Commit 27f7caa4 authored by Hamdi Allam's avatar Hamdi Allam

move eth predeploy back into op-bindings

parent 1c1422ea
package db package db
import ( import (
"github.com/ethereum-optimism/optimism/op-bindings/predeploys"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
op_legacy "github.com/ethereum-optimism/optimism/indexer/op-legacy"
) )
var ETHL1Address common.Address var ETHL1Address common.Address
...@@ -20,7 +19,7 @@ var ETHL1Token = &Token{ ...@@ -20,7 +19,7 @@ var ETHL1Token = &Token{
// ETHL2Token is a placeholder token for differentiating ETH transactions from // ETHL2Token is a placeholder token for differentiating ETH transactions from
// ERC20 transactions on L2. // ERC20 transactions on L2.
var ETHL2Token = &Token{ var ETHL2Token = &Token{
Address: op_legacy.LegacyERC20ETH, Address: predeploys.LegacyERC20ETH,
Name: "Ethereum", Name: "Ethereum",
Symbol: "ETH", Symbol: "ETH",
Decimals: 18, Decimals: 18,
......
package op_legacy
import "github.com/ethereum/go-ethereum/common"
const (
LegacyERC20ETH = "0xDeadDeAddeAddEAddeadDEaDDEAdDeaDDeAD0000"
)
var (
LegacyERC20ETHAddr = common.HexToAddress(LegacyERC20ETH)
)
...@@ -11,9 +11,9 @@ import ( ...@@ -11,9 +11,9 @@ import (
"time" "time"
"github.com/ethereum-optimism/optimism/indexer/metrics" "github.com/ethereum-optimism/optimism/indexer/metrics"
op_legacy "github.com/ethereum-optimism/optimism/indexer/op-legacy"
"github.com/ethereum-optimism/optimism/indexer/server" "github.com/ethereum-optimism/optimism/indexer/server"
"github.com/ethereum-optimism/optimism/indexer/services/query" "github.com/ethereum-optimism/optimism/indexer/services/query"
"github.com/ethereum-optimism/optimism/op-bindings/predeploys"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
"github.com/ethereum-optimism/optimism/indexer/db" "github.com/ethereum-optimism/optimism/indexer/db"
...@@ -122,7 +122,7 @@ func NewService(cfg ServiceConfig) (*Service, error) { ...@@ -122,7 +122,7 @@ func NewService(cfg ServiceConfig) (*Service, error) {
headerSelector: confirmedHeaderSelector, headerSelector: confirmedHeaderSelector,
metrics: cfg.Metrics, metrics: cfg.Metrics,
tokenCache: map[common.Address]*db.Token{ tokenCache: map[common.Address]*db.Token{
op_legacy.LegacyERC20ETHAddr: db.ETHL1Token, predeploys.LegacyERC20ETHAddr: db.ETHL1Token,
}, },
} }
service.wg.Add(1) service.wg.Add(1)
......
...@@ -3,6 +3,7 @@ package predeploys ...@@ -3,6 +3,7 @@ package predeploys
import "github.com/ethereum/go-ethereum/common" import "github.com/ethereum/go-ethereum/common"
const ( const (
LegacyERC20ETH = "0xDeadDeAddeAddEAddeadDEaDDEAdDeaDDeAD0000"
L2ToL1MessagePasser = "0x4200000000000000000000000000000000000016" L2ToL1MessagePasser = "0x4200000000000000000000000000000000000016"
DeployerWhitelist = "0x4200000000000000000000000000000000000002" DeployerWhitelist = "0x4200000000000000000000000000000000000002"
WETH9 = "0x4200000000000000000000000000000000000006" WETH9 = "0x4200000000000000000000000000000000000006"
...@@ -23,6 +24,7 @@ const ( ...@@ -23,6 +24,7 @@ const (
) )
var ( var (
LegacyERC20ETHAddr = common.HexToAddress(LegacyERC20ETH)
L2ToL1MessagePasserAddr = common.HexToAddress(L2ToL1MessagePasser) L2ToL1MessagePasserAddr = common.HexToAddress(L2ToL1MessagePasser)
DeployerWhitelistAddr = common.HexToAddress(DeployerWhitelist) DeployerWhitelistAddr = common.HexToAddress(DeployerWhitelist)
WETH9Addr = common.HexToAddress(WETH9) WETH9Addr = common.HexToAddress(WETH9)
...@@ -56,6 +58,7 @@ func IsProxied(predeployAddr common.Address) bool { ...@@ -56,6 +58,7 @@ func IsProxied(predeployAddr common.Address) bool {
} }
func init() { func init() {
Predeploys["LegacyERC20ETHAddr"] = &LegacyERC20ETHAddr
Predeploys["L2ToL1MessagePasser"] = &L2ToL1MessagePasserAddr Predeploys["L2ToL1MessagePasser"] = &L2ToL1MessagePasserAddr
Predeploys["DeployerWhitelist"] = &DeployerWhitelistAddr Predeploys["DeployerWhitelist"] = &DeployerWhitelistAddr
Predeploys["WETH9"] = &WETH9Addr Predeploys["WETH9"] = &WETH9Addr
......
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