From 73104a10df9cfa7af3f46390c7fddca0b3eff93b Mon Sep 17 00:00:00 2001 From: harkamal Date: Wed, 8 Jun 2022 18:53:03 +0530 Subject: [PATCH 1/4] mainnet shadow fork 6 config with small robustness update for cl --- .../{mainnetshadow-5.vars => mainnetshadow-6.vars} | 8 ++++---- kiln/devnets/setup.sh | 6 +++++- 2 files changed, 9 insertions(+), 5 deletions(-) rename kiln/devnets/{mainnetshadow-5.vars => mainnetshadow-6.vars} (65%) diff --git a/kiln/devnets/mainnetshadow-5.vars b/kiln/devnets/mainnetshadow-6.vars similarity index 65% rename from kiln/devnets/mainnetshadow-5.vars rename to kiln/devnets/mainnetshadow-6.vars index 9d08b257415a..b56cf128c71f 100644 --- a/kiln/devnets/mainnetshadow-5.vars +++ b/kiln/devnets/mainnetshadow-6.vars @@ -1,7 +1,7 @@ -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" @@ -14,7 +14,7 @@ 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" diff --git a/kiln/devnets/setup.sh b/kiln/devnets/setup.sh index 214e9136e9c1..e00f74ad5b46 100755 --- a/kiln/devnets/setup.sh +++ b/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; From ffff75a163ee3372c6475341255a3fc63778d6a8 Mon Sep 17 00:00:00 2001 From: harkamal Date: Wed, 8 Jun 2022 19:06:47 +0530 Subject: [PATCH 2/4] config and image update --- kiln/devnets/kiln.vars | 4 ++-- kiln/devnets/mainnetshadow-6.vars | 4 ++-- kiln/devnets/ropsten.vars | 6 +++--- packages/config/src/chainConfig/networks/ropsten.ts | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/kiln/devnets/kiln.vars b/kiln/devnets/kiln.vars index 4b5197020bfb..877afc8741c7 100644 --- a/kiln/devnets/kiln.vars +++ b/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 diff --git a/kiln/devnets/mainnetshadow-6.vars b/kiln/devnets/mainnetshadow-6.vars index b56cf128c71f..be28f46ccd6e 100644 --- a/kiln/devnets/mainnetshadow-6.vars +++ b/kiln/devnets/mainnetshadow-6.vars @@ -5,8 +5,8 @@ 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 diff --git a/kiln/devnets/ropsten.vars b/kiln/devnets/ropsten.vars index 12673e4911eb..300a4f69dbbf 100644 --- a/kiln/devnets/ropsten.vars +++ b/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 diff --git a/packages/config/src/chainConfig/networks/ropsten.ts b/packages/config/src/chainConfig/networks/ropsten.ts index 7dd2a8861c83..b2e5c52f883d 100644 --- a/packages/config/src/chainConfig/networks/ropsten.ts +++ b/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, From b37c21ca24d0f8d0d3fca91826135f0417de3d03 Mon Sep 17 00:00:00 2001 From: harkamal Date: Wed, 8 Jun 2022 19:36:11 +0530 Subject: [PATCH 3/4] update readme with the standard geth image --- kiln/gethdocker/README.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/kiln/gethdocker/README.md b/kiln/gethdocker/README.md index 5ad55f60edf9..0cbe5bbc74b9 100644 --- a/kiln/gethdocker/README.md +++ b/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 ``` From 8c16c06c759dc71eaffb52ec05abf353ff81b532 Mon Sep 17 00:00:00 2001 From: harkamal Date: Wed, 8 Jun 2022 19:37:48 +0530 Subject: [PATCH 4/4] remove the custom dockerfile --- kiln/gethdocker/Dockerfile | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 kiln/gethdocker/Dockerfile diff --git a/kiln/gethdocker/Dockerfile b/kiln/gethdocker/Dockerfile deleted file mode 100644 index 31c656d6d1f6..000000000000 --- a/kiln/gethdocker/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -# Build Geth in a stock Go builder container -FROM golang:1.17-alpine as builder - -RUN apk add --no-cache gcc musl-dev linux-headers git bash - -RUN git clone --depth 1 -b master https://github.com/ethereum/go-ethereum /go-ethereum -RUN cd /go-ethereum && go run build/ci.go install ./cmd/geth - -FROM alpine:latest -COPY --from=builder /go-ethereum/build/bin/geth /usr/local/bin/ - -EXPOSE 8545 8551 30303 30303/udp -ENTRYPOINT ["geth"] \ No newline at end of file