From da1a156b2a76247c5ddb6a4fd42bdf814097262f Mon Sep 17 00:00:00 2001 From: "lukasz.rozmej" Date: Fri, 3 Jun 2022 13:17:08 +0200 Subject: [PATCH 1/2] Remove merge-nethermind config. Make nethermind config merge compliant. --- clients/merge-nethermind/Dockerfile | 29 ---- clients/merge-nethermind/enode.sh | 16 -- clients/merge-nethermind/genesis.json | 15 -- clients/merge-nethermind/mapper.jq | 220 ------------------------- clients/merge-nethermind/mkconfig.jq | 74 --------- clients/merge-nethermind/nethermind.sh | 76 --------- clients/merge-nethermind/oldtest.cfg | 32 ---- clients/merge-nethermind/test.cfg | 27 --- clients/nethermind/mapper.jq | 4 + clients/nethermind/mkconfig.jq | 33 +++- clients/nethermind/nethermind.sh | 6 + 11 files changed, 42 insertions(+), 490 deletions(-) delete mode 100644 clients/merge-nethermind/Dockerfile delete mode 100644 clients/merge-nethermind/enode.sh delete mode 100644 clients/merge-nethermind/genesis.json delete mode 100644 clients/merge-nethermind/mapper.jq delete mode 100644 clients/merge-nethermind/mkconfig.jq delete mode 100644 clients/merge-nethermind/nethermind.sh delete mode 100644 clients/merge-nethermind/oldtest.cfg delete mode 100644 clients/merge-nethermind/test.cfg diff --git a/clients/merge-nethermind/Dockerfile b/clients/merge-nethermind/Dockerfile deleted file mode 100644 index 49055aebb8..0000000000 --- a/clients/merge-nethermind/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -# ARG branch=latest -ARG branch=kiln_shadowfork -FROM nethermindeth/nethermind:$branch - -RUN apt-get update && apt-get install -y wget -RUN wget https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 -O /usr/local/bin/jq && \ - echo 'af986793a515d500ab2d35f8d2aecd656e764504b789b66d7e1a0b727a124c44 /usr/local/bin/jq' | sha256sum -c && \ - chmod +x /usr/local/bin/jq - -ADD genesis.json /genesis.json -ADD mapper.jq /mapper.jq -ADD mkconfig.jq /mkconfig.jq -ADD enode.sh /enode.sh -ADD nethermind.sh /nethermind.sh - -RUN chmod +x /nethermind.sh - -# Add the enode script. -RUN mkdir /hive-bin -ADD enode.sh /hive-bin/enode.sh -RUN chmod +x /hive-bin/enode.sh - -# Write the version file. -RUN dotnet /nethermind/Nethermind.Runner.dll --version > /raw_version.txt && tail -n 1 /raw_version.txt > /version.txt - -ENV NETHERMIND_HIVE_ENABLED true - -EXPOSE 8545 30303 30303/udp -ENTRYPOINT ["/nethermind.sh"] diff --git a/clients/merge-nethermind/enode.sh b/clients/merge-nethermind/enode.sh deleted file mode 100644 index d192bc653d..0000000000 --- a/clients/merge-nethermind/enode.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -# Script to retrieve the enode -# -# This is copied into the validator container by Hive -# and used to provide a client-specific enode id retriever -# - -# Immediately abort the script on any error encountered - - -set -e - -TARGET_ENODE=$(sed -n -e 's/^.*This node.*: //p' /log.txt) -echo ${TARGET_ENODE/|/} - diff --git a/clients/merge-nethermind/genesis.json b/clients/merge-nethermind/genesis.json deleted file mode 100644 index 7ca6f39f73..0000000000 --- a/clients/merge-nethermind/genesis.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1", - "difficulty" : "0x020000", - "extraData" : "0x42", - "gasLimit" : "0x2fefd8", - "mixHash" : "0x2c85bcbce56429100b2108254bb56906257582aeafcbd682bc9af67a9f5aee46", - "nonce" : "0x78cc16f7b4f65485", - "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000", - "timestamp" : "0x54c98c81", - "alloc" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b": { - "balance" : "0x09184e72a000" - } - } -} diff --git a/clients/merge-nethermind/mapper.jq b/clients/merge-nethermind/mapper.jq deleted file mode 100644 index 937d64c43f..0000000000 --- a/clients/merge-nethermind/mapper.jq +++ /dev/null @@ -1,220 +0,0 @@ -# Removes all empty keys and values in input. -def remove_empty: - . | walk( - if type == "object" then - with_entries( - select( - .value != null and - .value != "" and - .value != [] and - .key != null and - .key != "" - ) - ) - else . - end - ) -; - -# Converts number to hex, from https://rosettacode.org/wiki/Non-decimal_radices/Convert#jq -def int_to_hex: - def stream: - recurse(if . > 0 then ./16|floor else empty end) | . % 16 ; - if . == 0 then "0x0" - else "0x" + ([stream] | reverse | .[1:] | map(if .<10 then 48+. else 87+. end) | implode) - end -; - -# Converts decimal number in string to hex. -def to_hex: - if . != null and startswith("0x") then . else - if (. != null and . != "") then .|tonumber|int_to_hex else . end - end -; - -# Zero-pads hex string. -def infix_zeros_to_length(s;l): - if . != null then - (.[0:s])+("0"*(l-(.|length)))+(.[s:l]) - else . - end -; - -# This gives the consensus engine definition for the ethash engine. -def ethash_engine: - { - "Ethash": { - "params": { - "minimumDifficulty": "0x20000", - "difficultyBoundDivisor": "0x800", - "durationLimit": "0x0d", - "homesteadTransition": env.HIVE_FORK_HOMESTEAD|to_hex, - "eip100bTransition": env.HIVE_FORK_BYZANTIUM|to_hex, - "daoHardforkTransition": env.HIVE_FORK_DAO_BLOCK|to_hex, - "daoHardforkBeneficiary": "0xbf4ed7b27f1d666546e30d74d50d173d20bca754", - "blockReward": { - "0x0": "0x4563918244F40000", - (env.HIVE_FORK_BYZANTIUM|to_hex//""): "0x29A2241AF62C0000", - (env.HIVE_FORK_CONSTANTINOPLE|to_hex//""): "0x1BC16D674EC80000", - }, - "difficultyBombDelays": { - (env.HIVE_FORK_BYZANTIUM|to_hex//""): 3000000, - (env.HIVE_FORK_CONSTANTINOPLE|to_hex//""): 2000000, - (env.HIVE_FORK_MUIR_GLACIER|to_hex//""): 4000000, - (env.HIVE_FORK_LONDON|to_hex//""): 700000, - } - } - } - } -; - -# This gives the consensus engine definition for the clique PoA engine. -def clique_engine: - { - "clique": { - "params": { - "period": env.HIVE_CLIQUE_PERIOD|tonumber, - "epoch": 30000, - "blockReward": "0x0" - } - } - } -; - -{ - "version": "1", - "engine": (if env.HIVE_CLIQUE_PERIOD then clique_engine else ethash_engine end), - "params": { - # Tangerine Whistle - "eip150Transition": env.HIVE_FORK_TANGERINE|to_hex, - - # Spurious Dragon - "eip160Transition": env.HIVE_FORK_SPURIOUS|to_hex, - "eip161abcTransition": env.HIVE_FORK_SPURIOUS|to_hex, - "eip161dTransition": env.HIVE_FORK_SPURIOUS|to_hex, - "eip155Transition": env.HIVE_FORK_SPURIOUS|to_hex, - "maxCodeSizeTransition": env.HIVE_FORK_SPURIOUS|to_hex, - "maxCodeSize": 24576, - "maximumExtraDataSize": "0x400", - - # Byzantium - "eip140Transition": env.HIVE_FORK_BYZANTIUM|to_hex, - "eip211Transition": env.HIVE_FORK_BYZANTIUM|to_hex, - "eip214Transition": env.HIVE_FORK_BYZANTIUM|to_hex, - "eip658Transition": env.HIVE_FORK_BYZANTIUM|to_hex, - - # Constantinople - "eip145Transition": env.HIVE_FORK_CONSTANTINOPLE|to_hex, - "eip1014Transition": env.HIVE_FORK_CONSTANTINOPLE|to_hex, - "eip1052Transition": env.HIVE_FORK_CONSTANTINOPLE|to_hex, - - # Petersburg - "eip1283Transition": (if env.HIVE_FORK_ISTANBUL|to_hex == "0x0" then "0x0" else env.HIVE_FORK_CONSTANTINOPLE|to_hex end), - "eip1283DisableTransition": (if env.HIVE_FORK_ISTANBUL|to_hex == "0x0" then "0x0" else env.HIVE_FORK_PETERSBURG|to_hex end), - - # Istanbul - "eip152Transition": env.HIVE_FORK_ISTANBUL|to_hex, - "eip1108Transition": env.HIVE_FORK_ISTANBUL|to_hex, - "eip1344Transition": env.HIVE_FORK_ISTANBUL|to_hex, - "eip1884Transition": env.HIVE_FORK_ISTANBUL|to_hex, - "eip2028Transition": env.HIVE_FORK_ISTANBUL|to_hex, - "eip2200Transition": env.HIVE_FORK_ISTANBUL|to_hex, - - # Berlin - "eip2565Transition": env.HIVE_FORK_BERLIN|to_hex, - "eip2718Transition": env.HIVE_FORK_BERLIN|to_hex, - "eip2929Transition": env.HIVE_FORK_BERLIN|to_hex, - "eip2930Transition": env.HIVE_FORK_BERLIN|to_hex, - - # London - "eip1559Transition": env.HIVE_FORK_LONDON|to_hex, - "eip3238Transition": env.HIVE_FORK_LONDON|to_hex, - "eip3529Transition": env.HIVE_FORK_LONDON|to_hex, - "eip3541Transition": env.HIVE_FORK_LONDON|to_hex, - "eip3198Transition": env.HIVE_FORK_LONDON|to_hex, - - # Merge - "MergeForkIdTransition": env.HIVE_MERGE_BLOCK_ID|to_hex, - - # Other chain parameters - "networkID": env.HIVE_NETWORK_ID|to_hex, - "chainID": env.HIVE_CHAIN_ID|to_hex, - }, - "genesis": { - "seal": { - "ethereum":{ - "nonce": .nonce|infix_zeros_to_length(2;18), - "mixHash": .mixHash, - }, - }, - "difficulty": .difficulty, - "author": .coinbase, - "timestamp": .timestamp, - "parentHash": .parentHash, - "extraData": .extraData, - "gasLimit": .gasLimit, - "baseFeePerGas": .baseFeePerGas, - }, - "accounts": ((.alloc|with_entries(.key|="0x"+.)) * { - "0x0000000000000000000000000000000000000001": { - "builtin": { - "name": "ecrecover", - "pricing": {"linear": {"base": 3000, "word": 0}}, - } - }, - "0x0000000000000000000000000000000000000002": { - "builtin": { - "name": "sha256", - "pricing": {"linear": {"base": 60, "word": 12}} - } - }, - "0x0000000000000000000000000000000000000003": { - "builtin": { - "name": "ripemd160", - "pricing": {"linear": {"base": 600, "word": 120}} - } - }, - "0x0000000000000000000000000000000000000004": { - "builtin": { - "name": "identity", - "pricing": {"linear": {"base": 15, "word": 3}} - } - }, - "0x0000000000000000000000000000000000000005": { - "builtin": { - "name": "modexp", - "activate_at": env.HIVE_FORK_BYZANTIUM|to_hex, - "pricing": {"modexp": {"divisor": 20}} - } - }, - "0x0000000000000000000000000000000000000006": { - "builtin": { - "name": "alt_bn128_add", - "activate_at": env.HIVE_FORK_BYZANTIUM|to_hex, - "pricing": {"linear": {"base": 500, "word": 0} - } - } - }, - "0x0000000000000000000000000000000000000007": { - "builtin": { - "name": "alt_bn128_mul", - "activate_at": env.HIVE_FORK_BYZANTIUM|to_hex, - "pricing": {"linear": {"base": 40000, "word": 0}} - } - }, - "0x0000000000000000000000000000000000000008": { - "builtin": { - "name": "alt_bn128_pairing", - "activate_at": env.HIVE_FORK_BYZANTIUM|to_hex, - "pricing": {"alt_bn128_pairing": {"base": 100000, "pair": 80000}} - } - }, - "0x0000000000000000000000000000000000000009": { - "builtin": { - "name": "blake2_f", - "activate_at": env.HIVE_FORK_ISTANBUL|to_hex, - "pricing": {"blake2_f": {"gas_per_round": 1}} - } - }, - }), -}|remove_empty diff --git a/clients/merge-nethermind/mkconfig.jq b/clients/merge-nethermind/mkconfig.jq deleted file mode 100644 index ec9161c12a..0000000000 --- a/clients/merge-nethermind/mkconfig.jq +++ /dev/null @@ -1,74 +0,0 @@ -# This JQ script generates the Nethermind config file. - -def keystore_config: - if env.HIVE_CLIQUE_PRIVATEKEY == null then - {} - else - { "KeyStoreConfig": { "TestNodeKey": env.HIVE_CLIQUE_PRIVATEKEY } } - end -; - -def merge_config: - if env.HIVE_TERMINAL_TOTAL_DIFFICULTY != null then - { - "Merge": { - "Enabled": true, - "TerminalTotalDifficulty": env.HIVE_TERMINAL_TOTAL_DIFFICULTY, - } - } - else - {} - end -; - -def json_rpc_config: - if env.HIVE_TERMINAL_TOTAL_DIFFICULTY != null then - { - "JsonRpc": { - "JwtSecretFile": "/jwt.secret", - "EnabledModules": ["Eth", "Subscribe", "Trace", "TxPool", "Web3", "Personal", "Proof", "Net", "Parity", "Health"], - "AdditionalRpcUrls": ["http://0.0.0.0:8550|http;ws|net;eth;subscribe;engine;web3;client|no-auth", "http://0.0.0.0:8551|http;ws|net;eth;subscribe;engine;web3;client"] - } - } - else - { - "JsonRpc": { - "EnabledModules": ["Eth", "Subscribe", "Trace", "TxPool", "Web3", "Personal", "Proof", "Net", "Parity", "Health"] - } - } - end -; - -def base_config: - { - "Init": { - "PubSubEnabled": true, - "WebSocketsEnabled": true, - "IsMining": (env.HIVE_MINER != null), - "UseMemDb": true, - "ChainSpecPath": "/chainspec/test.json", - "BaseDbPath": "nethermind_db/hive", - "LogFileName": "/hive.logs.txt" - }, - "JsonRpc": { - "Enabled": true, - "Host": "0.0.0.0", - "Port": 8545, - "WebSocketsPort": 8546, - }, - "Network": { - "DiscoveryPort": 30303, - "P2PPort": 30303, - "ExternalIp": "127.0.0.1", - }, - "Hive": { - "ChainFile": "/chain.rlp", - "GenesisFilePath": "/genesis.json", - "BlocksDir": "/blocks", - "KeysDir": "/keys" - }, - } -; - -# This is the main expression that outputs the config. -base_config * keystore_config * merge_config * json_rpc_config diff --git a/clients/merge-nethermind/nethermind.sh b/clients/merge-nethermind/nethermind.sh deleted file mode 100644 index 8a407c371e..0000000000 --- a/clients/merge-nethermind/nethermind.sh +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/bash - -# Startup script to initialize and boot a peer instance. -# -# This script assumes the following files: -# - `nethermind` binary is located in the filesystem root -# - `genesis.json` file is located in the filesystem root (mandatory) -# - `chain.rlp` file is located in the filesystem root (optional) -# - `blocks` folder is located in the filesystem root (optional) -# - `keys` folder is located in the filesystem root (optional) -# -# This script assumes the following environment variables: -# -# - HIVE_BOOTNODE enode URL of the remote bootstrap node -# - HIVE_NETWORK_ID network ID number to use for the eth protocol -# - HIVE_CHAIN_ID network ID number to use for the eth protocol -# - HIVE_NODETYPE sync and pruning selector (archive, full, light) -# - HIVE_SKIP_POW If set, skip PoW verification during block import -# -# Forks: -# -# - HIVE_FORK_HOMESTEAD block number of the DAO hard-fork transition -# - HIVE_FORK_DAO_BLOCK block number of the DAO hard-fork transitionnsition -# - HIVE_FORK_TANGERINE block number of TangerineWhistle -# - HIVE_FORK_SPURIOUS block number of SpuriousDragon -# - HIVE_FORK_BYZANTIUM block number for Byzantium transition -# - HIVE_FORK_CONSTANTINOPLE block number for Constantinople transition -# - HIVE_FORK_PETERSBURG block number for ConstantinopleFix/PetersBurg transition -# - HIVE_FORK_BERLIN block number for Berlin transition -# - HIVE_FORK_LONDON block number for London -# -# Clique PoA: -# -# - HIVE_CLIQUE_PERIOD enables clique support. value is block time in seconds. -# - HIVE_CLIQUE_PRIVATEKEY private key for clique mining -# -# Other: -# -# - HIVE_MINER enables mining. value is coinbase address. -# - HIVE_MINER_EXTRA extra-data field to set for newly minted blocks -# - HIVE_SKIP_POW If set, skip PoW verification -# - HIVE_LOGLEVEL Client log level -# -# These variables are not supported by Nethermind: -# -# - HIVE_FORK_DAO_VOTE whether the node support (or opposes) the DAO fork -# - HIVE_GRAPHQL_ENABLED if set, GraphQL is enabled on port 8545 -# - HIVE_TESTNET whether testnet nonces (2^20) are needed - -# Immediately abort the script on any error encountered -set -e - -# Generate JWT file if necessary -if [ "$HIVE_TERMINAL_TOTAL_DIFFICULTY" != "" ]; then - JWT_SECRET="0x7365637265747365637265747365637265747365637265747365637265747365" - echo -n $JWT_SECRET > /jwt.secret -fi - -# Generate the genesis and chainspec file. -mkdir -p /chainspec -jq -f /mapper.jq /genesis.json > /chainspec/test.json -jq . /chainspec/test.json - -# Generate the config file. -mkdir /configs -jq -n -f /mkconfig.jq > /configs/test.cfg - -# Set bootnode. -if [ -n "$HIVE_BOOTNODE" ]; then - mkdir -p /nethermind/Data - echo "[\"$HIVE_BOOTNODE\"]" > /nethermind/Data/static-nodes.json -fi - -echo "Running Nethermind..." -# The output is tee:d, via /log.txt, because the enode script uses that logfile to parse out the enode id -dotnet /nethermind/Nethermind.Runner.dll --config /configs/test.cfg 2>&1 | tee /log.txt diff --git a/clients/merge-nethermind/oldtest.cfg b/clients/merge-nethermind/oldtest.cfg deleted file mode 100644 index b7d6091bbd..0000000000 --- a/clients/merge-nethermind/oldtest.cfg +++ /dev/null @@ -1,32 +0,0 @@ -[ - { - "ConfigModule": "InitConfig", - "ConfigItems": { - "JsonRpcEnabled": true, - "WebSocketsEnabled": true, - "IsMining": false, - "DiscoveryPort": 30303, - "P2PPort": 30303, - "HttpHost": "127.0.0.1", - "HttpPort": 8545, - "ChainSpecPath": "/chainspec/test.json", - - "BaseDbPath": "nethermind_db/hive", - "LogFileName": "hive.logs.txt", - "StoreReceipts": true, - - } - }, - { - "ConfigModule": "SyncConfig", - "ConfigItems": { - "FastSync": false - } - }, - { - "ConfigModule": "KeyStoreConfig", - "ConfigItems": { - "TestNodeKey": "0x010102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f", - } - } -] diff --git a/clients/merge-nethermind/test.cfg b/clients/merge-nethermind/test.cfg deleted file mode 100644 index a0df242d63..0000000000 --- a/clients/merge-nethermind/test.cfg +++ /dev/null @@ -1,27 +0,0 @@ -{ - "Init": { - "PubSubEnabled": false, - "WebSocketsEnabled": false, - "IsMining": false, - "UseMemDb": true, - "ChainSpecPath": "/chainspec/test.json", - "BaseDbPath": "nethermind_db/hive", - "LogFileName": "/hive.logs.txt" - }, - "JsonRpc": { - "Enabled": true, - "Host": "0.0.0.0", - "Port": 8545, - }, - "Network": { - "DiscoveryPort": 30303, - "P2PPort": 30303, - "ExternalIp": "127.0.0.1", - }, - "Hive": { - "ChainFile": "/chain.rlp", - "GenesisFilePath": "/genesis.json", - "BlocksDir": "/blocks", - "KeysDir": "/keys" - } -} diff --git a/clients/nethermind/mapper.jq b/clients/nethermind/mapper.jq index 05057a6c57..937d64c43f 100644 --- a/clients/nethermind/mapper.jq +++ b/clients/nethermind/mapper.jq @@ -95,6 +95,7 @@ def clique_engine: "eip155Transition": env.HIVE_FORK_SPURIOUS|to_hex, "maxCodeSizeTransition": env.HIVE_FORK_SPURIOUS|to_hex, "maxCodeSize": 24576, + "maximumExtraDataSize": "0x400", # Byzantium "eip140Transition": env.HIVE_FORK_BYZANTIUM|to_hex, @@ -132,6 +133,9 @@ def clique_engine: "eip3541Transition": env.HIVE_FORK_LONDON|to_hex, "eip3198Transition": env.HIVE_FORK_LONDON|to_hex, + # Merge + "MergeForkIdTransition": env.HIVE_MERGE_BLOCK_ID|to_hex, + # Other chain parameters "networkID": env.HIVE_NETWORK_ID|to_hex, "chainID": env.HIVE_CHAIN_ID|to_hex, diff --git a/clients/nethermind/mkconfig.jq b/clients/nethermind/mkconfig.jq index 175ebdca04..ec9161c12a 100644 --- a/clients/nethermind/mkconfig.jq +++ b/clients/nethermind/mkconfig.jq @@ -8,6 +8,37 @@ def keystore_config: end ; +def merge_config: + if env.HIVE_TERMINAL_TOTAL_DIFFICULTY != null then + { + "Merge": { + "Enabled": true, + "TerminalTotalDifficulty": env.HIVE_TERMINAL_TOTAL_DIFFICULTY, + } + } + else + {} + end +; + +def json_rpc_config: + if env.HIVE_TERMINAL_TOTAL_DIFFICULTY != null then + { + "JsonRpc": { + "JwtSecretFile": "/jwt.secret", + "EnabledModules": ["Eth", "Subscribe", "Trace", "TxPool", "Web3", "Personal", "Proof", "Net", "Parity", "Health"], + "AdditionalRpcUrls": ["http://0.0.0.0:8550|http;ws|net;eth;subscribe;engine;web3;client|no-auth", "http://0.0.0.0:8551|http;ws|net;eth;subscribe;engine;web3;client"] + } + } + else + { + "JsonRpc": { + "EnabledModules": ["Eth", "Subscribe", "Trace", "TxPool", "Web3", "Personal", "Proof", "Net", "Parity", "Health"] + } + } + end +; + def base_config: { "Init": { @@ -40,4 +71,4 @@ def base_config: ; # This is the main expression that outputs the config. -base_config * keystore_config +base_config * keystore_config * merge_config * json_rpc_config diff --git a/clients/nethermind/nethermind.sh b/clients/nethermind/nethermind.sh index 2345aebf78..8a407c371e 100644 --- a/clients/nethermind/nethermind.sh +++ b/clients/nethermind/nethermind.sh @@ -50,6 +50,12 @@ # Immediately abort the script on any error encountered set -e +# Generate JWT file if necessary +if [ "$HIVE_TERMINAL_TOTAL_DIFFICULTY" != "" ]; then + JWT_SECRET="0x7365637265747365637265747365637265747365637265747365637265747365" + echo -n $JWT_SECRET > /jwt.secret +fi + # Generate the genesis and chainspec file. mkdir -p /chainspec jq -f /mapper.jq /genesis.json > /chainspec/test.json From 99c070947e5c3d0f7bbed5e19a3ccbfe34b66477 Mon Sep 17 00:00:00 2001 From: "lukasz.rozmej" Date: Fri, 3 Jun 2022 13:39:36 +0200 Subject: [PATCH 2/2] remove other mentions of merge-nethermind --- simulators/ethereum/engine/README.md | 1 - simulators/ethereum/engine/helper.go | 2 -- 2 files changed, 3 deletions(-) diff --git a/simulators/ethereum/engine/README.md b/simulators/ethereum/engine/README.md index a9250ebbb1..7fa9848839 100644 --- a/simulators/ethereum/engine/README.md +++ b/simulators/ethereum/engine/README.md @@ -6,7 +6,6 @@ The PoS consensus relies on the Engine API, which receives commands from the con Clients with support for the merge are required to run this suite: - merge-go-ethereum - - merge-nethermind ## Architecture diff --git a/simulators/ethereum/engine/helper.go b/simulators/ethereum/engine/helper.go index 2ae20e0414..211bd88f9e 100644 --- a/simulators/ethereum/engine/helper.go +++ b/simulators/ethereum/engine/helper.go @@ -472,8 +472,6 @@ func debugPrevRandaoTransaction(ctx context.Context, c *rpc.Client, clientType s return gethDebugPrevRandaoTransaction(ctx, c, tx, expectedPrevRandao) case "go-ethereum": return gethDebugPrevRandaoTransaction(ctx, c, tx, expectedPrevRandao) - case "merge-nethermind": - return nethermindDebugPrevRandaoTransaction(ctx, c, tx, expectedPrevRandao) case "nethermind": return nethermindDebugPrevRandaoTransaction(ctx, c, tx, expectedPrevRandao) }