diff --git a/.gitignore b/.gitignore index d12bb78..6354aab 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ consensus/genesis.ssz consensus/validatordata execution/geth execution/geth.ipc +execution/genesis.json .idea/ diff --git a/consensus/config.yml b/consensus/config.yml index 372cd8f..fa77db4 100644 --- a/consensus/config.yml +++ b/consensus/config.yml @@ -18,6 +18,7 @@ CAPELLA_FORK_EPOCH: 0 CAPELLA_FORK_VERSION: 0x20000092 MAX_WITHDRAWALS_PER_PAYLOAD: 16 +DENEB_FORK_EPOCH: 0 DENEB_FORK_VERSION: 0x20000093 # Time parameters diff --git a/docker-compose.yml b/docker-compose.yml index cb6c51d..ec55842 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,11 +3,11 @@ services: # Creates a genesis state for the beacon chain using a YAML configuration file and # a deterministic set of 64 validators. create-beacon-chain-genesis: - image: "gcr.io/prysmaticlabs/prysm/cmd/prysmctl" + image: "gcr.io/prysmaticlabs/prysm/cmd/prysmctl:latest" command: - testnet - generate-genesis - - --fork=capella + - --fork=deneb - --num-validators=64 - --genesis-time-delay=15 - --output-ssz=/consensus/genesis.ssz @@ -21,7 +21,7 @@ services: # Removes the database of the go-ethereum execution client to ensure we start from a clean state. # (geth has a `removedb` option, but it asks for a keyboard confirmation, so we use this instead) geth-remove-db: - image: "alpine:3.19.0" + image: "alpine:latest" command: rm -rf /execution/geth volumes: - ./execution:/execution @@ -44,7 +44,7 @@ services: # The account used in go-ethereum is set as the suggested fee recipient for transactions # proposed via the validators attached to the beacon node. beacon-chain: - image: "gcr.io/prysmaticlabs/prysm/beacon-chain:v4.1.1" + image: "gcr.io/prysmaticlabs/prysm/beacon-chain:stable" command: - --datadir=/consensus/beacondata # No peers to sync with in this testnet, so setting to 0 @@ -119,7 +119,7 @@ services: # We run a validator client with 64, deterministically-generated keys that match # The validator keys present in the beacon chain genesis state generated a few steps above. validator: - image: "gcr.io/prysmaticlabs/prysm/validator:v4.1.1" + image: "gcr.io/prysmaticlabs/prysm/validator:stable" command: - --beacon-rpc-provider=beacon-chain:4000 - --datadir=/consensus/validatordata diff --git a/execution/genesis.json b/execution/genesis.json index d9c7792..71eaad5 100644 --- a/execution/genesis.json +++ b/execution/genesis.json @@ -15,7 +15,8 @@ "londonBlock": 0, "arrowGlacierBlock": 0, "grayGlacierBlock": 0, - "shanghaiTime": 1694203366, + "shanghaiTime": 1706778826, + "cancunTime": 1706778826, "terminalTotalDifficulty": 0, "terminalTotalDifficultyPassed": true },