From f9ed4a7c9fe04d58651aec4e51810a8f050b4dd2 Mon Sep 17 00:00:00 2001 From: Gyanendra Mishra Date: Mon, 10 Jul 2023 11:34:50 +0100 Subject: [PATCH 1/6] support notion of counts --- README.md | 8 ++++++-- package_io/input_parser.star | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f56fa4fc..96ec0eae 100644 --- a/README.md +++ b/README.md @@ -83,7 +83,11 @@ these and other parameters are configurable through a json file Read more about // "https://0xdeadbeefcafc@relay.example.com", // "https://0xdeadbeefcafd@relay.example.com" // ] - "builder_network_params": null + "builder_network_params": null, + + // The number of times this participant should be repeated + // defaults to 1. This is optional. + "count": 1 } ], @@ -126,7 +130,7 @@ For example, this `eth-network-params.json` adds a second node, running a differ "beacon_extra_params": [], "el_extra_params": [], "validator_extra_params": [], - "builder_network_params": null + "builder_network_params": null, },{ "el_client_type": "nethermind", "el_client_image": "", diff --git a/package_io/input_parser.star b/package_io/input_parser.star index 82b8bf57..f276f4cb 100644 --- a/package_io/input_parser.star +++ b/package_io/input_parser.star @@ -37,7 +37,8 @@ def parse_input(input_args): for sub_attr, sub_value in participant.items(): # if the value is set in input we set it in participant new_participant[sub_attr] = sub_value - participants.append(new_participant) + for _ in range(0, new_participant["count"]): + participants.append(new_participant) result["participants"] = participants # validation of the above defaults @@ -180,4 +181,5 @@ def default_participant(): "el_extra_params": [], "validator_extra_params": [], "builder_network_params": None + "count": 0 } From 5604dd5a3721f6ba5b9b022417fbd9e27b3152b4 Mon Sep 17 00:00:00 2001 From: Gyanendra Mishra Date: Mon, 10 Jul 2023 11:36:21 +0100 Subject: [PATCH 2/6] added comma --- default-network-params.json | 3 ++- package_io/input_parser.star | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/default-network-params.json b/default-network-params.json index d451f9e7..5d650e83 100644 --- a/default-network-params.json +++ b/default-network-params.json @@ -9,7 +9,8 @@ "beacon_extra_params": [], "el_extra_params": [], "validator_extra_params": [], - "builder_network_params": null + "builder_network_params": null, + "count": 3 }], "network_params":{ "preregistered_validator_keys_mnemonic": "giant issue aisle success illegal bike spike question tent bar rely arctic volcano long crawl hungry vocal artwork sniff fantasy very lucky have athlete", diff --git a/package_io/input_parser.star b/package_io/input_parser.star index f276f4cb..7ee4ee7d 100644 --- a/package_io/input_parser.star +++ b/package_io/input_parser.star @@ -180,6 +180,6 @@ def default_participant(): "beacon_extra_params": [], "el_extra_params": [], "validator_extra_params": [], - "builder_network_params": None + "builder_network_params": None, "count": 0 } From 4759805428d20acd4792ce985cc6db0c73435f1e Mon Sep 17 00:00:00 2001 From: Gyanendra Mishra Date: Mon, 10 Jul 2023 11:37:17 +0100 Subject: [PATCH 3/6] revert default.json --- default-network-params.json | 1 - 1 file changed, 1 deletion(-) diff --git a/default-network-params.json b/default-network-params.json index 5d650e83..2fc8290d 100644 --- a/default-network-params.json +++ b/default-network-params.json @@ -10,7 +10,6 @@ "el_extra_params": [], "validator_extra_params": [], "builder_network_params": null, - "count": 3 }], "network_params":{ "preregistered_validator_keys_mnemonic": "giant issue aisle success illegal bike spike question tent bar rely arctic volcano long crawl hungry vocal artwork sniff fantasy very lucky have athlete", From ae1b84850f1525db0d868a4a02d00edaee8c9b78 Mon Sep 17 00:00:00 2001 From: Gyanendra Mishra Date: Mon, 10 Jul 2023 11:39:09 +0100 Subject: [PATCH 4/6] update README --- README.md | 6 ++++-- default-network-params.json | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 96ec0eae..33e83e23 100644 --- a/README.md +++ b/README.md @@ -86,7 +86,7 @@ these and other parameters are configurable through a json file Read more about "builder_network_params": null, // The number of times this participant should be repeated - // defaults to 1. This is optional. + // defaults to 1(i.e no repetition). This is optional. "count": 1 } ], @@ -131,6 +131,7 @@ For example, this `eth-network-params.json` adds a second node, running a differ "el_extra_params": [], "validator_extra_params": [], "builder_network_params": null, + "count": 1 },{ "el_client_type": "nethermind", "el_client_image": "", @@ -141,7 +142,8 @@ For example, this `eth-network-params.json` adds a second node, running a differ "beacon_extra_params": [], "el_extra_params": [], "validator_extra_params": [], - "builder_network_params": null + "builder_network_params": null, + "count": 1 }], "network_params":{ "preregistered_validator_keys_mnemonic": "giant issue aisle success illegal bike spike question tent bar rely arctic volcano long crawl hungry vocal artwork sniff fantasy very lucky have athlete", diff --git a/default-network-params.json b/default-network-params.json index 2fc8290d..d56e0394 100644 --- a/default-network-params.json +++ b/default-network-params.json @@ -10,6 +10,7 @@ "el_extra_params": [], "validator_extra_params": [], "builder_network_params": null, + "count": 1 }], "network_params":{ "preregistered_validator_keys_mnemonic": "giant issue aisle success illegal bike spike question tent bar rely arctic volcano long crawl hungry vocal artwork sniff fantasy very lucky have athlete", From 6b432882098832fbff3885eab7c6a47157223b14 Mon Sep 17 00:00:00 2001 From: Gyanendra Mishra Date: Mon, 10 Jul 2023 11:39:55 +0100 Subject: [PATCH 5/6] fix base case --- default-network-params.json | 26 +++++++++++++------------- package_io/input_parser.star | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/default-network-params.json b/default-network-params.json index d56e0394..497007ff 100644 --- a/default-network-params.json +++ b/default-network-params.json @@ -1,5 +1,5 @@ { - "participants":[{ + "participants":[{ "el_client_type": "geth", "el_client_image": "", "el_client_log_level": "", @@ -10,16 +10,16 @@ "el_extra_params": [], "validator_extra_params": [], "builder_network_params": null, - "count": 1 - }], - "network_params":{ - "preregistered_validator_keys_mnemonic": "giant issue aisle success illegal bike spike question tent bar rely arctic volcano long crawl hungry vocal artwork sniff fantasy very lucky have athlete", - "num_validator_keys_per_node": 64, - "network_id": "3151908", - "deposit_contract_address": "0x4242424242424242424242424242424242424242", - "seconds_per_slot": 12, - "genesis_delay": 120, - "capella_fork_epoch": 5 - }, - "global_client_log_level": "info" + "count": 5 + }], + "network_params":{ + "preregistered_validator_keys_mnemonic": "giant issue aisle success illegal bike spike question tent bar rely arctic volcano long crawl hungry vocal artwork sniff fantasy very lucky have athlete", + "num_validator_keys_per_node": 64, + "network_id": "3151908", + "deposit_contract_address": "0x4242424242424242424242424242424242424242", + "seconds_per_slot": 12, + "genesis_delay": 120, + "capella_fork_epoch": 5 + }, + "global_client_log_level": "info" } diff --git a/package_io/input_parser.star b/package_io/input_parser.star index 7ee4ee7d..fdb5ec43 100644 --- a/package_io/input_parser.star +++ b/package_io/input_parser.star @@ -181,5 +181,5 @@ def default_participant(): "el_extra_params": [], "validator_extra_params": [], "builder_network_params": None, - "count": 0 + "count": 1 } From 2f106a65054fab233a5cd5b1693488244da5b3b3 Mon Sep 17 00:00:00 2001 From: Gyanendra Mishra Date: Mon, 10 Jul 2023 12:46:24 +0100 Subject: [PATCH 6/6] set default repeats to 1 --- default-network-params.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/default-network-params.json b/default-network-params.json index 497007ff..0db93a13 100644 --- a/default-network-params.json +++ b/default-network-params.json @@ -10,7 +10,7 @@ "el_extra_params": [], "validator_extra_params": [], "builder_network_params": null, - "count": 5 + "count": 1 }], "network_params":{ "preregistered_validator_keys_mnemonic": "giant issue aisle success illegal bike spike question tent bar rely arctic volcano long crawl hungry vocal artwork sniff fantasy very lucky have athlete",