Skip to content

N
nebula
Commit 16ba4ab6 authored by Mark Tyneway's avatar Mark Tyneway Committed by GitHub
Browse files
Options

Merge branch 'develop' into feat/wait-for-final-batch

parents 8030491c db5284db
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 8820 additions and 540 deletions
.circleci/config.yml
View file @ 16ba4ab6
...@@ -1098,6 +1098,11 @@ workflows: ...@@ -1098,6 +1098,11 @@ workflows:
docker_context: . docker_context: .
- docker-publish: - docker-publish:
name: op-node-docker-publish name: op-node-docker-publish
filters:
tags:
only: /^op-[a-z0-9\-]*\/v.*/
branches:
ignore: /.*/
docker_name: op-node docker_name: op-node
docker_tags: <<pipeline.git.revision>>,<<pipeline.git.branch>> docker_tags: <<pipeline.git.revision>>,<<pipeline.git.branch>>
context: context:
...@@ -1117,6 +1122,11 @@ workflows: ...@@ -1117,6 +1122,11 @@ workflows:
docker_context: . docker_context: .
- docker-publish: - docker-publish:
name: op-batcher-docker-publish name: op-batcher-docker-publish
filters:
tags:
only: /^op-[a-z0-9\-]*\/v.*/
branches:
ignore: /.*/
docker_name: op-batcher docker_name: op-batcher
docker_tags: <<pipeline.git.revision>>,<<pipeline.git.branch>> docker_tags: <<pipeline.git.revision>>,<<pipeline.git.branch>>
context: context:
...@@ -1136,6 +1146,11 @@ workflows: ...@@ -1136,6 +1146,11 @@ workflows:
docker_context: . docker_context: .
- docker-publish: - docker-publish:
name: op-proposer-docker-publish name: op-proposer-docker-publish
filters:
tags:
only: /^op-[a-z0-9\-]*\/v.*/
branches:
ignore: /.*/
docker_name: op-proposer docker_name: op-proposer
docker_tags: <<pipeline.git.revision>>,<<pipeline.git.branch>> docker_tags: <<pipeline.git.revision>>,<<pipeline.git.branch>>
context: context:
...@@ -1155,6 +1170,11 @@ workflows: ...@@ -1155,6 +1170,11 @@ workflows:
docker_context: . docker_context: .
- docker-publish: - docker-publish:
name: op-migrate-docker-publish name: op-migrate-docker-publish
filters:
tags:
only: /^op-[a-z0-9\-]*\/v.*/
branches:
ignore: /.*/
docker_name: op-migrate docker_name: op-migrate
docker_tags: <<pipeline.git.revision>>,<<pipeline.git.branch>> docker_tags: <<pipeline.git.revision>>,<<pipeline.git.branch>>
context: context:
...@@ -1172,5 +1192,6 @@ workflows: ...@@ -1172,5 +1192,6 @@ workflows:
- op-node-docker-publish - op-node-docker-publish
- op-proposer-docker-publish - op-proposer-docker-publish
- op-batcher-docker-publish - op-batcher-docker-publish
- op-migrate-docker-publish
context: context:
- oplabs-gcr-release - oplabs-gcr-release
op-batcher/cmd/main.go
View file @ 16ba4ab6
...@@ -13,7 +13,7 @@ import ( ...@@ -13,7 +13,7 @@ import (
) )
var ( var (
Version = "v0.10.7" Version = "v0.10.8"
GitCommit = "" GitCommit = ""
GitDate = "" GitDate = ""
) )
......
op-batcher/go.mod
View file @ 16ba4ab6
...@@ -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.7 github.com/ethereum-optimism/optimism/op-node v0.10.8
github.com/ethereum-optimism/optimism/op-proposer v0.10.7 github.com/ethereum-optimism/optimism/op-proposer v0.10.8
github.com/ethereum-optimism/optimism/op-service v0.10.7 github.com/ethereum-optimism/optimism/op-service v0.10.8
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.7 // indirect github.com/ethereum-optimism/optimism/op-bindings v0.10.8 // 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 @ 16ba4ab6
...@@ -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.7 h1:/fG951SZKUwdsnNZeJyCJ6lI2AgiZOosblVggFe7syg= github.com/ethereum-optimism/optimism/op-bindings v0.10.8 h1:YA8DamAlRGWG7qZo6ommCGhZdC+hRUKKnh11nWAamZ0=
github.com/ethereum-optimism/optimism/op-bindings v0.10.7/go.mod h1:9ZSUq/rjlzp3uYyBN4sZmhTc3oZgDVqJ4wrUja7vj6c= github.com/ethereum-optimism/optimism/op-bindings v0.10.8/go.mod h1:9ZSUq/rjlzp3uYyBN4sZmhTc3oZgDVqJ4wrUja7vj6c=
github.com/ethereum-optimism/optimism/op-node v0.10.7 h1:dr8iKlUy8VXuUiRcoZ3wCQu9mPtyosC6/7D/VnmSy84= github.com/ethereum-optimism/optimism/op-node v0.10.8 h1:wdQlaIenwKWmq3OF4Bum6vDUqJcHi50LwOd0W8uR3T8=
github.com/ethereum-optimism/optimism/op-node v0.10.7/go.mod h1:l+g1HAgo4DZHm0hf17ztDSx2ZYs5sbFj/UhGkj6ur7k= github.com/ethereum-optimism/optimism/op-node v0.10.8/go.mod h1:iF/DSfu2DmiF3slkAsjQqYCd4rdiUwx1ydgdjc5zmo0=
github.com/ethereum-optimism/optimism/op-proposer v0.10.7 h1:w164WqXZxEREEzSj3/SY/Am/+Nwd0Aw3RGB3xLE8Ueg= github.com/ethereum-optimism/optimism/op-proposer v0.10.8 h1:aQqZrQCxtSMM6q0jTc29ct/UGNiVH0LOE+uyRrZelhk=
github.com/ethereum-optimism/optimism/op-proposer v0.10.7/go.mod h1:V48eWwPZ7rgbG2Zq5Ex4ergyqh4gt4CBGEFxmig7MJg= github.com/ethereum-optimism/optimism/op-proposer v0.10.8/go.mod h1:FYUuObzt4c+T0iBJIz/T4SBHpDO2pQQ7suMIV05YBSI=
github.com/ethereum-optimism/optimism/op-service v0.10.7 h1:XWTMSlLG8x0K+QAwBHNs7F7CwfkmpEiVY0xqwEnfA+Y= github.com/ethereum-optimism/optimism/op-service v0.10.8 h1:epZzRFY4RSuR52G6gU1yyGkwS/mow7Y0esdTCuIZX7g=
github.com/ethereum-optimism/optimism/op-service v0.10.7/go.mod h1:wbtHqi1fv00B3agj7a2zdP3OFanEfGZ23zPgGgFCF/c= github.com/ethereum-optimism/optimism/op-service v0.10.8/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-bindings/bindings/l2outputoracle.go
View file @ 16ba4ab6
This diff is collapsed.
op-chain-ops/go.mod
View file @ 16ba4ab6
...@@ -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.7 github.com/ethereum-optimism/optimism/op-bindings v0.10.8
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.7 // indirect github.com/ethereum-optimism/optimism/op-service v0.10.8 // 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 @ 16ba4ab6
...@@ -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.7 h1:/fG951SZKUwdsnNZeJyCJ6lI2AgiZOosblVggFe7syg= github.com/ethereum-optimism/optimism/op-bindings v0.10.8 h1:YA8DamAlRGWG7qZo6ommCGhZdC+hRUKKnh11nWAamZ0=
github.com/ethereum-optimism/optimism/op-bindings v0.10.7/go.mod h1:9ZSUq/rjlzp3uYyBN4sZmhTc3oZgDVqJ4wrUja7vj6c= github.com/ethereum-optimism/optimism/op-bindings v0.10.8/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.7 h1:XWTMSlLG8x0K+QAwBHNs7F7CwfkmpEiVY0xqwEnfA+Y= github.com/ethereum-optimism/optimism/op-service v0.10.8 h1:epZzRFY4RSuR52G6gU1yyGkwS/mow7Y0esdTCuIZX7g=
github.com/ethereum-optimism/optimism/op-service v0.10.7/go.mod h1:wbtHqi1fv00B3agj7a2zdP3OFanEfGZ23zPgGgFCF/c= github.com/ethereum-optimism/optimism/op-service v0.10.8/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 @ 16ba4ab6
...@@ -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.7 github.com/ethereum-optimism/optimism/op-batcher v0.10.8
github.com/ethereum-optimism/optimism/op-bindings v0.10.7 github.com/ethereum-optimism/optimism/op-bindings v0.10.8
github.com/ethereum-optimism/optimism/op-chain-ops v0.10.7 github.com/ethereum-optimism/optimism/op-chain-ops v0.10.8
github.com/ethereum-optimism/optimism/op-node v0.10.7 github.com/ethereum-optimism/optimism/op-node v0.10.8
github.com/ethereum-optimism/optimism/op-proposer v0.10.7 github.com/ethereum-optimism/optimism/op-proposer v0.10.8
github.com/ethereum-optimism/optimism/op-service v0.10.7 github.com/ethereum-optimism/optimism/op-service v0.10.8
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 @ 16ba4ab6
...@@ -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.7 h1:fN147RY4T494azf1vYEb8fpjqyAQfV8S4mAD2BSGU+E= github.com/ethereum-optimism/optimism/op-batcher v0.10.8 h1:3yDjwJsJ+LpZ4GTs0e7ryaf41pw9tQ8M0F9oHmYcu9M=
github.com/ethereum-optimism/optimism/op-batcher v0.10.7/go.mod h1:l8NGxkCfL7wG8od7Qd/66UTCRD/GhpyL8NsCREjDwfk= github.com/ethereum-optimism/optimism/op-batcher v0.10.8/go.mod h1:uZNCqM4cKWWjOy0nljCoXVWoxW72sGIDGicc3seG35Y=
github.com/ethereum-optimism/optimism/op-bindings v0.10.7 h1:/fG951SZKUwdsnNZeJyCJ6lI2AgiZOosblVggFe7syg= github.com/ethereum-optimism/optimism/op-bindings v0.10.8 h1:YA8DamAlRGWG7qZo6ommCGhZdC+hRUKKnh11nWAamZ0=
github.com/ethereum-optimism/optimism/op-bindings v0.10.7/go.mod h1:9ZSUq/rjlzp3uYyBN4sZmhTc3oZgDVqJ4wrUja7vj6c= github.com/ethereum-optimism/optimism/op-bindings v0.10.8/go.mod h1:9ZSUq/rjlzp3uYyBN4sZmhTc3oZgDVqJ4wrUja7vj6c=
github.com/ethereum-optimism/optimism/op-chain-ops v0.10.7 h1:GjbdBYP6u9+PiFJLBNn1aJzOAiSrFC3fAC3CyKETi2M= github.com/ethereum-optimism/optimism/op-chain-ops v0.10.8 h1:hsUQm/fwK99IHXJwlUM9QfTr82i2KUuSDezTy4q3ktI=
github.com/ethereum-optimism/optimism/op-chain-ops v0.10.7/go.mod h1:/zxR27u4tzSFUC7dT/5CgfwVP8JXgqmLJAqIAtvuAUg= github.com/ethereum-optimism/optimism/op-chain-ops v0.10.8/go.mod h1:mh9XQ3Fc3gjscMfEgPNCgrpRcbY0kDVgoGbqG+lkbVI=
github.com/ethereum-optimism/optimism/op-node v0.10.7 h1:dr8iKlUy8VXuUiRcoZ3wCQu9mPtyosC6/7D/VnmSy84= github.com/ethereum-optimism/optimism/op-node v0.10.8 h1:wdQlaIenwKWmq3OF4Bum6vDUqJcHi50LwOd0W8uR3T8=
github.com/ethereum-optimism/optimism/op-node v0.10.7/go.mod h1:l+g1HAgo4DZHm0hf17ztDSx2ZYs5sbFj/UhGkj6ur7k= github.com/ethereum-optimism/optimism/op-node v0.10.8/go.mod h1:iF/DSfu2DmiF3slkAsjQqYCd4rdiUwx1ydgdjc5zmo0=
github.com/ethereum-optimism/optimism/op-proposer v0.10.7 h1:w164WqXZxEREEzSj3/SY/Am/+Nwd0Aw3RGB3xLE8Ueg= github.com/ethereum-optimism/optimism/op-proposer v0.10.8 h1:aQqZrQCxtSMM6q0jTc29ct/UGNiVH0LOE+uyRrZelhk=
github.com/ethereum-optimism/optimism/op-proposer v0.10.7/go.mod h1:V48eWwPZ7rgbG2Zq5Ex4ergyqh4gt4CBGEFxmig7MJg= github.com/ethereum-optimism/optimism/op-proposer v0.10.8/go.mod h1:FYUuObzt4c+T0iBJIz/T4SBHpDO2pQQ7suMIV05YBSI=
github.com/ethereum-optimism/optimism/op-service v0.10.7 h1:XWTMSlLG8x0K+QAwBHNs7F7CwfkmpEiVY0xqwEnfA+Y= github.com/ethereum-optimism/optimism/op-service v0.10.8 h1:epZzRFY4RSuR52G6gU1yyGkwS/mow7Y0esdTCuIZX7g=
github.com/ethereum-optimism/optimism/op-service v0.10.7/go.mod h1:wbtHqi1fv00B3agj7a2zdP3OFanEfGZ23zPgGgFCF/c= github.com/ethereum-optimism/optimism/op-service v0.10.8/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/go.mod
View file @ 16ba4ab6
...@@ -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.7 github.com/ethereum-optimism/optimism/op-bindings v0.10.8
github.com/ethereum-optimism/optimism/op-chain-ops v0.10.7 github.com/ethereum-optimism/optimism/op-chain-ops v0.10.8
github.com/ethereum-optimism/optimism/op-service v0.10.7 github.com/ethereum-optimism/optimism/op-service v0.10.8
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 @ 16ba4ab6
...@@ -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.7 h1:/fG951SZKUwdsnNZeJyCJ6lI2AgiZOosblVggFe7syg= github.com/ethereum-optimism/optimism/op-bindings v0.10.8 h1:YA8DamAlRGWG7qZo6ommCGhZdC+hRUKKnh11nWAamZ0=
github.com/ethereum-optimism/optimism/op-bindings v0.10.7/go.mod h1:9ZSUq/rjlzp3uYyBN4sZmhTc3oZgDVqJ4wrUja7vj6c= github.com/ethereum-optimism/optimism/op-bindings v0.10.8/go.mod h1:9ZSUq/rjlzp3uYyBN4sZmhTc3oZgDVqJ4wrUja7vj6c=
github.com/ethereum-optimism/optimism/op-chain-ops v0.10.7 h1:GjbdBYP6u9+PiFJLBNn1aJzOAiSrFC3fAC3CyKETi2M= github.com/ethereum-optimism/optimism/op-chain-ops v0.10.8 h1:hsUQm/fwK99IHXJwlUM9QfTr82i2KUuSDezTy4q3ktI=
github.com/ethereum-optimism/optimism/op-chain-ops v0.10.7/go.mod h1:/zxR27u4tzSFUC7dT/5CgfwVP8JXgqmLJAqIAtvuAUg= github.com/ethereum-optimism/optimism/op-chain-ops v0.10.8/go.mod h1:mh9XQ3Fc3gjscMfEgPNCgrpRcbY0kDVgoGbqG+lkbVI=
github.com/ethereum-optimism/optimism/op-service v0.10.7 h1:XWTMSlLG8x0K+QAwBHNs7F7CwfkmpEiVY0xqwEnfA+Y= github.com/ethereum-optimism/optimism/op-service v0.10.8 h1:epZzRFY4RSuR52G6gU1yyGkwS/mow7Y0esdTCuIZX7g=
github.com/ethereum-optimism/optimism/op-service v0.10.7/go.mod h1:wbtHqi1fv00B3agj7a2zdP3OFanEfGZ23zPgGgFCF/c= github.com/ethereum-optimism/optimism/op-service v0.10.8/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 @ 16ba4ab6
package version package version
var ( var (
Version = "v0.10.7" Version = "v0.10.8"
Meta = "dev" Meta = "dev"
) )
op-proposer/cmd/main.go
View file @ 16ba4ab6
...@@ -13,7 +13,7 @@ import ( ...@@ -13,7 +13,7 @@ import (
) )
var ( var (
Version = "v0.10.7" Version = "v0.10.8"
GitCommit = "" GitCommit = ""
GitDate = "" GitDate = ""
) )
......
op-proposer/go.mod
View file @ 16ba4ab6
...@@ -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.7 github.com/ethereum-optimism/optimism/op-bindings v0.10.8
github.com/ethereum-optimism/optimism/op-node v0.10.7 github.com/ethereum-optimism/optimism/op-node v0.10.8
github.com/ethereum-optimism/optimism/op-service v0.10.7 github.com/ethereum-optimism/optimism/op-service v0.10.8
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 @ 16ba4ab6
...@@ -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.7 h1:/fG951SZKUwdsnNZeJyCJ6lI2AgiZOosblVggFe7syg= github.com/ethereum-optimism/optimism/op-bindings v0.10.8 h1:YA8DamAlRGWG7qZo6ommCGhZdC+hRUKKnh11nWAamZ0=
github.com/ethereum-optimism/optimism/op-bindings v0.10.7/go.mod h1:9ZSUq/rjlzp3uYyBN4sZmhTc3oZgDVqJ4wrUja7vj6c= github.com/ethereum-optimism/optimism/op-bindings v0.10.8/go.mod h1:9ZSUq/rjlzp3uYyBN4sZmhTc3oZgDVqJ4wrUja7vj6c=
github.com/ethereum-optimism/optimism/op-node v0.10.7 h1:dr8iKlUy8VXuUiRcoZ3wCQu9mPtyosC6/7D/VnmSy84= github.com/ethereum-optimism/optimism/op-node v0.10.8 h1:wdQlaIenwKWmq3OF4Bum6vDUqJcHi50LwOd0W8uR3T8=
github.com/ethereum-optimism/optimism/op-node v0.10.7/go.mod h1:l+g1HAgo4DZHm0hf17ztDSx2ZYs5sbFj/UhGkj6ur7k= github.com/ethereum-optimism/optimism/op-node v0.10.8/go.mod h1:iF/DSfu2DmiF3slkAsjQqYCd4rdiUwx1ydgdjc5zmo0=
github.com/ethereum-optimism/optimism/op-service v0.10.7 h1:XWTMSlLG8x0K+QAwBHNs7F7CwfkmpEiVY0xqwEnfA+Y= github.com/ethereum-optimism/optimism/op-service v0.10.8 h1:epZzRFY4RSuR52G6gU1yyGkwS/mow7Y0esdTCuIZX7g=
github.com/ethereum-optimism/optimism/op-service v0.10.7/go.mod h1:wbtHqi1fv00B3agj7a2zdP3OFanEfGZ23zPgGgFCF/c= github.com/ethereum-optimism/optimism/op-service v0.10.8/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/.gas-snapshot
View file @ 16ba4ab6
...@@ -139,11 +139,11 @@ L2ERC721Bridge_Test:test_finalizeBridgeERC721_succeeds() (gas: 168905) ...@@ -139,11 +139,11 @@ L2ERC721Bridge_Test:test_finalizeBridgeERC721_succeeds() (gas: 168905)
L2OutputOracleTest:test_computeL2Timestamp_succeeds() (gas: 37184) L2OutputOracleTest:test_computeL2Timestamp_succeeds() (gas: 37184)
L2OutputOracleTest:test_constructor_badTimestamp_reverts() (gas: 70717) L2OutputOracleTest:test_constructor_badTimestamp_reverts() (gas: 70717)
L2OutputOracleTest:test_constructor_succeeds() (gas: 33760) L2OutputOracleTest:test_constructor_succeeds() (gas: 33760)
L2OutputOracleTest:test_deleteL2Outputs_afterLatest_reverts() (gas: 200230) L2OutputOracleTest:test_deleteL2Outputs_afterLatest_reverts() (gas: 211900)
L2OutputOracleTest:test_deleteL2Outputs_ifNotChallenger_reverts() (gas: 18883) L2OutputOracleTest:test_deleteL2Outputs_ifNotChallenger_reverts() (gas: 18883)
L2OutputOracleTest:test_deleteL2Outputs_nonExistent_reverts() (gas: 103402) L2OutputOracleTest:test_deleteL2Outputs_nonExistent_reverts() (gas: 107292)
L2OutputOracleTest:test_deleteOutputs_multipleOutputs_succeeds() (gas: 286560) L2OutputOracleTest:test_deleteOutputs_multipleOutputs_succeeds() (gas: 302121)
L2OutputOracleTest:test_deleteOutputs_singleOutput_succeeds() (gas: 172876) L2OutputOracleTest:test_deleteOutputs_singleOutput_succeeds() (gas: 180656)
L2OutputOracleTest:test_getL2OutputIndexAfter_multipleOutputsExist_succeeds() (gas: 267182) L2OutputOracleTest:test_getL2OutputIndexAfter_multipleOutputsExist_succeeds() (gas: 267182)
L2OutputOracleTest:test_getL2OutputIndexAfter_noOutputsExis_reverts() (gas: 17914) L2OutputOracleTest:test_getL2OutputIndexAfter_noOutputsExis_reverts() (gas: 17914)
L2OutputOracleTest:test_getL2OutputIndexAfter_previousBlock_succeeds() (gas: 96086) L2OutputOracleTest:test_getL2OutputIndexAfter_previousBlock_succeeds() (gas: 96086)
...@@ -154,7 +154,7 @@ L2OutputOracleTest:test_nextBlockNumber_succeeds() (gas: 17468) ...@@ -154,7 +154,7 @@ L2OutputOracleTest:test_nextBlockNumber_succeeds() (gas: 17468)
L2OutputOracleTest:test_proposeL2Output_emptyOutput_reverts() (gas: 26688) L2OutputOracleTest:test_proposeL2Output_emptyOutput_reverts() (gas: 26688)
L2OutputOracleTest:test_proposeL2Output_futureTimetamp_reverts() (gas: 28646) L2OutputOracleTest:test_proposeL2Output_futureTimetamp_reverts() (gas: 28646)
L2OutputOracleTest:test_proposeL2Output_notProposer_reverts() (gas: 25782) L2OutputOracleTest:test_proposeL2Output_notProposer_reverts() (gas: 25782)
L2OutputOracleTest:test_proposeL2Output_proposeAnotherOutput_succeeds() (gas: 97137) L2OutputOracleTest:test_proposeL2Output_proposeAnotherOutput_succeeds() (gas: 101027)
L2OutputOracleTest:test_proposeL2Output_unexpectedBlockNumber_reverts() (gas: 28402) L2OutputOracleTest:test_proposeL2Output_unexpectedBlockNumber_reverts() (gas: 28402)
L2OutputOracleTest:test_proposeL2Output_unmatchedBlockhash_reverts() (gas: 29446) L2OutputOracleTest:test_proposeL2Output_unmatchedBlockhash_reverts() (gas: 29446)
L2OutputOracleTest:test_proposeL2Output_wrongFork_reverts() (gas: 29005) L2OutputOracleTest:test_proposeL2Output_wrongFork_reverts() (gas: 29005)
......
packages/contracts-bedrock/contracts/L1/L2OutputOracle.sol
View file @ 16ba4ab6
...@@ -198,7 +198,7 @@ contract L2OutputOracle is Initializable, Semver { ...@@ -198,7 +198,7 @@ contract L2OutputOracle is Initializable, Semver {
); );
} }
emit OutputProposed(_outputRoot, nextOutputIndex(), block.timestamp, _l2BlockNumber); emit OutputProposed(_outputRoot, nextOutputIndex(), _l2BlockNumber, block.timestamp);
l2Outputs.push( l2Outputs.push(
Types.OutputProposal({ Types.OutputProposal({
......
packages/contracts-bedrock/contracts/test/L2OutputOracle.t.sol
View file @ 16ba4ab6
...@@ -10,6 +10,13 @@ import { Types } from "../libraries/Types.sol"; ...@@ -10,6 +10,13 @@ import { Types } from "../libraries/Types.sol";
contract L2OutputOracleTest is L2OutputOracle_Initializer { contract L2OutputOracleTest is L2OutputOracle_Initializer {
bytes32 proposedOutput1 = keccak256(abi.encode(1)); bytes32 proposedOutput1 = keccak256(abi.encode(1));
event OutputProposed(
bytes32 indexed outputRoot,
uint256 indexed l2OutputIndex,
uint256 indexed l2BlockNumber,
uint256 l1Timestamp
);
function setUp() public override { function setUp() public override {
super.setUp(); super.setUp();
} }
...@@ -180,6 +187,7 @@ contract L2OutputOracleTest is L2OutputOracle_Initializer { ...@@ -180,6 +187,7 @@ contract L2OutputOracleTest is L2OutputOracle_Initializer {
function test_proposeL2Output_proposeAnotherOutput_succeeds() public { function test_proposeL2Output_proposeAnotherOutput_succeeds() public {
bytes32 proposedOutput2 = keccak256(abi.encode()); bytes32 proposedOutput2 = keccak256(abi.encode());
uint256 nextBlockNumber = oracle.nextBlockNumber(); uint256 nextBlockNumber = oracle.nextBlockNumber();
uint256 nextOutputIndex = oracle.nextOutputIndex();
warpToProposeTime(nextBlockNumber); warpToProposeTime(nextBlockNumber);
uint256 proposedNumber = oracle.latestBlockNumber(); uint256 proposedNumber = oracle.latestBlockNumber();
...@@ -187,6 +195,10 @@ contract L2OutputOracleTest is L2OutputOracle_Initializer { ...@@ -187,6 +195,10 @@ contract L2OutputOracleTest is L2OutputOracle_Initializer {
assertEq(nextBlockNumber, proposedNumber + submissionInterval); assertEq(nextBlockNumber, proposedNumber + submissionInterval);
vm.roll(nextBlockNumber + 1); vm.roll(nextBlockNumber + 1);
vm.expectEmit(true, true, true, true);
emit OutputProposed(proposedOutput2, nextOutputIndex, nextBlockNumber, block.timestamp);
vm.prank(proposer); vm.prank(proposer);
oracle.proposeL2Output(proposedOutput2, nextBlockNumber, 0, 0); oracle.proposeL2Output(proposedOutput2, nextBlockNumber, 0, 0);
} }
......
packages/contracts-bedrock/deploy-config/goerli.json
View file @ 16ba4ab6
{ {
"finalSystemOwner": "DUMMY", "numDeployConfirmations": 1,
"controller": "DUMMY",
"finalSystemOwner": "0xBc1233d0C3e6B5d53Ab455cF65A6623F6dCd7e4f",
"controller": "0xBc1233d0C3e6B5d53Ab455cF65A6623F6dCd7e4f",
"l1StartingBlockTag": "FILL_IN_DAY_OF",
"l1StartingBlockTag": "DUMMY",
"l1ChainID": 5, "l1ChainID": 5,
"l2ChainID": 420, "l2ChainID": 420,
"l2BlockTime": 2, "l2BlockTime": 2,
"maxSequencerDrift": 1200, "maxSequencerDrift": 600,
"sequencerWindowSize": 3600, "sequencerWindowSize": 3600,
"channelTimeout": 120, "channelTimeout": 300,
"p2pSequencerAddress": "DUMMY", "p2pSequencerAddress": "0x715b7219D986641DF9eFd9C7Ef01218D528e19ec",
"batchInboxAddress": "0xff00000000000000000000000000000000000420", "batchInboxAddress": "0xff00000000000000000000000000000000000420",
"batchSenderAddress": "DUMMY", "batchSenderAddress": "0x7431310e026B69BFC676C0013E12A1A11411EEc9",
"l2OutputOracleSubmissionInterval": 20,
"l2OutputOracleStartingTimestamp": -1,
"l2OutputOracleProposer": "DUMMY",
"l2OutputOracleChallenger": "DUMMY",
"finalizationPeriodSeconds": 2,
"l2GenesisBlockGasLimit": "0x17D7840", "l2OutputOracleSubmissionInterval": 12,
"l2GenesisBlockBaseFeePerGas": "0x3b9aca00", "l2OutputOracleStartingBlockNumber": "FILL_IN_DAY_OF",
"l2OutputOracleStartingTimestamp": "FILL_IN_DAY_OF",
"l2CrossDomainMessengerOwner": "DUMMY", "l2OutputOracleProposer": "0x02b1786A85Ec3f71fBbBa46507780dB7cF9014f6",
"l2OutputOracleChallenger": "0xBc1233d0C3e6B5d53Ab455cF65A6623F6dCd7e4f",
"governanceTokenName": "Optimism", "finalizationPeriodSeconds": 12,
"governanceTokenSymbol": "OP",
"governanceTokenOwner": "0x038a8825A3C3B0c08d52Cc76E5E361953Cf6Dc76", "proxyAdminOwner": "0xf80267194936da1E98dB10bcE06F3147D580a62e",
"baseFeeVaultRecipient": "0xBc1233d0C3e6B5d53Ab455cF65A6623F6dCd7e4f",
"l1FeeVaultRecipient": "0xBc1233d0C3e6B5d53Ab455cF65A6623F6dCd7e4f",
"sequencerFeeVaultRecipient": "0xBc1233d0C3e6B5d53Ab455cF65A6623F6dCd7e4f",
"gasPriceOracleOverhead": 2100, "gasPriceOracleOverhead": 2100,
"gasPriceOracleScalar": 1000000, "gasPriceOracleScalar": 1000000,
"governanceTokenSymbol": "OP",
"governanceTokenName": "Optimism",
"governanceTokenOwner": "0x038a8825A3C3B0c08d52Cc76E5E361953Cf6Dc76",
"l2GenesisBlockGasLimit": "0x17D7840",
"l2GenesisBlockBaseFeePerGas": "0x3b9aca00",
"eip1559Denominator": 50, "eip1559Denominator": 50,
"eip1559Elasticity": 10 "eip1559Elasticity": 10
} }
packages/contracts-bedrock/deploy/021-SystemDictatorSteps-2.ts
View file @ 16ba4ab6
...@@ -183,7 +183,19 @@ const deployFn: DeployFunction = async (hre) => { ...@@ -183,7 +183,19 @@ const deployFn: DeployFunction = async (hre) => {
l2OutputOracleStartingTimestamp: deployL2StartingTimestamp, l2OutputOracleStartingTimestamp: deployL2StartingTimestamp,
}) })
} else { } else {
const tx =
await SystemDictator.populateTransaction.updateL2OutputOracleDynamicConfig(
{
l2OutputOracleStartingBlockNumber:
hre.deployConfig.l2OutputOracleStartingBlockNumber,
l2OutputOracleStartingTimestamp:
hre.deployConfig.l2OutputOracleStartingTimestamp,
}
)
console.log(`Please update dynamic oracle config...`) console.log(`Please update dynamic oracle config...`)
console.log(`MSD address: ${SystemDictator.address}`)
console.log(`JSON:`)
console.log(jsonifyTransaction(tx))
} }
await awaitCondition( await awaitCondition(
......
packages/contracts-bedrock/deployments/goerli/L1StandardBridge.json 0 → 100644
View file @ 16ba4ab6
This source diff could not be displayed because it is too large. You can view the blob instead.
packages/contracts-bedrock/deployments/goerli/OptimismPortal.json 0 → 100644
View file @ 16ba4ab6
This source diff could not be displayed because it is too large. You can view the blob instead.
packages/contracts-bedrock/deployments/goerli/ProxyAdmin.json 0 → 100644
View file @ 16ba4ab6
This diff is collapsed.
packages/contracts-bedrock/hardhat.config.ts
View file @ 16ba4ab6
...@@ -22,6 +22,9 @@ const config: HardhatUserConfig = { ...@@ -22,6 +22,9 @@ const config: HardhatUserConfig = {
hardhat: { hardhat: {
live: false, live: false,
}, },
mainnet: {
url: process.env.RPC_URL || 'http://localhost:8545',
},
devnetL1: { devnetL1: {
live: false, live: false,
url: 'http://localhost:8545', url: 'http://localhost:8545',
...@@ -97,7 +100,10 @@ const config: HardhatUserConfig = { ...@@ -97,7 +100,10 @@ const config: HardhatUserConfig = {
}, },
], ],
deployments: { deployments: {
goerli: ['../contracts/deployments/goerli'], goerli: [
'../contracts/deployments/goerli',
'../contracts-periphery/deployments/goerli',
],
mainnet: [ mainnet: [
'../contracts/deployments/mainnet', '../contracts/deployments/mainnet',
'../contracts-periphery/deployments/mainnet', '../contracts-periphery/deployments/mainnet',
......
packages/contracts-bedrock/src/deploy-utils.ts
View file @ 16ba4ab6
...@@ -340,7 +340,13 @@ export const doStep = async (opts: { ...@@ -340,7 +340,13 @@ export const doStep = async (opts: {
console.log(`Executing step ${opts.step}...`) console.log(`Executing step ${opts.step}...`)
await opts.SystemDictator[`step${opts.step}`]() await opts.SystemDictator[`step${opts.step}`]()
} else { } else {
const tx = await opts.SystemDictator.populateTransaction[
`step${opts.step}`
]()
console.log(`Please execute step ${opts.step}...`) console.log(`Please execute step ${opts.step}...`)
console.log(`MSD address: ${opts.SystemDictator.address}`)
console.log(`JSON:`)
console.log(jsonifyTransaction(tx))
} }
// Wait for the step to complete. // Wait for the step to complete.
......
packages/contracts-bedrock/tasks/index.ts
View file @ 16ba4ab6
...@@ -9,3 +9,4 @@ import './accounts' ...@@ -9,3 +9,4 @@ import './accounts'
import './check-l2' import './check-l2'
import './update-dynamic-oracle-config' import './update-dynamic-oracle-config'
import './wait-for-final-batch' import './wait-for-final-batch'
import './wait-for-final-deposit'
\ No newline at end of file
packages/contracts-bedrock/tasks/wait-for-final-deposit.ts 0 → 100644
View file @ 16ba4ab6
import { task, types } from 'hardhat/config'
import '@nomiclabs/hardhat-ethers'
import 'hardhat-deploy'
import { HardhatRuntimeEnvironment } from 'hardhat/types'
import { BigNumber } from 'ethers'
import { sleep, toRpcHexString } from '@eth-optimism/core-utils'
task('wait-for-final-deposit', 'Waits for the final deposit to be ingested')
.addParam(
'l1RpcUrl',
'L1 RPC URL remote node',
'http://127.0.0.1:8545',
types.string
)
.addParam(
'l2RpcUrl',
'L2 RPC URL remote node',
'http://127.0.0.1:9545',
types.string
)
.setAction(async (args, hre: HardhatRuntimeEnvironment) => {
const l1Provider = new hre.ethers.providers.StaticJsonRpcProvider(
args.l1RpcUrl
)
const l2Provider = new hre.ethers.providers.StaticJsonRpcProvider(
args.l2RpcUrl
)
// Handle legacy deployments
let Deployment__AddressManager = await hre.deployments.getOrNull(
'Lib_AddressManager'
)
if (!Deployment__AddressManager) {
Deployment__AddressManager = await hre.deployments.get('AddressManager')
}
const AddressManager = new hre.ethers.Contract(
Deployment__AddressManager.address,
Deployment__AddressManager.abi,
l1Provider
)
const Deployment__CanonicalTransactionChain = await hre.deployments.get(
'CanonicalTransactionChain'
)
const CanonicalTransactionChain = new hre.ethers.Contract(
Deployment__CanonicalTransactionChain.address,
Deployment__CanonicalTransactionChain.abi,
l1Provider
)
// Wait for DTL_SHUTOFF_BLOCK block to be set in the AddressManager
let dtlShutoffBlock = BigNumber.from(0)
while (true) {
console.log('Waiting for DTL shutoff block to be set...')
const val = await AddressManager.getAddress('DTL_SHUTOFF_BLOCK')
dtlShutoffBlock = BigNumber.from(val)
if (!dtlShutoffBlock.eq(0)) {
break
}
await sleep(3000)
}
console.log(`DTL shutoff block ${dtlShutoffBlock.toString()}`)
// Now query the number of queue elements in the CTC
const queueLength = await CanonicalTransactionChain.getQueueLength()
console.log(`Total number of deposits: ${queueLength}`)
console.log('Searching backwards for final deposit')
let height = await l2Provider.getBlockNumber()
while (true) {
console.log(`Trying block ${height}`)
const hex = toRpcHexString(height)
const b = await l2Provider.send('eth_getBlockByNumber', [hex, true])
const tx = b.transactions[0]
if (tx === undefined) {
throw new Error(`unable to fetch transaction`)
}
if (tx.queueOrigin === 'l1') {
const queueIndex = BigNumber.from(tx.queueIndex).toNumber()
if (queueIndex === queueLength) {
break
}
if (queueIndex < queueLength) {
console.log()
throw new Error(
`Missed the final deposit. queueIndex ${queueIndex}, queueLength ${queueLength}`
)
}
}
height--
}
console.log('Final deposit has been ingested by l2geth')
})
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