cardano-foundation
diff --git a/‎.env.IntegrationTest‎
Lines changed: 1 addition & 1 deletion b/‎.env.IntegrationTest‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎.env.docker-compose‎
Lines changed: 2 additions & 2 deletions b/‎.env.docker-compose‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎.env.docker-compose-preprod‎
Lines changed: 2 additions & 3 deletions b/‎.env.docker-compose-preprod‎
Lines changed: 2 additions & 3 deletions
diff --git a/‎.env.h2‎
Lines changed: 1 addition & 1 deletion b/‎.env.h2‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎.env.h2-testdata‎
Lines changed: 1 addition & 1 deletion b/‎.env.h2-testdata‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎.github/actions/build_docker_images/action.yml‎
Lines changed: 64 additions & 30 deletions b/‎.github/actions/build_docker_images/action.yml‎
Lines changed: 64 additions & 30 deletions
diff --git a/‎.github/workflows/pr-preprod-tests.yaml‎
Lines changed: 39 additions & 11 deletions b/‎.github/workflows/pr-preprod-tests.yaml‎
Lines changed: 39 additions & 11 deletions
diff --git a/‎api/src/main/java/org/cardanofoundation/rosetta/api/account/mapper/AccountMapperUtil.java‎
Lines changed: 2 additions & 1 deletion b/‎api/src/main/java/org/cardanofoundation/rosetta/api/account/mapper/AccountMapperUtil.java‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎api/src/main/java/org/cardanofoundation/rosetta/api/account/model/domain/Amt.java‎
Lines changed: 10 additions & 12 deletions b/‎api/src/main/java/org/cardanofoundation/rosetta/api/account/model/domain/Amt.java‎
Lines changed: 10 additions & 12 deletions
diff --git a/‎api/src/main/java/org/cardanofoundation/rosetta/api/block/model/repository/TxRepositoryCustomBase.java‎
Lines changed: 2 additions & 2 deletions b/‎api/src/main/java/org/cardanofoundation/rosetta/api/block/model/repository/TxRepositoryCustomBase.java‎
Lines changed: 2 additions & 2 deletions
@@ -162,4 +162,4 @@ TOKEN_REGISTRY_LOGO_FETCH=false
 TOKEN_REGISTRY_REQUEST_TIMEOUT_SECONDS=2
 
 ## Mithril version for Docker build
-MITHRIL_VERSION=2524.0
+MITHRIL_VERSION=2537.0
@@ -24,7 +24,7 @@ CARDANO_NODE_HOST=cardano-node
 # Service name in docker-compose or local cardano node
 CARDANO_NODE_PORT=3001
 # Uncomment if you are using local cardano node
-CARDANO_NODE_VERSION=10.4.1
+CARDANO_NODE_VERSION=10.5.1
 CARDANO_NODE_SUBMIT_HOST=cardano-submit-api
 NODE_SUBMIT_API_PORT=8090
 CARDANO_NODE_DIR=/node
@@ -34,7 +34,7 @@ CARDANO_CONFIG=./config/node/${NETWORK}
 
 ## Mithril
 MITHRIL_SYNC=true
-MITHRIL_VERSION=2524.0
+MITHRIL_VERSION=2537.0
 SNAPSHOT_DIGEST=latest
 # if not set standard values will be used
 AGGREGATOR_ENDPOINT=
 
@@ -24,7 +24,7 @@ CARDANO_NODE_HOST=cardano-node
 # Service name in docker-compose or local cardano node
 CARDANO_NODE_PORT=3001
 # Uncomment if you are using local cardano node
-CARDANO_NODE_VERSION=10.4.1
+CARDANO_NODE_VERSION=10.5.1
 CARDANO_NODE_SUBMIT_HOST=cardano-submit-api
 NODE_SUBMIT_API_PORT=8090
 CARDANO_NODE_DIR=/opt/rosetta-java-preprod/node_data
@@ -34,7 +34,7 @@ CARDANO_CONFIG=./config/node/${NETWORK}
 
 ## Mithril
 MITHRIL_SYNC=true
-MITHRIL_VERSION=2524.0
+MITHRIL_VERSION=2537.0
 SNAPSHOT_DIGEST=latest
 # if not set standard values will be used
 AGGREGATOR_ENDPOINT=
@@ -112,7 +112,6 @@ POSTGRESQL_EXPORTER_PORT=9187
 PEER_DISCOVERY=true
 
 ## Token Registry
-# Externally hosted token registry is currently only available for mainnet
 TOKEN_REGISTRY_ENABLED=false
 TOKEN_REGISTRY_BASE_URL=
 TOKEN_REGISTRY_CACHE_TTL_HOURS=1
 
@@ -19,7 +19,7 @@ CARDANO_NODE_HOST=localhost
 # Service name in docker-compose or local cardano node
 CARDANO_NODE_PORT=3001
 # Uncomment if you are using local cardano node
-CARDANO_NODE_VERSION=10.4.1
+CARDANO_NODE_VERSION=10.5.1
 CARDANO_NODE_SUBMIT_HOST=localhost
 NODE_SUBMIT_API_PORT=8090
 
 
@@ -19,7 +19,7 @@ CARDANO_NODE_HOST=localhost
 # Service name in docker-compose or local cardano node
 CARDANO_NODE_PORT=3001
 # Uncomment if you are using local cardano node
-CARDANO_NODE_VERSION=10.4.1
+CARDANO_NODE_VERSION=10.5.1
 CARDANO_NODE_SUBMIT_HOST=localhost
 NODE_SUBMIT_API_PORT=8090
 
 
@@ -9,23 +9,74 @@ inputs:
     description: Is this a release build? If true, the latest tag will be applied
     required: false
     default: false
+  node_version_key:
+    required: false
+    default: CARDANO_NODE_VERSION
+  pg_version_key:
+    required: false
+    default: PG_VERSION_TAG
+  mithril_version_key:
+    required: false
+    default: MITHRIL_VERSION
+
 secrets:
   DOCKERHUB_USERNAME:
     description: Docker Hub username
     required: true
-    DOCKERHUB_TOKEN:
-      description: Docker Hub token
-      required: true
+  DOCKERHUB_TOKEN:
+    description: Docker Hub token
+    required: true
 runs:
     using: composite
     steps:
+      - name: Read versions from .env
+        id: envver
+        shell: bash
+        run: |
+          NODE_KEY='${{ inputs.node_version_key }}'
+          PG_KEY='${{ inputs.pg_version_key }}'
+          MITHRIL_KEY='${{ inputs.mithril_version_key }}'
+
+          if [[ ! -f .env ]]; then
+           echo ".env not found"
+           exit 0
+          fi
+
+          get_val() {
+           local key="$1"
+           grep -E "^${key}=" .env | head -1 | cut -d= -f2- | tr -d '\r'
+          }
+
+          NODE_VAL="$(get_val "$NODE_KEY")"
+          PG_VAL="$(get_val "$PG_KEY")"
+          MITHRIL_VAL="$(get_val "$MITHRIL_KEY")"
+        
+          if [[ -n "$NODE_VAL" ]]; then
+            echo "node_version=$NODE_VAL" >> "$GITHUB_OUTPUT"
+          else
+            echo "No value for $NODE_KEY in .env"
+          fi
+
+          if [[ -n "$PG_VAL" ]]; then
+            echo "pg_version=$PG_VAL" >> "$GITHUB_OUTPUT"
+          else
+            echo "No value for $PG_KEY in .env"
+          fi
+
+          if [[ -n "$MITHRIL_VAL" ]]; then
+            echo "mithril_version=$MITHRIL_VAL" >> "$GITHUB_OUTPUT"
+          else
+            echo "No value for $MITHRIL_KEY in .env"
+          fi
+
       - name: API - Build and push Docker ${{ inputs.tag }} image
         uses: docker/build-push-action@v4
         with:
           context: .
           file: ./api/Dockerfile
           tags: cardanofoundation/cardano-rosetta-java-api:${{ inputs.tag }}
           push: true
+
       - name: API - Build and push Docker latest image
         uses: docker/build-push-action@v4
         if: ${{ inputs.isRelease == 'true' }}
@@ -34,13 +85,15 @@ runs:
           file: ./api/Dockerfile
           tags: cardanofoundation/cardano-rosetta-java-api:latest
           push: true
+
       - name: Indexer - Build and push Docker ${{ inputs.tag }} image
         uses: docker/build-push-action@v4
         with:
           context: .
           file: ./yaci-indexer/Dockerfile
           tags: cardanofoundation/cardano-rosetta-java-indexer:${{ inputs.tag }}
           push: true
+
       - name: Indexer - Build and push Docker latest image
         uses: docker/build-push-action@v4
         if: ${{ inputs.isRelease == 'true' }}
@@ -49,58 +102,39 @@ runs:
           file: ./yaci-indexer/Dockerfile
           tags: cardanofoundation/cardano-rosetta-java-indexer:latest
           push: true
+
       - name: Cardano Node - Build and push Docker ${{ inputs.tag }} image
         uses: docker/build-push-action@v4
         with:
           context: .
           file: ./docker/dockerfiles/node/Dockerfile
-          tags: cardanofoundation/cardano-rosetta-java-cardano-node:${{ inputs.tag }}
-          push: true
-      - name: Cardano Node - Build and push Docker latest image
-        uses: docker/build-push-action@v4
-        if: ${{ inputs.isRelease == 'true' }}
-        with:
-          context: .
-          file: ./docker/dockerfiles/node/Dockerfile
-          tags: cardanofoundation/cardano-rosetta-java-cardano-node:latest
+          tags: cardanofoundation/cardano-rosetta-java-cardano-node:${{ steps.envver.outputs.node_version }}
           push: true
+
       - name: Postgres - Build and push Docker ${{ inputs.tag }} image
         uses: docker/build-push-action@v4
         with:
           context: .
           file: ./docker/dockerfiles/postgres/Dockerfile
-          tags: cardanofoundation/cardano-rosetta-java-postgres:${{ inputs.tag }}
-          push: true
-      - name: Postgres - Build and push Docker latest image
-        uses: docker/build-push-action@v4
-        if: ${{ inputs.isRelease == 'true' }}
-        with:
-          context: .
-          file: ./docker/dockerfiles/postgres/Dockerfile
-          tags: cardanofoundation/cardano-rosetta-java-postgres:latest
+          tags: cardanofoundation/cardano-rosetta-java-postgres:${{ steps.envver.outputs.pg_version }}
           push: true
+
       - name: Mithril - Build and push Docker ${{ inputs.tag }} image
         uses: docker/build-push-action@v4
         with:
           context: .
           file: ./docker/dockerfiles/mithril/Dockerfile
-          tags: cardanofoundation/cardano-rosetta-java-mithril:${{ inputs.tag }}
-          push: true
-      - name: Mithril - Build and push Docker latest image
-        uses: docker/build-push-action@v4
-        if: ${{ inputs.isRelease == 'true' }}
-        with:
-          context: .
-          file: ./docker/dockerfiles/mithril/Dockerfile
-          tags: cardanofoundation/cardano-rosetta-java-mithril:latest
+          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
         uses: docker/build-push-action@v4
         if: ${{ inputs.isRelease == 'true' }}
 
@@ -58,15 +58,19 @@ jobs:
             fi
           }
 
-          ensure_var REMOVE_SPENT_UTXOS false
-          ensure_var REMOVE_SPENT_UTXOS_LAST_BLOCKS_GRACE_COUNT 129600
-          ensure_var DB_PORT 5433
-          ensure_var TOKEN_REGISTRY_ENABLED true
-          ensure_var TOKEN_REGISTRY_BASE_URL http://preview.integrations.cf-systems.internal:8080/api
-          ensure_var TOKEN_REGISTRY_CACHE_TTL_HOURS 1
-          ensure_var TOKEN_REGISTRY_LOGO_FETCH true
-          ensure_var TOKEN_REGISTRY_REQUEST_TIMEOUT_SECONDS 2
-          ensure_var PEER_DISCOVERY true
+          configure_test_env() {
+            ensure_var REMOVE_SPENT_UTXOS false
+            ensure_var REMOVE_SPENT_UTXOS_LAST_BLOCKS_GRACE_COUNT 129600
+            ensure_var DB_PORT 5433
+            ensure_var TOKEN_REGISTRY_ENABLED true
+            ensure_var TOKEN_REGISTRY_BASE_URL http://preview.integrations.cf-systems.internal:8080/api
+            ensure_var TOKEN_REGISTRY_CACHE_TTL_HOURS 1
+            ensure_var TOKEN_REGISTRY_LOGO_FETCH true
+            ensure_var TOKEN_REGISTRY_REQUEST_TIMEOUT_SECONDS 2
+            ensure_var PEER_DISCOVERY true
+          }
+
+          configure_test_env
 
 
       - name: Build and start services with PR code
@@ -275,7 +279,29 @@ jobs:
         if: failure() && (steps.test.outcome == 'failure' || steps.test.outcome == 'cancelled')
         run: |
           cd /home/integration/git/cardano-rosetta-java
-          sed -i "s#^DB_PORT=.*#DB_PORT=5433#" .env.docker-compose-preprod
+
+          ensure_var() {
+            local key="$1"
+            local value="$2"
+            local file=".env.docker-compose-preprod"
+            if grep -q "^${key}=" "$file"; then
+              sed -i "s#^${key}=.*#${key}=${value}#" "$file"
+            else
+              echo "${key}=${value}" >> "$file"
+            fi
+          }
+
+          configure_test_env() {
+            ensure_var REMOVE_SPENT_UTXOS false
+            ensure_var REMOVE_SPENT_UTXOS_LAST_BLOCKS_GRACE_COUNT 129600
+            ensure_var DB_PORT 5433
+            ensure_var TOKEN_REGISTRY_ENABLED true
+            ensure_var TOKEN_REGISTRY_BASE_URL http://preview.integrations.cf-systems.internal:8080/api
+            ensure_var TOKEN_REGISTRY_CACHE_TTL_HOURS 1
+            ensure_var TOKEN_REGISTRY_LOGO_FETCH true
+            ensure_var TOKEN_REGISTRY_REQUEST_TIMEOUT_SECONDS 2
+            ensure_var PEER_DISCOVERY true
+          }
 
           echo "⚠️ Test failed - stopping services"
 
@@ -346,7 +372,9 @@ jobs:
           LAST_TAG=$(git tag --sort=-version:refname | head -1)
           echo "Rolling back to stable version: $LAST_TAG"
           git checkout -f $LAST_TAG
-          sed -i "s#^DB_PORT=.*#DB_PORT=5433#" .env.docker-compose-preprod
+
+          # Re-apply test configuration for stable version
+          configure_test_env
 
           docker compose \
             --env-file .env.docker-compose-preprod \
 
@@ -76,7 +76,8 @@ public List<Coin> mapUtxosToCoins(List<Utxo> utxos,
             Amt adaAsset = utxo.getAmounts().stream()
                     .filter(amt -> Constants.LOVELACE.equals(amt.getUnit()))
                     .findFirst()
-                    .orElseGet(() -> new Amt(null, null, Constants.ADA, BigInteger.ZERO));
+                    .orElseGet(() -> new Amt(null, Constants.ADA, BigInteger.ZERO));
+
             String coinIdentifier = "%s:%d".formatted(utxo.getTxHash(), utxo.getOutputIndex());
 
             return Coin.builder()
 
@@ -23,14 +23,18 @@ public class Amt implements Serializable {
   private String unit; // subject = policyId + hex(assetName)
   private String policyId;
 
-  // TODO avoid using assetName field for now
-  // TODO ASCI in case of CIP-26 and bech32 in case of CIP-68, actually it should always be ASCII and never bech32
-  @Deprecated
-  // consider removing
-  private String assetName;
-
   private BigInteger quantity;
 
+  /**
+   * Returns symbol as hex
+   *
+   * unit (subject) = policyId(hex) + symbol(hex)
+   */
+  @Nullable
+  public String getAssetNameAsHex() {
+    return getSymbolHex();
+  }
+
   /**
    * Returns symbol as hex
    *
@@ -45,10 +49,4 @@ public String getSymbolHex() {
     return unit.replace(policyId, "");
   }
 
-  @Deprecated
-  // TODO avoid using assetName field for now
-  public String getAssetName() {
-    return assetName;
-  }
-
 }
@@ -46,9 +46,9 @@ public final Condition buildCurrencyCondition(Currency currency) {
                         !"lovelace".equalsIgnoreCase(symbol) && !"ada".equalsIgnoreCase(symbol)) {
                     String escapedSymbol = symbol.trim().replace("\"", "\\\"");
                     return buildPolicyIdAndSymbolCondition(escapedPolicyId, escapedSymbol);
-                } else {
-                    return buildPolicyIdOnlyCondition(escapedPolicyId);
                 }
+
+                return buildPolicyIdOnlyCondition(escapedPolicyId);
             }
 
             if (symbol != null && !symbol.trim().isEmpty()) {
Original file line number	Diff line number	Diff line change
`@@ -46,9 +46,9 @@ public final Condition buildCurrencyCondition(Currency currency) {`
`46`	`46`	`!"lovelace".equalsIgnoreCase(symbol) && !"ada".equalsIgnoreCase(symbol)) {`
`47`	`47`	`String escapedSymbol = symbol.trim().replace("\"", "\\\"");`
`48`	`48`	`return buildPolicyIdAndSymbolCondition(escapedPolicyId, escapedSymbol);`
`49`		`- } else {`
`50`		`- return buildPolicyIdOnlyCondition(escapedPolicyId);`
`51`	`49`	`}`
	`50`	`+`
	`51`	`+ return buildPolicyIdOnlyCondition(escapedPolicyId);`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`if (symbol != null && !symbol.trim().isEmpty()) {`