@skalenetwork/upgrade-tools 3.0.0-verification.0 → 4.0.0-update-verify.1

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

@@ -1,159 +1,174 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": 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 = __importStar(require("hardhat"));
+const ethers_1 = require("ethers");
+const exitCodes_1 = require("../exitCodes");
 const eoa_submitter_1 = require("./eoa-submitter");
+const marionette_1 = require("./types/marionette");
+const safe_ima_legacy_marionette_submitter_1 = require("./safe-ima-legacy-marionette-submitter");
 const safe_submitter_1 = require("./safe-submitter");
+const submitter_1 = require("./submitter");
 const chalk_1 = __importDefault(require("chalk"));
-const safe_ima_legacy_marionette_submitter_1 = require("./safe-ima-legacy-marionette-submitter");
-const marionette_1 = require("./types/marionette");
-const skale_contracts_ethers_v5_1 = require("@skalenetwork/skale-contracts-ethers-v5");
+const hardhat_1 = require("hardhat");
+const skale_contracts_ethers_v6_1 = require("@skalenetwork/skale-contracts-ethers-v6");
 class AutoSubmitter extends submitter_1.Submitter {
+    constructor(upgrader) {
+        super();
+        this.name = "Auto Submitter";
+        this.upgrader = upgrader;
+    }
     async submit(transactions) {
-        let submitter;
-        // TODO: remove unknown when move everything to ethers 6
-        const proxyAdmin = await (0, admin_1.getManifestAdmin)(hardhat_1.default), owner = await proxyAdmin.owner();
-        if (await hardhat_1.default.ethers.provider.getCode(owner) === "0x") {
+        console.log(`Submit via ${this.name}`);
+        const submitter = await this.getSubmitter();
+        await submitter.submit(transactions);
+    }
+    // Private
+    async getSubmitter() {
+        const owner = await this.upgrader.getOwner();
+        if (await hardhat_1.ethers.provider.getCode(owner) === "0x") {
             console.log("Owner is not a contract");
-            submitter = new eoa_submitter_1.EoaSubmitter();
+            return new eoa_submitter_1.EoaSubmitter();
         }
-        else {
-            console.log("Owner is a contract");
-            if (hardhat_1.ethers.utils.getAddress(owner) == hardhat_1.ethers.utils.getAddress(marionette_1.MARIONETTE_ADDRESS)) {
-                console.log("Marionette owner is detected");
-                const imaInstance = await this._getImaInstance(), mainnetChainId = this._getMainnetChainId(), safeAddress = this._getSafeAddress(), schainHash = this._getSchainHash();
-                // TODO: after marionette has multiSend functionality
-                // query version and properly select a submitter
-                // based on it
-                //
-                // if (await this._versionFunctionExists()) {
-                //     console.log("version() function was found. Use normal Marionette")
-                //     submitter = new SafeImaMarionetteSubmitter(
-                //         safeAddress,
-                //         imaAbi,
-                //         schainHash,
-                //         mainnetChainId
-                //     )
-                // } else {
-                //     console.log("No version() function was found. Use legacy Marionette")
-                //     submitter = new SafeImaLegacyMarionetteSubmitter(
-                //         safeAddress,
-                //         imaAbi,
-                //         schainHash,
-                //         mainnetChainId
-                //     )
-                // }
-                submitter = new safe_ima_legacy_marionette_submitter_1.SafeImaLegacyMarionetteSubmitter(safeAddress, imaInstance, schainHash, mainnetChainId);
-            }
-            else {
-                // assuming owner is a Gnosis Safe
-                console.log("Using Gnosis Safe");
-                submitter = new safe_submitter_1.SafeSubmitter(owner);
-            }
+        console.log("Owner is a contract");
+        return AutoSubmitter.getSubmitterForContractOwner(owner);
+    }
+    static async getSubmitterForContractOwner(owner) {
+        const mainnetChainId = AutoSubmitter.getMainnetChainId();
+        if (hardhat_1.ethers.getAddress(owner) ===
+            hardhat_1.ethers.getAddress(marionette_1.MARIONETTE_ADDRESS)) {
+            console.log("Marionette owner is detected");
+            const imaInstance = await AutoSubmitter.getImaInstance();
+            const safeAddress = AutoSubmitter.getSafeAddress();
+            const schainHash = AutoSubmitter.getSchainHash();
+            /*
+             * TODO: after marionette has multiSend functionality
+             * query version and properly select a submitter
+             * based on it
+             *
+             * if (await this._versionFunctionExists()) {
+             *     console.log("version() function was found." +
+             *       " Use normal Marionette")
+             *     submitter = new SafeImaMarionetteSubmitter(
+             *         safeAddress,
+             *         imaAbi,
+             *         schainHash,
+             *         mainnetChainId
+             *     )
+             * } else {
+             *     console.log("No version() function was found." +
+             *       " Use legacy Marionette")
+             *     submitter = new SafeImaLegacyMarionetteSubmitter(
+             *         safeAddress,
+             *         imaAbi,
+             *         schainHash,
+             *         mainnetChainId
+             *     )
+             * }
+             */
+            return new safe_ima_legacy_marionette_submitter_1.SafeImaLegacyMarionetteSubmitter(safeAddress, imaInstance, {
+                mainnetChainId,
+                "targetSchainHash": schainHash
+            });
         }
-        await submitter.submit(transactions);
+        // Assuming owner is a Gnosis Safe
+        console.log("Using Gnosis Safe");
+        return new safe_submitter_1.SafeSubmitter(owner, mainnetChainId);
     }
-    // private
-    async _getImaInstance() {
+    static async getImaInstance() {
         if (!process.env.IMA) {
-            console.log(chalk_1.default.red("Set target IMA alias to IMA environment variable"));
-            process.exit(1);
+            console.log(chalk_1.default.red("Set target IMA alias" +
+                " to IMA environment variable"));
+            process.exit(exitCodes_1.EXIT_CODES.UNKNOWN_IMA);
         }
-        const network = await skale_contracts_ethers_v5_1.skaleContracts.getNetworkByProvider(hardhat_1.ethers.provider), ima = await network.getProject("ima");
+        if (!process.env.MAINNET_ENDPOINT) {
+            console.log(chalk_1.default.red("Set mainnet endpoint" +
+                " to MAINNET_ENDPOINT environment variable"));
+            process.exit(exitCodes_1.EXIT_CODES.UNKNOWN_MAINNET_ENDPOINT);
+        }
+        const mainnetProvider = new ethers_1.JsonRpcProvider(process.env.MAINNET_ENDPOINT);
+        const contractsNetwork = await skale_contracts_ethers_v6_1.skaleContracts.getNetworkByProvider(mainnetProvider);
+        const ima = contractsNetwork.getProject("mainnet-ima");
         return await ima.getInstance(process.env.IMA);
     }
-    _getSafeAddress() {
+    static getSafeAddress() {
         if (!process.env.SAFE_ADDRESS) {
-            console.log(chalk_1.default.red("Set Gnosis Safe owner address to SAFE_ADDRESS environment variable"));
-            process.exit(1);
+            console.log(chalk_1.default.red("Set Gnosis Safe owner address" +
+                " to SAFE_ADDRESS environment variable"));
+            process.exit(exitCodes_1.EXIT_CODES.UNKNOWN_SAFE_ADDRESS);
         }
         return process.env.SAFE_ADDRESS;
     }
-    _getSchainHash() {
-        // query Context to get schain hash
-        if (!process.env.SCHAIN_HASH) {
-            if (!process.env.SCHAIN_NAME) {
-                console.log(chalk_1.default.red("Set schain name to SCHAIN_NAME environment variable"));
-                console.log(chalk_1.default.red("or schain hash to SCHAIN_HASH environment variable"));
-                process.exit(1);
-            }
-            else {
-                return hardhat_1.ethers.utils.solidityKeccak256(["string"], [process.env.SCHAIN_NAME]);
-            }
-        }
-        else {
+    static getSchainHash() {
+        // Query Context to get schain hash
+        if (process.env.SCHAIN_HASH) {
             return process.env.SCHAIN_HASH;
         }
-    }
-    _getMainnetChainId() {
-        if (!process.env.MAINNET_CHAIN_ID) {
-            console.log(chalk_1.default.red("Set chainId of mainnet to MAINNET_CHAIN_ID environment variable"));
-            console.log(chalk_1.default.red("Use 1 for Ethereum mainnet or 5 for Goerli"));
-            process.exit(1);
+        if (process.env.SCHAIN_NAME) {
+            return hardhat_1.ethers.solidityPackedKeccak256(["string"], [process.env.SCHAIN_NAME]);
         }
-        else {
-            return Number.parseInt(process.env.MAINNET_CHAIN_ID);
+        console.log(chalk_1.default.red("Set schain name" +
+            " to SCHAIN_NAME environment variable"));
+        console.log(chalk_1.default.red("or schain hash" +
+            " to SCHAIN_HASH environment variable"));
+        throw Error("Schain is not set");
+    }
+    static getMainnetChainId() {
+        if (process.env.MAINNET_CHAIN_ID) {
+            return BigInt(process.env.MAINNET_CHAIN_ID);
         }
+        console.log(chalk_1.default.red("Set chainId of mainnet" +
+            " to MAINNET_CHAIN_ID environment variable"));
+        console.log(chalk_1.default.red("Use 1 for Ethereum mainnet" +
+            " or 5 for Goerli"));
+        throw Error("Mainnet chainId is not set");
     }
-    async _versionFunctionExists() {
-        const bytecode = await hardhat_1.default.ethers.provider.getCode(marionette_1.MARIONETTE_ADDRESS);
-        // If the bytecode doesn't include the function selector version()
-        // is definitely not present
-        if (!bytecode.includes(hardhat_1.ethers.utils.id("version()").slice(2, 10))) {
+    static async _versionFunctionExists() {
+        const bytecode = await hardhat_1.ethers.provider.getCode(marionette_1.MARIONETTE_ADDRESS);
+        const hexPrefixLength = 2;
+        const selectorLength = 10;
+        /*
+         * If the bytecode doesn't include the function selector version()
+         * is definitely not present
+         */
+        if (!bytecode.includes(hardhat_1.ethers.id("version()").slice(hexPrefixLength, selectorLength))) {
             return false;
         }
-        const marionette = new hardhat_1.ethers.Contract(marionette_1.MARIONETTE_ADDRESS, [{
-                "inputs": [],
-                "name": "version",
-                "outputs": [
-                    {
-                        "internalType": "string",
-                        "name": "",
-                        "type": "string"
-                    }
-                ],
-                "stateMutability": "view",
-                "type": "function"
-            }], hardhat_1.default.ethers.provider);
-        // If gas estimation doesn't revert then an execution is possible
-        // given the provided function selector
+        const marionette = new hardhat_1.ethers.Contract(marionette_1.MARIONETTE_ADDRESS, AutoSubmitter.marionetteInterface, hardhat_1.ethers.provider);
+        /*
+         * If gas estimation doesn't revert then an execution is possible
+         * given the provided function selector
+         */
         try {
-            await marionette.estimateGas.version();
+            await marionette.version.estimateGas();
             return true;
         }
         catch {
-            // Otherwise (revert) we assume that there is no entry in the jump table
-            // meaning that the contract doesn't include version()
+            /*
+             * Otherwise (revert) we assume
+             * that there is no entry in the jump table
+             * meaning that the contract doesn't include version()
+             */
             return false;
         }
     }
 }
 exports.AutoSubmitter = AutoSubmitter;
+AutoSubmitter.marionetteInterface = [
+    {
+        "inputs": [],
+        "name": "version",
+        "outputs": [
+            {
+                "internalType": "string",
+                "name": "",
+                "type": "string"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    }
+];
+//# sourceMappingURL=auto-submitter.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"auto-submitter.js","sourceRoot":"","sources":["../../../src/submitters/auto-submitter.ts"],"names":[],"mappings":"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"}

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

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

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

@@ -1,23 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EoaSubmitter = void 0;
-const hardhat_1 = require("hardhat");
 const submitter_1 = require("./submitter");
+const hardhat_1 = require("hardhat");
 class EoaSubmitter extends submitter_1.Submitter {
+    constructor() {
+        super(...arguments);
+        this.name = "EOA Submitter";
+    }
     async submit(transactions) {
-        this._atomicityWarning();
+        EoaSubmitter.atomicityWarning();
         const [deployer] = await hardhat_1.ethers.getSigners();
-        for (const transaction of transactions) {
-            console.log("Send transaction");
-            const response = await deployer.sendTransaction({
-                to: transaction.to,
-                value: transaction.value,
-                data: transaction.data
-            });
-            console.log(`Waiting for a transaction with nonce ${response.nonce}`);
-            await response.wait();
-            console.log("The transaction was sent");
+        console.log(`Send transaction via ${this.name}`);
+        /*
+         * TODO: Refactor this section.
+         * Now sending transactions sequentially.
+         * Previously, concurrent eth_estimateGas calls during initialize()
+         * could invoke unavailable functions (pre-upgrade), causing failures.
+         */
+        for (const tx of transactions) {
+            /* eslint-disable no-await-in-loop */
+            const receipt = await (await deployer.sendTransaction({
+                data: tx.data,
+                to: tx.to,
+                value: tx.value
+            })).wait();
+            console.log(`Sent transaction with hash: ${receipt?.hash}`);
         }
+        console.log("All transactions sent and confirmed");
     }
 }
 exports.EoaSubmitter = EoaSubmitter;
+//# sourceMappingURL=eoa-submitter.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"eoa-submitter.js","sourceRoot":"","sources":["../../../src/submitters/eoa-submitter.ts"],"names":[],"mappings":";;;AAAA,2CAAsC;AAEtC,qCAA+B;AAG/B,MAAa,YAAa,SAAQ,qBAAS;IAA3C;;QACI,SAAI,GAAG,eAAe,CAAC;IAyB3B,CAAC;IAvBG,KAAK,CAAC,MAAM,CAAE,YAA2B;QACrC,YAAY,CAAC,gBAAgB,EAAE,CAAC;QAChC,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,gBAAM,CAAC,UAAU,EAAE,CAAC;QAC7C,OAAO,CAAC,GAAG,CAAC,wBAAwB,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAEjD;;;;;WAKG;QACH,KAAK,MAAM,EAAE,IAAI,YAAY,EAAE,CAAC;YAC5B,qCAAqC;YACrC,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,QAAQ,CAAC,eAAe,CAAC;gBAClD,IAAI,EAAE,EAAE,CAAC,IAAI;gBACb,EAAE,EAAE,EAAE,CAAC,EAAE;gBACT,KAAK,EAAE,EAAE,CAAC,KAAK;aAClB,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YACX,OAAO,CAAC,GAAG,CAAC,+BAA+B,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QAChE,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAAC;IACvD,CAAC;CACJ;AA1BD,oCA0BC"}

package/dist/src/submitters/index.js

@@ -20,3 +20,4 @@ __exportStar(require("./safe-ima-legacy-marionette-submitter"), exports);
 __exportStar(require("./safe-submitter"), exports);
 __exportStar(require("./safe-to-ima-submitter"), exports);
 __exportStar(require("./submitter"), exports);
+//# sourceMappingURL=index.js.map

package/dist/src/submitters/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/submitters/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,mDAAiC;AACjC,kDAAgC;AAChC,yEAAuD;AACvD,mDAAiC;AACjC,0DAAwC;AACxC,8CAA4B"}

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

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

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

@@ -1,13 +1,14 @@
 "use strict";
 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");
 const marionette_1 = require("./types/marionette");
+const safe_to_ima_submitter_1 = require("./safe-to-ima-submitter");
+const ethers_1 = require("ethers");
+const hardhat_1 = require("hardhat");
 class SafeImaLegacyMarionetteSubmitter extends safe_to_ima_submitter_1.SafeToImaSubmitter {
     constructor() {
         super(...arguments);
-        this.marionette = new hardhat_1.ethers.Contract(marionette_1.MARIONETTE_ADDRESS, new hardhat_1.ethers.utils.Interface([
+        this.marionette = new hardhat_1.ethers.BaseContract(marionette_1.MARIONETTE_ADDRESS, new hardhat_1.ethers.Interface([
             {
                 "inputs": [
                     {
@@ -40,18 +41,18 @@ class SafeImaLegacyMarionetteSubmitter extends safe_to_ima_submitter_1.SafeToIma
         ]), hardhat_1.ethers.provider);
     }
     async submit(transactions) {
-        if (transactions.length > 1) {
-            this._atomicityWarning();
-        }
-        const transactionsToMarionette = [];
-        for (const transaction of transactions) {
-            transactionsToMarionette.push({
-                to: this.marionette.address,
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-                data: await this.marionette.encodeFunctionCall(transaction.to ? transaction.to : hardhat_1.ethers.constants.AddressZero, transaction.value ? transaction.value : 0, transaction.data ? transaction.data : "0x")
-            });
+        const singleTransaction = 1;
+        if (transactions.length > singleTransaction) {
+            SafeImaLegacyMarionetteSubmitter.atomicityWarning();
         }
+        const marionetteAddress = await this.marionette.getAddress();
+        const transactionsToMarionette = (await Promise.all(transactions.
+            map((transaction) => this.marionette.encodeFunctionCall(transaction.to ?? hardhat_1.ethers.ZeroAddress, transaction.value, transaction.data)))).map((data) => ethers_1.Transaction.from({
+            "data": hardhat_1.ethers.hexlify(data),
+            "to": marionetteAddress
+        }));
         await super.submit(transactionsToMarionette);
     }
 }
 exports.SafeImaLegacyMarionetteSubmitter = SafeImaLegacyMarionetteSubmitter;
+//# sourceMappingURL=safe-ima-legacy-marionette-submitter.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"safe-ima-legacy-marionette-submitter.js","sourceRoot":"","sources":["../../../src/submitters/safe-ima-legacy-marionette-submitter.ts"],"names":[],"mappings":";;;AAAA,mDAAwE;AACxE,mEAA2D;AAC3D,mCAAmC;AACnC,qCAA+B;AAG/B,MAAa,gCAAiC,SAAQ,0CAAkB;IAAxE;;QACI,eAAU,GAAG,IAAI,gBAAM,CAAC,YAAY,CAChC,+BAAkB,EAClB,IAAI,gBAAM,CAAC,SAAS,CAAC;YACjB;gBACI,QAAQ,EAAE;oBACN;wBACI,cAAc,EAAE,SAAS;wBACzB,MAAM,EAAE,UAAU;wBAClB,MAAM,EAAE,SAAS;qBACpB;oBACD;wBACI,cAAc,EAAE,SAAS;wBACzB,MAAM,EAAE,OAAO;wBACf,MAAM,EAAE,SAAS;qBACpB;oBACD;wBACI,cAAc,EAAE,OAAO;wBACvB,MAAM,EAAE,MAAM;wBACd,MAAM,EAAE,OAAO;qBAClB;iBACJ;gBACD,MAAM,EAAE,oBAAoB;gBAC5B,SAAS,EAAE;oBACP;wBACI,cAAc,EAAE,OAAO;wBACvB,MAAM,EAAE,EAAE;wBACV,MAAM,EAAE,OAAO;qBAClB;iBACJ;gBACD,iBAAiB,EAAE,MAAM;gBACzB,MAAM,EAAE,UAAU;aACrB;SACJ,CAAC,EACF,gBAAM,CAAC,QAAQ,CACE,CAAC;IAsB1B,CAAC;IApBG,KAAK,CAAC,MAAM,CAAE,YAA2B;QACrC,MAAM,iBAAiB,GAAG,CAAC,CAAC;QAC5B,IAAI,YAAY,CAAC,MAAM,GAAG,iBAAiB,EAAE,CAAC;YAC1C,gCAAgC,CAAC,gBAAgB,EAAE,CAAC;QACxD,CAAC;QACD,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC;QAC7D,MAAM,wBAAwB,GAC1B,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,YAAY;YAC3B,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,kBAAkB,CACnD,WAAW,CAAC,EAAE,IAAI,gBAAM,CAAC,WAAW,EACpC,WAAW,CAAC,KAAK,EACjB,WAAW,CAAC,IAAI,CACnB,CAAC,CAAC,CACN,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,oBAAW,CAAC,IAAI,CAAC;YAC7B,MAAM,EAAE,gBAAM,CAAC,OAAO,CAAC,IAAI,CAAC;YAC5B,IAAI,EAAE,iBAAiB;SAC1B,CAAC,CAAC,CAAC;QAER,MAAM,KAAK,CAAC,MAAM,CAAC,wBAAwB,CAAC,CAAC;IACjD,CAAC;CACJ;AAzDD,4EAyDC"}

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

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

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

@@ -1,13 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SafeImaMarionetteSubmitter = void 0;
-const hardhat_1 = require("hardhat");
-const safe_to_ima_submitter_1 = require("./safe-to-ima-submitter");
 const marionette_1 = require("./types/marionette");
+const safe_to_ima_submitter_1 = require("./safe-to-ima-submitter");
+const ethers_1 = require("ethers");
+const hardhat_1 = require("hardhat");
 class SafeImaMarionetteSubmitter extends safe_to_ima_submitter_1.SafeToImaSubmitter {
     constructor() {
         super(...arguments);
-        this.marionette = new hardhat_1.ethers.Contract(marionette_1.MARIONETTE_ADDRESS, new hardhat_1.ethers.utils.Interface([
+        this.marionette = new hardhat_1.ethers.BaseContract(marionette_1.MARIONETTE_ADDRESS, new hardhat_1.ethers.Interface([
             {
                 "inputs": [
                     {
@@ -50,17 +51,18 @@ class SafeImaMarionetteSubmitter extends safe_to_ima_submitter_1.SafeToImaSubmit
         const functionCalls = [];
         for (const transaction of transactions) {
             functionCalls.push({
-                receiver: transaction.to ? transaction.to : hardhat_1.ethers.constants.AddressZero,
-                value: transaction.value ? transaction.value : 0,
-                data: (transaction.data ? transaction.data : "0x")
+                "data": transaction.data,
+                "receiver": transaction.to ?? hardhat_1.ethers.ZeroAddress,
+                "value": transaction.value
             });
         }
-        await super.submit([
-            {
-                to: this.marionette.address,
-                data: await this.marionette.encodeFunctionCalls(functionCalls)
-            }
+        await super.submit([ethers_1.Transaction.from({
+                "data": hardhat_1.ethers.hexlify(await this.marionette.
+                    encodeFunctionCalls(functionCalls)),
+                "to": await this.marionette.getAddress()
+            })
         ]);
     }
 }
 exports.SafeImaMarionetteSubmitter = SafeImaMarionetteSubmitter;
+//# sourceMappingURL=safe-ima-marionette-submitter.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"safe-ima-marionette-submitter.js","sourceRoot":"","sources":["../../../src/submitters/safe-ima-marionette-submitter.ts"],"names":[],"mappings":";;;AAAA,mDAAkE;AAClE,mEAA2D;AAC3D,mCAAmC;AACnC,qCAA+B;AAG/B,MAAa,0BAA2B,SAAQ,0CAAkB;IAAlE;;QACI,eAAU,GAAG,IAAI,gBAAM,CAAC,YAAY,CAChC,+BAAkB,EAClB,IAAI,gBAAM,CAAC,SAAS,CAAC;YACjB;gBACI,QAAQ,EAAE;oBACN;wBACI,YAAY,EAAE;4BACV;gCACI,cAAc,EAAE,SAAS;gCACzB,MAAM,EAAE,UAAU;gCAClB,MAAM,EAAE,SAAS;6BACpB;4BACD;gCACI,cAAc,EAAE,SAAS;gCACzB,MAAM,EAAE,OAAO;gCACf,MAAM,EAAE,SAAS;6BACpB;4BACD;gCACI,cAAc,EAAE,OAAO;gCACvB,MAAM,EAAE,MAAM;gCACd,MAAM,EAAE,OAAO;6BAClB;yBACJ;wBACD,cAAc,EAAE,mCAAmC;wBACnD,MAAM,EAAE,eAAe;wBACvB,MAAM,EAAE,SAAS;qBACpB;iBACJ;gBACD,MAAM,EAAE,qBAAqB;gBAC7B,SAAS,EAAE;oBACP;wBACI,cAAc,EAAE,OAAO;wBACvB,MAAM,EAAE,EAAE;wBACV,MAAM,EAAE,OAAO;qBAClB;iBACJ;gBACD,iBAAiB,EAAE,MAAM;gBACzB,MAAM,EAAE,UAAU;aACrB;SACJ,CAAC,EACF,gBAAM,CAAC,QAAQ,CACJ,CAAC;IAkBpB,CAAC;IAhBG,KAAK,CAAC,MAAM,CAAE,YAA2B;QACrC,MAAM,aAAa,GAAG,EAAE,CAAC;QACzB,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;YACrC,aAAa,CAAC,IAAI,CAAC;gBACf,MAAM,EAAE,WAAW,CAAC,IAAI;gBACxB,UAAU,EAAE,WAAW,CAAC,EAAE,IAAI,gBAAM,CAAC,WAAW;gBAChD,OAAO,EAAE,WAAW,CAAC,KAAK;aAC7B,CAAC,CAAC;QACP,CAAC;QACD,MAAM,KAAK,CAAC,MAAM,CAAC,CAAC,oBAAW,CAAC,IAAI,CAAC;gBAC7B,MAAM,EAAE,gBAAM,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,UAAU;oBACxC,mBAAmB,CAAC,aAAa,CAAC,CAAC;gBACvC,IAAI,EAAE,MAAM,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE;aAC3C,CAAC;SACL,CAAC,CAAC;IACP,CAAC;CACJ;AA5DD,gEA4DC"}

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

@@ -1,8 +1,8 @@
-import { UnsignedTransaction } from "ethers";
 import { Submitter } from "./submitter";
+import { Transaction } from "ethers";
 export declare class SafeSubmitter extends Submitter {
     safeAddress: string;
-    chainId: number | undefined;
-    constructor(safeAddress: string, chainId?: number);
-    submit(transactions: UnsignedTransaction[]): Promise<void>;
+    chainId: bigint | undefined;
+    constructor(safeAddress: string, chainId?: bigint);
+    submit(transactions: Transaction[]): Promise<void>;
 }

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

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SafeSubmitter = void 0;
-const hardhat_1 = require("hardhat");
-const gnosis_safe_1 = require("../gnosis-safe");
 const submitter_1 = require("./submitter");
+const gnosis_safe_1 = require("../gnosis-safe");
+const hardhat_1 = require("hardhat");
 class SafeSubmitter extends submitter_1.Submitter {
     constructor(safeAddress, chainId) {
         super();
@@ -14,7 +14,8 @@ class SafeSubmitter extends submitter_1.Submitter {
         if (!this.chainId) {
             this.chainId = (await hardhat_1.ethers.provider.getNetwork()).chainId;
         }
-        await (0, gnosis_safe_1.createMultiSendTransaction)(this.safeAddress, transactions);
+        await (0, gnosis_safe_1.createMultiSendTransaction)(this.safeAddress, this.chainId, transactions);
     }
 }
 exports.SafeSubmitter = SafeSubmitter;
+//# sourceMappingURL=safe-submitter.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"safe-submitter.js","sourceRoot":"","sources":["../../../src/submitters/safe-submitter.ts"],"names":[],"mappings":";;;AAAA,2CAAsC;AAEtC,gDAA0D;AAC1D,qCAA+B;AAG/B,MAAa,aAAc,SAAQ,qBAAS;IAKxC,YAAa,WAAmB,EAAE,OAAgB;QAC9C,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,MAAM,CAAE,YAA2B;QACrC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAChB,IAAI,CAAC,OAAO,GAAG,CAAC,MAAM,gBAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC,OAAO,CAAC;QAChE,CAAC;QACD,MAAM,IAAA,wCAA0B,EAC5B,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,OAAO,EACZ,YAAY,CACf,CAAC;IACN,CAAC;CACJ;AArBD,sCAqBC"}

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

@@ -1,11 +1,16 @@
-import { BytesLike, UnsignedTransaction } from "ethers";
+import { BytesLike, Transaction } from "ethers";
+import { Instance } from "@skalenetwork/skale-contracts-ethers-v6";
 import { SafeSubmitter } from "./safe-submitter";
-import { Instance } from "@skalenetwork/skale-contracts-ethers-v5";
+interface Network {
+    targetSchainHash: BytesLike;
+    mainnetChainId?: bigint;
+}
 export declare class SafeToImaSubmitter extends SafeSubmitter {
     imaInstance: Instance;
     targetSchainHash: BytesLike;
-    private _messageProxyForMainnet;
-    constructor(safeAddress: string, imaInstance: Instance, targetSchainHash: BytesLike, chainId?: number);
-    submit(transactions: UnsignedTransaction[]): Promise<void>;
-    private _getMessageProxyForMainnet;
+    private messageProxyForMainnet;
+    constructor(safeAddress: string, imaInstance: Instance, network: Network);
+    submit(transactions: Transaction[]): Promise<void>;
+    private getMessageProxyForMainnet;
 }
+export {};

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

@@ -1,30 +1,38 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SafeToImaSubmitter = void 0;
+const ethers_1 = require("ethers");
 const safe_submitter_1 = require("./safe-submitter");
 class SafeToImaSubmitter extends safe_submitter_1.SafeSubmitter {
-    constructor(safeAddress, imaInstance, targetSchainHash, chainId) {
-        super(safeAddress, chainId);
+    constructor(safeAddress, imaInstance, network) {
+        super(safeAddress, network.mainnetChainId);
         this.imaInstance = imaInstance;
-        this.targetSchainHash = targetSchainHash;
+        this.targetSchainHash = network.targetSchainHash;
     }
     async submit(transactions) {
-        if (transactions.length > 1) {
-            this._atomicityWarning();
+        const singleTransaction = 1;
+        if (transactions.length > singleTransaction) {
+            SafeToImaSubmitter.atomicityWarning();
         }
-        const messageProxyForMainnet = await this._getMessageProxyForMainnet(), transactionsToIma = transactions.map((transaction) => {
-            return {
-                to: messageProxyForMainnet.address,
-                data: messageProxyForMainnet.interface.encodeFunctionData("postOutgoingMessage", [this.targetSchainHash, transaction.to, transaction.data])
-            };
-        });
+        const messageProxyForMainnet = await this.getMessageProxyForMainnet();
+        const messageProxyForMainnetAddress = await messageProxyForMainnet.getAddress();
+        const transactionsToIma = transactions.map((transaction) => ethers_1.Transaction.from({
+            "data": messageProxyForMainnet.interface.encodeFunctionData("postOutgoingMessage", [
+                this.targetSchainHash,
+                transaction.to,
+                transaction.data
+            ]),
+            "to": messageProxyForMainnetAddress
+        }));
         await super.submit(transactionsToIma);
     }
-    async _getMessageProxyForMainnet() {
-        if (this._messageProxyForMainnet === undefined) {
-            this._messageProxyForMainnet = await this.imaInstance.getContract("MessageProxyForMainnet");
+    async getMessageProxyForMainnet() {
+        if (typeof this.messageProxyForMainnet === "undefined") {
+            this.messageProxyForMainnet =
+                await this.imaInstance.getContract("MessageProxyForMainnet");
         }
-        return this._messageProxyForMainnet;
+        return this.messageProxyForMainnet;
     }
 }
 exports.SafeToImaSubmitter = SafeToImaSubmitter;
+//# sourceMappingURL=safe-to-ima-submitter.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"safe-to-ima-submitter.js","sourceRoot":"","sources":["../../../src/submitters/safe-to-ima-submitter.ts"],"names":[],"mappings":";;;AAAA,mCAA4D;AAE5D,qDAA+C;AAQ/C,MAAa,kBAAmB,SAAQ,8BAAa;IAOjD,YACI,WAAmB,EACnB,WAAqB,EACrB,OAAgB;QAEhB,KAAK,CACD,WAAW,EACX,OAAO,CAAC,cAAc,CACzB,CAAC;QACF,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,MAAM,CAAE,YAA2B;QACrC,MAAM,iBAAiB,GAAG,CAAC,CAAC;QAC5B,IAAI,YAAY,CAAC,MAAM,GAAG,iBAAiB,EAAE,CAAC;YAC1C,kBAAkB,CAAC,gBAAgB,EAAE,CAAC;QAC1C,CAAC;QACD,MAAM,sBAAsB,GAAG,MAAM,IAAI,CAAC,yBAAyB,EAAE,CAAC;QACtE,MAAM,6BAA6B,GAAG,MAAM,sBAAsB,CAAC,UAAU,EAAE,CAAC;QAChF,MAAM,iBAAiB,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,oBAAW,CAAC,IAAI,CAAC;YACzE,MAAM,EAAE,sBAAsB,CAAC,SAAS,CAAC,kBAAkB,CACvD,qBAAqB,EACrB;gBACI,IAAI,CAAC,gBAAgB;gBACrB,WAAW,CAAC,EAAE;gBACd,WAAW,CAAC,IAAI;aACnB,CACJ;YACD,IAAI,EAAE,6BAA6B;SACtC,CAAC,CAAC,CAAC;QACJ,MAAM,KAAK,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;IAC1C,CAAC;IAEO,KAAK,CAAC,yBAAyB;QACnC,IAAI,OAAO,IAAI,CAAC,sBAAsB,KAAK,WAAW,EAAE,CAAC;YACrD,IAAI,CAAC,sBAAsB;gBACvB,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,wBAAwB,CAAC,CAAC;QACrE,CAAC;QACD,OAAO,IAAI,CAAC,sBAAsB,CAAC;IACvC,CAAC;CACJ;AAhDD,gDAgDC"}