@skalenetwork/upgrade-tools 2.0.0-refactor.6 → 2.0.0-refactor.8

package/dist/src/submitters/auto-submitter.d.ts

@@ -1,5 +1,5 @@
 import { UnsignedTransaction } from "ethers";
 import { Submitter } from "./submitter";
-export declare class AutoSubmitter implements Submitter {
+export declare class AutoSubmitter extends Submitter {
     submit(transactions: UnsignedTransaction[]): Promise<void>;
 }

package/dist/src/submitters/auto-submitter.js

@@ -14,10 +14,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AutoSubmitter = void 0;
 const admin_1 = require("@openzeppelin/hardhat-upgrades/dist/admin");
+const submitter_1 = require("./submitter");
 const hardhat_1 = __importDefault(require("hardhat"));
 const eoa_submitter_1 = require("./eoa-submitter");
 const safe_submitter_1 = require("./safe-submitter");
-class AutoSubmitter {
+class AutoSubmitter extends submitter_1.Submitter {
     submit(transactions) {
         return __awaiter(this, void 0, void 0, function* () {
             let submitter;

package/dist/src/submitters/eoa-submitter.d.ts

@@ -1,6 +1,5 @@
 import { UnsignedTransaction } from "ethers";
 import { Submitter } from "./submitter";
-export declare class EoaSubmitter implements Submitter {
+export declare class EoaSubmitter extends Submitter {
     submit(transactions: UnsignedTransaction[]): Promise<void>;
-    _atomicityWarning(): void;
 }

package/dist/src/submitters/eoa-submitter.js

@@ -8,14 +8,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EoaSubmitter = void 0;
-const chalk_1 = __importDefault(require("chalk"));
 const hardhat_1 = require("hardhat");
-class EoaSubmitter {
+const submitter_1 = require("./submitter");
+class EoaSubmitter extends submitter_1.Submitter {
     submit(transactions) {
         return __awaiter(this, void 0, void 0, function* () {
             this._atomicityWarning();
@@ -33,16 +30,5 @@ class EoaSubmitter {
             }
         });
     }
-    // private
-    _atomicityWarning() {
-        if (!process.env.ALLOW_NOT_ATOMIC_UPGRADE) {
-            console.log(chalk_1.default.red("The upgrade will consist of multiple transactions and will not be atomic"));
-            console.log(chalk_1.default.red("If not atomic upgrade is OK set ALLOW_NOT_ATOMIC_UPGRADE environment variable"));
-            process.exit(1);
-        }
-        else {
-            console.log(chalk_1.default.yellow("Not atomic upgrade is performing"));
-        }
-    }
 }
 exports.EoaSubmitter = EoaSubmitter;

package/dist/src/submitters/safe-ima-legacy-marionette-submitter.d.ts

@@ -0,0 +1,6 @@
+import { UnsignedTransaction } from "ethers";
+import { SafeToImaSubmitter } from "./safe-to-ima-submitter";
+export declare class SafeImaLegacyMarionetteSubmitter extends SafeToImaSubmitter {
+    marionette: import("ethers").Contract;
+    submit(transactions: UnsignedTransaction[]): Promise<void>;
+}

package/dist/src/submitters/safe-ima-legacy-marionette-submitter.js

@@ -0,0 +1,69 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SafeImaLegacyMarionetteSubmitter = void 0;
+const hardhat_1 = require("hardhat");
+const safe_to_ima_submitter_1 = require("./safe-to-ima-submitter");
+class SafeImaLegacyMarionetteSubmitter extends safe_to_ima_submitter_1.SafeToImaSubmitter {
+    constructor() {
+        super(...arguments);
+        this.marionette = new hardhat_1.ethers.Contract("0xD2c0DeFACe000000000000000000000000000000", new hardhat_1.ethers.utils.Interface([
+            {
+                "inputs": [
+                    {
+                        "internalType": "address",
+                        "name": "receiver",
+                        "type": "address"
+                    },
+                    {
+                        "internalType": "uint256",
+                        "name": "value",
+                        "type": "uint256"
+                    },
+                    {
+                        "internalType": "bytes",
+                        "name": "data",
+                        "type": "bytes"
+                    }
+                ],
+                "name": "encodeFunctionCall",
+                "outputs": [
+                    {
+                        "internalType": "bytes",
+                        "name": "",
+                        "type": "bytes"
+                    }
+                ],
+                "stateMutability": "pure",
+                "type": "function"
+            }
+        ]));
+    }
+    submit(transactions) {
+        const _super = Object.create(null, {
+            submit: { get: () => super.submit }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            if (transactions.length > 1) {
+                this._atomicityWarning();
+            }
+            const transactionsToMarionette = [];
+            for (const transaction of transactions) {
+                transactionsToMarionette.push({
+                    to: this.marionette.address,
+                    data: yield this.marionette.functions["encodeFunctionCall"].call(transaction.to ? transaction.to : hardhat_1.ethers.constants.AddressZero, transaction.value ? transaction.value : 0, transaction.data ? transaction.data : "0x")
+                });
+            }
+            yield _super.submit.call(this, transactionsToMarionette);
+        });
+    }
+}
+exports.SafeImaLegacyMarionetteSubmitter = SafeImaLegacyMarionetteSubmitter;

package/dist/src/submitters/safe-submitter.d.ts

@@ -1,6 +1,6 @@
 import { UnsignedTransaction } from "ethers";
 import { Submitter } from "./submitter";
-export declare class SafeSubmitter implements Submitter {
+export declare class SafeSubmitter extends Submitter {
     safeAddress: string;
     chainId: number | undefined;
     constructor(safeAddress: string, chainId?: number);

package/dist/src/submitters/safe-submitter.js

@@ -14,8 +14,10 @@ const ethers_1 = require("ethers");
 const hardhat_1 = require("hardhat");
 const gnosis_safe_1 = require("../gnosis-safe");
 const multiSend_1 = require("../multiSend");
-class SafeSubmitter {
+const submitter_1 = require("./submitter");
+class SafeSubmitter extends submitter_1.Submitter {
     constructor(safeAddress, chainId) {
+        super();
         this.safeAddress = safeAddress;
         this.chainId = chainId;
     }

package/dist/src/submitters/safe-to-ima-submitter.js

@@ -23,6 +23,9 @@ class SafeToImaSubmitter extends safe_submitter_1.SafeSubmitter {
             submit: { get: () => super.submit }
         });
         return __awaiter(this, void 0, void 0, function* () {
+            if (transactions.length > 1) {
+                this._atomicityWarning();
+            }
             const transactionsToIma = transactions.map((transaction) => {
                 return {
                     to: this.messageProxyForMainnet.address,

package/dist/src/submitters/submitter.d.ts

@@ -1,4 +1,5 @@
 import { UnsignedTransaction } from "ethers";
-export interface Submitter {
-    submit(transactions: UnsignedTransaction[]): Promise<void>;
+export declare abstract class Submitter {
+    abstract submit(transactions: UnsignedTransaction[]): Promise<void>;
+    _atomicityWarning(): void;
 }

package/dist/src/submitters/submitter.js

@@ -1,2 +1,21 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Submitter = void 0;
+const chalk_1 = __importDefault(require("chalk"));
+class Submitter {
+    // private
+    _atomicityWarning() {
+        if (!process.env.ALLOW_NOT_ATOMIC_UPGRADE) {
+            console.log(chalk_1.default.red("The upgrade will consist of multiple transactions and will not be atomic"));
+            console.log(chalk_1.default.red("If not atomic upgrade is OK set ALLOW_NOT_ATOMIC_UPGRADE environment variable"));
+            process.exit(1);
+        }
+        else {
+            console.log(chalk_1.default.yellow("Not atomic upgrade is performing"));
+        }
+    }
+}
+exports.Submitter = Submitter;

package/package.json

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