Merge pull request #220 from poanetwork/update-contract-submodule

Update contract submodule
omni · May 24, 2019 · 0342e0a · 0342e0a
2 parents a6e8c72 + 0ca3248
commit 0342e0a
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 25 deletions.
diff --git a/e2e-script/contracts/Dockerfile b/e2e-script/contracts/Dockerfile
@@ -9,7 +9,7 @@ RUN mkdir submodules && \
   mv poa-bridge-contracts submodules && \
   cd submodules/poa-bridge-contracts && \
   git fetch && \
-  git checkout 2.1.0
+  git checkout 2.3.2
 
 RUN cd submodules/poa-bridge-contracts && \
   npm install && \

diff --git a/e2e-script/contracts/contracts.env b/e2e-script/contracts/contracts.env
@@ -1,7 +1,7 @@
 BRIDGE_MODE=NATIVE_TO_ERC
 DEPLOYMENT_ACCOUNT_ADDRESS=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
 DEPLOYMENT_ACCOUNT_PRIVATE_KEY=8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9
-DEPLOYMENT_GAS_LIMIT=4000000
+DEPLOYMENT_GAS_LIMIT_EXTRA=0.2
 HOME_DEPLOYMENT_GAS_PRICE=10000000000
 FOREIGN_DEPLOYMENT_GAS_PRICE=10000000000
 GET_RECEIPT_INTERVAL_IN_MILLISECONDS=50
@@ -11,24 +11,30 @@ BRIDGEABLE_TOKEN_SYMBOL="TEST"
 BRIDGEABLE_TOKEN_DECIMALS="18"
 
 HOME_RPC_URL=http://parity1:8545
-HOME_OWNER_MULTISIG=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
-HOME_UPGRADEABLE_ADMIN_VALIDATORS=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
-HOME_UPGRADEABLE_ADMIN_BRIDGE=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
+HOME_BRIDGE_OWNER=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
+HOME_VALIDATORS_OWNER=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
+HOME_UPGRADEABLE_ADMIN=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
 HOME_DAILY_LIMIT=30000000000000000000000000
 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_OWNER_MULTISIG=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
-FOREIGN_UPGRADEABLE_ADMIN_VALIDATORS=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
-FOREIGN_UPGRADEABLE_ADMIN_BRIDGE=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
+FOREIGN_BRIDGE_OWNER=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
+FOREIGN_VALIDATORS_OWNER=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
+FOREIGN_UPGRADEABLE_ADMIN=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
 FOREIGN_DAILY_LIMIT=15000000000000000000000000
 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
+
+DEPLOY_REWARDABLE_TOKEN=false
+BLOCK_REWARD_ADDRESS=0x0000000000000000000000000000000000000000
diff --git a/e2e-script/contracts/deployERC20.js b/e2e-script/contracts/deployERC20.js
@@ -3,7 +3,7 @@ const path = require('path')
 require('dotenv').config();
 const {
   deployContract,
-  sendRawTx
+  sendRawTxForeign
 } = require('./src/deploymentUtils')
 const {
   web3Foreign,
@@ -29,7 +29,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,

diff --git a/e2e-script/contracts/erc-contracts.env b/e2e-script/contracts/erc-contracts.env
@@ -1,7 +1,7 @@
 BRIDGE_MODE=ERC_TO_ERC
 DEPLOYMENT_ACCOUNT_ADDRESS=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
 DEPLOYMENT_ACCOUNT_PRIVATE_KEY=8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9
-DEPLOYMENT_GAS_LIMIT=4000000
+DEPLOYMENT_GAS_LIMIT_EXTRA=0.2
 HOME_DEPLOYMENT_GAS_PRICE=10000000000
 FOREIGN_DEPLOYMENT_GAS_PRICE=10000000000
 GET_RECEIPT_INTERVAL_IN_MILLISECONDS=50
@@ -11,25 +11,33 @@ BRIDGEABLE_TOKEN_SYMBOL="TEST"
 BRIDGEABLE_TOKEN_DECIMALS="18"
 
 HOME_RPC_URL=http://parity1:8545
-HOME_OWNER_MULTISIG=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
-HOME_UPGRADEABLE_ADMIN_VALIDATORS=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
-HOME_UPGRADEABLE_ADMIN_BRIDGE=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
+HOME_BRIDGE_OWNER=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
+HOME_VALIDATORS_OWNER=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
+HOME_UPGRADEABLE_ADMIN=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
 HOME_DAILY_LIMIT=30000000000000000000000000
 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_OWNER_MULTISIG=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
-FOREIGN_UPGRADEABLE_ADMIN_VALIDATORS=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
-FOREIGN_UPGRADEABLE_ADMIN_BRIDGE=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
+FOREIGN_BRIDGE_OWNER=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
+FOREIGN_VALIDATORS_OWNER=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
+FOREIGN_UPGRADEABLE_ADMIN=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
 FOREIGN_DAILY_LIMIT=15000000000000000000000000
 FOREIGN_MAX_AMOUNT_PER_TX=750000000000000000000000
 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
+
+DEPLOY_REWARDABLE_TOKEN=false
+BLOCK_REWARD_ADDRESS=0x0000000000000000000000000000000000000000
+DPOS_STAKING_ADDRESS=0x0000000000000000000000000000000000000000
+ERC20_EXTENDED_BY_ERC677=false
diff --git a/e2e-script/contracts/erc-native-contracts.env b/e2e-script/contracts/erc-native-contracts.env
@@ -1,6 +1,6 @@
 BRIDGE_MODE=ERC_TO_NATIVE
 DEPLOYMENT_ACCOUNT_PRIVATE_KEY=8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9
-DEPLOYMENT_GAS_LIMIT=4000000
+DEPLOYMENT_GAS_LIMIT_EXTRA=0.2
 HOME_DEPLOYMENT_GAS_PRICE=10000000000
 FOREIGN_DEPLOYMENT_GAS_PRICE=10000000000
 GET_RECEIPT_INTERVAL_IN_MILLISECONDS=50
@@ -10,19 +10,20 @@ BRIDGEABLE_TOKEN_SYMBOL="TEST"
 BRIDGEABLE_TOKEN_DECIMALS="18"
 
 HOME_RPC_URL=http://parity1:8545
-HOME_OWNER_MULTISIG=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
-HOME_UPGRADEABLE_ADMIN_VALIDATORS=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
-HOME_UPGRADEABLE_ADMIN_BRIDGE=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
+HOME_BRIDGE_OWNER=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
+HOME_VALIDATORS_OWNER=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
+HOME_UPGRADEABLE_ADMIN=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
 HOME_DAILY_LIMIT=30000000000000000000000000
 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_OWNER_MULTISIG=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
-FOREIGN_UPGRADEABLE_ADMIN_VALIDATORS=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
-FOREIGN_UPGRADEABLE_ADMIN_BRIDGE=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
+FOREIGN_BRIDGE_OWNER=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
+FOREIGN_VALIDATORS_OWNER=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
+FOREIGN_UPGRADEABLE_ADMIN=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
 FOREIGN_DAILY_LIMIT=15000000000000000000000000
 FOREIGN_MAX_AMOUNT_PER_TX=750000000000000000000000
 FOREIGN_MIN_AMOUNT_PER_TX=10000000000000000
@@ -31,6 +32,10 @@ FOREIGN_GAS_PRICE=10000000000
 
 BLOCK_REWARD_ADDRESS=0xF9698Eb93702dfdd0e2d802088d4c21822a8A977
 ERC20_TOKEN_ADDRESS=0x3C665A31199694Bf723fD08844AD290207B5797f
+FOREIGN_REWARDABLE=false
 
 REQUIRED_NUMBER_OF_VALIDATORS=1
 VALIDATORS="0xaaB52d66283F7A1D5978bcFcB55721ACB467384b"
+VALIDATORS_REWARD_ACCOUNTS=0x0000000000000000000000000000000000000000
+
+DEPLOY_REWARDABLE_TOKEN=false
diff --git a/submodules/poa-bridge-contracts b/submodules/poa-bridge-contracts