update dependencies, remove outdated testnet simulator

.circleci/config.yml

@@ -103,11 +103,6 @@ workflows:
           requires: [ "build" ]
           context: slack
           sim: optimism/rpc
-      - run-hive-sim:
-          name: hive-test-testnet
-          requires: [ "build" ]
-          context: slack
-          sim: optimism/testnet
   scheduled:
     triggers:
       - schedule:

go.work

@@ -16,7 +16,6 @@ use (
 	./simulators/optimism/l1ops
 	./simulators/optimism/p2p
 	./simulators/optimism/rpc
-	./simulators/optimism/testnet
 	./simulators/smoke/clique
 	./simulators/smoke/genesis
 	./simulators/smoke/network

optimism/devnet.go

@@ -22,6 +22,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	opbf "github.com/ethereum-optimism/optimism/op-batcher/flags"
+	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils"
 	opnf "github.com/ethereum-optimism/optimism/op-node/flags"
 	oppf "github.com/ethereum-optimism/optimism/op-proposer/flags"
 	"github.com/ethereum/hive/hivesim"
@@ -251,11 +252,9 @@ func (d *Devnet) AddOpProposer(eth1Index int, l2EngIndex int, opNodeIndex int, o
 
 	eth1Node := d.GetEth1(eth1Index)
 	opNode := d.GetOpNode(opNodeIndex)
-	l2Engine := d.GetOpL2Engine(l2EngIndex)
 
 	defaultSettings := HiveUnpackParams{
 		oppf.L1EthRpcFlag.EnvVar:                  eth1Node.WsRpcEndpoint(),
-		oppf.L2EthRpcFlag.EnvVar:                  l2Engine.WsRpcEndpoint(),
 		oppf.RollupRpcFlag.EnvVar:                 opNode.HttpRpcEndpoint(),
 		oppf.L2OOAddressFlag.EnvVar:               d.Deployments.L2OutputOracleProxy.String(),
 		oppf.PollIntervalFlag.EnvVar:              "10s",
@@ -264,7 +263,7 @@ func (d *Devnet) AddOpProposer(eth1Index int, l2EngIndex int, opNodeIndex int, o
 		oppf.ResubmissionTimeoutFlag.EnvVar:       "30s",
 		oppf.MnemonicFlag.EnvVar:                  d.MnemonicCfg.Mnemonic,
 		oppf.L2OutputHDPathFlag.EnvVar:            d.MnemonicCfg.Proposer,
-		"OP_PROPOSER_ALLOW_NON_FINALIZED":         "true",
+		oppf.AllowNonFinalizedFlag.EnvVar:         "true",
 		"OP_PROPOSER_LOG_LEVEL":                   "debug",
 	}
 	input := []hivesim.StartOption{defaultSettings.Params()}
@@ -396,7 +395,6 @@ func (d *Devnet) InitChain(maxSeqDrift uint64, seqWindowSize uint64, chanTimeout
 		SequencerWindowSize:       seqWindowSize,
 		ChannelTimeout:            chanTimeout,
 		P2PSequencerAddress:       d.Addresses.SequencerP2P,
-		OptimismL2FeeRecipient:    common.Address{0: 0x42, 19: 0xf0}, // tbd
 		BatchInboxAddress:         common.Address{0: 0x42, 19: 0xff}, // tbd
 		BatchSenderAddress:        d.Addresses.Batcher,
 
@@ -405,6 +403,8 @@ func (d *Devnet) InitChain(maxSeqDrift uint64, seqWindowSize uint64, chanTimeout
 		L2OutputOracleProposer:           d.Addresses.Proposer,
 		L2OutputOracleOwner:              common.Address{}, // tbd
 
+		SystemConfigOwner: common.Address{0: 0x42, 1: 43},
+
 		L1BlockTime:                 15,
 		L1GenesisBlockNonce:         0,
 		CliqueSignerAddress:         d.Addresses.CliqueSigner,
@@ -435,7 +435,6 @@ func (d *Devnet) InitChain(maxSeqDrift uint64, seqWindowSize uint64, chanTimeout
 		GasPriceOracleOwner:         common.Address{0: 0x42, 19: 0xf3}, // tbd
 		GasPriceOracleOverhead:      2100,
 		GasPriceOracleScalar:        1000_000,
-		GasPriceOracleDecimals:      6,
 		DeploymentWaitConfirmations: 1,
 
 		EIP1559Elasticity:  10,
@@ -452,9 +451,9 @@ func (d *Devnet) InitChain(maxSeqDrift uint64, seqWindowSize uint64, chanTimeout
 
 	l1Block := l1Genesis.ToBlock()
 	l2Addrs := &genesis.L2Addresses{
-		ProxyAdmin:                  predeploys.DevProxyAdminAddr,
 		L1StandardBridgeProxy:       predeploys.DevL1StandardBridgeAddr,
 		L1CrossDomainMessengerProxy: predeploys.DevL1CrossDomainMessengerAddr,
+		L1ERC721BridgeProxy:         predeploys.DevL1ERC721BridgeAddr,
 	}
 
 	l2Genesis, err := genesis.BuildL2DeveloperGenesis(config, l1Block, l2Addrs)
@@ -477,7 +476,8 @@ func (d *Devnet) InitChain(maxSeqDrift uint64, seqWindowSize uint64, chanTimeout
 				Hash:   l2Genesis.ToBlock().Hash(),
 				Number: 0,
 			},
-			L2Time: uint64(config.L1GenesisBlockTimestamp),
+			L2Time:       uint64(config.L1GenesisBlockTimestamp),
+			SystemConfig: e2eutils.SystemConfigFromDeployConfig(config),
 		},
 		BlockTime:              config.L2BlockTime,
 		MaxSequencerDrift:      config.MaxSequencerDrift,
@@ -486,10 +486,9 @@ func (d *Devnet) InitChain(maxSeqDrift uint64, seqWindowSize uint64, chanTimeout
 		L1ChainID:              new(big.Int).SetUint64(config.L1ChainID),
 		L2ChainID:              new(big.Int).SetUint64(config.L2ChainID),
 		P2PSequencerAddress:    config.P2PSequencerAddress,
-		FeeRecipientAddress:    config.OptimismL2FeeRecipient,
 		BatchInboxAddress:      config.BatchInboxAddress,
-		BatchSenderAddress:     config.BatchSenderAddress,
 		DepositContractAddress: predeploys.DevOptimismPortalAddr,
+		L1SystemConfigAddress:  predeploys.DevSystemConfigAddr,
 	}
 
 	d.Deployments.DeploymentsL1 = DeploymentsL1{

optimism/go.mod

@@ -2,14 +2,15 @@ module github.com/ethereum/hive/optimism
 
 go 1.18
 
-replace github.com/ethereum/go-ethereum v1.10.23 => github.com/ethereum-optimism/op-geth v0.0.0-20220926184707-53d23c240afd
+replace github.com/ethereum/go-ethereum v1.10.23 => github.com/ethereum-optimism/op-geth v0.0.0-20221104021113-befc264446fa
 
 require (
-	github.com/ethereum-optimism/optimism/op-batcher v0.8.9
-	github.com/ethereum-optimism/optimism/op-bindings v0.8.9
-	github.com/ethereum-optimism/optimism/op-chain-ops v0.8.9
-	github.com/ethereum-optimism/optimism/op-node v0.8.9
-	github.com/ethereum-optimism/optimism/op-proposer v0.8.9
+	github.com/ethereum-optimism/optimism/op-batcher v0.9.0
+	github.com/ethereum-optimism/optimism/op-bindings v0.9.0
+	github.com/ethereum-optimism/optimism/op-chain-ops v0.9.0
+	github.com/ethereum-optimism/optimism/op-e2e v0.9.0
+	github.com/ethereum-optimism/optimism/op-node v0.9.0
+	github.com/ethereum-optimism/optimism/op-proposer v0.9.0
 	github.com/ethereum/go-ethereum v1.10.23
 	github.com/ethereum/hive v0.0.0-20220727121216-02ad57aaf9c1
 	github.com/miguelmota/go-ethereum-hdwallet v0.1.1
@@ -36,7 +37,7 @@ require (
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/edsrzf/mmap-go v1.1.0 // indirect
 	github.com/elastic/gosigar v0.14.2 // indirect
-	github.com/ethereum-optimism/optimism/op-service v0.8.9 // indirect
+	github.com/ethereum-optimism/optimism/op-service v0.9.0 // indirect
 	github.com/fjl/memsize v0.0.1 // indirect
 	github.com/flynn/noise v1.0.0 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect

optimism/go.sum

@@ -173,20 +173,22 @@ 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/op-geth v0.0.0-20220926184707-53d23c240afd h1:NchOnosWOkH9wlix8QevGHE+6vuRa+OMGvDNsczv2kQ=
-github.com/ethereum-optimism/op-geth v0.0.0-20220926184707-53d23c240afd/go.mod h1:/6CsT5Ceen2WPLI/oCA3xMcZ5sWMF/D46SjM/ayY0Oo=
-github.com/ethereum-optimism/optimism/op-batcher v0.8.9 h1:toKo/4yjwLX7J/C/Fi9hH3jd2TYAWwxUc9VPpR/Dv+A=
-github.com/ethereum-optimism/optimism/op-batcher v0.8.9/go.mod h1:iRw9zIuH0mV+zg7gpUeMHGuGsAWcFdIqzQdRMkW1fvQ=
-github.com/ethereum-optimism/optimism/op-bindings v0.8.9 h1:QeYLhgZP0QkDLxyXhkWLj/iHDFkMNI18abgrHL4I9TE=
-github.com/ethereum-optimism/optimism/op-bindings v0.8.9/go.mod h1:pyTCbh2o/SY+5/AL2Qo5GgAao3Gtt9Ff6tfK9Pa9emM=
-github.com/ethereum-optimism/optimism/op-chain-ops v0.8.9 h1:Z8174lRVnvw1r8w0OS0vOrFXcAg6635WuqHObZSJzKs=
-github.com/ethereum-optimism/optimism/op-chain-ops v0.8.9/go.mod h1:Y+on77cEP5Kn6Jc2aX24d3zk2lvT76KaUlTQSn7zesU=
-github.com/ethereum-optimism/optimism/op-node v0.8.9 h1:wUxvjeHB1nQtnsxbNxqHthSS+Uune7Xb17NWXDBdSXI=
-github.com/ethereum-optimism/optimism/op-node v0.8.9/go.mod h1:ETNw9UP6sy/pWf6aoNHEgQKrXN2ca0Fm0OqIbCEghYk=
-github.com/ethereum-optimism/optimism/op-proposer v0.8.9 h1:affd05NB0zxYJA/aCXEwDtaH1kcZfu3b3mnJTn94v74=
-github.com/ethereum-optimism/optimism/op-proposer v0.8.9/go.mod h1:00UGw9VkWSv/0TyltXqU2NGsp4QaWVPzLZ4zvpUGbhU=
-github.com/ethereum-optimism/optimism/op-service v0.8.9 h1:YdMBcgXi+NHqX3pKR6UhjGHtBeF8AQK6kLmwpv7LzJM=
-github.com/ethereum-optimism/optimism/op-service v0.8.9/go.mod h1:K0uybOhICTc2yfhrRj0cD1m7aPkOf5C9e6bUmvf4rGA=
+github.com/ethereum-optimism/op-geth v0.0.0-20221104021113-befc264446fa h1:jQ6FlSUf8BOttQexgqHjltQhn495S2oL06/UA20co9w=
+github.com/ethereum-optimism/op-geth v0.0.0-20221104021113-befc264446fa/go.mod h1:/6CsT5Ceen2WPLI/oCA3xMcZ5sWMF/D46SjM/ayY0Oo=
+github.com/ethereum-optimism/optimism/op-batcher v0.9.0 h1:7tqonODI3X6RBaXCyy0UXerJ17BrpENHZWmvd9KWmrk=
+github.com/ethereum-optimism/optimism/op-batcher v0.9.0/go.mod h1:+9BNdLCZLdCU6ALeGOVAibVFSGT5/g8DQVOYOEb3iVI=
+github.com/ethereum-optimism/optimism/op-bindings v0.9.0 h1:CZmeC5Jq5T7ijjUor+ylWCfgYOmIvYlB9rhJ8VO6rRY=
+github.com/ethereum-optimism/optimism/op-bindings v0.9.0/go.mod h1:ahYJOfSx0e0kwDq7doROfxMa00CXuklAGC5uS9kKdTU=
+github.com/ethereum-optimism/optimism/op-chain-ops v0.9.0 h1:oWhjl3ZkOjzdRkgE2q3b2nTuqegHbwXsFmSAb3y5nL0=
+github.com/ethereum-optimism/optimism/op-chain-ops v0.9.0/go.mod h1:0DdDDwMEBdBMkqWfX8c5s17nDdKAyf+9VKnlk++bYYQ=
+github.com/ethereum-optimism/optimism/op-e2e v0.9.0 h1:cEnXyLsmCPSozFeXx7H+MaYoFLc/kZ3abGp+DjVaO80=
+github.com/ethereum-optimism/optimism/op-e2e v0.9.0/go.mod h1:wvTyLXBoRFl6n6WyziC7a6d8x8uQyPjhRNw6V6Jrwe4=
+github.com/ethereum-optimism/optimism/op-node v0.9.0 h1:fdIhZBKs51EZhVQT51PpZ/Ug+W0eqt88UhNAaQ7ySzk=
+github.com/ethereum-optimism/optimism/op-node v0.9.0/go.mod h1:0kVRsoEdYTkxd0Bgi5UddpQE+n7uI7WGMh2KLwJ4/Tk=
+github.com/ethereum-optimism/optimism/op-proposer v0.9.0 h1:jOT8ckvQDc0Dssr/l86zEH+FMRgMpAp23er/v+DY+FE=
+github.com/ethereum-optimism/optimism/op-proposer v0.9.0/go.mod h1:1vTrvuernHcvYD/nnrLti2jKEArUFEe6Yvy3B/7aYJA=
+github.com/ethereum-optimism/optimism/op-service v0.9.0 h1:gT6lDgS5Hi+lGNVuki9bdkAwyCSi+1rCMXzKhPaa3DE=
+github.com/ethereum-optimism/optimism/op-service v0.9.0/go.mod h1:1nUKyuhfxcRVhNzklwE+JRe2vs5vax5jn/X8j16WlIc=
 github.com/ethereum/go-ethereum v1.10.4/go.mod h1:nEE0TP5MtxGzOMd7egIrbPJMQBnhVU3ELNxhBglIzhg=
 github.com/ethereum/hive v0.0.0-20220727121216-02ad57aaf9c1 h1:/9pjERGkOhfngQJ8wAxx+pjrM5lnml+dUxD3HVDaE8g=
 github.com/ethereum/hive v0.0.0-20220727121216-02ad57aaf9c1/go.mod h1:G8XiiUErpj6++yb93r6y6T1nWBh4Bgoi3QFwUSbzt/U=

optimism/nodes.go

@@ -3,8 +3,9 @@ package optimism
 import (
 	"crypto/ecdsa"
 	"fmt"
+	"github.com/ethereum-optimism/optimism/op-node/client"
 	"github.com/ethereum-optimism/optimism/op-node/p2p"
-	"github.com/ethereum-optimism/optimism/op-proposer/rollupclient"
+	"github.com/ethereum-optimism/optimism/op-node/sources"
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/ethereum/hive/hivesim"
 )
@@ -74,8 +75,8 @@ func (e *OpNode) HttpRpcEndpoint() string {
 	return fmt.Sprintf("http://%v:%d", e.IP, RollupRPCPort)
 }
 
-func (e *OpNode) RollupClient() *rollupclient.RollupClient {
-	return rollupclient.NewRollupClient(e.RPC())
+func (e *OpNode) RollupClient() *sources.RollupClient {
+	return sources.NewRollupClient(client.NewBaseRPCClient(e.RPC()))
 }
 
 func (e *OpNode) P2PClient() *p2p.Client {

scripts/update-op-dependencies.py

@@ -9,7 +9,6 @@
     'simulators/optimism/l1ops',
     'simulators/optimism/p2p',
     'simulators/optimism/rpc',
-    'simulators/optimism/testnet',
 ]
 REPLACER_RE = r'replace github\.com/ethereum/go-ethereum (.*) => github.com/ethereum-optimism/op-geth'
 VERSION_RE = r'github\.com/ethereum-optimism/op-geth@([va-f0-9\d\.\-]+)'

simulators/optimism/l1ops/deposit_tests.go

@@ -1,8 +1,7 @@
 package main
 
 import (
-	"encoding/json"
-	"fmt"
+	"github.com/ethereum/go-ethereum/ethclient/gethclient"
 	"math/big"
 	"math/rand"
 	"time"
@@ -234,12 +233,9 @@ func erc20RoundtripTest(t *hivesim.T, env *optimism.TestEnv) {
 	finHeader, err := l2.HeaderByNumber(env.Ctx(), big.NewInt(int64(finBlockNum)))
 	require.NoError(t, err)
 
-	j, _ := json.MarshalIndent(receipt, "", "  ")
-	fmt.Println(string(j))
-
 	// Get withdrawal parameters
-	l2Client := withdrawals.NewClient(env.Devnet.GetOpL2Engine(0).RPC())
-	wParams, err := withdrawals.FinalizeWithdrawalParameters(env.Ctx(), l2Client, tx.Hash(), finHeader)
+	proofClient := gethclient.New(env.Devnet.GetOpL2Engine(0).RPC())
+	wParams, err := withdrawals.FinalizeWithdrawalParameters(env.Ctx(), proofClient, l2, tx.Hash(), finHeader)
 	require.NoError(t, err)
 
 	// Finalize the withdrawal

simulators/optimism/l1ops/go.mod

@@ -2,16 +2,16 @@ module github.com/ethereum/hive/simulators/optimism/l1ops
 
 go 1.18
 
-replace github.com/ethereum/go-ethereum v1.10.23 => github.com/ethereum-optimism/op-geth v0.0.0-20220926184707-53d23c240afd
+replace github.com/ethereum/go-ethereum v1.10.23 => github.com/ethereum-optimism/op-geth v0.0.0-20221104021113-befc264446fa
 
 replace github.com/ethereum/hive v0.0.0-20220727121216-02ad57aaf9c1 => github.com/ethereum-optimism/hive v0.0.0-20220929220349-8cbb5d7fffe7
 
 replace github.com/ethereum/hive/optimism v0.0.0 => github.com/ethereum-optimism/hive/optimism v0.0.0-20221102053920-dbdb4ad29ff2
 
 require (
-	github.com/ethereum-optimism/optimism/op-bindings v0.8.9
-	github.com/ethereum-optimism/optimism/op-chain-ops v0.8.9
-	github.com/ethereum-optimism/optimism/op-node v0.8.9
+	github.com/ethereum-optimism/optimism/op-bindings v0.9.0
+	github.com/ethereum-optimism/optimism/op-chain-ops v0.9.0
+	github.com/ethereum-optimism/optimism/op-node v0.9.0
 	github.com/ethereum/go-ethereum v1.10.23
 	github.com/ethereum/hive v0.0.0-20220727121216-02ad57aaf9c1
 	github.com/ethereum/hive/optimism v0.0.0
@@ -39,7 +39,7 @@ require (
 	github.com/elastic/gosigar v0.14.2 // indirect
 	github.com/ethereum-optimism/optimism/op-batcher v0.8.9 // indirect
 	github.com/ethereum-optimism/optimism/op-proposer v0.8.9 // indirect
-	github.com/ethereum-optimism/optimism/op-service v0.8.9 // indirect
+	github.com/ethereum-optimism/optimism/op-service v0.9.0 // indirect
 	github.com/fjl/memsize v0.0.1 // indirect
 	github.com/flynn/noise v1.0.0 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect

simulators/optimism/l1ops/go.sum

@@ -177,20 +177,20 @@ github.com/ethereum-optimism/hive v0.0.0-20220929220349-8cbb5d7fffe7 h1:OW94CEw+
 github.com/ethereum-optimism/hive v0.0.0-20220929220349-8cbb5d7fffe7/go.mod h1:SH5X2jsgBzhSFkcG2OD9O8gTC4iXU1HycjLiWp/oDs0=
 github.com/ethereum-optimism/hive/optimism v0.0.0-20221102053920-dbdb4ad29ff2 h1:hzPWf5GmvU38BNkdJBPxJ+536/fCQDr1WvGdrkkvmSk=
 github.com/ethereum-optimism/hive/optimism v0.0.0-20221102053920-dbdb4ad29ff2/go.mod h1:YI3uBK5ffT0KJpHQx8VqjYO8il2T0NxI6eHIzV0M3eo=
-github.com/ethereum-optimism/op-geth v0.0.0-20220926184707-53d23c240afd h1:NchOnosWOkH9wlix8QevGHE+6vuRa+OMGvDNsczv2kQ=
-github.com/ethereum-optimism/op-geth v0.0.0-20220926184707-53d23c240afd/go.mod h1:/6CsT5Ceen2WPLI/oCA3xMcZ5sWMF/D46SjM/ayY0Oo=
+github.com/ethereum-optimism/op-geth v0.0.0-20221104021113-befc264446fa h1:jQ6FlSUf8BOttQexgqHjltQhn495S2oL06/UA20co9w=
+github.com/ethereum-optimism/op-geth v0.0.0-20221104021113-befc264446fa/go.mod h1:/6CsT5Ceen2WPLI/oCA3xMcZ5sWMF/D46SjM/ayY0Oo=
 github.com/ethereum-optimism/optimism/op-batcher v0.8.9 h1:toKo/4yjwLX7J/C/Fi9hH3jd2TYAWwxUc9VPpR/Dv+A=
 github.com/ethereum-optimism/optimism/op-batcher v0.8.9/go.mod h1:iRw9zIuH0mV+zg7gpUeMHGuGsAWcFdIqzQdRMkW1fvQ=
-github.com/ethereum-optimism/optimism/op-bindings v0.8.9 h1:QeYLhgZP0QkDLxyXhkWLj/iHDFkMNI18abgrHL4I9TE=
-github.com/ethereum-optimism/optimism/op-bindings v0.8.9/go.mod h1:pyTCbh2o/SY+5/AL2Qo5GgAao3Gtt9Ff6tfK9Pa9emM=
-github.com/ethereum-optimism/optimism/op-chain-ops v0.8.9 h1:Z8174lRVnvw1r8w0OS0vOrFXcAg6635WuqHObZSJzKs=
-github.com/ethereum-optimism/optimism/op-chain-ops v0.8.9/go.mod h1:Y+on77cEP5Kn6Jc2aX24d3zk2lvT76KaUlTQSn7zesU=
-github.com/ethereum-optimism/optimism/op-node v0.8.9 h1:wUxvjeHB1nQtnsxbNxqHthSS+Uune7Xb17NWXDBdSXI=
-github.com/ethereum-optimism/optimism/op-node v0.8.9/go.mod h1:ETNw9UP6sy/pWf6aoNHEgQKrXN2ca0Fm0OqIbCEghYk=
+github.com/ethereum-optimism/optimism/op-bindings v0.9.0 h1:CZmeC5Jq5T7ijjUor+ylWCfgYOmIvYlB9rhJ8VO6rRY=
+github.com/ethereum-optimism/optimism/op-bindings v0.9.0/go.mod h1:ahYJOfSx0e0kwDq7doROfxMa00CXuklAGC5uS9kKdTU=
+github.com/ethereum-optimism/optimism/op-chain-ops v0.9.0 h1:oWhjl3ZkOjzdRkgE2q3b2nTuqegHbwXsFmSAb3y5nL0=
+github.com/ethereum-optimism/optimism/op-chain-ops v0.9.0/go.mod h1:0DdDDwMEBdBMkqWfX8c5s17nDdKAyf+9VKnlk++bYYQ=
+github.com/ethereum-optimism/optimism/op-node v0.9.0 h1:fdIhZBKs51EZhVQT51PpZ/Ug+W0eqt88UhNAaQ7ySzk=
+github.com/ethereum-optimism/optimism/op-node v0.9.0/go.mod h1:0kVRsoEdYTkxd0Bgi5UddpQE+n7uI7WGMh2KLwJ4/Tk=
 github.com/ethereum-optimism/optimism/op-proposer v0.8.9 h1:affd05NB0zxYJA/aCXEwDtaH1kcZfu3b3mnJTn94v74=
 github.com/ethereum-optimism/optimism/op-proposer v0.8.9/go.mod h1:00UGw9VkWSv/0TyltXqU2NGsp4QaWVPzLZ4zvpUGbhU=
-github.com/ethereum-optimism/optimism/op-service v0.8.9 h1:YdMBcgXi+NHqX3pKR6UhjGHtBeF8AQK6kLmwpv7LzJM=
-github.com/ethereum-optimism/optimism/op-service v0.8.9/go.mod h1:K0uybOhICTc2yfhrRj0cD1m7aPkOf5C9e6bUmvf4rGA=
+github.com/ethereum-optimism/optimism/op-service v0.9.0 h1:gT6lDgS5Hi+lGNVuki9bdkAwyCSi+1rCMXzKhPaa3DE=
+github.com/ethereum-optimism/optimism/op-service v0.9.0/go.mod h1:1nUKyuhfxcRVhNzklwE+JRe2vs5vax5jn/X8j16WlIc=
 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=

simulators/optimism/l1ops/withdrawal_tests.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"github.com/ethereum/go-ethereum/ethclient/gethclient"
 	"math/big"
 	"time"
 
@@ -47,8 +48,8 @@ func simpleWithdrawalTest(t *hivesim.T, env *optimism.TestEnv) {
 	finHeader, err := l2.HeaderByNumber(env.Ctx(), big.NewInt(int64(finBlockNum)))
 	require.NoError(t, err)
 
-	l2Client := withdrawals.NewClient(env.Devnet.GetOpL2Engine(0).RPC())
-	wParams, err := withdrawals.FinalizeWithdrawalParameters(env.Ctx(), l2Client, initTx.Hash(), finHeader)
+	proofClient := gethclient.New(env.Devnet.GetOpL2Engine(0).RPC())
+	wParams, err := withdrawals.FinalizeWithdrawalParameters(env.Ctx(), proofClient, l2, initTx.Hash(), finHeader)
 	require.NoError(t, err)
 
 	portal, err := bindings.NewOptimismPortal(

simulators/optimism/p2p/go.mod

@@ -2,14 +2,14 @@ module github.com/ethereum/hive/simulators/optimism/p2p
 
 go 1.18
 
-replace github.com/ethereum/go-ethereum v1.10.23 => github.com/ethereum-optimism/op-geth v0.0.0-20220926184707-53d23c240afd
+replace github.com/ethereum/go-ethereum v1.10.23 => github.com/ethereum-optimism/op-geth v0.0.0-20221104021113-befc264446fa
 
 replace github.com/ethereum/hive v0.0.0-20220727121216-02ad57aaf9c1 => github.com/ethereum-optimism/hive v0.0.0-20220929220349-8cbb5d7fffe7
 
 replace github.com/ethereum/hive/optimism v0.0.0 => github.com/ethereum-optimism/hive/optimism v0.0.0-20221102053920-dbdb4ad29ff2
 
 require (
-	github.com/ethereum-optimism/optimism/op-node v0.8.9
+	github.com/ethereum-optimism/optimism/op-node v0.9.0
 	github.com/ethereum/go-ethereum v1.10.23
 	github.com/ethereum/hive v0.0.0-20220727121216-02ad57aaf9c1
 	github.com/ethereum/hive/optimism v0.0.0
@@ -36,10 +36,10 @@ require (
 	github.com/edsrzf/mmap-go v1.1.0 // indirect
 	github.com/elastic/gosigar v0.14.2 // indirect
 	github.com/ethereum-optimism/optimism/op-batcher v0.8.9 // indirect
-	github.com/ethereum-optimism/optimism/op-bindings v0.8.9 // indirect
-	github.com/ethereum-optimism/optimism/op-chain-ops v0.8.9 // indirect
+	github.com/ethereum-optimism/optimism/op-bindings v0.9.0 // indirect
+	github.com/ethereum-optimism/optimism/op-chain-ops v0.9.0 // indirect
 	github.com/ethereum-optimism/optimism/op-proposer v0.8.9 // indirect
-	github.com/ethereum-optimism/optimism/op-service v0.8.9 // indirect
+	github.com/ethereum-optimism/optimism/op-service v0.9.0 // indirect
 	github.com/fjl/memsize v0.0.1 // indirect
 	github.com/flynn/noise v1.0.0 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect