diff --git a/go.work b/go.work index ae2c0b34dfa3..383d3f1db5ae 100644 --- a/go.work +++ b/go.work @@ -19,7 +19,7 @@ use ( ./teleportr ) -replace github.com/ethereum/go-ethereum v1.10.21 => github.com/ethereum-optimism/reference-optimistic-geth v0.0.0-20220810221227-a68e5aa189e1 +replace github.com/ethereum/go-ethereum v1.10.21 => github.com/ethereum-optimism/op-geth v0.0.0-20220819161933-acfde114de61 // For local debugging: //replace github.com/ethereum/go-ethereum v1.10.21 => ../go-ethereum diff --git a/op-batcher/go.mod b/op-batcher/go.mod index cf4f0e71cb74..a5546838c934 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.21 => github.com/ethereum-optimism/reference-optimistic-geth v0.0.0-20220810221227-a68e5aa189e1 +replace github.com/ethereum/go-ethereum v1.10.21 => github.com/ethereum-optimism/op-geth v0.0.0-20220819161933-acfde114de61 diff --git a/op-batcher/go.sum b/op-batcher/go.sum index 74643eca1155..d207f2559a2b 100644 --- a/op-batcher/go.sum +++ b/op-batcher/go.sum @@ -155,8 +155,8 @@ github.com/ethereum-optimism/optimism/op-proposer v0.4.0 h1:hngSchpdW418heSRtPQJ github.com/ethereum-optimism/optimism/op-proposer v0.4.0/go.mod h1:gVAzBmhHcoznIFMzF8EUh5lmti8Wy7JaNqyPmDlbr1M= github.com/ethereum-optimism/optimism/op-service v0.4.0 h1:LhzEQ4obnN3/Qv2HGXI/ZyQgo+0afH6n+bwj7z1SZ68= github.com/ethereum-optimism/optimism/op-service v0.4.0/go.mod h1:PMl9VqIC3FPH/THwZFmwEyb3ytyAqGmMTzEw4R4J3FI= -github.com/ethereum-optimism/reference-optimistic-geth v0.0.0-20220810221227-a68e5aa189e1 h1:cLAkNAHg/ByqMvyMdcHaOLuJJeQY+YxHUYOPg6zDvjg= -github.com/ethereum-optimism/reference-optimistic-geth v0.0.0-20220810221227-a68e5aa189e1/go.mod h1:EYFyF19u3ezGLD4RqOkLq+ZCXzYbLoNDdZlMt7kyKFg= +github.com/ethereum-optimism/op-geth v0.0.0-20220819161933-acfde114de61 h1:+WfrwiRELp3hoeb1bnPws3FtUUoYCDDYsCkwvKek5FY= +github.com/ethereum-optimism/op-geth v0.0.0-20220819161933-acfde114de61/go.mod h1:EYFyF19u3ezGLD4RqOkLq+ZCXzYbLoNDdZlMt7kyKFg= github.com/ethereum/go-ethereum v1.10.4/go.mod h1:nEE0TP5MtxGzOMd7egIrbPJMQBnhVU3ELNxhBglIzhg= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= diff --git a/op-bindings/go.mod b/op-bindings/go.mod index 018bb7f90cc5..be1bf42b2033 100644 --- a/op-bindings/go.mod +++ b/op-bindings/go.mod @@ -41,4 +41,4 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/ethereum/go-ethereum v1.10.21 => github.com/ethereum-optimism/reference-optimistic-geth v0.0.0-20220810221227-a68e5aa189e1 +replace github.com/ethereum/go-ethereum v1.10.21 => github.com/ethereum-optimism/op-geth v0.0.0-20220819161933-acfde114de61 diff --git a/op-bindings/go.sum b/op-bindings/go.sum index 2284c6260c2b..fb66df18de4e 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/reference-optimistic-geth v0.0.0-20220810221227-a68e5aa189e1 h1:cLAkNAHg/ByqMvyMdcHaOLuJJeQY+YxHUYOPg6zDvjg= -github.com/ethereum-optimism/reference-optimistic-geth v0.0.0-20220810221227-a68e5aa189e1/go.mod h1:EYFyF19u3ezGLD4RqOkLq+ZCXzYbLoNDdZlMt7kyKFg= +github.com/ethereum-optimism/op-geth v0.0.0-20220819161933-acfde114de61 h1:+WfrwiRELp3hoeb1bnPws3FtUUoYCDDYsCkwvKek5FY= +github.com/ethereum-optimism/op-geth v0.0.0-20220819161933-acfde114de61/go.mod h1:EYFyF19u3ezGLD4RqOkLq+ZCXzYbLoNDdZlMt7kyKFg= 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-e2e/go.mod b/op-e2e/go.mod index 3677b1e0b77a..b7115390b427 100644 --- a/op-e2e/go.mod +++ b/op-e2e/go.mod @@ -148,4 +148,4 @@ require ( lukechampine.com/blake3 v1.1.7 // indirect ) -replace github.com/ethereum/go-ethereum v1.10.21 => github.com/ethereum-optimism/reference-optimistic-geth v0.0.0-20220810221227-a68e5aa189e1 +replace github.com/ethereum/go-ethereum v1.10.21 => github.com/ethereum-optimism/op-geth v0.0.0-20220819161933-acfde114de61 diff --git a/op-e2e/go.sum b/op-e2e/go.sum index e8afeec3c8c4..ad3982e49d49 100644 --- a/op-e2e/go.sum +++ b/op-e2e/go.sum @@ -244,8 +244,8 @@ github.com/ethereum-optimism/optimism/op-proposer v0.4.0 h1:hngSchpdW418heSRtPQJ github.com/ethereum-optimism/optimism/op-proposer v0.4.0/go.mod h1:gVAzBmhHcoznIFMzF8EUh5lmti8Wy7JaNqyPmDlbr1M= github.com/ethereum-optimism/optimism/op-service v0.4.0 h1:LhzEQ4obnN3/Qv2HGXI/ZyQgo+0afH6n+bwj7z1SZ68= github.com/ethereum-optimism/optimism/op-service v0.4.0/go.mod h1:PMl9VqIC3FPH/THwZFmwEyb3ytyAqGmMTzEw4R4J3FI= -github.com/ethereum-optimism/reference-optimistic-geth v0.0.0-20220810221227-a68e5aa189e1 h1:cLAkNAHg/ByqMvyMdcHaOLuJJeQY+YxHUYOPg6zDvjg= -github.com/ethereum-optimism/reference-optimistic-geth v0.0.0-20220810221227-a68e5aa189e1/go.mod h1:EYFyF19u3ezGLD4RqOkLq+ZCXzYbLoNDdZlMt7kyKFg= +github.com/ethereum-optimism/op-geth v0.0.0-20220819161933-acfde114de61 h1:+WfrwiRELp3hoeb1bnPws3FtUUoYCDDYsCkwvKek5FY= +github.com/ethereum-optimism/op-geth v0.0.0-20220819161933-acfde114de61/go.mod h1:EYFyF19u3ezGLD4RqOkLq+ZCXzYbLoNDdZlMt7kyKFg= github.com/ethereum/go-ethereum v1.10.4/go.mod h1:nEE0TP5MtxGzOMd7egIrbPJMQBnhVU3ELNxhBglIzhg= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= diff --git a/op-node/README.md b/op-node/README.md index 0e1fccd452f8..ab39862267a1 100644 --- a/op-node/README.md +++ b/op-node/README.md @@ -24,7 +24,7 @@ To start syncing the rollup: Connect to at least one L1 RPC and L2 execution engine: - L1: use any L1 node / RPC (websocket connection path may differ) -- L2: run the Optimism fork of geth: +- L2: run the Optimism fork of geth: Initialize the L2 chain with a `genesis.json` chain spec like L1, with the Merge fork activated from genesis. diff --git a/op-node/go.mod b/op-node/go.mod index e2edf0380ccd..94354eed6159 100644 --- a/op-node/go.mod +++ b/op-node/go.mod @@ -158,4 +158,4 @@ require ( lukechampine.com/blake3 v1.1.7 // indirect ) -replace github.com/ethereum/go-ethereum v1.10.21 => github.com/ethereum-optimism/reference-optimistic-geth v0.0.0-20220810221227-a68e5aa189e1 +replace github.com/ethereum/go-ethereum v1.10.21 => github.com/ethereum-optimism/op-geth v0.0.0-20220819161933-acfde114de61 diff --git a/op-node/go.sum b/op-node/go.sum index f497ff2d047a..2ae21469e4f7 100644 --- a/op-node/go.sum +++ b/op-node/go.sum @@ -189,8 +189,8 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.m github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/ethereum-optimism/optimism/op-bindings v0.4.0 h1:4Yop9PGMBUhRtg12aR/ydTTut72s/1J+ztl0lv8UvSI= github.com/ethereum-optimism/optimism/op-bindings v0.4.0/go.mod h1:LHuyDHLNLalBJouGRnryAivhRBz+r4T0+stIKaE1+/g= -github.com/ethereum-optimism/reference-optimistic-geth v0.0.0-20220810221227-a68e5aa189e1 h1:cLAkNAHg/ByqMvyMdcHaOLuJJeQY+YxHUYOPg6zDvjg= -github.com/ethereum-optimism/reference-optimistic-geth v0.0.0-20220810221227-a68e5aa189e1/go.mod h1:EYFyF19u3ezGLD4RqOkLq+ZCXzYbLoNDdZlMt7kyKFg= +github.com/ethereum-optimism/op-geth v0.0.0-20220819161933-acfde114de61 h1:+WfrwiRELp3hoeb1bnPws3FtUUoYCDDYsCkwvKek5FY= +github.com/ethereum-optimism/op-geth v0.0.0-20220819161933-acfde114de61/go.mod h1:EYFyF19u3ezGLD4RqOkLq+ZCXzYbLoNDdZlMt7kyKFg= 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= diff --git a/op-proposer/go.mod b/op-proposer/go.mod index 00addd0a1ce9..8c2a2d72c9d8 100644 --- a/op-proposer/go.mod +++ b/op-proposer/go.mod @@ -78,4 +78,4 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/ethereum/go-ethereum v1.10.21 => github.com/ethereum-optimism/reference-optimistic-geth v0.0.0-20220810221227-a68e5aa189e1 +replace github.com/ethereum/go-ethereum v1.10.21 => github.com/ethereum-optimism/op-geth v0.0.0-20220819161933-acfde114de61 diff --git a/op-proposer/go.sum b/op-proposer/go.sum index 8a22e5813fa8..e9466cdedd4a 100644 --- a/op-proposer/go.sum +++ b/op-proposer/go.sum @@ -156,8 +156,8 @@ github.com/ethereum-optimism/optimism/op-node v0.4.0 h1:JMciDGLS+LMxk46OLh2SJWRh github.com/ethereum-optimism/optimism/op-node v0.4.0/go.mod h1:gM5gaglsxm5wx39KGSZEmu48MWRL4AJjderg+jOGi/I= github.com/ethereum-optimism/optimism/op-service v0.4.0 h1:LhzEQ4obnN3/Qv2HGXI/ZyQgo+0afH6n+bwj7z1SZ68= github.com/ethereum-optimism/optimism/op-service v0.4.0/go.mod h1:PMl9VqIC3FPH/THwZFmwEyb3ytyAqGmMTzEw4R4J3FI= -github.com/ethereum-optimism/reference-optimistic-geth v0.0.0-20220810221227-a68e5aa189e1 h1:cLAkNAHg/ByqMvyMdcHaOLuJJeQY+YxHUYOPg6zDvjg= -github.com/ethereum-optimism/reference-optimistic-geth v0.0.0-20220810221227-a68e5aa189e1/go.mod h1:EYFyF19u3ezGLD4RqOkLq+ZCXzYbLoNDdZlMt7kyKFg= +github.com/ethereum-optimism/op-geth v0.0.0-20220819161933-acfde114de61 h1:+WfrwiRELp3hoeb1bnPws3FtUUoYCDDYsCkwvKek5FY= +github.com/ethereum-optimism/op-geth v0.0.0-20220819161933-acfde114de61/go.mod h1:EYFyF19u3ezGLD4RqOkLq+ZCXzYbLoNDdZlMt7kyKFg= github.com/ethereum/go-ethereum v1.10.4/go.mod h1:nEE0TP5MtxGzOMd7egIrbPJMQBnhVU3ELNxhBglIzhg= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= diff --git a/op-service/go.mod b/op-service/go.mod index e5aa3bbdb307..540daa0cb26a 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.21 => github.com/ethereum-optimism/reference-optimistic-geth v0.0.0-20220810221227-a68e5aa189e1 +replace github.com/ethereum/go-ethereum v1.10.21 => github.com/ethereum-optimism/op-geth v0.0.0-20220819161933-acfde114de61 diff --git a/op-service/go.sum b/op-service/go.sum index 3bfe94d9a282..919fa278e9b9 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/reference-optimistic-geth v0.0.0-20220810221227-a68e5aa189e1 h1:cLAkNAHg/ByqMvyMdcHaOLuJJeQY+YxHUYOPg6zDvjg= -github.com/ethereum-optimism/reference-optimistic-geth v0.0.0-20220810221227-a68e5aa189e1/go.mod h1:EYFyF19u3ezGLD4RqOkLq+ZCXzYbLoNDdZlMt7kyKFg= +github.com/ethereum-optimism/op-geth v0.0.0-20220819161933-acfde114de61 h1:+WfrwiRELp3hoeb1bnPws3FtUUoYCDDYsCkwvKek5FY= +github.com/ethereum-optimism/op-geth v0.0.0-20220819161933-acfde114de61/go.mod h1:EYFyF19u3ezGLD4RqOkLq+ZCXzYbLoNDdZlMt7kyKFg= 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= diff --git a/ops-bedrock/Dockerfile.l2 b/ops-bedrock/Dockerfile.l2 index 8f73abb81efb..42eaa8a91fc1 100644 --- a/ops-bedrock/Dockerfile.l2 +++ b/ops-bedrock/Dockerfile.l2 @@ -1,4 +1,4 @@ -FROM ethereumoptimism/reference-optimistic-geth:latest +FROM ethereumoptimism/op-geth:latest RUN apk add --no-cache jq diff --git a/technical-documents/postmortems/2022-02-02-inflation-vuln.md b/technical-documents/postmortems/2022-02-02-inflation-vuln.md index 8cdf2ae56f22..212abf15cc85 100644 --- a/technical-documents/postmortems/2022-02-02-inflation-vuln.md +++ b/technical-documents/postmortems/2022-02-02-inflation-vuln.md @@ -192,7 +192,7 @@ the various risks they considered. - Our forthcoming network upgrade ([Optimism: Bedrock](https://github.com/ethereum-optimism/optimistic-specs)) will use a - [fresh fork of Geth](https://github.com/ethereum-optimism/reference-optimistic-geth), with a + [fresh fork of Geth](https://github.com/ethereum-optimism/op-geth), with a minimal set of changes which can be easily rebased to track the upstream Geth repository. - We will ensure the common Ethereum tests are run against Bedrock. - We are redesigning our code review process, to introduce measure which will: