Merge pull request #76 from webb-tools/salman/fix-orbit

Fix and update orbit
tangle-network · May 13, 2024 · accf9a4 · accf9a4
2 parents ab9eb45 + 07ae097
commit accf9a4
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/deploy/package.json b/deploy/package.json
@@ -16,10 +16,9 @@
     "format": "prettier --write '**/*.{ts,js,yml}'",
     "ts:check": "tsc --noEmit",
     "ts:build": "tsc",
-    "deploy": "ts-node main.ts",
-    "tangle": "ts-node tangle.ts",
-    "faucet": "ts-node faucet.ts",
-    "deposit": "ts-node deposit.ts",
+    "deploy": "node --loader ts-node/esm main.ts",
+    "faucet": "node --loader ts-node/esm faucet.ts",
+    "deposit": "node --loader ts-node/esm deposit.ts",
     "test": "mocha"
   },
   "dependencies": {
@@ -28,7 +27,7 @@
     "@webb-tools/proposals": "^1.0.8",
     "@webb-tools/utils": "^1.0.8",
     "@webb-tools/vbridge": "^1.0.8",
-    "@webb-tools/tangle-substrate-types": "0.3.2-hotfix.1",
+    "@webb-tools/tangle-substrate-types": "0.5.5",
     "chalk": "^4",
     "ecpair": "^2.1.0",
     "ethers": "5.7.2",

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -6,7 +6,7 @@ networks:
 
 services:
   athena_chain:
-    image: ethereum/client-go:stable
+    image: ethereum/client-go:v1.13.14
     container_name: athena-chain
     ports:
       - ${ATHENA_CHAIN_PORT}:8545
@@ -51,7 +51,7 @@ services:
         max-file: "10"
 
   hermes_chain:
-    image: ethereum/client-go:stable
+    image: ethereum/client-go:v1.13.14
     container_name: hermes-chain
     ports:
       - ${HERMES_CHAIN_PORT}:8545
@@ -96,7 +96,7 @@ services:
         max-file: "10"
 
   demeter_chain:
-    image: ethereum/client-go:stable
+    image: ethereum/client-go:v1.13.14
     container_name: demeter-chain
     ports:
       - ${DEMETER_CHAIN_PORT}:8545

diff --git a/explorers.yml b/explorers.yml
@@ -120,6 +120,8 @@ services:
       PORT: "${ATHENA_CHAIN_EXPLORER_PORT}"
       SUBNETWORK: "${ATHENA_CHAIN_SUBNETWORK}"
       BLOCKSCOUT_HOST: "athena-explorer.${DOMAIN}"
+    ports:
+     - ${ATHENA_CHAIN_EXPLORER_PORT}:${ATHENA_CHAIN_EXPLORER_PORT}
     volumes:
       - ./logs/athena_blockscout/:/app/logs/
     logging:
@@ -154,6 +156,8 @@ services:
       PORT: "${HERMES_CHAIN_EXPLORER_PORT}"
       SUBNETWORK: "${HERMES_CHAIN_SUBNETWORK}"
       BLOCKSCOUT_HOST: "hermes-explorer.${DOMAIN}"
+    ports:
+     - ${HERMES_CHAIN_EXPLORER_PORT}:${HERMES_CHAIN_EXPLORER_PORT}
     volumes:
       - ./logs/hermes_blockscout:/app/logs/
 
@@ -189,6 +193,8 @@ services:
       PORT: "${DEMETER_CHAIN_EXPLORER_PORT}"
       SUBNETWORK: "${DEMETER_CHAIN_SUBNETWORK}"
       BLOCKSCOUT_HOST: "demeter-explorer.${DOMAIN}"
+    ports:
+     - ${DEMETER_CHAIN_EXPLORER_PORT}:${DEMETER_CHAIN_EXPLORER_PORT}
     volumes:
       - ./logs/demeter_blockscout:/app/logs/
     logging:

diff --git a/scripts/setup-orbit.sh b/scripts/setup-orbit.sh
@@ -53,7 +53,7 @@ function geth() {
   required_arg "$1" "chain-datadir"
   local chain_datadir=$1
   shift 1 # Remove the first arg $1 from the list of args $@
-  docker run -t --rm -v $ROOT_DIR/$chain_datadir:/data ethereum/client-go:stable --datadir /data "$@"
+  docker run -t --rm -v $ROOT_DIR/$chain_datadir:/data ethereum/client-go:v1.13.14 --datadir /data "$@"
 }
 
 # Extradata is the extra data field in the genesis file.