From 17140eda8fdad88fc2217d420200c0c5318edcad Mon Sep 17 00:00:00 2001
From: masaun <masanoriuno@gmail.com>
Date: Sat, 8 Feb 2020 10:26:45 +0100
Subject: [PATCH] Adjust codes which are parts of 'Step #6: Multisig Ownership'

---
 contracts/NewBancorPool.sol                       | 15 +++++++++------
 .../old => contracts_old}/NewBancorPool_old.sol   |  0
 package.json                                      |  6 +++---
 3 files changed, 12 insertions(+), 9 deletions(-)
 rename {contracts/old => contracts_old}/NewBancorPool_old.sol (100%)

diff --git a/contracts/NewBancorPool.sol b/contracts/NewBancorPool.sol
index daee5df..77cdbc6 100644
--- a/contracts/NewBancorPool.sol
+++ b/contracts/NewBancorPool.sol
@@ -140,12 +140,15 @@ contract NewBancorPool2 is BnStorage, BnConstants, Managed {
         // Step #5: Activation
         // Step #6: Multisig Ownership
         address _converterAddress;  // @notice - This variable is for receiving return value of createConverter() below
-        uint32 _maxConversionFee = 1;
-        _converterAddress = bancorConverterFactory.createConverter(smartToken, 
-                                                                   contractRegistry, 
-                                                                   _maxConversionFee, 
-                                                                   token, 
-                                                                   reserveRatio);
+        // uint32 _maxConversionFee = 1;
+        // _converterAddress = bancorConverterFactory.createConverter(smartToken, 
+        //                                                            contractRegistry, 
+        //                                                            _maxConversionFee, 
+        //                                                            token, 
+        //                                                            reserveRatio);
+        bancorConverter.transferOwnership(msg.sender);   // @dev - Reference from Managed.sol 
+        bancorConverter.transferManagement(msg.sender);  // @dev - Reference from Managed.sol 
+        _converterAddress = address(bancorConverter);
 
         // Step #7: Converters Registry Listing
         bancorConverterRegistry.addConverter(IBancorConverter(_converterAddress));
diff --git a/contracts/old/NewBancorPool_old.sol b/contracts_old/NewBancorPool_old.sol
similarity index 100%
rename from contracts/old/NewBancorPool_old.sol
rename to contracts_old/NewBancorPool_old.sol
diff --git a/package.json b/package.json
index 9d88696..8097802 100755
--- a/package.json
+++ b/package.json
@@ -9,9 +9,9 @@
     "install": "node scripts/fix-modules.js",
     "build": "node scripts/rebuild-all.js",
     "test": "echo \"Error: no test specified\" && exit 1",
-    "deploy": "node scripts/deploy-one.js",
-    "verify": "node scripts/verify-all.js",
-    "flatten": "node scripts/flatten.js",
+    "deploy": "node scripts/bancor-protocol/deploy-one.js",
+    "verify": "node scripts/bancor-protocol/verify-all.js",
+    "flatten": "node scripts/bancor-protocol/flatten.js",
     "test:truffle": "truffle test ./test/*",
     "start-blank": "rm -rf client/src && cp -rf barebones/src client/",
     "client": "cd client && npm run start",