Merge branch 'develop' into arbitrary-message-bridging-#73

# Conflicts: # deploy/package-lock.json
omni · May 24, 2019 · 1b99d75 · 1b99d75
2 parents 9a48868 + bbb97a6
commit 1b99d75
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/deploy/package-lock.json b/deploy/package-lock.json
diff --git a/deploy/src/erc_to_erc/foreign.js b/deploy/src/erc_to_erc/foreign.js
@@ -141,6 +141,7 @@ async function deployForeign() {
   nonce++
 
   console.log('\ninitializing Foreign Bridge Validators with following parameters:\n')
+  bridgeValidatorsForeign.options.address = storageValidatorsForeign.options.address
   await initializeValidators({
     contract: bridgeValidatorsForeign,
     isRewardableBridge: false,

diff --git a/deploy/src/erc_to_erc/home.js b/deploy/src/erc_to_erc/home.js
@@ -188,6 +188,7 @@ async function deployHome() {
   nonce++
 
   console.log('\ninitializing Home Bridge Validators with following parameters:\n')
+  bridgeValidatorsHome.options.address = storageValidatorsHome.options.address
   await initializeValidators({
     contract: bridgeValidatorsHome,
     isRewardableBridge: isRewardableBridge && BLOCK_REWARD_ADDRESS === ZERO_ADDRESS,

diff --git a/deploy/src/erc_to_native/foreign.js b/deploy/src/erc_to_native/foreign.js
@@ -118,6 +118,7 @@ async function deployForeign() {
   nonce++
 
   console.log('\ninitializing Foreign Bridge Validators with following parameters:\n')
+  bridgeValidatorsForeign.options.address = storageValidatorsForeign.options.address
   await initializeValidators({
     contract: bridgeValidatorsForeign,
     isRewardableBridge: false,