docker-compose config update for different network support. Oracle update to support auto getting chainId, starting from custom block

src/oracle/docker-compose-test.yml

@@ -31,7 +31,7 @@ services:
       - 'RABBITMQ_URL=amqp://rabbitmq:5672'
       - 'PROXY_URL=http://proxy:8001'
     volumes:
-      - '${PWD}/keys:/keys'
+      - '${PWD}/${TARGET_NETWORK}/keys:/keys'
     networks:
       - test_network
   signer:
@@ -44,7 +44,7 @@ services:
       - FOREIGN_URL
       - FOREIGN_ASSET
     volumes:
-      - '${PWD}/keys:/keys'
+      - '${PWD}/${TARGET_NETWORK}/keys:/keys'
     ports:
       - '${SIGN_RESTART_PORT}:8001'
     networks:
@@ -52,14 +52,14 @@ services:
   redis:
     image: redis:5.0.5-alpine
     volumes:
-      - '${PWD}/db:/data'
+      - '${PWD}/${TARGET_NETWORK}/db:/data'
     networks:
       - test_network
   rabbitmq:
     hostname: rabbit
     image: rabbitmq:3.7.15-alpine
     volumes:
-      - '${PWD}/queue:/var/lib/rabbitmq/mnesia'
+      - '${PWD}/${TARGET_NETWORK}/queue:/var/lib/rabbitmq/mnesia'
     networks:
       - test_network
   eth-watcher:
@@ -70,6 +70,7 @@ services:
       - HOME_BRIDGE_ADDRESS
       - HOME_TOKEN_ADDRESS
       - HOME_CHAIN_ID
+      - HOME_START_BLOCK
       - 'RABBITMQ_URL=amqp://rabbitmq:5672'
     volumes:
       - '../deploy/deploy-home/build/contracts/Bridge.json:/watcher/contracts_data/Bridge.json'
@@ -86,7 +87,7 @@ services:
       - 'RABBITMQ_URL=amqp://rabbitmq:5672'
       - 'PROXY_URL=http://proxy:8001'
     volumes:
-      - '${PWD}/keys:/keys'
+      - '${PWD}/${TARGET_NETWORK}/keys:/keys'
     networks:
       - test_network
 networks:

src/oracle/docker-compose.yml

@@ -31,7 +31,7 @@ services:
       - 'RABBITMQ_URL=amqp://rabbitmq:5672'
       - 'PROXY_URL=http://proxy:8001'
     volumes:
-      - '${PWD}/keys:/keys'
+      - '${PWD}/${TARGET_NETWORK}/keys:/keys'
     networks:
       - keygen-proxy-net
       - rabbit-keygen-net
@@ -46,7 +46,7 @@ services:
       - FOREIGN_URL
       - FOREIGN_ASSET
     volumes:
-      - '${PWD}/keys:/keys'
+      - '${PWD}/${TARGET_NETWORK}/keys:/keys'
     ports:
       - '${SIGN_RESTART_PORT}:8001'
     networks:
@@ -56,7 +56,7 @@ services:
   redis:
     image: redis:5.0.5-alpine
     volumes:
-      - '${PWD}/db:/data'
+      - '${PWD}/${TARGET_NETWORK}/db:/data'
     networks:
       - redis-signer-net
       - redis-keygen-net
@@ -66,7 +66,7 @@ services:
     hostname: rabbit
     image: rabbitmq:3.7.15-alpine
     volumes:
-      - '${PWD}/queue:/var/lib/rabbitmq/mnesia'
+      - '${PWD}/${TARGET_NETWORK}/queue:/var/lib/rabbitmq/mnesia'
     networks:
       - rabbit-signer-net
       - rabbit-keygen-net
@@ -80,6 +80,7 @@ services:
       - HOME_BRIDGE_ADDRESS
       - HOME_TOKEN_ADDRESS
       - HOME_CHAIN_ID
+      - HOME_START_BLOCK
       - 'RABBITMQ_URL=amqp://rabbitmq:5672'
     volumes:
       - '../deploy/deploy-home/build/contracts/Bridge.json:/watcher/contracts_data/Bridge.json'
@@ -96,7 +97,7 @@ services:
       - 'RABBITMQ_URL=amqp://rabbitmq:5672'
       - 'PROXY_URL=http://proxy:8001'
     volumes:
-      - '${PWD}/keys:/keys'
+      - '${PWD}/${TARGET_NETWORK}/keys:/keys'
     networks:
       - rabbit-bncwatcher-net
       - redis-bncwatcher-net

src/oracle/ethWatcher/ethWatcher.js

@@ -9,7 +9,7 @@ const bech32 = require('bech32')
 const abiBridge = require('./contracts_data/Bridge.json').abi
 const abiToken = require('./contracts_data/IERC20.json').abi
 
-const { HOME_RPC_URL, HOME_CHAIN_ID, HOME_BRIDGE_ADDRESS, RABBITMQ_URL, HOME_TOKEN_ADDRESS } = process.env
+const { HOME_RPC_URL, HOME_CHAIN_ID, HOME_BRIDGE_ADDRESS, RABBITMQ_URL, HOME_TOKEN_ADDRESS, HOME_START_BLOCK } = process.env
 
 const web3Home = new Web3(HOME_RPC_URL)
 const bridge = new web3Home.eth.Contract(abiBridge, HOME_BRIDGE_ADDRESS)
@@ -46,7 +46,7 @@ async function initialize () {
   epoch = events.length ? events[events.length - 1].returnValues.epoch.toNumber() : 0
   console.log(`Current epoch ${epoch}`)
   const epochStart = events.length ? events[events.length - 1].blockNumber : 1
-  const saved = (parseInt(await redis.get('homeBlock')) + 1) || 1
+  const saved = (parseInt(await redis.get('homeBlock')) + 1) || parseInt(HOME_START_BLOCK)
   console.log(epochStart, saved)
   if (epochStart > saved) {
     console.log(`Data in db is outdated, starting from epoch ${epoch}, block #${epochStart}`)
@@ -168,7 +168,7 @@ async function sendSign (event) {
     to: tx.to,
     value: `0x${new BN(tx.value).toString(16)}`,
     data: tx.input,
-    chainId: parseInt(HOME_CHAIN_ID)
+    chainId: await web3Home.eth.net.getId()
   })
   const hash = web3Home.utils.sha3(msg)
   const publicKey = utils.recoverPublicKey(hash, { r: tx.r, s: tx.s, v: tx.v })

src/oracle/proxy/index.js

@@ -184,7 +184,7 @@ function sideSendQuery (query) {
       from: validatorAddress,
       to: SIDE_SHARED_DB_ADDRESS,
       nonce: sideValidatorNonce++,
-      chainId: parseInt(SIDE_CHAIN_ID)
+      chainId: await sideWeb3.eth.net.getId()
     }
     tx.gas = Math.min(Math.ceil(await query.estimateGas(tx) * 1.5), 6721975)
     const signedTx = await sideWeb3.eth.accounts.signTransaction(tx, VALIDATOR_PRIVATE_KEY)
@@ -220,7 +220,7 @@ function homeSendQuery (query) {
       from: validatorAddress,
       to: HOME_BRIDGE_ADDRESS,
       nonce: homeValidatorNonce++,
-      chainId: parseInt(HOME_CHAIN_ID)
+      chainId: await homeWeb3.eth.net.getId()
     }
     tx.gas = Math.min(Math.ceil(await query.estimateGas(tx) * 1.5), 6721975)
     console.log(tx)