@skalenetwork/upgrade-tools 2.0.0-refactor.0 → 2.0.0-refactor.10

package/dist/src/gnosis-safe.js

@@ -70,13 +70,7 @@ const URLS = {
 };
 // public functions
 function getSafeTransactionUrl(chainId) {
-    if (chainId === Network.MAINNET) {
-        return URLS.safe_transaction[chainId];
-    }
-    else if (chainId === Network.RINKEBY) {
-        return URLS.safe_transaction[chainId];
-    }
-    else if (chainId === Network.GOERLI) {
+    if (Object.keys(URLS.safe_transaction).includes(chainId.toString())) {
         return URLS.safe_transaction[chainId];
     }
     else {
@@ -85,10 +79,7 @@ function getSafeTransactionUrl(chainId) {
 }
 exports.getSafeTransactionUrl = getSafeTransactionUrl;
 function getSafeRelayUrl(chainId) {
-    if (chainId === 1) {
-        return URLS.safe_relay[chainId];
-    }
-    else if (chainId === 4) {
+    if (Object.keys(URLS.safe_relay).includes(chainId.toString())) {
         return URLS.safe_relay[chainId];
     }
     else {
@@ -196,18 +187,12 @@ function sendSafeTransaction(safe, chainId, safeTx) {
 exports.sendSafeTransaction = sendSafeTransaction;
 // private functions
 function getMultiSendAddress(chainId) {
-    if (chainId === Network.MAINNET) {
-        return ADDRESSES.multiSend[chainId];
-    }
-    else if (chainId === Network.RINKEBY) {
-        return ADDRESSES.multiSend[chainId];
+    if ([Network.GANACHE, Network.HARDHAT].includes(chainId)) {
+        return ethers_1.ethers.constants.AddressZero;
     }
-    else if (chainId === Network.GOERLI) {
+    else if (Object.keys(ADDRESSES.multiSend).includes(chainId.toString())) {
         return ADDRESSES.multiSend[chainId];
     }
-    else if ([Network.GANACHE, Network.HARDHAT].includes(chainId)) {
-        return ethers_1.ethers.constants.AddressZero;
-    }
     else {
         throw Error(`Can't get multiSend contract at network with chainId = ${chainId}`);
     }

package/dist/src/index.d.ts

@@ -2,6 +2,8 @@ export * from "./abi";
 export * from "./deploy";
 export * from "./gnosis-safe";
 export * from "./multiSend";
-export * from "./upgrade";
+export * from "./submitters";
 export * from "./verification";
 export * from "./version";
+export * from "./upgrade";
+export * from "./upgrader";

package/dist/src/index.js

@@ -18,6 +18,8 @@ __exportStar(require("./abi"), exports);
 __exportStar(require("./deploy"), exports);
 __exportStar(require("./gnosis-safe"), exports);
 __exportStar(require("./multiSend"), exports);
-__exportStar(require("./upgrade"), exports);
+__exportStar(require("./submitters"), exports);
 __exportStar(require("./verification"), exports);
 __exportStar(require("./version"), exports);
+__exportStar(require("./upgrade"), exports);
+__exportStar(require("./upgrader"), exports);

package/dist/src/submitters/{EoaSubmitter.d.ts → auto-submitter.d.ts}

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

package/dist/src/submitters/{AutoSubmitter.js → 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 EoaSubmitter_1 = require("./EoaSubmitter");
-const SafeSubmitter_1 = require("./SafeSubmitter");
-class AutoSubmitter {
+const eoa_submitter_1 = require("./eoa-submitter");
+const safe_submitter_1 = require("./safe-submitter");
+class AutoSubmitter extends submitter_1.Submitter {
     submit(transactions) {
         return __awaiter(this, void 0, void 0, function* () {
             let submitter;
@@ -25,12 +26,12 @@ class AutoSubmitter {
             const owner = yield proxyAdmin.owner();
             if ((yield hardhat_1.default.ethers.provider.getCode(owner)) === "0x") {
                 console.log("Owner is not a contract");
-                submitter = new EoaSubmitter_1.EoaSubmitter();
+                submitter = new eoa_submitter_1.EoaSubmitter();
             }
             else {
                 console.log("Owner is a contract");
                 // TODO: add support of Marionette
-                submitter = new SafeSubmitter_1.SafeSubmitter(owner);
+                submitter = new safe_submitter_1.SafeSubmitter(owner);
             }
             yield submitter.submit(transactions);
         });

package/dist/src/submitters/{Submitter.d.ts → eoa-submitter.d.ts}

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

package/dist/src/submitters/{EoaSubmitter.js → eoa-submitter.js}

@@ -11,17 +11,22 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EoaSubmitter = void 0;
 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();
             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");
             }
         });
     }

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

@@ -0,0 +1,6 @@
+export * from "./auto-submitter";
+export * from "./eoa-submitter";
+export * from "./safe-ima-legacy-marionette-submitter";
+export * from "./safe-submitter";
+export * from "./safe-to-ima-submitter";
+export * from "./submitter";

package/dist/src/submitters/index.js

@@ -0,0 +1,22 @@
+"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 __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./auto-submitter"), exports);
+__exportStar(require("./eoa-submitter"), exports);
+__exportStar(require("./safe-ima-legacy-marionette-submitter"), exports);
+__exportStar(require("./safe-submitter"), exports);
+__exportStar(require("./safe-to-ima-submitter"), exports);
+__exportStar(require("./submitter"), exports);

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/{SafeSubmitter.d.ts → safe-submitter.d.ts}

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

package/dist/src/submitters/{SafeSubmitter.js → 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.d.ts

@@ -0,0 +1,9 @@
+import { BytesLike, Contract, UnsignedTransaction } from "ethers";
+import { SkaleABIFile } from "../types/SkaleABIFile";
+import { SafeSubmitter } from "./safe-submitter";
+export declare class SafeToImaSubmitter extends SafeSubmitter {
+    messageProxyForMainnet: Contract;
+    targetSchainHash: BytesLike;
+    constructor(safeAddress: string, imaAbi: SkaleABIFile, targetSchainHash: BytesLike, chainId?: number);
+    submit(transactions: UnsignedTransaction[]): Promise<void>;
+}

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

@@ -0,0 +1,39 @@
+"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.SafeToImaSubmitter = void 0;
+const hardhat_1 = require("hardhat");
+const safe_submitter_1 = require("./safe-submitter");
+class SafeToImaSubmitter extends safe_submitter_1.SafeSubmitter {
+    constructor(safeAddress, imaAbi, targetSchainHash, chainId) {
+        super(safeAddress, chainId);
+        this.messageProxyForMainnet = new hardhat_1.ethers.Contract(imaAbi["message_proxy_mainnet_address"], new hardhat_1.ethers.utils.Interface(imaAbi["message_proxy_mainnet_abi"]));
+        this.targetSchainHash = targetSchainHash;
+    }
+    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 transactionsToIma = transactions.map((transaction) => {
+                return {
+                    to: this.messageProxyForMainnet.address,
+                    data: this.messageProxyForMainnet.interface.encodeFunctionData("postOutgoingMessage", [this.targetSchainHash, transaction.to, transaction.data])
+                };
+            });
+            yield _super.submit.call(this, transactionsToIma);
+        });
+    }
+}
+exports.SafeToImaSubmitter = SafeToImaSubmitter;

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

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

package/dist/src/submitters/submitter.js

@@ -0,0 +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/dist/src/{upgraders/Upgrader.d.ts → upgrader.d.ts}

@@ -1,6 +1,6 @@
 import { UnsignedTransaction } from "ethers";
-import { SkaleABIFile } from "../types/SkaleABIFile";
-import { Submitter } from "../submitters/Submitter";
+import { SkaleABIFile } from "./types/SkaleABIFile";
+import { Submitter } from "./submitters/submitter";
 export declare abstract class Upgrader {
     abi: SkaleABIFile;
     targetVersion: string;
@@ -10,9 +10,9 @@ export declare abstract class Upgrader {
     submitter: Submitter;
     constructor(projectName: string, targetVersion: string, abi: SkaleABIFile, contractNamesToUpgrade: string[], submitter?: Submitter);
     abstract getDeployedVersion: () => Promise<string | undefined>;
-    abstract deployNewContracts: () => Promise<void>;
-    abstract initialize: () => Promise<void>;
     abstract setVersion: (newVersion: string) => Promise<void>;
+    deployNewContracts: () => Promise<void>;
+    initialize: () => Promise<void>;
     upgrade(): Promise<void>;
     _getContractFactoryAndUpdateManifest(contract: string): Promise<import("ethers").ContractFactory>;
     _getContractKeyInAbiFile(contract: string): string;

package/dist/src/{upgraders/Upgrader.js → upgrader.js}

@@ -17,15 +17,18 @@ const hardhat_1 = __importDefault(require("hardhat"));
 const chalk_1 = __importDefault(require("chalk"));
 const hardhat_2 = require("hardhat");
 const admin_1 = require("@openzeppelin/hardhat-upgrades/dist/admin");
-const version_1 = require("../version");
+const version_1 = require("./version");
 const fs_1 = require("fs");
-const deploy_1 = require("../deploy");
+const deploy_1 = require("./deploy");
 const upgrades_core_1 = require("@openzeppelin/upgrades-core");
-const abi_1 = require("../abi");
-const verification_1 = require("../verification");
-const AutoSubmitter_1 = require("../submitters/AutoSubmitter");
+const abi_1 = require("./abi");
+const verification_1 = require("./verification");
+const auto_submitter_1 = require("./submitters/auto-submitter");
 class Upgrader {
-    constructor(projectName, targetVersion, abi, contractNamesToUpgrade, submitter = new AutoSubmitter_1.AutoSubmitter()) {
+    constructor(projectName, targetVersion, abi, contractNamesToUpgrade, submitter = new auto_submitter_1.AutoSubmitter()) {
+        // protected
+        this.deployNewContracts = () => { return Promise.resolve(); };
+        this.initialize = () => { return Promise.resolve(); };
         this.targetVersion = targetVersion;
         this.abi = abi;
         this.contractNamesToUpgrade = contractNamesToUpgrade;

package/package.json

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

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

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

package/dist/src/submitters/Submitter.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });