From ad2843bf5b88d17806514f266570ade8d824f166 Mon Sep 17 00:00:00 2001 From: cby3149 Date: Tue, 7 Jan 2025 16:15:06 -0800 Subject: [PATCH 1/2] Enable Boba Mainnet holocene hardfork --- go.mod | 2 +- go.sum | 4 ++-- params/superchain_test.go | 7 ++----- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 087e533161..4510861701 100644 --- a/go.mod +++ b/go.mod @@ -151,4 +151,4 @@ require ( rsc.io/tmplfunc v0.0.3 // indirect ) -replace github.com/ethereum-optimism/superchain-registry/superchain => github.com/bobanetwork/superchain-registry/superchain v0.0.0-20241205210931-5e9b6db19ee3 +replace github.com/ethereum-optimism/superchain-registry/superchain => github.com/bobanetwork/superchain-registry/superchain v0.0.0-20250107213715-cb3c5cb83e2e diff --git a/go.sum b/go.sum index 3a45ddfd4f..e2916d8900 100644 --- a/go.sum +++ b/go.sum @@ -94,8 +94,8 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bits-and-blooms/bitset v1.13.0 h1:bAQ9OPNFYbGHV6Nez0tmNI0RiEu7/hxlYJRUA0wFAVE= github.com/bits-and-blooms/bitset v1.13.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8= -github.com/bobanetwork/superchain-registry/superchain v0.0.0-20241205210931-5e9b6db19ee3 h1:keQvcCoOu9AiB0oAiA0tVW8IrFKVeXuPJPq7uBLXNfs= -github.com/bobanetwork/superchain-registry/superchain v0.0.0-20241205210931-5e9b6db19ee3/go.mod h1:9feO8jcL5OZ1tvRjEfNAHz4Aggvd6373l+ZxmZZAyZs= +github.com/bobanetwork/superchain-registry/superchain v0.0.0-20250107213715-cb3c5cb83e2e h1:4oA6AvcG16s+ZPyv7mIxk+8XYcgIbCyyXLw7e9p5NRY= +github.com/bobanetwork/superchain-registry/superchain v0.0.0-20250107213715-cb3c5cb83e2e/go.mod h1:9feO8jcL5OZ1tvRjEfNAHz4Aggvd6373l+ZxmZZAyZs= github.com/btcsuite/btcd/btcec/v2 v2.3.4 h1:3EJjcN70HCu/mwqlUsGK8GcNVyLVxFDlWurTXGPFfiQ= github.com/btcsuite/btcd/btcec/v2 v2.3.4/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= diff --git a/params/superchain_test.go b/params/superchain_test.go index 07d4534111..644c70ef80 100644 --- a/params/superchain_test.go +++ b/params/superchain_test.go @@ -216,6 +216,7 @@ var bobaMainnetCfg = hardforkConfig{ EcotoneTime: uint64(1713302880), FjordTime: uint64(1725951600), GraniteTime: uint64(1729753200), + HoloceneTime: uint64(1738785600), EIP1559Elasticity: 6, EIP1559Denominator: 50, EIP1559DenominatorCanyon: 250, @@ -311,11 +312,7 @@ func TestChainConfigByOpStackChainName(t *testing.T) { require.Equal(t, expectedHarhardforkCfg.EcotoneTime, *gotCfg.EcotoneTime) require.Equal(t, expectedHarhardforkCfg.FjordTime, *gotCfg.FjordTime) require.Equal(t, expectedHarhardforkCfg.GraniteTime, *gotCfg.GraniteTime) - if expectedHarhardforkCfg.HoloceneTime != 0 { - require.Equal(t, expectedHarhardforkCfg.HoloceneTime, *gotCfg.HoloceneTime) - } else { - require.Nil(t, gotCfg.HoloceneTime) - } + require.Equal(t, expectedHarhardforkCfg.HoloceneTime, *gotCfg.HoloceneTime) // EIP-1559 require.Equal(t, expectedHarhardforkCfg.EIP1559Elasticity, gotCfg.Optimism.EIP1559Elasticity) From b6f639dba60d6c4537997444115560192499f638 Mon Sep 17 00:00:00 2001 From: cby3149 Date: Wed, 8 Jan 2025 09:47:01 -0800 Subject: [PATCH 2/2] Fix holocene hardfork for op mainnet --- params/superchain_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/params/superchain_test.go b/params/superchain_test.go index 644c70ef80..5a26b3e2fc 100644 --- a/params/superchain_test.go +++ b/params/superchain_test.go @@ -280,6 +280,7 @@ var opMainnetCfg = hardforkConfig{ EcotoneTime: uint64(1710374401), FjordTime: uint64(1720627201), GraniteTime: uint64(1726070401), + HoloceneTime: uint64(1736445601), EIP1559Elasticity: 6, EIP1559Denominator: 50, EIP1559DenominatorCanyon: 250,