From 278f471154ca8aac6e3cb179498a0cee04161dab Mon Sep 17 00:00:00 2001 From: hcastc00 Date: Tue, 11 Nov 2025 14:41:43 +0100 Subject: [PATCH 1/4] Added mainnet variant - Modified P2P in testnet so both networks can run in same host - Added Keystore docker volume --- docker-compose.yml | 4 ++++ package_variants/mainnet/dappnode_package.json | 4 ++++ package_variants/mainnet/docker-compose.yml | 12 ++++++++++++ package_variants/sepolia/docker-compose.yml | 5 +++-- 4 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 package_variants/mainnet/dappnode_package.json create mode 100644 package_variants/mainnet/docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml index 6ac77f3..6cac261 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,10 +8,14 @@ services: DATA_DIRECTORY: /data volumes: - sequencer-data:/data + - keystore-data:/keystore environment: + KEY_STORE_DIRECTORY: /keystore + DATA_DIRECTORY: /data COINBASE: "" VALIDATOR_PRIVATE_KEYS: "" LOG_LEVEL: info restart: unless-stopped volumes: sequencer-data: {} + keystore-data: {} diff --git a/package_variants/mainnet/dappnode_package.json b/package_variants/mainnet/dappnode_package.json new file mode 100644 index 0000000..558f653 --- /dev/null +++ b/package_variants/mainnet/dappnode_package.json @@ -0,0 +1,4 @@ +{ + "name": "aztec.dnp.dappnode.eth", + "version": "0.1.0" +} diff --git a/package_variants/mainnet/docker-compose.yml b/package_variants/mainnet/docker-compose.yml new file mode 100644 index 0000000..faa457a --- /dev/null +++ b/package_variants/mainnet/docker-compose.yml @@ -0,0 +1,12 @@ +version: "3.5" +services: + sequencer: + build: + args: + NETWORK: "mainnet" + environment: + ETHEREUM_HOSTS: http://geth.dappnode:8545 + L1_CONSENSUS_HOST_URLS: http://prysm.dappnode:3500 + ports: + - 40400:40400/tcp + - 40400:40400/udp diff --git a/package_variants/sepolia/docker-compose.yml b/package_variants/sepolia/docker-compose.yml index b0fdbf0..3f1d016 100644 --- a/package_variants/sepolia/docker-compose.yml +++ b/package_variants/sepolia/docker-compose.yml @@ -7,6 +7,7 @@ services: environment: ETHEREUM_HOSTS: http://geth.sepolia-geth.dappnode:8545 L1_CONSENSUS_HOST_URLS: http://prysm-sepolia.dappnode:3500 + P2P_PORT: 40401 ports: - - 40400:40400/tcp - - 40400:40400/udp + - 40401:40401/tcp + - 40401:40401/udp From 63693f7232403061e723115773de7814c2b81b88 Mon Sep 17 00:00:00 2001 From: hcastc00 Date: Wed, 12 Nov 2025 12:21:14 +0100 Subject: [PATCH 2/4] Added backup for keystore - Added generic URL for consensus and execution clients --- dappnode_package.json | 7 +++++++ package_variants/mainnet/docker-compose.yml | 4 ++-- package_variants/sepolia/docker-compose.yml | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dappnode_package.json b/dappnode_package.json index e0d694e..d6e1b7c 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -45,5 +45,12 @@ "sequencer" ] } + ], + "backup": [ + { + "name": "keystore", + "path": "/keystore", + "service": "sequencer" + } ] } \ No newline at end of file diff --git a/package_variants/mainnet/docker-compose.yml b/package_variants/mainnet/docker-compose.yml index faa457a..a2658a2 100644 --- a/package_variants/mainnet/docker-compose.yml +++ b/package_variants/mainnet/docker-compose.yml @@ -5,8 +5,8 @@ services: args: NETWORK: "mainnet" environment: - ETHEREUM_HOSTS: http://geth.dappnode:8545 - L1_CONSENSUS_HOST_URLS: http://prysm.dappnode:3500 + ETHEREUM_HOSTS: http://execution.mainnet.dncore.dappnode:8555 + L1_CONSENSUS_HOST_URLS: http://beacon-chain.mainnet.dncore.dappnode:3500 ports: - 40400:40400/tcp - 40400:40400/udp diff --git a/package_variants/sepolia/docker-compose.yml b/package_variants/sepolia/docker-compose.yml index 3f1d016..bca39d6 100644 --- a/package_variants/sepolia/docker-compose.yml +++ b/package_variants/sepolia/docker-compose.yml @@ -5,8 +5,8 @@ services: args: NETWORK: "testnet" environment: - ETHEREUM_HOSTS: http://geth.sepolia-geth.dappnode:8545 - L1_CONSENSUS_HOST_URLS: http://prysm-sepolia.dappnode:3500 + ETHEREUM_HOSTS: http://execution.sepolia.dncore.dappnode:8555 + L1_CONSENSUS_HOST_URLS: http://beacon-chain.sepolia.dncore.dappnode:3500 P2P_PORT: 40401 ports: - 40401:40401/tcp From af48ab1f6804b07e6ea1963afc81701d8defc934 Mon Sep 17 00:00:00 2001 From: hcastc00 Date: Wed, 12 Nov 2025 12:44:33 +0100 Subject: [PATCH 3/4] Bump to v2.1.3 - Deprecated ENVs for Coinbase and PK - Fix execution client port --- dappnode_package.json | 2 +- docker-compose.yml | 2 +- package_variants/mainnet/docker-compose.yml | 2 +- package_variants/sepolia/docker-compose.yml | 2 +- setup-wizard.yml | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dappnode_package.json b/dappnode_package.json index d6e1b7c..f9908f3 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -2,7 +2,7 @@ "upstream": [ { "repo": "AztecProtocol/aztec-packages", - "version": "v2.1.2", + "version": "v2.1.3", "arg": "UPSTREAM_VERSION" } ], diff --git a/docker-compose.yml b/docker-compose.yml index 6cac261..cc77171 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,7 +4,7 @@ services: build: context: sequencer args: - UPSTREAM_VERSION: v2.1.2 + UPSTREAM_VERSION: v2.1.3 DATA_DIRECTORY: /data volumes: - sequencer-data:/data diff --git a/package_variants/mainnet/docker-compose.yml b/package_variants/mainnet/docker-compose.yml index a2658a2..5a7f4e6 100644 --- a/package_variants/mainnet/docker-compose.yml +++ b/package_variants/mainnet/docker-compose.yml @@ -5,7 +5,7 @@ services: args: NETWORK: "mainnet" environment: - ETHEREUM_HOSTS: http://execution.mainnet.dncore.dappnode:8555 + ETHEREUM_HOSTS: http://execution.mainnet.dncore.dappnode:8545 L1_CONSENSUS_HOST_URLS: http://beacon-chain.mainnet.dncore.dappnode:3500 ports: - 40400:40400/tcp diff --git a/package_variants/sepolia/docker-compose.yml b/package_variants/sepolia/docker-compose.yml index bca39d6..975aa24 100644 --- a/package_variants/sepolia/docker-compose.yml +++ b/package_variants/sepolia/docker-compose.yml @@ -5,7 +5,7 @@ services: args: NETWORK: "testnet" environment: - ETHEREUM_HOSTS: http://execution.sepolia.dncore.dappnode:8555 + ETHEREUM_HOSTS: http://execution.sepolia.dncore.dappnode:8545 L1_CONSENSUS_HOST_URLS: http://beacon-chain.sepolia.dncore.dappnode:3500 P2P_PORT: 40401 ports: diff --git a/setup-wizard.yml b/setup-wizard.yml index ffab838..f612d65 100644 --- a/setup-wizard.yml +++ b/setup-wizard.yml @@ -28,7 +28,7 @@ fields: type: environment name: VALIDATOR_PRIVATE_KEYS service: [sequencer] - title: Validator Private Key + title: Validator Private Key - DEPRECATED, just for backup purposes description: "Private key of testnet L1 EOA that holds Sepolia ETH (0.01 Sepolia ETH can get you started)" required: true secret: true @@ -40,7 +40,7 @@ fields: type: environment name: COINBASE service: [sequencer] - title: Coinbase Address + title: Coinbase Address - DEPRECATED, just for backup purposes description: "Recipient of block rewards (for node security on mainnet, this should be a different address to the validator eoa)" required: true pattern: '^0x[a-fA-F0-9]{40}$' From dbc28d0a6143bca21c132ece8cf5661b9cfe0c79 Mon Sep 17 00:00:00 2001 From: hcastc00 Date: Wed, 12 Nov 2025 13:21:45 +0100 Subject: [PATCH 4/4] Deprecated ENVs for Coinbase and PK --- sequencer/entrypoint.sh | 2 -- setup-wizard.yml | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sequencer/entrypoint.sh b/sequencer/entrypoint.sh index 9793666..c4be936 100644 --- a/sequencer/entrypoint.sh +++ b/sequencer/entrypoint.sh @@ -4,8 +4,6 @@ set -euo pipefail # — Required environment variables : "${ETHEREUM_HOSTS?Need to set ETHEREUM_HOSTS}" : "${L1_CONSENSUS_HOST_URLS?Need to set L1_CONSENSUS_HOST_URLS}" -: "${VALIDATOR_PRIVATE_KEYS?Need to set VALIDATOR_PRIVATE_KEYS}" -: "${COINBASE?Need to set COINBASE}" : "${_DAPPNODE_GLOBAL_PUBLIC_IP?Need to set _DAPPNODE_GLOBAL_PUBLIC_IP (your public IP)}" : "${NETWORK?Need to set NETWORK (build arg)}" : "${LOG_LEVEL:=info}" diff --git a/setup-wizard.yml b/setup-wizard.yml index f612d65..85261e4 100644 --- a/setup-wizard.yml +++ b/setup-wizard.yml @@ -30,7 +30,7 @@ fields: service: [sequencer] title: Validator Private Key - DEPRECATED, just for backup purposes description: "Private key of testnet L1 EOA that holds Sepolia ETH (0.01 Sepolia ETH can get you started)" - required: true + required: false secret: true pattern: '^0x[a-fA-F0-9]{64}$' patternErrorMessage: "Please enter a valid private key (0x followed by 64 hexadecimal characters)" @@ -42,6 +42,6 @@ fields: service: [sequencer] title: Coinbase Address - DEPRECATED, just for backup purposes description: "Recipient of block rewards (for node security on mainnet, this should be a different address to the validator eoa)" - required: true + required: false pattern: '^0x[a-fA-F0-9]{40}$' patternErrorMessage: "Please enter a valid Ethereum address (0x followed by 40 hexadecimal characters)"