@skalenetwork/upgrade-tools 2.0.0-refactor.15 → 2.0.0-refactor.17

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

@@ -7,4 +7,5 @@ export declare class AutoSubmitter extends Submitter {
     _getSafeAddress(): string;
     _getSchainHash(): string;
     _getMainnetChainId(): number;
+    _versionFunctionExists(): Promise<boolean>;
 }

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

@@ -44,6 +44,8 @@ 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 safe_ima_marionette_submitter_1 = require("./safe-ima-marionette-submitter");
 class AutoSubmitter extends submitter_1.Submitter {
     submit(transactions) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -56,13 +58,20 @@ class AutoSubmitter extends submitter_1.Submitter {
             }
             else {
                 console.log("Owner is a contract");
-                if (hardhat_1.ethers.utils.getAddress(owner) == hardhat_1.ethers.utils.getAddress("0xD2c0DeFACe000000000000000000000000000000")) {
+                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();
-                    submitter = new safe_ima_legacy_marionette_submitter_1.SafeImaLegacyMarionetteSubmitter(safeAddress, imaAbi, schainHash, mainnetChainId);
+                    if (yield this._versionFunctionExists()) {
+                        console.log("version() function was found. Use normal Marionette");
+                        submitter = new safe_ima_marionette_submitter_1.SafeImaMarionetteSubmitter(safeAddress, imaAbi, schainHash, mainnetChainId);
+                    }
+                    else {
+                        console.log("No version() function was found. Use legacy Marionette");
+                        submitter = new safe_ima_legacy_marionette_submitter_1.SafeImaLegacyMarionetteSubmitter(safeAddress, imaAbi, schainHash, mainnetChainId);
+                    }
                 }
                 else {
                     // assuming owner is a Gnosis Safe
@@ -116,5 +125,39 @@ 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;
+            }
+        });
+    }
 }
 exports.AutoSubmitter = AutoSubmitter;

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

@@ -12,10 +12,11 @@ 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");
 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([
+        this.marionette = new hardhat_1.ethers.Contract(marionette_1.MARIONETTE_ADDRESS, new hardhat_1.ethers.utils.Interface([
             {
                 "inputs": [
                     {

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

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

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

@@ -0,0 +1,80 @@
+"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.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");
+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([
+            {
+                "inputs": [
+                    {
+                        "components": [
+                            {
+                                "internalType": "address",
+                                "name": "receiver",
+                                "type": "address"
+                            },
+                            {
+                                "internalType": "uint256",
+                                "name": "value",
+                                "type": "uint256"
+                            },
+                            {
+                                "internalType": "bytes",
+                                "name": "data",
+                                "type": "bytes"
+                            }
+                        ],
+                        "internalType": "struct IMarionette.FunctionCall[]",
+                        "name": "functionCalls",
+                        "type": "tuple[]"
+                    }
+                ],
+                "name": "encodeFunctionCalls",
+                "outputs": [
+                    {
+                        "internalType": "bytes",
+                        "name": "",
+                        "type": "bytes"
+                    }
+                ],
+                "stateMutability": "pure",
+                "type": "function"
+            }
+        ]), hardhat_1.ethers.provider);
+    }
+    submit(transactions) {
+        const _super = Object.create(null, {
+            submit: { get: () => super.submit }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            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")
+                });
+            }
+            yield _super.submit.call(this, [
+                {
+                    to: this.marionette.address,
+                    data: yield this.marionette.encodeFunctionCalls(functionCalls)
+                }
+            ]);
+        });
+    }
+}
+exports.SafeImaMarionetteSubmitter = SafeImaMarionetteSubmitter;

package/dist/src/submitters/types/marionette.d.ts

@@ -0,0 +1,13 @@
+import { BigNumberish, BytesLike } from "ethers";
+import { ethers as RawEthers } from "ethers";
+export declare const MARIONETTE_ADDRESS = "0xD2c0DeFACe000000000000000000000000000000";
+declare type FunctionCallStruct = {
+    receiver: string;
+    value: BigNumberish;
+    data: BytesLike;
+};
+export interface Marionette extends RawEthers.Contract {
+    encodeFunctionCalls(functionCalls: FunctionCallStruct[]): Promise<BytesLike>;
+    version(): Promise<string>;
+}
+export {};

package/dist/src/submitters/types/marionette.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MARIONETTE_ADDRESS = void 0;
+exports.MARIONETTE_ADDRESS = "0xD2c0DeFACe000000000000000000000000000000";

package/package.json

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