Develop -> Master

.changeset/afraid-jokes-run.md

@@ -0,0 +1,6 @@
+---
+'@eth-optimism/ci-builder': patch
+'@eth-optimism/foundry': patch
+---
+
+Update foundry to fix a bug in coverage generation

.changeset/brave-glasses-dress.md

@@ -0,0 +1,5 @@
+---
+'@eth-optimism/contracts-bedrock': minor
+---
+
+Removes initializer from StandardBridge in favor of immutables

.changeset/gorgeous-waves-allow.md

@@ -0,0 +1,5 @@
+---
+'@eth-optimism/sdk': patch
+---
+
+Add wsteth support for DAI bridge to sdk

.changeset/green-stingrays-nail.md

@@ -0,0 +1,5 @@
+---
+'@eth-optimism/contracts-bedrock': minor
+---
+
+Updates the storage layout for the CrossDomainMessenger base contract to reduce diff with the existing system.

.changeset/serious-deers-end.md

@@ -0,0 +1,5 @@
+---
+'@eth-optimism/contracts-bedrock': patch
+---
+
+Delete hardhat genesis tasks

.circleci/config.yml

@@ -175,7 +175,7 @@ jobs:
             fi
       - run:
           name: check go bindings
-          command: make && git diff --exit-code
+          command: make && git diff --exit-code -- ':!*_more.go'
           working_directory: op-bindings
 
   js-lint-test:

indexer/db/sql.go

@@ -65,7 +65,7 @@ CREATE TABLE IF NOT EXISTS withdrawals (
 	log_index INTEGER NOT NULL,
 	l1_block_hash VARCHAR REFERENCES l1_blocks(hash),
 	l2_block_hash VARCHAR NOT NULL REFERENCES l2_blocks(hash),
-	tx_hash VARCHAR NOT NULL,
+	tx_hash VARCHAR NOT NULL
 )
 `
 

indexer/services/l1/bridge/bridge.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/ethereum-optimism/optimism/indexer/db"
 	"github.com/ethereum-optimism/optimism/op-bindings/bindings"
+	"github.com/ethereum-optimism/optimism/op-bindings/predeploys"
 
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
@@ -25,59 +26,65 @@ type Bridge interface {
 type implConfig struct {
 	name string
 	impl string
-	addr common.Address
+	addr string
 }
 
-var addrs map[string]common.Address
+var defaultBridgeCfgs = map[uint64][]*implConfig{
+	// Devnet
+	900: {
+		{"Standard", "StandardBridge", predeploys.DevL1StandardBridge},
+		{"ETH", "ETHBridge", predeploys.DevL1StandardBridge},
+	},
+}
 
 var customBridgeCfgs = map[uint64][]*implConfig{
 	// Mainnet
 	1: {
-		{"BitBTC", "StandardBridge", common.HexToAddress("0xaBA2c5F108F7E820C049D5Af70B16ac266c8f128")},
-		{"DAI", "StandardBridge", common.HexToAddress("0x10E6593CDda8c58a1d0f14C5164B376352a55f2F")},
+		{"BitBTC", "StandardBridge", "0xaBA2c5F108F7E820C049D5Af70B16ac266c8f128"},
+		{"DAI", "StandardBridge", "0x10E6593CDda8c58a1d0f14C5164B376352a55f2F"},
 	},
 	// Kovan
 	42: {
-		{"BitBTC", "StandardBridge", common.HexToAddress("0x0b651A42F32069d62d5ECf4f2a7e5Bd3E9438746")},
-		{"USX", "StandardBridge", common.HexToAddress("0x40E862341b2416345F02c41Ac70df08525150dC7")},
-		{"DAI", "StandardBridge", common.HexToAddress("0xb415e822C4983ecD6B1c1596e8a5f976cf6CD9e3")},
+		{"BitBTC", "StandardBridge", "0x0b651A42F32069d62d5ECf4f2a7e5Bd3E9438746"},
+		{"USX", "StandardBridge", "0x40E862341b2416345F02c41Ac70df08525150dC7"},
+		{"DAI", "StandardBridge", "0xb415e822C4983ecD6B1c1596e8a5f976cf6CD9e3"},
 	},
 }
 
 func BridgesByChainID(chainID *big.Int, client bind.ContractBackend, ctx context.Context) (map[string]Bridge, error) {
-	allCfgs := []*implConfig{
-		{"Standard", "StandardBridge", addrs["L1StandardBridge"]},
-		{"ETH", "ETHBridge", addrs["L1StandardBridge"]},
-	}
+	allCfgs := make([]*implConfig, 0)
+	allCfgs = append(allCfgs, defaultBridgeCfgs[chainID.Uint64()]...)
 	allCfgs = append(allCfgs, customBridgeCfgs[chainID.Uint64()]...)
 
 	bridges := make(map[string]Bridge)
 	for _, bridge := range allCfgs {
 		switch bridge.impl {
 		case "StandardBridge":
-			l1StandardBridgeFilter, err := bindings.NewL1StandardBridgeFilterer(bridge.addr, client)
+			l1StandardBridgeAddress := common.HexToAddress(bridge.addr)
+			l1StandardBridgeFilter, err := bindings.NewL1StandardBridgeFilterer(l1StandardBridgeAddress, client)
 			if err != nil {
 				return nil, err
 			}
 
 			standardBridge := &StandardBridge{
 				name:     bridge.name,
 				ctx:      ctx,
-				address:  bridge.addr,
+				address:  l1StandardBridgeAddress,
 				client:   client,
 				filterer: l1StandardBridgeFilter,
 			}
 			bridges[bridge.name] = standardBridge
 		case "ETHBridge":
-			l1EthBridgeFilter, err := bindings.NewL1StandardBridgeFilterer(bridge.addr, client)
+			l1StandardBridgeAddress := common.HexToAddress(bridge.addr)
+			l1EthBridgeFilter, err := bindings.NewL1StandardBridgeFilterer(l1StandardBridgeAddress, client)
 			if err != nil {
 				return nil, err
 			}
 
 			ethBridge := &EthBridge{
 				name:     bridge.name,
 				ctx:      ctx,
-				address:  bridge.addr,
+				address:  l1StandardBridgeAddress,
 				client:   client,
 				filterer: l1EthBridgeFilter,
 			}

indexer/services/l1/service.go

@@ -113,7 +113,11 @@ func NewService(cfg ServiceConfig) (*Service, error) {
 		return nil, fmt.Errorf("chain ID configured with %d but got %d", cfg.ChainID, chainID)
 	}
 
-	var bridges map[string]bridge.Bridge
+	bridges, err := bridge.BridgesByChainID(cfg.ChainID, cfg.L1Client, ctx)
+	if err != nil {
+		cancel()
+		return nil, err
+	}
 	logger.Info("Scanning bridges for deposits", "bridges", bridges)
 
 	confirmedHeaderSelector, err := NewConfirmedHeaderSelector(HeaderSelectorConfig{
@@ -278,7 +282,7 @@ func (s *Service) Update(newHeader *types.Header) error {
 		}
 
 		receives++
-		if receives == len(s.bridges) {
+		if receives == 2*len(s.bridges) {
 			break
 		}
 	}

indexer/services/l2/bridge/bridge.go

@@ -28,8 +28,11 @@ type implConfig struct {
 	addr string
 }
 
-var defaultBridgeCfgs = []*implConfig{
-	{"Standard", "StandardBridge", L2StandardBridgeAddr},
+var defaultBridgeCfgs = map[uint64][]*implConfig{
+	// Devnet
+	901: {
+		{"Standard", "StandardBridge", L2StandardBridgeAddr},
+	},
 }
 
 var customBridgeCfgs = map[uint64][]*implConfig{
@@ -48,7 +51,7 @@ var customBridgeCfgs = map[uint64][]*implConfig{
 
 func BridgesByChainID(chainID *big.Int, client bind.ContractFilterer, ctx context.Context) (map[string]Bridge, error) {
 	allCfgs := make([]*implConfig, 0)
-	allCfgs = append(allCfgs, defaultBridgeCfgs...)
+	allCfgs = append(allCfgs, defaultBridgeCfgs[chainID.Uint64()]...)
 	allCfgs = append(allCfgs, customBridgeCfgs[chainID.Uint64()]...)
 
 	bridges := make(map[string]Bridge)

indexer/services/l2/service.go

@@ -278,7 +278,7 @@ func (s *Service) Update(newHeader *types.Header) error {
 		}
 
 		receives++
-		if receives == len(s.bridges) {
+		if receives == 2*len(s.bridges) {
 			break
 		}
 	}

op-batcher/batch_submitter.go

@@ -16,16 +16,17 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/ethereum-optimism/optimism/op-node/sources"
 	oplog "github.com/ethereum-optimism/optimism/op-service/log"
 	opmetrics "github.com/ethereum-optimism/optimism/op-service/metrics"
 	oppprof "github.com/ethereum-optimism/optimism/op-service/pprof"
 	oprpc "github.com/ethereum-optimism/optimism/op-service/rpc"
-	"github.com/ethereum/go-ethereum/rpc"
+	hdwallet "github.com/miguelmota/go-ethereum-hdwallet"
+	"github.com/urfave/cli"
 
 	"github.com/ethereum-optimism/optimism/op-batcher/sequencer"
 	"github.com/ethereum-optimism/optimism/op-node/eth"
 	"github.com/ethereum-optimism/optimism/op-node/rollup/derive"
-	"github.com/ethereum-optimism/optimism/op-proposer/rollupclient"
 	"github.com/ethereum-optimism/optimism/op-proposer/txmgr"
 	"github.com/ethereum/go-ethereum/accounts"
 	"github.com/ethereum/go-ethereum/common"
@@ -34,8 +35,7 @@ import (
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/ethereum/go-ethereum/log"
-	hdwallet "github.com/miguelmota/go-ethereum-hdwallet"
-	"github.com/urfave/cli"
+	"github.com/ethereum/go-ethereum/rpc"
 )
 
 const (
@@ -491,7 +491,7 @@ func dialEthClientWithTimeout(ctx context.Context, url string) (
 // dialRollupClientWithTimeout attempts to dial the RPC provider using the provided
 // URL. If the dial doesn't complete within defaultDialTimeout seconds, this
 // method will return an error.
-func dialRollupClientWithTimeout(ctx context.Context, url string) (*rollupclient.RollupClient, error) {
+func dialRollupClientWithTimeout(ctx context.Context, url string) (*sources.RollupClient, error) {
 	ctxt, cancel := context.WithTimeout(ctx, defaultDialTimeout)
 	defer cancel()
 
@@ -500,7 +500,7 @@ func dialRollupClientWithTimeout(ctx context.Context, url string) (*rollupclient
 		return nil, err
 	}
 
-	return rollupclient.NewRollupClient(client), nil
+	return sources.NewRollupClient(client), nil
 }
 
 // parseAddress parses an ETH address from a hex string. This method will fail if

op-batcher/cmd/main.go

@@ -4,13 +4,12 @@ import (
 	"fmt"
 	"os"
 
-	oplog "github.com/ethereum-optimism/optimism/op-service/log"
-
-	"github.com/ethereum/go-ethereum/log"
 	"github.com/urfave/cli"
 
 	batcher "github.com/ethereum-optimism/optimism/op-batcher"
 	"github.com/ethereum-optimism/optimism/op-batcher/flags"
+	oplog "github.com/ethereum-optimism/optimism/op-service/log"
+	"github.com/ethereum/go-ethereum/log"
 )
 
 var (

op-batcher/config.go

@@ -3,16 +3,13 @@ package op_batcher
 import (
 	"time"
 
-	oprpc "github.com/ethereum-optimism/optimism/op-service/rpc"
-
-	opmetrics "github.com/ethereum-optimism/optimism/op-service/metrics"
-
-	oplog "github.com/ethereum-optimism/optimism/op-service/log"
-	oppprof "github.com/ethereum-optimism/optimism/op-service/pprof"
-
 	"github.com/urfave/cli"
 
 	"github.com/ethereum-optimism/optimism/op-batcher/flags"
+	oplog "github.com/ethereum-optimism/optimism/op-service/log"
+	opmetrics "github.com/ethereum-optimism/optimism/op-service/metrics"
+	oppprof "github.com/ethereum-optimism/optimism/op-service/pprof"
+	oprpc "github.com/ethereum-optimism/optimism/op-service/rpc"
 )
 
 type Config struct {

op-batcher/flags/flags.go

@@ -1,12 +1,13 @@
 package flags
 
 import (
+	"github.com/urfave/cli"
+
 	opservice "github.com/ethereum-optimism/optimism/op-service"
 	oplog "github.com/ethereum-optimism/optimism/op-service/log"
 	opmetrics "github.com/ethereum-optimism/optimism/op-service/metrics"
 	oppprof "github.com/ethereum-optimism/optimism/op-service/pprof"
 	oprpc "github.com/ethereum-optimism/optimism/op-service/rpc"
-	"github.com/urfave/cli"
 )
 
 const envVarPrefix = "OP_BATCHER"

op-batcher/sequencer/driver.go

@@ -5,7 +5,7 @@ import (
 	"math/big"
 	"time"
 
-	"github.com/ethereum-optimism/optimism/op-proposer/rollupclient"
+	"github.com/ethereum-optimism/optimism/op-node/sources"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/ethclient"
@@ -22,7 +22,7 @@ type Config struct {
 	// API to hit for batch data
 	L2Client *ethclient.Client
 
-	RollupNode *rollupclient.RollupClient
+	RollupNode *sources.RollupClient
 
 	// Limit the size of txs
 	MinL1TxSize uint64

op-bindings/Makefile

@@ -20,11 +20,12 @@ bindings: l1block-bindings \
 	proxy-bindings \
 	proxy-admin-bindings \
 	erc20-bindings \
-	weth9-bindings
+	weth9-bindings \
+	deployer-whitelist-bindings
 
 compile:
 	cd ../packages/contracts-bedrock/ && \
-		forge build -o ./tmp-artifacts
+		npx hardhat compile
 
 l1-cross-domain-messenger-bindings: compile
 	./gen_bindings.sh contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger $(pkg)
@@ -72,14 +73,20 @@ proxy-admin-bindings: compile
 	./gen_bindings.sh contracts/universal/ProxyAdmin.sol:ProxyAdmin $(pkg)
 
 erc20-bindings: compile
-	./gen_bindings.sh ERC20 $(pkg)
+	./gen_bindings.sh node_modules/@openzeppelin/contracts/token/ERC20/ERC20.sol:ERC20 $(pkg)
 
 weth9-bindings: compile
 	./gen_bindings.sh contracts/vendor/WETH9.sol:WETH9 $(pkg)
 
+deployer-whitelist-bindings: compile
+	./gen_bindings.sh contracts/legacy/DeployerWhitelist.sol:DeployerWhitelist $(pkg)
+
+l1-blocknumber-bindings: compile
+	./gen_bindings.sh contracts/legacy/L1BlockNumber.sol:L1BlockNumber $(pkg)
+
 more:
 	go run ./gen/main.go \
-		-artifacts ../packages/contracts-bedrock/artifacts,../packages/contracts-governance/artifacts \
+		-artifacts ../packages/contracts-bedrock/artifacts \
 		-out ./bindings \
 		-contracts OptimismMintableERC20Factory,L2StandardBridge,L1BlockNumber,DeployerWhitelist,Proxy,OptimismPortal,L2ToL1MessagePasser,L2CrossDomainMessenger,GasPriceOracle,SequencerFeeVault,L1Block,LegacyERC20ETH,WETH9,GovernanceToken \
 		-package bindings