diff --git a/src/cl/teku/teku_launcher.star b/src/cl/teku/teku_launcher.star index fd6809cf..516f51bd 100644 --- a/src/cl/teku/teku_launcher.star +++ b/src/cl/teku/teku_launcher.star @@ -151,7 +151,6 @@ def get_config( DEST_VALIDATOR_SECRETS_DIRPATH_IN_SERVICE_CONTAINER, "&&", TEKU_BINARY_FILEPATH_IN_IMAGE, - "--Xee-version kilnv2", "--logging=" + log_level, "--log-destination=CONSOLE", "--network=" + genesis_config_filepath, @@ -162,7 +161,6 @@ def get_config( # Set per Pari's recommendation, to reduce noise in the logs "--p2p-subscribe-all-subnets-enabled=true", "--p2p-peer-lower-bound={0}".format(MIN_PEERS), - "--eth1-endpoints=" + el_client_rpc_url_str, "--p2p-advertised-ip=" + PRIVATE_IP_ADDRESS_PLACEHOLDER, "--rest-api-enabled=true", "--rest-api-docs-enabled=true", diff --git a/src/el/nethermind/nethermind_launcher.star b/src/el/nethermind/nethermind_launcher.star index 80ff1481..0f7d23c2 100644 --- a/src/el/nethermind/nethermind_launcher.star +++ b/src/el/nethermind/nethermind_launcher.star @@ -93,16 +93,12 @@ def get_config(genesis_data, image, existing_el_clients, log_level, extra_params "--JsonRpc.Enabled=true", "--JsonRpc.EnabledModules=net,eth,consensus,subscribe,web3,admin", "--JsonRpc.Host=0.0.0.0", - # TODO(old) Set Eth isMining? "--JsonRpc.Port={0}".format(RPC_PORT_NUM), "--JsonRpc.WebSocketsPort={0}".format(WS_PORT_NUM), "--Network.ExternalIp={0}".format(PRIVATE_IP_ADDRESS_PLACEHOLDER), "--Network.LocalIp={0}".format(PRIVATE_IP_ADDRESS_PLACEHOLDER), "--Network.DiscoveryPort={0}".format(DISCOVERY_PORT_NUM), "--Network.P2PPort={0}".format(DISCOVERY_PORT_NUM), - "--Merge.Enabled=true", - "--Merge.TerminalTotalDifficulty=0", # merge has happened already - "--Merge.TerminalBlockNumber=null", "--JsonRpc.JwtSecretFile={0}".format(jwt_secret_json_filepath_on_client), "--JsonRpc.AdditionalRpcUrls=[\"http://0.0.0.0:{0}|http;ws|net;eth;subscribe;engine;web3;client\"]".format(ENGINE_RPC_PORT_NUM), "--Network.OnlyStaticPeers=true",