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

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

@@ -5,3 +5,4 @@ export * from "./multiSend";
 export * from "./upgrade";
 export * from "./verification";
 export * from "./version";
+export * from "./upgrader";

package/dist/src/index.js

@@ -21,3 +21,4 @@ __exportStar(require("./multiSend"), exports);
 __exportStar(require("./upgrade"), exports);
 __exportStar(require("./verification"), exports);
 __exportStar(require("./version"), exports);
+__exportStar(require("./upgrader"), exports);

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

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

package/dist/src/submitters/{AutoSubmitter.js → auto-submitter.js}

@@ -15,8 +15,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AutoSubmitter = void 0;
 const admin_1 = require("@openzeppelin/hardhat-upgrades/dist/admin");
 const hardhat_1 = __importDefault(require("hardhat"));
-const EoaSubmitter_1 = require("./EoaSubmitter");
-const SafeSubmitter_1 = require("./SafeSubmitter");
+const eoa_submitter_1 = require("./eoa-submitter");
+const safe_submitter_1 = require("./safe-submitter");
 class AutoSubmitter {
     submit(transactions) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -25,12 +25,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/{EoaSubmitter.d.ts → eoa-submitter.d.ts}

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

package/dist/src/submitters/{SafeSubmitter.d.ts → safe-submitter.d.ts}

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

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;

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

@@ -17,15 +17,15 @@ 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()) {
         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.2",
   "description": "Scripts to support upgrades of smart contracts",
   "files": [
     "dist/**/*"