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
526d7e51
Commit
526d7e51
authored
Nov 05, 2021
by
0xYYY
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix[batch-submitter]: add same-address error
parent
4096cd39
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
3 deletions
+16
-3
long-mayflies-sit.md
.changeset/long-mayflies-sit.md
+5
-0
docker-compose-nobuild.yml
ops/docker-compose-nobuild.yml
+3
-1
docker-compose.yml
ops/docker-compose.yml
+3
-1
run-batch-submitter.ts
packages/batch-submitter/src/exec/run-batch-submitter.ts
+3
-0
deploy.ts
packages/contracts/bin/deploy.ts
+2
-1
No files found.
.changeset/long-mayflies-sit.md
0 → 100644
View file @
526d7e51
---
'
@eth-optimism/batch-submitter'
:
patch
---
Throw an error when sequencer and proposer have the same address.
ops/docker-compose-nobuild.yml
View file @
526d7e51
...
@@ -17,9 +17,10 @@ services:
...
@@ -17,9 +17,10 @@ services:
environment
:
environment
:
FRAUD_PROOF_WINDOW_SECONDS
:
0
FRAUD_PROOF_WINDOW_SECONDS
:
0
L1_NODE_WEB3_URL
:
http://l1_chain:8545
L1_NODE_WEB3_URL
:
http://l1_chain:8545
# these keys are hardhat's first
2
accounts, DO NOT use in production
# these keys are hardhat's first
3
accounts, DO NOT use in production
DEPLOYER_PRIVATE_KEY
:
"
0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"
DEPLOYER_PRIVATE_KEY
:
"
0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"
SEQUENCER_PRIVATE_KEY
:
"
0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d"
SEQUENCER_PRIVATE_KEY
:
"
0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d"
PROPOSER_PRIVATE_KEY
:
"
0x5de4111afa1a4b94908f83103eb1f1706367c2e68ca870fc3fb9a804cdab365a"
GAS_PRICE_ORACLE_OWNER
:
"
0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266"
GAS_PRICE_ORACLE_OWNER
:
"
0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266"
# setting the whitelist owner to address(0) disables the whitelist
# setting the whitelist owner to address(0) disables the whitelist
WHITELIST_OWNER
:
"
0x0000000000000000000000000000000000000000"
WHITELIST_OWNER
:
"
0x0000000000000000000000000000000000000000"
...
@@ -93,6 +94,7 @@ services:
...
@@ -93,6 +94,7 @@ services:
L2_NODE_WEB3_URL
:
http://l2geth:8545
L2_NODE_WEB3_URL
:
http://l2geth:8545
URL
:
http://deployer:8081/addresses.json
URL
:
http://deployer:8081/addresses.json
SEQUENCER_PRIVATE_KEY
:
"
0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d"
SEQUENCER_PRIVATE_KEY
:
"
0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d"
PROPOSER_PRIVATE_KEY
:
"
0x5de4111afa1a4b94908f83103eb1f1706367c2e68ca870fc3fb9a804cdab365a"
verifier
:
verifier
:
depends_on
:
depends_on
:
...
...
ops/docker-compose.yml
View file @
526d7e51
...
@@ -22,9 +22,10 @@ services:
...
@@ -22,9 +22,10 @@ services:
environment
:
environment
:
FRAUD_PROOF_WINDOW_SECONDS
:
0
FRAUD_PROOF_WINDOW_SECONDS
:
0
L1_NODE_WEB3_URL
:
http://l1_chain:8545
L1_NODE_WEB3_URL
:
http://l1_chain:8545
# these keys are hardhat's first
2
accounts, DO NOT use in production
# these keys are hardhat's first
3
accounts, DO NOT use in production
DEPLOYER_PRIVATE_KEY
:
"
0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"
DEPLOYER_PRIVATE_KEY
:
"
0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"
SEQUENCER_PRIVATE_KEY
:
"
0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d"
SEQUENCER_PRIVATE_KEY
:
"
0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d"
PROPOSER_PRIVATE_KEY
:
"
0x5de4111afa1a4b94908f83103eb1f1706367c2e68ca870fc3fb9a804cdab365a"
GAS_PRICE_ORACLE_OWNER
:
"
0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266"
GAS_PRICE_ORACLE_OWNER
:
"
0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266"
# setting the whitelist owner to address(0) disables the whitelist
# setting the whitelist owner to address(0) disables the whitelist
WHITELIST_OWNER
:
"
0x0000000000000000000000000000000000000000"
WHITELIST_OWNER
:
"
0x0000000000000000000000000000000000000000"
...
@@ -133,6 +134,7 @@ services:
...
@@ -133,6 +134,7 @@ services:
L2_NODE_WEB3_URL
:
http://l2geth:8545
L2_NODE_WEB3_URL
:
http://l2geth:8545
URL
:
http://deployer:8081/addresses.json
URL
:
http://deployer:8081/addresses.json
SEQUENCER_PRIVATE_KEY
:
"
0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d"
SEQUENCER_PRIVATE_KEY
:
"
0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d"
PROPOSER_PRIVATE_KEY
:
"
0x5de4111afa1a4b94908f83103eb1f1706367c2e68ca870fc3fb9a804cdab365a"
verifier
:
verifier
:
depends_on
:
depends_on
:
...
...
packages/batch-submitter/src/exec/run-batch-submitter.ts
View file @
526d7e51
...
@@ -360,6 +360,9 @@ export const run = async () => {
...
@@ -360,6 +360,9 @@ export const run = async () => {
// If the sequencer & proposer are the same, use a single wallet
// If the sequencer & proposer are the same, use a single wallet
if
(
sequencerAddress
===
proposerAddress
)
{
if
(
sequencerAddress
===
proposerAddress
)
{
proposerSigner
=
sequencerSigner
proposerSigner
=
sequencerSigner
throw
new
Error
(
'
Sequencer and proposer have the same address, multiple transactions may be sent with the same nonce.
'
)
}
}
logger
.
info
(
'
Configured batch submitter addresses
'
,
{
logger
.
info
(
'
Configured batch submitter addresses
'
,
{
...
...
packages/contracts/bin/deploy.ts
View file @
526d7e51
...
@@ -21,6 +21,7 @@ process.env.CONTRACTS_RPC_URL =
...
@@ -21,6 +21,7 @@ process.env.CONTRACTS_RPC_URL =
import
hre
from
'
hardhat
'
import
hre
from
'
hardhat
'
const
sequencer
=
new
Wallet
(
process
.
env
.
SEQUENCER_PRIVATE_KEY
)
const
sequencer
=
new
Wallet
(
process
.
env
.
SEQUENCER_PRIVATE_KEY
)
const
proposer
=
new
Wallet
(
process
.
env
.
PROPOSER_PRIVATE_KEY
)
const
deployer
=
new
Wallet
(
process
.
env
.
DEPLOYER_PRIVATE_KEY
)
const
deployer
=
new
Wallet
(
process
.
env
.
DEPLOYER_PRIVATE_KEY
)
const
parseEnv
=
()
=>
{
const
parseEnv
=
()
=>
{
...
@@ -63,7 +64,7 @@ const main = async () => {
...
@@ -63,7 +64,7 @@ const main = async () => {
sccFraudProofWindow
:
config
.
sccFraudProofWindow
,
sccFraudProofWindow
:
config
.
sccFraudProofWindow
,
sccSequencerPublishWindow
:
config
.
sccFraudProofWindow
,
sccSequencerPublishWindow
:
config
.
sccFraudProofWindow
,
ovmSequencerAddress
:
sequencer
.
address
,
ovmSequencerAddress
:
sequencer
.
address
,
ovmProposerAddress
:
sequenc
er
.
address
,
ovmProposerAddress
:
propos
er
.
address
,
ovmAddressManagerOwner
:
deployer
.
address
,
ovmAddressManagerOwner
:
deployer
.
address
,
numDeployConfirmations
:
0
,
numDeployConfirmations
:
0
,
noCompile
:
process
.
env
.
NO_COMPILE
?
true
:
false
,
noCompile
:
process
.
env
.
NO_COMPILE
?
true
:
false
,
...
...
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