Skip to content

Commit 65c7c6d

Browse files
authored
Merge pull request #12 from zapper-95/remove-redundant-parsing
refactor: removed unused input params
2 parents 2b3ec0a + 09a9588 commit 65c7c6d

File tree

2 files changed

+0
-51
lines changed

2 files changed

+0
-51
lines changed

src/package_io/input_parser.star

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,6 @@ DEFAULT_PROPOSER_IMAGES = {
3333
"op-proposer": "us-docker.pkg.dev/oplabs-tools-artifacts/images/op-proposer:df1d18acb5f151b5d32b5e78df9c1331ed770505",
3434
}
3535

36-
37-
DEFAULT_SEQUENCER_IMAGES = {
38-
"op-sequencer": "us-docker.pkg.dev/oplabs-tools-artifacts/images/op-proposer:develop",
39-
}
40-
4136
DEFAULT_SIDECAR_IMAGES = {
4237
"rollup-boost": "flashbots/rollup-boost:sha-628bb2d",
4338
}
@@ -242,21 +237,11 @@ def input_parser(plan, input_args, deployment_type="devnet"):
242237
proposal_interval=result["proposer_params"]["proposal_interval"],
243238
),
244239
sequencer_params=struct(
245-
image=result["sequencer_params"]["image"],
246240
private_key=result["sequencer_params"]["private_key"],
247241
signer_endpoint=result["sequencer_params"]["signer_endpoint"],
248242
signer_address=result["sequencer_params"]["signer_address"],
249243
extra_params=result["sequencer_params"]["extra_params"],
250244
),
251-
l1_proxy_admin_params=struct(
252-
address=result["l1_proxy_admin_params"]["address"]
253-
),
254-
l2_proxy_admin_params=struct(
255-
address=result["l2_proxy_admin_params"]["address"]
256-
),
257-
system_config_owner_params=struct(
258-
address=result["system_config_owner_params"]["address"]
259-
),
260245
gas_params=struct(
261246
gas_limit=result["gas_params"]["gas_limit"],
262247
eip_1559_denominator=result["gas_params"]["eip_1559_denominator"],
@@ -364,15 +349,6 @@ def parse_network_params(plan, input_args, deployment_type):
364349
sequencer_params = default_sequencer_params()
365350
sequencer_params.update(chain.get("sequencer_params", {}))
366351

367-
l1_proxy_admin_params = default_l1_proxy_admin_params()
368-
l1_proxy_admin_params.update(chain.get("l1_proxy_admin_params", {}))
369-
370-
l2_proxy_admin_params = default_l2_proxy_admin_params()
371-
l2_proxy_admin_params.update(chain.get("l2_proxy_admin_params", {}))
372-
373-
system_config_owner_params = default_system_config_owner_params()
374-
system_config_owner_params.update(chain.get("system_config_owner_params", {}))
375-
376352
gas_params = default_gas_params()
377353
gas_params.update(chain.get("gas_params", {}))
378354

@@ -462,9 +438,6 @@ def parse_network_params(plan, input_args, deployment_type):
462438
"challenger_params": challenger_params,
463439
"proposer_params": proposer_params,
464440
"sequencer_params": sequencer_params,
465-
"l1_proxy_admin_params": l1_proxy_admin_params,
466-
"l2_proxy_admin_params": l2_proxy_admin_params,
467-
"system_config_owner_params": system_config_owner_params,
468441
"gas_params": gas_params,
469442
"mev_params": mev_params,
470443
"da_server_params": da_server_params,
@@ -594,9 +567,6 @@ def default_chains():
594567
"proposer_params": default_proposer_params(),
595568
"challenger_params": default_challenger_params(),
596569
"sequencer_params": default_sequencer_params(),
597-
"l1_proxy_admin_params": default_l1_proxy_admin_params(),
598-
"l2_proxy_admin_params": default_l2_proxy_admin_params(),
599-
"system_config_owner_params": default_system_config_owner_params(),
600570
"gas_params": default_gas_params(),
601571
"mev_params": default_mev_params(),
602572
"da_server_params": default_da_server_params(),
@@ -623,18 +593,6 @@ def default_network_params():
623593
}
624594

625595

626-
def default_l1_proxy_admin_params():
627-
return {"address": "0x255fcBEC3d6984215a97389d83f03B608A8FA452"}
628-
629-
630-
def default_l2_proxy_admin_params():
631-
return {"address": "0x255fcBEC3d6984215a97389d83f03B608A8FA452"}
632-
633-
634-
def default_system_config_owner_params():
635-
return {"address": "0x255fcBEC3d6984215a97389d83f03B608A8FA452"}
636-
637-
638596
def default_batcher_params():
639597
params = {
640598
"image": DEFAULT_BATCHER_IMAGES["op-batcher"],
@@ -676,7 +634,6 @@ def default_proposer_params():
676634

677635
def default_sequencer_params():
678636
params = {
679-
"image": DEFAULT_SEQUENCER_IMAGES["op-sequencer"],
680637
"extra_params": [],
681638
"private_key": "",
682639
"signer_endpoint": "",

src/package_io/sanity_check.star

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -119,15 +119,13 @@ SUBCATEGORY_PARAMS = {
119119
"dispute_game_finality_delay",
120120
],
121121
"batcher_params": [
122-
"address",
123122
"image",
124123
"private_key",
125124
"signer_endpoint",
126125
"signer_address",
127126
"extra_params",
128127
],
129128
"proposer_params": [
130-
"address",
131129
"image",
132130
"private_key",
133131
"signer_endpoint",
@@ -137,7 +135,6 @@ SUBCATEGORY_PARAMS = {
137135
"proposal_interval",
138136
],
139137
"challenger_params": [
140-
"address",
141138
"enabled",
142139
"image",
143140
"private_key",
@@ -149,16 +146,11 @@ SUBCATEGORY_PARAMS = {
149146
"cannon_trace_types",
150147
],
151148
"sequencer_params": [
152-
"address",
153-
"image",
154149
"private_key",
155150
"signer_endpoint",
156151
"signer_address",
157152
"extra_params",
158153
],
159-
"l1_proxy_admin_params": ["address"],
160-
"l2_proxy_admin_params": ["address"],
161-
"system_config_owner_params": ["address"],
162154
"gas_params": [
163155
"gas_limit",
164156
"eip_1559_elasticity",

0 commit comments

Comments
 (0)