diff --git a/dappnode_package.json b/dappnode_package.json index e0d694e..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" } ], @@ -45,5 +45,12 @@ "sequencer" ] } + ], + "backup": [ + { + "name": "keystore", + "path": "/keystore", + "service": "sequencer" + } ] } \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 6ac77f3..cc77171 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,14 +4,18 @@ services: build: context: sequencer args: - UPSTREAM_VERSION: v2.1.2 + UPSTREAM_VERSION: v2.1.3 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..5a7f4e6 --- /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://execution.mainnet.dncore.dappnode:8545 + 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 b0fdbf0..975aa24 100644 --- a/package_variants/sepolia/docker-compose.yml +++ b/package_variants/sepolia/docker-compose.yml @@ -5,8 +5,9 @@ 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:8545 + L1_CONSENSUS_HOST_URLS: http://beacon-chain.sepolia.dncore.dappnode:3500 + P2P_PORT: 40401 ports: - - 40400:40400/tcp - - 40400:40400/udp + - 40401:40401/tcp + - 40401:40401/udp 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 ffab838..85261e4 100644 --- a/setup-wizard.yml +++ b/setup-wizard.yml @@ -28,9 +28,9 @@ 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 + required: false secret: true pattern: '^0x[a-fA-F0-9]{64}$' patternErrorMessage: "Please enter a valid private key (0x followed by 64 hexadecimal characters)" @@ -40,8 +40,8 @@ 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 + required: false pattern: '^0x[a-fA-F0-9]{40}$' patternErrorMessage: "Please enter a valid Ethereum address (0x followed by 40 hexadecimal characters)"