Skip to content

Commit 8203867

Browse files
authored
Remove base from contract version check exclusions + tidy up L2OutputOracle validation exclusions (#359)
* remove base from contract version check exclusions * Tidy up exclusions for L2OutputOracle validation checks (#360) * skip l2oo checks for any fault proof chain * slacken challenge_period_seconds requirement on sepolia superchain * remove several l2oo exclusions * add clarifying comments
1 parent 4ac847e commit 8203867

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

superchain/configs/mainnet/base.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ explorer: https://explorer.base.org
66

77
superchain_level: 1
88
standard_chain_candidate: true # This is a temporary field which causes most of the standard validation checks to run on this chain
9-
109
superchain_time: 0 # Missing hardfork times are inherited from superchain.yaml
10+
contracts_version_tag: op-contracts/v1.3.0 # Multi-Chain Prep (MCP) https://github.com/ethereum-optimism/optimism/releases/tag/op-contracts%2Fv1.3.0
11+
1112

1213
system_config_addr: "0x73a79Fab69143498Ed3712e519A88a918e1f4072"
1314
batch_inbox_addr: "0xFf00000000000000000000000000000000008453"

validation/exclusions_test.go

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,8 @@ var exclusions = map[string]map[uint64]bool{
2727
11763072: true, // sepolia-dev-0/base-devnet-0 (no public endpoint)
2828
},
2929
"L2OO_Params": {
30-
10: true, // OP mainnet - Upgraded to fault proofs
31-
999999999: true, // sepolia/zora Incorrect finalizationPeriodSeconds, 604800 is not within bounds [12 12]
32-
1740: true, // sepolia/metal Incorrect finalizationPeriodSeconds, 604800 is not within bounds [12 12]
33-
919: true, // sepolia/mode Incorrect finalizationPeriodSeconds, 180 is not within bounds [12 12]
34-
11155420: true, // sepolia/op No L2OO because this chain uses Fault Proofs https://github.com/ethereum-optimism/superchain-registry/issues/219
35-
11155421: true, // oplabs-sepolia-devnet-0 No L2OO because this chain uses Fault Proofs https://github.com/ethereum-optimism/superchain-registry/issues/219
30+
11155421: true, // sepolia-dev-0/oplabs-devnet-0 (does not yet declare a contract versions tag)
31+
11763072: true, // sepolia-dev-0/base-devnet-0 (does not yet declare a contract versions tag)
3632
},
3733
"L1_Security_Config": {
3834
8453: true, // base (incorrect challenger, incorrect guardian)
@@ -57,7 +53,6 @@ var exclusions = map[string]map[uint64]bool{
5753
11763072: true, // sepolia-dev-0/base-devnet-0 No Public RPC declared
5854
},
5955
"Standard_Contract_Versions": {
60-
8453: true, // mainnet/base
6156
11155421: true, // sepolia-dev-0/oplabs-devnet-0
6257
11763072: true, // sepolia-dev-0/base-devnet-0
6358
},

validation/l2oo_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ type L2OOParams struct {
2626
func testL2OOParams(t *testing.T, chain *ChainConfig) {
2727
skipIfExcluded(t, chain.ChainID)
2828

29+
if *chain.ContractsVersionTag == "op-contracts/v1.4.0" {
30+
t.Skip("Chain is on fault proofs, so there is no L2OutputOracle to track")
31+
}
32+
2933
rpcEndpoint := Superchains[chain.Superchain].Config.L1.PublicRPC
3034

3135
require.NotEmpty(t, rpcEndpoint)

validation/standard/standard-config-params-sepolia.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ maximum_base_fee = "340_282_366_920_938_463_463_374_607_431_768_211_455"
1010
[l2_output_oracle]
1111
submission_interval = [1, 86400]
1212
l2_block_time = [2, 2]
13-
challenge_period_seconds = [12, 12] # i.e. finalization period
13+
challenge_period_seconds = [12, 604800] # i.e. finalization period
1414

1515
[gas_price_oracle.pre-ecotone]
1616
decimals = [6, 6]

0 commit comments

Comments
 (0)