Add check for proxies in storage for proxy re-deployment

Author: Anyhowclick

web3deployment/KatalystDeploy/katalystNetworkDeployer.js

@@ -565,6 +565,15 @@ async function waitForMatchingEngineAndStorageUpdate() {
   }
 }
 
+async function checkZeroProxies() {
+    let networkProxies = await storageContract.methods.getKyberProxies().call();
+    if (networkProxies.length > 0) {
+      console.log("\x1b[41m%s\x1b[0m" ,"Existing kyberProxies in storage, remove before proceeding");
+      process.exit(1);
+    }
+    return;
+}
+
 async function setNetworkAddressInMatchingEngine(tempAddress) {
   console.log("set network in matching engine");
   if (tempAddress == undefined) {
@@ -760,6 +769,7 @@ async function listReservesForTokens() {
 }
 
 async function redeployProxy() {
+  await checkZeroProxies();
   await setNetworkInProxy();
   await setHintHandlerInProxy();
   await pressToContinue();

web3deployment/KatalystDeploy/katalyst_deployer_ropsten_input.json

@@ -148,11 +148,7 @@
     "neg diff in bps" : 20,
 
     "epoch period": 2700,
-<<<<<<< HEAD
-    "start timestamp": 1591983945,
-=======
     "start timestamp": 1591848000,
->>>>>>> 25c50ac... update change from katalyst_iteration3
     "network fee bps": 30,
     "reward fee bps": 3850,
     "rebate bps": 3000,