Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/tests/interop.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ optimism_package:
network: "interop"
network_id: "2151908"
holocene_time_offset: 0
isthmus_time_offset: 0
jovian_time_offset: 0
interop_time_offset: 0
fund_dev_accounts: true
interop-2:
Expand Down
11 changes: 8 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ optimism_package:
participants:
# Nodes are keyed by their name
node0:
# EL(Execution Layer) Specific flags
# EL(Execution Layer) Specific flags
el:
# The type of EL client that should be started
# Valid values are:
Expand Down Expand Up @@ -353,7 +353,7 @@ optimism_package:
# Builder secret key used by op-rbuilder to sign transactions
# Defaults to None - not used
key: ""

cl_builder:
# The type of builder CL client that should be started
# Valid values are:
Expand Down Expand Up @@ -402,6 +402,11 @@ optimism_package:
# Offset is in seconds
isthmus_time_offset: ""

# Jovian fork
# Defaults to None - not activated - decimal value
# Offset is in seconds
jovian_time_offset: ""

# Interop fork
# Defaults to None - not activated - decimal value
# Offset is in seconds
Expand Down Expand Up @@ -484,7 +489,7 @@ optimism_package:
enabled: false
image: "blockscout/blockscout-optimism:6.8.0"
verifier_image: "ghcr.io/blockscout/smart-contract-verifier:v1.9.0"


challengers:
my-challenger:
Expand Down
1 change: 1 addition & 0 deletions src/contracts/contract_deployer.star
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ def _build_hardfork_schedule(chain):
("l2GenesisGraniteTimeOffset", np.granite_time_offset),
("l2GenesisHoloceneTimeOffset", np.holocene_time_offset),
("l2GenesisIsthmusTimeOffset", np.isthmus_time_offset),
("l2GenesisJovianTimeOffset", np.jovian_time_offset),
("l2GenesisInteropTimeOffset", np.interop_time_offset),
)

Expand Down
1 change: 1 addition & 0 deletions src/l2/input_parser.star
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ _DEFAULT_NETWORK_PARAMS = {
"granite_time_offset": 0,
"holocene_time_offset": None,
"isthmus_time_offset": None,
"jovian_time_offset": None,
"interop_time_offset": None,
"fund_dev_accounts": True,
}
Expand Down
1 change: 1 addition & 0 deletions src/package_io/input_parser.star
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,7 @@ def default_network_params():
"granite_time_offset": 0,
"holocene_time_offset": None,
"isthmus_time_offset": None,
"jovian_time_offset": None,
"interop_time_offset": None,
"fund_dev_accounts": True,
}
Expand Down
16 changes: 14 additions & 2 deletions test/contracts/contract_deployer_test.star
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ def test_empty_hardforks_single_chain(plan):
granite_time_offset=None,
holocene_time_offset=None,
isthmus_time_offset=None,
jovian_time_offset=None,
interop_time_offset=None,
)
)
Expand All @@ -22,6 +23,7 @@ def test_single_chain_with_hardforks(plan):
granite_time_offset=None,
holocene_time_offset=20,
isthmus_time_offset=None,
jovian_time_offset=None,
interop_time_offset=40,
)
)
Expand All @@ -45,7 +47,8 @@ def test_chain_with_all_hardforks(plan):
granite_time_offset=100,
holocene_time_offset=200,
isthmus_time_offset=300,
interop_time_offset=400,
jovian_time_offset=400,
interop_time_offset=500,
)
)

Expand All @@ -58,7 +61,8 @@ def test_chain_with_all_hardforks(plan):
("l2GenesisGraniteTimeOffset", 100),
("l2GenesisHoloceneTimeOffset", 200),
("l2GenesisIsthmusTimeOffset", 300),
("l2GenesisInteropTimeOffset", 400),
("l2GenesisJovianTimeOffset", 400),
("l2GenesisInteropTimeOffset", 500),
],
)

Expand Down Expand Up @@ -120,6 +124,7 @@ def test_build_hardfork_schedule_single_chain(plan):
granite_time_offset=None,
holocene_time_offset=200,
isthmus_time_offset=None,
jovian_time_offset=None,
interop_time_offset=300,
)
)
Expand All @@ -143,6 +148,7 @@ def test_build_hardfork_schedule_single_chain_no_hardforks(plan):
granite_time_offset=None,
holocene_time_offset=None,
isthmus_time_offset=None,
jovian_time_offset=None,
interop_time_offset=None,
)
)
Expand Down Expand Up @@ -235,6 +241,7 @@ def test_build_deployment_intent_no_interop(plan):
granite_time_offset=None,
holocene_time_offset=None,
isthmus_time_offset=None,
jovian_time_offset=None,
interop_time_offset=None,
)
)
Expand Down Expand Up @@ -286,6 +293,7 @@ def test_build_deployment_intent_with_interop_and_prestate(plan):
granite_time_offset=None,
holocene_time_offset=200,
isthmus_time_offset=None,
jovian_time_offset=None,
interop_time_offset=300,
)
),
Expand All @@ -298,6 +306,7 @@ def test_build_deployment_intent_with_interop_and_prestate(plan):
granite_time_offset=None,
holocene_time_offset=None,
isthmus_time_offset=None,
jovian_time_offset=None,
interop_time_offset=None,
)
),
Expand Down Expand Up @@ -371,6 +380,7 @@ def test_build_deployment_intent_no_global_overrides(plan):
granite_time_offset=None,
holocene_time_offset=None,
isthmus_time_offset=None,
jovian_time_offset=None,
interop_time_offset=None,
)
)
Expand Down Expand Up @@ -408,6 +418,7 @@ def test_build_deployment_intent_multiple_chains_different_configs(plan):
granite_time_offset=None,
holocene_time_offset=None,
isthmus_time_offset=None,
jovian_time_offset=None,
interop_time_offset=None,
)
),
Expand All @@ -420,6 +431,7 @@ def test_build_deployment_intent_multiple_chains_different_configs(plan):
granite_time_offset=75,
holocene_time_offset=None,
isthmus_time_offset=None,
jovian_time_offset=None,
interop_time_offset=125,
)
),
Expand Down
3 changes: 2 additions & 1 deletion test/l2/input_parser_test.star
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,9 @@ def test_l2_input_parser_defaults(plan):
fund_dev_accounts=True,
granite_time_offset=0,
holocene_time_offset=None,
interop_time_offset=None,
isthmus_time_offset=None,
jovian_time_offset=None,
interop_time_offset=None,
network="kurtosis",
network_id=2151908,
name="network1",
Expand Down
Loading