From abab52a1bbee3f48d9862e5ae29fc68c42928dc2 Mon Sep 17 00:00:00 2001
From: benk10 <ben@daostack.io>
Date: Sun, 5 Jul 2020 22:08:35 +0300
Subject: [PATCH] Fix need for pk (#340)

* Remove need for private key if Standalone Contracts aren't used

* release 0.1.2-rc.0-v1
---
 migrate-dao.js    | 12 +++++++++---
 package-lock.json |  2 +-
 package.json      |  2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/migrate-dao.js b/migrate-dao.js
index e25e8c7e..466b9a9c 100644
--- a/migrate-dao.js
+++ b/migrate-dao.js
@@ -7,7 +7,11 @@ async function migrateDAO ({ arcVersion, web3, spinner, confirm, opts, migration
     network = 'mainnet'
   }
 
-  let adminAddress = web3.eth.accounts.wallet[0].address
+  let adminAddress
+
+  if (migrationParams.StandAloneContracts) {
+    adminAddress = web3.eth.accounts.wallet[0].address
+  }
 
   if (network === 'private') {
     if (await web3.eth.net.getId() === 100) {
@@ -15,8 +19,10 @@ async function migrateDAO ({ arcVersion, web3, spinner, confirm, opts, migration
     } 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
+      if (migrationParams.StandAloneContracts) {
+        web3.eth.accounts.wallet.add(web3.eth.accounts.privateKeyToAccount('0x6cbed15c793ce57650b9877cf6fa156fbef513c4e6134f022a85b1ffdd59b2a1'))
+        adminAddress = web3.eth.accounts.wallet[1].address
+      }
     }
   }
 
diff --git a/package-lock.json b/package-lock.json
index 5d29c67a..04634d15 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@daostack/migration-experimental",
-  "version": "0.1.2-rc.0-v0",
+  "version": "0.1.2-rc.0-v1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index dd6777ea..5fbc9cfe 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@daostack/migration-experimental",
-  "version": "0.1.2-rc.0-v0",
+  "version": "0.1.2-rc.0-v1",
   "description": "A repo for handling DAOstack contract migrations",
   "main": "index.js",
   "bin": {