Added contracts-2.2.0 for use in oracle-e2e
This commit is contained in:
parent
16423bdedc
commit
da6957a45e
3
.gitmodules
vendored
3
.gitmodules
vendored
@ -7,3 +7,6 @@
|
||||
[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
|
||||
|
@ -15,5 +15,6 @@ RUN yarn install
|
||||
COPY . .
|
||||
|
||||
RUN yarn workspace poa-parity-bridge-contracts run compile
|
||||
RUN cd contracts-2.2.0 && npm install && npm run compile:contracts && cd deploy && rm -f package-lock.json && npm install
|
||||
RUN yarn workspace ui run compile:contracts
|
||||
RUN cd contracts/deploy && rm -f package-lock.json && npm install
|
||||
|
1
contracts-2.2.0
Submodule
1
contracts-2.2.0
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 46151629adb3dd20e6fb47d4ba91b88c6d388c4f
|
@ -2,7 +2,7 @@ const path = require('path')
|
||||
const shell = require('shelljs')
|
||||
|
||||
const envsDir = path.join(__dirname, 'envs')
|
||||
const deployContractsDir = path.join(__dirname, '../contracts/deploy')
|
||||
const deployContractsDir = path.join(__dirname, '../contracts-2.2.0/deploy')
|
||||
const erc20ScriptDir = path.join(__dirname, 'scripts')
|
||||
|
||||
shell.cp(path.join(envsDir, 'contracts-deploy.env'), path.join(deployContractsDir, '.env'))
|
||||
|
@ -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, '../../contracts/deploy/.env')
|
||||
path: path.join(__dirname, '../../contracts-2.2.0/deploy/.env')
|
||||
})
|
||||
|
||||
const {
|
||||
deployContract,
|
||||
sendRawTx,
|
||||
privateKeyToAddress
|
||||
} = require('../../contracts/deploy/src/deploymentUtils')
|
||||
} = require('../../contracts-2.2.0/deploy/src/deploymentUtils')
|
||||
const {
|
||||
web3Foreign,
|
||||
deploymentPrivateKey
|
||||
} = require('../../contracts/deploy/src/web3')
|
||||
const POA20 = require('../../contracts/build/contracts/ERC677BridgeToken.json')
|
||||
} = require('../../contracts-2.2.0/deploy/src/web3')
|
||||
const POA20 = require('../../contracts-2.2.0/build/contracts/ERC677BridgeToken.json')
|
||||
const { user } = require('../constants.json')
|
||||
|
||||
const { DEPLOYMENT_ACCOUNT_PRIVATE_KEY } = process.env
|
||||
|
@ -5,7 +5,7 @@ const promiseRetry = require('promise-retry')
|
||||
const { user } = require('../constants.json')
|
||||
const { generateNewBlock } = require('../utils/utils')
|
||||
|
||||
const abisDir = path.join(__dirname, '..', '../contracts/build/contracts')
|
||||
const abisDir = path.join(__dirname, '..', '../contracts-2.2.0/build/contracts')
|
||||
|
||||
const homeWeb3 = new Web3(new Web3.providers.HttpProvider('http://parity1:8545'))
|
||||
const foreignWeb3 = new Web3(new Web3.providers.HttpProvider('http://parity2:8545'))
|
||||
|
@ -5,7 +5,7 @@ const promiseRetry = require('promise-retry')
|
||||
const { user } = require('../constants.json')
|
||||
const { generateNewBlock } = require('../utils/utils')
|
||||
|
||||
const abisDir = path.join(__dirname, '..', '../contracts/build/contracts')
|
||||
const abisDir = path.join(__dirname, '..', '../contracts-2.2.0/build/contracts')
|
||||
|
||||
const homeWeb3 = new Web3(new Web3.providers.HttpProvider('http://parity1:8545'))
|
||||
const foreignWeb3 = new Web3(new Web3.providers.HttpProvider('http://parity2:8545'))
|
||||
|
@ -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, '..', '../contracts/build/contracts')
|
||||
const abisDir = path.join(__dirname, '..', '../contracts-2.2.0/build/contracts')
|
||||
|
||||
const homeWeb3 = new Web3(new Web3.providers.HttpProvider('http://parity1:8545'))
|
||||
const foreignWeb3 = new Web3(new Web3.providers.HttpProvider('http://parity2:8545'))
|
||||
|
Loading…
Reference in New Issue
Block a user