From edc51c78e286cbdf343be57c9bf3b53b65e422ec Mon Sep 17 00:00:00 2001 From: Gerardo Nardelli Date: Mon, 20 Jan 2020 17:00:04 -0300 Subject: [PATCH] Use 3 validators in oracle e2e tests (#264) --- e2e-commons/constants.json | 16 ++++++ e2e-commons/contracts-envs/amb.env | 2 +- e2e-commons/contracts-envs/erc-to-erc.env | 3 +- e2e-commons/contracts-envs/erc-to-native.env | 3 +- e2e-commons/contracts-envs/native-to-erc.env | 3 +- e2e-commons/docker-compose.yml | 2 - e2e-commons/down.sh | 2 + e2e-commons/up.sh | 37 ++++++++++++++ oracle-e2e/run-tests.sh | 2 +- oracle-e2e/test/amb.js | 36 ++++++++++++- oracle-e2e/test/ercToErc.js | 32 +++++++++++- oracle-e2e/test/ercToNative.js | 30 ++++++++++- oracle-e2e/test/mocha.opts | 2 +- oracle-e2e/test/nativeToErc.js | 54 ++++++++++++++++++-- oracle-e2e/test/utils.js | 12 +++++ parity/chain-foreign.json | 6 +++ parity/chain.json | 2 + 17 files changed, 223 insertions(+), 21 deletions(-) create mode 100644 oracle-e2e/test/utils.js diff --git a/e2e-commons/constants.json b/e2e-commons/constants.json index ae28c339..9f5c8334 100644 --- a/e2e-commons/constants.json +++ b/e2e-commons/constants.json @@ -7,10 +7,26 @@ "address": "0xcca2fb44C8C36E51f743269d6F484Fd027B9F9Aa", "privateKey": "0xcf954e07e6a439faf392eb474e95ddb444c2ca444847f2ad6ecc79e1a585e2b8" }, + "thirdUser": { + "address": "0x441cc8537aB6cE63d060b63F3A44eE021d62e6cF", + "privateKey": "0xd3915199f27691d7784cb01ab0c7220308053b229f95d592e97493326314a8d0" + }, + "fourthUser": { + "address": "0x3CC5baAB679eC0732C175760079Bf48F564ad26B", + "privateKey": "0xedb53ee050631b7914d5f1a66c2f0d2df3ec85a9ed2a9616b16a7b1b7a10b8d1" + }, "validator": { "address": "0xaaB52d66283F7A1D5978bcFcB55721ACB467384b", "privateKey": "0x8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9" }, + "secondValidator": { + "address": "0xdCC784657C78054aa61FbcFFd2605F32374816A4", + "privateKey": "0x5a5c3645d0f04e9eb4f27f94ed4c244a225587405b8838e7456f7781ce3a9513" + }, + "thirdValidator": { + "address": "0xDcef88209a20D52165230104B245803C3269454d", + "privateKey": "0xf877f62a1c19f852cff1d29f0fb1ecac18821c0080d4cc0520c60c098293dca1" + }, "blockGenerator": { "address": "0xB4579fd5AfEaB60B03Db3F408AAdD315035943f7", "privateKey": "0xd6143d390d8b28c33601bb0fe29392fb1c35c24ccfe8722c09c2bdd6ada2699f" diff --git a/e2e-commons/contracts-envs/amb.env b/e2e-commons/contracts-envs/amb.env index 9335c504..e575f0b5 100644 --- a/e2e-commons/contracts-envs/amb.env +++ b/e2e-commons/contracts-envs/amb.env @@ -22,4 +22,4 @@ FOREIGN_REQUIRED_BLOCK_CONFIRMATIONS=1 FOREIGN_GAS_PRICE=10000000000 REQUIRED_NUMBER_OF_VALIDATORS=1 -VALIDATORS=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b +VALIDATORS="0xaaB52d66283F7A1D5978bcFcB55721ACB467384b 0xdCC784657C78054aa61FbcFFd2605F32374816A4 0xDcef88209a20D52165230104B245803C3269454d" diff --git a/e2e-commons/contracts-envs/erc-to-erc.env b/e2e-commons/contracts-envs/erc-to-erc.env index f1f4daa8..1c9a2004 100644 --- a/e2e-commons/contracts-envs/erc-to-erc.env +++ b/e2e-commons/contracts-envs/erc-to-erc.env @@ -34,8 +34,7 @@ FOREIGN_REWARDABLE=false ERC20_TOKEN_ADDRESS=0x3C665A31199694Bf723fD08844AD290207B5797f REQUIRED_NUMBER_OF_VALIDATORS=1 -VALIDATORS="0xaaB52d66283F7A1D5978bcFcB55721ACB467384b" -VALIDATORS_REWARD_ACCOUNTS=0x0000000000000000000000000000000000000000 +VALIDATORS="0xaaB52d66283F7A1D5978bcFcB55721ACB467384b 0xdCC784657C78054aa61FbcFFd2605F32374816A4 0xDcef88209a20D52165230104B245803C3269454d" BLOCK_REWARD_ADDRESS=0x0000000000000000000000000000000000000000 DPOS_STAKING_ADDRESS=0x0000000000000000000000000000000000000000 ERC20_EXTENDED_BY_ERC677=false diff --git a/e2e-commons/contracts-envs/erc-to-native.env b/e2e-commons/contracts-envs/erc-to-native.env index f7991673..8a7ccac7 100644 --- a/e2e-commons/contracts-envs/erc-to-native.env +++ b/e2e-commons/contracts-envs/erc-to-native.env @@ -35,5 +35,4 @@ BLOCK_REWARD_ADDRESS=0xF9698Eb93702dfdd0e2d802088d4c21822a8A977 ERC20_TOKEN_ADDRESS=0x89d24A6b4CcB1B6fAA2625fE562bDD9a23260359 REQUIRED_NUMBER_OF_VALIDATORS=1 -VALIDATORS="0xaaB52d66283F7A1D5978bcFcB55721ACB467384b" -VALIDATORS_REWARD_ACCOUNTS=0x0000000000000000000000000000000000000000 +VALIDATORS="0xaaB52d66283F7A1D5978bcFcB55721ACB467384b 0xdCC784657C78054aa61FbcFFd2605F32374816A4 0xDcef88209a20D52165230104B245803C3269454d" diff --git a/e2e-commons/contracts-envs/native-to-erc.env b/e2e-commons/contracts-envs/native-to-erc.env index 7e16f2c7..6620aa46 100644 --- a/e2e-commons/contracts-envs/native-to-erc.env +++ b/e2e-commons/contracts-envs/native-to-erc.env @@ -34,6 +34,5 @@ FOREIGN_GAS_PRICE=10000000000 FOREIGN_REWARDABLE=false REQUIRED_NUMBER_OF_VALIDATORS=1 -VALIDATORS="0xaaB52d66283F7A1D5978bcFcB55721ACB467384b" -VALIDATORS_REWARD_ACCOUNTS=0x0000000000000000000000000000000000000000 +VALIDATORS="0xaaB52d66283F7A1D5978bcFcB55721ACB467384b 0xdCC784657C78054aa61FbcFFd2605F32374816A4 0xDcef88209a20D52165230104B245803C3269454d" BLOCK_REWARD_ADDRESS=0x0000000000000000000000000000000000000000 diff --git a/e2e-commons/docker-compose.yml b/e2e-commons/docker-compose.yml index 722af57c..693e067f 100644 --- a/e2e-commons/docker-compose.yml +++ b/e2e-commons/docker-compose.yml @@ -24,8 +24,6 @@ services: - ultimate rabbit: image: "rabbitmq:3-management" - ports: - - "15672:15672" networks: - ultimate oracle: diff --git a/e2e-commons/down.sh b/e2e-commons/down.sh index 06e846fe..8eef3155 100755 --- a/e2e-commons/down.sh +++ b/e2e-commons/down.sh @@ -5,4 +5,6 @@ if [ $CI ]; then exit $rc; fi ps | grep node | grep -v grep | awk '{print "kill " $1}' | /bin/bash docker-compose down +docker-compose -p validator2 down +docker-compose -p validator3 down docker network rm ultimate || true diff --git a/e2e-commons/up.sh b/e2e-commons/up.sh index 5a8053b3..b7554dbf 100755 --- a/e2e-commons/up.sh +++ b/e2e-commons/up.sh @@ -7,6 +7,29 @@ docker-compose build docker network create --driver bridge ultimate || true docker-compose up -d parity1 parity2 e2e +startValidator () { + docker-compose $1 run -d --name $4 redis + docker-compose $1 run -d --name $5 rabbit + docker-compose $1 run $2 $3 -d oracle yarn watcher:signature-request + docker-compose $1 run $2 $3 -d oracle yarn watcher:collected-signatures + docker-compose $1 run $2 $3 -d oracle yarn watcher:affirmation-request + docker-compose $1 run $2 $3 -d oracle-erc20 yarn watcher:signature-request + docker-compose $1 run $2 $3 -d oracle-erc20 yarn watcher:collected-signatures + docker-compose $1 run $2 $3 -d oracle-erc20 yarn watcher:affirmation-request + docker-compose $1 run $2 $3 -d oracle-erc20 yarn watcher:transfer + docker-compose $1 run $2 $3 -d oracle-erc20-native yarn watcher:signature-request + docker-compose $1 run $2 $3 -d oracle-erc20-native yarn watcher:collected-signatures + docker-compose $1 run $2 $3 -d oracle-erc20-native yarn watcher:affirmation-request + docker-compose $1 run $2 $3 -d oracle-erc20-native yarn watcher:transfer + docker-compose $1 run $2 $3 -d oracle-erc20-native yarn watcher:half-duplex-transfer + docker-compose $1 run $2 $3 -d oracle-erc20-native yarn worker:swap-tokens + docker-compose $1 run $2 $3 -d oracle-amb yarn watcher:signature-request + docker-compose $1 run $2 $3 -d oracle-amb yarn watcher:collected-signatures + docker-compose $1 run $2 $3 -d oracle-amb yarn watcher:affirmation-request + docker-compose $1 run $2 $3 -d oracle-erc20-native yarn sender:home + docker-compose $1 run $2 $3 -d oracle-erc20-native yarn sender:foreign +} + while [ "$1" != "" ]; do if [ "$1" == "oracle" ]; then docker-compose up -d redis rabbit oracle oracle-erc20 oracle-erc20-native oracle-amb @@ -31,6 +54,20 @@ while [ "$1" != "" ]; do docker-compose run -d oracle yarn sender:foreign fi + if [ "$1" == "oracle-validator-2" ]; then + oracle2name="-p validator2" + oracle2Values="-e ORACLE_VALIDATOR_ADDRESS=0xdCC784657C78054aa61FbcFFd2605F32374816A4 -e ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY=5a5c3645d0f04e9eb4f27f94ed4c244a225587405b8838e7456f7781ce3a9513" + oracle2comp="-e ORACLE_QUEUE_URL=amqp://rabbit2 -e ORACLE_REDIS_URL=redis://redis2" + startValidator "$oracle2name" "$oracle2Values" "$oracle2comp" "redis2" "rabbit2" + fi + + if [ "$1" == "oracle-validator-3" ]; then + oracle3name="-p validator3" + oracle3Values="-e ORACLE_VALIDATOR_ADDRESS=0xDcef88209a20D52165230104B245803C3269454d -e ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY=f877f62a1c19f852cff1d29f0fb1ecac18821c0080d4cc0520c60c098293dca1" + oracle3comp="-e ORACLE_QUEUE_URL=amqp://rabbit3 -e ORACLE_REDIS_URL=redis://redis3" + startValidator "$oracle3name" "$oracle3Values" "$oracle3comp" "redis3" "rabbit3" + fi + if [ "$1" == "ui" ]; then docker-compose up -d ui ui-erc20 ui-erc20-native diff --git a/oracle-e2e/run-tests.sh b/oracle-e2e/run-tests.sh index 74599c37..a2aba6c6 100755 --- a/oracle-e2e/run-tests.sh +++ b/oracle-e2e/run-tests.sh @@ -1,6 +1,6 @@ cd $(dirname $0) -../e2e-commons/up.sh deploy oracle +../e2e-commons/up.sh deploy oracle oracle-validator-2 oracle-validator-3 docker-compose -f ../e2e-commons/docker-compose.yml run e2e yarn workspace oracle-e2e run start rc=$? diff --git a/oracle-e2e/test/amb.js b/oracle-e2e/test/amb.js index 351c4b96..d3b27da2 100644 --- a/oracle-e2e/test/amb.js +++ b/oracle-e2e/test/amb.js @@ -1,22 +1,53 @@ const Web3 = require('web3') const assert = require('assert') const promiseRetry = require('promise-retry') -const { user, homeRPC, foreignRPC, amb } = require('../../e2e-commons/constants.json') +const { user, homeRPC, foreignRPC, amb, validator } = require('../../e2e-commons/constants.json') const { generateNewBlock } = require('../../e2e-commons/utils') -const { BOX_ABI } = require('../../commons') +const { BOX_ABI, HOME_AMB_ABI, FOREIGN_AMB_ABI } = require('../../commons') +const { setRequiredSignatures } = require('./utils') const { toBN } = Web3.utils const homeWeb3 = new Web3(new Web3.providers.HttpProvider(homeRPC.URL)) const foreignWeb3 = new Web3(new Web3.providers.HttpProvider(foreignRPC.URL)) +const COMMON_HOME_BRIDGE_ADDRESS = amb.home +const COMMON_FOREIGN_BRIDGE_ADDRESS = amb.foreign + homeWeb3.eth.accounts.wallet.add(user.privateKey) +homeWeb3.eth.accounts.wallet.add(validator.privateKey) foreignWeb3.eth.accounts.wallet.add(user.privateKey) +foreignWeb3.eth.accounts.wallet.add(validator.privateKey) const homeBox = new homeWeb3.eth.Contract(BOX_ABI, amb.homeBox) const foreignBox = new foreignWeb3.eth.Contract(BOX_ABI, amb.foreignBox) +const homeBridge = new homeWeb3.eth.Contract(HOME_AMB_ABI, COMMON_HOME_BRIDGE_ADDRESS) +const foreignBridge = new foreignWeb3.eth.Contract(FOREIGN_AMB_ABI, COMMON_FOREIGN_BRIDGE_ADDRESS) describe('arbitrary message bridging', () => { + before(async () => { + // Set 2 required signatures for home bridge + await setRequiredSignatures({ + bridgeContract: homeBridge, + web3: homeWeb3, + requiredSignatures: 2, + options: { + from: validator.address, + gas: '4000000' + } + }) + + // Set 2 required signatures for foreign bridge + await setRequiredSignatures({ + bridgeContract: foreignBridge, + web3: foreignWeb3, + requiredSignatures: 2, + options: { + from: validator.address, + gas: '4000000' + } + }) + }) describe('Home to Foreign', () => { describe('Subsidized Mode', () => { it('should bridge message', async () => { @@ -59,6 +90,7 @@ describe('arbitrary message bridging', () => { // check that value changed and balance decreased await promiseRetry(async retry => { + await generateNewBlock(homeWeb3, user.address) const value = await foreignBox.methods.value().call() if (!toBN(value).eq(toBN(newValue))) { retry() diff --git a/oracle-e2e/test/ercToErc.js b/oracle-e2e/test/ercToErc.js index ef155bf8..2fa01273 100644 --- a/oracle-e2e/test/ercToErc.js +++ b/oracle-e2e/test/ercToErc.js @@ -1,9 +1,10 @@ const Web3 = require('web3') const assert = require('assert') const promiseRetry = require('promise-retry') -const { user, secondUser, ercToErcBridge, homeRPC, foreignRPC } = require('../../e2e-commons/constants.json') -const { ERC677_BRIDGE_TOKEN_ABI, FOREIGN_ERC_TO_NATIVE_ABI } = require('../../commons') +const { user, secondUser, ercToErcBridge, homeRPC, foreignRPC, validator } = require('../../e2e-commons/constants.json') +const { ERC677_BRIDGE_TOKEN_ABI, FOREIGN_ERC_TO_NATIVE_ABI, HOME_ERC_TO_ERC_ABI } = require('../../commons') const { generateNewBlock } = require('../../e2e-commons/utils') +const { setRequiredSignatures } = require('./utils') const homeWeb3 = new Web3(new Web3.providers.HttpProvider(homeRPC.URL)) const foreignWeb3 = new Web3(new Web3.providers.HttpProvider(foreignRPC.URL)) @@ -14,13 +15,39 @@ const COMMON_FOREIGN_BRIDGE_ADDRESS = ercToErcBridge.foreign const { toBN } = foreignWeb3.utils homeWeb3.eth.accounts.wallet.add(user.privateKey) +homeWeb3.eth.accounts.wallet.add(validator.privateKey) foreignWeb3.eth.accounts.wallet.add(user.privateKey) +foreignWeb3.eth.accounts.wallet.add(validator.privateKey) const erc20Token = new foreignWeb3.eth.Contract(ERC677_BRIDGE_TOKEN_ABI, ercToErcBridge.foreignToken) const foreignBridge = new foreignWeb3.eth.Contract(FOREIGN_ERC_TO_NATIVE_ABI, COMMON_FOREIGN_BRIDGE_ADDRESS) const erc677Token = new homeWeb3.eth.Contract(ERC677_BRIDGE_TOKEN_ABI, ercToErcBridge.homeToken) +const homeBridge = new homeWeb3.eth.Contract(HOME_ERC_TO_ERC_ABI, COMMON_HOME_BRIDGE_ADDRESS) describe('erc to erc', () => { + before(async () => { + // Set 2 required signatures for home bridge + await setRequiredSignatures({ + bridgeContract: homeBridge, + web3: homeWeb3, + requiredSignatures: 2, + options: { + from: validator.address, + gas: '4000000' + } + }) + + // Set 2 required signatures for foreign bridge + await setRequiredSignatures({ + bridgeContract: foreignBridge, + web3: foreignWeb3, + requiredSignatures: 2, + options: { + from: validator.address, + gas: '4000000' + } + }) + }) it('should convert tokens in foreign to tokens in home', async () => { const balance = await erc20Token.methods.balanceOf(user.address).call() assert(!toBN(balance).isZero(), 'Account should have tokens') @@ -132,6 +159,7 @@ describe('erc to erc', () => { // check that balance increases await promiseRetry(async retry => { + await generateNewBlock(homeWeb3, user.address) const balance = await erc20Token.methods.balanceOf(user.address).call() if (toBN(balance).lte(toBN(originalBalance))) { retry() diff --git a/oracle-e2e/test/ercToNative.js b/oracle-e2e/test/ercToNative.js index ba474693..b1c925e4 100644 --- a/oracle-e2e/test/ercToNative.js +++ b/oracle-e2e/test/ercToNative.js @@ -9,8 +9,9 @@ const { homeRPC, foreignRPC } = require('../../e2e-commons/constants.json') -const { ERC677_BRIDGE_TOKEN_ABI, FOREIGN_ERC_TO_NATIVE_ABI, SAI_TOP } = require('../../commons') +const { ERC677_BRIDGE_TOKEN_ABI, FOREIGN_ERC_TO_NATIVE_ABI, SAI_TOP, HOME_ERC_TO_NATIVE_ABI } = require('../../commons') const { generateNewBlock } = require('../../e2e-commons/utils') +const { setRequiredSignatures } = require('./utils') const homeWeb3 = new Web3(new Web3.providers.HttpProvider(homeRPC.URL)) const foreignWeb3 = new Web3(new Web3.providers.HttpProvider(foreignRPC.URL)) @@ -21,11 +22,13 @@ const COMMON_FOREIGN_BRIDGE_ADDRESS = ercToNativeBridge.foreign const { toBN } = foreignWeb3.utils homeWeb3.eth.accounts.wallet.add(user.privateKey) +homeWeb3.eth.accounts.wallet.add(validator.privateKey) foreignWeb3.eth.accounts.wallet.add(user.privateKey) foreignWeb3.eth.accounts.wallet.add(validator.privateKey) const erc20Token = new foreignWeb3.eth.Contract(ERC677_BRIDGE_TOKEN_ABI, ercToNativeBridge.foreignToken) const foreignBridge = new foreignWeb3.eth.Contract(FOREIGN_ERC_TO_NATIVE_ABI, COMMON_FOREIGN_BRIDGE_ADDRESS) +const homeBridge = new homeWeb3.eth.Contract(HOME_ERC_TO_NATIVE_ABI, COMMON_HOME_BRIDGE_ADDRESS) describe('erc to native', () => { let halfDuplexTokenAddress @@ -33,6 +36,28 @@ describe('erc to native', () => { before(async () => { halfDuplexTokenAddress = await foreignBridge.methods.halfDuplexErc20token().call() halfDuplexToken = new foreignWeb3.eth.Contract(ERC677_BRIDGE_TOKEN_ABI, halfDuplexTokenAddress) + + // Set 2 required signatures for home bridge + await setRequiredSignatures({ + bridgeContract: homeBridge, + web3: homeWeb3, + requiredSignatures: 2, + options: { + from: validator.address, + gas: '4000000' + } + }) + + // Set 2 required signatures for foreign bridge + await setRequiredSignatures({ + bridgeContract: foreignBridge, + web3: foreignWeb3, + requiredSignatures: 2, + options: { + from: validator.address, + gas: '4000000' + } + }) }) it('should continue working after migration', async () => { const originalBalanceOnHome = await homeWeb3.eth.getBalance(user.address) @@ -81,7 +106,7 @@ describe('erc to native', () => { }) // update min threshold for swap - await foreignBridge.methods.setMinHDTokenBalance(foreignWeb3.utils.toWei('1', 'ether')).send({ + await foreignBridge.methods.setMinHDTokenBalance(foreignWeb3.utils.toWei('2', 'ether')).send({ from: validator.address, gas: '1000000' }) @@ -494,6 +519,7 @@ describe('erc to native', () => { // check that balance increases await promiseRetry(async retry => { + await generateNewBlock(homeWeb3, user.address) const balance = await erc20Token.methods.balanceOf(user.address).call() if (toBN(balance).lte(toBN(originalBalance))) { retry() diff --git a/oracle-e2e/test/mocha.opts b/oracle-e2e/test/mocha.opts index 9be9f564..4effd056 100644 --- a/oracle-e2e/test/mocha.opts +++ b/oracle-e2e/test/mocha.opts @@ -1 +1 @@ ---timeout 30000 +--timeout 120000 diff --git a/oracle-e2e/test/nativeToErc.js b/oracle-e2e/test/nativeToErc.js index ab1d9e3c..bc07fa31 100644 --- a/oracle-e2e/test/nativeToErc.js +++ b/oracle-e2e/test/nativeToErc.js @@ -4,13 +4,18 @@ const promiseRetry = require('promise-retry') const { user, validator, + secondValidator, + thirdValidator, nativeToErcBridge, secondUser, + thirdUser, + fourthUser, homeRPC, foreignRPC } = require('../../e2e-commons/constants.json') -const { ERC677_BRIDGE_TOKEN_ABI } = require('../../commons') +const { ERC677_BRIDGE_TOKEN_ABI, HOME_NATIVE_TO_ERC_ABI, FOREIGN_NATIVE_TO_ERC_ABI } = require('../../commons') const { generateNewBlock } = require('../../e2e-commons/utils') +const { setRequiredSignatures } = require('./utils') const homeWeb3 = new Web3(new Web3.providers.HttpProvider(homeRPC.URL)) const foreignWeb3 = new Web3(new Web3.providers.HttpProvider(foreignRPC.URL)) @@ -22,15 +27,48 @@ const COMMON_FOREIGN_BRIDGE_ADDRESS = nativeToErcBridge.foreign homeWeb3.eth.accounts.wallet.add(user.privateKey) homeWeb3.eth.accounts.wallet.add(validator.privateKey) homeWeb3.eth.accounts.wallet.add(secondUser.privateKey) +homeWeb3.eth.accounts.wallet.add(secondValidator.privateKey) +homeWeb3.eth.accounts.wallet.add(thirdValidator.privateKey) +homeWeb3.eth.accounts.wallet.add(thirdUser.privateKey) +homeWeb3.eth.accounts.wallet.add(fourthUser.privateKey) foreignWeb3.eth.accounts.wallet.add(user.privateKey) foreignWeb3.eth.accounts.wallet.add(validator.privateKey) foreignWeb3.eth.accounts.wallet.add(secondUser.privateKey) +foreignWeb3.eth.accounts.wallet.add(secondValidator.privateKey) +foreignWeb3.eth.accounts.wallet.add(thirdValidator.privateKey) +foreignWeb3.eth.accounts.wallet.add(thirdUser.privateKey) +foreignWeb3.eth.accounts.wallet.add(fourthUser.privateKey) const token = new foreignWeb3.eth.Contract(ERC677_BRIDGE_TOKEN_ABI, nativeToErcBridge.foreignToken) +const homeBridge = new homeWeb3.eth.Contract(HOME_NATIVE_TO_ERC_ABI, COMMON_HOME_BRIDGE_ADDRESS) +const foreignBridge = new foreignWeb3.eth.Contract(FOREIGN_NATIVE_TO_ERC_ABI, COMMON_FOREIGN_BRIDGE_ADDRESS) const sleep = timeout => new Promise(res => setTimeout(res, timeout)) describe('native to erc', () => { + before(async () => { + // Set 2 required signatures for home bridge + await setRequiredSignatures({ + bridgeContract: homeBridge, + web3: homeWeb3, + requiredSignatures: 2, + options: { + from: validator.address, + gas: '4000000' + } + }) + + // Set 2 required signatures for foreign bridge + await setRequiredSignatures({ + bridgeContract: foreignBridge, + web3: foreignWeb3, + requiredSignatures: 2, + options: { + from: validator.address, + gas: '4000000' + } + }) + }) it('should convert eth in home to tokens in foreign', async () => { // check that account has zero tokens in the foreign chain const balance = await token.methods.balanceOf(user.address).call() @@ -109,6 +147,8 @@ describe('native to erc', () => { // empty validator funds await sendAllBalance(homeWeb3, validator.address, secondUser.address) + await sendAllBalance(homeWeb3, secondValidator.address, thirdUser.address) + await sendAllBalance(homeWeb3, thirdValidator.address, fourthUser.address) // send transaction to home chain const depositTx = await homeWeb3.eth.sendTransaction({ @@ -130,14 +170,16 @@ describe('native to erc', () => { assert(originalBalance.eq(balance), "Token balance shouldn't have changed") // send funds back to validator - const sendBalanceBackTx = await sendAllBalance(homeWeb3, secondUser.address, validator.address) + await sendAllBalance(homeWeb3, secondUser.address, validator.address) + await sendAllBalance(homeWeb3, thirdUser.address, secondValidator.address) + const sendBalanceBackTx = await sendAllBalance(homeWeb3, fourthUser.address, thirdValidator.address) // expect Deposit event to be processed await promiseRetry( async retry => { const lastBlockNumber = await homeWeb3.eth.getBlockNumber() // check that a new block was created since the last transaction - if (lastBlockNumber === sendBalanceBackTx.blockNumber + 1) { + if (lastBlockNumber >= sendBalanceBackTx.blockNumber + 1) { await generateNewBlock(homeWeb3, user.address) } else { retry() @@ -165,6 +207,8 @@ describe('native to erc', () => { // empty foreign validator funds await sendAllBalance(foreignWeb3, validator.address, secondUser.address) + await sendAllBalance(foreignWeb3, secondValidator.address, thirdUser.address) + await sendAllBalance(foreignWeb3, thirdValidator.address, fourthUser.address) const foreignBlockNumber = await foreignWeb3.eth.getBlockNumber() // send transaction to home chain @@ -183,7 +227,7 @@ describe('native to erc', () => { await promiseRetry( async retry => { const lastBlockNumber = await homeWeb3.eth.getBlockNumber() - if (lastBlockNumber === lastHomeTx.blockNumber + 1) { + if (lastBlockNumber >= lastHomeTx.blockNumber + 1) { await generateNewBlock(homeWeb3, user.address) } else { retry() @@ -203,6 +247,8 @@ describe('native to erc', () => { // send funds back to validator await sendAllBalance(foreignWeb3, secondUser.address, validator.address) + await sendAllBalance(foreignWeb3, thirdUser.address, secondValidator.address) + await sendAllBalance(foreignWeb3, fourthUser.address, thirdValidator.address) // check that account has tokens in the foreign chain await promiseRetry(async retry => { diff --git a/oracle-e2e/test/utils.js b/oracle-e2e/test/utils.js new file mode 100644 index 00000000..f1b85de0 --- /dev/null +++ b/oracle-e2e/test/utils.js @@ -0,0 +1,12 @@ +const { BRIDGE_VALIDATORS_ABI } = require('../../commons') + +const setRequiredSignatures = async ({ bridgeContract, web3, requiredSignatures, options }) => { + const validatorAddress = await bridgeContract.methods.validatorContract().call() + const validatorContract = new web3.eth.Contract(BRIDGE_VALIDATORS_ABI, validatorAddress) + + return validatorContract.methods.setRequiredSignatures(requiredSignatures).send(options) +} + +module.exports = { + setRequiredSignatures +} diff --git a/parity/chain-foreign.json b/parity/chain-foreign.json index 67f2cc60..a3c8ac88 100644 --- a/parity/chain-foreign.json +++ b/parity/chain-foreign.json @@ -79,6 +79,12 @@ "aaB52d66283F7A1D5978bcFcB55721ACB467384b": { "balance": "1606938044258990275541962092341162602522202993782792835301376" }, + "dCC784657C78054aa61FbcFFd2605F32374816A4": { + "balance": "1606938044258990275541962092341162602522202993782792835301376" + }, + "Dcef88209a20D52165230104B245803C3269454d": { + "balance": "1606938044258990275541962092341162602522202993782792835301376" + }, "bb140FbA6242a1c3887A7823F7750a73101383e3": { "balance": "1606938044258990275541962092341162602522202993782792835301376" }, diff --git a/parity/chain.json b/parity/chain.json index 586321e3..ee1b205e 100644 --- a/parity/chain.json +++ b/parity/chain.json @@ -46,6 +46,8 @@ "0000000000000000000000000000000000000008": { "balance": "1", "builtin": { "name": "alt_bn128_pairing", "activate_at": 0, "pricing": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 } } } }, "0000000000000000000000000000000000001337": { "balance": "1", "constructor": "0x606060405233600060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550670de0b6b3a764000060035534610000575b612904806100666000396000f3006060604052361561013c576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306b2ff471461014157806313af40351461018c57806319362a28146101bf5780633f3935d114610248578063432ced04146102b75780634f39ca59146102eb5780636795dbcd1461032457806369fe0e2d146103c857806379ce9fac146103fd5780638da5cb5b1461045557806390b97fc1146104a457806392698814146105245780639890220b1461055d578063ac4e73f914610584578063ac72c12014610612578063c3a358251461064b578063ddca3f43146106c3578063deb931a2146106e6578063df57b74214610747578063e30bd740146107a8578063eadf976014610862578063ef5454d6146108e7578063f25eb5c114610975578063f6d339e414610984575b610000565b3461000057610172600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610a1f565b604051808215151515815260200191505060405180910390f35b34610000576101bd600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610a81565b005b346100005761022e60048080356000191690602001909190803590602001908201803590602001908080601f0160208091040260200160405190810160405280939291908181526020018383808284378201915050505050509190803560001916906020019091905050610ba2565b604051808215151515815260200191505060405180910390f35b346100005761029d600480803590602001908201803590602001908080601f01602080910402602001604051908101604052809392919081815260200183838082843782019150505050505091905050610dc9565b604051808215151515815260200191505060405180910390f35b6102d1600480803560001916906020019091905050611035565b604051808215151515815260200191505060405180910390f35b346100005761030a60048080356000191690602001909190505061115f565b604051808215151515815260200191505060405180910390f35b346100005761038660048080356000191690602001909190803590602001908201803590602001908080601f01602080910402602001604051908101604052809392919081815260200183838082843782019150505050505091905050611378565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34610000576103e3600480803590602001909190505061140d565b604051808215151515815260200191505060405180910390f35b346100005761043b60048080356000191690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919050506114b4565b604051808215151515815260200191505060405180910390f35b34610000576104626115fb565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b346100005761050660048080356000191690602001909190803590602001908201803590602001908080601f01602080910402602001604051908101604052809392919081815260200183838082843782019150505050505091905050611621565b60405180826000191660001916815260200191505060405180910390f35b34610000576105436004808035600019169060200190919050506116b2565b604051808215151515815260200191505060405180910390f35b346100005761056a611715565b604051808215151515815260200191505060405180910390f35b34610000576105f8600480803590602001908201803590602001908080601f0160208091040260200160405190810160405280939291908181526020018383808284378201915050505050509190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611824565b604051808215151515815260200191505060405180910390f35b3461000057610631600480803560001916906020019091905050611d8b565b604051808215151515815260200191505060405180910390f35b34610000576106ad60048080356000191690602001909190803590602001908201803590602001908080601f01602080910402602001604051908101604052809392919081815260200183838082843782019150505050505091905050611dee565b6040518082815260200191505060405180910390f35b34610000576106d0611e83565b6040518082815260200191505060405180910390f35b3461000057610705600480803560001916906020019091905050611e89565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b3461000057610766600480803560001916906020019091905050611ed2565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34610000576107d9600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611f1b565b6040518080602001828103825283818151815260200191508051906020019080838360008314610828575b80518252602083111561082857602082019150602081019050602083039250610804565b505050905090810190601f1680156108545780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34610000576108cd60048080356000191690602001909190803590602001908201803590602001908080601f0160208091040260200160405190810160405280939291908181526020018383808284378201915050505050509190803590602001909190505061200c565b604051808215151515815260200191505060405180910390f35b346100005761095b600480803590602001908201803590602001908080601f0160208091040260200160405190810160405280939291908181526020018383808284378201915050505050509190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050612236565b604051808215151515815260200191505060405180910390f35b3461000057610982612425565b005b3461000057610a0560048080356000191690602001909190803590602001908201803590602001908080601f0160208091040260200160405190810160405280939291908181526020018383808284378201915050505050509190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050612698565b604051808215151515815260200191505060405180910390f35b60006000600260008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020805460018160011615610100020316600290049050141590505b919050565b600060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610add57610b9f565b8073ffffffffffffffffffffffffffffffffffffffff16600060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff167f70aea8d848e8a90fb7661b227dc522eb6395c3dac71b63cb59edd5c9899b236460405180905060405180910390a380600060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505b5b50565b6000833373ffffffffffffffffffffffffffffffffffffffff1660016000836000191660001916815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16141515610c1d57610dc1565b82600160008760001916600019168152602001908152602001600020600201856040518082805190602001908083835b60208310610c705780518252602082019150602081019050602083039250610c4d565b6001836020036101000a03801982511681845116808217855250505050505090500191505090815260200160405180910390208160001916905550836040518082805190602001908083835b60208310610cdf5780518252602082019150602081019050602083039250610cbc565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902085600019167fb829c3e412537bbe794c048ccb9e4605bb4aaaa8e4d4c15c1a6e0c2adc1716ea866040518080602001828103825283818151815260200191508051906020019080838360008314610d82575b805182526020831115610d8257602082019150602081019050602083039250610d5e565b505050905090810190601f168015610dae5780820380516001836020036101000a031916815260200191505b509250505060405180910390a3600191505b5b509392505050565b6000813373ffffffffffffffffffffffffffffffffffffffff1660016000836040518082805190602001908083835b60208310610e1b5780518252602082019150602081019050602083039250610df8565b6001836020036101000a03801982511681845116808217855250505050505090500191505060405180910390206000191660001916815260200190815260200160002060010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16141515610ea45761102f565b82600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000209080519060200190828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f10610f2d57805160ff1916838001178555610f5b565b82800160010185558215610f5b579182015b82811115610f5a578251825591602001919060010190610f3f565b5b509050610f8091905b80821115610f7c576000816000905550600101610f64565b5090565b50503373ffffffffffffffffffffffffffffffffffffffff16836040518082805190602001908083835b60208310610fcd5780518252602082019150602081019050602083039250610faa565b6001836020036101000a03801982511681845116808217855250505050505090500191505060405180910390207f098ae8581bb8bd9af1beaf7f2e9f51f31a8e5a8bfada4e303a645d71d9c9192060405180905060405180910390a3600191505b5b50919050565b600081600060016000836000191660001916815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614151561109b57611159565b6003543410156110aa57611158565b3360016000856000191660001916815260200190815260200160002060000160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055503373ffffffffffffffffffffffffffffffffffffffff1683600019167f4963513eca575aba66fdcd25f267aae85958fe6fb97e75fa25d783f1a091a22160405180905060405180910390a3600191505b5b5b50919050565b6000813373ffffffffffffffffffffffffffffffffffffffff1660016000836000191660001916815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff161415156111da57611372565b6002600060016000866000191660001916815260200190815260200160002060010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020805460018160011615610100020316600290046000825580601f1061127c57506112b3565b601f0160209004906000526020600020908101906112b291905b808211156112ae576000816000905550600101611296565b5090565b5b5060016000846000191660001916815260200190815260200160002060006000820160006101000a81549073ffffffffffffffffffffffffffffffffffffffff02191690556001820160006101000a81549073ffffffffffffffffffffffffffffffffffffffff021916905550503373ffffffffffffffffffffffffffffffffffffffff1683600019167fef1961b4d2909dc23643b309bfe5c3e5646842d98c3a58517037ef3871185af360405180905060405180910390a3600191505b5b50919050565b6000600160008460001916600019168152602001908152602001600020600201826040518082805190602001908083835b602083106113cc57805182526020820191506020810190506020830392506113a9565b6001836020036101000a0380198251168184511680821785525050505050509050019150509081526020016040518091039020546001900490505b92915050565b6000600060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614151561146b576114af565b816003819055507f6bbc57480a46553fa4d156ce702beef5f3ad66303b0ed1a5d4cb44966c6584c3826040518082815260200191505060405180910390a1600190505b5b919050565b6000823373ffffffffffffffffffffffffffffffffffffffff1660016000836000191660001916815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614151561152f576115f4565b8260016000866000191660001916815260200190815260200160002060000160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1685600019167f7b97c62130aa09acbbcbf7482630e756592496f1759eaf702f469cf64dfb779460405180905060405180910390a4600191505b5b5092915050565b600060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6000600160008460001916600019168152602001908152602001600020600201826040518082805190602001908083835b602083106116755780518252602082019150602081019050602083039250611652565b6001836020036101000a03801982511681845116808217855250505050505090500191505090815260200160405180910390205490505b92915050565b6000600060016000846000191660001916815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16141590505b919050565b6000600060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614151561177357611821565b7fdef931299fe61d176f949118058530c1f3f539dcb6950b4e372c9b835c33ca073073ffffffffffffffffffffffffffffffffffffffff16316040518082815260200191505060405180910390a13373ffffffffffffffffffffffffffffffffffffffff166108fc3073ffffffffffffffffffffffffffffffffffffffff16319081150290604051809050600060405180830381858888f19350505050151561181b57610000565b600190505b5b90565b60006000836040518082805190602001908083835b6020831061185c5780518252602082019150602081019050602083039250611839565b6001836020036101000a03801982511681845116808217855250505050505090500191505060405180910390203373ffffffffffffffffffffffffffffffffffffffff1660016000836000191660001916815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614151561190157611d83565b846040518082805190602001908083835b602083106119355780518252602082019150602081019050602083039250611912565b6001836020036101000a03801982511681845116808217855250505050505090500191505060405180910390209150600060016000846000191660001916815260200190815260200160002060010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614158015611ab4575081600019166002600060016000866000191660001916815260200190815260200160002060010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206040518082805460018160011615610100020316600290048015611aa15780601f10611a7f576101008083540402835291820191611aa1565b820191906000526020600020905b815481529060010190602001808311611a8d575b5050915050604051809103902060001916145b15611c79576002600060016000856000191660001916815260200190815260200160002060010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020805460018160011615610100020316600290046000825580601f10611b5b5750611b92565b601f016020900490600052602060002090810190611b9191905b80821115611b8d576000816000905550600101611b75565b5090565b5b5060016000836000191660001916815260200190815260200160002060010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16856040518082805190602001908083835b60208310611c1c5780518252602082019150602081019050602083039250611bf9565b6001836020036101000a03801982511681845116808217855250505050505090500191505060405180910390207f12491ad95fd945e444d88a894ffad3c21959880a4dcd8af99d4ae4ffc71d4abd60405180905060405180910390a35b8360016000846000191660001916815260200190815260200160002060010160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055508373ffffffffffffffffffffffffffffffffffffffff16856040518082805190602001908083835b60208310611d215780518252602082019150602081019050602083039250611cfe565b6001836020036101000a03801982511681845116808217855250505050505090500191505060405180910390207f728435a0031f6a04538fcdd24922a7e06bc7bc945db03e83d22122d1bc5f28df60405180905060405180910390a3600192505b5b505092915050565b6000600060016000846000191660001916815260200190815260200160002060010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16141590505b919050565b6000600160008460001916600019168152602001908152602001600020600201826040518082805190602001908083835b60208310611e425780518252602082019150602081019050602083039250611e1f565b6001836020036101000a0380198251168184511680821785525050505050509050019150509081526020016040518091039020546001900490505b92915050565b60035481565b600060016000836000191660001916815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690505b919050565b600060016000836000191660001916815260200190815260200160002060010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690505b919050565b6020604051908101604052806000815250600260008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015611fff5780601f10611fd457610100808354040283529160200191611fff565b820191906000526020600020905b815481529060010190602001808311611fe257829003601f168201915b505050505090505b919050565b6000833373ffffffffffffffffffffffffffffffffffffffff1660016000836000191660001916815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff161415156120875761222e565b82600102600160008760001916600019168152602001908152602001600020600201856040518082805190602001908083835b602083106120dd57805182526020820191506020810190506020830392506120ba565b6001836020036101000a03801982511681845116808217855250505050505090500191505090815260200160405180910390208160001916905550836040518082805190602001908083835b6020831061214c5780518252602082019150602081019050602083039250612129565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902085600019167fb829c3e412537bbe794c048ccb9e4605bb4aaaa8e4d4c15c1a6e0c2adc1716ea8660405180806020018281038252838181518152602001915080519060200190808383600083146121ef575b8051825260208311156121ef576020820191506020810190506020830392506121cb565b505050905090810190601f16801561221b5780820380516001836020036101000a031916815260200191505b509250505060405180910390a3600191505b5b509392505050565b6000600060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161415156122945761241f565b82600260008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000209080519060200190828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061231d57805160ff191683800117855561234b565b8280016001018555821561234b579182015b8281111561234a57825182559160200191906001019061232f565b5b50905061237091905b8082111561236c576000816000905550600101612354565b5090565b50508173ffffffffffffffffffffffffffffffffffffffff16836040518082805190602001908083835b602083106123bd578051825260208201915060208101905060208303925061239a565b6001836020036101000a03801982511681845116808217855250505050505090500191505060405180910390207f098ae8581bb8bd9af1beaf7f2e9f51f31a8e5a8bfada4e303a645d71d9c9192060405180905060405180910390a3600190505b5b92915050565b3373ffffffffffffffffffffffffffffffffffffffff16600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060405180828054600181600116156101000203166002900480156124d65780601f106124b45761010080835404028352918201916124d6565b820191906000526020600020905b8154815290600101906020018083116124c2575b505091505060405180910390207f12491ad95fd945e444d88a894ffad3c21959880a4dcd8af99d4ae4ffc71d4abd60405180905060405180910390a360016000600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060405180828054600181600116156101000203166002900480156125b05780601f1061258e5761010080835404028352918201916125b0565b820191906000526020600020905b81548152906001019060200180831161259c575b505091505060405180910390206000191660001916815260200190815260200160002060010160006101000a81549073ffffffffffffffffffffffffffffffffffffffff0219169055600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020805460018160011615610100020316600290046000825580601f1061265d5750612694565b601f01602090049060005260206000209081019061269391905b8082111561268f576000816000905550600101612677565b5090565b5b505b565b6000833373ffffffffffffffffffffffffffffffffffffffff1660016000836000191660001916815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16141515612713576128d0565b8273ffffffffffffffffffffffffffffffffffffffff16600102600160008760001916600019168152602001908152602001600020600201856040518082805190602001908083835b6020831061277f578051825260208201915060208101905060208303925061275c565b6001836020036101000a03801982511681845116808217855250505050505090500191505090815260200160405180910390208160001916905550836040518082805190602001908083835b602083106127ee57805182526020820191506020810190506020830392506127cb565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902085600019167fb829c3e412537bbe794c048ccb9e4605bb4aaaa8e4d4c15c1a6e0c2adc1716ea866040518080602001828103825283818151815260200191508051906020019080838360008314612891575b8051825260208311156128915760208201915060208101905060208303925061286d565b505050905090810190601f1680156128bd5780820380516001836020036101000a031916815260200191505b509250505060405180910390a3600191505b5b5093925050505600a165627a7a7230582066b2da4773a0f1d81efe071c66b51c46868a871661efd18c0f629353ff4c1f9b0029" }, "aaB52d66283F7A1D5978bcFcB55721ACB467384b": { "balance": "1606938044258990275541962092341162602522202993782792835301376" }, + "dCC784657C78054aa61FbcFFd2605F32374816A4": { "balance": "1606938044258990275541962092341162602522202993782792835301376" }, + "Dcef88209a20D52165230104B245803C3269454d": { "balance": "1606938044258990275541962092341162602522202993782792835301376" }, "bb140FbA6242a1c3887A7823F7750a73101383e3": { "balance": "1606938044258990275541962092341162602522202993782792835301376" }, "7FC1442AB55Da569940Eb750AaD2BAA63DA4010E": { "balance": "500000000000000000000" }, "B4579fd5AfEaB60B03Db3F408AAdD315035943f7": { "balance": "500000000000000000000" }