@skalenetwork/upgrade-tools 1.0.0-develop.10 → 1.0.0-develop.11

package/dist/src/gnosis-safe.d.ts

@@ -20,6 +20,6 @@ interface SafeMultisigTransaction {
 }
 export declare function getSafeTransactionUrl(chainId: number): string;
 export declare function getSafeRelayUrl(chainId: number): string;
-export declare function createMultiSendTransaction(ethers: Ethers, safeAddress: string, privateKey: string, transactions: string[], isSafeMock?: boolean): Promise<SafeMultisigTransaction>;
+export declare function createMultiSendTransaction(ethers: Ethers, safeAddress: string, privateKey: string, transactions: string[], nonce?: number): Promise<SafeMultisigTransaction>;
 export declare function sendSafeTransaction(safe: string, chainId: number, safeTx: SafeMultisigTransaction): Promise<void>;
 export {};

package/dist/src/gnosis-safe.js

@@ -111,7 +111,7 @@ function concatTransactions(transactions) {
         }
     }).join("");
 }
-function createMultiSendTransaction(ethers, safeAddress, privateKey, transactions, isSafeMock = false) {
+function createMultiSendTransaction(ethers, safeAddress, privateKey, transactions, nonce) {
     return __awaiter(this, void 0, void 0, function* () {
         const chainId = (yield ethers.provider.getNetwork()).chainId;
         const multiSendAddress = getMultiSendAddress(chainId);
@@ -119,11 +119,11 @@ function createMultiSendTransaction(ethers, safeAddress, privateKey, transaction
         const multiSend = new ethers.Contract(multiSendAddress, new ethers.utils.Interface(multiSendAbi), ethers.provider);
         const safeAbi = [{ "constant": true, "inputs": [{ "internalType": "address", "name": "to", "type": "address" }, { "internalType": "uint256", "name": "value", "type": "uint256" }, { "internalType": "bytes", "name": "data", "type": "bytes" }, { "internalType": "enum Enum.Operation", "name": "operation", "type": "uint8" }, { "internalType": "uint256", "name": "safeTxGas", "type": "uint256" }, { "internalType": "uint256", "name": "baseGas", "type": "uint256" }, { "internalType": "uint256", "name": "gasPrice", "type": "uint256" }, { "internalType": "address", "name": "gasToken", "type": "address" }, { "internalType": "address", "name": "refundReceiver", "type": "address" }, { "internalType": "uint256", "name": "_nonce", "type": "uint256" }], "name": "getTransactionHash", "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }], "payable": false, "stateMutability": "view", "type": "function" }];
         const safe = new ethers.Contract(safeAddress, new ethers.utils.Interface(safeAbi), ethers.provider);
-        let nonce = 0;
-        if (!isSafeMock) {
+        let nonceValue = 0;
+        if (nonce === undefined) {
             try {
                 const nonceResponse = yield axios_1.default.get(`${getSafeTransactionUrl(chainId)}/api/v1/safes/${safeAddress}/`);
-                nonce = nonceResponse.data.nonce;
+                nonceValue = nonceResponse.data.nonce;
             }
             catch (e) {
                 if (!(e instanceof Error) || !e.toString().startsWith("Error: Can't get safe-transaction url")) {
@@ -131,6 +131,9 @@ function createMultiSendTransaction(ethers, safeAddress, privateKey, transaction
                 }
             }
         }
+        else {
+            nonceValue = nonce;
+        }
         const tx = {
             "safe": safeAddress,
             "to": multiSend.address,
@@ -142,7 +145,7 @@ function createMultiSendTransaction(ethers, safeAddress, privateKey, transaction
             "baseGas": 0,
             "gasPrice": 0,
             "refundReceiver": ethers.constants.AddressZero,
-            "nonce": nonce, // Nonce of the Safe, transaction cannot be executed until Safe's nonce is not equal to this nonce
+            "nonce": nonceValue, // Nonce of the Safe, transaction cannot be executed until Safe's nonce is not equal to this nonce
         };
         const digestHex = yield safe.getTransactionHash(tx.to, tx.value, tx.data, tx.operation, tx.safeTxGas, tx.baseGas, tx.gasPrice, tx.gasToken, tx.refundReceiver, tx.nonce);
         const privateKeyBuffer = ethUtil.toBuffer(privateKey);

package/dist/src/upgrade.js

@@ -171,7 +171,7 @@ function upgrade(projectName, targetVersion, getDeployedVersion, setVersion, saf
             // Use random one because we most probable run tests
             privateKey = hardhat_1.ethers.Wallet.createRandom().privateKey;
         }
-        const safeTx = yield (0, gnosis_safe_1.createMultiSendTransaction)(hardhat_1.ethers, safe, privateKey, safeTransactions, safeMock !== undefined);
+        const safeTx = yield (0, gnosis_safe_1.createMultiSendTransaction)(hardhat_1.ethers, safe, privateKey, safeTransactions, safeMock !== undefined ? 0 : undefined);
         let transactionsBatches;
         if (afterUpgrade !== undefined) {
             transactionsBatches = yield afterUpgrade(abi, contractManager);
@@ -183,8 +183,8 @@ function upgrade(projectName, targetVersion, getDeployedVersion, setVersion, saf
             const chainId = (yield hardhat_1.ethers.provider.getNetwork()).chainId;
             yield (0, gnosis_safe_1.sendSafeTransaction)(safe, chainId, safeTx);
             if (transactionsBatches !== undefined) {
-                for (const batch of transactionsBatches) {
-                    const multiSendTransaction = yield (0, gnosis_safe_1.createMultiSendTransaction)(hardhat_1.ethers, safe, privateKey, batch, safeMock !== undefined);
+                for (const { batch, index } of transactionsBatches.map((batch, index) => ({ batch, index }))) {
+                    const multiSendTransaction = yield (0, gnosis_safe_1.createMultiSendTransaction)(hardhat_1.ethers, safe, privateKey, batch, safeTx.nonce + index + 1);
                     yield (0, gnosis_safe_1.sendSafeTransaction)(safe, chainId, multiSendTransaction);
                 }
             }
@@ -199,7 +199,7 @@ function upgrade(projectName, targetVersion, getDeployedVersion, setVersion, saf
                 })).wait();
                 if (transactionsBatches !== undefined) {
                     for (const batch of transactionsBatches) {
-                        const multiSendTransaction = yield (0, gnosis_safe_1.createMultiSendTransaction)(hardhat_1.ethers, safe, privateKey, batch, safeMock !== undefined);
+                        const multiSendTransaction = yield (0, gnosis_safe_1.createMultiSendTransaction)(hardhat_1.ethers, safe, privateKey, batch, 0);
                         yield (yield deployer.sendTransaction({
                             to: safeMock.address,
                             value: multiSendTransaction.value,

package/package.json

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