chore: prepare 2.1.0-beta

.env.IntegrationTest

@@ -4,7 +4,7 @@ NETWORK=devkit
 PROTOCOL_MAGIC=42
 
 ## Postgres image
-PG_VERSION_TAG=REL_14_11
+PG_VERSION_TAG=REL_18_0
 
 ## Yaci image
 YACI_VERSION=0.10.5
@@ -16,10 +16,10 @@ DB_SECRET=weakpwd#123_d
 DB_HOST=db
 # Service name in docker-compose or local db
 DB_PORT=5432
-DB_SCHEMA=${NETWORK}
+DB_SCHEMA=public
 DB_PATH=data
-UPDATE_GENESIS_BLOCK_QUERY="UPDATE devkit.block SET number = 0 WHERE number = -1; UPDATE devkit.block SET prev_hash = 'Genesis' WHERE number = 1"
-#UPDATE_GENESIS_BLOCK_QUERY="UPDATE devkit.block SET prev_hash = 'Genesis' WHERE number = 1"
+UPDATE_GENESIS_BLOCK_QUERY="UPDATE \"public\".block SET number = 0 WHERE number = -1; UPDATE \"public\".block SET prev_hash = 'Genesis' WHERE number = 1"
+#UPDATE_GENESIS_BLOCK_QUERY="UPDATE \"public\".block SET prev_hash = 'Genesis' WHERE number = 1"
 
 ## Cardano Node variables
 CARDANO_NODE_HOST=yaci-cli

.env.docker-compose

@@ -7,7 +7,7 @@ PROTOCOL_MAGIC=764824073
 # mainnet 764824073, preprod 1, preview 2, devkit 42
 
 ## Postgres image
-PG_VERSION_TAG=REL_14_11
+PG_VERSION_TAG=REL_18_0
 
 ## Postgres variables
 DB_NAME=rosetta-java
@@ -16,7 +16,7 @@ DB_SECRET=weakpwd#123_d
 DB_HOST=db
 # Service name in docker-compose or local db
 DB_PORT=5432
-DB_SCHEMA=${NETWORK}
+DB_SCHEMA=public
 DB_PATH=data
 
 ## Cardano Node variables

.env.docker-compose-preprod

@@ -7,7 +7,7 @@ PROTOCOL_MAGIC=1
 # mainnet 764824073, preprod 1, preview 2, devkit 42
 
 ## Postgres image
-PG_VERSION_TAG=REL_14_11
+PG_VERSION_TAG=REL_18_0
 
 ## Postgres variables
 DB_NAME=rosetta-java
@@ -16,7 +16,7 @@ DB_SECRET=weakpwd#123_d
 DB_HOST=db
 # Service name in docker-compose or local db
 DB_PORT=5432
-DB_SCHEMA=${NETWORK}
+DB_SCHEMA=public
 DB_PATH=/opt/rosetta-java-preprod/sql_data
 
 ## Cardano Node variables

.env.h2

@@ -31,11 +31,11 @@ API_PORT=8082
 PRINT_EXCEPTION=true
 
 ROSETTA_VERSION=1.4.13
-TOPOLOGY_FILEPATH=./config/${NETWORK}/topology.json
-GENESIS_SHELLEY_PATH=./config/${NETWORK}/shelley-genesis.json
-GENESIS_BYRON_PATH=./config/${NETWORK}/byron-genesis.json
-GENESIS_ALONZO_PATH=./config/${NETWORK}/alonzo-genesis.json
-GENESIS_CONWAY_PATH=./config/${NETWORK}/conway-genesis.json
+TOPOLOGY_FILEPATH=./config/node/${NETWORK}/topology.json
+GENESIS_SHELLEY_PATH=./config/node/${NETWORK}/shelley-genesis.json
+GENESIS_BYRON_PATH=./config/node/${NETWORK}/byron-genesis.json
+GENESIS_ALONZO_PATH=./config/node/${NETWORK}/alonzo-genesis.json
+GENESIS_CONWAY_PATH=./config/node/${NETWORK}/conway-genesis.json
 SEARCH_LIMIT=100
 
 ## Yaci Indexer env

.env.h2-testdata

@@ -31,11 +31,11 @@ API_PORT=8082
 PRINT_EXCEPTION=true
 
 ROSETTA_VERSION=1.4.13
-TOPOLOGY_FILEPATH=./config/${NETWORK}/topology.json
-GENESIS_SHELLEY_PATH=./config/${NETWORK}/shelley-genesis.json
-GENESIS_BYRON_PATH=./config/${NETWORK}/byron-genesis.json
-GENESIS_ALONZO_PATH=./config/${NETWORK}/alonzo-genesis.json
-GENESIS_CONWAY_PATH=./config/${NETWORK}/conway-genesis.json
+TOPOLOGY_FILEPATH=./config/node/${NETWORK}/topology.json
+GENESIS_SHELLEY_PATH=./config/node/${NETWORK}/shelley-genesis.json
+GENESIS_BYRON_PATH=./config/node/${NETWORK}/byron-genesis.json
+GENESIS_ALONZO_PATH=./config/node/${NETWORK}/alonzo-genesis.json
+GENESIS_CONWAY_PATH=./config/node/${NETWORK}/conway-genesis.json
 SEARCH_LIMIT=100
 
 ## Yaci Indexer env

.github/actions/build_docker_images/action.yml

@@ -133,19 +133,11 @@ runs:
           tags: cardanofoundation/cardano-rosetta-java-mithril:${{ steps.envver.outputs.mithril_version }}
           push: true
 
-      - name: All-in-one - Build and push Docker image
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          file: ./docker/Dockerfile
-          tags: cardanofoundation/cardano-rosetta-java:${{ inputs.tag }}
-          push: true
-
-      - name: All-in-one - Build and push Docker latest image
+      - name: Mithril - Build and push Docker latest image
         uses: docker/build-push-action@v4
         if: ${{ inputs.isRelease == 'true' }}
         with:
           context: .
-          file: ./docker/Dockerfile
-          tags: cardanofoundation/cardano-rosetta-java:latest
+          file: ./docker/dockerfiles/mithril/Dockerfile
+          tags: cardanofoundation/cardano-rosetta-java-mithril:latest
           push: true

.github/workflows/integration-test.yaml

@@ -35,23 +35,27 @@ jobs:
           python-version: '3.12'
       - name: "Install uv"
         run: curl -LsSf https://astral.sh/uv/install.sh | sh
+
 #      - name: "Install mesh-cli"
 #        run: curl -sSfL https://raw.githubusercontent.com/coinbase/mesh-cli/master/scripts/install.sh | sh -s
 
       # https://github.com/coinbase/mesh-cli/issues/422
       - name: "Install mesh-cli"
         run: curl -sSfL https://raw.githubusercontent.com/coinbase/mesh-cli/v0.10.3/scripts/install.sh | sed -e 's/^REPO=.*/REPO=mesh-cli/' | sh -s
 
-      - name: "Run tests"
-        run: newman run ./postmanTests/rosetta-java.postman_collection.json -e postmanTests/Rosetta-java-env.postman_environment.json -r cli
+#      - name: "Run tests"
+#        run: newman run ./postmanTests/rosetta-java.postman_collection.json -e postmanTests/Rosetta-java-env.postman_environment.json -r cli
+
       - name: "Run construction API tests with schema validation"
         run: |
           cd ./tests/integration
           ~/.local/bin/uv run test_construction_api.py \
             -u http://localhost:8082 \
             --network-id devkit \
             --openapi ../../api/src/main/resources/rosetta-specifications-1.4.15/api.yaml
+
       - name: "Run rosetta check:data tests"
         run: ./bin/rosetta-cli check:data --configuration-file ./rosetta-cli-tests/data/byron_sample.json
+
       - name: "Tear down environment"
         run: docker compose --env-file .env.IntegrationTest -f docker-integration-test-environment.yaml down

.github/workflows/pr-preprod-tests.yaml

@@ -210,9 +210,8 @@ jobs:
           # Output test result
           echo "construction_result=${CONSTRUCTION_RESULT:-0}" >> $GITHUB_OUTPUT
 
-          # Don't fail the whole job if construction tests fail
-          # These are informational for now
-          exit 0
+          # Fail if construction tests failed
+          exit ${CONSTRUCTION_RESULT:-0}
         env:
           ROSETTA_URL: http://localhost:8082
           CARDANO_NETWORK: preprod

CLAUDE.md

@@ -33,21 +33,25 @@ cd api && mvn spring-boot:run
 mvn clean package
 ```
 
-### Docker Commands
+### Docker Compose Commands
 ```bash
-# Build from source
-docker build -t rosetta-java -f ./docker/Dockerfile .
+# Start all services (full stack)
+docker compose --env-file .env.docker-compose --env-file .env.docker-compose-profile-mid-level up -d
 
-# Run with docker-compose (full stack)
-docker-compose up -d
-
-# Run specific services
-docker-compose up -d api indexer postgres
+# Start specific services
+docker compose up -d cardano-node db
+docker compose up -d api yaci-indexer
 
 # View logs
-docker logs rosetta -f
-docker exec rosetta tail -f /logs/node.log
-docker exec rosetta tail -f /logs/indexer.log
+docker compose logs -f api
+docker compose logs -f yaci-indexer
+docker compose logs -f cardano-node
+
+# Stop all services
+docker compose down
+
+# Restart a service
+docker compose restart api
 ```
 
 ## Architecture Overview

api/src/main/java/org/cardanofoundation/rosetta/api/account/mapper/AccountMapperUtil.java

@@ -18,6 +18,9 @@
 import java.math.BigInteger;
 import java.util.*;
 
+import static org.cardanofoundation.rosetta.common.util.Constants.ADA;
+import static org.cardanofoundation.rosetta.common.util.Constants.ADA_DECIMALS;
+
 @Component
 @RequiredArgsConstructor
 public class AccountMapperUtil {
@@ -76,7 +79,7 @@ public List<Coin> mapUtxosToCoins(List<Utxo> utxos,
             Amt adaAsset = utxo.getAmounts().stream()
                     .filter(amt -> Constants.LOVELACE.equals(amt.getUnit()))
                     .findFirst()
-                    .orElseGet(() -> new Amt(null, Constants.ADA, BigInteger.ZERO));
+                    .orElseGet(() -> new Amt(null, ADA, BigInteger.ZERO));
 
             String coinIdentifier = "%s:%d".formatted(utxo.getTxHash(), utxo.getOutputIndex());
 
@@ -144,8 +147,8 @@ private static int getDecimalsWithFallback(@NotNull TokenRegistryCurrencyData me
 
     private CurrencyResponse getAdaCurrency() {
         return CurrencyResponse.builder()
-                .symbol(Constants.ADA)
-                .decimals(Constants.ADA_DECIMALS)
+                .symbol(ADA)
+                .decimals(ADA_DECIMALS)
                 .build();
     }
 

api/src/main/java/org/cardanofoundation/rosetta/api/block/model/entity/TxnEntity.java

@@ -2,6 +2,7 @@
 
 import java.math.BigInteger;
 import java.util.List;
+import jakarta.annotation.Nullable;
 import jakarta.persistence.Column;
 import jakarta.persistence.ConstraintMode;
 import jakarta.persistence.Entity;
@@ -50,6 +51,10 @@ public class TxnEntity {
   @Column(name = "fee")
   private BigInteger fee;
 
+  @Column(name = "tx_index")
+  @Nullable
+  private Integer txIndex;
+
   @OneToMany(mappedBy = "txHash")
   private List<TxScriptEntity> script;
 

api/src/main/java/org/cardanofoundation/rosetta/api/block/model/repository/TxRepositoryCustomBase.java

@@ -123,6 +123,7 @@ public List<TxnEntity> findTransactionsByBlockHash(String blockHash) {
                         TRANSACTION.OUTPUTS,
                         TRANSACTION.FEE,
                         TRANSACTION.SLOT,
+                        TRANSACTION.TX_INDEX,
                         BLOCK.HASH.as("joined_block_hash"),
                         BLOCK.NUMBER.as("joined_block_number"),
                         BLOCK.SLOT.as("joined_block_slot"),
@@ -133,6 +134,7 @@ public List<TxnEntity> findTransactionsByBlockHash(String blockHash) {
                 .leftJoin(BLOCK).on(TRANSACTION.BLOCK_HASH.eq(BLOCK.HASH))
                 .leftJoin(TRANSACTION_SIZE).on(TRANSACTION.TX_HASH.eq(TRANSACTION_SIZE.TX_HASH))
                 .where(TRANSACTION.BLOCK_HASH.eq(blockHash))
+                .orderBy(TRANSACTION.TX_INDEX.asc())
                 .fetch(queryBuilder::mapRecordToTxnEntity);
     }
 
@@ -182,12 +184,12 @@ protected int executeCountQuery(Condition conditions, @Nullable Boolean isSucces
      * Ensures count and results queries use identical conditions and JOINs.
      * Currency conditions use EXISTS subqueries - no JOIN needed.
      */
-    protected List<? extends org.jooq.Record> executeResultsQuery(Condition conditions, 
-                                                                  @Nullable Boolean isSuccess, 
+    protected List<? extends org.jooq.Record> executeResultsQuery(Condition conditions,
+                                                                  @Nullable Boolean isSuccess,
                                                                   OffsetBasedPageRequest offsetBasedPageRequest) {
         return buildBaseResultsQuery(isSuccess)
                 .where(conditions)
-                .orderBy(TRANSACTION.SLOT.desc())
+                .orderBy(TRANSACTION.SLOT.desc(), TRANSACTION.TX_INDEX.desc())
                 .limit(offsetBasedPageRequest.getLimit())
                 .offset(offsetBasedPageRequest.getOffset())
                 .fetch();

api/src/main/java/org/cardanofoundation/rosetta/api/block/model/repository/util/TxRepositoryQueryBuilder.java

@@ -36,14 +36,15 @@ public interface CurrencyConditionBuilder {
         Condition buildCurrencyCondition(Currency currency);
     }
 
-    public SelectJoinStep<Record11<String, String, JSONB, JSONB, Long, Long, String, Long, Long, Integer, Integer>> buildTransactionSelectQuery(DSLContext dsl) {
+    public SelectJoinStep<Record12<String, String, JSONB, JSONB, Long, Long, Integer, String, Long, Long, Integer, Integer>> buildTransactionSelectQuery(DSLContext dsl) {
         return dsl.select(
                 TRANSACTION.TX_HASH,
                 TRANSACTION.BLOCK_HASH,
                 TRANSACTION.INPUTS,
                 TRANSACTION.OUTPUTS,
                 TRANSACTION.FEE,
                 TRANSACTION.SLOT,
+                TRANSACTION.TX_INDEX,
                 BLOCK.HASH.as("joined_block_hash"),
                 BLOCK.NUMBER.as("joined_block_number"),
                 BLOCK.SLOT.as("joined_block_slot"),
@@ -161,6 +162,8 @@ public TxnEntity mapRecordToTxnEntity(org.jooq.Record record) {
         @Nullable BigInteger fee = Optional.ofNullable(record.get(TRANSACTION.FEE))
                 .map(BigInteger::valueOf).orElse(null);
 
+        @Nullable Integer txIndex = record.get(TRANSACTION.TX_INDEX);
+
         @Nullable BlockEntity blockEntity = null;
         String blockHashFromRecord = record.get("joined_block_hash", String.class);
         if (blockHashFromRecord != null) {
@@ -178,6 +181,7 @@ public TxnEntity mapRecordToTxnEntity(org.jooq.Record record) {
                 .inputKeys(readUtxoKeys(inputs, txHash))
                 .outputKeys(readUtxoKeys(outputs, txHash))
                 .fee(fee)
+                .txIndex(txIndex)
                 .build();
     }
 

api/src/main/java/org/cardanofoundation/rosetta/api/construction/service/CardanoConstructionServiceImpl.java

@@ -73,7 +73,7 @@ public class CardanoConstructionServiceImpl implements CardanoConstructionServic
 
   private final LedgerBlockService ledgerBlockService;
   private final ProtocolParamService protocolParamService;
-  private final OperationService operationService;
+  private final TransactionOperationParser transactionOperationParser;
   private final RestTemplate restTemplate;
   private final OfflineSlotService offlineSlotService;
 
@@ -89,22 +89,27 @@ public class CardanoConstructionServiceImpl implements CardanoConstructionServic
   @Override
   public TransactionParsed parseTransaction(Network network, String transaction, boolean signed) {
     Array decodeTransaction = decodeTransaction(transaction);
+
     try {
       TransactionData convertedTr = CborArrayToTransactionData.convert(decodeTransaction, signed);
-      List<Operation> operations = operationService.getOperationsFromTransactionData(convertedTr, network);
+      List<Operation> operations = transactionOperationParser.getOperationsFromTransactionData(convertedTr, network);
       List<AccountIdentifier> accountIdentifierSigners = new ArrayList<>();
+
       if (signed) {
         log.info("[parseSignedTransaction] About to get signatures from parsed transaction");
         List<String> accumulator = convertedTr.transactionExtraData().operations().stream()
-                .map(o -> operationService.getSignerFromOperation(network, o))
+                .map(o -> transactionOperationParser.getSignerFromOperation(network, o))
                 .flatMap(List::stream)
                 .toList();
+
         accountIdentifierSigners = getUniqueAccountIdentifiers(accumulator);
       }
+
       return new TransactionParsed(operations, accountIdentifierSigners);
     } catch (CborException | CborDeserializationException | CborSerializationException error) {
       log.error("{} [parseTransaction] Cant instantiate transaction from transaction bytes",
               error.getMessage(), error);
+
       throw ExceptionFactory.invalidTransactionError();
     }
   }
@@ -624,7 +629,7 @@ private TransactionBody deserializeTransactionBody(String unsignedTransaction) {
   private List<AccountIdentifier> getUniqueAccountIdentifiers(List<String> addresses) {
     return new HashSet<>(addresses)
             .stream()
-            .map(s -> new AccountIdentifier(s, null, null))
+            .map(address -> new AccountIdentifier(address, null, null))
             .toList();
   }