Update e2e contracts addresses

omni · Oct 10, 2018 · ec3aaf6 · ec3aaf6
1 parent 451da02
commit ec3aaf6
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 45 deletions.
diff --git a/e2e/docker-compose.yml b/e2e/docker-compose.yml
@@ -29,8 +29,14 @@ services:
       - VALIDATOR_ADDRESS=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
       - VALIDATOR_ADDRESS_PRIVATE_KEY=8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9
       - REDIS_LOCK_TTL=1000
-      - GAS_PRICE_SPEED_TYPE=standard
-      - GAS_PRICE_FALLBACK=1
+      - HOME_GAS_PRICE_ORACLE_URL=https://gasprice.poa.network/
+      - HOME_GAS_PRICE_SPEED_TYPE=standard
+      - HOME_GAS_PRICE_FALLBACK=1000000000
+      - HOME_GAS_PRICE_UPDATE_INTERVAL=600000
+      - FOREIGN_GAS_PRICE_ORACLE_URL=https://gasprice.poa.network/
+      - FOREIGN_GAS_PRICE_SPEED_TYPE=standard
+      - FOREIGN_GAS_PRICE_FALLBACK=10000000000
+      - FOREIGN_GAS_PRICE_UPDATE_INTERVAL=600000
       - HOME_POLLING_INTERVAL=500
       - FOREIGN_POLLING_INTERVAL=500
       - ALLOW_HTTP=yes
@@ -45,52 +51,51 @@ services:
       - HOME_RPC_URL=http://parity1:8545
       - FOREIGN_RPC_URL=http://parity2:8545
       - HOME_BRIDGE_ADDRESS=0x1feB40aD9420b186F019A717c37f5546165d411E
-      - FOREIGN_BRIDGE_ADDRESS=0xD0B9745831dDA9cbb47D0dEa904972cDcecc52e8
-      - ERC20_TOKEN_ADDRESS=0x7777D2BF48993088dC1ceD832863b80427Ff5Ec9
+      - FOREIGN_BRIDGE_ADDRESS=0x4a58D6d8D416a5fBCAcf3dC52eb8bE8948E25127
+      - ERC20_TOKEN_ADDRESS=0x3C665A31199694Bf723fD08844AD290207B5797f
       - BRIDGEABLE_TOKEN_ADDRESS=0x792455a6bCb62Ed4C4362D323E0590654CA4765c
       - VALIDATOR_ADDRESS=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
       - VALIDATOR_ADDRESS_PRIVATE_KEY=8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9
       - REDIS_LOCK_TTL=1000
-      - GAS_PRICE_SPEED_TYPE=standard
-      - GAS_PRICE_FALLBACK=1
+      - HOME_GAS_PRICE_ORACLE_URL=https://gasprice.poa.network/
+      - HOME_GAS_PRICE_SPEED_TYPE=standard
+      - HOME_GAS_PRICE_FALLBACK=1000000000
+      - HOME_GAS_PRICE_UPDATE_INTERVAL=600000
+      - FOREIGN_GAS_PRICE_ORACLE_URL=https://gasprice.poa.network/
+      - FOREIGN_GAS_PRICE_SPEED_TYPE=standard
+      - FOREIGN_GAS_PRICE_FALLBACK=10000000000
+      - FOREIGN_GAS_PRICE_UPDATE_INTERVAL=600000
       - HOME_POLLING_INTERVAL=500
       - FOREIGN_POLLING_INTERVAL=500
       - ALLOW_HTTP=yes
-      - NUMBER_OF_WITHDRAWALS_TO_SEND=3
-      - NUMBER_OF_DEPOSITS_TO_SEND=3
-      - USER_ADDRESS=0xbb140FbA6242a1c3887A7823F7750a73101383e3
-      - USER_ADDRESS_PRIVATE_KEY=63e48a8ba0b99e0377c6b483af4a072cbca5ffbcfdac77be72e69f4960125800
-      - HOME_MIN_AMOUNT_PER_TX=0.01
-      - FOREIGN_MIN_AMOUNT_PER_TX=0.01
     command: "true"
   bridge-erc-native:
     build: ..
     environment:
-    - NODE_ENV=production
-    - BRIDGE_MODE=ERC_TO_NATIVE
-    - QUEUE_URL=amqp://rabbit
-    - REDIS_URL=redis://redis
-    - HOME_RPC_URL=http://parity1:8545
-    - FOREIGN_RPC_URL=http://parity2:8545
-    - HOME_BRIDGE_ADDRESS=0x5A42E119990c3F3A80Fea20aAF4c3Ff4DB240Cc9
-    - FOREIGN_BRIDGE_ADDRESS=0x5A42E119990c3F3A80Fea20aAF4c3Ff4DB240Cc9
-    - BLOCK_REWARD_ADDRESS=0xb008E9076fCbDB2C3AF84225Bc07Eb35B2bE5ECD
-    - ERC20_TOKEN_ADDRESS=0x7777D2BF48993088dC1ceD832863b80427Ff5Ec9
-    - BRIDGEABLE_TOKEN_ADDRESS=0x792455a6bCb62Ed4C4362D323E0590654CA4765c
-    - VALIDATOR_ADDRESS=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
-    - VALIDATOR_ADDRESS_PRIVATE_KEY=8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9
-    - REDIS_LOCK_TTL=1000
-    - GAS_PRICE_SPEED_TYPE=standard
-    - GAS_PRICE_FALLBACK=1
-    - HOME_POLLING_INTERVAL=500
-    - FOREIGN_POLLING_INTERVAL=500
-    - ALLOW_HTTP=yes
-    - NUMBER_OF_WITHDRAWALS_TO_SEND=3
-    - NUMBER_OF_DEPOSITS_TO_SEND=3
-    - USER_ADDRESS=0xbb140FbA6242a1c3887A7823F7750a73101383e3
-    - USER_ADDRESS_PRIVATE_KEY=63e48a8ba0b99e0377c6b483af4a072cbca5ffbcfdac77be72e69f4960125800
-    - HOME_MIN_AMOUNT_PER_TX=0.01
-    - FOREIGN_MIN_AMOUNT_PER_TX=0.01
+      - NODE_ENV=production
+      - BRIDGE_MODE=ERC_TO_NATIVE
+      - QUEUE_URL=amqp://rabbit
+      - REDIS_URL=redis://redis
+      - HOME_RPC_URL=http://parity1:8545
+      - FOREIGN_RPC_URL=http://parity2:8545
+      - HOME_BRIDGE_ADDRESS=0x488Af810997eD1730cB3a3918cD83b3216E6eAda
+      - FOREIGN_BRIDGE_ADDRESS=0x488Af810997eD1730cB3a3918cD83b3216E6eAda
+      - ERC20_TOKEN_ADDRESS=0x3C665A31199694Bf723fD08844AD290207B5797f
+      - BRIDGEABLE_TOKEN_ADDRESS=0x792455a6bCb62Ed4C4362D323E0590654CA4765c
+      - VALIDATOR_ADDRESS=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
+      - VALIDATOR_ADDRESS_PRIVATE_KEY=8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9
+      - REDIS_LOCK_TTL=1000
+      - HOME_GAS_PRICE_ORACLE_URL=https://gasprice.poa.network/
+      - HOME_GAS_PRICE_SPEED_TYPE=standard
+      - HOME_GAS_PRICE_FALLBACK=1000000000
+      - HOME_GAS_PRICE_UPDATE_INTERVAL=600000
+      - FOREIGN_GAS_PRICE_ORACLE_URL=https://gasprice.poa.network/
+      - FOREIGN_GAS_PRICE_SPEED_TYPE=standard
+      - FOREIGN_GAS_PRICE_FALLBACK=10000000000
+      - FOREIGN_GAS_PRICE_UPDATE_INTERVAL=600000
+      - HOME_POLLING_INTERVAL=500
+      - FOREIGN_POLLING_INTERVAL=500
+      - ALLOW_HTTP=yes
     command: "true"
   e2e:
     build: .

diff --git a/e2e/envs/erc-contracts-deploy.env b/e2e/envs/erc-contracts-deploy.env
@@ -29,7 +29,7 @@ FOREIGN_MAX_AMOUNT_PER_TX=750000000000000000000000
 FOREIGN_MIN_AMOUNT_PER_TX=10000000000000000
 FOREIGN_REQUIRED_BLOCK_CONFIRMATIONS=1
 FOREIGN_GAS_PRICE=10000000000
-ERC20_TOKEN_ADDRESS=0x7777D2BF48993088dC1ceD832863b80427Ff5Ec9
+ERC20_TOKEN_ADDRESS=0x3C665A31199694Bf723fD08844AD290207B5797f
 
 REQUIRED_NUMBER_OF_VALIDATORS=1
 VALIDATORS="0xaaB52d66283F7A1D5978bcFcB55721ACB467384b"
diff --git a/e2e/envs/erc-native-contracts-deploy.env b/e2e/envs/erc-native-contracts-deploy.env
@@ -29,8 +29,8 @@ FOREIGN_MIN_AMOUNT_PER_TX=10000000000000000
 FOREIGN_REQUIRED_BLOCK_CONFIRMATIONS=1
 FOREIGN_GAS_PRICE=10000000000
 
-BLOCK_REWARD_ADDRESS=0xb008E9076fCbDB2C3AF84225Bc07Eb35B2bE5ECD
-ERC20_TOKEN_ADDRESS=0x7777D2BF48993088dC1ceD832863b80427Ff5Ec9
+BLOCK_REWARD_ADDRESS=0xF9698Eb93702dfdd0e2d802088d4c21822a8A977
+ERC20_TOKEN_ADDRESS=0x3C665A31199694Bf723fD08844AD290207B5797f
 
 REQUIRED_NUMBER_OF_VALIDATORS=1
 VALIDATORS="0xaaB52d66283F7A1D5978bcFcB55721ACB467384b"
diff --git a/e2e/test/ercToErc.js b/e2e/test/ercToErc.js
@@ -11,7 +11,7 @@ const homeWeb3 = new Web3(new Web3.providers.HttpProvider('http://parity1:8545')
 const foreignWeb3 = new Web3(new Web3.providers.HttpProvider('http://parity2:8545'))
 
 const HOME_BRIDGE_ADDRESS = '0x1feB40aD9420b186F019A717c37f5546165d411E'
-const FOREIGN_BRIDGE_ADDRESS = '0xD0B9745831dDA9cbb47D0dEa904972cDcecc52e8'
+const FOREIGN_BRIDGE_ADDRESS = '0x4a58D6d8D416a5fBCAcf3dC52eb8bE8948E25127'
 
 const { toBN } = foreignWeb3.utils
 
@@ -21,7 +21,7 @@ foreignWeb3.eth.accounts.wallet.add(user.privateKey)
 const tokenAbi = require(path.join(abisDir, 'ERC677BridgeToken.json')).abi
 const erc20Token = new foreignWeb3.eth.Contract(
   tokenAbi,
-  '0x7777D2BF48993088dC1ceD832863b80427Ff5Ec9'
+  '0x3C665A31199694Bf723fD08844AD290207B5797f'
 )
 const erc677Token = new homeWeb3.eth.Contract(
   tokenAbi,

diff --git a/e2e/test/ercToNative.js b/e2e/test/ercToNative.js
@@ -10,8 +10,8 @@ const abisDir = path.join(__dirname, '..', 'submodules/poa-bridge-contracts/buil
 const homeWeb3 = new Web3(new Web3.providers.HttpProvider('http://parity1:8545'))
 const foreignWeb3 = new Web3(new Web3.providers.HttpProvider('http://parity2:8545'))
 
-const HOME_BRIDGE_ADDRESS = '0x5A42E119990c3F3A80Fea20aAF4c3Ff4DB240Cc9'
-const FOREIGN_BRIDGE_ADDRESS = '0x5A42E119990c3F3A80Fea20aAF4c3Ff4DB240Cc9'
+const HOME_BRIDGE_ADDRESS = '0x488Af810997eD1730cB3a3918cD83b3216E6eAda'
+const FOREIGN_BRIDGE_ADDRESS = '0x488Af810997eD1730cB3a3918cD83b3216E6eAda'
 
 const { toBN } = foreignWeb3.utils
 
@@ -21,7 +21,7 @@ foreignWeb3.eth.accounts.wallet.add(user.privateKey)
 const tokenAbi = require(path.join(abisDir, 'ERC677BridgeToken.json')).abi
 const erc20Token = new foreignWeb3.eth.Contract(
   tokenAbi,
-  '0x7777D2BF48993088dC1ceD832863b80427Ff5Ec9'
+  '0x3C665A31199694Bf723fD08844AD290207B5797f'
 )
 
 describe('erc to native', () => {