tornadocontrib/tokenbridge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Using main contracts submodule in oracle-e2e.

Browse Source
This commit is contained in:
rzadp 2019-05-21 10:33:31 +02:00
parent 3446f805db
commit 16423bdedc
6 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
oracle-e2e/envs/erc-contracts-deploy.env
View File

@ -32,3 +32,10 @@ ERC20_TOKEN_ADDRESS=0x3C665A31199694Bf723fD08844AD290207B5797f
REQUIRED_NUMBER_OF_VALIDATORS=1
VALIDATORS="0xaaB52d66283F7A1D5978bcFcB55721ACB467384b"
HOME_REWARDABLE=false
FOREIGN_REWARDABLE=false
DEPLOYMENT_GAS_LIMIT_EXTRA=0.2
DEPLOY_REWARDABLE_TOKEN=false
BLOCK_REWARD_ADDRESS=0x0000000000000000000000000000000000000000
VALIDATORS_REWARD_ACCOUNTS=

7
oracle-e2e/envs/erc-native-contracts-deploy.env
View File

@ -34,3 +34,10 @@ ERC20_TOKEN_ADDRESS=0x3C665A31199694Bf723fD08844AD290207B5797f
REQUIRED_NUMBER_OF_VALIDATORS=1
VALIDATORS="0xaaB52d66283F7A1D5978bcFcB55721ACB467384b"
HOME_REWARDABLE=false
FOREIGN_REWARDABLE=false
DEPLOYMENT_GAS_LIMIT_EXTRA=0.2
DEPLOY_REWARDABLE_TOKEN=false
BLOCK_REWARD_ADDRESS=0x0000000000000000000000000000000000000000
VALIDATORS_REWARD_ACCOUNTS=

8
oracle-e2e/scripts/deployERC20.js
View File

@ -1,19 +1,19 @@
/* eslint import/no-unresolved: 0 node/no-missing-require: 0 */
const path = require('path')
require('dotenv').config({
path: path.join(__dirname, '../submodules/poa-bridge-contracts/deploy/.env')
path: path.join(__dirname, '../../contracts/deploy/.env')
})
const {
deployContract,
sendRawTx,
privateKeyToAddress
} = require('../submodules/poa-bridge-contracts/deploy/src/deploymentUtils')
} = require('../../contracts/deploy/src/deploymentUtils')
const {
web3Foreign,
deploymentPrivateKey
} = require('../submodules/poa-bridge-contracts/deploy/src/web3')
const POA20 = require('../submodules/poa-bridge-contracts/build/contracts/ERC677BridgeToken.json')
} = require('../../contracts/deploy/src/web3')
const POA20 = require('../../contracts/build/contracts/ERC677BridgeToken.json')
const { user } = require('../constants.json')
const { DEPLOYMENT_ACCOUNT_PRIVATE_KEY } = process.env

2
oracle-e2e/test/ercToErc.js
View File

@ -5,7 +5,7 @@ const promiseRetry = require('promise-retry')
const { user } = require('../constants.json')
const { generateNewBlock } = require('../utils/utils')
const abisDir = path.join(__dirname, '..', 'submodules/poa-bridge-contracts/build/contracts')
const abisDir = path.join(__dirname, '..', '../contracts/build/contracts')
const homeWeb3 = new Web3(new Web3.providers.HttpProvider('http://parity1:8545'))
const foreignWeb3 = new Web3(new Web3.providers.HttpProvider('http://parity2:8545'))

2
oracle-e2e/test/ercToNative.js
View File

@ -5,7 +5,7 @@ const promiseRetry = require('promise-retry')
const { user } = require('../constants.json')
const { generateNewBlock } = require('../utils/utils')
const abisDir = path.join(__dirname, '..', 'submodules/poa-bridge-contracts/build/contracts')
const abisDir = path.join(__dirname, '..', '../contracts/build/contracts')
const homeWeb3 = new Web3(new Web3.providers.HttpProvider('http://parity1:8545'))
const foreignWeb3 = new Web3(new Web3.providers.HttpProvider('http://parity2:8545'))

2
oracle-e2e/test/nativeToErc.js
View File

@ -5,7 +5,7 @@ const promiseRetry = require('promise-retry')
const { user, validator, temp } = require('../constants.json')
const { generateNewBlock } = require('../utils/utils')
const abisDir = path.join(__dirname, '..', 'submodules/poa-bridge-contracts/build/contracts')
const abisDir = path.join(__dirname, '..', '../contracts/build/contracts')
const homeWeb3 = new Web3(new Web3.providers.HttpProvider('http://parity1:8545'))
const foreignWeb3 = new Web3(new Web3.providers.HttpProvider('http://parity2:8545'))