Merge remote-tracking branch 'origin/unstable' into tree-states

scripts/cli.sh

@@ -17,6 +17,9 @@ write_to_file() {
 
     # We need to add the header and the backticks to create the code block.
     printf "# %s\n\n\`\`\`\n%s\n\`\`\`" "$program" "$cmd" > "$file"
+
+    # Adjust the width of the help text and append to the end of file
+    sed -i -e '$a\'$'\n''<style> .content main {max-width:88%;} </style>' "$file"
 }
 
 CMD=./target/release/lighthouse

scripts/local_testnet/README.md

@@ -78,7 +78,7 @@ To view the beacon, validator client and geth logs:
 
 ```bash
 tail -f ~/.lighthouse/local-testnet/testnet/beacon_node_1.log
-taif -f ~/.lighthouse/local-testnet/testnet/validator_node_1.log
+tail -f ~/.lighthouse/local-testnet/testnet/validator_node_1.log
 tail -f ~/.lighthouse/local-testnet/testnet/geth_1.log
 ```
 
@@ -198,4 +198,4 @@ Update the genesis time to now using:
 
 Some addresses in the local testnet are seeded with testnet ETH, allowing users to carry out transactions. To send a transaction, we first add the address to a wallet, such as [Metamask](https://metamask.io/). The private keys for the addresses are listed [here](https://github.com/sigp/lighthouse/blob/441fc1691b69f9edc4bbdc6665f3efab16265c9b/testing/execution_engine_integration/src/execution_engine.rs#L13-L14).
 
-Next, we add the local testnet to Metamask, a brief guide can be found [here](https://support.metamask.io/hc/en-us/articles/360043227612-How-to-add-a-custom-network-RPC). If you start the local testnet with default settings, the network RPC is: http://localhost:6001 and the `Chain ID` is `4242`, as defined in [`vars.env`](https://github.com/sigp/lighthouse/blob/441fc1691b69f9edc4bbdc6665f3efab16265c9b/scripts/local_testnet/vars.env#L42). Once the network and account are added, you should see that the account contains testnet ETH which allow us to carry out transactions. 
+Next, we add the local testnet to Metamask, a brief guide can be found [here](https://support.metamask.io/hc/en-us/articles/360043227612-How-to-add-a-custom-network-RPC). If you start the local testnet with default settings, the network RPC is: http://localhost:6001 and the `Chain ID` is `4242`, as defined in [`vars.env`](https://github.com/sigp/lighthouse/blob/441fc1691b69f9edc4bbdc6665f3efab16265c9b/scripts/local_testnet/vars.env#L42). Once the network and account are added, you should see that the account contains testnet ETH which allow us to carry out transactions. 

scripts/local_testnet/genesis.json

@@ -14,6 +14,7 @@
     "mergeNetsplitBlock": 0,
     "shanghaiTime": 0,
     "cancunTime": 0,
+    "pragueTime": 0,
     "terminalTotalDifficulty": 0,
     "terminalTotalDifficultyPassed": true
   },

scripts/local_testnet/geth.sh

@@ -50,5 +50,4 @@ exec $GETH_BINARY \
     --bootnodes $EL_BOOTNODE_ENODE \
     --port $network_port \
     --http.port $http_port \
-    --authrpc.port $auth_port \
-    2>&1 | tee $data_dir/geth.log
+    --authrpc.port $auth_port

scripts/local_testnet/setup.sh

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

scripts/local_testnet/setup_time.sh

@@ -28,5 +28,8 @@ sed -i 's/"shanghaiTime".*$/"shanghaiTime": '"$CAPELLA_TIME"',/g' $genesis_file
 CANCUN_TIME=$((GENESIS_TIME + (DENEB_FORK_EPOCH * $SLOT_PER_EPOCH * SECONDS_PER_SLOT)))
 echo $CANCUN_TIME
 sed -i 's/"cancunTime".*$/"cancunTime": '"$CANCUN_TIME"',/g' $genesis_file
+PRAGUE_TIME=$((GENESIS_TIME + (ELECTRA_FORK_EPOCH * $SLOT_PER_EPOCH * SECONDS_PER_SLOT)))
+echo $PRAGUE_TIME
+sed -i 's/"pragueTime".*$/"pragueTime": '"$PRAGUE_TIME"',/g' $genesis_file
 cat $genesis_file
 

scripts/local_testnet/start_local_testnet.sh

@@ -103,7 +103,7 @@ echo "executing: ./setup.sh >> $LOG_DIR/setup.log"
 ./setup.sh >> $LOG_DIR/setup.log 2>&1
 
 # Call setup_time.sh to update future hardforks time in the EL genesis file based on the CL genesis time
-./setup_time.sh genesis.json
+./setup_time.sh $genesis_file
 
 # Delay to let boot_enr.yaml to be created
 execute_command_add_PID bootnode.log ./bootnode.sh
@@ -134,6 +134,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
+sed -i 's/"pragueTime".*$/"pragueTime": 0,/g' $genesis_file
 
 for (( bn=1; bn<=$BN_COUNT; bn++ )); do
     secret=$DATADIR/geth_datadir$bn/geth/jwtsecret

scripts/local_testnet/vars.env

@@ -44,8 +44,9 @@ CHAIN_ID=4242
 # Hard fork configuration
 ALTAIR_FORK_EPOCH=0
 BELLATRIX_FORK_EPOCH=0
-CAPELLA_FORK_EPOCH=1
-DENEB_FORK_EPOCH=2
+CAPELLA_FORK_EPOCH=0
+DENEB_FORK_EPOCH=1
+ELECTRA_FORK_EPOCH=9999999
 
 TTD=0
 

scripts/tests/vars.env

@@ -43,6 +43,7 @@ ALTAIR_FORK_EPOCH=0
 BELLATRIX_FORK_EPOCH=0
 CAPELLA_FORK_EPOCH=0
 DENEB_FORK_EPOCH=0
+ELECTRA_FORK_EPOCH=18446744073709551615
 
 TTD=0
 
@@ -63,4 +64,3 @@ BN_ARGS=""
 
 # Enable doppelganger detection
 VC_ARGS=" --enable-doppelganger-protection "
-