@skalenetwork/upgrade-tools 2.0.0-refactor.14 → 2.0.0-refactor.16

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

@@ -1,5 +1,10 @@
 import { UnsignedTransaction } 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>;
+    _getSafeAddress(): string;
+    _getSchainHash(): string;
+    _getMainnetChainId(): number;
 }

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

@@ -1,4 +1,27 @@
 "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 __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) {
@@ -15,9 +38,12 @@ 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 hardhat_1 = __importStar(require("hardhat"));
 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");
 class AutoSubmitter extends submitter_1.Submitter {
     submit(transactions) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -30,11 +56,65 @@ class AutoSubmitter extends submitter_1.Submitter {
             }
             else {
                 console.log("Owner is a contract");
-                // TODO: add support of Marionette
-                submitter = new safe_submitter_1.SafeSubmitter(owner);
+                if (hardhat_1.ethers.utils.getAddress(owner) == hardhat_1.ethers.utils.getAddress("0xD2c0DeFACe000000000000000000000000000000")) {
+                    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);
+                }
+                else {
+                    // assuming owner is a Gnosis Safe
+                    console.log("Using Gnosis Safe");
+                    submitter = new safe_submitter_1.SafeSubmitter(owner);
+                }
             }
             yield 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"));
+        });
+    }
+    _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);
+        }
+        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 {
+            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);
+        }
+        else {
+            return Number.parseInt(process.env.MAINNET_CHAIN_ID);
+        }
+    }
 }
 exports.AutoSubmitter = AutoSubmitter;

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

@@ -0,0 +1,16 @@
+import { BigNumberish, BytesLike, UnsignedTransaction } from "ethers";
+import { ethers as RawEthers } from "ethers";
+import { SafeToImaSubmitter } from "./safe-to-ima-submitter";
+declare type FunctionCallStruct = {
+    receiver: string;
+    value: BigNumberish;
+    data: BytesLike;
+};
+interface Marionette extends RawEthers.Contract {
+    encodeFunctionCalls(functionCalls: FunctionCallStruct[]): Promise<BytesLike>;
+}
+export declare class SafeImaMarionetteSubmitter extends SafeToImaSubmitter {
+    marionette: Marionette;
+    submit(transactions: UnsignedTransaction[]): Promise<void>;
+}
+export {};

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

@@ -0,0 +1,79 @@
+"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");
+class SafeImaMarionetteSubmitter 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": [
+                    {
+                        "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/package.json

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