Skip to content

Commit 0342e0a

Browse files
akolotovakolotov
authored
Merge pull request #220 from poanetwork/update-contract-submodule
Update contract submodule
2 parents a6e8c72 + 0ca3248 commit 0342e0a

File tree

6 files changed

+44
-25
lines changed

6 files changed

+44
-25
lines changed

‎e2e-script/contracts/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ RUN mkdir submodules && \
99
mv poa-bridge-contracts submodules && \
1010
cd submodules/poa-bridge-contracts && \
1111
git fetch && \
12-
git checkout 2.1.0
12+
git checkout 2.3.2
1313

1414
RUN cd submodules/poa-bridge-contracts && \
1515
npm install && \

‎e2e-script/contracts/contracts.env‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
BRIDGE_MODE=NATIVE_TO_ERC
22
DEPLOYMENT_ACCOUNT_ADDRESS=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
33
DEPLOYMENT_ACCOUNT_PRIVATE_KEY=8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9
4-
DEPLOYMENT_GAS_LIMIT=4000000
4+
DEPLOYMENT_GAS_LIMIT_EXTRA=0.2
55
HOME_DEPLOYMENT_GAS_PRICE=10000000000
66
FOREIGN_DEPLOYMENT_GAS_PRICE=10000000000
77
GET_RECEIPT_INTERVAL_IN_MILLISECONDS=50
@@ -11,24 +11,30 @@ BRIDGEABLE_TOKEN_SYMBOL="TEST"
1111
BRIDGEABLE_TOKEN_DECIMALS="18"
1212

1313
HOME_RPC_URL=http://parity1:8545
14-
HOME_OWNER_MULTISIG=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
15-
HOME_UPGRADEABLE_ADMIN_VALIDATORS=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
16-
HOME_UPGRADEABLE_ADMIN_BRIDGE=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
14+
HOME_BRIDGE_OWNER=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
15+
HOME_VALIDATORS_OWNER=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
16+
HOME_UPGRADEABLE_ADMIN=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
1717
HOME_DAILY_LIMIT=30000000000000000000000000
1818
HOME_MAX_AMOUNT_PER_TX=1500000000000000000000000
1919
HOME_MIN_AMOUNT_PER_TX=10000000000000000
2020
HOME_REQUIRED_BLOCK_CONFIRMATIONS=1
2121
HOME_GAS_PRICE=1000000000
22+
HOME_REWARDABLE=false
2223

2324
FOREIGN_RPC_URL=http://parity2:8545
24-
FOREIGN_OWNER_MULTISIG=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
25-
FOREIGN_UPGRADEABLE_ADMIN_VALIDATORS=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
26-
FOREIGN_UPGRADEABLE_ADMIN_BRIDGE=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
25+
FOREIGN_BRIDGE_OWNER=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
26+
FOREIGN_VALIDATORS_OWNER=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
27+
FOREIGN_UPGRADEABLE_ADMIN=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
2728
FOREIGN_DAILY_LIMIT=15000000000000000000000000
2829
FOREIGN_MAX_AMOUNT_PER_TX=750000000000000000000000
2930
FOREIGN_MIN_AMOUNT_PER_TX=10000000000000000
3031
FOREIGN_REQUIRED_BLOCK_CONFIRMATIONS=1
3132
FOREIGN_GAS_PRICE=10000000000
33+
FOREIGN_REWARDABLE=false
3234

3335
REQUIRED_NUMBER_OF_VALIDATORS=1
3436
VALIDATORS="0xaaB52d66283F7A1D5978bcFcB55721ACB467384b"
37+
VALIDATORS_REWARD_ACCOUNTS=0x0000000000000000000000000000000000000000
38+
39+
DEPLOY_REWARDABLE_TOKEN=false
40+
BLOCK_REWARD_ADDRESS=0x0000000000000000000000000000000000000000

‎e2e-script/contracts/deployERC20.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const path = require('path')
33
require('dotenv').config();
44
const {
55
deployContract,
6-
sendRawTx
6+
sendRawTxForeign
77
} = require('./src/deploymentUtils')
88
const {
99
web3Foreign,
@@ -29,7 +29,7 @@ async function deployErc20() {
2929
const mintData = await poa20foreign.methods
3030
.mint(user, '500000000000000000000')
3131
.encodeABI({ from: DEPLOYMENT_ACCOUNT_ADDRESS })
32-
await sendRawTx({
32+
await sendRawTxForeign({
3333
data: mintData,
3434
nonce: foreignNonce,
3535
to: poa20foreign.options.address,

‎e2e-script/contracts/erc-contracts.env‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
BRIDGE_MODE=ERC_TO_ERC
22
DEPLOYMENT_ACCOUNT_ADDRESS=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
33
DEPLOYMENT_ACCOUNT_PRIVATE_KEY=8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9
4-
DEPLOYMENT_GAS_LIMIT=4000000
4+
DEPLOYMENT_GAS_LIMIT_EXTRA=0.2
55
HOME_DEPLOYMENT_GAS_PRICE=10000000000
66
FOREIGN_DEPLOYMENT_GAS_PRICE=10000000000
77
GET_RECEIPT_INTERVAL_IN_MILLISECONDS=50
@@ -11,25 +11,33 @@ BRIDGEABLE_TOKEN_SYMBOL="TEST"
1111
BRIDGEABLE_TOKEN_DECIMALS="18"
1212

1313
HOME_RPC_URL=http://parity1:8545
14-
HOME_OWNER_MULTISIG=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
15-
HOME_UPGRADEABLE_ADMIN_VALIDATORS=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
16-
HOME_UPGRADEABLE_ADMIN_BRIDGE=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
14+
HOME_BRIDGE_OWNER=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
15+
HOME_VALIDATORS_OWNER=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
16+
HOME_UPGRADEABLE_ADMIN=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
1717
HOME_DAILY_LIMIT=30000000000000000000000000
1818
HOME_MAX_AMOUNT_PER_TX=1500000000000000000000000
1919
HOME_MIN_AMOUNT_PER_TX=10000000000000000
2020
HOME_REQUIRED_BLOCK_CONFIRMATIONS=1
2121
HOME_GAS_PRICE=1000000000
22+
HOME_REWARDABLE=false
2223

2324
FOREIGN_RPC_URL=http://parity2:8545
24-
FOREIGN_OWNER_MULTISIG=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
25-
FOREIGN_UPGRADEABLE_ADMIN_VALIDATORS=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
26-
FOREIGN_UPGRADEABLE_ADMIN_BRIDGE=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
25+
FOREIGN_BRIDGE_OWNER=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
26+
FOREIGN_VALIDATORS_OWNER=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
27+
FOREIGN_UPGRADEABLE_ADMIN=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
2728
FOREIGN_DAILY_LIMIT=15000000000000000000000000
2829
FOREIGN_MAX_AMOUNT_PER_TX=750000000000000000000000
2930
FOREIGN_MIN_AMOUNT_PER_TX=10000000000000000
3031
FOREIGN_REQUIRED_BLOCK_CONFIRMATIONS=1
3132
FOREIGN_GAS_PRICE=10000000000
3233
ERC20_TOKEN_ADDRESS=0x3C665A31199694Bf723fD08844AD290207B5797f
34+
FOREIGN_REWARDABLE=false
3335

3436
REQUIRED_NUMBER_OF_VALIDATORS=1
3537
VALIDATORS="0xaaB52d66283F7A1D5978bcFcB55721ACB467384b"
38+
VALIDATORS_REWARD_ACCOUNTS=0x0000000000000000000000000000000000000000
39+
40+
DEPLOY_REWARDABLE_TOKEN=false
41+
BLOCK_REWARD_ADDRESS=0x0000000000000000000000000000000000000000
42+
DPOS_STAKING_ADDRESS=0x0000000000000000000000000000000000000000
43+
ERC20_EXTENDED_BY_ERC677=false

‎e2e-script/contracts/erc-native-contracts.env‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
BRIDGE_MODE=ERC_TO_NATIVE
22
DEPLOYMENT_ACCOUNT_PRIVATE_KEY=8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9
3-
DEPLOYMENT_GAS_LIMIT=4000000
3+
DEPLOYMENT_GAS_LIMIT_EXTRA=0.2
44
HOME_DEPLOYMENT_GAS_PRICE=10000000000
55
FOREIGN_DEPLOYMENT_GAS_PRICE=10000000000
66
GET_RECEIPT_INTERVAL_IN_MILLISECONDS=50
@@ -10,19 +10,20 @@ BRIDGEABLE_TOKEN_SYMBOL="TEST"
1010
BRIDGEABLE_TOKEN_DECIMALS="18"
1111

1212
HOME_RPC_URL=http://parity1:8545
13-
HOME_OWNER_MULTISIG=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
14-
HOME_UPGRADEABLE_ADMIN_VALIDATORS=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
15-
HOME_UPGRADEABLE_ADMIN_BRIDGE=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
13+
HOME_BRIDGE_OWNER=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
14+
HOME_VALIDATORS_OWNER=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
15+
HOME_UPGRADEABLE_ADMIN=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
1616
HOME_DAILY_LIMIT=30000000000000000000000000
1717
HOME_MAX_AMOUNT_PER_TX=1500000000000000000000000
1818
HOME_MIN_AMOUNT_PER_TX=10000000000000000
1919
HOME_REQUIRED_BLOCK_CONFIRMATIONS=1
2020
HOME_GAS_PRICE=1000000000
21+
HOME_REWARDABLE=false
2122

2223
FOREIGN_RPC_URL=http://parity2:8545
23-
FOREIGN_OWNER_MULTISIG=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
24-
FOREIGN_UPGRADEABLE_ADMIN_VALIDATORS=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
25-
FOREIGN_UPGRADEABLE_ADMIN_BRIDGE=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
24+
FOREIGN_BRIDGE_OWNER=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
25+
FOREIGN_VALIDATORS_OWNER=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
26+
FOREIGN_UPGRADEABLE_ADMIN=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
2627
FOREIGN_DAILY_LIMIT=15000000000000000000000000
2728
FOREIGN_MAX_AMOUNT_PER_TX=750000000000000000000000
2829
FOREIGN_MIN_AMOUNT_PER_TX=10000000000000000
@@ -31,6 +32,10 @@ FOREIGN_GAS_PRICE=10000000000
3132

3233
BLOCK_REWARD_ADDRESS=0xF9698Eb93702dfdd0e2d802088d4c21822a8A977
3334
ERC20_TOKEN_ADDRESS=0x3C665A31199694Bf723fD08844AD290207B5797f
35+
FOREIGN_REWARDABLE=false
3436

3537
REQUIRED_NUMBER_OF_VALIDATORS=1
3638
VALIDATORS="0xaaB52d66283F7A1D5978bcFcB55721ACB467384b"
39+
VALIDATORS_REWARD_ACCOUNTS=0x0000000000000000000000000000000000000000
40+
41+
DEPLOY_REWARDABLE_TOKEN=false

‎submodules/poa-bridge-contracts‎

0 commit comments

Comments
 (0)