diff --git a/go.work b/go.work index b39576e8dc61b..9855c351f286f 100644 --- a/go.work +++ b/go.work @@ -19,7 +19,7 @@ use ( ./teleportr ) -replace github.com/ethereum/go-ethereum v1.10.23 => github.com/ethereum-optimism/op-geth v0.0.0-20220921202220-511148385c73 +replace github.com/ethereum/go-ethereum v1.10.23 => github.com/ethereum-optimism/op-geth v0.0.0-20220926184707-53d23c240afd // For local debugging: //replace github.com/ethereum/go-ethereum v1.10.23 => ../go-ethereum diff --git a/op-batcher/go.mod b/op-batcher/go.mod index 1bcd4cefd6469..2f34687c6823e 100644 --- a/op-batcher/go.mod +++ b/op-batcher/go.mod @@ -70,4 +70,4 @@ require ( gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect ) -replace github.com/ethereum/go-ethereum v1.10.23 => github.com/ethereum-optimism/op-geth v0.0.0-20220921202220-511148385c73 +replace github.com/ethereum/go-ethereum v1.10.23 => github.com/ethereum-optimism/op-geth v0.0.0-20220926184707-53d23c240afd diff --git a/op-batcher/go.sum b/op-batcher/go.sum index e4d2a2cd4e7cf..a8ef0d751edfd 100644 --- a/op-batcher/go.sum +++ b/op-batcher/go.sum @@ -147,8 +147,8 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/ethereum-optimism/op-geth v0.0.0-20220921202220-511148385c73 h1:eXnnByFF0QiN1Qrq0wYmvI5lbDM8QQM0pv6AHx2FLnk= -github.com/ethereum-optimism/op-geth v0.0.0-20220921202220-511148385c73/go.mod h1:/6CsT5Ceen2WPLI/oCA3xMcZ5sWMF/D46SjM/ayY0Oo= +github.com/ethereum-optimism/op-geth v0.0.0-20220926184707-53d23c240afd h1:NchOnosWOkH9wlix8QevGHE+6vuRa+OMGvDNsczv2kQ= +github.com/ethereum-optimism/op-geth v0.0.0-20220926184707-53d23c240afd/go.mod h1:/6CsT5Ceen2WPLI/oCA3xMcZ5sWMF/D46SjM/ayY0Oo= github.com/ethereum-optimism/optimism/op-bindings v0.8.7 h1:/WSsNqCSZw9JzPb0nv9SFdD+tj/u/9Jcf8AahDMQJDM= github.com/ethereum-optimism/optimism/op-bindings v0.8.7/go.mod h1:3TGO6MZKWHY0Qo7S49xboaoCro2LuopTDI3Otp88EBI= github.com/ethereum-optimism/optimism/op-node v0.8.7 h1:qunRx02Ph9DciM5j2YR3ie9noD0iYHLxN8CRd6oIJLA= diff --git a/op-bindings/go.mod b/op-bindings/go.mod index 42863a6ccace5..880ecf170edc7 100644 --- a/op-bindings/go.mod +++ b/op-bindings/go.mod @@ -40,6 +40,6 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/ethereum/go-ethereum v1.10.23 => github.com/ethereum-optimism/op-geth v0.0.0-20220921202220-511148385c73 +replace github.com/ethereum/go-ethereum v1.10.23 => github.com/ethereum-optimism/op-geth v0.0.0-20220926184707-53d23c240afd // github.com/ethereum-optimism/op-geth v0.0.0-20220909213840-e6575c0168f1 diff --git a/op-bindings/go.sum b/op-bindings/go.sum index 323ccaf38018d..72340723da9c2 100644 --- a/op-bindings/go.sum +++ b/op-bindings/go.sum @@ -28,8 +28,8 @@ github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 h1:YLtO71vCjJRCBcrPMtQ9nqBsqpA1 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1/go.mod h1:hyedUtir6IdtD/7lIxGeCxkaw7y45JueMRL4DIyJDKs= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/edsrzf/mmap-go v1.0.0 h1:CEBF7HpRnUCSJgGUb5h1Gm7e3VkmVDrR8lvWVLtrOFw= -github.com/ethereum-optimism/op-geth v0.0.0-20220921202220-511148385c73 h1:eXnnByFF0QiN1Qrq0wYmvI5lbDM8QQM0pv6AHx2FLnk= -github.com/ethereum-optimism/op-geth v0.0.0-20220921202220-511148385c73/go.mod h1:/6CsT5Ceen2WPLI/oCA3xMcZ5sWMF/D46SjM/ayY0Oo= +github.com/ethereum-optimism/op-geth v0.0.0-20220926184707-53d23c240afd h1:NchOnosWOkH9wlix8QevGHE+6vuRa+OMGvDNsczv2kQ= +github.com/ethereum-optimism/op-geth v0.0.0-20220926184707-53d23c240afd/go.mod h1:/6CsT5Ceen2WPLI/oCA3xMcZ5sWMF/D46SjM/ayY0Oo= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI= diff --git a/op-chain-ops/deployer/deployer.go b/op-chain-ops/deployer/deployer.go index e596598e56f89..c2f0056ef7ac5 100644 --- a/op-chain-ops/deployer/deployer.go +++ b/op-chain-ops/deployer/deployer.go @@ -9,6 +9,8 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/ethereum/go-ethereum/consensus/beacon" + "github.com/ethereum/go-ethereum/consensus/ethash" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" @@ -43,12 +45,40 @@ func NewBackend() *backends.SimulatedBackend { } func NewBackendWithGenesisTimestamp(ts uint64) *backends.SimulatedBackend { + chainConfig := params.ChainConfig{ + ChainID: ChainID, + HomesteadBlock: big.NewInt(0), + DAOForkBlock: nil, + DAOForkSupport: false, + EIP150Block: big.NewInt(0), + EIP150Hash: common.Hash{}, + EIP155Block: big.NewInt(0), + EIP158Block: big.NewInt(0), + ByzantiumBlock: big.NewInt(0), + ConstantinopleBlock: big.NewInt(0), + PetersburgBlock: big.NewInt(0), + IstanbulBlock: big.NewInt(0), + MuirGlacierBlock: big.NewInt(0), + BerlinBlock: big.NewInt(0), + LondonBlock: big.NewInt(0), + ArrowGlacierBlock: big.NewInt(0), + GrayGlacierBlock: big.NewInt(0), + ShanghaiBlock: nil, + CancunBlock: nil, + // Activated proof of stake. We manually build/commit blocks in the simulator anyway, + // and the timestamp verification of PoS is not against the wallclock, + // preventing blocks from getting stuck temporarily in the future-blocks queue, decreasing setup time a lot. + MergeNetsplitBlock: big.NewInt(0), + TerminalTotalDifficulty: big.NewInt(0), + TerminalTotalDifficultyPassed: true, + } + return backends.NewSimulatedBackendWithOpts( backends.WithCacheConfig(&core.CacheConfig{ Preimages: true, }), backends.WithGenesis(core.Genesis{ - Config: params.AllEthashProtocolChanges, + Config: &chainConfig, Timestamp: ts, Difficulty: big.NewInt(0), Alloc: core.GenesisAlloc{ @@ -56,6 +86,7 @@ func NewBackendWithGenesisTimestamp(ts uint64) *backends.SimulatedBackend { }, GasLimit: 15000000, }), + backends.WithConsensus(beacon.New(ethash.NewFaker())), ) } diff --git a/op-chain-ops/genesis/config.go b/op-chain-ops/genesis/config.go index 490e869be8f76..336a8ea5811d5 100644 --- a/op-chain-ops/genesis/config.go +++ b/op-chain-ops/genesis/config.go @@ -5,6 +5,7 @@ import ( "os" "path/filepath" + "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/rpc" @@ -12,7 +13,6 @@ import ( "github.com/ethereum-optimism/optimism/op-bindings/predeploys" "github.com/ethereum-optimism/optimism/op-chain-ops/immutables" "github.com/ethereum-optimism/optimism/op-chain-ops/state" - "github.com/ethereum/go-ethereum/common" ) // DeployConfig represents the deployment configuration for Optimism @@ -40,7 +40,7 @@ type DeployConfig struct { L1BlockTime uint64 `json:"l1BlockTime"` L1GenesisBlockTimestamp hexutil.Uint64 `json:"l1GenesisBlockTimestamp"` L1GenesisBlockNonce hexutil.Uint64 `json:"l1GenesisBlockNonce"` - CliqueSignerAddress common.Address `json:"cliqueSignerAddress"` + CliqueSignerAddress common.Address `json:"cliqueSignerAddress"` // proof of stake genesis if left zeroed. L1GenesisBlockGasLimit hexutil.Uint64 `json:"l1GenesisBlockGasLimit"` L1GenesisBlockDifficulty *hexutil.Big `json:"l1GenesisBlockDifficulty"` L1GenesisBlockMixHash common.Hash `json:"l1GenesisBlockMixHash"` diff --git a/op-chain-ops/genesis/genesis.go b/op-chain-ops/genesis/genesis.go index 0c336f78fc7d3..1239439e0ba10 100644 --- a/op-chain-ops/genesis/genesis.go +++ b/op-chain-ops/genesis/genesis.go @@ -5,11 +5,10 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/core" + "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/params" ) @@ -100,12 +99,40 @@ func NewL1Genesis(config *DeployConfig) (*core.Genesis, error) { return nil, errors.New("must define L1 ChainID") } - chainConfig := *params.AllCliqueProtocolChanges - chainConfig.Clique = ¶ms.CliqueConfig{ - Period: config.L1BlockTime, - Epoch: 30000, + chainConfig := params.ChainConfig{ + ChainID: uint642Big(config.L1ChainID), + HomesteadBlock: big.NewInt(0), + DAOForkBlock: nil, + DAOForkSupport: false, + EIP150Block: big.NewInt(0), + EIP150Hash: common.Hash{}, + EIP155Block: big.NewInt(0), + EIP158Block: big.NewInt(0), + ByzantiumBlock: big.NewInt(0), + ConstantinopleBlock: big.NewInt(0), + PetersburgBlock: big.NewInt(0), + IstanbulBlock: big.NewInt(0), + MuirGlacierBlock: big.NewInt(0), + BerlinBlock: big.NewInt(0), + LondonBlock: big.NewInt(0), + ArrowGlacierBlock: big.NewInt(0), + GrayGlacierBlock: big.NewInt(0), + ShanghaiBlock: nil, + CancunBlock: nil, + } + + if config.CliqueSignerAddress != (common.Address{}) { + // warning: clique has an overly strict block header timestamp check against the system wallclock, + // causing blocks to get scheduled as "future block" and not get mined instantly when produced. + chainConfig.Clique = ¶ms.CliqueConfig{ + Period: config.L1BlockTime, + Epoch: 30000, + } + } else { + chainConfig.MergeNetsplitBlock = big.NewInt(0) + chainConfig.TerminalTotalDifficulty = big.NewInt(0) + chainConfig.TerminalTotalDifficultyPassed = true } - chainConfig.ChainID = uint642Big(config.L1ChainID) gasLimit := config.L1GenesisBlockGasLimit if gasLimit == 0 { @@ -124,7 +151,10 @@ func NewL1Genesis(config *DeployConfig) (*core.Genesis, error) { timestamp = hexutil.Uint64(time.Now().Unix()) } - extraData := append(append(make([]byte, 32), config.CliqueSignerAddress[:]...), make([]byte, crypto.SignatureLength)...) + extraData := make([]byte, 0) + if config.CliqueSignerAddress != (common.Address{}) { + extraData = append(append(make([]byte, 32), config.CliqueSignerAddress[:]...), make([]byte, crypto.SignatureLength)...) + } return &core.Genesis{ Config: &chainConfig, diff --git a/op-chain-ops/go.mod b/op-chain-ops/go.mod index 4241f757d3b59..fae1ab0c1bc9b 100644 --- a/op-chain-ops/go.mod +++ b/op-chain-ops/go.mod @@ -58,4 +58,4 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/ethereum/go-ethereum v1.10.23 => github.com/ethereum-optimism/op-geth v0.0.0-20220921202220-511148385c73 +replace github.com/ethereum/go-ethereum v1.10.23 => github.com/ethereum-optimism/op-geth v0.0.0-20220926184707-53d23c240afd diff --git a/op-chain-ops/go.sum b/op-chain-ops/go.sum index 5b07126acd849..194e1fe4439e4 100644 --- a/op-chain-ops/go.sum +++ b/op-chain-ops/go.sum @@ -172,8 +172,8 @@ github.com/elastic/gosigar v0.12.0/go.mod h1:iXRIGg2tLnu7LBdpqzyQfGDEidKCfWcCMS0 github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/ethereum-optimism/op-geth v0.0.0-20220921202220-511148385c73 h1:eXnnByFF0QiN1Qrq0wYmvI5lbDM8QQM0pv6AHx2FLnk= -github.com/ethereum-optimism/op-geth v0.0.0-20220921202220-511148385c73/go.mod h1:/6CsT5Ceen2WPLI/oCA3xMcZ5sWMF/D46SjM/ayY0Oo= +github.com/ethereum-optimism/op-geth v0.0.0-20220926184707-53d23c240afd h1:NchOnosWOkH9wlix8QevGHE+6vuRa+OMGvDNsczv2kQ= +github.com/ethereum-optimism/op-geth v0.0.0-20220926184707-53d23c240afd/go.mod h1:/6CsT5Ceen2WPLI/oCA3xMcZ5sWMF/D46SjM/ayY0Oo= github.com/ethereum-optimism/optimism/l2geth v0.0.0-20220820030939-de38b6f6f77e h1:LUfy9ofKcen9Cm1T9JyGNnrPLR2AmyelFbohS6bs4X8= github.com/ethereum-optimism/optimism/l2geth v0.0.0-20220820030939-de38b6f6f77e/go.mod h1:Oj5A6Qs/Ao1SP17i3uKroyhz49q/ehagSXRAlvwaI5Y= github.com/ethereum-optimism/optimism/op-bindings v0.8.7 h1:/WSsNqCSZw9JzPb0nv9SFdD+tj/u/9Jcf8AahDMQJDM= diff --git a/op-e2e/go.mod b/op-e2e/go.mod index 46f702ea36aa8..1d689818a6712 100644 --- a/op-e2e/go.mod +++ b/op-e2e/go.mod @@ -155,4 +155,4 @@ require ( lukechampine.com/blake3 v1.1.7 // indirect ) -replace github.com/ethereum/go-ethereum v1.10.23 => github.com/ethereum-optimism/op-geth v0.0.0-20220921202220-511148385c73 +replace github.com/ethereum/go-ethereum v1.10.23 => github.com/ethereum-optimism/op-geth v0.0.0-20220926184707-53d23c240afd diff --git a/op-e2e/go.sum b/op-e2e/go.sum index f9621f04efcb9..4776cba771a94 100644 --- a/op-e2e/go.sum +++ b/op-e2e/go.sum @@ -239,8 +239,8 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/ethereum-optimism/op-geth v0.0.0-20220921202220-511148385c73 h1:eXnnByFF0QiN1Qrq0wYmvI5lbDM8QQM0pv6AHx2FLnk= -github.com/ethereum-optimism/op-geth v0.0.0-20220921202220-511148385c73/go.mod h1:/6CsT5Ceen2WPLI/oCA3xMcZ5sWMF/D46SjM/ayY0Oo= +github.com/ethereum-optimism/op-geth v0.0.0-20220926184707-53d23c240afd h1:NchOnosWOkH9wlix8QevGHE+6vuRa+OMGvDNsczv2kQ= +github.com/ethereum-optimism/op-geth v0.0.0-20220926184707-53d23c240afd/go.mod h1:/6CsT5Ceen2WPLI/oCA3xMcZ5sWMF/D46SjM/ayY0Oo= github.com/ethereum-optimism/optimism/op-batcher v0.8.7 h1:9Qs84Gk3x9Le0xuX5ZBFgajYk8EuQ2Jwxz6qc6wheD0= github.com/ethereum-optimism/optimism/op-batcher v0.8.7/go.mod h1:f7Hk2UQB5ynfgaCWaIDel4htNyu2mXuoJpAYMeD7iyk= github.com/ethereum-optimism/optimism/op-bindings v0.8.7 h1:/WSsNqCSZw9JzPb0nv9SFdD+tj/u/9Jcf8AahDMQJDM= diff --git a/op-node/go.mod b/op-node/go.mod index e116bd0aeb7c5..2980063fe7ea3 100644 --- a/op-node/go.mod +++ b/op-node/go.mod @@ -159,4 +159,4 @@ require ( lukechampine.com/blake3 v1.1.7 // indirect ) -replace github.com/ethereum/go-ethereum v1.10.23 => github.com/ethereum-optimism/op-geth v0.0.0-20220921202220-511148385c73 +replace github.com/ethereum/go-ethereum v1.10.23 => github.com/ethereum-optimism/op-geth v0.0.0-20220926184707-53d23c240afd diff --git a/op-node/go.sum b/op-node/go.sum index e547ab3499d48..4dead30c97238 100644 --- a/op-node/go.sum +++ b/op-node/go.sum @@ -188,8 +188,8 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/ethereum-optimism/op-geth v0.0.0-20220921202220-511148385c73 h1:eXnnByFF0QiN1Qrq0wYmvI5lbDM8QQM0pv6AHx2FLnk= -github.com/ethereum-optimism/op-geth v0.0.0-20220921202220-511148385c73/go.mod h1:/6CsT5Ceen2WPLI/oCA3xMcZ5sWMF/D46SjM/ayY0Oo= +github.com/ethereum-optimism/op-geth v0.0.0-20220926184707-53d23c240afd h1:NchOnosWOkH9wlix8QevGHE+6vuRa+OMGvDNsczv2kQ= +github.com/ethereum-optimism/op-geth v0.0.0-20220926184707-53d23c240afd/go.mod h1:/6CsT5Ceen2WPLI/oCA3xMcZ5sWMF/D46SjM/ayY0Oo= github.com/ethereum-optimism/optimism/op-bindings v0.8.7 h1:/WSsNqCSZw9JzPb0nv9SFdD+tj/u/9Jcf8AahDMQJDM= github.com/ethereum-optimism/optimism/op-bindings v0.8.7/go.mod h1:3TGO6MZKWHY0Qo7S49xboaoCro2LuopTDI3Otp88EBI= github.com/ethereum-optimism/optimism/op-chain-ops v0.8.7 h1:IE825906yyrm5EHAuCLlBOI4kzQHOdCk0QujuTa0PEg= diff --git a/op-proposer/go.mod b/op-proposer/go.mod index 1b3a9e7052b5e..1906e36c44e4e 100644 --- a/op-proposer/go.mod +++ b/op-proposer/go.mod @@ -76,4 +76,4 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/ethereum/go-ethereum v1.10.23 => github.com/ethereum-optimism/op-geth v0.0.0-20220921202220-511148385c73 +replace github.com/ethereum/go-ethereum v1.10.23 => github.com/ethereum-optimism/op-geth v0.0.0-20220926184707-53d23c240afd diff --git a/op-proposer/go.sum b/op-proposer/go.sum index 38f3f548dca82..85a78a2e6b372 100644 --- a/op-proposer/go.sum +++ b/op-proposer/go.sum @@ -148,8 +148,8 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/ethereum-optimism/op-geth v0.0.0-20220921202220-511148385c73 h1:eXnnByFF0QiN1Qrq0wYmvI5lbDM8QQM0pv6AHx2FLnk= -github.com/ethereum-optimism/op-geth v0.0.0-20220921202220-511148385c73/go.mod h1:/6CsT5Ceen2WPLI/oCA3xMcZ5sWMF/D46SjM/ayY0Oo= +github.com/ethereum-optimism/op-geth v0.0.0-20220926184707-53d23c240afd h1:NchOnosWOkH9wlix8QevGHE+6vuRa+OMGvDNsczv2kQ= +github.com/ethereum-optimism/op-geth v0.0.0-20220926184707-53d23c240afd/go.mod h1:/6CsT5Ceen2WPLI/oCA3xMcZ5sWMF/D46SjM/ayY0Oo= github.com/ethereum-optimism/optimism/op-bindings v0.8.7 h1:/WSsNqCSZw9JzPb0nv9SFdD+tj/u/9Jcf8AahDMQJDM= github.com/ethereum-optimism/optimism/op-bindings v0.8.7/go.mod h1:3TGO6MZKWHY0Qo7S49xboaoCro2LuopTDI3Otp88EBI= github.com/ethereum-optimism/optimism/op-node v0.8.7 h1:qunRx02Ph9DciM5j2YR3ie9noD0iYHLxN8CRd6oIJLA= diff --git a/op-service/go.mod b/op-service/go.mod index 63e9bd4b9562b..b5134fd618b40 100644 --- a/op-service/go.mod +++ b/op-service/go.mod @@ -65,4 +65,4 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/ethereum/go-ethereum v1.10.23 => github.com/ethereum-optimism/op-geth v0.0.0-20220921202220-511148385c73 +replace github.com/ethereum/go-ethereum v1.10.23 => github.com/ethereum-optimism/op-geth v0.0.0-20220926184707-53d23c240afd diff --git a/op-service/go.sum b/op-service/go.sum index d0e1e73d5680c..24130690f718a 100644 --- a/op-service/go.sum +++ b/op-service/go.sum @@ -108,8 +108,8 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/ethereum-optimism/op-geth v0.0.0-20220921202220-511148385c73 h1:eXnnByFF0QiN1Qrq0wYmvI5lbDM8QQM0pv6AHx2FLnk= -github.com/ethereum-optimism/op-geth v0.0.0-20220921202220-511148385c73/go.mod h1:/6CsT5Ceen2WPLI/oCA3xMcZ5sWMF/D46SjM/ayY0Oo= +github.com/ethereum-optimism/op-geth v0.0.0-20220926184707-53d23c240afd h1:NchOnosWOkH9wlix8QevGHE+6vuRa+OMGvDNsczv2kQ= +github.com/ethereum-optimism/op-geth v0.0.0-20220926184707-53d23c240afd/go.mod h1:/6CsT5Ceen2WPLI/oCA3xMcZ5sWMF/D46SjM/ayY0Oo= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fjl/memsize v0.0.1 h1:+zhkb+dhUgx0/e+M8sF0QqiouvMQUiKR+QYvdxIOKcQ= github.com/fjl/memsize v0.0.1/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0=