Merge branch 'develop' into inphi/fpp-empty

go.mod

@@ -9,15 +9,15 @@ require (
 	github.com/docker/docker v20.10.24+incompatible
 	github.com/docker/go-connections v0.4.0
 	github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3
-	github.com/ethereum/go-ethereum v1.11.5
+	github.com/ethereum/go-ethereum v1.11.6
 	github.com/fsnotify/fsnotify v1.6.0
-	github.com/golang/snappy v0.0.4
+	github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb
 	github.com/google/go-cmp v0.5.9
 	github.com/google/gofuzz v1.2.1-0.20220503160820-4a35382e8fc8
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d
 	github.com/hashicorp/golang-lru/v2 v2.0.1
-	github.com/holiman/uint256 v1.2.0
+	github.com/holiman/uint256 v1.2.2-0.20230321075855-87b91420868c
 	github.com/ipfs/go-datastore v0.6.0
 	github.com/ipfs/go-ds-leveldb v0.5.0
 	github.com/libp2p/go-libp2p v0.25.1
@@ -35,7 +35,7 @@ require (
 	golang.org/x/crypto v0.6.0
 	golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb
 	golang.org/x/sync v0.1.0
-	golang.org/x/term v0.5.0
+	golang.org/x/term v0.6.0
 	golang.org/x/time v0.0.0-20220922220347-f3bd1da661af
 )
 
@@ -90,8 +90,8 @@ require (
 	github.com/hashicorp/go-bexpr v0.1.11 // indirect
 	github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
 	github.com/huin/goupnp v1.1.0 // indirect
-	github.com/influxdata/influxdb v1.8.3 // indirect
 	github.com/influxdata/influxdb-client-go/v2 v2.4.0 // indirect
+	github.com/influxdata/influxdb1-client v0.0.0-20220302092344-a9ab5670611c // indirect
 	github.com/influxdata/line-protocol v0.0.0-20210311194329-9aa0e372d097 // indirect
 	github.com/ipfs/go-cid v0.3.2 // indirect
 	github.com/ipfs/go-log v1.0.5 // indirect
@@ -175,12 +175,13 @@ require (
 	go.uber.org/fx v1.19.1 // indirect
 	go.uber.org/multierr v1.9.0 // indirect
 	go.uber.org/zap v1.24.0 // indirect
-	golang.org/x/mod v0.8.0 // indirect
-	golang.org/x/net v0.7.0 // indirect
-	golang.org/x/sys v0.5.0 // indirect
-	golang.org/x/text v0.7.0 // indirect
-	golang.org/x/tools v0.6.0 // indirect
+	golang.org/x/mod v0.9.0 // indirect
+	golang.org/x/net v0.8.0 // indirect
+	golang.org/x/sys v0.6.0 // indirect
+	golang.org/x/text v0.8.0 // indirect
+	golang.org/x/tools v0.7.0 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
+	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
 	gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
@@ -189,6 +190,6 @@ require (
 	nhooyr.io/websocket v1.8.7 // indirect
 )
 
-replace github.com/ethereum/go-ethereum v1.11.5 => github.com/ethereum-optimism/op-geth v1.101105.1-0.20230420183214-24ae687be390
+replace github.com/ethereum/go-ethereum v1.11.6 => github.com/ethereum-optimism/op-geth v1.101105.2-0.20230502202351-9cc072e922f6
 
-//replace github.com/ethereum/go-ethereum v1.11.5 => ../go-ethereum
+//replace github.com/ethereum/go-ethereum v1.11.6 => ../go-ethereum

op-batcher/Dockerfile

-FROM --platform=$BUILDPLATFORM golang:1.19.0-alpine3.15 as builder
+FROM --platform=$BUILDPLATFORM golang:1.19.9-alpine3.16 as builder
 
 ARG VERSION=v0.0.0
 
@@ -23,7 +23,7 @@ ARG TARGETOS TARGETARCH
 
 RUN make op-batcher VERSION="$VERSION" GOOS=$TARGETOS GOARCH=$TARGETARCH
 
-FROM alpine:3.15
+FROM alpine:3.16
 
 COPY --from=builder /app/op-batcher/bin/op-batcher /usr/local/bin
 

op-chain-ops/Dockerfile

-FROM golang:1.19.0-alpine3.15 as builder
+FROM golang:1.19.9-alpine3.15 as builder
 
 RUN apk add --no-cache make gcc musl-dev linux-headers git jq bash
 

op-chain-ops/deployer/deployer.go

@@ -51,7 +51,6 @@ func NewBackendWithGenesisTimestamp(ts uint64) *backends.SimulatedBackend {
 		DAOForkBlock:        nil,
 		DAOForkSupport:      false,
 		EIP150Block:         big.NewInt(0),
-		EIP150Hash:          common.Hash{},
 		EIP155Block:         big.NewInt(0),
 		EIP158Block:         big.NewInt(0),
 		ByzantiumBlock:      big.NewInt(0),

op-chain-ops/eof/eof_crawler.go

@@ -94,7 +94,10 @@ func IndexEOFContracts(dbPath string, out string) error {
 		}
 
 		// Attempt to get the address of the account from the trie
-		addrBytes := st.Get(it.Key)
+		addrBytes, err := st.Get(it.Key)
+		if err != nil {
+			return fmt.Errorf("load address for account: %w", err)
+		}
 		if addrBytes == nil {
 			// Preimage missing! Cannot continue.
 			missingPreimages++

op-chain-ops/genesis/genesis.go

@@ -39,7 +39,6 @@ func NewL2Genesis(config *DeployConfig, block *types.Block) (*core.Genesis, erro
 		DAOForkBlock:                  nil,
 		DAOForkSupport:                false,
 		EIP150Block:                   big.NewInt(0),
-		EIP150Hash:                    common.Hash{},
 		EIP155Block:                   big.NewInt(0),
 		EIP158Block:                   big.NewInt(0),
 		ByzantiumBlock:                big.NewInt(0),
@@ -109,7 +108,6 @@ func NewL1Genesis(config *DeployConfig) (*core.Genesis, error) {
 		DAOForkBlock:        nil,
 		DAOForkSupport:      false,
 		EIP150Block:         big.NewInt(0),
-		EIP150Hash:          common.Hash{},
 		EIP155Block:         big.NewInt(0),
 		EIP158Block:         big.NewInt(0),
 		ByzantiumBlock:      big.NewInt(0),

op-exporter/Dockerfile

-FROM golang:1.19.0-alpine3.15 as builder
+FROM golang:1.19.9-alpine3.16 as builder
 
 # build from root of repo
 COPY ./op-exporter /app
@@ -7,7 +7,7 @@ WORKDIR /app/
 RUN apk --no-cache add make bash jq git
 RUN make build
 
-FROM alpine:3.15
+FROM alpine:3.16
 RUN apk --no-cache add ca-certificates
 WORKDIR /root/
 COPY --from=builder /app/op-exporter /usr/local/bin/

op-node/Dockerfile

-FROM --platform=$BUILDPLATFORM golang:1.19.0-alpine3.15 as builder
+FROM --platform=$BUILDPLATFORM golang:1.19.9-alpine3.16 as builder
 
 ARG VERSION=v0.0.0
 
@@ -21,7 +21,7 @@ ARG TARGETOS TARGETARCH
 
 RUN make op-node VERSION="$VERSION" GOOS=$TARGETOS GOARCH=$TARGETARCH
 
-FROM alpine:3.15
+FROM alpine:3.16
 
 COPY --from=builder /app/op-node/bin/op-node /usr/local/bin
 

op-program/Dockerfile

-FROM --platform=$BUILDPLATFORM golang:1.19.0-alpine3.15 as builder
+FROM --platform=$BUILDPLATFORM golang:1.19.9-alpine3.16 as builder
 
 ARG VERSION=v0.0.0
 
@@ -22,7 +22,7 @@ ARG TARGETOS TARGETARCH
 
 RUN make op-program VERSION="$VERSION" GOOS=$TARGETOS GOARCH=$TARGETARCH
 
-FROM alpine:3.15
+FROM alpine:3.16
 
 COPY --from=builder /app/op-program/bin/op-program /usr/local/bin
 

op-program/host/config/chaincfg.go

@@ -3,7 +3,6 @@ package config
 import (
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/params"
 )
 
@@ -13,7 +12,6 @@ var OPGoerliChainConfig = &params.ChainConfig{
 	DAOForkBlock:                  nil,
 	DAOForkSupport:                false,
 	EIP150Block:                   big.NewInt(0),
-	EIP150Hash:                    common.Hash{},
 	EIP155Block:                   big.NewInt(0),
 	EIP158Block:                   big.NewInt(0),
 	ByzantiumBlock:                big.NewInt(0),

op-proposer/Dockerfile

-FROM --platform=$BUILDPLATFORM golang:1.19.0-alpine3.15 as builder
+FROM --platform=$BUILDPLATFORM golang:1.19.9-alpine3.16 as builder
 
 ARG VERSION=v0.0.0
 
@@ -22,7 +22,7 @@ ARG TARGETOS TARGETARCH
 
 RUN make op-proposer VERSION="$VERSION" GOOS=$TARGETOS GOARCH=$TARGETARCH
 
-FROM alpine:3.15
+FROM alpine:3.16
 
 COPY --from=builder /app/op-proposer/bin/op-proposer /usr/local/bin
 

op-wheel/Dockerfile

-FROM golang:1.19.0-alpine3.15 as builder
+FROM golang:1.19.9-alpine3.16 as builder
 
 RUN apk add --no-cache make gcc musl-dev linux-headers
 
@@ -14,7 +14,7 @@ WORKDIR /app/op-wheel
 
 RUN go build -o op-wheel ./cmd/main.go
 
-FROM alpine:3.15
+FROM alpine:3.16
 
 COPY --from=builder /app/op-wheel/op-wheel /usr/local/bin
 

ops-bedrock/Dockerfile.stateviz

-FROM golang:1.18.0-alpine3.15 as builder
+FROM golang:1.19.9-alpine3.16 as builder
 
 RUN apk add --no-cache make gcc musl-dev linux-headers git jq bash
 
@@ -14,7 +14,7 @@ COPY ./op-node /app/op-node
 
 RUN go build -o ./bin/stateviz ./cmd/stateviz
 
-FROM alpine:3.15
+FROM alpine:3.16
 
 COPY --from=builder /app/op-node/bin/stateviz /usr/local/bin
 

specs/dispute-game-interface.md

@@ -196,14 +196,19 @@ interface IDisputeGame_OutputAttestation is IDisputeGame {
     function challenges(address challenger) external view returns (bool _challenged);
 
     /// @notice The signer set consists of authorized public keys that may challenge the `rootClaim`.
-    /// @return An array of authorized signers.
-    function signerSet() external view returns (address[] memory _signers);
+    ///         This set of signers is snapshotted from the `SystemConfig` upon creation of the game.
+    /// @return An array of authorized signers from the `SystemConfig` contract.
+    function frozenSignerSet() external view returns (address[] memory _signers);
+
+    /// @notice The signer set consists of authorized public keys that may challenge the `rootClaim`.
+    /// @return _isAuthorized Whether or not the `addr` is part of the frozen signer set.
+    function signerSet(address addr) external view override returns (bool _isAuthorized);
 
     /// @notice The amount of signatures required to successfully challenge the `rootClaim`
     ///         output proposal. Once this threshold is met by members of the `signerSet`
     ///         calling `challenge`, the game will be resolved to `CHALLENGER_WINS`.
     /// @custom:invariant The `signatureThreshold` may never be greater than the length of the `signerSet`.
-    function signatureThreshold() public view returns (uint16 _signatureThreshold);
+    function frozenSignatureThreshold() external view returns (uint256 _signatureThreshold);
 
     /// @notice Returns the L2 Block Number that the `rootClaim` commits to. Exists within the `extraData`.
     function l2BlockNumber() public view returns (uint256 _l2BlockNumber);
@@ -211,8 +216,6 @@ interface IDisputeGame_OutputAttestation is IDisputeGame {
     /// @notice Challenge the `rootClaim`.
     /// @dev - If the `ecrecover`ed address that created the signature is not a part of the
     ///      signer set returned by `signerSet`, this function should revert.
-    ///      - If the `ecrecover`ed address that created the signature is not the msg.sender,
-    ///      this function should revert.
     ///      - If the signature provided is the signature that breaches the signature threshold,
     ///      the function should call the `resolve` function to resolve the game as `CHALLENGER_WINS`.
     ///      - When the game resolves, the bond attached to the root claim should be distributed among