diff --git a/docker-compose.yml b/docker-compose.yml index aa6b07bd2b23..6ae744099aaf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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 @@ -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 diff --git a/packages/rollup-full-node/src/app/utils/environment.ts b/packages/rollup-full-node/src/app/utils/environment.ts index c8cf27821f9d..935a10490f5c 100644 --- a/packages/rollup-full-node/src/app/utils/environment.ts +++ b/packages/rollup-full-node/src/app/utils/environment.ts @@ -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 } @@ -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 } }