From b8e6d2d5e068907caaffd03cfbb1c69797612278 Mon Sep 17 00:00:00 2001 From: Jia Liu Date: Tue, 16 Jul 2024 10:34:08 +0100 Subject: [PATCH] merge with service and remove unused env vars --- ops/docker-compose.yml | 25 ------------------------- services/exec/runNode.ts | 10 ---------- services/node.ts | 8 -------- 3 files changed, 43 deletions(-) diff --git a/ops/docker-compose.yml b/ops/docker-compose.yml index 02e4efc..021fbb2 100644 --- a/ops/docker-compose.yml +++ b/ops/docker-compose.yml @@ -27,11 +27,6 @@ services: - POLLING_INTERVAL: 12000 - ZK_RAND_ADDRESS: "0xd688cFE3EC08d893E9A3b76f12113e1ef762f53A" - NODE_PRIVATE_KEY: "0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d" - - NODE_ONE_ADDRESS: "0x70997970c51812dc3a010c7d01b50e0d17dc79c8" - - NODE_TWO_ADDRESS: "0x3c44cdddb6a900fa2b585dd299e03d12fa4293bc" - - NODE_THREE_ADDRESS: "0x90f79bf6eb2c4f870365e785982e1f101e93b906" - - NODE_FOUR_ADDRESS: "0x15d34aaf54267db7d7c367839aaf71a00a2c6a65" - - NODE_FIVE_ADDRESS: "0x9965507d1a55bcc2695c58ba16fb37d819b0a4dc" depends_on: - admin @@ -45,11 +40,6 @@ services: - POLLING_INTERVAL: 12000 - ZK_RAND_ADDRESS: "0xd688cFE3EC08d893E9A3b76f12113e1ef762f53A" - NODE_PRIVATE_KEY: "0x5de4111afa1a4b94908f83103eb1f1706367c2e68ca870fc3fb9a804cdab365a" - - NODE_ONE_ADDRESS: "0x70997970c51812dc3a010c7d01b50e0d17dc79c8" - - NODE_TWO_ADDRESS: "0x3c44cdddb6a900fa2b585dd299e03d12fa4293bc" - - NODE_THREE_ADDRESS: "0x90f79bf6eb2c4f870365e785982e1f101e93b906" - - NODE_FOUR_ADDRESS: "0x15d34aaf54267db7d7c367839aaf71a00a2c6a65" - - NODE_FIVE_ADDRESS: "0x9965507d1a55bcc2695c58ba16fb37d819b0a4dc" depends_on: - admin @@ -63,11 +53,6 @@ services: - POLLING_INTERVAL: 12000 - ZK_RAND_ADDRESS: "0xd688cFE3EC08d893E9A3b76f12113e1ef762f53A" - NODE_PRIVATE_KEY: "0x7c852118294e51e653712a81e05800f419141751be58f605c371e15141b007a6" - - NODE_ONE_ADDRESS: "0x70997970c51812dc3a010c7d01b50e0d17dc79c8" - - NODE_TWO_ADDRESS: "0x3c44cdddb6a900fa2b585dd299e03d12fa4293bc" - - NODE_THREE_ADDRESS: "0x90f79bf6eb2c4f870365e785982e1f101e93b906" - - NODE_FOUR_ADDRESS: "0x15d34aaf54267db7d7c367839aaf71a00a2c6a65" - - NODE_FIVE_ADDRESS: "0x9965507d1a55bcc2695c58ba16fb37d819b0a4dc" depends_on: - admin @@ -81,11 +66,6 @@ services: - POLLING_INTERVAL: 12000 - ZK_RAND_ADDRESS: "0xd688cFE3EC08d893E9A3b76f12113e1ef762f53A" - NODE_PRIVATE_KEY: "0x47e179ec197488593b187f80a00eb0da91f1b9d0b13f8733639f19c30a34926a" - - NODE_ONE_ADDRESS: "0x70997970c51812dc3a010c7d01b50e0d17dc79c8" - - NODE_TWO_ADDRESS: "0x3c44cdddb6a900fa2b585dd299e03d12fa4293bc" - - NODE_THREE_ADDRESS: "0x90f79bf6eb2c4f870365e785982e1f101e93b906" - - NODE_FOUR_ADDRESS: "0x15d34aaf54267db7d7c367839aaf71a00a2c6a65" - - NODE_FIVE_ADDRESS: "0x9965507d1a55bcc2695c58ba16fb37d819b0a4dc" depends_on: - admin @@ -99,10 +79,5 @@ services: - POLLING_INTERVAL: 12000 - ZK_RAND_ADDRESS: "0xd688cFE3EC08d893E9A3b76f12113e1ef762f53A" - NODE_PRIVATE_KEY: "0x8b3a350cf5c34c9194ca85829a2df0ec3153be0318b5e2d3348e872092edffba" - - NODE_ONE_ADDRESS: "0x70997970c51812dc3a010c7d01b50e0d17dc79c8" - - NODE_TWO_ADDRESS: "0x3c44cdddb6a900fa2b585dd299e03d12fa4293bc" - - NODE_THREE_ADDRESS: "0x90f79bf6eb2c4f870365e785982e1f101e93b906" - - NODE_FOUR_ADDRESS: "0x15d34aaf54267db7d7c367839aaf71a00a2c6a65" - - NODE_FIVE_ADDRESS: "0x9965507d1a55bcc2695c58ba16fb37d819b0a4dc" depends_on: - admin diff --git a/services/exec/runNode.ts b/services/exec/runNode.ts index 2c291fe..20423cc 100644 --- a/services/exec/runNode.ts +++ b/services/exec/runNode.ts @@ -26,11 +26,6 @@ const main = async () => { ) const ZK_RAND_ADDRESS = config.str('zk-rand-address', env.ZK_RAND_ADDRESS) - const NODE_ONE_ADDRESS = config.str('node-one-address', env.NODE_ONE_ADDRESS) - const NODE_TWO_ADDRESS = config.str('node-two-address', env.NODE_TWO_ADDRESS) - const NODE_THREE_ADDRESS = config.str('node-three-address', env.NODE_THREE_ADDRESS) - const NODE_FOUR_ADDRESS = config.str('node-four-address', env.NODE_FOUR_ADDRESS) - const NODE_FIVE_ADDRESS = config.str('node-five-address', env.NODE_FIVE_ADDRESS) if (!L2_NODE_WEB3_URL) { throw new Error('Must pass L2_NODE_WEB3_URL') @@ -48,11 +43,6 @@ const main = async () => { l2Wallet: wallet, chainId, zkRandAddress: ZK_RAND_ADDRESS, - nodeOneAddress: NODE_ONE_ADDRESS, - nodeTwoAddress: NODE_TWO_ADDRESS, - nodeThreeAddress: NODE_THREE_ADDRESS, - nodeFourAddress: NODE_FOUR_ADDRESS, - nodeFiveAddress: NODE_FIVE_ADDRESS, pollingInterval: POLLING_INTERVAL, }) diff --git a/services/node.ts b/services/node.ts index 6df6268..faea052 100644 --- a/services/node.ts +++ b/services/node.ts @@ -33,15 +33,7 @@ interface NodeZkRandOptions { l2Wallet: Wallet // chain ID of the L2 network chainId: number - zkRandAddress: string - - nodeOneAddress: string - nodeTwoAddress: string - nodeThreeAddress: string - nodeFourAddress: string - nodeFiveAddress: string - pollingInterval: number }