Commit c5d40289 authored by Barnabas Busa's avatar Barnabas Busa Committed by GitHub

fix: disable static peers (#529)

parent ad7773e8
...@@ -317,15 +317,6 @@ def get_beacon_config( ...@@ -317,15 +317,6 @@ def get_beacon_config(
] ]
) )
) )
cmd.append(
"--trusted-peers="
+ ",".join(
[
ctx.peer_id
for ctx in boot_cl_client_ctxs[: constants.MAX_ENR_ENTRIES]
]
)
)
elif network == constants.NETWORK_NAME.ephemery: elif network == constants.NETWORK_NAME.ephemery:
cmd.append( cmd.append(
"--checkpoint-sync-url=" + constants.CHECKPOINT_SYNC_URL[network] "--checkpoint-sync-url=" + constants.CHECKPOINT_SYNC_URL[network]
......
...@@ -329,7 +329,6 @@ def get_beacon_config( ...@@ -329,7 +329,6 @@ def get_beacon_config(
else: else:
for ctx in bootnode_contexts[: constants.MAX_ENR_ENTRIES]: for ctx in bootnode_contexts[: constants.MAX_ENR_ENTRIES]:
cmd.append("--bootstrap-node=" + ctx.enr) cmd.append("--bootstrap-node=" + ctx.enr)
cmd.append("--direct-peer=" + ctx.multiaddr)
if len(extra_params) > 0: if len(extra_params) > 0:
cmd.extend([param for param in extra_params]) cmd.extend([param for param in extra_params])
......
...@@ -274,7 +274,6 @@ def get_beacon_config( ...@@ -274,7 +274,6 @@ def get_beacon_config(
): ):
if bootnode_contexts != None: if bootnode_contexts != None:
for ctx in bootnode_contexts[: constants.MAX_ENR_ENTRIES]: for ctx in bootnode_contexts[: constants.MAX_ENR_ENTRIES]:
cmd.append("--peer=" + ctx.multiaddr)
cmd.append("--bootstrap-node=" + ctx.enr) cmd.append("--bootstrap-node=" + ctx.enr)
elif network == constants.NETWORK_NAME.ephemery: elif network == constants.NETWORK_NAME.ephemery:
cmd.append( cmd.append(
......
...@@ -335,15 +335,6 @@ def get_beacon_config( ...@@ -335,15 +335,6 @@ def get_beacon_config(
] ]
) )
) )
cmd.append(
"--p2p-static-peers="
+ ",".join(
[
ctx.multiaddr
for ctx in bootnode_contexts[: constants.MAX_ENR_ENTRIES]
]
)
)
elif network == constants.NETWORK_NAME.ephemery: elif network == constants.NETWORK_NAME.ephemery:
cmd.append( cmd.append(
"--checkpoint-sync-url=" + constants.CHECKPOINT_SYNC_URL[network] "--checkpoint-sync-url=" + constants.CHECKPOINT_SYNC_URL[network]
......
...@@ -239,15 +239,6 @@ def get_config( ...@@ -239,15 +239,6 @@ def get_config(
] ]
) )
) )
cmd.append(
"--staticpeers="
+ ",".join(
[
ctx.enode
for ctx in existing_el_clients[: constants.MAX_ENODE_ENTRIES]
]
)
)
elif network not in constants.PUBLIC_NETWORKS: elif network not in constants.PUBLIC_NETWORKS:
cmd.append( cmd.append(
"--bootnodes=" "--bootnodes="
...@@ -255,12 +246,6 @@ def get_config( ...@@ -255,12 +246,6 @@ def get_config(
plan, el_cl_genesis_data.files_artifact_uuid plan, el_cl_genesis_data.files_artifact_uuid
) )
) )
cmd.append(
"--staticpeers="
+ shared_utils.get_devnet_enodes(
plan, el_cl_genesis_data.files_artifact_uuid
)
)
if len(extra_params) > 0: if len(extra_params) > 0:
cmd.extend([param for param in extra_params]) cmd.extend([param for param in extra_params])
......
...@@ -187,7 +187,6 @@ def get_config( ...@@ -187,7 +187,6 @@ def get_config(
"--Network.DiscoveryPort={0}".format(DISCOVERY_PORT_NUM), "--Network.DiscoveryPort={0}".format(DISCOVERY_PORT_NUM),
"--Network.P2PPort={0}".format(DISCOVERY_PORT_NUM), "--Network.P2PPort={0}".format(DISCOVERY_PORT_NUM),
"--JsonRpc.JwtSecretFile=" + constants.JWT_MOUNT_PATH_ON_CONTAINER, "--JsonRpc.JwtSecretFile=" + constants.JWT_MOUNT_PATH_ON_CONTAINER,
"--Network.OnlyStaticPeers=true",
"--Metrics.Enabled=true", "--Metrics.Enabled=true",
"--Metrics.ExposePort={0}".format(METRICS_PORT_NUM), "--Metrics.ExposePort={0}".format(METRICS_PORT_NUM),
"--Metrics.ExposeHost=0.0.0.0", "--Metrics.ExposeHost=0.0.0.0",
...@@ -216,7 +215,7 @@ def get_config( ...@@ -216,7 +215,7 @@ def get_config(
): ):
if len(existing_el_clients) > 0: if len(existing_el_clients) > 0:
cmd.append( cmd.append(
"--Network.StaticPeers=" "--Discovery.Bootnodes="
+ ",".join( + ",".join(
[ [
ctx.enode ctx.enode
...@@ -226,7 +225,7 @@ def get_config( ...@@ -226,7 +225,7 @@ def get_config(
) )
elif network not in constants.PUBLIC_NETWORKS: elif network not in constants.PUBLIC_NETWORKS:
cmd.append( cmd.append(
"--Network.StaticPeers=" "--Discovery.Bootnodes="
+ shared_utils.get_devnet_enodes( + shared_utils.get_devnet_enodes(
plan, el_cl_genesis_data.files_artifact_uuid plan, el_cl_genesis_data.files_artifact_uuid
) )
......
...@@ -75,7 +75,7 @@ ELECTRA_FORK_VERSION = "0x60000038" ...@@ -75,7 +75,7 @@ ELECTRA_FORK_VERSION = "0x60000038"
ETHEREUM_GENESIS_GENERATOR = struct( ETHEREUM_GENESIS_GENERATOR = struct(
capella_genesis="ethpandaops/ethereum-genesis-generator:2.0.12", # Deprecated (no support for minimal config) capella_genesis="ethpandaops/ethereum-genesis-generator:2.0.12", # Deprecated (no support for minimal config)
deneb_genesis="ethpandaops/ethereum-genesis-generator:3.0.2", # Default deneb_genesis="ethpandaops/ethereum-genesis-generator:3.0.3", # Default
verkle_support_genesis="ethpandaops/ethereum-genesis-generator:3.0.0-rc.19", # soon to be deneb genesis, waiting for rebase verkle_support_genesis="ethpandaops/ethereum-genesis-generator:3.0.0-rc.19", # soon to be deneb genesis, waiting for rebase
verkle_genesis="ethpandaops/ethereum-genesis-generator:verkle-gen-v1.0.0", verkle_genesis="ethpandaops/ethereum-genesis-generator:verkle-gen-v1.0.0",
) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment