Skip to content

N
nebula
Commit d0ec9aff authored by mergify[bot]'s avatar mergify[bot] Committed by GitHub
Browse files
Options

Merge branch 'develop' into fix/wait-tasks

parents 3e309009 7efde787
Hide whitespace changes
Inline Side-by-side
Showing with 82 additions and 80 deletions
op-batcher/cmd/main.go
View file @ d0ec9aff
...@@ -13,7 +13,7 @@ import ( ...@@ -13,7 +13,7 @@ import (
) )
var ( var (
Version = "v0.10.8" Version = "v0.10.9"
GitCommit = "" GitCommit = ""
GitDate = "" GitDate = ""
) )
......
op-batcher/go.mod
View file @ d0ec9aff
...@@ -4,9 +4,9 @@ go 1.18 ...@@ -4,9 +4,9 @@ go 1.18
require ( require (
github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3 github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3
github.com/ethereum-optimism/optimism/op-node v0.10.8 github.com/ethereum-optimism/optimism/op-node v0.10.9
github.com/ethereum-optimism/optimism/op-proposer v0.10.8 github.com/ethereum-optimism/optimism/op-proposer v0.10.9
github.com/ethereum-optimism/optimism/op-service v0.10.8 github.com/ethereum-optimism/optimism/op-service v0.10.9
github.com/ethereum/go-ethereum v1.10.26 github.com/ethereum/go-ethereum v1.10.26
github.com/urfave/cli v1.22.9 github.com/urfave/cli v1.22.9
) )
...@@ -23,7 +23,7 @@ require ( ...@@ -23,7 +23,7 @@ require (
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
github.com/deckarep/golang-set v1.8.0 // indirect github.com/deckarep/golang-set v1.8.0 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
github.com/ethereum-optimism/optimism/op-bindings v0.10.8 // indirect github.com/ethereum-optimism/optimism/op-bindings v0.10.9 // indirect
github.com/fjl/memsize v0.0.1 // indirect github.com/fjl/memsize v0.0.1 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect github.com/go-ole/go-ole v1.2.6 // indirect
github.com/go-stack/stack v1.8.1 // indirect github.com/go-stack/stack v1.8.1 // indirect
......
op-batcher/go.sum
View file @ d0ec9aff
...@@ -107,14 +107,14 @@ github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3 h1:RWHKLhCrQThMfch+QJ1Z ...@@ -107,14 +107,14 @@ github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3 h1:RWHKLhCrQThMfch+QJ1Z
github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3/go.mod h1:QziizLAiF0KqyLdNJYD7O5cpDlaFMNZzlxYNcWsJUxs= github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3/go.mod h1:QziizLAiF0KqyLdNJYD7O5cpDlaFMNZzlxYNcWsJUxs=
github.com/ethereum-optimism/op-geth v0.0.0-20221216190603-60b51d600468 h1:7KgjBYDji5AKi42eRYI+n8Gs+ZJVilSASL3WBu82c3M= github.com/ethereum-optimism/op-geth v0.0.0-20221216190603-60b51d600468 h1:7KgjBYDji5AKi42eRYI+n8Gs+ZJVilSASL3WBu82c3M=
github.com/ethereum-optimism/op-geth v0.0.0-20221216190603-60b51d600468/go.mod h1:p0Yox74PhYlq1HvijrCBCD9A3cI7rXco7hT6KrQr+rY= github.com/ethereum-optimism/op-geth v0.0.0-20221216190603-60b51d600468/go.mod h1:p0Yox74PhYlq1HvijrCBCD9A3cI7rXco7hT6KrQr+rY=
github.com/ethereum-optimism/optimism/op-bindings v0.10.8 h1:YA8DamAlRGWG7qZo6ommCGhZdC+hRUKKnh11nWAamZ0= github.com/ethereum-optimism/optimism/op-bindings v0.10.9 h1:FC+M7om33BYBTcdHyZwDX8H/igrZsxtdk+xZAnfIRJg=
github.com/ethereum-optimism/optimism/op-bindings v0.10.8/go.mod h1:9ZSUq/rjlzp3uYyBN4sZmhTc3oZgDVqJ4wrUja7vj6c= github.com/ethereum-optimism/optimism/op-bindings v0.10.9/go.mod h1:9ZSUq/rjlzp3uYyBN4sZmhTc3oZgDVqJ4wrUja7vj6c=
github.com/ethereum-optimism/optimism/op-node v0.10.8 h1:wdQlaIenwKWmq3OF4Bum6vDUqJcHi50LwOd0W8uR3T8= github.com/ethereum-optimism/optimism/op-node v0.10.9 h1:93B8u5hGvXyyESYIMeCGfkZbwFt+gJBx44c1PUvEjrA=
github.com/ethereum-optimism/optimism/op-node v0.10.8/go.mod h1:iF/DSfu2DmiF3slkAsjQqYCd4rdiUwx1ydgdjc5zmo0= github.com/ethereum-optimism/optimism/op-node v0.10.9/go.mod h1:rtMSVpV5++c/3y3ShyIxaDEm1UmS6iCibY20DFx9HPs=
github.com/ethereum-optimism/optimism/op-proposer v0.10.8 h1:aQqZrQCxtSMM6q0jTc29ct/UGNiVH0LOE+uyRrZelhk= github.com/ethereum-optimism/optimism/op-proposer v0.10.9 h1:/RLP/eBUhT4N/bHobQnaJAcgb4Gg7mO9C/nv3nDnvV8=
github.com/ethereum-optimism/optimism/op-proposer v0.10.8/go.mod h1:FYUuObzt4c+T0iBJIz/T4SBHpDO2pQQ7suMIV05YBSI= github.com/ethereum-optimism/optimism/op-proposer v0.10.9/go.mod h1:hRF9v4ERcX42J5xIPPD5BnKTOFSKpzrV+meyi1IHXq4=
github.com/ethereum-optimism/optimism/op-service v0.10.8 h1:epZzRFY4RSuR52G6gU1yyGkwS/mow7Y0esdTCuIZX7g= github.com/ethereum-optimism/optimism/op-service v0.10.9 h1:B6cU47e5MqibqsPzATmNHvjvy04aa8yfgWe5Lv2VQCg=
github.com/ethereum-optimism/optimism/op-service v0.10.8/go.mod h1:wbtHqi1fv00B3agj7a2zdP3OFanEfGZ23zPgGgFCF/c= github.com/ethereum-optimism/optimism/op-service v0.10.9/go.mod h1:wbtHqi1fv00B3agj7a2zdP3OFanEfGZ23zPgGgFCF/c=
github.com/fjl/memsize v0.0.1 h1:+zhkb+dhUgx0/e+M8sF0QqiouvMQUiKR+QYvdxIOKcQ= 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= github.com/fjl/memsize v0.0.1/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0=
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
......
op-chain-ops/cmd/op-migrate/main.go
View file @ d0ec9aff
...@@ -205,6 +205,7 @@ func main() { ...@@ -205,6 +205,7 @@ func main() {
&config.L1CrossDomainMessengerProxy, &config.L1CrossDomainMessengerProxy,
config.L1ChainID, config.L1ChainID,
config.FinalSystemOwner, config.FinalSystemOwner,
config.ProxyAdminOwner,
&derive.L1BlockInfo{ &derive.L1BlockInfo{
Number: block.NumberU64(), Number: block.NumberU64(),
Time: block.Time(), Time: block.Time(),
......
op-chain-ops/genesis/check.go
View file @ d0ec9aff
...@@ -93,6 +93,7 @@ func PostCheckMigratedDB( ...@@ -93,6 +93,7 @@ func PostCheckMigratedDB(
l1XDM *common.Address, l1XDM *common.Address,
l1ChainID uint64, l1ChainID uint64,
finalSystemOwner common.Address, finalSystemOwner common.Address,
proxyAdminOwner common.Address,
info *derive.L1BlockInfo, info *derive.L1BlockInfo,
) error { ) error {
log.Info("Validating database migration") log.Info("Validating database migration")
...@@ -123,7 +124,7 @@ func PostCheckMigratedDB( ...@@ -123,7 +124,7 @@ func PostCheckMigratedDB(
return fmt.Errorf("cannot open StateDB: %w", err) return fmt.Errorf("cannot open StateDB: %w", err)
} }
if err := PostCheckPredeployStorage(db, finalSystemOwner); err != nil { if err := PostCheckPredeployStorage(db, finalSystemOwner, proxyAdminOwner); err != nil {
return err return err
} }
log.Info("checked predeploy storage") log.Info("checked predeploy storage")
...@@ -276,7 +277,7 @@ func PostCheckPredeploys(db *state.StateDB) error { ...@@ -276,7 +277,7 @@ func PostCheckPredeploys(db *state.StateDB) error {
// PostCheckPredeployStorage will ensure that the predeploys had their storage // PostCheckPredeployStorage will ensure that the predeploys had their storage
// wiped correctly. // wiped correctly.
func PostCheckPredeployStorage(db vm.StateDB, finalSystemOwner common.Address) error { func PostCheckPredeployStorage(db vm.StateDB, finalSystemOwner common.Address, proxyAdminOwner common.Address) error {
for name, addr := range predeploys.Predeploys { for name, addr := range predeploys.Predeploys {
if addr == nil { if addr == nil {
return fmt.Errorf("nil address in predeploys mapping for %s", name) return fmt.Errorf("nil address in predeploys mapping for %s", name)
...@@ -315,8 +316,8 @@ func PostCheckPredeployStorage(db vm.StateDB, finalSystemOwner common.Address) e ...@@ -315,8 +316,8 @@ func PostCheckPredeployStorage(db vm.StateDB, finalSystemOwner common.Address) e
// They are set to the final system owner in the config. // They are set to the final system owner in the config.
if (*addr == predeploys.L2CrossDomainMessengerAddr && key == L2XDMOwnerSlot) || (*addr == predeploys.ProxyAdminAddr && key == ProxyAdminOwnerSlot) { if (*addr == predeploys.L2CrossDomainMessengerAddr && key == L2XDMOwnerSlot) || (*addr == predeploys.ProxyAdminAddr && key == ProxyAdminOwnerSlot) {
actualOwner := common.BytesToAddress(slots[key].Bytes()) actualOwner := common.BytesToAddress(slots[key].Bytes())
if actualOwner != finalSystemOwner { if actualOwner != proxyAdminOwner {
return fmt.Errorf("expected owner for %s to be %s but got %s", name, finalSystemOwner, actualOwner) return fmt.Errorf("expected owner for %s to be %s but got %s", name, proxyAdminOwner, actualOwner)
} }
log.Debug("validated special case owner slot", "value", actualOwner, "name", name) log.Debug("validated special case owner slot", "value", actualOwner, "name", name)
continue continue
......
op-chain-ops/go.mod
View file @ d0ec9aff
...@@ -3,7 +3,7 @@ module github.com/ethereum-optimism/optimism/op-chain-ops ...@@ -3,7 +3,7 @@ module github.com/ethereum-optimism/optimism/op-chain-ops
go 1.18 go 1.18
require ( require (
github.com/ethereum-optimism/optimism/op-bindings v0.10.8 github.com/ethereum-optimism/optimism/op-bindings v0.10.9
github.com/ethereum-optimism/optimism/op-node v0.10.1 github.com/ethereum-optimism/optimism/op-node v0.10.1
github.com/ethereum/go-ethereum v1.10.26 github.com/ethereum/go-ethereum v1.10.26
github.com/holiman/uint256 v1.2.0 github.com/holiman/uint256 v1.2.0
...@@ -23,7 +23,7 @@ require ( ...@@ -23,7 +23,7 @@ require (
github.com/deckarep/golang-set v1.8.0 // indirect github.com/deckarep/golang-set v1.8.0 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
github.com/edsrzf/mmap-go v1.1.0 // indirect github.com/edsrzf/mmap-go v1.1.0 // indirect
github.com/ethereum-optimism/optimism/op-service v0.10.8 // indirect github.com/ethereum-optimism/optimism/op-service v0.10.9 // indirect
github.com/go-kit/kit v0.10.0 // indirect github.com/go-kit/kit v0.10.0 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect github.com/go-ole/go-ole v1.2.6 // indirect
github.com/go-stack/stack v1.8.1 // indirect github.com/go-stack/stack v1.8.1 // indirect
......
op-chain-ops/go.sum
View file @ d0ec9aff
...@@ -79,12 +79,12 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m ...@@ -79,12 +79,12 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/ethereum-optimism/op-geth v0.0.0-20221216190603-60b51d600468 h1:7KgjBYDji5AKi42eRYI+n8Gs+ZJVilSASL3WBu82c3M= github.com/ethereum-optimism/op-geth v0.0.0-20221216190603-60b51d600468 h1:7KgjBYDji5AKi42eRYI+n8Gs+ZJVilSASL3WBu82c3M=
github.com/ethereum-optimism/op-geth v0.0.0-20221216190603-60b51d600468/go.mod h1:p0Yox74PhYlq1HvijrCBCD9A3cI7rXco7hT6KrQr+rY= github.com/ethereum-optimism/op-geth v0.0.0-20221216190603-60b51d600468/go.mod h1:p0Yox74PhYlq1HvijrCBCD9A3cI7rXco7hT6KrQr+rY=
github.com/ethereum-optimism/optimism/op-bindings v0.10.8 h1:YA8DamAlRGWG7qZo6ommCGhZdC+hRUKKnh11nWAamZ0= github.com/ethereum-optimism/optimism/op-bindings v0.10.9 h1:FC+M7om33BYBTcdHyZwDX8H/igrZsxtdk+xZAnfIRJg=
github.com/ethereum-optimism/optimism/op-bindings v0.10.8/go.mod h1:9ZSUq/rjlzp3uYyBN4sZmhTc3oZgDVqJ4wrUja7vj6c= github.com/ethereum-optimism/optimism/op-bindings v0.10.9/go.mod h1:9ZSUq/rjlzp3uYyBN4sZmhTc3oZgDVqJ4wrUja7vj6c=
github.com/ethereum-optimism/optimism/op-node v0.10.1 h1:kVBaOEOYLV22XEHRhB7dfdmoXepO0kx/RsZQK+Bpk1Y= github.com/ethereum-optimism/optimism/op-node v0.10.1 h1:kVBaOEOYLV22XEHRhB7dfdmoXepO0kx/RsZQK+Bpk1Y=
github.com/ethereum-optimism/optimism/op-node v0.10.1/go.mod h1:pup7wiiUs9g8cZKwXeB5tEGCqwUUwFVmej9MmSIm6S8= github.com/ethereum-optimism/optimism/op-node v0.10.1/go.mod h1:pup7wiiUs9g8cZKwXeB5tEGCqwUUwFVmej9MmSIm6S8=
github.com/ethereum-optimism/optimism/op-service v0.10.8 h1:epZzRFY4RSuR52G6gU1yyGkwS/mow7Y0esdTCuIZX7g= github.com/ethereum-optimism/optimism/op-service v0.10.9 h1:B6cU47e5MqibqsPzATmNHvjvy04aa8yfgWe5Lv2VQCg=
github.com/ethereum-optimism/optimism/op-service v0.10.8/go.mod h1:wbtHqi1fv00B3agj7a2zdP3OFanEfGZ23zPgGgFCF/c= github.com/ethereum-optimism/optimism/op-service v0.10.9/go.mod h1:wbtHqi1fv00B3agj7a2zdP3OFanEfGZ23zPgGgFCF/c=
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= 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 h1:+zhkb+dhUgx0/e+M8sF0QqiouvMQUiKR+QYvdxIOKcQ=
github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4=
......
op-e2e/go.mod
View file @ d0ec9aff
...@@ -10,12 +10,12 @@ require ( ...@@ -10,12 +10,12 @@ require (
github.com/docker/docker v20.10.21+incompatible github.com/docker/docker v20.10.21+incompatible
github.com/docker/go-connections v0.4.0 github.com/docker/go-connections v0.4.0
github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3 github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3
github.com/ethereum-optimism/optimism/op-batcher v0.10.8 github.com/ethereum-optimism/optimism/op-batcher v0.10.9
github.com/ethereum-optimism/optimism/op-bindings v0.10.8 github.com/ethereum-optimism/optimism/op-bindings v0.10.9
github.com/ethereum-optimism/optimism/op-chain-ops v0.10.8 github.com/ethereum-optimism/optimism/op-chain-ops v0.10.9
github.com/ethereum-optimism/optimism/op-node v0.10.8 github.com/ethereum-optimism/optimism/op-node v0.10.9
github.com/ethereum-optimism/optimism/op-proposer v0.10.8 github.com/ethereum-optimism/optimism/op-proposer v0.10.9
github.com/ethereum-optimism/optimism/op-service v0.10.8 github.com/ethereum-optimism/optimism/op-service v0.10.9
github.com/ethereum/go-ethereum v1.10.26 github.com/ethereum/go-ethereum v1.10.26
github.com/google/gofuzz v1.2.1-0.20220503160820-4a35382e8fc8 github.com/google/gofuzz v1.2.1-0.20220503160820-4a35382e8fc8
github.com/libp2p/go-libp2p v0.23.3 github.com/libp2p/go-libp2p v0.23.3
......
op-e2e/go.sum
View file @ d0ec9aff
...@@ -159,18 +159,18 @@ github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3 h1:RWHKLhCrQThMfch+QJ1Z ...@@ -159,18 +159,18 @@ github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3 h1:RWHKLhCrQThMfch+QJ1Z
github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3/go.mod h1:QziizLAiF0KqyLdNJYD7O5cpDlaFMNZzlxYNcWsJUxs= github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3/go.mod h1:QziizLAiF0KqyLdNJYD7O5cpDlaFMNZzlxYNcWsJUxs=
github.com/ethereum-optimism/op-geth v0.0.0-20221216190603-60b51d600468 h1:7KgjBYDji5AKi42eRYI+n8Gs+ZJVilSASL3WBu82c3M= github.com/ethereum-optimism/op-geth v0.0.0-20221216190603-60b51d600468 h1:7KgjBYDji5AKi42eRYI+n8Gs+ZJVilSASL3WBu82c3M=
github.com/ethereum-optimism/op-geth v0.0.0-20221216190603-60b51d600468/go.mod h1:p0Yox74PhYlq1HvijrCBCD9A3cI7rXco7hT6KrQr+rY= github.com/ethereum-optimism/op-geth v0.0.0-20221216190603-60b51d600468/go.mod h1:p0Yox74PhYlq1HvijrCBCD9A3cI7rXco7hT6KrQr+rY=
github.com/ethereum-optimism/optimism/op-batcher v0.10.8 h1:3yDjwJsJ+LpZ4GTs0e7ryaf41pw9tQ8M0F9oHmYcu9M= github.com/ethereum-optimism/optimism/op-batcher v0.10.9 h1:4jVwnc56rJO+acKMz9L86+AV/q/QgYLU0zshfHW5aZ8=
github.com/ethereum-optimism/optimism/op-batcher v0.10.8/go.mod h1:uZNCqM4cKWWjOy0nljCoXVWoxW72sGIDGicc3seG35Y= github.com/ethereum-optimism/optimism/op-batcher v0.10.9/go.mod h1:VN53ECiipFG8uo5stH9YBa968YA1ii7Fg1pw+WjpK6I=
github.com/ethereum-optimism/optimism/op-bindings v0.10.8 h1:YA8DamAlRGWG7qZo6ommCGhZdC+hRUKKnh11nWAamZ0= github.com/ethereum-optimism/optimism/op-bindings v0.10.9 h1:FC+M7om33BYBTcdHyZwDX8H/igrZsxtdk+xZAnfIRJg=
github.com/ethereum-optimism/optimism/op-bindings v0.10.8/go.mod h1:9ZSUq/rjlzp3uYyBN4sZmhTc3oZgDVqJ4wrUja7vj6c= github.com/ethereum-optimism/optimism/op-bindings v0.10.9/go.mod h1:9ZSUq/rjlzp3uYyBN4sZmhTc3oZgDVqJ4wrUja7vj6c=
github.com/ethereum-optimism/optimism/op-chain-ops v0.10.8 h1:hsUQm/fwK99IHXJwlUM9QfTr82i2KUuSDezTy4q3ktI= github.com/ethereum-optimism/optimism/op-chain-ops v0.10.9 h1:1zO/XGavOhKE39D6bmdyVJehLFq9IBgJpbbt+8gPfu4=
github.com/ethereum-optimism/optimism/op-chain-ops v0.10.8/go.mod h1:mh9XQ3Fc3gjscMfEgPNCgrpRcbY0kDVgoGbqG+lkbVI= github.com/ethereum-optimism/optimism/op-chain-ops v0.10.9/go.mod h1:17sjIp7SXPN8Bi/yPgmOm6DiYbdOmsxjlgLZLAWg004=
github.com/ethereum-optimism/optimism/op-node v0.10.8 h1:wdQlaIenwKWmq3OF4Bum6vDUqJcHi50LwOd0W8uR3T8= github.com/ethereum-optimism/optimism/op-node v0.10.9 h1:93B8u5hGvXyyESYIMeCGfkZbwFt+gJBx44c1PUvEjrA=
github.com/ethereum-optimism/optimism/op-node v0.10.8/go.mod h1:iF/DSfu2DmiF3slkAsjQqYCd4rdiUwx1ydgdjc5zmo0= github.com/ethereum-optimism/optimism/op-node v0.10.9/go.mod h1:rtMSVpV5++c/3y3ShyIxaDEm1UmS6iCibY20DFx9HPs=
github.com/ethereum-optimism/optimism/op-proposer v0.10.8 h1:aQqZrQCxtSMM6q0jTc29ct/UGNiVH0LOE+uyRrZelhk= github.com/ethereum-optimism/optimism/op-proposer v0.10.9 h1:/RLP/eBUhT4N/bHobQnaJAcgb4Gg7mO9C/nv3nDnvV8=
github.com/ethereum-optimism/optimism/op-proposer v0.10.8/go.mod h1:FYUuObzt4c+T0iBJIz/T4SBHpDO2pQQ7suMIV05YBSI= github.com/ethereum-optimism/optimism/op-proposer v0.10.9/go.mod h1:hRF9v4ERcX42J5xIPPD5BnKTOFSKpzrV+meyi1IHXq4=
github.com/ethereum-optimism/optimism/op-service v0.10.8 h1:epZzRFY4RSuR52G6gU1yyGkwS/mow7Y0esdTCuIZX7g= github.com/ethereum-optimism/optimism/op-service v0.10.9 h1:B6cU47e5MqibqsPzATmNHvjvy04aa8yfgWe5Lv2VQCg=
github.com/ethereum-optimism/optimism/op-service v0.10.8/go.mod h1:wbtHqi1fv00B3agj7a2zdP3OFanEfGZ23zPgGgFCF/c= github.com/ethereum-optimism/optimism/op-service v0.10.9/go.mod h1:wbtHqi1fv00B3agj7a2zdP3OFanEfGZ23zPgGgFCF/c=
github.com/fjl/memsize v0.0.1 h1:+zhkb+dhUgx0/e+M8sF0QqiouvMQUiKR+QYvdxIOKcQ= 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= github.com/fjl/memsize v0.0.1/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0=
github.com/flynn/noise v1.0.0 h1:DlTHqmzmvcEiKj+4RYo/imoswx/4r6iBlCMfVtrMXpQ= github.com/flynn/noise v1.0.0 h1:DlTHqmzmvcEiKj+4RYo/imoswx/4r6iBlCMfVtrMXpQ=
......
op-node/chaincfg/chains.go
View file @ d0ec9aff
...@@ -42,35 +42,35 @@ var Beta1 = rollup.Config{ ...@@ -42,35 +42,35 @@ var Beta1 = rollup.Config{
var Goerli = rollup.Config{ var Goerli = rollup.Config{
Genesis: rollup.Genesis{ Genesis: rollup.Genesis{
L1: eth.BlockID{ L1: eth.BlockID{
Hash: common.HexToHash(""), Hash: common.HexToHash("0x6ffc1bf3754c01f6bb9fe057c1578b87a8571ce2e9be5ca14bace6eccfd336c7"),
Number: 0, Number: 8300214,
}, },
L2: eth.BlockID{ L2: eth.BlockID{
Hash: common.HexToHash(""), Hash: common.HexToHash("0x0f783549ea4313b784eadd9b8e8a69913b368b7366363ea814d7707ac505175f"),
Number: 0, Number: 4061224,
}, },
L2Time: 0, L2Time: 1673550516,
SystemConfig: eth.SystemConfig{ SystemConfig: eth.SystemConfig{
BatcherAddr: common.HexToAddress(""), BatcherAddr: common.HexToAddress("0x7431310e026B69BFC676C0013E12A1A11411EEc9"),
Overhead: eth.Bytes32(common.HexToHash("")), Overhead: eth.Bytes32(common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000834")),
Scalar: eth.Bytes32(common.HexToHash("")), Scalar: eth.Bytes32(common.HexToHash("0x00000000000000000000000000000000000000000000000000000000000f4240")),
GasLimit: 0, GasLimit: 25_000_000,
}, },
}, },
BlockTime: 2, BlockTime: 2,
MaxSequencerDrift: 0, MaxSequencerDrift: 600,
SeqWindowSize: 0, SeqWindowSize: 3600,
ChannelTimeout: 0, ChannelTimeout: 300,
L1ChainID: big.NewInt(5), L1ChainID: big.NewInt(5),
L2ChainID: big.NewInt(420), L2ChainID: big.NewInt(420),
BatchInboxAddress: common.HexToAddress(""), BatchInboxAddress: common.HexToAddress("0xff00000000000000000000000000000000000420"),
DepositContractAddress: common.HexToAddress(""), DepositContractAddress: common.HexToAddress("0x5b47E1A08Ea6d985D6649300584e6722Ec4B1383"),
L1SystemConfigAddress: common.HexToAddress(""), L1SystemConfigAddress: common.HexToAddress("0xAe851f927Ee40dE99aaBb7461C00f9622ab91d60"),
} }
var NetworksByName = map[string]rollup.Config{ var NetworksByName = map[string]rollup.Config{
"beta-1": Beta1, "beta-1": Beta1,
//"goerli": Goerli, "goerli": Goerli,
} }
func AvailableNetworks() []string { func AvailableNetworks() []string {
......
op-node/go.mod
View file @ d0ec9aff
...@@ -6,9 +6,9 @@ require ( ...@@ -6,9 +6,9 @@ require (
github.com/btcsuite/btcd v0.23.3 github.com/btcsuite/btcd v0.23.3
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0
github.com/ethereum-optimism/optimism/op-bindings v0.10.8 github.com/ethereum-optimism/optimism/op-bindings v0.10.9
github.com/ethereum-optimism/optimism/op-chain-ops v0.10.8 github.com/ethereum-optimism/optimism/op-chain-ops v0.10.9
github.com/ethereum-optimism/optimism/op-service v0.10.8 github.com/ethereum-optimism/optimism/op-service v0.10.9
github.com/ethereum/go-ethereum v1.10.26 github.com/ethereum/go-ethereum v1.10.26
github.com/golang/snappy v0.0.4 github.com/golang/snappy v0.0.4
github.com/google/go-cmp v0.5.8 github.com/google/go-cmp v0.5.8
......
op-node/go.sum
View file @ d0ec9aff
...@@ -145,12 +145,12 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m ...@@ -145,12 +145,12 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/ethereum-optimism/op-geth v0.0.0-20221216190603-60b51d600468 h1:7KgjBYDji5AKi42eRYI+n8Gs+ZJVilSASL3WBu82c3M= github.com/ethereum-optimism/op-geth v0.0.0-20221216190603-60b51d600468 h1:7KgjBYDji5AKi42eRYI+n8Gs+ZJVilSASL3WBu82c3M=
github.com/ethereum-optimism/op-geth v0.0.0-20221216190603-60b51d600468/go.mod h1:p0Yox74PhYlq1HvijrCBCD9A3cI7rXco7hT6KrQr+rY= github.com/ethereum-optimism/op-geth v0.0.0-20221216190603-60b51d600468/go.mod h1:p0Yox74PhYlq1HvijrCBCD9A3cI7rXco7hT6KrQr+rY=
github.com/ethereum-optimism/optimism/op-bindings v0.10.8 h1:YA8DamAlRGWG7qZo6ommCGhZdC+hRUKKnh11nWAamZ0= github.com/ethereum-optimism/optimism/op-bindings v0.10.9 h1:FC+M7om33BYBTcdHyZwDX8H/igrZsxtdk+xZAnfIRJg=
github.com/ethereum-optimism/optimism/op-bindings v0.10.8/go.mod h1:9ZSUq/rjlzp3uYyBN4sZmhTc3oZgDVqJ4wrUja7vj6c= github.com/ethereum-optimism/optimism/op-bindings v0.10.9/go.mod h1:9ZSUq/rjlzp3uYyBN4sZmhTc3oZgDVqJ4wrUja7vj6c=
github.com/ethereum-optimism/optimism/op-chain-ops v0.10.8 h1:hsUQm/fwK99IHXJwlUM9QfTr82i2KUuSDezTy4q3ktI= github.com/ethereum-optimism/optimism/op-chain-ops v0.10.9 h1:1zO/XGavOhKE39D6bmdyVJehLFq9IBgJpbbt+8gPfu4=
github.com/ethereum-optimism/optimism/op-chain-ops v0.10.8/go.mod h1:mh9XQ3Fc3gjscMfEgPNCgrpRcbY0kDVgoGbqG+lkbVI= github.com/ethereum-optimism/optimism/op-chain-ops v0.10.9/go.mod h1:17sjIp7SXPN8Bi/yPgmOm6DiYbdOmsxjlgLZLAWg004=
github.com/ethereum-optimism/optimism/op-service v0.10.8 h1:epZzRFY4RSuR52G6gU1yyGkwS/mow7Y0esdTCuIZX7g= github.com/ethereum-optimism/optimism/op-service v0.10.9 h1:B6cU47e5MqibqsPzATmNHvjvy04aa8yfgWe5Lv2VQCg=
github.com/ethereum-optimism/optimism/op-service v0.10.8/go.mod h1:wbtHqi1fv00B3agj7a2zdP3OFanEfGZ23zPgGgFCF/c= github.com/ethereum-optimism/optimism/op-service v0.10.9/go.mod h1:wbtHqi1fv00B3agj7a2zdP3OFanEfGZ23zPgGgFCF/c=
github.com/fjl/memsize v0.0.1 h1:+zhkb+dhUgx0/e+M8sF0QqiouvMQUiKR+QYvdxIOKcQ= 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= github.com/fjl/memsize v0.0.1/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0=
github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
......
op-node/version/version.go
View file @ d0ec9aff
package version package version
var ( var (
Version = "v0.10.8" Version = "v0.10.9"
Meta = "dev" Meta = "dev"
) )
op-proposer/cmd/main.go
View file @ d0ec9aff
...@@ -13,7 +13,7 @@ import ( ...@@ -13,7 +13,7 @@ import (
) )
var ( var (
Version = "v0.10.8" Version = "v0.10.9"
GitCommit = "" GitCommit = ""
GitDate = "" GitDate = ""
) )
......
op-proposer/go.mod
View file @ d0ec9aff
...@@ -4,9 +4,9 @@ go 1.18 ...@@ -4,9 +4,9 @@ go 1.18
require ( require (
github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3 github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3
github.com/ethereum-optimism/optimism/op-bindings v0.10.8 github.com/ethereum-optimism/optimism/op-bindings v0.10.9
github.com/ethereum-optimism/optimism/op-node v0.10.8 github.com/ethereum-optimism/optimism/op-node v0.10.9
github.com/ethereum-optimism/optimism/op-service v0.10.8 github.com/ethereum-optimism/optimism/op-service v0.10.9
github.com/ethereum/go-ethereum v1.10.26 github.com/ethereum/go-ethereum v1.10.26
github.com/stretchr/testify v1.8.1 github.com/stretchr/testify v1.8.1
github.com/urfave/cli v1.22.9 github.com/urfave/cli v1.22.9
......
op-proposer/go.sum
View file @ d0ec9aff
...@@ -107,12 +107,12 @@ github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3 h1:RWHKLhCrQThMfch+QJ1Z ...@@ -107,12 +107,12 @@ github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3 h1:RWHKLhCrQThMfch+QJ1Z
github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3/go.mod h1:QziizLAiF0KqyLdNJYD7O5cpDlaFMNZzlxYNcWsJUxs= github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3/go.mod h1:QziizLAiF0KqyLdNJYD7O5cpDlaFMNZzlxYNcWsJUxs=
github.com/ethereum-optimism/op-geth v0.0.0-20221216190603-60b51d600468 h1:7KgjBYDji5AKi42eRYI+n8Gs+ZJVilSASL3WBu82c3M= github.com/ethereum-optimism/op-geth v0.0.0-20221216190603-60b51d600468 h1:7KgjBYDji5AKi42eRYI+n8Gs+ZJVilSASL3WBu82c3M=
github.com/ethereum-optimism/op-geth v0.0.0-20221216190603-60b51d600468/go.mod h1:p0Yox74PhYlq1HvijrCBCD9A3cI7rXco7hT6KrQr+rY= github.com/ethereum-optimism/op-geth v0.0.0-20221216190603-60b51d600468/go.mod h1:p0Yox74PhYlq1HvijrCBCD9A3cI7rXco7hT6KrQr+rY=
github.com/ethereum-optimism/optimism/op-bindings v0.10.8 h1:YA8DamAlRGWG7qZo6ommCGhZdC+hRUKKnh11nWAamZ0= github.com/ethereum-optimism/optimism/op-bindings v0.10.9 h1:FC+M7om33BYBTcdHyZwDX8H/igrZsxtdk+xZAnfIRJg=
github.com/ethereum-optimism/optimism/op-bindings v0.10.8/go.mod h1:9ZSUq/rjlzp3uYyBN4sZmhTc3oZgDVqJ4wrUja7vj6c= github.com/ethereum-optimism/optimism/op-bindings v0.10.9/go.mod h1:9ZSUq/rjlzp3uYyBN4sZmhTc3oZgDVqJ4wrUja7vj6c=
github.com/ethereum-optimism/optimism/op-node v0.10.8 h1:wdQlaIenwKWmq3OF4Bum6vDUqJcHi50LwOd0W8uR3T8= github.com/ethereum-optimism/optimism/op-node v0.10.9 h1:93B8u5hGvXyyESYIMeCGfkZbwFt+gJBx44c1PUvEjrA=
github.com/ethereum-optimism/optimism/op-node v0.10.8/go.mod h1:iF/DSfu2DmiF3slkAsjQqYCd4rdiUwx1ydgdjc5zmo0= github.com/ethereum-optimism/optimism/op-node v0.10.9/go.mod h1:rtMSVpV5++c/3y3ShyIxaDEm1UmS6iCibY20DFx9HPs=
github.com/ethereum-optimism/optimism/op-service v0.10.8 h1:epZzRFY4RSuR52G6gU1yyGkwS/mow7Y0esdTCuIZX7g= github.com/ethereum-optimism/optimism/op-service v0.10.9 h1:B6cU47e5MqibqsPzATmNHvjvy04aa8yfgWe5Lv2VQCg=
github.com/ethereum-optimism/optimism/op-service v0.10.8/go.mod h1:wbtHqi1fv00B3agj7a2zdP3OFanEfGZ23zPgGgFCF/c= github.com/ethereum-optimism/optimism/op-service v0.10.9/go.mod h1:wbtHqi1fv00B3agj7a2zdP3OFanEfGZ23zPgGgFCF/c=
github.com/fjl/memsize v0.0.1 h1:+zhkb+dhUgx0/e+M8sF0QqiouvMQUiKR+QYvdxIOKcQ= 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= github.com/fjl/memsize v0.0.1/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0=
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
......
packages/contracts-bedrock/deploy-config/goerli.json
View file @ d0ec9aff
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"finalSystemOwner": "0xBc1233d0C3e6B5d53Ab455cF65A6623F6dCd7e4f", "finalSystemOwner": "0xBc1233d0C3e6B5d53Ab455cF65A6623F6dCd7e4f",
"controller": "0xBc1233d0C3e6B5d53Ab455cF65A6623F6dCd7e4f", "controller": "0xBc1233d0C3e6B5d53Ab455cF65A6623F6dCd7e4f",
"l1StartingBlockTag": "FILL_IN_DAY_OF", "l1StartingBlockTag": "0x6ffc1bf3754c01f6bb9fe057c1578b87a8571ce2e9be5ca14bace6eccfd336c7",
"l1ChainID": 5, "l1ChainID": 5,
"l2ChainID": 420, "l2ChainID": 420,
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
"batchSenderAddress": "0x7431310e026B69BFC676C0013E12A1A11411EEc9", "batchSenderAddress": "0x7431310e026B69BFC676C0013E12A1A11411EEc9",
"l2OutputOracleSubmissionInterval": 12, "l2OutputOracleSubmissionInterval": 12,
"l2OutputOracleStartingBlockNumber": "FILL_IN_DAY_OF", "l2OutputOracleStartingBlockNumber": 4061224,
"l2OutputOracleStartingTimestamp": "FILL_IN_DAY_OF", "l2OutputOracleStartingTimestamp": 1673550516,
"l2OutputOracleProposer": "0x02b1786A85Ec3f71fBbBa46507780dB7cF9014f6", "l2OutputOracleProposer": "0x02b1786A85Ec3f71fBbBa46507780dB7cF9014f6",
"l2OutputOracleChallenger": "0xBc1233d0C3e6B5d53Ab455cF65A6623F6dCd7e4f", "l2OutputOracleChallenger": "0xBc1233d0C3e6B5d53Ab455cF65A6623F6dCd7e4f",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment