fix: disable static peers (ethereum#529)

barnabasbusa · web-flow · commit c5d402893969 · 2024-04-02T09:31:23.000+02:00
diff --git a/src/cl/lighthouse/lighthouse_launcher.star b/src/cl/lighthouse/lighthouse_launcher.star
@@ -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:
             cmd.append(
                 "--checkpoint-sync-url=" + constants.CHECKPOINT_SYNC_URL[network]
diff --git a/src/cl/nimbus/nimbus_launcher.star b/src/cl/nimbus/nimbus_launcher.star
@@ -329,7 +329,6 @@ def get_beacon_config(
             else:
                 for ctx in bootnode_contexts[: constants.MAX_ENR_ENTRIES]:
                     cmd.append("--bootstrap-node=" + ctx.enr)
-                    cmd.append("--direct-peer=" + ctx.multiaddr)
 
     if len(extra_params) > 0:
         cmd.extend([param for param in extra_params])
diff --git a/src/cl/prysm/prysm_launcher.star b/src/cl/prysm/prysm_launcher.star
@@ -274,7 +274,6 @@ def get_beacon_config(
         ):
             if bootnode_contexts != None:
                 for ctx in bootnode_contexts[: constants.MAX_ENR_ENTRIES]:
-                    cmd.append("--peer=" + ctx.multiaddr)
                     cmd.append("--bootstrap-node=" + ctx.enr)
         elif network == constants.NETWORK_NAME.ephemery:
             cmd.append(
diff --git a/src/cl/teku/teku_launcher.star b/src/cl/teku/teku_launcher.star
@@ -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:
             cmd.append(
                 "--checkpoint-sync-url=" + constants.CHECKPOINT_SYNC_URL[network]
diff --git a/src/el/erigon/erigon_launcher.star b/src/el/erigon/erigon_launcher.star
@@ -239,28 +239,13 @@ 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:
         cmd.append(
             "--bootnodes="
             + shared_utils.get_devnet_enodes(
                 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:
         cmd.extend([param for param in extra_params])
diff --git a/src/el/nethermind/nethermind_launcher.star b/src/el/nethermind/nethermind_launcher.star
@@ -187,7 +187,6 @@ def get_config(
         "--Network.DiscoveryPort={0}".format(DISCOVERY_PORT_NUM),
         "--Network.P2PPort={0}".format(DISCOVERY_PORT_NUM),
         "--JsonRpc.JwtSecretFile=" + constants.JWT_MOUNT_PATH_ON_CONTAINER,
-        "--Network.OnlyStaticPeers=true",
         "--Metrics.Enabled=true",
         "--Metrics.ExposePort={0}".format(METRICS_PORT_NUM),
         "--Metrics.ExposeHost=0.0.0.0",
@@ -216,7 +215,7 @@ def get_config(
     ):
         if len(existing_el_clients) > 0:
             cmd.append(
-                "--Network.StaticPeers="
+                "--Discovery.Bootnodes="
                 + ",".join(
                     [
                         ctx.enode
@@ -226,7 +225,7 @@ def get_config(
             )
     elif network not in constants.PUBLIC_NETWORKS:
         cmd.append(
-            "--Network.StaticPeers="
+            "--Discovery.Bootnodes="
             + shared_utils.get_devnet_enodes(
                 plan, el_cl_genesis_data.files_artifact_uuid
             )
diff --git a/src/package_io/constants.star b/src/package_io/constants.star
@@ -75,7 +75,7 @@ ELECTRA_FORK_VERSION = "0x60000038"
 
 ETHEREUM_GENESIS_GENERATOR = struct(
     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_genesis="ethpandaops/ethereum-genesis-generator:verkle-gen-v1.0.0",
 )

Original file line number	Diff line number	Diff line change
`@@ -317,15 +317,6 @@ def get_beacon_config(`
`317`	`317`	`]`
`318`	`318`	`)`
`319`	`319`	`)`
`320`		`- cmd.append(`
`321`		`- "--trusted-peers="`
`322`		`- + ",".join(`
`323`		`- [`
`324`		`- ctx.peer_id`
`325`		`- for ctx in boot_cl_client_ctxs[: constants.MAX_ENR_ENTRIES]`
`326`		`- ]`
`327`		`- )`
`328`		`- )`
`329`	`320`	`elif network == constants.NETWORK_NAME.ephemery:`
`330`	`321`	`cmd.append(`
`331`	`322`	`"--checkpoint-sync-url=" + constants.CHECKPOINT_SYNC_URL[network]`
Original file line number	Diff line number	Diff line change
`@@ -335,15 +335,6 @@ def get_beacon_config(`
`335`	`335`	`]`
`336`	`336`	`)`
`337`	`337`	`)`
`338`		`- cmd.append(`
`339`		`- "--p2p-static-peers="`
`340`		`- + ",".join(`
`341`		`- [`
`342`		`- ctx.multiaddr`
`343`		`- for ctx in bootnode_contexts[: constants.MAX_ENR_ENTRIES]`
`344`		`- ]`
`345`		`- )`
`346`		`- )`
`347`	`338`	`elif network == constants.NETWORK_NAME.ephemery:`
`348`	`339`	`cmd.append(`
`349`	`340`	`"--checkpoint-sync-url=" + constants.CHECKPOINT_SYNC_URL[network]`
Original file line number	Diff line number	Diff line change
`@@ -239,28 +239,13 @@ def get_config(`
`239`	`239`	`]`
`240`	`240`	`)`
`241`	`241`	`)`
`242`		`- cmd.append(`
`243`		`- "--staticpeers="`
`244`		`- + ",".join(`
`245`		`- [`
`246`		`- ctx.enode`
`247`		`- for ctx in existing_el_clients[: constants.MAX_ENODE_ENTRIES]`
`248`		`- ]`
`249`		`- )`
`250`		`- )`
`251`	`242`	`elif network not in constants.PUBLIC_NETWORKS:`
`252`	`243`	`cmd.append(`
`253`	`244`	`"--bootnodes="`
`254`	`245`	`+ shared_utils.get_devnet_enodes(`
`255`	`246`	`plan, el_cl_genesis_data.files_artifact_uuid`
`256`	`247`	`)`
`257`	`248`	`)`
`258`		`- cmd.append(`
`259`		`- "--staticpeers="`
`260`		`- + shared_utils.get_devnet_enodes(`
`261`		`- plan, el_cl_genesis_data.files_artifact_uuid`
`262`		`- )`
`263`		`- )`
`264`	`249`
`265`	`250`	`if len(extra_params) > 0:`
`266`	`251`	`cmd.extend([param for param in extra_params])`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ ELECTRA_FORK_VERSION = "0x60000038"`
`75`	`75`
`76`	`76`	`ETHEREUM_GENESIS_GENERATOR = struct(`
`77`	`77`	`capella_genesis="ethpandaops/ethereum-genesis-generator:2.0.12", # Deprecated (no support for minimal config)`
`78`		`- deneb_genesis="ethpandaops/ethereum-genesis-generator:3.0.2", # Default`
	`78`	`+ deneb_genesis="ethpandaops/ethereum-genesis-generator:3.0.3", # Default`
`79`	`79`	`verkle_support_genesis="ethpandaops/ethereum-genesis-generator:3.0.0-rc.19", # soon to be deneb genesis, waiting for rebase`
`80`	`80`	`verkle_genesis="ethpandaops/ethereum-genesis-generator:verkle-gen-v1.0.0",`
`81`	`81`	`)`