@skalenetwork/upgrade-tools 3.0.0-develop.3 → 3.0.0-linter.0

package/dist/src/deploy.js

@@ -5,7 +5,8 @@ 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), library = await Library.deploy();
+    const Library = await hardhat_1.ethers.getContractFactory(libraryName);
+    const library = await Library.deploy();
     await library.deployed();
     return library.address;
 }
@@ -36,7 +37,9 @@ function _linkBytecode(artifact, libraries) {
     return bytecode;
 }
 async function getLinkedContractFactory(contractName, libraries) {
-    const cArtifact = await hardhat_1.artifacts.readArtifact(contractName), linkedBytecode = _linkBytecode(cArtifact, libraries), ContractFactory = await hardhat_1.ethers.getContractFactory(cArtifact.abi, linkedBytecode);
+    const cArtifact = await hardhat_1.artifacts.readArtifact(contractName);
+    const linkedBytecode = _linkBytecode(cArtifact, libraries);
+    const ContractFactory = await hardhat_1.ethers.getContractFactory(cArtifact.abi, linkedBytecode);
     return ContractFactory;
 }
 exports.getLinkedContractFactory = getLinkedContractFactory;
@@ -53,7 +56,8 @@ async function getContractFactory(contract) {
         const libraryName = Object.keys(linkReferences[key])[0];
         libraryNames.push(libraryName);
     }
-    const libraries = await deployLibraries(libraryNames), libraryArtifacts = {};
+    const libraries = await deployLibraries(libraryNames);
+    const libraryArtifacts = {};
     for (const [libraryName, libraryAddress] of libraries.entries()) {
         const { bytecode } = await hardhat_1.artifacts.readArtifact(libraryName);
         libraryArtifacts[libraryName] = {

package/dist/src/gnosis-safe.js

@@ -56,7 +56,8 @@ async function createMultiSendTransaction(safeAddress, transactions) {
             operation: 0,
         });
     }
-    const safeService = await getSafeService(), nonce = await safeService.getNextNonce(safeAddress);
+    const safeService = await getSafeService();
+    const nonce = await safeService.getNextNonce(safeAddress);
     console.log("Will send tx to Gnosis with nonce", nonce);
     const options = {
         safeTxGas: "0",
@@ -65,7 +66,10 @@ 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
-    }, ethAdapter = await getEthAdapter(), safeSdk = await protocol_kit_1.default.create({ ethAdapter, safeAddress }), safeTransaction = await safeSdk.createTransaction({ safeTransactionData, options });
+    };
+    const ethAdapter = await getEthAdapter();
+    const safeSdk = await protocol_kit_1.default.create({ ethAdapter, safeAddress });
+    const safeTransaction = await safeSdk.createTransaction({ safeTransactionData, options });
     await estimateSafeTransaction(safeAddress, safeTransactionData);
     await proposeTransaction(safeAddress, safeTransaction);
 }
@@ -86,7 +90,12 @@ 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(), 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();
+    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();
     await safeService.proposeTransaction({
         safeAddress,
         safeTransactionData: safeTransaction.data,
@@ -96,14 +105,17 @@ async function proposeTransaction(safeAddress, safeTransaction) {
     });
 }
 async function getEthAdapter() {
-    const [safeOwner] = await hardhat_1.ethers.getSigners(), ethAdapter = new protocol_kit_1.EthersAdapter({
+    const [safeOwner] = await hardhat_1.ethers.getSigners();
+    const 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, ethAdapter = await getEthAdapter(), safeService = new api_kit_1.default({
+    const chainId = (await hardhat_1.ethers.provider.getNetwork()).chainId;
+    const ethAdapter = await getEthAdapter();
+    const safeService = new api_kit_1.default({
         txServiceUrl: getSafeTransactionUrl(chainId),
         ethAdapter
     });

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

@@ -40,7 +40,8 @@ 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), owner = await proxyAdmin.owner();
+        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();
@@ -49,7 +50,10 @@ 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(), mainnetChainId = this._getMainnetChainId(), safeAddress = this._getSafeAddress(), schainHash = this._getSchainHash();
+                const imaInstance = await this._getImaInstance();
+                const mainnetChainId = this._getMainnetChainId();
+                const safeAddress = this._getSafeAddress();
+                const schainHash = this._getSchainHash();
                 // TODO: after marionette has multiSend functionality
                 // query version and properly select a submitter
                 // based on it
@@ -87,7 +91,8 @@ 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_ethers_v5_1.skaleContracts.getNetworkByProvider(hardhat_1.ethers.provider), ima = await network.getProject("ima");
+        const network = await skale_contracts_ethers_v5_1.skaleContracts.getNetworkByProvider(hardhat_1.ethers.provider);
+        const ima = await network.getProject("ima");
         return await ima.getInstance(process.env.IMA);
     }
     _getSafeAddress() {

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

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

package/dist/src/upgrader.js

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

package/dist/src/version.js

@@ -14,7 +14,8 @@ async function getVersionFilename(folder) {
     if (folder === undefined) {
         return getVersionFilename((await exec("git rev-parse --show-toplevel")).stdout.trim());
     }
-    const VERSION_FILENAME = 'VERSION', path = `${folder}/${VERSION_FILENAME}`;
+    const VERSION_FILENAME = 'VERSION';
+    const path = `${folder}/${VERSION_FILENAME}`;
     if ((0, fs_1.existsSync)(path)) {
         return path;
     }

package/package.json

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