feat: add SuperchainTokenBridge to interop applier

ethereum-optimism · Oct 17, 2024 · 2224787 · 2224787
1 parent 8457d2c
commit 2224787
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/genesis/cmd/main.go b/genesis/cmd/main.go
@@ -5,9 +5,9 @@ import (
 	"os"
 	"path"
 
-	"github.com/ethereum-optimism/optimism/op-chain-ops/deployer/opcm"
-	"github.com/ethereum-optimism/optimism/op-chain-ops/deployer/pipeline"
 	"github.com/ethereum-optimism/optimism/op-chain-ops/foundry"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/opcm"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/pipeline"
 	"github.com/ethereum-optimism/optimism/op-service/ioutil"
 	"github.com/ethereum-optimism/optimism/op-service/jsonutil"
 	oplog "github.com/ethereum-optimism/optimism/op-service/log"

diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.22.3
 
 require (
 	github.com/asaskevich/EventBus v0.0.0-20200907212545-49d423059eef
-	github.com/ethereum-optimism/optimism v1.9.4-0.20241016180232-3f65402acca0
+	github.com/ethereum-optimism/optimism v1.9.4-0.20241017231226-27c12a132d32
 	github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20241002103526-9083af857790
 	github.com/ethereum/go-ethereum v1.14.11
 	github.com/joho/godotenv v1.5.1

diff --git a/go.sum b/go.sum
@@ -97,8 +97,8 @@ 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/op-geth v1.101411.0-rc.1 h1:xRheNbOM+Js9a+dqVt5LmBqQK8L5IyHKU8FfI4Cy9qw=
 github.com/ethereum-optimism/op-geth v1.101411.0-rc.1/go.mod h1:7S4pp8KHBmEmKkRjL1BPOc6jY9hW+64YeMUjR3RVLw4=
-github.com/ethereum-optimism/optimism v1.9.4-0.20241016180232-3f65402acca0 h1:Yof8WmPC4iC0gH0BeTYxu3GVc0SXXHWXXpDevbR6/Ts=
-github.com/ethereum-optimism/optimism v1.9.4-0.20241016180232-3f65402acca0/go.mod h1:Xghe72cmK8ehQipbTp2TZSaiaKNIFKz2LWxKccAu5bg=
+github.com/ethereum-optimism/optimism v1.9.4-0.20241017231226-27c12a132d32 h1:0aL9mA2eP6HTUtGkATxJ+I4cELWp2uG1hALwRPAWvqg=
+github.com/ethereum-optimism/optimism v1.9.4-0.20241017231226-27c12a132d32/go.mod h1:Xghe72cmK8ehQipbTp2TZSaiaKNIFKz2LWxKccAu5bg=
 github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20241002103526-9083af857790 h1:yZlEBCdD0izqzTvmhET1roNSzMfXL50DhL+dALYlnXk=
 github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20241002103526-9083af857790/go.mod h1:XaVXL9jg8BcyOeugECgIUGa9Y3DjYJj71RHmb5qon6M=
 github.com/ethereum/c-kzg-4844 v1.0.0 h1:0X1LBXxaEtYD9xsyj9B9ctQEZIpnvVDeoBx8aHEwTNA=

diff --git a/interop/applier.go b/interop/applier.go
@@ -30,6 +30,7 @@ var interopPredeploys = []common.Address{
 	predeploys.L1BlockAddr,
 	predeploys.SuperchainWETHAddr,
 	predeploys.ETHLiquidityAddr,
+	predeploys.SuperchainTokenBridgeAddr,
 }
 
 type predeploy struct {

diff --git a/opsimulator/opsimulator.go b/opsimulator/opsimulator.go
@@ -35,7 +35,6 @@ import (
 const (
 	host                        = "127.0.0.1"
 	l2NativeSuperchainERC20Addr = "0x420beeF000000000000000000000000000000001"
-	superchainTokenBridgeAddr   = "0x4200000000000000000000000000000000000028"
 )
 
 type OpSimulator struct {
@@ -203,7 +202,7 @@ func (opSim *OpSimulator) startBackgroundTasks() {
 
 	// Log SuperchainTokenBridge events
 	opSim.bgTasks.Go(func() error {
-		superchainTokenBridge, err := bindings.NewSuperchainTokenBridge(common.HexToAddress(superchainTokenBridgeAddr), opSim.Chain.EthClient())
+		superchainTokenBridge, err := bindings.NewSuperchainTokenBridge(predeploys.SuperchainTokenBridgeAddr, opSim.Chain.EthClient())
 		if err != nil {
 			return fmt.Errorf("failed to create SuperchainTokenBridge contract: %w", err)
 		}