Merge 461265a into de50e60

omni · Jul 1, 2020 · b291c41 · b291c41
2 parents de50e60 + 461265a
commit b291c41
Show file tree

Hide file tree

Showing 14 changed files with 43 additions and 42 deletions.
diff --git a/deploy/src/amb_erc20_to_native/initializeForeign.js b/deploy/src/amb_erc20_to_native/initializeForeign.js
@@ -62,8 +62,8 @@ async function initializeMediator({
     .initialize(
       bridgeContract,
       mediatorContract,
-      [FOREIGN_DAILY_LIMIT.toString(10), FOREIGN_MAX_AMOUNT_PER_TX.toString(10), FOREIGN_MIN_AMOUNT_PER_TX.toString(10)],
-      [HOME_DAILY_LIMIT.toString(10), HOME_MAX_AMOUNT_PER_TX.toString(10)],
+      [FOREIGN_DAILY_LIMIT.toString(), FOREIGN_MAX_AMOUNT_PER_TX.toString(), FOREIGN_MIN_AMOUNT_PER_TX.toString()],
+      [HOME_DAILY_LIMIT.toString(), HOME_MAX_AMOUNT_PER_TX.toString()],
       requestGasLimit,
       foreignToHomeDecimalShift,
       owner,

diff --git a/deploy/src/amb_erc20_to_native/initializeHome.js b/deploy/src/amb_erc20_to_native/initializeHome.js
@@ -68,8 +68,8 @@ async function initializeMediator({
     .initialize(
       bridgeContract,
       mediatorContract,
-      [HOME_DAILY_LIMIT.toString(10), HOME_MAX_AMOUNT_PER_TX.toString(10), HOME_MIN_AMOUNT_PER_TX.toString(10)],
-      [FOREIGN_DAILY_LIMIT.toString(10), FOREIGN_MAX_AMOUNT_PER_TX.toString(10)],
+      [HOME_DAILY_LIMIT.toString(), HOME_MAX_AMOUNT_PER_TX.toString(), HOME_MIN_AMOUNT_PER_TX.toString()],
+      [FOREIGN_DAILY_LIMIT.toString(), FOREIGN_MAX_AMOUNT_PER_TX.toString()],
       requestGasLimit,
       foreignToHomeDecimalShift,
       owner,
@@ -118,14 +118,14 @@ async function rewardableInitializeMediator({
     .rewardableInitialize(
       bridgeContract,
       mediatorContract,
-      [HOME_DAILY_LIMIT.toString(10), HOME_MAX_AMOUNT_PER_TX.toString(10), HOME_MIN_AMOUNT_PER_TX.toString(10)],
-      [FOREIGN_DAILY_LIMIT.toString(10), FOREIGN_MAX_AMOUNT_PER_TX.toString(10)],
+      [HOME_DAILY_LIMIT.toString(), HOME_MAX_AMOUNT_PER_TX.toString(), HOME_MIN_AMOUNT_PER_TX.toString()],
+      [FOREIGN_DAILY_LIMIT.toString(), FOREIGN_MAX_AMOUNT_PER_TX.toString()],
       requestGasLimit,
       foreignToHomeDecimalShift,
       owner,
       blockRewardContract,
       rewardAddressList,
-      [homeToForeignFee.toString(10), foreignToHomeFee.toString()]
+      [homeToForeignFee.toString(), foreignToHomeFee.toString()]
     )
     .encodeABI()
 }

diff --git a/deploy/src/amb_erc677_to_erc677/initialize.js b/deploy/src/amb_erc677_to_erc677/initialize.js
@@ -79,8 +79,8 @@ async function initialize({
       bridgeContract,
       mediatorContract,
       erc677token,
-      [dailyLimit, maxPerTx, minPerTx],
-      [executionDailyLimit, executionMaxPerTx],
+      [dailyLimit.toString(), maxPerTx.toString(), minPerTx.toString()],
+      [executionDailyLimit.toString(), executionMaxPerTx.toString()],
       requestGasLimit,
       foreignToHomeDecimalShift,
       owner

diff --git a/deploy/src/amb_native_to_erc20/initializeForeign.js b/deploy/src/amb_native_to_erc20/initializeForeign.js
@@ -63,8 +63,8 @@ async function initializeMediator({
     .initialize(
       bridgeContract,
       mediatorContract,
-      [dailyLimit, maxPerTx, minPerTx],
-      [executionDailyLimit, executionMaxPerTx],
+      [dailyLimit.toString(), maxPerTx.toString(), minPerTx.toString()],
+      [executionDailyLimit.toString(), executionMaxPerTx.toString()],
       requestGasLimit,
       foreignToHomeDecimalShift,
       owner,

diff --git a/deploy/src/amb_native_to_erc20/initializeHome.js b/deploy/src/amb_native_to_erc20/initializeHome.js
@@ -61,8 +61,8 @@ async function initializeMediator({
     .initialize(
       bridgeContract,
       mediatorContract,
-      [dailyLimit, maxPerTx, minPerTx],
-      [executionDailyLimit, executionMaxPerTx],
+      [dailyLimit.toString(), maxPerTx.toString(), minPerTx.toString()],
+      [executionDailyLimit.toString(), executionMaxPerTx.toString()],
       requestGasLimit,
       foreignToHomeDecimalShift,
       owner,

diff --git a/deploy/src/erc_to_erc/foreign.js b/deploy/src/erc_to_erc/foreign.js
@@ -64,8 +64,8 @@ async function initializeBridge({ validatorsBridge, bridge, nonce }) {
       ERC20_TOKEN_ADDRESS,
       FOREIGN_REQUIRED_BLOCK_CONFIRMATIONS,
       FOREIGN_GAS_PRICE,
-      [FOREIGN_DAILY_LIMIT, FOREIGN_MAX_AMOUNT_PER_TX, FOREIGN_MIN_AMOUNT_PER_TX],
-      [HOME_DAILY_LIMIT, HOME_MAX_AMOUNT_PER_TX],
+      [FOREIGN_DAILY_LIMIT.toString(), FOREIGN_MAX_AMOUNT_PER_TX.toString(), FOREIGN_MIN_AMOUNT_PER_TX.toString()],
+      [HOME_DAILY_LIMIT.toString(), HOME_MAX_AMOUNT_PER_TX.toString()],
       FOREIGN_BRIDGE_OWNER,
       foreignToHomeDecimalShift
     )

diff --git a/deploy/src/erc_to_erc/home.js b/deploy/src/erc_to_erc/home.js
@@ -96,14 +96,14 @@ async function initializeBridge({ validatorsBridge, bridge, erc677token, initial
     initializeHomeBridgeData = await bridge.methods
       .rewardableInitialize(
         validatorsBridge.options.address,
-        [HOME_DAILY_LIMIT, HOME_MAX_AMOUNT_PER_TX, HOME_MIN_AMOUNT_PER_TX],
+        [HOME_DAILY_LIMIT.toString(), HOME_MAX_AMOUNT_PER_TX.toString(), HOME_MIN_AMOUNT_PER_TX.toString()],
         HOME_GAS_PRICE,
         HOME_REQUIRED_BLOCK_CONFIRMATIONS,
         erc677token.options.address,
-        [FOREIGN_DAILY_LIMIT, FOREIGN_MAX_AMOUNT_PER_TX],
+        [FOREIGN_DAILY_LIMIT.toString(), FOREIGN_MAX_AMOUNT_PER_TX.toString()],
         HOME_BRIDGE_OWNER,
         feeManager.options.address,
-        [homeFeeInWei, foreignFeeInWei],
+        [homeFeeInWei.toString(), foreignFeeInWei.toString()],
         BLOCK_REWARD_ADDRESS,
         foreignToHomeDecimalShift
       )
@@ -119,11 +119,11 @@ async function initializeBridge({ validatorsBridge, bridge, erc677token, initial
     initializeHomeBridgeData = await bridge.methods
       .initialize(
         validatorsBridge.options.address,
-        [HOME_DAILY_LIMIT, HOME_MAX_AMOUNT_PER_TX, HOME_MIN_AMOUNT_PER_TX],
+        [HOME_DAILY_LIMIT.toString(), HOME_MAX_AMOUNT_PER_TX.toString(), HOME_MIN_AMOUNT_PER_TX.toString()],
         HOME_GAS_PRICE,
         HOME_REQUIRED_BLOCK_CONFIRMATIONS,
         erc677token.options.address,
-        [FOREIGN_DAILY_LIMIT, FOREIGN_MAX_AMOUNT_PER_TX],
+        [FOREIGN_DAILY_LIMIT.toString(), FOREIGN_MAX_AMOUNT_PER_TX.toString()],
         HOME_BRIDGE_OWNER,
         foreignToHomeDecimalShift
       )

diff --git a/deploy/src/erc_to_native/foreign.js b/deploy/src/erc_to_native/foreign.js
@@ -62,8 +62,8 @@ async function initializeBridge({ validatorsBridge, bridge, nonce, homeBridgeAdd
       ERC20_TOKEN_ADDRESS,
       FOREIGN_REQUIRED_BLOCK_CONFIRMATIONS,
       FOREIGN_GAS_PRICE,
-      [FOREIGN_DAILY_LIMIT, FOREIGN_MAX_AMOUNT_PER_TX, FOREIGN_MIN_AMOUNT_PER_TX],
-      [HOME_DAILY_LIMIT, HOME_MAX_AMOUNT_PER_TX],
+      [FOREIGN_DAILY_LIMIT.toString(), FOREIGN_MAX_AMOUNT_PER_TX.toString(), FOREIGN_MIN_AMOUNT_PER_TX.toString()],
+      [HOME_DAILY_LIMIT.toString(), HOME_MAX_AMOUNT_PER_TX.toString()],
       FOREIGN_BRIDGE_OWNER,
       foreignToHomeDecimalShift,
       homeBridgeAddress

diff --git a/deploy/src/erc_to_native/home.js b/deploy/src/erc_to_native/home.js
@@ -94,14 +94,14 @@ async function initializeBridge({ validatorsBridge, bridge, initialNonce }) {
     initializeHomeBridgeData = await bridge.methods
       .rewardableInitialize(
         validatorsBridge.options.address,
-        [HOME_DAILY_LIMIT, HOME_MAX_AMOUNT_PER_TX, HOME_MIN_AMOUNT_PER_TX],
+        [HOME_DAILY_LIMIT.toString(), HOME_MAX_AMOUNT_PER_TX.toString(), HOME_MIN_AMOUNT_PER_TX.toString()],
         HOME_GAS_PRICE,
         HOME_REQUIRED_BLOCK_CONFIRMATIONS,
         BLOCK_REWARD_ADDRESS,
-        [FOREIGN_DAILY_LIMIT, FOREIGN_MAX_AMOUNT_PER_TX],
+        [FOREIGN_DAILY_LIMIT.toString(), FOREIGN_MAX_AMOUNT_PER_TX.toString()],
         HOME_BRIDGE_OWNER,
         feeManager.options.address,
-        [homeFeeInWei, foreignFeeInWei],
+        [homeFeeInWei.toString(), foreignFeeInWei.toString()],
         foreignToHomeDecimalShift
       )
       .encodeABI()
@@ -123,11 +123,11 @@ async function initializeBridge({ validatorsBridge, bridge, initialNonce }) {
     initializeHomeBridgeData = await bridge.methods
       .initialize(
         validatorsBridge.options.address,
-        [HOME_DAILY_LIMIT, HOME_MAX_AMOUNT_PER_TX, HOME_MIN_AMOUNT_PER_TX],
+        [HOME_DAILY_LIMIT.toString(), HOME_MAX_AMOUNT_PER_TX.toString(), HOME_MIN_AMOUNT_PER_TX.toString()],
         HOME_GAS_PRICE,
         HOME_REQUIRED_BLOCK_CONFIRMATIONS,
         BLOCK_REWARD_ADDRESS,
-        [FOREIGN_DAILY_LIMIT, FOREIGN_MAX_AMOUNT_PER_TX],
+        [FOREIGN_DAILY_LIMIT.toString(), FOREIGN_MAX_AMOUNT_PER_TX.toString()],
         HOME_BRIDGE_OWNER,
         foreignToHomeDecimalShift
       )

diff --git a/deploy/src/loadContracts.js b/deploy/src/loadContracts.js
@@ -32,6 +32,7 @@ function getContracts(evmVersion) {
       ? require(`../../build/${buildPath}/ClassicHomeBridgeNativeToErc.json`)
       : require(`../../build/${buildPath}/HomeBridgeNativeToErc.json`),
     BlockReward: require(`../../build/${buildPath}/BlockReward.json`),
+    BlockRewardMock: require(`../../build/${buildPath}/BlockRewardMock.json`),
     HomeAMB: require(`../../build/${buildPath}/HomeAMB.json`),
     ForeignAMB: require(`../../build/${buildPath}/ForeignAMB`),
     HomeAMBErc677ToErc677: require(`../../build/${buildPath}/HomeAMBErc677ToErc677.json`),

diff --git a/deploy/src/native_to_erc/foreign.js b/deploy/src/native_to_erc/foreign.js
@@ -102,10 +102,10 @@ async function initializeBridge({ validatorsBridge, bridge, erc677bridgeToken, i
       .rewardableInitialize(
         validatorsBridge.options.address,
         erc677bridgeToken.options.address,
-        [FOREIGN_DAILY_LIMIT, FOREIGN_MAX_AMOUNT_PER_TX, FOREIGN_MIN_AMOUNT_PER_TX],
+        [FOREIGN_DAILY_LIMIT.toString(), FOREIGN_MAX_AMOUNT_PER_TX.toString(), FOREIGN_MIN_AMOUNT_PER_TX.toString()],
         FOREIGN_GAS_PRICE,
         FOREIGN_REQUIRED_BLOCK_CONFIRMATIONS,
-        [HOME_DAILY_LIMIT, HOME_MAX_AMOUNT_PER_TX],
+        [HOME_DAILY_LIMIT.toString(), HOME_MAX_AMOUNT_PER_TX.toString()],
         FOREIGN_BRIDGE_OWNER,
         feeManager.options.address,
         homeFeeInWei,
@@ -135,10 +135,10 @@ async function initializeBridge({ validatorsBridge, bridge, erc677bridgeToken, i
       .initialize(
         validatorsBridge.options.address,
         erc677bridgeToken.options.address,
-        [FOREIGN_DAILY_LIMIT, FOREIGN_MAX_AMOUNT_PER_TX, FOREIGN_MIN_AMOUNT_PER_TX],
+        [FOREIGN_DAILY_LIMIT.toString(), FOREIGN_MAX_AMOUNT_PER_TX.toString(), FOREIGN_MIN_AMOUNT_PER_TX.toString()],
         FOREIGN_GAS_PRICE,
         FOREIGN_REQUIRED_BLOCK_CONFIRMATIONS,
-        [HOME_DAILY_LIMIT, HOME_MAX_AMOUNT_PER_TX],
+        [HOME_DAILY_LIMIT.toString(), HOME_MAX_AMOUNT_PER_TX.toString()],
         FOREIGN_BRIDGE_OWNER,
         foreignToHomeDecimalShift,
         homeBridgeAddress

diff --git a/deploy/src/native_to_erc/home.js b/deploy/src/native_to_erc/home.js
@@ -94,13 +94,13 @@ async function initializeBridge({ validatorsBridge, bridge, initialNonce }) {
     initializeHomeBridgeData = await bridge.methods
       .rewardableInitialize(
         validatorsBridge.options.address,
-        [HOME_DAILY_LIMIT, HOME_MAX_AMOUNT_PER_TX, HOME_MIN_AMOUNT_PER_TX],
+        [HOME_DAILY_LIMIT.toString(), HOME_MAX_AMOUNT_PER_TX.toString(), HOME_MIN_AMOUNT_PER_TX.toString()],
         HOME_GAS_PRICE,
         HOME_REQUIRED_BLOCK_CONFIRMATIONS,
-        [FOREIGN_DAILY_LIMIT, FOREIGN_MAX_AMOUNT_PER_TX],
+        [FOREIGN_DAILY_LIMIT.toString(), FOREIGN_MAX_AMOUNT_PER_TX.toString()],
         HOME_BRIDGE_OWNER,
         feeManager.options.address,
-        [homeFeeInWei, foreignFeeInWei],
+        [homeFeeInWei.toString(), foreignFeeInWei.toString()],
         foreignToHomeDecimalShift
       )
       .encodeABI()
@@ -121,10 +121,10 @@ async function initializeBridge({ validatorsBridge, bridge, initialNonce }) {
     initializeHomeBridgeData = await bridge.methods
       .initialize(
         validatorsBridge.options.address,
-        [HOME_DAILY_LIMIT, HOME_MAX_AMOUNT_PER_TX, HOME_MIN_AMOUNT_PER_TX],
+        [HOME_DAILY_LIMIT.toString(), HOME_MAX_AMOUNT_PER_TX.toString(), HOME_MIN_AMOUNT_PER_TX.toString()],
         HOME_GAS_PRICE,
         HOME_REQUIRED_BLOCK_CONFIRMATIONS,
-        [FOREIGN_DAILY_LIMIT, FOREIGN_MAX_AMOUNT_PER_TX],
+        [FOREIGN_DAILY_LIMIT.toString(), FOREIGN_MAX_AMOUNT_PER_TX.toString()],
         HOME_BRIDGE_OWNER,
         foreignToHomeDecimalShift
       )

diff --git a/deploy/src/stake_token_mediators/initialize.js b/deploy/src/stake_token_mediators/initialize.js
@@ -69,8 +69,8 @@ async function initializeHome(homeMediator, foreignMediator) {
       HOME_AMB_BRIDGE,
       foreignMediator,
       HOME_STAKE_TOKEN_ADDRESS,
-      [HOME_DAILY_LIMIT, HOME_MAX_AMOUNT_PER_TX, HOME_MIN_AMOUNT_PER_TX],
-      [FOREIGN_DAILY_LIMIT, FOREIGN_MAX_AMOUNT_PER_TX],
+      [HOME_DAILY_LIMIT.toString(), HOME_MAX_AMOUNT_PER_TX.toString(), HOME_MIN_AMOUNT_PER_TX.toString()],
+      [FOREIGN_DAILY_LIMIT.toString(), FOREIGN_MAX_AMOUNT_PER_TX.toString()],
       HOME_MEDIATOR_REQUEST_GAS_LIMIT,
       foreignToHomeDecimalShift,
       HOME_BRIDGE_OWNER,
@@ -127,8 +127,8 @@ async function initializeForeign(foreignMediator, homeMediator) {
       FOREIGN_AMB_BRIDGE,
       homeMediator,
       FOREIGN_STAKE_TOKEN_ADDRESS,
-      [FOREIGN_DAILY_LIMIT, FOREIGN_MAX_AMOUNT_PER_TX, FOREIGN_MIN_AMOUNT_PER_TX],
-      [HOME_DAILY_LIMIT, HOME_MAX_AMOUNT_PER_TX],
+      [FOREIGN_DAILY_LIMIT.toString(), FOREIGN_MAX_AMOUNT_PER_TX.toString(), FOREIGN_MIN_AMOUNT_PER_TX.toString()],
+      [HOME_DAILY_LIMIT.toString(), HOME_MAX_AMOUNT_PER_TX.toString()],
       FOREIGN_MEDIATOR_REQUEST_GAS_LIMIT,
       foreignToHomeDecimalShift,
       FOREIGN_BRIDGE_OWNER

diff --git a/deploy/src/utils/deployBlockReward.js b/deploy/src/utils/deployBlockReward.js
@@ -2,7 +2,7 @@ const Web3Utils = require('web3-utils')
 const { web3Home, deploymentPrivateKey, HOME_RPC_URL } = require('../web3')
 const { deployContract, privateKeyToAddress, sendRawTxHome } = require('../deploymentUtils')
 const {
-  homeContracts: { BlockReward }
+  homeContracts: { BlockRewardMock }
 } = require('../loadContracts')
 const env = require('../loadEnv')
 
@@ -12,7 +12,7 @@ const DEPLOYMENT_ACCOUNT_ADDRESS = privateKeyToAddress(DEPLOYMENT_ACCOUNT_PRIVAT
 
 async function deployBlockReward() {
   let homeNonce = await web3Home.eth.getTransactionCount(DEPLOYMENT_ACCOUNT_ADDRESS)
-  const blockReward = await deployContract(BlockReward, [], {
+  const blockReward = await deployContract(BlockRewardMock, [], {
     from: DEPLOYMENT_ACCOUNT_ADDRESS,
     network: 'home',
     nonce: homeNonce