@skalenetwork/upgrade-tools 2.0.1 → 3.0.0-191-version.1

package/dist/hardhat.config.js

@@ -18,6 +18,7 @@ const config = {
         ]
     },
     typechain: {
+        target: "ethers-v5",
         externalArtifacts: ['node_modules/@openzeppelin/upgrades-core/artifacts/[!b]*.json']
     }
 };

package/dist/src/deploy.js

@@ -1,34 +1,20 @@
 "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.getContractFactory = exports.getManifestFile = exports.getLinkedContractFactory = exports.deployLibraries = void 0;
 const upgrades_core_1 = require("@openzeppelin/upgrades-core");
 const hardhat_1 = require("hardhat");
 const fs_1 = require("fs");
-function _deployLibrary(libraryName) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const Library = yield hardhat_1.ethers.getContractFactory(libraryName);
-        const library = yield Library.deploy();
-        yield library.deployed();
-        return library.address;
-    });
+async function _deployLibrary(libraryName) {
+    const Library = await hardhat_1.ethers.getContractFactory(libraryName), library = await Library.deploy();
+    await library.deployed();
+    return library.address;
 }
-function deployLibraries(libraryNames) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const libraries = new Map();
-        for (const libraryName of libraryNames) {
-            libraries.set(libraryName, yield _deployLibrary(libraryName));
-        }
-        return libraries;
-    });
+async function deployLibraries(libraryNames) {
+    const libraries = new Map();
+    for (const libraryName of libraryNames) {
+        libraries.set(libraryName, await _deployLibrary(libraryName));
+    }
+    return libraries;
 }
 exports.deployLibraries = deployLibraries;
 function _linkBytecode(artifact, libraries) {
@@ -49,49 +35,43 @@ function _linkBytecode(artifact, libraries) {
     }
     return bytecode;
 }
-function getLinkedContractFactory(contractName, libraries) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const cArtifact = yield hardhat_1.artifacts.readArtifact(contractName);
-        const linkedBytecode = _linkBytecode(cArtifact, libraries);
-        const ContractFactory = yield hardhat_1.ethers.getContractFactory(cArtifact.abi, linkedBytecode);
-        return ContractFactory;
-    });
+async function getLinkedContractFactory(contractName, libraries) {
+    const cArtifact = await hardhat_1.artifacts.readArtifact(contractName), linkedBytecode = _linkBytecode(cArtifact, libraries), ContractFactory = await hardhat_1.ethers.getContractFactory(cArtifact.abi, linkedBytecode);
+    return ContractFactory;
 }
 exports.getLinkedContractFactory = getLinkedContractFactory;
-function getManifestFile() {
-    return __awaiter(this, void 0, void 0, function* () {
-        return (yield upgrades_core_1.Manifest.forNetwork(hardhat_1.ethers.provider)).file;
-    });
+async function getManifestFile() {
+    return (await upgrades_core_1.Manifest.forNetwork(hardhat_1.ethers.provider)).file;
 }
 exports.getManifestFile = getManifestFile;
-function getContractFactory(contract) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { linkReferences } = yield hardhat_1.artifacts.readArtifact(contract);
-        if (!Object.keys(linkReferences).length)
-            return yield hardhat_1.ethers.getContractFactory(contract);
-        const libraryNames = [];
-        for (const key of Object.keys(linkReferences)) {
-            const libraryName = Object.keys(linkReferences[key])[0];
-            libraryNames.push(libraryName);
-        }
-        const libraries = yield deployLibraries(libraryNames);
-        const libraryArtifacts = {};
-        for (const [libraryName, libraryAddress] of libraries.entries()) {
-            const { bytecode } = yield hardhat_1.artifacts.readArtifact(libraryName);
-            libraryArtifacts[libraryName] = { "address": libraryAddress, "bytecodeHash": (0, upgrades_core_1.hashBytecode)(bytecode) };
-        }
-        let manifest;
-        try {
-            manifest = JSON.parse(yield fs_1.promises.readFile(yield getManifestFile(), "utf-8"));
-            Object.assign(libraryArtifacts, manifest.libraries);
-        }
-        finally {
-            if (manifest !== undefined) {
-                Object.assign(manifest, { libraries: libraryArtifacts });
-            }
-            yield fs_1.promises.writeFile(yield getManifestFile(), JSON.stringify(manifest, null, 4));
+async function getContractFactory(contract) {
+    const { linkReferences } = await hardhat_1.artifacts.readArtifact(contract);
+    if (!Object.keys(linkReferences).length)
+        return await hardhat_1.ethers.getContractFactory(contract);
+    const libraryNames = [];
+    for (const key of Object.keys(linkReferences)) {
+        const libraryName = Object.keys(linkReferences[key])[0];
+        libraryNames.push(libraryName);
+    }
+    const libraries = await deployLibraries(libraryNames), libraryArtifacts = {};
+    for (const [libraryName, libraryAddress] of libraries.entries()) {
+        const { bytecode } = await hardhat_1.artifacts.readArtifact(libraryName);
+        libraryArtifacts[libraryName] = {
+            "address": libraryAddress,
+            "bytecodeHash": (0, upgrades_core_1.hashBytecode)(bytecode)
+        };
+    }
+    let manifest;
+    try {
+        manifest = JSON.parse(await fs_1.promises.readFile(await getManifestFile(), "utf-8"));
+        Object.assign(libraryArtifacts, manifest.libraries);
+    }
+    finally {
+        if (manifest !== undefined) {
+            Object.assign(manifest, { libraries: libraryArtifacts });
         }
-        return yield getLinkedContractFactory(contract, libraries);
-    });
+        await fs_1.promises.writeFile(await getManifestFile(), JSON.stringify(manifest, null, 4));
+    }
+    return await getLinkedContractFactory(contract, libraries);
 }
 exports.getContractFactory = getContractFactory;

package/dist/src/gnosis-safe.js

@@ -1,12 +1,26 @@
 "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());
-    });
+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 };
@@ -15,9 +29,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createMultiSendTransaction = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const hardhat_1 = require("hardhat");
-const safe_ethers_lib_1 = __importDefault(require("@safe-global/safe-ethers-lib"));
-const safe_service_client_1 = __importDefault(require("@safe-global/safe-service-client"));
-const safe_core_sdk_1 = __importDefault(require("@safe-global/safe-core-sdk"));
+const api_kit_1 = __importDefault(require("@safe-global/api-kit"));
+const protocol_kit_1 = __importStar(require("@safe-global/protocol-kit"));
 var Network;
 (function (Network) {
     Network[Network["MAINNET"] = 1] = "MAINNET";
@@ -33,90 +46,68 @@ const URLS = {
     }
 };
 // public functions
-function createMultiSendTransaction(safeAddress, transactions) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const safeTransactionData = [];
-        for (const transaction of transactions) {
-            safeTransactionData.push({
-                to: transaction.to ? transaction.to : hardhat_1.ethers.constants.AddressZero,
-                data: transaction.data ? transaction.data.toString() : "0x",
-                value: transaction.value ? transaction.value.toString() : "0",
-                operation: 0,
-            });
-        }
-        const safeService = yield getSafeService();
-        const nonce = yield safeService.getNextNonce(safeAddress);
-        console.log("Will send tx to Gnosis with nonce", nonce);
-        const options = {
-            safeTxGas: 0,
-            baseGas: 0,
-            gasPrice: 0,
-            gasToken: hardhat_1.ethers.constants.AddressZero,
-            refundReceiver: hardhat_1.ethers.constants.AddressZero,
-            nonce: nonce // Nonce of the Safe, transaction cannot be executed until Safe's nonce is not equal to this nonce
-        };
-        const ethAdapter = yield getEthAdapter();
-        const safeSdk = yield safe_core_sdk_1.default.create({ ethAdapter, safeAddress });
-        const safeTransaction = yield safeSdk.createTransaction({ safeTransactionData, options });
-        yield estimateSafeTransaction(safeAddress, safeTransactionData);
-        yield proposeTransaction(safeAddress, safeTransaction);
-    });
+async function createMultiSendTransaction(safeAddress, transactions) {
+    const safeTransactionData = [];
+    for (const transaction of transactions) {
+        safeTransactionData.push({
+            to: transaction.to ? transaction.to : hardhat_1.ethers.constants.AddressZero,
+            data: transaction.data ? transaction.data.toString() : "0x",
+            value: transaction.value ? transaction.value.toString() : "0",
+            operation: 0,
+        });
+    }
+    const safeService = await getSafeService(), nonce = await safeService.getNextNonce(safeAddress);
+    console.log("Will send tx to Gnosis with nonce", nonce);
+    const options = {
+        safeTxGas: "0",
+        baseGas: "0",
+        gasPrice: "0",
+        gasToken: hardhat_1.ethers.constants.AddressZero,
+        refundReceiver: hardhat_1.ethers.constants.AddressZero,
+        nonce: nonce // Nonce of the Safe, transaction cannot be executed until Safe's nonce is not equal to this nonce
+    }, ethAdapter = await getEthAdapter(), safeSdk = await protocol_kit_1.default.create({ ethAdapter, safeAddress }), safeTransaction = await safeSdk.createTransaction({ safeTransactionData, options });
+    await estimateSafeTransaction(safeAddress, safeTransactionData);
+    await proposeTransaction(safeAddress, safeTransaction);
 }
 exports.createMultiSendTransaction = createMultiSendTransaction;
 // private functions
-function estimateSafeTransaction(safeAddress, safeTransactionData) {
-    return __awaiter(this, void 0, void 0, function* () {
-        console.log("Estimate gas");
-        const safeService = yield getSafeService();
-        for (const transaction of safeTransactionData) {
-            const estimateResponse = yield safeService.estimateSafeTransaction(safeAddress, {
-                to: transaction.to,
-                value: transaction.value,
-                data: transaction.data,
-                operation: transaction.operation || 0,
-            });
-            console.log(chalk_1.default.cyan(`Recommend to set gas limit to ${parseInt(estimateResponse.safeTxGas, 10)}`));
-        }
-        console.log(chalk_1.default.green("Send transaction to gnosis safe"));
-    });
-}
-function proposeTransaction(safeAddress, safeTransaction) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const [safeOwner] = yield hardhat_1.ethers.getSigners();
-        const ethAdapter = yield getEthAdapter();
-        const safeSdk = yield safe_core_sdk_1.default.create({ ethAdapter, safeAddress });
-        const safeTxHash = yield safeSdk.getTransactionHash(safeTransaction);
-        const senderSignature = yield safeSdk.signTransactionHash(safeTxHash);
-        const safeService = yield getSafeService();
-        yield safeService.proposeTransaction({
-            safeAddress,
-            safeTransactionData: safeTransaction.data,
-            safeTxHash,
-            senderAddress: safeOwner.address,
-            senderSignature: senderSignature.data
+async function estimateSafeTransaction(safeAddress, safeTransactionData) {
+    console.log("Estimate gas");
+    const safeService = await getSafeService();
+    for (const transaction of safeTransactionData) {
+        const estimateResponse = await safeService.estimateSafeTransaction(safeAddress, {
+            to: transaction.to,
+            value: transaction.value,
+            data: transaction.data,
+            operation: transaction.operation || 0,
         });
+        console.log(chalk_1.default.cyan(`Recommend to set gas limit to ${parseInt(estimateResponse.safeTxGas, 10)}`));
+    }
+    console.log(chalk_1.default.green("Send transaction to gnosis safe"));
+}
+async function proposeTransaction(safeAddress, safeTransaction) {
+    const [safeOwner] = await hardhat_1.ethers.getSigners(), ethAdapter = await getEthAdapter(), safeSdk = await protocol_kit_1.default.create({ ethAdapter, safeAddress }), safeTxHash = await safeSdk.getTransactionHash(safeTransaction), senderSignature = await safeSdk.signTransactionHash(safeTxHash), safeService = await getSafeService();
+    await safeService.proposeTransaction({
+        safeAddress,
+        safeTransactionData: safeTransaction.data,
+        safeTxHash,
+        senderAddress: safeOwner.address,
+        senderSignature: senderSignature.data
     });
 }
-function getEthAdapter() {
-    return __awaiter(this, void 0, void 0, function* () {
-        const [safeOwner] = yield hardhat_1.ethers.getSigners();
-        const ethAdapter = new safe_ethers_lib_1.default({
-            ethers: hardhat_1.ethers,
-            signerOrProvider: safeOwner
-        });
-        return ethAdapter;
+async function getEthAdapter() {
+    const [safeOwner] = await hardhat_1.ethers.getSigners(), ethAdapter = new protocol_kit_1.EthersAdapter({
+        ethers: hardhat_1.ethers,
+        signerOrProvider: safeOwner
     });
+    return ethAdapter;
 }
-function getSafeService() {
-    return __awaiter(this, void 0, void 0, function* () {
-        const chainId = (yield hardhat_1.ethers.provider.getNetwork()).chainId;
-        const ethAdapter = yield getEthAdapter();
-        const safeService = new safe_service_client_1.default({
-            txServiceUrl: getSafeTransactionUrl(chainId),
-            ethAdapter
-        });
-        return safeService;
+async function getSafeService() {
+    const chainId = (await hardhat_1.ethers.provider.getNetwork()).chainId, ethAdapter = await getEthAdapter(), safeService = new api_kit_1.default({
+        txServiceUrl: getSafeTransactionUrl(chainId),
+        ethAdapter
     });
+    return safeService;
 }
 function getSafeTransactionUrl(chainId) {
     if (Object.keys(URLS.safe_transaction).includes(chainId.toString())) {

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

@@ -1,9 +1,8 @@
-import { UnsignedTransaction } from "ethers";
+import { Transaction } from "ethers";
 import { Submitter } from "./submitter";
-import { SkaleABIFile } from "../types/SkaleABIFile";
 export declare class AutoSubmitter extends Submitter {
-    submit(transactions: UnsignedTransaction[]): Promise<void>;
-    _getImaAbi(): Promise<SkaleABIFile>;
+    submit(transactions: Transaction[]): Promise<void>;
+    _getImaInstance(): Promise<import("@skalenetwork/skale-contracts/lib/instance").Instance<import("ethers").BaseContract>>;
     _getSafeAddress(): string;
     _getSchainHash(): string;
     _getMainnetChainId(): number;

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

@@ -22,15 +22,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-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());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -43,67 +34,61 @@ const eoa_submitter_1 = require("./eoa-submitter");
 const safe_submitter_1 = require("./safe-submitter");
 const chalk_1 = __importDefault(require("chalk"));
 const safe_ima_legacy_marionette_submitter_1 = require("./safe-ima-legacy-marionette-submitter");
-const fs_1 = require("fs");
 const marionette_1 = require("./types/marionette");
+const skale_contracts_ethers_v5_1 = require("@skalenetwork/skale-contracts-ethers-v5");
 class AutoSubmitter extends submitter_1.Submitter {
-    submit(transactions) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let submitter;
-            const proxyAdmin = yield (0, admin_1.getManifestAdmin)(hardhat_1.default);
-            const owner = yield proxyAdmin.owner();
-            if ((yield hardhat_1.default.ethers.provider.getCode(owner)) === "0x") {
-                console.log("Owner is not a contract");
-                submitter = new eoa_submitter_1.EoaSubmitter();
+    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("Owner is not a contract");
+            submitter = 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 {
-                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 imaAbi = yield this._getImaAbi();
-                    const safeAddress = this._getSafeAddress();
-                    const schainHash = this._getSchainHash();
-                    const mainnetChainId = this._getMainnetChainId();
-                    // 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, imaAbi, schainHash, mainnetChainId);
-                }
-                else {
-                    // assuming owner is a Gnosis Safe
-                    console.log("Using Gnosis Safe");
-                    submitter = new safe_submitter_1.SafeSubmitter(owner);
-                }
+                // assuming owner is a Gnosis Safe
+                console.log("Using Gnosis Safe");
+                submitter = new safe_submitter_1.SafeSubmitter(owner);
             }
-            yield submitter.submit(transactions);
-        });
+        }
+        await submitter.submit(transactions);
     }
     // private
-    _getImaAbi() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!process.env.IMA_ABI) {
-                console.log(chalk_1.default.red("Set path to ima abi to IMA_ABI environment variable"));
-                process.exit(1);
-            }
-            return JSON.parse(yield fs_1.promises.readFile(process.env.IMA_ABI, "utf-8"));
-        });
+    async _getImaInstance() {
+        if (!process.env.IMA) {
+            console.log(chalk_1.default.red("Set target IMA alias to IMA environment variable"));
+            process.exit(1);
+        }
+        const network = await skale_contracts_ethers_v5_1.skaleContracts.getNetworkByProvider(hardhat_1.ethers.provider), ima = await network.getProject("ima");
+        return await ima.getInstance(process.env.IMA);
     }
     _getSafeAddress() {
         if (!process.env.SAFE_ADDRESS) {
@@ -138,39 +123,37 @@ class AutoSubmitter extends submitter_1.Submitter {
             return Number.parseInt(process.env.MAINNET_CHAIN_ID);
         }
     }
-    _versionFunctionExists() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const bytecode = yield 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))) {
-                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
-            try {
-                yield marionette.estimateGas.version();
-                return true;
-            }
-            catch (_a) {
-                // Otherwise (revert) we assume that there is no entry in the jump table
-                // meaning that the contract doesn't include version()
-                return false;
-            }
-        });
+    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))) {
+            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
+        try {
+            await marionette.estimateGas.version();
+            return true;
+        }
+        catch {
+            // 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;

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

@@ -1,34 +1,23 @@
 "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.EoaSubmitter = void 0;
 const hardhat_1 = require("hardhat");
 const submitter_1 = require("./submitter");
 class EoaSubmitter extends submitter_1.Submitter {
-    submit(transactions) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this._atomicityWarning();
-            const [deployer] = yield hardhat_1.ethers.getSigners();
-            for (const transaction of transactions) {
-                console.log("Send transaction");
-                const response = yield deployer.sendTransaction({
-                    to: transaction.to,
-                    value: transaction.value,
-                    data: transaction.data
-                });
-                console.log(`Waiting for a transaction with nonce ${response.nonce}`);
-                yield response.wait();
-                console.log("The transaction was sent");
-            }
-        });
+    async submit(transactions) {
+        this._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");
+        }
     }
 }
 exports.EoaSubmitter = EoaSubmitter;