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
871cda5c
Unverified
Commit
871cda5c
authored
Oct 17, 2022
by
mergify[bot]
Committed by
GitHub
Oct 17, 2022
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' into e2e/set-value
parents
a1858767
e97a9ade
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
43 additions
and
16 deletions
+43
-16
flat-windows-trade.md
.changeset/flat-windows-trade.md
+0
-5
shy-trainers-sneeze.md
.changeset/shy-trainers-sneeze.md
+0
-5
wet-cameras-cover.md
.changeset/wet-cameras-cover.md
+0
-5
dev_addresses.go
op-bindings/predeploys/dev_addresses.go
+3
-0
layer_one.go
op-chain-ops/genesis/layer_one.go
+19
-0
layer_one_test.go
op-chain-ops/genesis/layer_one_test.go
+12
-0
CHANGELOG.md
proxyd/CHANGELOG.md
+8
-0
package.json
proxyd/package.json
+1
-1
No files found.
.changeset/flat-windows-trade.md
deleted
100644 → 0
View file @
a1858767
---
'
@eth-optimism/proxyd'
:
minor
---
Allow disabling backend rate limiter
.changeset/shy-trainers-sneeze.md
deleted
100644 → 0
View file @
a1858767
---
'
@eth-optimism/proxyd'
:
minor
---
Support pattern matching in exempt origins/user agents
.changeset/wet-cameras-cover.md
deleted
100644 → 0
View file @
a1858767
---
'
@eth-optimism/proxyd'
:
minor
---
adds server.log_level config
op-bindings/predeploys/dev_addresses.go
View file @
871cda5c
...
...
@@ -10,6 +10,7 @@ const (
DevOptimismMintableERC20Factory
=
"0x6900000000000000000000000000000000000004"
DevAddressManager
=
"0x6900000000000000000000000000000000000005"
DevProxyAdmin
=
"0x6900000000000000000000000000000000000006"
DevWETH9
=
"0x6900000000000000000000000000000000000007"
)
var
(
...
...
@@ -20,6 +21,7 @@ var (
DevOptimismMintableERC20FactoryAddr
=
common
.
HexToAddress
(
DevOptimismMintableERC20Factory
)
DevAddressManagerAddr
=
common
.
HexToAddress
(
DevAddressManager
)
DevProxyAdminAddr
=
common
.
HexToAddress
(
DevProxyAdmin
)
DevWETH9Addr
=
common
.
HexToAddress
(
DevWETH9
)
DevPredeploys
=
make
(
map
[
string
]
*
common
.
Address
)
)
...
...
@@ -32,4 +34,5 @@ func init() {
DevPredeploys
[
"OptimismMintableERC20Factory"
]
=
&
DevOptimismMintableERC20FactoryAddr
DevPredeploys
[
"AddressManager"
]
=
&
DevAddressManagerAddr
DevPredeploys
[
"Admin"
]
=
&
DevProxyAdminAddr
DevPredeploys
[
"WETH9"
]
=
&
DevWETH9Addr
}
op-chain-ops/genesis/layer_one.go
View file @
871cda5c
...
...
@@ -165,6 +165,16 @@ func BuildL1DeveloperGenesis(config *DeployConfig) (*core.Genesis, error) {
for
name
,
proxyAddr
:=
range
predeploys
.
DevPredeploys
{
memDB
.
SetState
(
*
proxyAddr
,
ImplementationSlot
,
depsByName
[
name
]
.
Address
.
Hash
())
// Special case for WETH since it was not designed to be behind a proxy
if
name
==
"WETH9"
{
name
,
_
:=
state
.
EncodeStringValue
(
"Wrapped Ether"
,
0
)
symbol
,
_
:=
state
.
EncodeStringValue
(
"WETH"
,
0
)
decimals
,
_
:=
state
.
EncodeUintValue
(
18
,
0
)
memDB
.
SetState
(
*
proxyAddr
,
common
.
Hash
{},
name
)
memDB
.
SetState
(
*
proxyAddr
,
common
.
Hash
{
31
:
0x01
},
symbol
)
memDB
.
SetState
(
*
proxyAddr
,
common
.
Hash
{
31
:
0x02
},
decimals
)
}
}
stateDB
,
err
:=
backend
.
Blockchain
()
.
State
()
...
...
@@ -183,6 +193,7 @@ func BuildL1DeveloperGenesis(config *DeployConfig) (*core.Genesis, error) {
memDB
.
CreateAccount
(
depAddr
)
memDB
.
SetCode
(
depAddr
,
dep
.
Bytecode
)
for
iter
.
Next
()
{
_
,
data
,
_
,
err
:=
rlp
.
Split
(
iter
.
Value
)
if
err
!=
nil
{
...
...
@@ -250,6 +261,9 @@ func deployL1Contracts(config *DeployConfig, backend *backends.SimulatedBackend)
common
.
Address
{
19
:
0x01
},
},
},
{
Name
:
"WETH9"
,
},
}
...
)
return
deployer
.
Deploy
(
backend
,
constructors
,
l1Deployer
)
}
...
...
@@ -308,6 +322,11 @@ func l1Deployer(backend *backends.SimulatedBackend, opts *bind.TransactOpts, dep
backend
,
common
.
Address
{},
)
case
"WETH9"
:
_
,
tx
,
_
,
err
=
bindings
.
DeployWETH9
(
opts
,
backend
,
)
default
:
if
strings
.
HasSuffix
(
deployment
.
Name
,
"Proxy"
)
{
_
,
tx
,
_
,
err
=
bindings
.
DeployProxy
(
opts
,
backend
,
deployer
.
TestAddress
)
...
...
op-chain-ops/genesis/layer_one_test.go
View file @
871cda5c
...
...
@@ -92,6 +92,18 @@ func TestBuildL1DeveloperGenesis(t *testing.T) {
require
.
NoError
(
t
,
err
)
require
.
Equal
(
t
,
predeploys
.
DevL1StandardBridgeAddr
,
bridgeAddr
)
weth9
,
err
:=
bindings
.
NewWETH9
(
predeploys
.
DevWETH9Addr
,
sim
)
require
.
NoError
(
t
,
err
)
decimals
,
err
:=
weth9
.
Decimals
(
callOpts
)
require
.
NoError
(
t
,
err
)
require
.
Equal
(
t
,
uint8
(
18
),
decimals
)
symbol
,
err
:=
weth9
.
Symbol
(
callOpts
)
require
.
NoError
(
t
,
err
)
require
.
Equal
(
t
,
"WETH"
,
symbol
)
name
,
err
:=
weth9
.
Name
(
callOpts
)
require
.
NoError
(
t
,
err
)
require
.
Equal
(
t
,
"Wrapped Ether"
,
name
)
// test that we can do deposits, etc.
priv
,
err
:=
crypto
.
HexToECDSA
(
"ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"
)
require
.
NoError
(
t
,
err
)
...
...
proxyd/CHANGELOG.md
View file @
871cda5c
# @eth-optimism/proxyd
## 3.12.0
### Minor Changes
-
e9f2c701: Allow disabling backend rate limiter
-
ca45a85e: Support pattern matching in exempt origins/user agents
-
f4faa44c: adds server.log_level config
## 3.11.0
### Minor Changes
...
...
proxyd/package.json
View file @
871cda5c
{
"name"
:
"@eth-optimism/proxyd"
,
"version"
:
"3.1
1
.0"
,
"version"
:
"3.1
2
.0"
,
"private"
:
true
,
"dependencies"
:
{}
}
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