Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
nebula
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
exchain
nebula
Commits
27f7caa4
Commit
27f7caa4
authored
Jul 19, 2023
by
Hamdi Allam
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
move eth predeploy back into op-bindings
parent
1c1422ea
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
16 deletions
+7
-16
eth.go
indexer/db/eth.go
+2
-3
predeploys.go
indexer/op-legacy/predeploys.go
+0
-11
service.go
indexer/services/l2/service.go
+2
-2
addresses.go
op-bindings/predeploys/addresses.go
+3
-0
No files found.
indexer/db/eth.go
View file @
27f7caa4
package
db
import
(
"github.com/ethereum-optimism/optimism/op-bindings/predeploys"
"github.com/ethereum/go-ethereum/common"
op_legacy
"github.com/ethereum-optimism/optimism/indexer/op-legacy"
)
var
ETHL1Address
common
.
Address
...
...
@@ -20,7 +19,7 @@ var ETHL1Token = &Token{
// ETHL2Token is a placeholder token for differentiating ETH transactions from
// ERC20 transactions on L2.
var
ETHL2Token
=
&
Token
{
Address
:
op_legacy
.
LegacyERC20ETH
,
Address
:
predeploys
.
LegacyERC20ETH
,
Name
:
"Ethereum"
,
Symbol
:
"ETH"
,
Decimals
:
18
,
...
...
indexer/op-legacy/predeploys.go
deleted
100644 → 0
View file @
1c1422ea
package
op_legacy
import
"github.com/ethereum/go-ethereum/common"
const
(
LegacyERC20ETH
=
"0xDeadDeAddeAddEAddeadDEaDDEAdDeaDDeAD0000"
)
var
(
LegacyERC20ETHAddr
=
common
.
HexToAddress
(
LegacyERC20ETH
)
)
indexer/services/l2/service.go
View file @
27f7caa4
...
...
@@ -11,9 +11,9 @@ import (
"time"
"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/services/query"
"github.com/ethereum-optimism/optimism/op-bindings/predeploys"
"github.com/prometheus/client_golang/prometheus"
"github.com/ethereum-optimism/optimism/indexer/db"
...
...
@@ -122,7 +122,7 @@ func NewService(cfg ServiceConfig) (*Service, error) {
headerSelector
:
confirmedHeaderSelector
,
metrics
:
cfg
.
Metrics
,
tokenCache
:
map
[
common
.
Address
]
*
db
.
Token
{
op_legacy
.
LegacyERC20ETHAddr
:
db
.
ETHL1Token
,
predeploys
.
LegacyERC20ETHAddr
:
db
.
ETHL1Token
,
},
}
service
.
wg
.
Add
(
1
)
...
...
op-bindings/predeploys/addresses.go
View file @
27f7caa4
...
...
@@ -3,6 +3,7 @@ package predeploys
import
"github.com/ethereum/go-ethereum/common"
const
(
LegacyERC20ETH
=
"0xDeadDeAddeAddEAddeadDEaDDEAdDeaDDeAD0000"
L2ToL1MessagePasser
=
"0x4200000000000000000000000000000000000016"
DeployerWhitelist
=
"0x4200000000000000000000000000000000000002"
WETH9
=
"0x4200000000000000000000000000000000000006"
...
...
@@ -23,6 +24,7 @@ const (
)
var
(
LegacyERC20ETHAddr
=
common
.
HexToAddress
(
LegacyERC20ETH
)
L2ToL1MessagePasserAddr
=
common
.
HexToAddress
(
L2ToL1MessagePasser
)
DeployerWhitelistAddr
=
common
.
HexToAddress
(
DeployerWhitelist
)
WETH9Addr
=
common
.
HexToAddress
(
WETH9
)
...
...
@@ -56,6 +58,7 @@ func IsProxied(predeployAddr common.Address) bool {
}
func
init
()
{
Predeploys
[
"LegacyERC20ETHAddr"
]
=
&
LegacyERC20ETHAddr
Predeploys
[
"L2ToL1MessagePasser"
]
=
&
L2ToL1MessagePasserAddr
Predeploys
[
"DeployerWhitelist"
]
=
&
DeployerWhitelistAddr
Predeploys
[
"WETH9"
]
=
&
WETH9Addr
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment