@skalenetwork/upgrade-tools 1.0.0-develop.15 → 1.0.0-develop.18

package/dist/src/gnosis-safe.js

@@ -47,6 +47,7 @@ var Network;
     Network[Network["GANACHE"] = 1337] = "GANACHE";
     Network[Network["HARDHAT"] = 31337] = "HARDHAT";
 })(Network || (Network = {}));
+// constants
 const ADDRESSES = {
     multiSend: {
         [Network.MAINNET]: "0x8D29bE29923b68abfDD21e541b9374737B49cdAD",
@@ -63,20 +64,7 @@ const URLS = {
         [Network.RINKEBY]: "https://safe-relay.rinkeby.gnosis.io",
     }
 };
-function getMultiSendAddress(chainId) {
-    if (chainId === Network.MAINNET) {
-        return ADDRESSES.multiSend[chainId];
-    }
-    else if (chainId === Network.RINKEBY) {
-        return ADDRESSES.multiSend[chainId];
-    }
-    else if ([Network.GANACHE, Network.HARDHAT].includes(chainId)) {
-        return ethers_1.ethers.constants.AddressZero;
-    }
-    else {
-        throw Error(`Can't get multiSend contract at network with chainId = ${chainId}`);
-    }
-}
+// public functions
 function getSafeTransactionUrl(chainId) {
     if (chainId === Network.MAINNET) {
         return URLS.safe_transaction[chainId];
@@ -101,16 +89,6 @@ function getSafeRelayUrl(chainId) {
     }
 }
 exports.getSafeRelayUrl = getSafeRelayUrl;
-function concatTransactions(transactions) {
-    return "0x" + transactions.map((transaction) => {
-        if (transaction.startsWith("0x")) {
-            return transaction.slice(2);
-        }
-        else {
-            return transaction;
-        }
-    }).join("");
-}
 function createMultiSendTransaction(ethers, safeAddress, privateKey, transactions, nonce) {
     return __awaiter(this, void 0, void 0, function* () {
         const chainId = (yield ethers.provider.getNetwork()).chainId;
@@ -122,8 +100,26 @@ function createMultiSendTransaction(ethers, safeAddress, privateKey, transaction
         let nonceValue = 0;
         if (nonce === undefined) {
             try {
-                const nonceResponse = yield axios_1.default.get(`${getSafeTransactionUrl(chainId)}/api/v1/safes/${safeAddress}/`);
-                nonceValue = nonceResponse.data.nonce;
+                if (process.env.NONCE) {
+                    // NONCE variable is set
+                    if (isNaN(Number.parseInt(process.env.NONCE))) {
+                        // NONCE variable is not a number
+                        if (process.env.NONCE.toLowerCase() === "pending") {
+                            nonceValue = yield getSafeNonceWithPending(chainId, safeAddress);
+                        }
+                        else {
+                            nonceValue = yield getSafeNonce(chainId, safeAddress);
+                        }
+                    }
+                    else {
+                        // NONCE variable is a number
+                        nonceValue = Number.parseInt(process.env.NONCE);
+                    }
+                }
+                else {
+                    // NONCE variable is not set
+                    nonceValue = yield getSafeNonce(chainId, safeAddress);
+                }
             }
             catch (e) {
                 if (!(e instanceof Error) || !e.toString().startsWith("Error: Can't get safe-transaction url")) {
@@ -134,6 +130,7 @@ function createMultiSendTransaction(ethers, safeAddress, privateKey, transaction
         else {
             nonceValue = nonce;
         }
+        console.log("Will send tx to Gnosis with nonce", nonceValue);
         const tx = {
             "safe": safeAddress,
             "to": multiSend.address,
@@ -190,3 +187,45 @@ function sendSafeTransaction(safe, chainId, safeTx) {
     });
 }
 exports.sendSafeTransaction = sendSafeTransaction;
+// private functions
+function getMultiSendAddress(chainId) {
+    if (chainId === Network.MAINNET) {
+        return ADDRESSES.multiSend[chainId];
+    }
+    else if (chainId === Network.RINKEBY) {
+        return ADDRESSES.multiSend[chainId];
+    }
+    else if ([Network.GANACHE, Network.HARDHAT].includes(chainId)) {
+        return ethers_1.ethers.constants.AddressZero;
+    }
+    else {
+        throw Error(`Can't get multiSend contract at network with chainId = ${chainId}`);
+    }
+}
+function concatTransactions(transactions) {
+    return "0x" + transactions.map((transaction) => {
+        if (transaction.startsWith("0x")) {
+            return transaction.slice(2);
+        }
+        else {
+            return transaction;
+        }
+    }).join("");
+}
+function getSafeNonce(chainId, safeAddress) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const safeInfo = yield axios_1.default.get(`${getSafeTransactionUrl(chainId)}/api/v1/safes/${safeAddress}/`);
+        return safeInfo.data.nonce;
+    });
+}
+function getSafeNonceWithPending(chainId, safeAddress) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const allTransactions = yield axios_1.default.get(`${getSafeTransactionUrl(chainId)}/api/v1/safes/${safeAddress}/all-transactions/?executed=false&queued=true&trusted=true`);
+        if (allTransactions.data.results.length > 0) {
+            return allTransactions.data.results[0].nonce + 1;
+        }
+        else {
+            return 0;
+        }
+    });
+}

package/dist/src/upgrade.js

@@ -209,6 +209,11 @@ function upgrade(projectName, targetVersion, getDeployedVersion, setVersion, saf
                 }
                 console.log(chalk_1.default.blue("Transactions have been sent"));
             }
+            catch (exception) {
+                console.log(chalk_1.default.red("Error during upgrade"));
+                console.log(exception);
+                process.exitCode = 13;
+            }
             finally {
                 console.log(chalk_1.default.blue("Return ownership to wallet"));
                 yield (yield safeMock.transferProxyAdminOwnership(contractManager.address, deployer.address)).wait();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skalenetwork/upgrade-tools",
-  "version": "1.0.0-develop.15",
+  "version": "1.0.0-develop.18",
   "description": "Scripts to support upgrades of smart contracts",
   "files": [
     "dist/**/*"