@skalenetwork/upgrade-tools 3.0.0-skale-contracts.7 → 3.0.0-skale-contracts.9

package/dist/src/deploy.js

@@ -5,8 +5,7 @@ const upgrades_core_1 = require("@openzeppelin/upgrades-core");
 const hardhat_1 = require("hardhat");
 const fs_1 = require("fs");
 async function _deployLibrary(libraryName) {
-    const Library = await hardhat_1.ethers.getContractFactory(libraryName);
-    const library = await Library.deploy();
+    const Library = await hardhat_1.ethers.getContractFactory(libraryName), library = await Library.deploy();
     await library.deployed();
     return library.address;
 }
@@ -37,9 +36,7 @@ function _linkBytecode(artifact, libraries) {
     return bytecode;
 }
 async function getLinkedContractFactory(contractName, libraries) {
-    const cArtifact = await hardhat_1.artifacts.readArtifact(contractName);
-    const linkedBytecode = _linkBytecode(cArtifact, libraries);
-    const ContractFactory = await hardhat_1.ethers.getContractFactory(cArtifact.abi, linkedBytecode);
+    const cArtifact = await hardhat_1.artifacts.readArtifact(contractName), linkedBytecode = _linkBytecode(cArtifact, libraries), ContractFactory = await hardhat_1.ethers.getContractFactory(cArtifact.abi, linkedBytecode);
     return ContractFactory;
 }
 exports.getLinkedContractFactory = getLinkedContractFactory;
@@ -56,11 +53,13 @@ async function getContractFactory(contract) {
         const libraryName = Object.keys(linkReferences[key])[0];
         libraryNames.push(libraryName);
     }
-    const libraries = await deployLibraries(libraryNames);
-    const libraryArtifacts = {};
+    const libraries = await deployLibraries(libraryNames), libraryArtifacts = {};
     for (const [libraryName, libraryAddress] of libraries.entries()) {
         const { bytecode } = await hardhat_1.artifacts.readArtifact(libraryName);
-        libraryArtifacts[libraryName] = { "address": libraryAddress, "bytecodeHash": (0, upgrades_core_1.hashBytecode)(bytecode) };
+        libraryArtifacts[libraryName] = {
+            "address": libraryAddress,
+            "bytecodeHash": (0, upgrades_core_1.hashBytecode)(bytecode)
+        };
     }
     let manifest;
     try {

package/dist/src/gnosis-safe.js

@@ -56,8 +56,7 @@ async function createMultiSendTransaction(safeAddress, transactions) {
             operation: 0,
         });
     }
-    const safeService = await getSafeService();
-    const nonce = await safeService.getNextNonce(safeAddress);
+    const safeService = await getSafeService(), nonce = await safeService.getNextNonce(safeAddress);
     console.log("Will send tx to Gnosis with nonce", nonce);
     const options = {
         safeTxGas: "0",
@@ -66,10 +65,7 @@ async function createMultiSendTransaction(safeAddress, transactions) {
         gasToken: hardhat_1.ethers.constants.AddressZero,
         refundReceiver: hardhat_1.ethers.constants.AddressZero,
         nonce: nonce // Nonce of the Safe, transaction cannot be executed until Safe's nonce is not equal to this nonce
-    };
-    const ethAdapter = await getEthAdapter();
-    const safeSdk = await protocol_kit_1.default.create({ ethAdapter, safeAddress });
-    const safeTransaction = await safeSdk.createTransaction({ safeTransactionData, options });
+    }, ethAdapter = await getEthAdapter(), safeSdk = await protocol_kit_1.default.create({ ethAdapter, safeAddress }), safeTransaction = await safeSdk.createTransaction({ safeTransactionData, options });
     await estimateSafeTransaction(safeAddress, safeTransactionData);
     await proposeTransaction(safeAddress, safeTransaction);
 }
@@ -90,12 +86,7 @@ async function estimateSafeTransaction(safeAddress, safeTransactionData) {
     console.log(chalk_1.default.green("Send transaction to gnosis safe"));
 }
 async function proposeTransaction(safeAddress, safeTransaction) {
-    const [safeOwner] = await hardhat_1.ethers.getSigners();
-    const ethAdapter = await getEthAdapter();
-    const safeSdk = await protocol_kit_1.default.create({ ethAdapter, safeAddress });
-    const safeTxHash = await safeSdk.getTransactionHash(safeTransaction);
-    const senderSignature = await safeSdk.signTransactionHash(safeTxHash);
-    const safeService = await getSafeService();
+    const [safeOwner] = await hardhat_1.ethers.getSigners(), ethAdapter = await getEthAdapter(), safeSdk = await protocol_kit_1.default.create({ ethAdapter, safeAddress }), safeTxHash = await safeSdk.getTransactionHash(safeTransaction), senderSignature = await safeSdk.signTransactionHash(safeTxHash), safeService = await getSafeService();
     await safeService.proposeTransaction({
         safeAddress,
         safeTransactionData: safeTransaction.data,
@@ -105,17 +96,14 @@ async function proposeTransaction(safeAddress, safeTransaction) {
     });
 }
 async function getEthAdapter() {
-    const [safeOwner] = await hardhat_1.ethers.getSigners();
-    const ethAdapter = new protocol_kit_1.EthersAdapter({
+    const [safeOwner] = await hardhat_1.ethers.getSigners(), ethAdapter = new protocol_kit_1.EthersAdapter({
         ethers: hardhat_1.ethers,
         signerOrProvider: safeOwner
     });
     return ethAdapter;
 }
 async function getSafeService() {
-    const chainId = (await hardhat_1.ethers.provider.getNetwork()).chainId;
-    const ethAdapter = await getEthAdapter();
-    const safeService = new api_kit_1.default({
+    const chainId = (await hardhat_1.ethers.provider.getNetwork()).chainId, ethAdapter = await getEthAdapter(), safeService = new api_kit_1.default({
         txServiceUrl: getSafeTransactionUrl(chainId),
         ethAdapter
     });

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

@@ -2,7 +2,7 @@ import { Transaction } from "ethers";
 import { Submitter } from "./submitter";
 export declare class AutoSubmitter extends Submitter {
     submit(transactions: Transaction[]): Promise<void>;
-    _getImaInstance(): Promise<import("@skalenetwork/skale-contracts").Instance>;
+    _getImaInstance(): Promise<import("@skalenetwork/skale-contracts/lib/instance").Instance<import("ethers").BaseContract>>;
     _getSafeAddress(): string;
     _getSchainHash(): string;
     _getMainnetChainId(): number;

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

@@ -35,13 +35,12 @@ 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 marionette_1 = require("./types/marionette");
-const skale_contracts_1 = require("@skalenetwork/skale-contracts");
+const skale_contracts_ethers_v5_1 = require("@skalenetwork/skale-contracts-ethers-v5");
 class AutoSubmitter extends submitter_1.Submitter {
     async submit(transactions) {
         let submitter;
         // TODO: remove unknown when move everything to ethers 6
-        const proxyAdmin = await (0, admin_1.getManifestAdmin)(hardhat_1.default);
-        const owner = await proxyAdmin.owner();
+        const proxyAdmin = await (0, admin_1.getManifestAdmin)(hardhat_1.default), 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();
@@ -50,10 +49,7 @@ class AutoSubmitter extends submitter_1.Submitter {
             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 this._getImaInstance();
-                const safeAddress = this._getSafeAddress();
-                const schainHash = this._getSchainHash();
-                const mainnetChainId = this._getMainnetChainId();
+                const imaInstance = await this._getImaInstance(), mainnetChainId = this._getMainnetChainId(), safeAddress = this._getSafeAddress(), schainHash = this._getSchainHash();
                 // TODO: after marionette has multiSend functionality
                 // query version and properly select a submitter
                 // based on it
@@ -91,8 +87,7 @@ class AutoSubmitter extends submitter_1.Submitter {
             console.log(chalk_1.default.red("Set target IMA alias to IMA environment variable"));
             process.exit(1);
         }
-        const network = await skale_contracts_1.skaleContracts.getNetworkByChainId((await hardhat_1.ethers.provider.getNetwork()).chainId);
-        const ima = await network.getProject("ima");
+        const network = await skale_contracts_ethers_v5_1.skaleContracts.getNetworkByProvider(hardhat_1.ethers.provider), ima = await network.getProject("ima");
         return await ima.getInstance(process.env.IMA);
     }
     _getSafeAddress() {

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";
+import { Instance } from "@skalenetwork/skale-contracts-ethers-v5";
 export declare class SafeToImaSubmitter extends SafeSubmitter {
     imaInstance: Instance;
     targetSchainHash: BytesLike;

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

@@ -12,8 +12,7 @@ class SafeToImaSubmitter extends safe_submitter_1.SafeSubmitter {
         if (transactions.length > 1) {
             this._atomicityWarning();
         }
-        const messageProxyForMainnet = await this._getMessageProxyForMainnet();
-        const transactionsToIma = transactions.map((transaction) => {
+        const messageProxyForMainnet = await this._getMessageProxyForMainnet(), transactionsToIma = transactions.map((transaction) => {
             return {
                 to: messageProxyForMainnet.address,
                 data: messageProxyForMainnet.interface.encodeFunctionData("postOutgoingMessage", [this.targetSchainHash, transaction.to, transaction.data])

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/lib/instance";
+import { Instance } from "@skalenetwork/skale-contracts-ethers-v5";
 export declare abstract class Upgrader {
     instance: Instance;
     targetVersion: string;

package/dist/src/upgrader.js

@@ -52,14 +52,12 @@ class Upgrader {
         // Deploy new implementations
         const contractsToUpgrade = [];
         for (const contract of this.contractNamesToUpgrade) {
-            const contractFactory = await this._getContractFactoryAndUpdateManifest(contract);
-            const proxyAddress = (await this.instance.getContract(contract)).address;
+            const contractFactory = await this._getContractFactoryAndUpdateManifest(contract), proxyAddress = (await this.instance.getContract(contract)).address;
             console.log(`Prepare upgrade of ${contract}`);
-            const newImplementationAddress = await hardhat_2.upgrades.prepareUpgrade(proxyAddress, contractFactory, {
+            const currentImplementationAddress = await (0, upgrades_core_1.getImplementationAddress)(hardhat_2.network.provider, proxyAddress), newImplementationAddress = await hardhat_2.upgrades.prepareUpgrade(proxyAddress, contractFactory, {
                 unsafeAllowLinkedLibraries: true,
                 unsafeAllowRenames: true
             });
-            const currentImplementationAddress = await (0, upgrades_core_1.getImplementationAddress)(hardhat_2.network.provider, proxyAddress);
             if (newImplementationAddress !== currentImplementationAddress) {
                 contractsToUpgrade.push({
                     proxyAddress,
@@ -89,18 +87,15 @@ class Upgrader {
     }
     // private
     async _getContractFactoryAndUpdateManifest(contract) {
-        const manifest = JSON.parse(await fs_1.promises.readFile(await (0, deploy_1.getManifestFile)(), "utf-8"));
-        const { linkReferences } = await hardhat_2.artifacts.readArtifact(contract);
+        const { linkReferences } = await hardhat_2.artifacts.readArtifact(contract), manifest = JSON.parse(await fs_1.promises.readFile(await (0, deploy_1.getManifestFile)(), "utf-8"));
         if (!Object.keys(linkReferences).length)
             return await hardhat_2.ethers.getContractFactory(contract);
-        const librariesToUpgrade = [];
-        const oldLibraries = {};
+        const librariesToUpgrade = [], oldLibraries = {};
         if (manifest.libraries === undefined) {
             Object.assign(manifest, { libraries: {} });
         }
         for (const key of Object.keys(linkReferences)) {
-            const libraryName = Object.keys(linkReferences[key])[0];
-            const { bytecode } = await hardhat_2.artifacts.readArtifact(libraryName);
+            const libraryName = Object.keys(linkReferences[key])[0], { bytecode } = await hardhat_2.artifacts.readArtifact(libraryName);
             if (manifest.libraries[libraryName] === undefined) {
                 librariesToUpgrade.push(libraryName);
                 continue;

package/dist/src/version.d.ts

@@ -1 +1 @@
-export declare function getVersion(): Promise<string>;
+export declare const getVersion: () => Promise<string>;

package/dist/src/version.js

@@ -4,11 +4,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getVersion = void 0;
-const fs_1 = require("fs");
 const child_process_1 = require("child_process");
+const fs_1 = require("fs");
 const util_1 = __importDefault(require("util"));
 const exec = util_1.default.promisify(child_process_1.exec);
-async function getVersion() {
+const getVersion = async () => {
     if (process.env.VERSION) {
         return process.env.VERSION;
     }
@@ -19,5 +19,5 @@ async function getVersion() {
     catch {
         return (await fs_1.promises.readFile("VERSION", "utf-8")).trim();
     }
-}
+};
 exports.getVersion = getVersion;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skalenetwork/upgrade-tools",
-  "version": "3.0.0-skale-contracts.7",
+  "version": "3.0.0-skale-contracts.9",
   "description": "Scripts to support upgrades of smart contracts",
   "files": [
     "dist/**/*"
@@ -21,15 +21,15 @@
     "fullCheck": "yarn compile && yarn lint && yarn eslint && yarn cspell && yarn slither",
     "lint": "npx solhint \"contracts/**/*.sol\"",
     "slither": "slither .",
-    "eslint": "npx eslint --cache --ext .js,.jsx,.ts,.tsx .",
+    "eslint": "npx eslint .",
     "cspell": "npx cspell \"**/*\""
   },
   "devDependencies": {
     "@tsconfig/recommended": "^1.0.2",
     "@typechain/ethers-v5": "^9.0.0",
     "@typechain/hardhat": "^8.0.0",
-    "@typescript-eslint/eslint-plugin": "^5.23.0",
-    "@typescript-eslint/parser": "^5.23.0",
+    "@typescript-eslint/eslint-plugin": "^6.6.0",
+    "@typescript-eslint/parser": "^6.6.0",
     "cspell": "^7.0.0",
     "eslint": "^8.15.0",
     "install-peers-cli": "^2.2.0",
@@ -43,7 +43,7 @@
     "@safe-global/api-kit": "^1.3.0",
     "@safe-global/protocol-kit": "^1.2.0",
     "@safe-global/safe-core-sdk-types": "^2.2.0",
-    "@skalenetwork/skale-contracts": "^0.0.1-main.20",
+    "@skalenetwork/skale-contracts-ethers-v5": "0.1.0-develop.0",
     "axios": "^1.4.0",
     "ethereumjs-util": "^7.1.4"
   },