From 11aa7d15534a82fabaa45c647297a5f31b1b5de6 Mon Sep 17 00:00:00 2001 From: Voss Date: Tue, 14 Mar 2023 01:20:00 -0500 Subject: [PATCH 1/5] add mainnet and prater global EL ENVs --- dappnode_package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dappnode_package.json b/dappnode_package.json index 8b618e9..a389746 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -37,7 +37,7 @@ ], "globalEnvs": [ { - "envs": ["DOMAIN"], + "envs": ["DOMAIN", "EXECUTION_CLIENT_MAINNET", "EXECUTION_CLIENT_PRATER"] "services": ["pocket"] } ], From 824b5e54623086c298184a2b5f7990de2029642e Mon Sep 17 00:00:00 2001 From: Voss Date: Tue, 14 Mar 2023 21:33:44 -0500 Subject: [PATCH 2/5] Test Adapt for Global Envs for ETH and testnet ETH --- dappnode_package.json | 2 +- pocket/chains/chains_mainnet_template.json | 4 +- pocket/entrypoint.sh | 43 ++++++++++++++++++++++ 3 files changed, 46 insertions(+), 3 deletions(-) diff --git a/dappnode_package.json b/dappnode_package.json index a389746..64ee78d 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -37,7 +37,7 @@ ], "globalEnvs": [ { - "envs": ["DOMAIN", "EXECUTION_CLIENT_MAINNET", "EXECUTION_CLIENT_PRATER"] + "envs": ["DOMAIN", "EXECUTION_CLIENT_MAINNET", "EXECUTION_CLIENT_PRATER"], "services": ["pocket"] } ], diff --git a/pocket/chains/chains_mainnet_template.json b/pocket/chains/chains_mainnet_template.json index 46801a6..634721f 100644 --- a/pocket/chains/chains_mainnet_template.json +++ b/pocket/chains/chains_mainnet_template.json @@ -9,7 +9,7 @@ }, { "id": "0021", - "url": "http://geth.dappnode:8545" + "url": "${GLOBAL_EXEXUTION_CLIENT_MAINNET}" }, { "id": "0023", @@ -21,7 +21,7 @@ }, { "id": "0026", - "url": "http://goerli-geth.dappnode:8545" + "url": "${GLOBAL_EXEXUTION_CLIENT_PRATER}" }, { "id": "0027", diff --git a/pocket/entrypoint.sh b/pocket/entrypoint.sh index bdaef4a..8659ec8 100755 --- a/pocket/entrypoint.sh +++ b/pocket/entrypoint.sh @@ -7,6 +7,49 @@ ERROR="[ ERROR ]" WARN="[ WARN ]" INFO="[ INFO ]" +#Determine Global ENVs for Execution Clients on Goerli and Mainnet +case $_DAPPNODE_GLOBAL_EXECUTION_CLIENT_PRATER in +"goerli-geth.dnp.dappnode.eth") + GLOBAL_EXECUTION_CLIENT_GOERLI="http://goerli-geth.dappnode:8545" + ;; +"goerli-nethermind.dnp.dappnode.eth") + GLOBAL_EXECUTION_CLIENT_GOERLI="http://goerli-nethermind.dappnode:8545" + ;; +"goerli-besu.dnp.dappnode.eth") + GLOBAL_EXECUTION_CLIENT_GOERLI="http://goerli-besu.dappnode:8545" + ;; +"goerli-erigon.dnp.dappnode.eth") + GLOBAL_EXECUTION_CLIENT_GOERLI="http://goerli-erigon.dappnode:8545" + ;; +*) + echo "Unknown value for _DAPPNODE_GLOBAL_EXECUTION_CLIENT_PRATER: $_DAPPNODE_GLOBAL_EXECUTION_CLIENT_PRATER" + GLOBAL_EXECUTION_CLIENT_GOERLI="http://goerli-geth.dappnode:8545" + ;; +esac +export GLOBAL_EXECUTION_CLIENT_GOERLI=$GLOBAL_EXECUTION_CLIENT_GOERLI + +case $_DAPPNODE_GLOBAL_EXECUTION_CLIENT_MAINNET in +"geth.dnp.dappnode.eth") + GLOBAL_EXECUTION_CLIENT_MAINNET="http://geth.dappnode:8545" + ;; +"nethermind.public.dappnode.eth") + GLOBAL_EXECUTION_CLIENT_MAINNET="http://nethermind.public.dappnode:8545" + ;; +"besu.public.dappnode.eth") + GLOBAL_EXECUTION_CLIENT_MAINNET="http://besu.public.dappnode:8545" + ;; +"erigon.dnp.dappnode.eth") + GLOBAL_EXECUTION_CLIENT_MAINNET="http://erigon.dappnode:8545" + ;; +*) + echo "Unknown value for _DAPPNODE_GLOBAL_EXECUTION_CLIENT_MAINNET: $_DAPPNODE_GLOBAL_EXECUTION_CLIENT_MAINNET" + GLOBAL_EXECUTION_CLIENT_MAINNET="http://geth.dappnode:8545" + ;; +esac +export GLOBAL_EXECUTION_CLIENT_MAINNET=$GLOBAL_EXECUTION_CLIENT_MAINNET + + + # Replace domain export DOMAIN=${_DAPPNODE_GLOBAL_DOMAIN} envsubst < /home/app/.pocket/config/config_template.json > /home/app/.pocket/config/config.json From 8d410874cfd090039ff8278bdd967ef9c36365b2 Mon Sep 17 00:00:00 2001 From: Voss Date: Thu, 16 Mar 2023 18:48:11 -0500 Subject: [PATCH 3/5] add global envs test --- dappnode_package.json | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dappnode_package.json b/dappnode_package.json index 64ee78d..f35e404 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,6 +1,6 @@ { "name": "pocket.dnp.dappnode.eth", - "version": "0.1.1", + "version": "0.1.4", "upstreamVersion": "RC-0.9.2", "upstreamRepo": "pokt-network/pocket-core", "upstreamArg": "UPSTREAM_VERSION", diff --git a/docker-compose.yml b/docker-compose.yml index 2f261bc..4bec630 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: "3.4" services: pocket: - image: "pocket.pocket.dnp.dappnode.eth:0.1.0" + image: "pocket.pocket.dnp.dappnode.eth:0.1.4" build: context: pocket args: From 354c2b748d59730cfe2e2b6c8699de723700208d Mon Sep 17 00:00:00 2001 From: Voss Date: Fri, 5 Jan 2024 23:21:19 -0600 Subject: [PATCH 4/5] Update docker-compose.yml --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index c7afc05..7ae01c1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: "3.4" services: pocket: - image: "pocket.pocket.dnp.dappnode.eth:0.1.4" + image: "pocket.pocket.dnp.dappnode.eth:0.1.0" build: context: pocket args: From 42b0e70c8c45f9f48e7616400c1fa8b46a4b6f5c Mon Sep 17 00:00:00 2001 From: Voss Date: Fri, 5 Jan 2024 23:24:10 -0600 Subject: [PATCH 5/5] Update chains_mainnet_template.json --- pocket/chains/chains_mainnet_template.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pocket/chains/chains_mainnet_template.json b/pocket/chains/chains_mainnet_template.json index d70e891..38bd9ef 100644 --- a/pocket/chains/chains_mainnet_template.json +++ b/pocket/chains/chains_mainnet_template.json @@ -21,7 +21,7 @@ }, { "id": "0026", - "url": "${GLOBAL_EXEXUTION_CLIENT_PRATER}" + "url": "${GLOBAL_EXEXUTION_CLIENT_GOERLI}" }, { "id": "0027",