op-geth: Update to latest op-geth

Brings in the Regolith consensus changes for the execution layer Updates the update-op-geth.py script to account for the new geth version and op-wheel being in the main go.mod now

op-geth: Update to latest op-geth
Brings in the Regolith consensus changes for the execution layer Updates the update-op-geth.py script to account for the new geth version and op-wheel being in the main go.mod now
f5a1a409 · Adrian Sutton · 75ab0172 · f5a1a409 · f5a1a409 · f5a1a409
Commit f5a1a409 authored Feb 24, 2023 by Adrian Sutton
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 7 deletions

go.mod go.mod +1 -1

go.sum go.sum +2 -2

go.mod indexer/go.mod +4 -1

update-op-geth.py ops/scripts/update-op-geth.py +3 -3

No files found.
--- a/go.mod
+++ b/go.mod
@@ -191,6 +191,6 @@ require (
 	nhooyr.io/websocket v1.8.7 // indirect
 )

-replace github.com/ethereum/go-ethereum v1.11.2 => github.com/ethereum-optimism/op-geth v0.0.0-20230222154945-12d211246519
+replace github.com/ethereum/go-ethereum v1.11.2 => github.com/ethereum-optimism/op-geth v1.11.2-aea0402.0.20230227230209-0705cf1b7df9

 //replace github.com/ethereum/go-ethereum v1.11.2 => ../go-ethereum
--- a/go.sum
+++ b/go.sum
@@ -217,8 +217,8 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7
 github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw=
 github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3 h1:RWHKLhCrQThMfch+QJ1Z8veEq5ZO3DfIhZ7xgRP9WTc=
 github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3/go.mod h1:QziizLAiF0KqyLdNJYD7O5cpDlaFMNZzlxYNcWsJUxs=
-github.com/ethereum-optimism/op-geth v0.0.0-20230222154945-12d211246519 h1:6ha+V+b2sHGSgJHLvrrrGjJM27Vr51g381Vq4Jj0Qfc=
-github.com/ethereum-optimism/op-geth v0.0.0-20230222154945-12d211246519/go.mod h1:/tjlXxOaovIyuF0l6+wCzr6AtDb3lYWTymmpQAQcqu8=
+github.com/ethereum-optimism/op-geth v1.11.2-aea0402.0.20230227230209-0705cf1b7df9 h1:O13fqCZYW+HiGVs+UFKtMUHnCMpWR7XcyTPijm9IAiY=
+github.com/ethereum-optimism/op-geth v1.11.2-aea0402.0.20230227230209-0705cf1b7df9/go.mod h1:/tjlXxOaovIyuF0l6+wCzr6AtDb3lYWTymmpQAQcqu8=
 github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=

--- a/indexer/go.mod
+++ b/indexer/go.mod
@@ -2,7 +2,10 @@ module github.com/ethereum-optimism/optimism/indexer

 go 1.17

-replace github.com/ethereum/go-ethereum v1.10.26 => github.com/ethereum-optimism/op-geth v0.0.0-20230214215134-401b7fd3309b
+replace (
+	github.com/ethereum/go-ethereum v1.10.26 => github.com/ethereum-optimism/op-geth v0.0.0-20230214215134-401b7fd3309b
+	github.com/ethereum/go-ethereum v1.11.2 => github.com/ethereum-optimism/op-geth v1.11.2-aea0402.0.20230227230209-0705cf1b7df9
+)

 require (
 	github.com/ethereum-optimism/optimism/op-bindings v0.10.14

--- a/ops/scripts/update-op-geth.py
+++ b/ops/scripts/update-op-geth.py
@@ -6,11 +6,11 @@ import subprocess
 import os


-GETH_VERSION='v1.10.26'
+GETH_VERSION='v1.11.2'


 def main():
-	for project in ('.', 'op-wheel', 'indexer'):
+	for project in ('.', 'indexer'):
 		print(f'Updating {project}...')
 		update_mod(project)

@@ -22,7 +22,7 @@ def update_mod(project):
 		'mod',
 		'edit',
 		'-replace',
-		f'github.com/ethereum/go-ethereum@{GETH_VERSION}=github.com/ethereum-optimism/op-geth@optimism-history'
+		f'github.com/ethereum/go-ethereum@{GETH_VERSION}=github.com/ethereum-optimism/op-geth@optimism'
 	], cwd=os.path.join(project), check=True)
 	print('Tidying...')
 	subprocess.run([