release 0.1.1-rc.23-v4 (#337)

* release 0.1.1-rc.23-v4

* release 0.1.1-rc.23-v4

Author: ben-kaufman

migrate-dao.js

@@ -7,11 +7,16 @@ async function migrateDAO ({ arcVersion, web3, spinner, confirm, opts, migration
     network = 'mainnet'
   }
 
+  let adminAddress = web3.eth.accounts.wallet[0].address
+
   if (network === 'private') {
     if (await web3.eth.net.getId() === 100) {
       network = 'xdai'
     } else if (await web3.eth.net.getId() === 77) {
       network = 'sokol'
+    } else {
+      web3.eth.accounts.wallet.add(web3.eth.accounts.privateKeyToAccount('0x6cbed15c793ce57650b9877cf6fa156fbef513c4e6134f022a85b1ffdd59b2a1'))
+      adminAddress = web3.eth.accounts.wallet[1].address
     }
   }
 
@@ -150,7 +155,7 @@ async function migrateDAO ({ arcVersion, web3, spinner, confirm, opts, migration
         let createStandAloneProxyInstance = daoFactory.methods.createInstance(
           [0, 1, getArcVersionNumber(standAlone.arcVersion ? standAlone.arcVersion : arcVersion)],
           standAlone.name,
-          web3.eth.accounts.wallet[0].address,
+          adminAddress,
           contractInitParams
         )
         tx = (await sendTx(createStandAloneProxyInstance, `Creating ${standAlone.name} Proxy Instance...`)).receipt
@@ -362,7 +367,7 @@ async function migrateDAO ({ arcVersion, web3, spinner, confirm, opts, migration
         deploymentState.StandAloneContracts[i].address,
         opts
       )
-      tx = (await sendTx(standaloneContractProxy.methods.changeAdmin(deploymentState.Avatar), 'Transferring Standalone Proxy Ownership...')).receipt
+      tx = (await sendTx(standaloneContractProxy.methods.changeAdmin(deploymentState.Avatar), 'Transferring Standalone Proxy Ownership...', adminAddress, 100000)).receipt
       await logTx(tx, 'Transferred Standalone Proxy Ownership.')
     }
   }

migrate.js

@@ -181,23 +181,26 @@ const wrapCommand = fn => async options => {
     getArcVersionNumber: function getArcVersionNumber (arcVersion) {
       return Number(arcVersion.split('rc.')[1])
     },
-    sendTx: async function sendTx (tx, msg, from = web3.eth.defaultAccount) {
+    sendTx: async function sendTx (tx, msg, from = web3.eth.defaultAccount, manualGas = -1) {
       spinner.start(msg)
       let gas = 0
       let nonce = await web3.eth.getTransactionCount(from)
       const blockLimit = (await web3.eth.getBlock('latest')).gasLimit
-      try {
-        gas = (await tx.estimateGas())
-        if (gas * 1.1 < blockLimit - 10000) {
-          gas *= 1.1
-          gas = parseInt(gas)
-        } else {
+      if (manualGas === -1) {
+        try {
+          gas = (await tx.estimateGas())
+          if (gas * 1.1 < blockLimit - 10000) {
+            gas *= 1.1
+            gas = parseInt(gas)
+          } else {
+            gas = blockLimit - 10000
+          }
+        } catch (error) {
           gas = blockLimit - 10000
         }
-      } catch (error) {
-        gas = blockLimit - 10000
+      } else {
+        gas = manualGas
       }
-
       let result = tx.send({ from, gas, nonce })
       let receipt = await new Promise(resolve => result.on('receipt', resolve).on('error', async error => {
         spinner.fail('Transaction failed: ' + error)

migration.json

@@ -162,56 +162,56 @@
     "dao": {
       "0.1.1-rc.23": {
         "name": "My DAO",
-        "Avatar": "0x86723520CfF2D1E532D4F6e22cfdd84D76aB5D0b",
-        "DAOToken": "0xa33Dc908e9b26E3c69B7aeCEDA134782B75CcC51",
-        "Reputation": "0x26aFf68278F12eeB8378107c2C582F2fDBE23988",
-        "Controller": "0x54ce40dee051F7A1C99403aF2b905016fF761bD0",
+        "Avatar": "0xA26ba3f02cE548338820AB556a920f6640394183",
+        "DAOToken": "0xB7d2dE9352c1524A1be13ABa68E7f9834C062100",
+        "Reputation": "0xEac1B1f3B63913bB09A9DBec5510fdEc2A245d4E",
+        "Controller": "0x42783B49FD10b9F2946A81e1870870eD1D81F840",
         "Schemes": [
           {
             "name": "ContributionReward",
             "alias": "ContributionRewardAlias",
-            "address": "0x25C91D8323eFe51da746218da13EbEe092635bFb"
+            "address": "0x7eE4919E2Cc29d4865a94A8d78CA7187F2BAe679"
           },
           {
             "name": "SchemeRegistrar",
             "alias": "SchemeRegistrarAlias",
-            "address": "0x7De0C44E2094d5243368C47108329A7eB894B31d"
+            "address": "0x06B9944C656b1686ea98c873aA3621Ba8700B1d4"
           },
           {
             "name": "UpgradeScheme",
             "alias": "UpgradeSchemeAlias",
-            "address": "0xC32427f155ceF70597542BF442A21cA0Dee4697E"
+            "address": "0x3aF09be413393Ca300690fA4CEA0E625Cae913A8"
           },
           {
             "name": "GenericScheme",
             "alias": "GenericSchemeAlias",
-            "address": "0x17C9EA3eEd28F70851c36712d813de7f205ce047"
+            "address": "0x1FdEA2d3B279A74578f4D49FED447efE4ed650d1"
           },
           {
             "name": "ContributionRewardExt",
             "alias": "ContributionRewardExt",
-            "address": "0x3FcE5A99519fDD6bc9ed8fBf3A76DcA5b3e7c543"
+            "address": "0x935CBd9fa6C00d405f78f1DF25Df9de0cC66085F"
           },
           {
             "name": "SchemeFactory",
             "alias": "SchemeRegistrarAlias",
-            "address": "0x56A3Db23B8382CC3E88Fc3E184348dd9D8dB4c2a"
+            "address": "0xC960814DaDDD5f88C0eF3789bBF6CDBE82B78267"
           },
           {
             "name": "JoinAndQuit",
             "alias": "JoinAndQuitAlias",
-            "address": "0xB224bD269727E7aaC8EB09A5fDeCcafc0b76aa1e"
+            "address": "0xCBbf83116959326cdc47eAa48b488d1DF8965843"
           },
           {
             "name": "FundingRequest",
             "alias": "FundingRequestAlias",
-            "address": "0x383cD7281570edBaD63092bfb159a3a00A8BAEc7"
+            "address": "0x69f6723F401cA05b8a70005f571fAb380856a21d"
           }
         ],
         "StandAloneContracts": [
           {
             "name": "Wallet",
-            "address": "0x5064A8C4111Fc206BF3DDeA121481a664F4a595c",
+            "address": "0xa8960C1b61Fa6AAbc8B86e8C1B8D9873d1d0B8EE",
             "arcVersion": "0.1.1-rc.23"
           }
         ],

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@daostack/migration-experimental",
-  "version": "0.1.1-rc.23-v3",
+  "version": "0.1.1-rc.23-v4",
   "description": "A repo for handling DAOstack contract migrations",
   "main": "index.js",
   "bin": {