@skalenetwork/upgrade-tools 3.0.0-linter.6 → 3.0.0-linter.7

package/dist/src/deploy.js

@@ -64,17 +64,14 @@ const getContractFactory = async (contract) => {
             "bytecodeHash": (0, upgrades_core_1.hashBytecode)(bytecode)
         };
     }
-    let manifest;
-    try {
-        manifest = JSON.parse(await fs_1.promises.readFile(await (0, exports.getManifestFile)(), "utf-8"));
-        Object.assign(libraryArtifacts, manifest.libraries);
+    const manifest = JSON.parse(await fs_1.promises.readFile(await (0, exports.getManifestFile)(), "utf-8"));
+    if (manifest.libraries === undefined) {
+        Object.assign(manifest, { "libraries": libraryArtifacts });
     }
-    finally {
-        if (manifest !== undefined) {
-            Object.assign(manifest, { "libraries": libraryArtifacts });
-        }
-        await fs_1.promises.writeFile(await (0, exports.getManifestFile)(), JSON.stringify(manifest, null, 4));
+    else {
+        Object.assign(libraryArtifacts, manifest.libraries);
     }
+    await fs_1.promises.writeFile(await (0, exports.getManifestFile)(), JSON.stringify(manifest, null, 4));
     return await (0, exports.getLinkedContractFactory)(contract, libraries);
 };
 exports.getContractFactory = getContractFactory;

package/dist/src/multiSend.js

@@ -9,7 +9,7 @@ const encodeTransaction = (operation, to, value, data) => {
     // / value as a uint256 (=> 32 bytes),
     // / data length as a uint256 (=> 32 bytes),
     // / data as bytes.
-    let _operation;
+    let _operation = "";
     if (operation === 0) {
         _operation = "00";
     }

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

@@ -3,6 +3,7 @@ import { Submitter } from "./submitter";
 export declare class AutoSubmitter extends Submitter {
     name: string;
     submit(transactions: Transaction[]): Promise<void>;
+    private static getSubmitter;
     private static _getImaInstance;
     private static _getSafeAddress;
     private static _getSchainHash;

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

@@ -43,56 +43,54 @@ class AutoSubmitter extends submitter_1.Submitter {
     }
     async submit(transactions) {
         console.log(`Submit via ${this.name}`);
-        let submitter;
+        const submitter = await AutoSubmitter.getSubmitter();
+        await submitter.submit(transactions);
+    }
+    // Private
+    static async getSubmitter() {
         // TODO: remove unknown when move everything to ethers 6
         const proxyAdmin = await (0, admin_1.getManifestAdmin)(hardhat_1.default);
         const owner = await proxyAdmin.owner();
         if (await hardhat_1.default.ethers.provider.getCode(owner) === "0x") {
             console.log("Owner is not a contract");
-            submitter = new eoa_submitter_1.EoaSubmitter();
+            return new eoa_submitter_1.EoaSubmitter();
         }
-        else {
-            console.log("Owner is a contract");
-            if (hardhat_1.ethers.utils.getAddress(owner) === hardhat_1.ethers.utils.getAddress(marionette_1.MARIONETTE_ADDRESS)) {
-                console.log("Marionette owner is detected");
-                const imaInstance = await AutoSubmitter._getImaInstance();
-                const mainnetChainId = AutoSubmitter._getMainnetChainId();
-                const safeAddress = AutoSubmitter._getSafeAddress();
-                const schainHash = AutoSubmitter._getSchainHash();
-                /*
-                 * TODO: after marionette has multiSend functionality
-                 * query version and properly select a submitter
-                 * based on it
-                 *
-                 * if (await this._versionFunctionExists()) {
-                 *     console.log("version() function was found. Use normal Marionette")
-                 *     submitter = new SafeImaMarionetteSubmitter(
-                 *         safeAddress,
-                 *         imaAbi,
-                 *         schainHash,
-                 *         mainnetChainId
-                 *     )
-                 * } else {
-                 *     console.log("No version() function was found. Use legacy Marionette")
-                 *     submitter = new SafeImaLegacyMarionetteSubmitter(
-                 *         safeAddress,
-                 *         imaAbi,
-                 *         schainHash,
-                 *         mainnetChainId
-                 *     )
-                 * }
-                 */
-                submitter = new safe_ima_legacy_marionette_submitter_1.SafeImaLegacyMarionetteSubmitter(safeAddress, imaInstance, schainHash, mainnetChainId);
-            }
-            else {
-                // Assuming owner is a Gnosis Safe
-                console.log("Using Gnosis Safe");
-                submitter = new safe_submitter_1.SafeSubmitter(owner);
-            }
+        console.log("Owner is a contract");
+        if (hardhat_1.ethers.utils.getAddress(owner) === hardhat_1.ethers.utils.getAddress(marionette_1.MARIONETTE_ADDRESS)) {
+            console.log("Marionette owner is detected");
+            const imaInstance = await AutoSubmitter._getImaInstance();
+            const mainnetChainId = AutoSubmitter._getMainnetChainId();
+            const safeAddress = AutoSubmitter._getSafeAddress();
+            const schainHash = AutoSubmitter._getSchainHash();
+            /*
+            * TODO: after marionette has multiSend functionality
+            * query version and properly select a submitter
+            * based on it
+            *
+            * if (await this._versionFunctionExists()) {
+            *     console.log("version() function was found. Use normal Marionette")
+            *     submitter = new SafeImaMarionetteSubmitter(
+            *         safeAddress,
+            *         imaAbi,
+            *         schainHash,
+            *         mainnetChainId
+            *     )
+            * } else {
+            *     console.log("No version() function was found. Use legacy Marionette")
+            *     submitter = new SafeImaLegacyMarionetteSubmitter(
+            *         safeAddress,
+            *         imaAbi,
+            *         schainHash,
+            *         mainnetChainId
+            *     )
+            * }
+            */
+            return new safe_ima_legacy_marionette_submitter_1.SafeImaLegacyMarionetteSubmitter(safeAddress, imaInstance, schainHash, mainnetChainId);
         }
-        await submitter.submit(transactions);
+        // Assuming owner is a Gnosis Safe
+        console.log("Using Gnosis Safe");
+        return new safe_submitter_1.SafeSubmitter(owner);
     }
-    // Private
     static async _getImaInstance() {
         if (!process.env.IMA) {
             console.log(chalk_1.default.red("Set target IMA alias to IMA environment variable"));

package/dist/src/types/SkaleManifestData.d.ts

@@ -1,6 +1,6 @@
 import { ManifestData } from "@openzeppelin/upgrades-core";
 export interface SkaleManifestData extends ManifestData {
-    libraries: {
+    libraries?: {
         [libraryName: string]: {
             address: string;
             bytecodeHash: string;

package/dist/src/upgrader.js

@@ -109,7 +109,7 @@ class Upgrader {
         const librariesToUpgrade = [];
         const oldLibraries = {};
         if (manifest.libraries === undefined) {
-            Object.assign(manifest, { "libraries": {} });
+            manifest.libraries = {};
         }
         for (const key of Object.keys(linkReferences)) {
             const libraryName = Object.keys(linkReferences[key])[0];

package/package.json

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