Merge remote-tracking branch 'origin/deneb-free-blobs' into tree-states

scripts/local_testnet/README.md

@@ -128,3 +128,16 @@ Update the genesis time to now using:
 
 > Note: you probably want to just rerun `./start_local_testnet.sh` to start over
 > but this is another option.
+
+### Testing builder flow
+
+1. Add builder URL to `BN_ARGS` in `./var.env`, e.g. `--builder http://localhost:8650`. Some mock builder server options: 
+    - [`mock-relay`](https://github.com/realbigsean/mock-relay)
+    - [`dummy-builder`](https://github.com/michaelsproul/dummy_builder)
+2. (Optional) Add `--always-prefer-builder-payload` to `BN_ARGS`.
+3. The above mock builders do not support non-mainnet presets as of now, and will require setting `SECONDS_PER_SLOT` and `SECONDS_PER_ETH1_BLOCK` to `12` in `./vars.env`. 
+4. Start the testnet with the following command (the `-p` flag enables the validator client `--builder-proposals` flag:
+    ```bash
+    ./start_local_testnet.sh -p genesis.json
+    ```
+5. Block production using builder flow will start at epoch 4.

scripts/local_testnet/beacon_node.sh

@@ -67,4 +67,5 @@ exec $lighthouse_binary \
 	--target-peers $((BN_COUNT - 1)) \
   --execution-endpoint $execution_endpoint \
   --execution-jwt $execution_jwt \
-  --unsafe-and-dangerous-mode
+  --unsafe-and-dangerous-mode \
+  $BN_ARGS

scripts/local_testnet/genesis.json

@@ -13,6 +13,7 @@
     "londonBlock": 0,
     "mergeNetsplitBlock": 0,
     "shanghaiTime": 0,
+    "cancunTime": 0,
     "terminalTotalDifficulty": 0,
     "terminalTotalDifficultyPassed": true
   },
@@ -858,4 +859,4 @@
   "mixhash": "0x0000000000000000000000000000000000000000000000000000000000000000",
   "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
   "timestamp": "1662465600"
-}
+}

scripts/local_testnet/geth.sh

@@ -33,7 +33,6 @@ http_port=${@:$OPTIND+2:1}
 auth_port=${@:$OPTIND+3:1}
 genesis_file=${@:$OPTIND+4:1}
 
-
 # Init
 $GETH_BINARY init \
     --datadir $data_dir \
@@ -51,4 +50,4 @@ exec $GETH_BINARY \
     --bootnodes $EL_BOOTNODE_ENODE \
     --port $network_port \
     --http.port $http_port \
-    --authrpc.port $auth_port
+    --authrpc.port $auth_port

scripts/local_testnet/setup.sh

@@ -28,6 +28,7 @@ lcli \
 	--altair-fork-epoch $ALTAIR_FORK_EPOCH \
 	--bellatrix-fork-epoch $BELLATRIX_FORK_EPOCH \
 	--capella-fork-epoch $CAPELLA_FORK_EPOCH \
+	--deneb-fork-epoch $DENEB_FORK_EPOCH \
 	--ttd $TTD \
 	--eth1-block-hash $ETH1_BLOCK_HASH \
 	--eth1-id $CHAIN_ID \

scripts/local_testnet/start_local_testnet.sh

@@ -108,11 +108,17 @@ echo $GENESIS_TIME
 CAPELLA_TIME=$((GENESIS_TIME + (CAPELLA_FORK_EPOCH * 32 * SECONDS_PER_SLOT)))
 echo $CAPELLA_TIME
 sed -i 's/"shanghaiTime".*$/"shanghaiTime": '"$CAPELLA_TIME"',/g' $genesis_file
+CANCUN_TIME=$((GENESIS_TIME + (DENEB_FORK_EPOCH * 32 * SECONDS_PER_SLOT)))
+echo $CANCUN_TIME
+sed -i 's/"cancunTime".*$/"cancunTime": '"$CANCUN_TIME"',/g' $genesis_file
 cat $genesis_file
 
 # Delay to let boot_enr.yaml to be created
 execute_command_add_PID bootnode.log ./bootnode.sh
-sleeping 1
+sleeping 3
+
+execute_command_add_PID el_bootnode.log ./el_bootnode.sh
+sleeping 3
 
 execute_command_add_PID el_bootnode.log ./el_bootnode.sh
 sleeping 1
@@ -135,6 +141,7 @@ sleeping 20
 
 # Reset the `genesis.json` config file fork times.
 sed -i 's/"shanghaiTime".*$/"shanghaiTime": 0,/g' $genesis_file
+sed -i 's/"cancunTime".*$/"cancunTime": 0,/g' $genesis_file
 
 for (( bn=1; bn<=$BN_COUNT; bn++ )); do
     secret=$DATADIR/geth_datadir$bn/geth/jwtsecret

scripts/local_testnet/vars.env

@@ -45,6 +45,7 @@ CHAIN_ID=4242
 ALTAIR_FORK_EPOCH=0
 BELLATRIX_FORK_EPOCH=0
 CAPELLA_FORK_EPOCH=1
+DENEB_FORK_EPOCH=2
 
 TTD=0
 
@@ -60,5 +61,8 @@ SECONDS_PER_ETH1_BLOCK=1
 # Proposer score boost percentage
 PROPOSER_SCORE_BOOST=40
 
+# Command line arguments for beacon node client
+BN_ARGS=""
+
 # Command line arguments for validator client
 VC_ARGS=""

scripts/tests/doppelganger_protection.sh

@@ -49,8 +49,6 @@ exit_if_fails ../local_testnet/geth.sh $HOME/.lighthouse/local-testnet/geth_data
 
 sleep 20
 
-echo "Starting local beacon nodes"
-
 exit_if_fails ../local_testnet/beacon_node.sh -d debug $HOME/.lighthouse/local-testnet/node_1 8000 7000 9000 http://localhost:4000 $HOME/.lighthouse/local-testnet/geth_datadir1/geth/jwtsecret &> /dev/null &
 exit_if_fails ../local_testnet/beacon_node.sh $HOME/.lighthouse/local-testnet/node_2 8100 7100 9100 http://localhost:4100 $HOME/.lighthouse/local-testnet/geth_datadir2/geth/jwtsecret &> /dev/null &
 exit_if_fails ../local_testnet/beacon_node.sh $HOME/.lighthouse/local-testnet/node_3 8200 7200 9200 http://localhost:4200 $HOME/.lighthouse/local-testnet/geth_datadir3/geth/jwtsecret &> /dev/null &

scripts/tests/genesis.json

@@ -12,10 +12,15 @@
     "berlinBlock": 0,
     "londonBlock": 0,
     "mergeForkBlock": 0,
+    "shanghaiTime": 0,
+    "shardingForkTime": 0,
     "terminalTotalDifficulty": 0,
     "terminalTotalDifficultyPassed": true
   },
   "alloc": {
+    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+      "balance": "0x6d6172697573766477000000"
+    },
     "0x0000000000000000000000000000000000000000": {
       "balance": "1"
     },
@@ -848,4 +853,4 @@
   "mixhash": "0x0000000000000000000000000000000000000000000000000000000000000000",
   "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
   "timestamp": "1662465600"
-}
+}

scripts/tests/vars.env

@@ -16,7 +16,7 @@ DEPOSIT_CONTRACT_ADDRESS=4242424242424242424242424242424242424242
 GENESIS_FORK_VERSION=0x42424242
 
 # Block hash generated from genesis.json in directory
-ETH1_BLOCK_HASH=16ef16304456fdacdeb272bd70207021031db355ed6c5e44ebd34c1ab757e221
+ETH1_BLOCK_HASH=add7865f8346031c72287e2edc4a4952fd34fc0a8642403e8c1bce67f215c92b
 
 VALIDATOR_COUNT=80
 GENESIS_VALIDATOR_COUNT=80
@@ -41,7 +41,7 @@ CHAIN_ID=4242
 # Hard fork configuration
 ALTAIR_FORK_EPOCH=0
 BELLATRIX_FORK_EPOCH=0
-CAPELLA_FORK_EPOCH=18446744073709551615
+CAPELLA_FORK_EPOCH=1
 DENEB_FORK_EPOCH=18446744073709551615
 
 TTD=0
@@ -58,5 +58,8 @@ SECONDS_PER_ETH1_BLOCK=1
 # Proposer score boost percentage
 PROPOSER_SCORE_BOOST=70
 
+# Command line arguments for beacon node client
+BN_ARGS=""
+
 # Enable doppelganger detection
 VC_ARGS=" --enable-doppelganger-protection "