@skalenetwork/upgrade-tools 3.0.0-linter.24 → 3.0.0-linter.26

package/dist/hardhat.config.d.ts

@@ -1,6 +1,6 @@
-import { HardhatUserConfig } from "hardhat/config";
 import "@typechain/hardhat";
 import "@nomiclabs/hardhat-ethers";
 import "@openzeppelin/hardhat-upgrades";
+import { HardhatUserConfig } from "hardhat/config";
 declare const config: HardhatUserConfig;
 export default config;

package/dist/hardhat.config.js

@@ -6,8 +6,8 @@ require("@openzeppelin/hardhat-upgrades");
 const coreArtifacts = "node_modules/@openzeppelin/upgrades-core/artifacts/[!b]*.json";
 const config = {
     "typechain": {
-        "target": "ethers-v5",
-        "externalArtifacts": [coreArtifacts]
+        "externalArtifacts": [coreArtifacts],
+        "target": "ethers-v5"
     }
 };
 exports.default = config;

package/dist/src/contractFactory.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getContractFactoryAndUpdateManifest = exports.getLibrariesNames = void 0;
 const hardhat_1 = require("hardhat");
+const deploy_1 = require("./deploy");
 const fs_1 = require("fs");
 const upgrades_core_1 = require("@openzeppelin/upgrades-core");
-const deploy_1 = require("./deploy");
 const getSkaleManifest = async () => {
     const manifest = JSON.parse(await fs_1.promises.readFile(await (0, deploy_1.getManifestFile)(), "utf-8"));
     if (typeof manifest.libraries === "undefined") {

package/dist/src/deploy.js

@@ -3,8 +3,8 @@ 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");
 const utils_1 = require("ethers/lib/utils");
+const fs_1 = require("fs");
 const contractFactory_1 = require("./contractFactory");
 const deployLibrary = async (libraryName, nonce) => {
     const Library = await hardhat_1.ethers.getContractFactory(libraryName);

package/dist/src/gnosis-safe.js

@@ -27,11 +27,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createMultiSendTransaction = void 0;
+const safe_core_sdk_types_1 = require("@safe-global/safe-core-sdk-types");
+const protocol_kit_1 = __importStar(require("@safe-global/protocol-kit"));
+const api_kit_1 = __importDefault(require("@safe-global/api-kit"));
 const chalk_1 = __importDefault(require("chalk"));
 const hardhat_1 = require("hardhat");
-const api_kit_1 = __importDefault(require("@safe-global/api-kit"));
-const protocol_kit_1 = __importStar(require("@safe-global/protocol-kit"));
-const safe_core_sdk_types_1 = require("@safe-global/safe-core-sdk-types");
 const networks_1 = require("@ethersproject/networks");
 // Constants
 const URLS = {
@@ -41,8 +41,6 @@ const URLS = {
     }
 };
 const defaultOptions = {
-    // Max gas to use in the transaction
-    "safeTxGas": "0",
     /*
      * Gas costs not related to the transaction execution
      * (signature check, refund payment...)
@@ -57,17 +55,19 @@ const defaultOptions = {
      */
     "gasToken": hardhat_1.ethers.constants.AddressZero,
     // Address of receiver of gas payment (or `null` if tx.origin)
-    "refundReceiver": hardhat_1.ethers.constants.AddressZero
+    "refundReceiver": hardhat_1.ethers.constants.AddressZero,
+    // Max gas to use in the transaction
+    "safeTxGas": "0"
 };
 // Private functions
 const getSafeTransactionData = (transactions) => {
     const safeTransactionData = [];
     for (const transaction of transactions) {
         safeTransactionData.push({
-            "to": transaction.to ?? hardhat_1.ethers.constants.AddressZero,
             "data": transaction.data?.toString() ?? "0x",
-            "value": transaction.value?.toString() ?? "0",
-            "operation": 0
+            "operation": safe_core_sdk_types_1.OperationType.Call,
+            "to": transaction.to ?? hardhat_1.ethers.constants.AddressZero,
+            "value": transaction.value?.toString() ?? "0"
         });
     }
     return safeTransactionData;
@@ -91,8 +91,8 @@ const getSafeService = async () => {
     const { chainId } = await hardhat_1.ethers.provider.getNetwork();
     const ethAdapter = await getEthAdapter();
     const safeService = new api_kit_1.default({
-        "txServiceUrl": getSafeTransactionUrl(chainId),
-        ethAdapter
+        ethAdapter,
+        "txServiceUrl": getSafeTransactionUrl(chainId)
     });
     return safeService;
 };
@@ -152,8 +152,8 @@ const createMultiSendTransaction = async (safeAddress, transactions) => {
         safeAddress
     });
     const safeTransaction = await safeSdk.createTransaction({
-        safeTransactionData,
-        options
+        options,
+        safeTransactionData
     });
     await estimateSafeTransaction(safeAddress, safeTransactionData);
     await proposeTransaction(safeAddress, safeTransaction);

package/dist/src/multiSend.d.ts

@@ -1,5 +1,5 @@
-import { OperationType } from "@safe-global/safe-core-sdk-types";
 import { BigNumberish, BytesLike } from "ethers";
+import { OperationType } from "@safe-global/safe-core-sdk-types";
 interface Transaction {
     operation: OperationType;
     to: string;

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

@@ -1,5 +1,5 @@
-import { Transaction } from "ethers";
 import { Submitter } from "./submitter";
+import { Transaction } from "ethers";
 export declare class AutoSubmitter extends Submitter {
     name: string;
     static marionetteInterface: {

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

@@ -27,16 +27,16 @@ 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 = __importStar(require("hardhat"));
+const exitCodes_1 = require("../exitCodes");
 const eoa_submitter_1 = require("./eoa-submitter");
+const marionette_1 = require("./types/marionette");
+const safe_ima_legacy_marionette_submitter_1 = require("./safe-ima-legacy-marionette-submitter");
 const safe_submitter_1 = require("./safe-submitter");
+const submitter_1 = require("./submitter");
 const chalk_1 = __importDefault(require("chalk"));
-const safe_ima_legacy_marionette_submitter_1 = require("./safe-ima-legacy-marionette-submitter");
-const marionette_1 = require("./types/marionette");
+const admin_1 = require("@openzeppelin/hardhat-upgrades/dist/admin");
 const skale_contracts_ethers_v5_1 = require("@skalenetwork/skale-contracts-ethers-v5");
-const exitCodes_1 = require("../exitCodes");
 class AutoSubmitter extends submitter_1.Submitter {
     constructor() {
         super(...arguments);

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

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

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

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EoaSubmitter = void 0;
-const hardhat_1 = require("hardhat");
 const submitter_1 = require("./submitter");
+const hardhat_1 = require("hardhat");
 class EoaSubmitter extends submitter_1.Submitter {
     constructor() {
         super(...arguments);
@@ -15,10 +15,10 @@ class EoaSubmitter extends submitter_1.Submitter {
         console.log(`Send transaction via ${this.name}`);
         const responses = await Promise.all(transactions.
             map((transaction, index) => deployer.sendTransaction({
-            "to": transaction.to,
-            "value": transaction.value,
             "data": transaction.data,
-            "nonce": nonce + index
+            "nonce": nonce + index,
+            "to": transaction.to,
+            "value": transaction.value
         })));
         console.log("Waiting for transactions");
         await Promise.all(responses.map((response) => response.wait()));

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

@@ -1,9 +1,9 @@
 "use strict";
 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");
+const safe_to_ima_submitter_1 = require("./safe-to-ima-submitter");
+const hardhat_1 = require("hardhat");
 class SafeImaLegacyMarionetteSubmitter extends safe_to_ima_submitter_1.SafeToImaSubmitter {
     constructor() {
         super(...arguments);

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

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

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

@@ -1,9 +1,9 @@
 "use strict";
 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");
+const safe_to_ima_submitter_1 = require("./safe-to-ima-submitter");
+const hardhat_1 = require("hardhat");
 class SafeImaMarionetteSubmitter extends safe_to_ima_submitter_1.SafeToImaSubmitter {
     constructor() {
         super(...arguments);
@@ -58,8 +58,9 @@ class SafeImaMarionetteSubmitter extends safe_to_ima_submitter_1.SafeToImaSubmit
         }
         await super.submit([
             {
-                "to": this.marionette.address,
-                "data": await this.marionette.encodeFunctionCalls(functionCalls)
+                "data": await this.marionette.
+                    encodeFunctionCalls(functionCalls),
+                "to": this.marionette.address
             }
         ]);
     }

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

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

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

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SafeSubmitter = void 0;
-const hardhat_1 = require("hardhat");
-const gnosis_safe_1 = require("../gnosis-safe");
 const submitter_1 = require("./submitter");
+const gnosis_safe_1 = require("../gnosis-safe");
+const hardhat_1 = require("hardhat");
 class SafeSubmitter extends submitter_1.Submitter {
     constructor(safeAddress, chainId) {
         super();

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

@@ -1,6 +1,6 @@
 import { BytesLike, UnsignedTransaction } from "ethers";
-import { SafeSubmitter } from "./safe-submitter";
 import { Instance } from "@skalenetwork/skale-contracts-ethers-v5";
+import { SafeSubmitter } from "./safe-submitter";
 interface Network {
     targetSchainHash: BytesLike;
     mainnetChainId?: number;

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

@@ -15,12 +15,12 @@ class SafeToImaSubmitter extends safe_submitter_1.SafeSubmitter {
         }
         const messageProxyForMainnet = await this.getMessageProxyForMainnet();
         const transactionsToIma = transactions.map((transaction) => ({
-            "to": messageProxyForMainnet.address,
             "data": messageProxyForMainnet.interface.encodeFunctionData("postOutgoingMessage", [
                 this.targetSchainHash,
                 transaction.to,
                 transaction.data
-            ])
+            ]),
+            "to": messageProxyForMainnet.address
         }));
         await super.submit(transactionsToIma);
     }

package/dist/src/submitters/submitter.js

@@ -4,8 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Submitter = void 0;
-const chalk_1 = __importDefault(require("chalk"));
 const exitCodes_1 = require("../exitCodes");
+const chalk_1 = __importDefault(require("chalk"));
 class Submitter {
     // Protected
     static atomicityWarning() {

package/dist/src/upgrader.d.ts

@@ -1,6 +1,6 @@
-import { UnsignedTransaction } from "ethers";
-import { Submitter } from "./submitters/submitter";
 import { Instance } from "@skalenetwork/skale-contracts-ethers-v5";
+import { Submitter } from "./submitters/submitter";
+import { UnsignedTransaction } from "ethers";
 interface Project {
     name: string;
     instance: Instance;

package/dist/src/upgrader.js

@@ -28,15 +28,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Upgrader = void 0;
 const hardhat_1 = __importStar(require("hardhat"));
+const auto_submitter_1 = require("./submitters/auto-submitter");
+const exitCodes_1 = require("./exitCodes");
 const chalk_1 = __importDefault(require("chalk"));
-const admin_1 = require("@openzeppelin/hardhat-upgrades/dist/admin");
-const version_1 = require("./version");
 const fs_1 = require("fs");
+const contractFactory_1 = require("./contractFactory");
 const upgrades_core_1 = require("@openzeppelin/upgrades-core");
+const admin_1 = require("@openzeppelin/hardhat-upgrades/dist/admin");
+const version_1 = require("./version");
 const verification_1 = require("./verification");
-const auto_submitter_1 = require("./submitters/auto-submitter");
-const contractFactory_1 = require("./contractFactory");
-const exitCodes_1 = require("./exitCodes");
 const withoutNull = (array) => array.
     filter((element) => element !== null);
 class Upgrader {
@@ -103,11 +103,11 @@ class Upgrader {
                 ` to ${contract.implementationAddress}`;
             console.log(chalk_1.default.yellowBright(infoMessage));
             this.transactions.push({
-                "to": proxyAdmin.address,
                 "data": proxyAdmin.interface.encodeFunctionData("upgrade", [
                     contract.proxyAddress,
                     contract.implementationAddress
-                ])
+                ]),
+                "to": proxyAdmin.address
             });
         }
     }
@@ -127,9 +127,9 @@ class Upgrader {
         });
         if (newImplementationAddress !== currentImplementationAddress) {
             return {
-                proxyAddress,
                 "implementationAddress": newImplementationAddress,
-                "name": contract
+                "name": contract,
+                proxyAddress
             };
         }
         console.log(chalk_1.default.gray(`Contract ${contract} is up to date`));

package/dist/src/verification.js

@@ -54,9 +54,9 @@ const verify = async (contractName, contractAddress, constructorArguments) => {
         return;
     }
     await verifyWithRetry({
-        contractName,
+        constructorArguments,
         contractAddress,
-        constructorArguments
+        contractName
     }, RETRIES_AMOUNT);
 };
 exports.verify = verify;

package/dist/src/version.js

@@ -4,8 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getVersion = void 0;
-const child_process_1 = require("child_process");
 const fs_1 = require("fs");
+const child_process_1 = require("child_process");
 const util_1 = __importDefault(require("util"));
 const exec = util_1.default.promisify(child_process_1.exec);
 class VersionNotFound extends Error {
@@ -20,8 +20,8 @@ const getVersionFilename = async (folder) => {
         return path;
     }
     for (const entry of await fs_1.promises.readdir(folder, {
-        "withFileTypes": true,
-        "recursive": true
+        "recursive": true,
+        "withFileTypes": true
     })) {
         if (entry.isFile() && entry.name === VERSION_FILENAME) {
             return `${entry.path}/${entry.name}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skalenetwork/upgrade-tools",
-  "version": "3.0.0-linter.24",
+  "version": "3.0.0-linter.26",
   "description": "Scripts to support upgrades of smart contracts",
   "files": [
     "dist/**/*"