fix: added submit-api-host to api (#120)

* fix: added submit-api-host to api * fix: added submit-api-host to api
cardano-foundation · Apr 11, 2024 · 6c5f10d · 6c5f10d
1 parent cef1f81
commit 6c5f10d
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 8 deletions.
diff --git a/.env.IntegrationTest b/.env.IntegrationTest
@@ -19,6 +19,7 @@ DB_PATH="data"
 CARDANO_NODE_HOST="yaci-cli" # Service name in docker-compose or local cardano node
 CARDANO_NODE_PORT="9999" # Uncomment if you are using local cardano node
 CARDANO_NODE_VERSION="8.9.0"
+CARDANO_NODE_SUBMIT_HOST="cardano-submit-api"
 NODE_SUBMIT_API_PORT=8090
 CARDANO_NODE_SOCKET="./node-ipc"
 CARDANO_NODE_DB="node/db"

diff --git a/.env.docker-compose b/.env.docker-compose
@@ -19,6 +19,7 @@ DB_PATH="data"
 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="8.9.0"
+CARDANO_NODE_SUBMIT_HOST="cardano-submit-api"
 NODE_SUBMIT_API_PORT=8090
 CARDANO_NODE_SOCKET="./node-ipc"
 CARDANO_NODE_DB="./node/db"

diff --git a/.env.h2 b/.env.h2
@@ -18,6 +18,7 @@ SCHEMA=${NETWORK}
 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=8.9.0
+CARDANO_NODE_SUBMIT_HOST="cardano-submit-api"
 NODE_SUBMIT_API_PORT=8090
 CARDANO_NODE_SOCKET="./node-ipc"
 

diff --git a/api/src/main/java/org/cardanofoundation/rosetta/common/services/impl/CardanoServiceImpl.java b/api/src/main/java/org/cardanofoundation/rosetta/common/services/impl/CardanoServiceImpl.java
@@ -77,8 +77,8 @@ public class CardanoServiceImpl implements CardanoService {
     private final LedgerDataProviderService ledgerDataProviderService;
     @Value("${cardano.rosetta.NODE_SUBMIT_API_PORT}")
     private int NODE_SUBMIT_API_PORT;
-    @Value("${cardano.rosetta.CARDANO_NODE_HOST}")
-    private String CARDANO_NODE_HOST;
+    @Value("${cardano.rosetta.CARDANO_NODE_SUBMIT_HOST}")
+    private String CARDANO_NODE_SUBMIT_HOST;
 
   @Override
   public TransactionParsed parseTransaction(NetworkIdentifierType networkIdentifierType,
@@ -473,7 +473,7 @@ public ProcessOperations convertRosettaOperations(NetworkIdentifierType networkI
      */
     @Override
     public String submitTransaction(String signedTransaction) throws ApiException {
-        String submitURL = Constants.PROTOCOL + CARDANO_NODE_HOST + ":" + NODE_SUBMIT_API_PORT
+        String submitURL = Constants.PROTOCOL + CARDANO_NODE_SUBMIT_HOST + ":" + NODE_SUBMIT_API_PORT
             + Constants.SUBMIT_API_PATH;
         log.info("[submitTransaction] About to submit transaction to {}", submitURL);
         Request request = null;

diff --git a/api/src/main/resources/config/application-dev.yaml b/api/src/main/resources/config/application-dev.yaml
@@ -47,5 +47,5 @@ cardano:
     DEVKIT_ENABLED: ${DEVKIT_ENABLED:false}
     DEVKIT_URL: ${DEVKIT_URL:localhost}
     DEVKIT_PORT: ${HOST_N2C_SOCAT_PORT:3333}
-    CARDANO_NODE_HOST: ${CARDANO_NODE_HOST}
+    CARDANO_NODE_SUBMIT_HOST: ${CARDANO_NODE_SUBMIT_HOST}
     NODE_SUBMIT_API_PORT: ${NODE_SUBMIT_API_PORT}
diff --git a/api/src/main/resources/config/application-h2.yaml b/api/src/main/resources/config/application-h2.yaml
@@ -42,7 +42,7 @@ cardano:
     TOPOLOGY_FILEPATH: ${TOPOLOGY_FILEPATH}
     GENESIS_SHELLEY_PATH: ${GENESIS_SHELLEY_PATH}
     CARDANO_NODE_VERSION: ${CARDANO_NODE_VERSION}
-    CARDANO_NODE_HOST: ${CARDANO_NODE_HOST}
+    CARDANO_NODE_SUBMIT_HOST: ${CARDANO_NODE_SUBMIT_HOST}
     NODE_SUBMIT_API_PORT: ${NODE_SUBMIT_API_PORT}
     CARDANO_NODE_SOCKET: ${CARDANO_NODE_SOCKET}
     # devkit variables

diff --git a/api/src/main/resources/config/application-staging.yaml b/api/src/main/resources/config/application-staging.yaml
@@ -41,7 +41,7 @@ cardano:
       ${ROSETTA_VERSION}
     TOPOLOGY_FILEPATH: ${TOPOLOGY_FILEPATH}
     GENESIS_SHELLEY_PATH: ${GENESIS_SHELLEY_PATH}
-    CARDANO_NODE_HOST: ${CARDANO_NODE_HOST}
+    CARDANO_NODE_SUBMIT_HOST: ${CARDANO_NODE_SUBMIT_HOST}
     NODE_SUBMIT_API_PORT: ${NODE_SUBMIT_API_PORT}
     CARDANO_NODE_SOCKET: ${CARDANO_NODE_SOCKET}
     # devkit variables

diff --git a/api/src/test/resources/application-test-integration.yaml b/api/src/test/resources/application-test-integration.yaml
@@ -51,7 +51,7 @@ cardano:
     TOPOLOGY_FILEPATH: ../config/devkit/topology.json
     GENESIS_SHELLEY_PATH: ../config/devkit/shelley-genesis.json
     CARDANO_NODE_VERSION: "8.9.0"
-    CARDANO_NODE_HOST: localhost
+    CARDANO_NODE_SUBMIT_HOST: localhost
     NODE_SUBMIT_API_PORT: 8090
     CARDANO_NODE_SOCKET: ${CARDANO_NODE_SOCKET:""}
     # devkit variables

diff --git a/docker-api-indexer.yaml b/docker-api-indexer.yaml
@@ -27,7 +27,7 @@ services:
       TOPOLOGY_FILEPATH: ${TOPOLOGY_FILEPATH}
       GENESIS_SHELLEY_PATH: ${GENESIS_SHELLEY_PATH}
       NODE_SUBMIT_API_PORT: ${NODE_SUBMIT_API_PORT}
-      CARDANO_NODE_HOST: ${CARDANO_NODE_HOST}
+      CARDANO_NODE_SUBMIT_HOST: ${CARDANO_NODE_SUBMIT_HOST}
       CARDANO_NODE_SOCKET: /ipc/node.socket
       DEVKIT_ENABLED: ${DEVKIT_ENABLED}
       DEVKIT_URL: ${DEVKIT_URL}