diff --git a/.circleci/config.yml b/.circleci/config.yml index 527b6b9..38627e7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -49,8 +49,6 @@ orbs: docker cp "./workspace/ganache_side_data" "tmp:/ganache_side_data" docker cp "./workspace/ganache_home_data" "tmp:/ganache_home_data" docker kill tmp - ls ./workspace/ganache_side_data - ls ./workspace/ganache_home_data restore_tss_image: description: "Restores tss image from cache" steps: diff --git a/demo/start-environment.sh b/demo/start-environment.sh index 2a3b775..760c6f3 100755 --- a/demo/start-environment.sh +++ b/demo/start-environment.sh @@ -22,7 +22,7 @@ start_dev_blockchain_networks() { docker run -d --network blockchain_side --rm --name ganache_side -v "ganache_side_data:/app/db" \ -p "7545:8545" \ trufflesuite/ganache-cli:latest \ - -m "shrug dwarf easily blade trigger lucky reopen cage lake scatter desk boat" -i 33 -q --db /app/db -b "$BLOCK_TIME" --noVMErrorsOnRPCResponse + -m "shrug dwarf easily blade trigger lucky reopen cage lake scatter desk boat" -i 33 --db /app/db -b "$BLOCK_TIME" --noVMErrorsOnRPCResponse echo "Starting home test blockchain" @@ -32,7 +32,7 @@ start_dev_blockchain_networks() { docker run -d --network blockchain_home --rm --name ganache_home -v "ganache_home_data:/app/db" \ -p "8545:8545" \ trufflesuite/ganache-cli:latest \ - -m "shrug dwarf easily blade trigger lucky reopen cage lake scatter desk boat" -i 44 -q --db /app/db -b "$BLOCK_TIME" --noVMErrorsOnRPCResponse + -m "shrug dwarf easily blade trigger lucky reopen cage lake scatter desk boat" -i 44 --db /app/db -b "$BLOCK_TIME" --noVMErrorsOnRPCResponse sleep 4 } diff --git a/src/oracle/ethWatcher/ethWatcher.js b/src/oracle/ethWatcher/ethWatcher.js index b64b9ef..3eb9878 100644 --- a/src/oracle/ethWatcher/ethWatcher.js +++ b/src/oracle/ethWatcher/ethWatcher.js @@ -12,14 +12,12 @@ const abiBridge = require('./contracts_data/Bridge.json').abi const { HOME_RPC_URL, HOME_BRIDGE_ADDRESS, RABBITMQ_URL, HOME_START_BLOCK, VALIDATOR_PRIVATE_KEY } = process.env -setInterval(() => { - axios.post(HOME_RPC_URL, { - jsonrpc: '2.0', - method: "eth_blockNumber", - params: [], - id: 1 - }).then(console.log, console.log) -}, 5000) +axios.post(HOME_RPC_URL, { + jsonrpc: '2.0', + method: 'eth_getCode', + params: [ HOME_BRIDGE_ADDRESS, 'latest' ], + id: 1 +}).then(x => console.log(x.data), console.log) const homeWeb3 = new Web3(HOME_RPC_URL) const bridge = new homeWeb3.eth.Contract(abiBridge, HOME_BRIDGE_ADDRESS) @@ -104,7 +102,15 @@ async function initialize () { foreignNonce[epoch] = parseInt(await redis.get(`foreignNonce${epoch}`)) || 0 } logger.debug('Checking if current validator') - isCurrentValidator = (await bridge.methods.getValidators().call()).includes(validatorAddress) + let currentValidators = [] + try { + logger.debug('1') + currentValidators = await bridge.methods.getValidators().call() + logger.debug('2') + } catch (e) { + logger.debug('%o', e) + } + isCurrentValidator = (currentValidators).includes(validatorAddress) if (isCurrentValidator) { logger.info(`${validatorAddress} is a current validator`) } else { diff --git a/tests/.mocharc.yml b/tests/.mocharc.yml index b43d42d..f085534 100644 --- a/tests/.mocharc.yml +++ b/tests/.mocharc.yml @@ -1,3 +1,4 @@ +exit: true reporter: mocha-multi-reporters reporter-option: - configFile=./reportersConfig.json