Merge branch 'release'

nayms · Jan 14, 2021 · 3e32b4c · 3e32b4c
2 parents 11324af + 2b39a95
commit 3e32b4c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/deployedAddresses.json b/deployedAddresses.json
@@ -1,27 +1,27 @@
 {
   "ACL": {
     "4": {
-      "address": "0x409081EC125dcac56DB01dD129e9a6d6153EC2db"
+      "address": "0x3529eF352F8c4737f37f9A4d58fBd4B5b8E8F26b"
     }
   },
   "Settings": {
     "4": {
-      "address": "0x79dbdc511Fbd67Fc606975ce7b8dD72630c47bF7"
+      "address": "0xeDBf085C820AD19948DC1813376F1Ac87E01BA9B"
     }
   },
   "EntityDeployer": {
     "4": {
-      "address": "0xC8D260A852fe0Af9B155298F027484E04a158Dd4"
+      "address": "0xeECA531060BCeEb0B169e9Ad8B3Fc8783244658E"
     }
   },
   "EtherToken": {
     "4": {
-      "address": "0xbD1b988A3bBdAB70fcD61D4610Ba7c3483594582"
+      "address": "0xcEbfB77C559bb094B21356198C42F9cB5B089D7B"
     }
   },
   "MatchingMarket": {
     "4": {
-      "address": "0x72b662bDAD0760c111CFECb583d1a8F7c169ACcB"
+      "address": "0x66F218DBd2024aaabB67E83abcaD16BB0756c6a2"
     }
   }
 }
diff --git a/migrations/1_deploy_contracts.js b/migrations/1_deploy_contracts.js
@@ -160,7 +160,7 @@ module.exports = async (deployer, network, accounts) => {
   }
 
   if (releaseConfig.freshDeployment && releaseConfig.multisig) {
-    setAclAdminToMultisigAddress(cfg, releaseConfig.multisig)
+    await setAclAdminToMultisigAddress(cfg, releaseConfig.multisig)
     // upgrades following this fresh deployment should use the multisig!
   }
 }
diff --git a/migrations/modules/acl.js b/migrations/modules/acl.js
@@ -61,7 +61,7 @@ export const setAclAdminToMultisigAddress = async ({ accounts, log, getTxParams
   if (acl && multisig) { 
     await log.task('Set Multisig as ACL admin', async task => {
       await acl.addAdmin(multisig, getTxParams())
-      await acl.removeAdmin(accounts[0])
+      await acl.removeAdmin(accounts[0], getTxParams())
     })
   }
 }
diff --git a/migrations/utils/index.js b/migrations/utils/index.js
@@ -45,7 +45,7 @@ exports.execCall = async ({ task, contract, method, args, cfg }) => {
     const data = cm[method].apply(cm, args).encodeABI()
     await task.log(`     --> Data: ${data}`, 'green')
 
-    const safeTxGas = await cm[method].apply(cm, args).estimateGas({ from: accounts[0] })
+    const safeTxGas = await cm[method].apply(cm, args).estimateGas({ from: multisig })
     await task.log(`     --> Gas estimate: ${safeTxGas}`, 'green')
 
     if (!safeNonce) {