From 10c450e4ba7ec350ab1f0b8d604803c62e8b3c3b Mon Sep 17 00:00:00 2001 From: Josh Klopfenstein Date: Mon, 3 Nov 2025 11:31:49 -0800 Subject: [PATCH 1/4] all: update op-geth to pull in fusaka timestamps --- go.mod | 4 ++-- go.sum | 8 ++++---- op-service/txmgr/cli_test.go | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index a55711bdd79..89bc0b8349f 100644 --- a/go.mod +++ b/go.mod @@ -162,7 +162,7 @@ require ( github.com/hashicorp/golang-lru v0.5.0 // indirect github.com/hashicorp/golang-lru/arc/v2 v2.0.7 // indirect github.com/hashicorp/raft-boltdb v0.0.0-20231211162105-6c830fa4535e // indirect - github.com/holiman/billy v0.0.0-20240216141850-2abb0c79d3c4 // indirect + github.com/holiman/billy v0.0.0-20250707135307-f2f9b9aae7db // indirect github.com/holiman/bloomfilter/v2 v2.0.3 // indirect github.com/huin/goupnp v1.3.0 // indirect github.com/influxdata/influxdb-client-go/v2 v2.4.0 // indirect @@ -308,7 +308,7 @@ require ( lukechampine.com/blake3 v1.3.0 // indirect ) -replace github.com/ethereum/go-ethereum => github.com/ethereum-optimism/op-geth v1.101603.3-rc.3 +replace github.com/ethereum/go-ethereum => github.com/ethereum-optimism/op-geth v1.101603.4-0.20251103191005-3e7dd84c9ae2 // replace github.com/ethereum/go-ethereum => ../op-geth diff --git a/go.sum b/go.sum index 4e96d52c1a7..7d718e1992e 100644 --- a/go.sum +++ b/go.sum @@ -238,8 +238,8 @@ github.com/emicklei/dot v1.6.2 h1:08GN+DD79cy/tzN6uLCT84+2Wk9u+wvqP+Hkx/dIR8A= github.com/emicklei/dot v1.6.2/go.mod h1:DeV7GvQtIw4h2u73RKBkkFdvVAz0D9fzeJrgPW6gy/s= github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.4-0.20251001155152-4eb15ccedf7e h1:iy1vBIzACYUyOVyoADUwvAiq2eOPC0yVsDUdolPwQjk= github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.4-0.20251001155152-4eb15ccedf7e/go.mod h1:DYj7+vYJ4cIB7zera9mv4LcAynCL5u4YVfoeUu6Wa+w= -github.com/ethereum-optimism/op-geth v1.101603.3-rc.3 h1:KGpZouRMsMcl9MWOmYKJi+XR1gTT9/2STANv1G7oaNA= -github.com/ethereum-optimism/op-geth v1.101603.3-rc.3/go.mod h1:Wiy9cngs7ll1slc/dcHHRVuGhozWOpF1y6f31xENR7k= +github.com/ethereum-optimism/op-geth v1.101603.4-0.20251103191005-3e7dd84c9ae2 h1:HE3kupOf4DPVDvK5YZjzHtSqdx16xlzDu9LPwh4+E6o= +github.com/ethereum-optimism/op-geth v1.101603.4-0.20251103191005-3e7dd84c9ae2/go.mod h1:cnGR2M8zX91+rRQxXyNTEOEpw/IwdR8P11FQX7Xaqwk= github.com/ethereum-optimism/superchain-registry/validation v0.0.0-20251009180028-9b4658b9b7af h1:WWz0gJM/boaUImtJnROecPirAerKCLpAU4m6Tx0ArOg= github.com/ethereum-optimism/superchain-registry/validation v0.0.0-20251009180028-9b4658b9b7af/go.mod h1:NZ816PzLU1TLv1RdAvYAb6KWOj4Zm5aInT0YpDVml2Y= github.com/ethereum/c-kzg-4844/v2 v2.1.5 h1:aVtoLK5xwJ6c5RiqO8g8ptJ5KU+2Hdquf6G3aXiHh5s= @@ -432,8 +432,8 @@ github.com/hashicorp/raft-boltdb v0.0.0-20231211162105-6c830fa4535e h1:SK4y8oR4Z github.com/hashicorp/raft-boltdb v0.0.0-20231211162105-6c830fa4535e/go.mod h1:EMz/UIuG93P0MBeHh6CbXQAEe8ckVJLZjhD17lBzK5Q= github.com/hashicorp/raft-boltdb/v2 v2.3.1 h1:ackhdCNPKblmOhjEU9+4lHSJYFkJd6Jqyvj6eW9pwkc= github.com/hashicorp/raft-boltdb/v2 v2.3.1/go.mod h1:n4S+g43dXF1tqDT+yzcXHhXM6y7MrlUd3TTwGRcUvQE= -github.com/holiman/billy v0.0.0-20240216141850-2abb0c79d3c4 h1:X4egAf/gcS1zATw6wn4Ej8vjuVGxeHdan+bRb2ebyv4= -github.com/holiman/billy v0.0.0-20240216141850-2abb0c79d3c4/go.mod h1:5GuXa7vkL8u9FkFuWdVvfR5ix8hRB7DbOAaYULamFpc= +github.com/holiman/billy v0.0.0-20250707135307-f2f9b9aae7db h1:IZUYC/xb3giYwBLMnr8d0TGTzPKFGNTCGgGLoyeX330= +github.com/holiman/billy v0.0.0-20250707135307-f2f9b9aae7db/go.mod h1:xTEYN9KCHxuYHs+NmrmzFcnvHMzLLNiGFafCb1n3Mfg= github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao= github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA= github.com/holiman/uint256 v1.3.2 h1:a9EgMPSC1AAaj1SZL5zIQD3WbwTuHrMGOerLjGmM/TA= diff --git a/op-service/txmgr/cli_test.go b/op-service/txmgr/cli_test.go index 892a9d498d5..eee02aaca2e 100644 --- a/op-service/txmgr/cli_test.go +++ b/op-service/txmgr/cli_test.go @@ -46,7 +46,7 @@ func configForArgs(args ...string) CLIConfig { func TestFallbackToOsakaCellProofTimeIfKnown(t *testing.T) { // No override, but we detect the L1 is Mainnet (no Osaka time yet) cellProofTime := fallbackToOsakaCellProofTimeIfKnown(big.NewInt(1), math.MaxUint64) - require.Equal(t, uint64(18446744073709551615), cellProofTime) + require.Equal(t, uint64(1764798551), cellProofTime) // No override, but we detect the L1 is Sepolia cellProofTime = fallbackToOsakaCellProofTimeIfKnown(big.NewInt(11155111), math.MaxUint64) From eb665613af89ffb220e616695e72ff262d1a8f65 Mon Sep 17 00:00:00 2001 From: Josh Klopfenstein Date: Mon, 3 Nov 2025 12:52:05 -0800 Subject: [PATCH 2/4] update for scr changes --- go.mod | 2 +- go.sum | 4 ++-- op-node/chaincfg/chains_test.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 89bc0b8349f..be22daed5c8 100644 --- a/go.mod +++ b/go.mod @@ -308,7 +308,7 @@ require ( lukechampine.com/blake3 v1.3.0 // indirect ) -replace github.com/ethereum/go-ethereum => github.com/ethereum-optimism/op-geth v1.101603.4-0.20251103191005-3e7dd84c9ae2 +replace github.com/ethereum/go-ethereum => github.com/ethereum-optimism/op-geth v1.101603.4-0.20251103204619-9a4dd6333357 // replace github.com/ethereum/go-ethereum => ../op-geth diff --git a/go.sum b/go.sum index 7d718e1992e..f604b791a4d 100644 --- a/go.sum +++ b/go.sum @@ -238,8 +238,8 @@ github.com/emicklei/dot v1.6.2 h1:08GN+DD79cy/tzN6uLCT84+2Wk9u+wvqP+Hkx/dIR8A= github.com/emicklei/dot v1.6.2/go.mod h1:DeV7GvQtIw4h2u73RKBkkFdvVAz0D9fzeJrgPW6gy/s= github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.4-0.20251001155152-4eb15ccedf7e h1:iy1vBIzACYUyOVyoADUwvAiq2eOPC0yVsDUdolPwQjk= github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.4-0.20251001155152-4eb15ccedf7e/go.mod h1:DYj7+vYJ4cIB7zera9mv4LcAynCL5u4YVfoeUu6Wa+w= -github.com/ethereum-optimism/op-geth v1.101603.4-0.20251103191005-3e7dd84c9ae2 h1:HE3kupOf4DPVDvK5YZjzHtSqdx16xlzDu9LPwh4+E6o= -github.com/ethereum-optimism/op-geth v1.101603.4-0.20251103191005-3e7dd84c9ae2/go.mod h1:cnGR2M8zX91+rRQxXyNTEOEpw/IwdR8P11FQX7Xaqwk= +github.com/ethereum-optimism/op-geth v1.101603.4-0.20251103204619-9a4dd6333357 h1:ABr8kl+Dk0Dpz8h6tSbfGlDFKpEx163xBx5cUtR5mHg= +github.com/ethereum-optimism/op-geth v1.101603.4-0.20251103204619-9a4dd6333357/go.mod h1:cnGR2M8zX91+rRQxXyNTEOEpw/IwdR8P11FQX7Xaqwk= github.com/ethereum-optimism/superchain-registry/validation v0.0.0-20251009180028-9b4658b9b7af h1:WWz0gJM/boaUImtJnROecPirAerKCLpAU4m6Tx0ArOg= github.com/ethereum-optimism/superchain-registry/validation v0.0.0-20251009180028-9b4658b9b7af/go.mod h1:NZ816PzLU1TLv1RdAvYAb6KWOj4Zm5aInT0YpDVml2Y= github.com/ethereum/c-kzg-4844/v2 v2.1.5 h1:aVtoLK5xwJ6c5RiqO8g8ptJ5KU+2Hdquf6G3aXiHh5s= diff --git a/op-node/chaincfg/chains_test.go b/op-node/chaincfg/chains_test.go index fe2c1682dda..dd0ff560cab 100644 --- a/op-node/chaincfg/chains_test.go +++ b/op-node/chaincfg/chains_test.go @@ -77,7 +77,7 @@ var mainnetCfg = rollup.Config{ GraniteTime: u64Ptr(1726070401), HoloceneTime: u64Ptr(1736445601), IsthmusTime: u64Ptr(1746806401), - JovianTime: u64Ptr(1764086401), + JovianTime: u64Ptr(1764691201), ProtocolVersionsAddress: common.HexToAddress("0x8062AbC286f5e7D9428a0Ccb9AbD71e50d93b935"), ChainOpConfig: defaultOpConfig, } @@ -118,7 +118,7 @@ var sepoliaCfg = rollup.Config{ HoloceneTime: u64Ptr(1732633200), PectraBlobScheduleTime: u64Ptr(1742486400), IsthmusTime: u64Ptr(1744905600), - JovianTime: u64Ptr(1762963201), + JovianTime: u64Ptr(1763568001), ProtocolVersionsAddress: common.HexToAddress("0x79ADD5713B383DAa0a138d3C4780C7A1804a8090"), ChainOpConfig: defaultOpConfig, } From 86a238fa408aa2c213baf2a205fe3c0d0d6f0d41 Mon Sep 17 00:00:00 2001 From: Josh Klopfenstein Date: Mon, 3 Nov 2025 13:33:37 -0800 Subject: [PATCH 3/4] point go.mod at op-geth rc --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index be22daed5c8..057eeba7802 100644 --- a/go.mod +++ b/go.mod @@ -308,7 +308,7 @@ require ( lukechampine.com/blake3 v1.3.0 // indirect ) -replace github.com/ethereum/go-ethereum => github.com/ethereum-optimism/op-geth v1.101603.4-0.20251103204619-9a4dd6333357 +replace github.com/ethereum/go-ethereum => github.com/ethereum-optimism/op-geth v1.101603.4-rc.1 // replace github.com/ethereum/go-ethereum => ../op-geth diff --git a/go.sum b/go.sum index f604b791a4d..daec5bd6f99 100644 --- a/go.sum +++ b/go.sum @@ -238,8 +238,8 @@ github.com/emicklei/dot v1.6.2 h1:08GN+DD79cy/tzN6uLCT84+2Wk9u+wvqP+Hkx/dIR8A= github.com/emicklei/dot v1.6.2/go.mod h1:DeV7GvQtIw4h2u73RKBkkFdvVAz0D9fzeJrgPW6gy/s= github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.4-0.20251001155152-4eb15ccedf7e h1:iy1vBIzACYUyOVyoADUwvAiq2eOPC0yVsDUdolPwQjk= github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.4-0.20251001155152-4eb15ccedf7e/go.mod h1:DYj7+vYJ4cIB7zera9mv4LcAynCL5u4YVfoeUu6Wa+w= -github.com/ethereum-optimism/op-geth v1.101603.4-0.20251103204619-9a4dd6333357 h1:ABr8kl+Dk0Dpz8h6tSbfGlDFKpEx163xBx5cUtR5mHg= -github.com/ethereum-optimism/op-geth v1.101603.4-0.20251103204619-9a4dd6333357/go.mod h1:cnGR2M8zX91+rRQxXyNTEOEpw/IwdR8P11FQX7Xaqwk= +github.com/ethereum-optimism/op-geth v1.101603.4-rc.1 h1:5ByBDUKBY/IHibukF/C9kjzaTk4SxUoXH449VuDrMn4= +github.com/ethereum-optimism/op-geth v1.101603.4-rc.1/go.mod h1:cnGR2M8zX91+rRQxXyNTEOEpw/IwdR8P11FQX7Xaqwk= github.com/ethereum-optimism/superchain-registry/validation v0.0.0-20251009180028-9b4658b9b7af h1:WWz0gJM/boaUImtJnROecPirAerKCLpAU4m6Tx0ArOg= github.com/ethereum-optimism/superchain-registry/validation v0.0.0-20251009180028-9b4658b9b7af/go.mod h1:NZ816PzLU1TLv1RdAvYAb6KWOj4Zm5aInT0YpDVml2Y= github.com/ethereum/c-kzg-4844/v2 v2.1.5 h1:aVtoLK5xwJ6c5RiqO8g8ptJ5KU+2Hdquf6G3aXiHh5s= From 88d307ced5888b73f8936aefaf415a2dc135d509 Mon Sep 17 00:00:00 2001 From: Josh Klopfenstein Date: Mon, 3 Nov 2025 15:04:31 -0800 Subject: [PATCH 4/4] address comment --- op-service/txmgr/cli_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/op-service/txmgr/cli_test.go b/op-service/txmgr/cli_test.go index eee02aaca2e..759ce037d65 100644 --- a/op-service/txmgr/cli_test.go +++ b/op-service/txmgr/cli_test.go @@ -44,7 +44,7 @@ func configForArgs(args ...string) CLIConfig { } func TestFallbackToOsakaCellProofTimeIfKnown(t *testing.T) { - // No override, but we detect the L1 is Mainnet (no Osaka time yet) + // No override, but we detect the L1 is Mainnet cellProofTime := fallbackToOsakaCellProofTimeIfKnown(big.NewInt(1), math.MaxUint64) require.Equal(t, uint64(1764798551), cellProofTime)