Update mainnet shadow fork 6 and ropsten configs and images

kiln/devnets/kiln.vars

@@ -5,8 +5,8 @@ MERGE_TTD=20000000000000
 
 JWT_SECRET="0xdc6457099f127cf0bac78de8b297df04951281909db4f58b43def7c7151e765d"
 
-GETH_IMAGE=parithoshj/geth:master
-NETHERMIND_IMAGE=nethermindeth/nethermind:kiln_0.12
+GETH_IMAGE=ethereum/client-go:latest
+NETHERMIND_IMAGE=nethermind/nethermind:latest
 ETHEREUMJS_IMAGE=g11tech/ethereumjs:kiln
 BESU_IMAGE=hyperledger/besu:develop
 

kiln/devnets/mainnetshadow-5.vars → kiln/devnets/mainnetshadow-6.vars

@@ -1,20 +1,20 @@
-DEVNET_NAME=mainnet-shadow-fork-5
-CONFIG_GIT_DIR=mainnet-shadow-fork-5
+DEVNET_NAME=mainnet-shadow-fork-6
+CONFIG_GIT_DIR=mainnet-shadow-fork-6
 NETWORK_ID=1
-MERGE_TTD=49407055721335634264064
+MERGE_TTD=50468767937878607003648
 
 JWT_SECRET="0xdc6457099f127cf0bac78de8b297df04951281909db4f58b43def7c7151e765d"
 
-GETH_IMAGE=parithoshj/geth:master
-NETHERMIND_IMAGE=nethermindeth/nethermind:kiln_shadowfork
+GETH_IMAGE=ethereum/client-go:latest
+NETHERMIND_IMAGE=nethermind/nethermind:latest
 ETHEREUMJS_IMAGE=g11tech/ethereumjs:kiln
 BESU_IMAGE=hyperledger/besu:develop
 
 LODESTAR_IMAGE=chainsafe/lodestar:next
 
 LODESTAR_EXTRA_ARGS="--terminal-total-difficulty-override $MERGE_TTD $LODESTAR_FIXED_VARS"
 
-LODESTAR_VALIDATOR_ARGS="--network ropsten --terminal-total-difficulty-override $MERGE_TTD --fromMnemonic \"lens risk clerk foot verb planet drill roof boost aim salt omit celery tube list permit motor obvious flash demise churn hold wave hollow\" --mnemonicIndexes 0..5 $LODESTAR_VAL_FIXED_VARS"
+LODESTAR_VALIDATOR_ARGS="--network ropsten --fromMnemonic \"lens risk clerk foot verb planet drill roof boost aim salt omit celery tube list permit motor obvious flash demise churn hold wave hollow\" --mnemonicIndexes 0..5 $LODESTAR_VAL_FIXED_VARS"
 
 NETHERMIND_EXTRA_ARGS="--config mainnet_shadowfork  --Merge.TerminalTotalDifficulty=$MERGE_TTD $NETHERMIND_FIXED_VARS"
 

kiln/devnets/ropsten.vars

@@ -2,13 +2,13 @@ DEVNET_NAME=ropsten
 # Empty config git dir will be assumed to be clients having bakedin configs
 CONFIG_GIT_DIR=
 NETWORK_ID=3
-MERGE_TTD=100000000000000000000000
+MERGE_TTD=50000000000000000
 
 # This will be available in /data/jwtsecret
 JWT_SECRET="0xdc6457099f127cf0bac78de8b297df04951281909db4f58b43def7c7151e765d"
 
-GETH_IMAGE=parithoshj/geth:master
-NETHERMIND_IMAGE=nethermindeth/nethermind:kiln_shadowfork
+GETH_IMAGE=ethereum/client-go:latest
+NETHERMIND_IMAGE=nethermind/nethermind:latest
 ETHEREUMJS_IMAGE=g11tech/ethereumjs:kiln
 BESU_IMAGE=hyperledger/besu:develop
 

kiln/devnets/setup.sh

@@ -32,12 +32,16 @@ then
     cd $dataDir && git init && git remote add -f origin $setupConfigUrl && git config core.sparseCheckout true && echo "$configGitDir/*" >> .git/info/sparse-checkout && git pull --depth=1 origin main && cd $currentDir
   fi;
 
-  if [ ! -n "$(ls -A $dataDir/$configGitDir)" ] || [ ! -n "$(ls -A $dataDir/$configGitDir/genesis.json)" ] || [ ! -n "$(ls -A $dataDir/$configGitDir/genesis.ssz)" ] || [ ! -n "$(ls -A $dataDir/$configGitDir/nethermind_genesis.json)" ] || [ ! -n "$(ls -A $dataDir/$configGitDir/el_bootnode.txt)" ] || [ ! -n "$(ls -A $dataDir/$configGitDir/bootstrap_nodes.txt)" ]
+  if [ ! -n "$(ls -A $dataDir/$configGitDir)" ] || [ ! -n "$(ls -A $dataDir/$configGitDir/genesis.json)" ] || [ ! -n "$(ls -A $dataDir/$configGitDir/genesis.ssz)" ] || [ ! -n "$(ls -A $dataDir/$configGitDir/nethermind_genesis.json)" ] || [ ! -n "$(ls -A $dataDir/$configGitDir/el_bootnode.txt)" ] || ( [ ! -n "$(ls -A $dataDir/$configGitDir/bootstrap_nodes.txt)" ] && [ ! -n "$(ls -A $dataDir/$configGitDir/boot_enr.yaml)" ] )
   then
     echo "Configuration directory not setup properly, remove the data directory and run again."
     echo "exiting ..."
     exit;
   else 
+    if [ ! -n "$(ls -A $dataDir/$configGitDir/boot_enr.yaml)" ]
+    then
+      cp $dataDir/$configGitDir/bootstrap_nodes.txt $dataDir/$configGitDir/boot_enr.yaml
+    fi;
     echo "Configuration discovered!"
   fi;
 

kiln/gethdocker/README.md

@@ -1,16 +1,15 @@
 # Geth Docker setup for running the sim merge tests on local machine
 
-###### Build geth docker image
-Or directly use a compatible pre-build image (checkout `./Dockerfile` for the compatible branch of `geth`)
+###### Geth docker image
+Pull the latest `geth` image from the dockerhub
 
 ```bash
-cd kiln/gethdocker
-docker build  . --tag geth:kiln
+docker pull ethereum/client-go:latest
 ```
 
 ###### Run test scripts
 
 ```bash
 cd packages/lodestar
-EL_BINARY_DIR=geth:kiln EL_SCRIPT_DIR=kiln/gethdocker ETH_PORT=8545 ENGINE_PORT=8551 TX_SCENARIOS=simple yarn mocha test/sim/merge-interop.test.ts
+EL_BINARY_DIR=ethereum/client-go:latest EL_SCRIPT_DIR=kiln/gethdocker ETH_PORT=8545 ENGINE_PORT=8551 TX_SCENARIOS=simple yarn mocha test/sim/merge-interop.test.ts
 ```

packages/config/src/chainConfig/networks/ropsten.ts

@@ -26,7 +26,7 @@ export const ropstenChainConfig: IChainConfig = {
   // # Merge
   BELLATRIX_FORK_VERSION: b("0x80000071"),
   BELLATRIX_FORK_EPOCH: 750,
-  TERMINAL_TOTAL_DIFFICULTY: BigInt("100000000000000000000000"),
+  TERMINAL_TOTAL_DIFFICULTY: BigInt("50000000000000000"),
   // # Sharding
   SHARDING_FORK_VERSION: b("0x03001020"),
   SHARDING_FORK_EPOCH: Infinity,