From 84e28f46b89c272c490c8557708202464b7a4773 Mon Sep 17 00:00:00 2001 From: rzadp Date: Thu, 23 May 2019 15:01:13 +0200 Subject: [PATCH 01/13] Changed contracts to main sub-dir --- oracle-e2e/constants.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oracle-e2e/constants.json b/oracle-e2e/constants.json index e3352941..f0d9d068 100644 --- a/oracle-e2e/constants.json +++ b/oracle-e2e/constants.json @@ -11,5 +11,5 @@ "address": "0xaaB52d66283F7A1D5978bcFcB55721ACB467384b", "privateKey": "0x8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9" }, - "contractsPath": "../contracts-2.2.0" + "contractsPath": "../contracts" } From b085c00616a933e18fe70e8d7757c5d52b5cbaa8 Mon Sep 17 00:00:00 2001 From: rzadp Date: Thu, 23 May 2019 15:01:17 +0200 Subject: [PATCH 02/13] Test script --- oracle-e2e/run-tests.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/oracle-e2e/run-tests.sh b/oracle-e2e/run-tests.sh index f482f5de..2a12525f 100755 --- a/oracle-e2e/run-tests.sh +++ b/oracle-e2e/run-tests.sh @@ -1,9 +1,17 @@ cd $(dirname $0) +ps | grep node | grep -v grep | awk '{print "kill " $1}' | sh docker-compose down -docker-compose up -d --build --force-recreate + +docker-compose up -d --build docker-compose run e2e yarn workspace oracle-e2e run deploy + +ps | grep node | grep -v grep | awk '{print "kill " $1}' | sh +docker-compose down +exit 0 + + docker-compose run -d bridge npm run watcher:signature-request docker-compose run -d bridge npm run watcher:collected-signatures docker-compose run -d bridge npm run watcher:affirmation-request From a1b85a7cc1c36a4b2c453cbb038829ee1c91d5a3 Mon Sep 17 00:00:00 2001 From: rzadp Date: Thu, 23 May 2019 14:24:46 +0200 Subject: [PATCH 03/13] Changed order in Dockerfile.e2e to utilize docker build cache --- Dockerfile.e2e | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Dockerfile.e2e b/Dockerfile.e2e index 4653c0fa..021c145a 100644 --- a/Dockerfile.e2e +++ b/Dockerfile.e2e @@ -9,12 +9,18 @@ COPY ui-e2e/package.json ./ui-e2e/ COPY monitor/package.json ./monitor/ COPY contracts/package.json ./contracts/ COPY ui/lib/web3-eth/index.js ./ui/lib/web3-eth/index.js + COPY yarn.lock . - RUN yarn install -COPY . . +COPY contracts contracts RUN yarn workspace poa-parity-bridge-contracts run compile -RUN cd contracts-2.2.0 && rm -f package-lock.json && npm install --silent && npm install --silent truffle@4.1.11 && npm run compile && cd deploy && rm -f package-lock.json && npm install --silent && npm install --silent web3@1.0.0-beta.33 -RUN yarn workspace ui run compile:contracts && yarn workspace ui run postinstall RUN cd contracts/deploy && rm -f package-lock.json && npm install + +COPY contracts-2.2.0 contracts-2.2.0 +RUN cd contracts-2.2.0 && rm -f package-lock.json && npm install --silent && npm install --silent truffle@4.1.11 && npm run compile && cd deploy && rm -f package-lock.json && npm install --silent && npm install --silent web3@1.0.0-beta.33 + +COPY ui ui +RUN yarn workspace ui run compile:contracts && yarn workspace ui run postinstall + +COPY . . From f5516a42fe2c78784b2f93db13364af6a33d3775 Mon Sep 17 00:00:00 2001 From: rzadp Date: Thu, 23 May 2019 15:11:35 +0200 Subject: [PATCH 04/13] Update deployment script --- oracle-e2e/scripts/deployERC20.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/oracle-e2e/scripts/deployERC20.js b/oracle-e2e/scripts/deployERC20.js index ed4b0596..16a9381e 100644 --- a/oracle-e2e/scripts/deployERC20.js +++ b/oracle-e2e/scripts/deployERC20.js @@ -7,7 +7,7 @@ require('dotenv').config({ const { deployContract, - sendRawTx, + sendRawTxForeign, privateKeyToAddress } = require(`../${contractsPath}/deploy/src/deploymentUtils`) const { @@ -34,7 +34,7 @@ async function deployErc20() { const mintData = await poa20foreign.methods .mint(user.address, '1000000000000000000') .encodeABI({ from: DEPLOYMENT_ACCOUNT_ADDRESS }) - await sendRawTx({ + await sendRawTxForeign({ data: mintData, nonce: foreignNonce, to: poa20foreign.options.address, From 6175ee19a1fe5bd37e4b0ef1b8b6b19eb18621db Mon Sep 17 00:00:00 2001 From: rzadp Date: Thu, 23 May 2019 15:17:57 +0200 Subject: [PATCH 05/13] Updated envs. --- oracle-e2e/envs/contracts-deploy.env | 6 ++++++ oracle-e2e/envs/erc-contracts-deploy.env | 8 ++++++++ oracle-e2e/envs/erc-native-contracts-deploy.env | 4 ++++ 3 files changed, 18 insertions(+) diff --git a/oracle-e2e/envs/contracts-deploy.env b/oracle-e2e/envs/contracts-deploy.env index 9cada7d9..1b76652a 100644 --- a/oracle-e2e/envs/contracts-deploy.env +++ b/oracle-e2e/envs/contracts-deploy.env @@ -4,6 +4,8 @@ DEPLOYMENT_GAS_LIMIT=4600000 HOME_DEPLOYMENT_GAS_PRICE=10000000000 FOREIGN_DEPLOYMENT_GAS_PRICE=10000000000 GET_RECEIPT_INTERVAL_IN_MILLISECONDS=50 +DEPLOYMENT_GAS_LIMIT_EXTRA=0.2 +DEPLOY_REWARDABLE_TOKEN=false BRIDGEABLE_TOKEN_NAME="Your New Bridged Token" BRIDGEABLE_TOKEN_SYMBOL="TEST" @@ -18,6 +20,7 @@ HOME_MAX_AMOUNT_PER_TX=1500000000000000000000000 HOME_MIN_AMOUNT_PER_TX=10000000000000000 HOME_REQUIRED_BLOCK_CONFIRMATIONS=1 HOME_GAS_PRICE=1000000000 +HOME_REWARDABLE=false FOREIGN_RPC_URL=http://parity2:8545 FOREIGN_BRIDGE_OWNER=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b @@ -28,6 +31,9 @@ FOREIGN_MAX_AMOUNT_PER_TX=750000000000000000000000 FOREIGN_MIN_AMOUNT_PER_TX=10000000000000000 FOREIGN_REQUIRED_BLOCK_CONFIRMATIONS=1 FOREIGN_GAS_PRICE=10000000000 +FOREIGN_REWARDABLE=false REQUIRED_NUMBER_OF_VALIDATORS=1 VALIDATORS="0xaaB52d66283F7A1D5978bcFcB55721ACB467384b" +VALIDATORS_REWARD_ACCOUNTS=0x0000000000000000000000000000000000000000 +BLOCK_REWARD_ADDRESS=0x0000000000000000000000000000000000000000 diff --git a/oracle-e2e/envs/erc-contracts-deploy.env b/oracle-e2e/envs/erc-contracts-deploy.env index dc7a7c5e..7d436170 100644 --- a/oracle-e2e/envs/erc-contracts-deploy.env +++ b/oracle-e2e/envs/erc-contracts-deploy.env @@ -4,6 +4,8 @@ DEPLOYMENT_GAS_LIMIT=4600000 HOME_DEPLOYMENT_GAS_PRICE=10000000000 FOREIGN_DEPLOYMENT_GAS_PRICE=10000000000 GET_RECEIPT_INTERVAL_IN_MILLISECONDS=50 +DEPLOYMENT_GAS_LIMIT_EXTRA=0.2 +DEPLOY_REWARDABLE_TOKEN=false BRIDGEABLE_TOKEN_NAME="Your New Bridged Token" BRIDGEABLE_TOKEN_SYMBOL="TEST" @@ -18,6 +20,7 @@ HOME_MAX_AMOUNT_PER_TX=1500000000000000000000000 HOME_MIN_AMOUNT_PER_TX=10000000000000000 HOME_REQUIRED_BLOCK_CONFIRMATIONS=1 HOME_GAS_PRICE=1000000000 +HOME_REWARDABLE=false FOREIGN_RPC_URL=http://parity2:8545 FOREIGN_BRIDGE_OWNER=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b @@ -28,7 +31,12 @@ FOREIGN_MAX_AMOUNT_PER_TX=750000000000000000000000 FOREIGN_MIN_AMOUNT_PER_TX=10000000000000000 FOREIGN_REQUIRED_BLOCK_CONFIRMATIONS=1 FOREIGN_GAS_PRICE=10000000000 +FOREIGN_REWARDABLE=false ERC20_TOKEN_ADDRESS=0x3C665A31199694Bf723fD08844AD290207B5797f REQUIRED_NUMBER_OF_VALIDATORS=1 VALIDATORS="0xaaB52d66283F7A1D5978bcFcB55721ACB467384b" +VALIDATORS_REWARD_ACCOUNTS=0x0000000000000000000000000000000000000000 +BLOCK_REWARD_ADDRESS=0x0000000000000000000000000000000000000000 +DPOS_STAKING_ADDRESS=0x0000000000000000000000000000000000000000 +ERC20_EXTENDED_BY_ERC677=false diff --git a/oracle-e2e/envs/erc-native-contracts-deploy.env b/oracle-e2e/envs/erc-native-contracts-deploy.env index fc1f6021..28ba0f65 100644 --- a/oracle-e2e/envs/erc-native-contracts-deploy.env +++ b/oracle-e2e/envs/erc-native-contracts-deploy.env @@ -4,6 +4,7 @@ DEPLOYMENT_GAS_LIMIT=4600000 HOME_DEPLOYMENT_GAS_PRICE=10000000000 FOREIGN_DEPLOYMENT_GAS_PRICE=10000000000 GET_RECEIPT_INTERVAL_IN_MILLISECONDS=50 +DEPLOYMENT_GAS_LIMIT_EXTRA=0.2 BRIDGEABLE_TOKEN_NAME="Your New Bridged Token" BRIDGEABLE_TOKEN_SYMBOL="TEST" @@ -18,6 +19,7 @@ HOME_MAX_AMOUNT_PER_TX=1500000000000000000000000 HOME_MIN_AMOUNT_PER_TX=10000000000000000 HOME_REQUIRED_BLOCK_CONFIRMATIONS=1 HOME_GAS_PRICE=1000000000 +HOME_REWARDABLE=false FOREIGN_RPC_URL=http://parity2:8545 FOREIGN_BRIDGE_OWNER=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b @@ -28,9 +30,11 @@ FOREIGN_MAX_AMOUNT_PER_TX=750000000000000000000000 FOREIGN_MIN_AMOUNT_PER_TX=10000000000000000 FOREIGN_REQUIRED_BLOCK_CONFIRMATIONS=1 FOREIGN_GAS_PRICE=10000000000 +FOREIGN_REWARDABLE=false BLOCK_REWARD_ADDRESS=0xF9698Eb93702dfdd0e2d802088d4c21822a8A977 ERC20_TOKEN_ADDRESS=0x3C665A31199694Bf723fD08844AD290207B5797f REQUIRED_NUMBER_OF_VALIDATORS=1 VALIDATORS="0xaaB52d66283F7A1D5978bcFcB55721ACB467384b" +VALIDATORS_REWARD_ACCOUNTS=0x0000000000000000000000000000000000000000 From d4327f8c0a2ccc5e9d80068a0fe187ca215c7ec8 Mon Sep 17 00:00:00 2001 From: rzadp Date: Thu, 23 May 2019 15:27:24 +0200 Subject: [PATCH 06/13] One job. --- .circleci/config.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2e7d4571..e2b51180 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -78,9 +78,4 @@ workflows: only: master tokenbridge: jobs: - - build - - lint - - ansible-lint - - test - oracle-e2e - - ui-e2e From fb4f7ee85acf8069d453e4bf859f368deedbd781 Mon Sep 17 00:00:00 2001 From: rzadp Date: Thu, 23 May 2019 15:32:05 +0200 Subject: [PATCH 07/13] Revert "Test script" b085c00616a933e18fe70e8d7757c5d52b5cbaa8 --- oracle-e2e/run-tests.sh | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/oracle-e2e/run-tests.sh b/oracle-e2e/run-tests.sh index 2a12525f..f482f5de 100755 --- a/oracle-e2e/run-tests.sh +++ b/oracle-e2e/run-tests.sh @@ -1,17 +1,9 @@ cd $(dirname $0) -ps | grep node | grep -v grep | awk '{print "kill " $1}' | sh docker-compose down - -docker-compose up -d --build +docker-compose up -d --build --force-recreate docker-compose run e2e yarn workspace oracle-e2e run deploy - -ps | grep node | grep -v grep | awk '{print "kill " $1}' | sh -docker-compose down -exit 0 - - docker-compose run -d bridge npm run watcher:signature-request docker-compose run -d bridge npm run watcher:collected-signatures docker-compose run -d bridge npm run watcher:affirmation-request From 875d7972a4f2f9f1d8ca9953b6daf74d661ab485 Mon Sep 17 00:00:00 2001 From: rzadp Date: Fri, 24 May 2019 09:28:24 +0200 Subject: [PATCH 08/13] Switched contracts to 2.3.1 --- contracts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contracts b/contracts index 492f6d01..b1c4c35f 160000 --- a/contracts +++ b/contracts @@ -1 +1 @@ -Subproject commit 492f6d010a1324676801df918f0449965e770c64 +Subproject commit b1c4c35fbc86acacf3a6d857c7e6b232aec2592f From 041d36fc3c77ef6dbcfb171f87e40b0e06ac0950 Mon Sep 17 00:00:00 2001 From: rzadp Date: Fri, 24 May 2019 09:37:03 +0200 Subject: [PATCH 09/13] Revert "One job." d4327f8c0a2ccc5e9d80068a0fe187ca215c7ec8 --- .circleci/config.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index e2b51180..2e7d4571 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -78,4 +78,9 @@ workflows: only: master tokenbridge: jobs: + - build + - lint + - ansible-lint + - test - oracle-e2e + - ui-e2e From 52684a30fd93161365cf93997837139cea81fff5 Mon Sep 17 00:00:00 2001 From: rzadp Date: Fri, 24 May 2019 09:52:16 +0200 Subject: [PATCH 10/13] Lint --- oracle/src/events/processAffirmationRequests/index.js | 5 +++-- oracle/src/tx/web3.js | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/oracle/src/events/processAffirmationRequests/index.js b/oracle/src/events/processAffirmationRequests/index.js index 8af27717..131beef3 100644 --- a/oracle/src/events/processAffirmationRequests/index.js +++ b/oracle/src/events/processAffirmationRequests/index.js @@ -1,7 +1,9 @@ require('dotenv').config() +const promiseLimit = require('promise-limit') +const { HttpListProviderError } = require('http-list-provider') const rootLogger = require('../../services/logger') const { web3Home } = require('../../services/web3') -const promiseLimit = require('promise-limit') + const bridgeValidatorsABI = require('../../../abis/BridgeValidators.abi') const { EXIT_CODES, MAX_CONCURRENT_EVENTS } = require('../../utils/constants') const estimateGas = require('./estimateGas') @@ -10,7 +12,6 @@ const { AlreadySignedError, InvalidValidatorError } = require('../../utils/errors') -const { HttpListProviderError } = require('http-list-provider') const limit = promiseLimit(MAX_CONCURRENT_EVENTS) diff --git a/oracle/src/tx/web3.js b/oracle/src/tx/web3.js index c22e1c8f..776300c1 100644 --- a/oracle/src/tx/web3.js +++ b/oracle/src/tx/web3.js @@ -1,8 +1,8 @@ +const { hexToNumber } = require('web3-utils') const logger = require('../services/logger').child({ module: 'web3' }) const { sendRawTx } = require('./sendTx') -const { hexToNumber } = require('web3-utils') async function getNonce(web3, address) { try { From 27ec83048fa50eed40d290555cdb8e9134e243ef Mon Sep 17 00:00:00 2001 From: rzadp Date: Fri, 24 May 2019 09:42:20 +0200 Subject: [PATCH 11/13] Switch ui-e2e contracts to 2.3.1. Update envs and deploy script --- ui-e2e/config.json | 2 +- ui-e2e/envs/contracts.env | 6 ++++++ ui-e2e/envs/erc-contracts.env | 8 ++++++++ ui-e2e/envs/erc-native-contracts.env | 4 ++++ ui-e2e/scripts/deployERC20.js | 4 ++-- 5 files changed, 21 insertions(+), 3 deletions(-) diff --git a/ui-e2e/config.json b/ui-e2e/config.json index 27de547c..0737ca87 100644 --- a/ui-e2e/config.json +++ b/ui-e2e/config.json @@ -4,5 +4,5 @@ "erc20NativeUrl" : "http://localhost:3002", "homeAccount": "./accounts/user77_7FC1.json", "foreignAccount": "./accounts/user42_7FC1.json", - "contractsPath": "../contracts-2.2.0" + "contractsPath": "../contracts" } diff --git a/ui-e2e/envs/contracts.env b/ui-e2e/envs/contracts.env index d16ca603..ea387a34 100644 --- a/ui-e2e/envs/contracts.env +++ b/ui-e2e/envs/contracts.env @@ -5,6 +5,8 @@ DEPLOYMENT_GAS_LIMIT=4600000 HOME_DEPLOYMENT_GAS_PRICE=10000000000 FOREIGN_DEPLOYMENT_GAS_PRICE=10000000000 GET_RECEIPT_INTERVAL_IN_MILLISECONDS=50 +DEPLOYMENT_GAS_LIMIT_EXTRA=0.2 +DEPLOY_REWARDABLE_TOKEN=false BRIDGEABLE_TOKEN_NAME="Your New Bridged Token" BRIDGEABLE_TOKEN_SYMBOL="TEST" @@ -19,6 +21,7 @@ HOME_MAX_AMOUNT_PER_TX=1500000000000000000000000 HOME_MIN_AMOUNT_PER_TX=10000000000000000 HOME_REQUIRED_BLOCK_CONFIRMATIONS=1 HOME_GAS_PRICE=1000000000 +HOME_REWARDABLE=false FOREIGN_RPC_URL=http://parity2:8545 FOREIGN_BRIDGE_OWNER=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b @@ -29,6 +32,9 @@ FOREIGN_MAX_AMOUNT_PER_TX=750000000000000000000000 FOREIGN_MIN_AMOUNT_PER_TX=10000000000000000 FOREIGN_REQUIRED_BLOCK_CONFIRMATIONS=1 FOREIGN_GAS_PRICE=10000000000 +FOREIGN_REWARDABLE=false REQUIRED_NUMBER_OF_VALIDATORS=1 VALIDATORS="0xaaB52d66283F7A1D5978bcFcB55721ACB467384b" +VALIDATORS_REWARD_ACCOUNTS=0x0000000000000000000000000000000000000000 +BLOCK_REWARD_ADDRESS=0x0000000000000000000000000000000000000000 diff --git a/ui-e2e/envs/erc-contracts.env b/ui-e2e/envs/erc-contracts.env index 4d647063..dc38c890 100644 --- a/ui-e2e/envs/erc-contracts.env +++ b/ui-e2e/envs/erc-contracts.env @@ -5,6 +5,8 @@ DEPLOYMENT_GAS_LIMIT=4600000 HOME_DEPLOYMENT_GAS_PRICE=10000000000 FOREIGN_DEPLOYMENT_GAS_PRICE=10000000000 GET_RECEIPT_INTERVAL_IN_MILLISECONDS=50 +DEPLOYMENT_GAS_LIMIT_EXTRA=0.2 +DEPLOY_REWARDABLE_TOKEN=false BRIDGEABLE_TOKEN_NAME="Your New Bridged Token" BRIDGEABLE_TOKEN_SYMBOL="TEST" @@ -19,6 +21,7 @@ HOME_MAX_AMOUNT_PER_TX=1500000000000000000000000 HOME_MIN_AMOUNT_PER_TX=10000000000000000 HOME_REQUIRED_BLOCK_CONFIRMATIONS=1 HOME_GAS_PRICE=1000000000 +HOME_REWARDABLE=false FOREIGN_RPC_URL=http://parity2:8545 FOREIGN_BRIDGE_OWNER=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b @@ -30,6 +33,11 @@ FOREIGN_MIN_AMOUNT_PER_TX=10000000000000000 FOREIGN_REQUIRED_BLOCK_CONFIRMATIONS=1 FOREIGN_GAS_PRICE=10000000000 ERC20_TOKEN_ADDRESS=0x3C665A31199694Bf723fD08844AD290207B5797f +FOREIGN_REWARDABLE=false REQUIRED_NUMBER_OF_VALIDATORS=1 VALIDATORS="0xaaB52d66283F7A1D5978bcFcB55721ACB467384b" +VALIDATORS_REWARD_ACCOUNTS=0x0000000000000000000000000000000000000000 +BLOCK_REWARD_ADDRESS=0x0000000000000000000000000000000000000000 +DPOS_STAKING_ADDRESS=0x0000000000000000000000000000000000000000 +ERC20_EXTENDED_BY_ERC677=false diff --git a/ui-e2e/envs/erc-native-contracts.env b/ui-e2e/envs/erc-native-contracts.env index fc1f6021..28ba0f65 100644 --- a/ui-e2e/envs/erc-native-contracts.env +++ b/ui-e2e/envs/erc-native-contracts.env @@ -4,6 +4,7 @@ DEPLOYMENT_GAS_LIMIT=4600000 HOME_DEPLOYMENT_GAS_PRICE=10000000000 FOREIGN_DEPLOYMENT_GAS_PRICE=10000000000 GET_RECEIPT_INTERVAL_IN_MILLISECONDS=50 +DEPLOYMENT_GAS_LIMIT_EXTRA=0.2 BRIDGEABLE_TOKEN_NAME="Your New Bridged Token" BRIDGEABLE_TOKEN_SYMBOL="TEST" @@ -18,6 +19,7 @@ HOME_MAX_AMOUNT_PER_TX=1500000000000000000000000 HOME_MIN_AMOUNT_PER_TX=10000000000000000 HOME_REQUIRED_BLOCK_CONFIRMATIONS=1 HOME_GAS_PRICE=1000000000 +HOME_REWARDABLE=false FOREIGN_RPC_URL=http://parity2:8545 FOREIGN_BRIDGE_OWNER=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b @@ -28,9 +30,11 @@ FOREIGN_MAX_AMOUNT_PER_TX=750000000000000000000000 FOREIGN_MIN_AMOUNT_PER_TX=10000000000000000 FOREIGN_REQUIRED_BLOCK_CONFIRMATIONS=1 FOREIGN_GAS_PRICE=10000000000 +FOREIGN_REWARDABLE=false BLOCK_REWARD_ADDRESS=0xF9698Eb93702dfdd0e2d802088d4c21822a8A977 ERC20_TOKEN_ADDRESS=0x3C665A31199694Bf723fD08844AD290207B5797f REQUIRED_NUMBER_OF_VALIDATORS=1 VALIDATORS="0xaaB52d66283F7A1D5978bcFcB55721ACB467384b" +VALIDATORS_REWARD_ACCOUNTS=0x0000000000000000000000000000000000000000 diff --git a/ui-e2e/scripts/deployERC20.js b/ui-e2e/scripts/deployERC20.js index 3120dadc..42a03cdc 100644 --- a/ui-e2e/scripts/deployERC20.js +++ b/ui-e2e/scripts/deployERC20.js @@ -7,7 +7,7 @@ require('dotenv').config({ const { deployContract, - sendRawTx + sendRawTxForeign } = require(path.join('..', contractsPath, 'deploy/src/deploymentUtils')) const { web3Foreign, @@ -33,7 +33,7 @@ async function deployErc20() { const mintData = await poa20foreign.methods .mint(user, '500000000000000000000') .encodeABI({ from: DEPLOYMENT_ACCOUNT_ADDRESS }) - await sendRawTx({ + await sendRawTxForeign({ data: mintData, nonce: foreignNonce, to: poa20foreign.options.address, From e2cc5e17b0e105b9f6681a76b4af30460f524060 Mon Sep 17 00:00:00 2001 From: rzadp Date: Fri, 24 May 2019 10:49:20 +0200 Subject: [PATCH 12/13] Removed contracts-2.2.0 module --- .gitmodules | 3 --- Dockerfile.e2e | 3 --- contracts-2.2.0 | 1 - 3 files changed, 7 deletions(-) delete mode 160000 contracts-2.2.0 diff --git a/.gitmodules b/.gitmodules index 8c9a7fdd..8b9087a2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ [submodule "contracts"] path = contracts url = https://github.com/poanetwork/poa-bridge-contracts.git -[submodule "contracts-2.2.0"] - path = contracts-2.2.0 - url = https://github.com/poanetwork/poa-bridge-contracts.git diff --git a/Dockerfile.e2e b/Dockerfile.e2e index 021c145a..38fcfec6 100644 --- a/Dockerfile.e2e +++ b/Dockerfile.e2e @@ -17,9 +17,6 @@ COPY contracts contracts RUN yarn workspace poa-parity-bridge-contracts run compile RUN cd contracts/deploy && rm -f package-lock.json && npm install -COPY contracts-2.2.0 contracts-2.2.0 -RUN cd contracts-2.2.0 && rm -f package-lock.json && npm install --silent && npm install --silent truffle@4.1.11 && npm run compile && cd deploy && rm -f package-lock.json && npm install --silent && npm install --silent web3@1.0.0-beta.33 - COPY ui ui RUN yarn workspace ui run compile:contracts && yarn workspace ui run postinstall diff --git a/contracts-2.2.0 b/contracts-2.2.0 deleted file mode 160000 index 46151629..00000000 --- a/contracts-2.2.0 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 46151629adb3dd20e6fb47d4ba91b88c6d388c4f From d1067a94bb8cdc8b2b6de0648873f241b748bfaf Mon Sep 17 00:00:00 2001 From: rzadp Date: Fri, 24 May 2019 11:30:51 +0200 Subject: [PATCH 13/13] Removed redundant DEPLOYMENT_GAS_LIMIT env variable --- oracle-e2e/envs/contracts-deploy.env | 1 - oracle-e2e/envs/erc-contracts-deploy.env | 1 - oracle-e2e/envs/erc-native-contracts-deploy.env | 1 - ui-e2e/envs/contracts.env | 1 - ui-e2e/envs/erc-contracts.env | 1 - ui-e2e/envs/erc-native-contracts.env | 1 - 6 files changed, 6 deletions(-) diff --git a/oracle-e2e/envs/contracts-deploy.env b/oracle-e2e/envs/contracts-deploy.env index 1b76652a..7a873b0c 100644 --- a/oracle-e2e/envs/contracts-deploy.env +++ b/oracle-e2e/envs/contracts-deploy.env @@ -1,6 +1,5 @@ BRIDGE_MODE=NATIVE_TO_ERC DEPLOYMENT_ACCOUNT_PRIVATE_KEY=8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9 -DEPLOYMENT_GAS_LIMIT=4600000 HOME_DEPLOYMENT_GAS_PRICE=10000000000 FOREIGN_DEPLOYMENT_GAS_PRICE=10000000000 GET_RECEIPT_INTERVAL_IN_MILLISECONDS=50 diff --git a/oracle-e2e/envs/erc-contracts-deploy.env b/oracle-e2e/envs/erc-contracts-deploy.env index 7d436170..f1f4daa8 100644 --- a/oracle-e2e/envs/erc-contracts-deploy.env +++ b/oracle-e2e/envs/erc-contracts-deploy.env @@ -1,6 +1,5 @@ BRIDGE_MODE=ERC_TO_ERC DEPLOYMENT_ACCOUNT_PRIVATE_KEY=8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9 -DEPLOYMENT_GAS_LIMIT=4600000 HOME_DEPLOYMENT_GAS_PRICE=10000000000 FOREIGN_DEPLOYMENT_GAS_PRICE=10000000000 GET_RECEIPT_INTERVAL_IN_MILLISECONDS=50 diff --git a/oracle-e2e/envs/erc-native-contracts-deploy.env b/oracle-e2e/envs/erc-native-contracts-deploy.env index 28ba0f65..7797aa85 100644 --- a/oracle-e2e/envs/erc-native-contracts-deploy.env +++ b/oracle-e2e/envs/erc-native-contracts-deploy.env @@ -1,6 +1,5 @@ BRIDGE_MODE=ERC_TO_NATIVE DEPLOYMENT_ACCOUNT_PRIVATE_KEY=8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9 -DEPLOYMENT_GAS_LIMIT=4600000 HOME_DEPLOYMENT_GAS_PRICE=10000000000 FOREIGN_DEPLOYMENT_GAS_PRICE=10000000000 GET_RECEIPT_INTERVAL_IN_MILLISECONDS=50 diff --git a/ui-e2e/envs/contracts.env b/ui-e2e/envs/contracts.env index ea387a34..7e16f2c7 100644 --- a/ui-e2e/envs/contracts.env +++ b/ui-e2e/envs/contracts.env @@ -1,7 +1,6 @@ BRIDGE_MODE=NATIVE_TO_ERC DEPLOYMENT_ACCOUNT_ADDRESS=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b DEPLOYMENT_ACCOUNT_PRIVATE_KEY=8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9 -DEPLOYMENT_GAS_LIMIT=4600000 HOME_DEPLOYMENT_GAS_PRICE=10000000000 FOREIGN_DEPLOYMENT_GAS_PRICE=10000000000 GET_RECEIPT_INTERVAL_IN_MILLISECONDS=50 diff --git a/ui-e2e/envs/erc-contracts.env b/ui-e2e/envs/erc-contracts.env index dc38c890..ce2211da 100644 --- a/ui-e2e/envs/erc-contracts.env +++ b/ui-e2e/envs/erc-contracts.env @@ -1,7 +1,6 @@ BRIDGE_MODE=ERC_TO_ERC DEPLOYMENT_ACCOUNT_ADDRESS=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b DEPLOYMENT_ACCOUNT_PRIVATE_KEY=8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9 -DEPLOYMENT_GAS_LIMIT=4600000 HOME_DEPLOYMENT_GAS_PRICE=10000000000 FOREIGN_DEPLOYMENT_GAS_PRICE=10000000000 GET_RECEIPT_INTERVAL_IN_MILLISECONDS=50 diff --git a/ui-e2e/envs/erc-native-contracts.env b/ui-e2e/envs/erc-native-contracts.env index 28ba0f65..7797aa85 100644 --- a/ui-e2e/envs/erc-native-contracts.env +++ b/ui-e2e/envs/erc-native-contracts.env @@ -1,6 +1,5 @@ BRIDGE_MODE=ERC_TO_NATIVE DEPLOYMENT_ACCOUNT_PRIVATE_KEY=8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9 -DEPLOYMENT_GAS_LIMIT=4600000 HOME_DEPLOYMENT_GAS_PRICE=10000000000 FOREIGN_DEPLOYMENT_GAS_PRICE=10000000000 GET_RECEIPT_INTERVAL_IN_MILLISECONDS=50