Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adding missing env vars to docker-compose #80

Merged
merged 1 commit into from
Apr 10, 2020
Merged

adding missing env vars to docker-compose #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@ services:
ports:
- 8545:8545
environment:
- CLEAR_DATA_KEY=33
- CLEAR_DATA_KEY=335
- STARTUP_WAIT_TIMEOUT=30
- OPCODE_WHITELIST_MASK
- L1_SEQUENCER_PRIVATE_KEY
- L1_SEQUENCER_MNEMONIC
- L1_TO_L2_TRANSACTION_PASSER_ADDRESS
- L2_TO_L1_MESSAGE_RECEIVER_ADDRESS
- L2_TO_L1_MESSAGE_FINALITY_DELAY_IN_BLOCKS
- L2_RPC_SERVER_HOST
Expand All @@ -41,7 +43,7 @@ services:
context: docker/geth
dockerfile: Dockerfile
environment:
- CLEAR_DATA_KEY=35
- CLEAR_DATA_KEY=355
- VOLUME_PATH=/mnt/l2-node/l2
- HOSTNAME=geth_l2
- PORT=9545
Expand Down
18 changes: 9 additions & 9 deletions packages/rollup-full-node/src/app/utils/environment.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,6 @@ export class Environment {
public static localL2NodePersistentDbPath(defaultValue?: string) {
return process.env.LOCAL_L2_NODE_PERSISTENT_DB_PATH || defaultValue
}
public static l2ToL1MessageFinalityDelayInBlocks(
defaultValue: number = 0
): number {
return process.env.L2_TO_L1_MESSAGE_FINALITY_DELAY_IN_BLOCKS
? parseInt(process.env.L2_TO_L1_MESSAGE_FINALITY_DELAY_IN_BLOCKS, 10)
: defaultValue
}
public static localL1NodePersistentDbPath(defaultValue?: string): string {
return process.env.LOCAL_L1_NODE_PERSISTENT_DB_PATH || defaultValue
}
Expand Down Expand Up @@ -85,10 +78,17 @@ export class Environment {
public static sequencerPrivateKey(defaultValue?: string): string {
return process.env.L1_SEQUENCER_PRIVATE_KEY || defaultValue
}
public static l1ToL2TransactionPasserAddress(defaultValue?: string): string {
return process.env.L1_TO_L2_TRANSACTION_PASSER_ADDRESS || defaultValue
}
public static l2ToL1MessageReceiverAddress(defaultValue?: string): string {
return process.env.L2_TO_L1_MESSAGE_RECEIVER_ADDRESS || defaultValue
}
public static l1ToL2TransactionPasserAddress(defaultValue?: string): string {
return process.env.L1_TO_L2_TRANSACTION_PASSER_ADDRESS || defaultValue
public static l2ToL1MessageFinalityDelayInBlocks(
defaultValue: number = 0
): number {
return process.env.L2_TO_L1_MESSAGE_FINALITY_DELAY_IN_BLOCKS
? parseInt(process.env.L2_TO_L1_MESSAGE_FINALITY_DELAY_IN_BLOCKS, 10)
: defaultValue
}
}