From eb9327a1d29098a63d1ecca0840dd55a71f99db6 Mon Sep 17 00:00:00 2001 From: dappnodedev Date: Fri, 27 Sep 2024 12:33:00 +0200 Subject: [PATCH 1/4] Bump upstream to 5.1.0 --- dappnode_package.json | 2 +- docker-compose.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dappnode_package.json b/dappnode_package.json index 890b64c..5c7f0be 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -2,7 +2,7 @@ "upstream": [ { "repo": "prysmaticlabs/prysm", - "version": "v5.0.4", + "version": "v5.1.0", "arg": "UPSTREAM_VERSION" }, { diff --git a/docker-compose.yml b/docker-compose.yml index 3f2df4d..c549a3d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,7 +4,7 @@ services: build: context: beacon-chain args: - UPSTREAM_VERSION: v5.0.4 + UPSTREAM_VERSION: v5.1.0 STAKER_SCRIPTS_VERSION: v0.1.0 DATA_DIR: /data volumes: @@ -22,7 +22,7 @@ services: build: context: validator args: - UPSTREAM_VERSION: v5.0.4 + UPSTREAM_VERSION: v5.1.0 STAKER_SCRIPTS_VERSION: v0.1.0 DATA_DIR: /root/.eth2validators volumes: From c7460f5ae711940598488045f32b37b7bbd17b2a Mon Sep 17 00:00:00 2001 From: dappnodedev Date: Fri, 27 Sep 2024 12:34:10 +0200 Subject: [PATCH 2/4] Update auth token --- validator/auth-token | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/validator/auth-token b/validator/auth-token index 783a085..7e67bca 100644 --- a/validator/auth-token +++ b/validator/auth-token @@ -1,2 +1 @@ -b5bbbaf533b625a93741978857f13d7adeca58445a1fb00ecf3373420b92776c -eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.e30.MxwOozSH-TLbW_XKepjyYDHm2IT8Ki0tD3AHuajfNMg \ No newline at end of file +0xd59b8238ecaeb255d62c85c6ca8aee185870bd7a27e43f85fd2658267036d94a \ No newline at end of file From 58585cc1a31aa4618cd4717bb7ed2bea941a63f2 Mon Sep 17 00:00:00 2001 From: dappnodedev Date: Fri, 27 Sep 2024 12:51:59 +0200 Subject: [PATCH 3/4] Add web3signer optional dependency --- package_variants/holesky/dappnode_package.json | 3 ++- package_variants/lukso/dappnode_package.json | 3 ++- package_variants/mainnet/dappnode_package.json | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package_variants/holesky/dappnode_package.json b/package_variants/holesky/dappnode_package.json index 1fb81e9..82d8a62 100644 --- a/package_variants/holesky/dappnode_package.json +++ b/package_variants/holesky/dappnode_package.json @@ -17,6 +17,7 @@ "holesky-geth.dnp.dappnode.eth": ">=1.0.1", "holesky-nethermind.dnp.dappnode.eth": ">=0.1.10", "holesky-besu.dnp.dappnode.eth": ">=0.1.2", - "holesky-erigon.dnp.dappnode.eth": ">=0.1.2" + "holesky-erigon.dnp.dappnode.eth": ">=0.1.2", + "web3signer-holesky.dnp.dappnode.eth": ">=0.1.7" } } diff --git a/package_variants/lukso/dappnode_package.json b/package_variants/lukso/dappnode_package.json index 34b04a2..ab0bcb6 100644 --- a/package_variants/lukso/dappnode_package.json +++ b/package_variants/lukso/dappnode_package.json @@ -8,6 +8,7 @@ "docs": "https://docs.prylabs.network/docs/getting-started" }, "optionalDependencies": { - "lukso-geth.dnp.dappnode.eth": ">=0.1.3" + "lukso-geth.dnp.dappnode.eth": ">=0.1.3", + "web3signer-lukso.dnp.dappnode.eth": ">=0.1.3" } } diff --git a/package_variants/mainnet/dappnode_package.json b/package_variants/mainnet/dappnode_package.json index 459244c..e07a6d5 100644 --- a/package_variants/mainnet/dappnode_package.json +++ b/package_variants/mainnet/dappnode_package.json @@ -18,6 +18,7 @@ "geth.dnp.dappnode.eth": ">=0.1.44", "nethermind.public.dappnode.eth": ">=1.0.53", "besu.public.dappnode.eth": ">=1.2.11", - "erigon.dnp.dappnode.eth": ">=0.1.44" + "erigon.dnp.dappnode.eth": ">=0.1.44", + "web3signer.dnp.dappnode.eth": ">=2.0.9" } } From c5e9ee129be9456f145beb95a410e87b886ea4b5 Mon Sep 17 00:00:00 2001 From: Marketen Date: Fri, 27 Sep 2024 12:54:43 +0200 Subject: [PATCH 4/4] rename flags --- beacon-chain/entrypoint.sh | 6 +++--- validator/entrypoint.sh | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/beacon-chain/entrypoint.sh b/beacon-chain/entrypoint.sh index a89e686..2e4e0a5 100755 --- a/beacon-chain/entrypoint.sh +++ b/beacon-chain/entrypoint.sh @@ -66,9 +66,9 @@ FLAGS="--accept-terms-of-use \ --jwt-secret=$JWT_FILE_PATH \ --execution-endpoint=$ENGINE_URL \ --monitoring-host=0.0.0.0 \ - --grpc-gateway-host=0.0.0.0 \ - --grpc-gateway-port=$BEACON_API_PORT \ - --grpc-gateway-corsdomain=$CORSDOMAIN \ + --http-host=0.0.0.0 \ + --http-port=$BEACON_API_PORT \ + --http-cors-domain=$CORSDOMAIN \ --rpc-host=0.0.0.0 \ --verbosity=$VERBOSITY \ --p2p-tcp-port=$P2P_TCP_PORT \ diff --git a/validator/entrypoint.sh b/validator/entrypoint.sh index 4cec0af..c2e6fa0 100755 --- a/validator/entrypoint.sh +++ b/validator/entrypoint.sh @@ -52,9 +52,9 @@ FLAGS="--datadir=$DATA_DIR \ --beacon-rpc-provider=$BEACON_RPC_PROVIDER \ --beacon-rpc-gateway-provider=$BEACON_RPC_GATEWAY_PROVIDER \ --validators-external-signer-url=$SIGNER_API_URL \ - --grpc-gateway-host=0.0.0.0 \ - --grpc-gateway-port=$VALIDATOR_API_PORT \ - --grpc-gateway-corsdomain=http://0.0.0.0:$VALIDATOR_API_PORT \ + --http-host=0.0.0.0 \ + --http-port=$VALIDATOR_API_PORT \ + --http-cors-domain=http://0.0.0.0:$VALIDATOR_API_PORT \ --graffiti=$VALID_GRAFFITI \ --suggested-fee-recipient=$VALID_FEE_RECIPIENT \ --verbosity=$VERBOSITY \