Ethereumjs script integration for kiln testnet (#3850)

* Ethereumjs script integration for kiln testnet

* ttd update as the ttd increased mid way

* midway TTD update for kiln

* correct ordering for bootnode with space

kiln/devnets/kiln.vars

@@ -2,6 +2,7 @@ DEVNET_NAME=kiln
 
 GETH_IMAGE=parithoshj/geth:merge-876ca42
 NETHERMIND_IMAGE=nethermindeth/nethermind:kiln_0.6
+ETHEREUMJS_IMAGE=g11tech/ethereumjs:kiln
 LODESTAR_IMAGE=chainsafe/lodestar:next
 CONFIG_GIT_DIR=kiln
 
@@ -11,8 +12,10 @@ LODESTAR_EXTRA_ARGS="--eth1.providerUrls http://127.0.0.1:8545 --execution.urls
 
 LODESTAR_VALIDATOR_ARGS='--network kiln  --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'
 
-NETHERMIND_EXTRA_ARGS="--config kiln --Network.DiscoveryPort=30303 --Network.P2PPort=30303 --Merge.Enabled=true --Merge.TerminalTotalDifficulty=1000000000000 --Init.DiagnosticMode=None --JsonRpc.Enabled=true --JsonRpc.Host=0.0.0.0 --JsonRpc.AdditionalRpcUrls \"http://localhost:8545|http;ws|net;eth;subscribe;engine;web3;client|no-auth,http://localhost:8551|http;ws|net;eth;subscribe;engine;web3;client\""
+NETHERMIND_EXTRA_ARGS="--config kiln --Network.DiscoveryPort=30303 --Network.P2PPort=30303 --Merge.Enabled=true --Merge.TerminalTotalDifficulty=20000000000000 --Init.DiagnosticMode=None --JsonRpc.Enabled=true --JsonRpc.Host=0.0.0.0 --JsonRpc.AdditionalRpcUrls \"http://localhost:8545|http;ws|net;eth;subscribe;engine;web3;client|no-auth,http://localhost:8551|http;ws|net;eth;subscribe;engine;web3;client\""
 
 GETH_EXTRA_ARGS="--http --http.api engine,net,eth --http.port 8545 --allow-insecure-unlock --http.addr 0.0.0.0 --authrpc.port=8551 --networkid 1337802"
 
+ETHEREUMJS_EXTRA_ARGS="--saveReceipts --rpc --rpcport 8545 --ws --rpcEngine --rpcEnginePort=8551 --rpcDebug --loglevel=debug"
+
 EXTRA_BOOTNODES=""

kiln/devnets/setup.sh

@@ -12,17 +12,17 @@ configGitDir=$CONFIG_GIT_DIR
 gethImage=$GETH_IMAGE
 nethermindImage=$NETHERMIND_IMAGE
 
-if [ ! -n "$dataDir" ] || [ ! -n "$devnetVars" ] || ([ "$elClient" != "geth" ] && [ "$elClient" != "nethermind" ]) 
+if [ ! -n "$dataDir" ] || [ ! -n "$devnetVars" ] || ([ "$elClient" != "geth" ] && [ "$elClient" != "nethermind" ] && [ "$elClient" != "ethereumjs" ]) 
 then
-  echo "usage: ./setup.sh --dataDir <data dir> --elClient <geth | nethermind> --devetVars <devnet vars file> [--dockerWithSudo --withTerminal \"gnome-terminal --disable-factory --\"]"
+  echo "usage: ./setup.sh --dataDir <data dir> --elClient <geth | nethermind | ethereumjs> --devetVars <devnet vars file> [--dockerWithSudo --withTerminal \"gnome-terminal --disable-factory --\"]"
   echo "example: ./setup.sh --dataDir kiln-data --elClient nethermind --devnetVars ./kiln.vars --dockerWithSudo --withTerminal \"gnome-terminal --disable-factory --\""
   echo "Note: if running on macOS where gnome-terminal is not available, remove the gnome-terminal related flags."
   echo "example: ./setup.sh --dataDir kiln-data --elClient geth --devnetVars ./kiln.vars"
   exit;
 fi
 
 
-mkdir $dataDir && mkdir $dataDir/lodestar && mkdir $dataDir/geth && mkdir $dataDir/nethermind && 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
+mkdir $dataDir && mkdir $dataDir/lodestar && mkdir $dataDir/geth && mkdir $dataDir/nethermind && mkdir $dataDir/ethereumjs && 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
 
 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)" ]
 then
@@ -74,7 +74,9 @@ fi;
 platform=$(uname)
 bootNode=$(cat $dataDir/$configGitDir/el_bootnode.txt)
 bootNode=($bootNode)
+bootNodeWithSpace=$(IFS=" " ; echo "${bootNode[*]}")
 bootNode=$(IFS=, ; echo "${bootNode[*]}")
+
 if [ "$elClient" == "geth" ]
 then
   echo "gethImage: $GETH_IMAGE"
@@ -105,6 +107,19 @@ then
   else
     elCmd="$dockerCmd --name $elName --network host -v $currentDir/$dataDir/$configGitDir:/config -v $currentDir/$dataDir:/data $NETHERMIND_IMAGE --datadir /data/nethermind  --Init.ChainSpecPath=/config/nethermind_genesis.json --JsonRpc.JwtSecretFile /data/jwtsecret $NETHERMIND_EXTRA_ARGS --Discovery.Bootnodes $EXTRA_BOOTNODES$bootNode"
   fi
+elif [ "$elClient" == "ethereumjs" ] 
+then
+  echo "ethereumjsImage: $ETHEREUMJS_IMAGE"
+  $dockerExec pull $ETHEREUMJS_IMAGE
+
+  elName="$DEVNET_NAME-ethereumjs"
+
+  if [ $platform == 'Darwin' ]
+  then
+    elCmd="$dockerCmd --name $elName -v $currentDir/$dataDir/$configGitDir:/config -v $currentDir/$dataDir:/data $ETHEREUMJS_IMAGE --datadir /data/ethereumjs --gethGenesis /config/genesis.json $ETHEREUMJS_EXTRA_ARGS --bootnodes=$bootNodeWithSpace --jwt-secret /data/jwtsecret"
+  else
+    elCmd="$dockerCmd --name $elName --network host -v $currentDir/$dataDir/$configGitDir:/config -v $currentDir/$dataDir:/data $ETHEREUMJS_IMAGE --datadir /data/ethereumjs --gethGenesis /config/genesis.json $ETHEREUMJS_EXTRA_ARGS --bootnodes=$bootNodeWithSpace --jwt-secret /data/jwtsecret"
+  fi
 fi
 
 echo "lodestarImage: $LODESTAR_IMAGE"

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

@@ -22,7 +22,7 @@ export const kilnChainConfig: IChainConfig = {
   // Bellatrix
   BELLATRIX_FORK_VERSION: b("0x70000071"),
   BELLATRIX_FORK_EPOCH: 150,
-  TERMINAL_TOTAL_DIFFICULTY: BigInt(1000000000000),
+  TERMINAL_TOTAL_DIFFICULTY: BigInt(20000000000000),
   // Sharding
   SHARDING_FORK_VERSION: b("0x03000000"),
   SHARDING_FORK_EPOCH: Infinity,