@skalenetwork/upgrade-tools 3.0.0-merge → 3.0.0-proxy-admin.0

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

@@ -1,11 +1,16 @@
-import { BytesLike, UnsignedTransaction } from "ethers";
+import { BytesLike, Transaction } from "ethers";
+import { Instance } from "@skalenetwork/skale-contracts-ethers-v6";
 import { SafeSubmitter } from "./safe-submitter";
-import { Instance } from "@skalenetwork/skale-contracts-ethers-v5";
+interface Network {
+    targetSchainHash: BytesLike;
+    mainnetChainId?: bigint;
+}
 export declare class SafeToImaSubmitter extends SafeSubmitter {
     imaInstance: Instance;
     targetSchainHash: BytesLike;
-    private _messageProxyForMainnet;
-    constructor(safeAddress: string, imaInstance: Instance, targetSchainHash: BytesLike, chainId?: number);
-    submit(transactions: UnsignedTransaction[]): Promise<void>;
-    private _getMessageProxyForMainnet;
+    private messageProxyForMainnet;
+    constructor(safeAddress: string, imaInstance: Instance, network: Network);
+    submit(transactions: Transaction[]): Promise<void>;
+    private getMessageProxyForMainnet;
 }
+export {};

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

@@ -1,30 +1,38 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SafeToImaSubmitter = void 0;
+const ethers_1 = require("ethers");
 const safe_submitter_1 = require("./safe-submitter");
 class SafeToImaSubmitter extends safe_submitter_1.SafeSubmitter {
-    constructor(safeAddress, imaInstance, targetSchainHash, chainId) {
-        super(safeAddress, chainId);
+    constructor(safeAddress, imaInstance, network) {
+        super(safeAddress, network.mainnetChainId);
         this.imaInstance = imaInstance;
-        this.targetSchainHash = targetSchainHash;
+        this.targetSchainHash = network.targetSchainHash;
     }
     async submit(transactions) {
-        if (transactions.length > 1) {
-            this._atomicityWarning();
+        const singleTransaction = 1;
+        if (transactions.length > singleTransaction) {
+            SafeToImaSubmitter.atomicityWarning();
         }
-        const messageProxyForMainnet = await this._getMessageProxyForMainnet(), transactionsToIma = transactions.map((transaction) => {
-            return {
-                to: messageProxyForMainnet.address,
-                data: messageProxyForMainnet.interface.encodeFunctionData("postOutgoingMessage", [this.targetSchainHash, transaction.to, transaction.data])
-            };
-        });
+        const messageProxyForMainnet = await this.getMessageProxyForMainnet();
+        const messageProxyForMainnetAddress = await messageProxyForMainnet.getAddress();
+        const transactionsToIma = transactions.map((transaction) => ethers_1.Transaction.from({
+            "data": messageProxyForMainnet.interface.encodeFunctionData("postOutgoingMessage", [
+                this.targetSchainHash,
+                transaction.to,
+                transaction.data
+            ]),
+            "to": messageProxyForMainnetAddress
+        }));
         await super.submit(transactionsToIma);
     }
-    async _getMessageProxyForMainnet() {
-        if (this._messageProxyForMainnet === undefined) {
-            this._messageProxyForMainnet = await this.imaInstance.getContract("MessageProxyForMainnet");
+    async getMessageProxyForMainnet() {
+        if (typeof this.messageProxyForMainnet === "undefined") {
+            this.messageProxyForMainnet =
+                await this.imaInstance.getContract("MessageProxyForMainnet");
         }
-        return this._messageProxyForMainnet;
+        return this.messageProxyForMainnet;
     }
 }
 exports.SafeToImaSubmitter = SafeToImaSubmitter;
+//# sourceMappingURL=safe-to-ima-submitter.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"safe-to-ima-submitter.js","sourceRoot":"","sources":["../../../src/submitters/safe-to-ima-submitter.ts"],"names":[],"mappings":";;;AAAA,mCAA4D;AAE5D,qDAA+C;AAQ/C,MAAa,kBAAmB,SAAQ,8BAAa;IAOjD,YACI,WAAmB,EACnB,WAAqB,EACrB,OAAgB;QAEhB,KAAK,CACD,WAAW,EACX,OAAO,CAAC,cAAc,CACzB,CAAC;QACF,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,MAAM,CAAE,YAA2B;QACrC,MAAM,iBAAiB,GAAG,CAAC,CAAC;QAC5B,IAAI,YAAY,CAAC,MAAM,GAAG,iBAAiB,EAAE;YACzC,kBAAkB,CAAC,gBAAgB,EAAE,CAAC;SACzC;QACD,MAAM,sBAAsB,GAAG,MAAM,IAAI,CAAC,yBAAyB,EAAE,CAAC;QACtE,MAAM,6BAA6B,GAAG,MAAM,sBAAsB,CAAC,UAAU,EAAE,CAAC;QAChF,MAAM,iBAAiB,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,oBAAW,CAAC,IAAI,CAAC;YACzE,MAAM,EAAE,sBAAsB,CAAC,SAAS,CAAC,kBAAkB,CACvD,qBAAqB,EACrB;gBACI,IAAI,CAAC,gBAAgB;gBACrB,WAAW,CAAC,EAAE;gBACd,WAAW,CAAC,IAAI;aACnB,CACJ;YACD,IAAI,EAAE,6BAA6B;SACtC,CAAC,CAAC,CAAC;QACJ,MAAM,KAAK,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;IAC1C,CAAC;IAEO,KAAK,CAAC,yBAAyB;QACnC,IAAI,OAAO,IAAI,CAAC,sBAAsB,KAAK,WAAW,EAAE;YACpD,IAAI,CAAC,sBAAsB;gBACvB,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,wBAAwB,CAAC,CAAC;SACpE;QACD,OAAO,IAAI,CAAC,sBAAsB,CAAC;IACvC,CAAC;CACJ;AAhDD,gDAgDC"}

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

@@ -1,5 +1,5 @@
-import { UnsignedTransaction } from "ethers";
+import { Transaction } from "ethers";
 export declare abstract class Submitter {
-    abstract submit(transactions: UnsignedTransaction[]): Promise<void>;
-    _atomicityWarning(): void;
+    abstract submit(transactions: Transaction[]): Promise<void>;
+    protected static atomicityWarning(): void;
 }

package/dist/src/submitters/submitter.js

@@ -4,18 +4,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Submitter = void 0;
+const exitCodes_1 = require("../exitCodes");
 const chalk_1 = __importDefault(require("chalk"));
 class Submitter {
-    // private
-    _atomicityWarning() {
-        if (!process.env.ALLOW_NOT_ATOMIC_UPGRADE) {
-            console.log(chalk_1.default.red("The upgrade will consist of multiple transactions and will not be atomic"));
-            console.log(chalk_1.default.red("If not atomic upgrade is OK set ALLOW_NOT_ATOMIC_UPGRADE environment variable"));
-            process.exit(1);
+    // Protected
+    static atomicityWarning() {
+        if (process.env.ALLOW_NOT_ATOMIC_UPGRADE) {
+            console.log(chalk_1.default.yellow("Not atomic upgrade is performing"));
         }
         else {
-            console.log(chalk_1.default.yellow("Not atomic upgrade is performing"));
+            console.log(chalk_1.default.red("The upgrade will consist" +
+                " of multiple transactions and will not be atomic"));
+            console.log(chalk_1.default.red("If not atomic upgrade is OK" +
+                " set ALLOW_NOT_ATOMIC_UPGRADE environment variable"));
+            process.exit(exitCodes_1.EXIT_CODES.NOT_ATOMIC_UPGRADE);
         }
     }
 }
 exports.Submitter = Submitter;
+//# sourceMappingURL=submitter.js.map

package/dist/src/submitters/submitter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"submitter.js","sourceRoot":"","sources":["../../../src/submitters/submitter.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAwC;AAExC,kDAA0B;AAG1B,MAAsB,SAAS;IAG3B,YAAY;IAEF,MAAM,CAAC,gBAAgB;QAC7B,IAAI,OAAO,CAAC,GAAG,CAAC,wBAAwB,EAAE;YACtC,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,MAAM,CAAC,kCAAkC,CAAC,CAAC,CAAC;SACjE;aAAM;YACH,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,0BAA0B;gBAC5C,kDAAkD,CAAC,CAAC,CAAC;YACzD,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,6BAA6B;gBAC/C,oDAAoD,CAAC,CAAC,CAAC;YAC3D,OAAO,CAAC,IAAI,CAAC,sBAAU,CAAC,kBAAkB,CAAC,CAAC;SAC/C;IACL,CAAC;CACJ;AAhBD,8BAgBC"}

package/dist/src/submitters/types/marionette.d.ts

@@ -1,12 +1,15 @@
-import { BigNumberish, BytesLike } from "ethers";
-import { ethers as RawEthers } from "ethers";
+import { BigNumberish, BytesLike, ethers as RawEthers } from "ethers";
 export declare const MARIONETTE_ADDRESS = "0xD2c0DeFACe000000000000000000000000000000";
 type FunctionCallStruct = {
     receiver: string;
     value: BigNumberish;
     data: BytesLike;
 };
-export interface Marionette extends RawEthers.Contract {
+export interface LegacyMarionette extends RawEthers.BaseContract {
+    encodeFunctionCall(receiver: string, value: BigNumberish, data: BytesLike): Promise<BytesLike>;
+    version(): Promise<string>;
+}
+export interface Marionette extends RawEthers.BaseContract {
     encodeFunctionCalls(functionCalls: FunctionCallStruct[]): Promise<BytesLike>;
     version(): Promise<string>;
 }

package/dist/src/submitters/types/marionette.js

@@ -2,3 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MARIONETTE_ADDRESS = void 0;
 exports.MARIONETTE_ADDRESS = "0xD2c0DeFACe000000000000000000000000000000";
+//# sourceMappingURL=marionette.js.map

package/dist/src/submitters/types/marionette.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"marionette.js","sourceRoot":"","sources":["../../../../src/submitters/types/marionette.ts"],"names":[],"mappings":";;;AAGa,QAAA,kBAAkB,GAAG,4CAA4C,CAAC"}

package/dist/src/types/SkaleManifestData.js

@@ -1,2 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=SkaleManifestData.js.map

package/dist/src/types/SkaleManifestData.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SkaleManifestData.js","sourceRoot":"","sources":["../../../src/types/SkaleManifestData.ts"],"names":[],"mappings":""}

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

@@ -0,0 +1,12 @@
+import { Instance } from "@skalenetwork/skale-contracts-ethers-v6";
+export interface ContractToUpgrade {
+    proxyAddress: string;
+    implementationAddress: string;
+    name: string;
+}
+export interface Project {
+    name: string;
+    instance: Instance;
+    version: string;
+    contractNamesToUpgrade: string[];
+}

package/dist/src/types/upgrader.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=upgrader.js.map

package/dist/src/types/upgrader.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"upgrader.js","sourceRoot":"","sources":["../../../src/types/upgrader.ts"],"names":[],"mappings":""}

package/dist/src/upgrader.d.ts

@@ -1,18 +1,37 @@
-import { UnsignedTransaction } from "ethers";
+import { Transaction } from "ethers";
+import { Project } from "./types/upgrader";
+import { Instance } from "@skalenetwork/skale-contracts-ethers-v6";
+import { NonceProvider } from "./nonceProvider";
+import { ProxyAdmin } from "../typechain-types";
+import Semaphore from 'semaphore-async-await';
 import { Submitter } from "./submitters/submitter";
-import { Instance } from "@skalenetwork/skale-contracts-ethers-v5";
 export declare abstract class Upgrader {
     instance: Instance;
     targetVersion: string;
     contractNamesToUpgrade: string[];
     projectName: string;
-    transactions: UnsignedTransaction[];
+    transactions: Transaction[];
     submitter: Submitter;
-    constructor(projectName: string, targetVersion: string, instance: Instance, contractNamesToUpgrade: string[], submitter?: Submitter);
+    nonceProvider?: NonceProvider;
+    deploySemaphore: Semaphore;
+    constructor(project: Project, submitter?: Submitter);
     abstract getDeployedVersion: () => Promise<string | undefined>;
     abstract setVersion: (newVersion: string) => Promise<void>;
-    deployNewContracts: () => Promise<void>;
-    initialize: () => Promise<void>;
+    deployNewContracts?: () => Promise<void>;
+    initialize?: () => Promise<void>;
     upgrade(): Promise<void>;
-    _getContractFactoryAndUpdateManifest(contract: string): Promise<import("ethers").ContractFactory>;
+    static getProxyAdmin(): Promise<ProxyAdmin>;
+    private callInitialize;
+    private callDeployNewContracts;
+    private prepareVersion;
+    private writeTransactions;
+    private static verify;
+    private switchToNewImplementations;
+    private deployNewImplementations;
+    private protectedDeployNewImplementation;
+    private deployNewImplementation;
+    private prepareUpgrade;
+    private getNormalizedDeployedVersion;
+    private checkVersion;
+    private static isNewProxyAdmin;
 }

package/dist/src/upgrader.js

@@ -4,126 +4,205 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Upgrader = void 0;
-const hardhat_1 = __importDefault(require("hardhat"));
+const ethers_1 = require("ethers");
+const upgrades_core_1 = require("@openzeppelin/upgrades-core");
+const hardhat_1 = require("hardhat");
+const auto_submitter_1 = require("./submitters/auto-submitter");
+const exitCodes_1 = require("./exitCodes");
+const nonceProvider_1 = require("./nonceProvider");
+const semaphore_async_await_1 = __importDefault(require("semaphore-async-await"));
 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 fs_1 = require("fs");
-const deploy_1 = require("./deploy");
-const upgrades_core_1 = require("@openzeppelin/upgrades-core");
+const contractFactory_1 = require("./contractFactory");
+const version_1 = require("./version");
 const verification_1 = require("./verification");
-const auto_submitter_1 = require("./submitters/auto-submitter");
+const withoutNull = (array) => array.
+    filter((element) => element !== null);
+// TODO: Set to 8 when upgrade plugins become thread safe
+const maxSimultaneousDeployments = 1;
+//                    10 minutes
+const deployTimeout = 60e4;
 class Upgrader {
-    constructor(projectName, targetVersion, instance, contractNamesToUpgrade, submitter = new auto_submitter_1.AutoSubmitter()) {
-        // protected
-        this.deployNewContracts = () => { return Promise.resolve(); };
-        this.initialize = () => { return Promise.resolve(); };
-        this.targetVersion = targetVersion;
-        if (!targetVersion.includes('-')) {
-            this.targetVersion = targetVersion + '-stable.0';
-        }
-        this.instance = instance;
-        this.contractNamesToUpgrade = contractNamesToUpgrade;
-        this.projectName = projectName;
+    constructor(project, submitter = new auto_submitter_1.AutoSubmitter()) {
+        this.targetVersion = project.version;
+        if (!project.version.includes("-")) {
+            this.targetVersion = `${project.version}-stable.0`;
+        }
+        this.instance = project.instance;
+        this.contractNamesToUpgrade = project.contractNamesToUpgrade;
+        this.projectName = project.name;
         this.transactions = [];
         this.submitter = submitter;
+        this.deploySemaphore = new semaphore_async_await_1.default(maxSimultaneousDeployments);
     }
-    // public
+    // Public
     async upgrade() {
-        const proxyAdmin = await (0, admin_1.getManifestAdmin)(hardhat_1.default);
-        let deployedVersion = await this.getDeployedVersion();
+        const version = await this.prepareVersion();
+        await this.callDeployNewContracts();
+        const contractsToUpgrade = await this.deployNewImplementations();
+        await this.switchToNewImplementations(contractsToUpgrade, await Upgrader.getProxyAdmin());
+        await this.callInitialize();
+        // Write version
+        await this.setVersion(version);
+        await this.writeTransactions(version);
+        await this.submitter.submit(this.transactions);
+        await Upgrader.verify(contractsToUpgrade);
+        console.log("Done");
+    }
+    static async getProxyAdmin() {
+        const manifest = await upgrades_core_1.Manifest.forNetwork(hardhat_1.network.provider);
+        const adminDeployment = await manifest.getAdmin();
+        if (!adminDeployment) {
+            throw new Error("Can't load ProxyAdmin address");
+        }
+        const factory = await hardhat_1.ethers.getContractFactory("ProxyAdmin");
+        return factory.attach(adminDeployment.address);
+    }
+    // Private
+    async callInitialize() {
+        if (typeof this.initialize !== "undefined") {
+            await this.initialize();
+        }
+    }
+    async callDeployNewContracts() {
+        if (typeof this.deployNewContracts !== "undefined") {
+            // Deploy new contracts
+            await this.deployNewContracts();
+        }
+    }
+    async prepareVersion() {
         const version = await (0, version_1.getVersion)();
-        if (deployedVersion) {
-            if (!deployedVersion.includes('-')) {
-                deployedVersion = deployedVersion + '-stable.0';
-            }
-            if (deployedVersion !== this.targetVersion) {
-                console.log(chalk_1.default.red(`This script can't upgrade version ${deployedVersion} to ${version}`));
-                process.exit(1);
-            }
+        await this.checkVersion(version);
+        console.log(`Will mark updated version as ${version}`);
+        return version;
+    }
+    async writeTransactions(version) {
+        const indentation = 4;
+        await fs_1.promises.writeFile(`data/transactions-${version}-${hardhat_1.network.name}.json`, JSON.stringify(this.transactions, null, indentation));
+    }
+    static async verify(contractsToUpgrade) {
+        if (process.env.NO_VERIFY) {
+            console.log("Skip verification");
         }
         else {
-            console.log(chalk_1.default.yellow(`Can't check currently deployed version of ${this.projectName}`));
+            console.log("Start verification");
+            await Promise.all(contractsToUpgrade.map((contract) => (0, verification_1.verify)(contract.name, contract.implementationAddress, [])));
         }
-        console.log(`Will mark updated version as ${version}`);
-        // Deploy new contracts
-        await this.deployNewContracts();
-        // Deploy new implementations
-        const contractsToUpgrade = [];
-        for (const contract of this.contractNamesToUpgrade) {
-            const contractFactory = await this._getContractFactoryAndUpdateManifest(contract), 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, {
-                unsafeAllowLinkedLibraries: true,
-                unsafeAllowRenames: true
+    }
+    async switchToNewImplementations(contractsToUpgrade, proxyAdmin) {
+        const proxyAdminAddress = await proxyAdmin.getAddress();
+        const newProxyAdmin = await Upgrader.isNewProxyAdmin(proxyAdminAddress);
+        for (const contract of contractsToUpgrade) {
+            const infoMessage = `Prepare transaction to upgrade ${contract.name}` +
+                ` at ${contract.proxyAddress}` +
+                ` to ${contract.implementationAddress}`;
+            console.log(chalk_1.default.yellowBright(infoMessage));
+            let transaction = ethers_1.Transaction.from({
+                "data": proxyAdmin.interface.encodeFunctionData("upgradeAndCall", [
+                    contract.proxyAddress,
+                    contract.implementationAddress,
+                    ""
+                ]),
+                "to": proxyAdminAddress
             });
-            if (newImplementationAddress !== currentImplementationAddress) {
-                contractsToUpgrade.push({
-                    proxyAddress,
-                    implementationAddress: newImplementationAddress,
-                    name: contract
+            if (!newProxyAdmin) {
+                transaction = ethers_1.Transaction.from({
+                    "data": proxyAdmin.interface.encodeFunctionData("upgrade", [
+                        contract.proxyAddress,
+                        contract.implementationAddress
+                    ]),
+                    "to": proxyAdminAddress
                 });
             }
-            else {
-                console.log(chalk_1.default.gray(`Contract ${contract} is up to date`));
-            }
+            this.transactions.push(transaction);
         }
-        // Switch proxies to new implementations
-        for (const contract of contractsToUpgrade) {
-            console.log(chalk_1.default.yellowBright(`Prepare transaction to upgrade ${contract.name} at ${contract.proxyAddress} to ${contract.implementationAddress}`));
-            this.transactions.push({
-                to: proxyAdmin.address,
-                data: proxyAdmin.interface.encodeFunctionData("upgrade", [contract.proxyAddress, contract.implementationAddress])
-            });
+    }
+    async deployNewImplementations() {
+        const [deployer] = await hardhat_1.ethers.getSigners();
+        this.nonceProvider ?? (this.nonceProvider = await nonceProvider_1.NonceProvider.createForWallet(deployer));
+        const contracts = await Promise.all(this.contractNamesToUpgrade.
+            map(this.protectedDeployNewImplementation, this));
+        return withoutNull(contracts);
+    }
+    async protectedDeployNewImplementation(contract) {
+        await this.deploySemaphore.acquire();
+        let result = null;
+        try {
+            result = await this.deployNewImplementation(contract);
         }
-        await this.initialize();
-        // write version
-        await this.setVersion(version);
-        await fs_1.promises.writeFile(`data/transactions-${version}-${hardhat_2.network.name}.json`, JSON.stringify(this.transactions, null, 4));
-        await this.submitter.submit(this.transactions);
-        if (process.env.NO_VERIFY) {
-            console.log("Skip verification");
+        finally {
+            this.deploySemaphore.release();
         }
-        else {
-            console.log("Start verification");
-            for (const contract of contractsToUpgrade) {
-                await (0, verification_1.verify)(contract.name, contract.implementationAddress, []);
-            }
+        return result;
+    }
+    async deployNewImplementation(contract) {
+        const contractFactory = await (0, contractFactory_1.getContractFactoryAndUpdateManifest)(contract, this.nonceProvider);
+        const proxyAddress = await (await this.instance.getContract(contract)).getAddress();
+        console.log(`Prepare upgrade of ${contract}`);
+        return this.prepareUpgrade(contract, proxyAddress, contractFactory);
+    }
+    async prepareUpgrade(contractName, proxyAddress, contractFactory) {
+        const currentImplementationAddress = await (0, upgrades_core_1.getImplementationAddress)(hardhat_1.network.provider, proxyAddress);
+        const nonce = this.nonceProvider?.reserveNonce();
+        const newImplementationAddress = await hardhat_1.upgrades.prepareUpgrade(proxyAddress, contractFactory, {
+            "timeout": deployTimeout,
+            "txOverrides": {
+                nonce
+            },
+            "unsafeAllowLinkedLibraries": true,
+            "unsafeAllowRenames": true
+        });
+        if (newImplementationAddress !== currentImplementationAddress) {
+            return {
+                "implementationAddress": newImplementationAddress,
+                "name": contractName,
+                proxyAddress
+            };
         }
-        console.log("Done");
+        console.log(chalk_1.default.gray(`Contract ${contractName} is up to date`));
+        if (nonce) {
+            this.nonceProvider?.releaseNonce(nonce);
+        }
+        return null;
     }
-    // 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"));
-        if (!Object.keys(linkReferences).length)
-            return await hardhat_2.ethers.getContractFactory(contract);
-        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], { bytecode } = await hardhat_2.artifacts.readArtifact(libraryName);
-            if (manifest.libraries[libraryName] === undefined) {
-                librariesToUpgrade.push(libraryName);
-                continue;
-            }
-            const libraryBytecodeHash = manifest.libraries[libraryName].bytecodeHash;
-            if ((0, upgrades_core_1.hashBytecode)(bytecode) !== libraryBytecodeHash) {
-                librariesToUpgrade.push(libraryName);
+    async getNormalizedDeployedVersion() {
+        const deployedVersion = await this.getDeployedVersion();
+        if (deployedVersion) {
+            if (!deployedVersion.includes("-")) {
+                return `${deployedVersion}-stable.0`;
             }
-            else {
-                oldLibraries[libraryName] = manifest.libraries[libraryName].address;
+            return deployedVersion;
+        }
+        return deployedVersion;
+    }
+    async checkVersion(version) {
+        const deployedVersion = await this.getNormalizedDeployedVersion();
+        if (deployedVersion) {
+            if (deployedVersion !== this.targetVersion) {
+                const cannotUpgradeMessage = `This script can't upgrade version ${deployedVersion}` +
+                    ` to ${version}`;
+                console.log(chalk_1.default.red(cannotUpgradeMessage));
+                process.exit(exitCodes_1.EXIT_CODES.BAD_VERSION);
             }
         }
-        const libraries = await (0, deploy_1.deployLibraries)(librariesToUpgrade);
-        for (const [libraryName, libraryAddress] of libraries.entries()) {
-            const { bytecode } = await hardhat_2.artifacts.readArtifact(libraryName);
-            manifest.libraries[libraryName] = { "address": libraryAddress, "bytecodeHash": (0, upgrades_core_1.hashBytecode)(bytecode) };
+        else {
+            const cannotCheckMessage = `Can't check currently deployed version of ${this.projectName}`;
+            console.log(chalk_1.default.yellow(cannotCheckMessage));
+        }
+    }
+    static async isNewProxyAdmin(proxyAdminAddress) {
+        const interfaceVersionAbi = ["function UPGRADE_INTERFACE_VERSION()"];
+        const proxyAdminContract = new hardhat_1.ethers.Contract(proxyAdminAddress, interfaceVersionAbi);
+        try {
+            // This function name is set in external library
+            // eslint-disable-next-line new-cap
+            await proxyAdminContract.UPGRADE_INTERFACE_VERSION();
+            return true;
+        }
+        catch {
+            return false;
         }
-        Object.assign(libraries, oldLibraries);
-        await fs_1.promises.writeFile(await (0, deploy_1.getManifestFile)(), JSON.stringify(manifest, null, 4));
-        return await (0, deploy_1.getLinkedContractFactory)(contract, libraries);
     }
 }
 exports.Upgrader = Upgrader;
+//# sourceMappingURL=upgrader.js.map

package/dist/src/upgrader.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"upgrader.js","sourceRoot":"","sources":["../../src/upgrader.ts"],"names":[],"mappings":";;;;;;AAAA,mCAAoD;AAEpD,+DAA+E;AAC/E,qCAAkD;AAClD,gEAA0D;AAC1D,2CAAuC;AAEvC,mDAA8C;AAE9C,kFAA8C;AAE9C,kDAA0B;AAC1B,2BAAkC;AAClC,uDAAsE;AACtE,uCAAqC;AACrC,iDAAsC;AAGtC,MAAM,WAAW,GAAG,CAAI,KAAsB,EAAE,EAAE,CAAC,KAAK;IACpD,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,KAAK,IAAI,CAAa,CAAC;AAEtD,yDAAyD;AACzD,MAAM,0BAA0B,GAAG,CAAC,CAAC;AACrC,gCAAgC;AAChC,MAAM,aAAa,GAAG,IAAI,CAAC;AAG3B,MAAsB,QAAQ;IAiB1B,YACI,OAAgB,EAChB,YAAuB,IAAI,8BAAa,EAAE;QAE1C,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC;QACrC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YAChC,IAAI,CAAC,aAAa,GAAG,GAAG,OAAO,CAAC,OAAO,WAAW,CAAC;SACtD;QACD,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QACjC,IAAI,CAAC,sBAAsB,GAAG,OAAO,CAAC,sBAAsB,CAAC;QAC7D,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;QAChC,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;QACvB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,eAAe,GAAG,IAAI,+BAAS,CAAC,0BAA0B,CAAC,CAAC;IACrE,CAAC;IAcD,SAAS;IAET,KAAK,CAAC,OAAO;QACT,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAC5C,MAAM,IAAI,CAAC,sBAAsB,EAAE,CAAC;QACpC,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,wBAAwB,EAAE,CAAC;QACjE,MAAM,IAAI,CAAC,0BAA0B,CACjC,kBAAkB,EAClB,MAAM,QAAQ,CAAC,aAAa,EAAE,CACjC,CAAC;QACF,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAC5B,gBAAgB;QAChB,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAC/B,MAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;QACtC,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC/C,MAAM,QAAQ,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;QAC1C,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACxB,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,aAAa;QACtB,MAAM,QAAQ,GAAG,MAAM,wBAAQ,CAAC,UAAU,CAAC,iBAAO,CAAC,QAAQ,CAAC,CAAC;QAC7D,MAAM,eAAe,GAAG,MAAM,QAAQ,CAAC,QAAQ,EAAE,CAAC;QAClD,IAAI,CAAC,eAAe,EAAE;YAClB,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;SACpD;QACD,MAAM,OAAO,GAAG,MAAM,gBAAM,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;QAC9D,OAAO,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC,OAAO,CAAe,CAAC;IACjE,CAAC;IAED,UAAU;IAEF,KAAK,CAAC,cAAc;QACxB,IAAI,OAAO,IAAI,CAAC,UAAU,KAAK,WAAW,EAAE;YACxC,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;SAC3B;IACL,CAAC;IAEO,KAAK,CAAC,sBAAsB;QAChC,IAAI,OAAO,IAAI,CAAC,kBAAkB,KAAK,WAAW,EAAE;YAChD,uBAAuB;YACvB,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;SACnC;IACL,CAAC;IAEO,KAAK,CAAC,cAAc;QACxB,MAAM,OAAO,GAAG,MAAM,IAAA,oBAAU,GAAE,CAAC;QACnC,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QACjC,OAAO,CAAC,GAAG,CAAC,gCAAgC,OAAO,EAAE,CAAC,CAAC;QACvD,OAAO,OAAO,CAAC;IACnB,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAAE,OAAe;QAC5C,MAAM,WAAW,GAAG,CAAC,CAAC;QACtB,MAAM,aAAE,CAAC,SAAS,CACd,qBAAqB,OAAO,IAAI,iBAAO,CAAC,IAAI,OAAO,EACnD,IAAI,CAAC,SAAS,CACV,IAAI,CAAC,YAAY,EACjB,IAAI,EACJ,WAAW,CACd,CACJ,CAAC;IACN,CAAC;IAEO,MAAM,CAAC,KAAK,CAAC,MAAM,CAAE,kBAAuC;QAChE,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE;YACvB,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;SACpC;aAAM;YACH,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;YAClC,MAAM,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAA,qBAAM,EACzD,QAAQ,CAAC,IAAI,EACb,QAAQ,CAAC,qBAAqB,EAC9B,EAAE,CACL,CAAC,CAAC,CAAC;SACP;IACL,CAAC;IAEO,KAAK,CAAC,0BAA0B,CACpC,kBAAuC,EACvC,UAAsB;QAEtB,MAAM,iBAAiB,GAAG,MAAM,UAAU,CAAC,UAAU,EAAE,CAAC;QACxD,MAAM,aAAa,GAAG,MAAM,QAAQ,CAAC,eAAe,CAAC,iBAAiB,CAAC,CAAC;QACxE,KAAK,MAAM,QAAQ,IAAI,kBAAkB,EAAE;YACvC,MAAM,WAAW,GACb,kCAAkC,QAAQ,CAAC,IAAI,EAAE;gBACjD,OAAO,QAAQ,CAAC,YAAY,EAAE;gBAC9B,OAAO,QAAQ,CAAC,qBAAqB,EAAE,CAAC;YAC5C,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,CAAC;YAC7C,IAAI,WAAW,GAAG,oBAAW,CAAC,IAAI,CAAC;gBAC3B,MAAM,EAAE,UAAU,CAAC,SAAS,CAAC,kBAAkB,CAC3C,gBAAgB,EAChB;oBACI,QAAQ,CAAC,YAAY;oBACrB,QAAQ,CAAC,qBAAqB;oBAC9B,EAAE;iBACL,CACJ;gBACD,IAAI,EAAE,iBAAiB;aAC1B,CAAC,CAAC;YACP,IAAI,CAAC,aAAa,EAAE;gBAChB,WAAW,GAAG,oBAAW,CAAC,IAAI,CAAC;oBAC3B,MAAM,EAAE,UAAU,CAAC,SAAS,CAAC,kBAAkB,CAC3C,SAAS,EACT;wBACI,QAAQ,CAAC,YAAY;wBACrB,QAAQ,CAAC,qBAAqB;qBACjC,CACJ;oBACD,IAAI,EAAE,iBAAiB;iBAC1B,CAAC,CAAC;aACN;YACD,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SACvC;IACL,CAAC;IAEO,KAAK,CAAC,wBAAwB;QAClC,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,gBAAM,CAAC,UAAU,EAAE,CAAC;QAC7C,IAAI,CAAC,aAAa,KAAlB,IAAI,CAAC,aAAa,GAAK,MAAM,6BAAa,CAAC,eAAe,CAAC,QAAQ,CAAC,EAAC;QACrE,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,sBAAsB;YAC3D,GAAG,CACC,IAAI,CAAC,gCAAgC,EACrC,IAAI,CACP,CAAC,CAAC;QACP,OAAO,WAAW,CAAC,SAAS,CAAC,CAAC;IAClC,CAAC;IAEO,KAAK,CAAC,gCAAgC,CAAE,QAAgB;QAC5D,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC;QACrC,IAAI,MAAM,GAA6B,IAAI,CAAC;QAC5C,IAAI;YACA,MAAM,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC;SACzD;gBAAS;YACN,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC;SAClC;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAEO,KAAK,CAAC,uBAAuB,CAAE,QAAgB;QACnD,MAAM,eAAe,GAAG,MAAM,IAAA,qDAAmC,EAC7D,QAAQ,EACR,IAAI,CAAC,aAAa,CACrB,CAAC;QACF,MAAM,YAAY,GAAG,MACb,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC;QAEjE,OAAO,CAAC,GAAG,CAAC,sBAAsB,QAAQ,EAAE,CAAC,CAAC;QAE9C,OAAO,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,YAAY,EAAE,eAAe,CAAC,CAAC;IACxE,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,YAAoB,EAAE,YAAoB,EAAE,eAAgC;QACrG,MAAM,4BAA4B,GAAG,MAAM,IAAA,wCAAwB,EAC/D,iBAAO,CAAC,QAAQ,EAChB,YAAY,CACf,CAAC;QAEF,MAAM,KAAK,GAAG,IAAI,CAAC,aAAa,EAAE,YAAY,EAAE,CAAC;QAEjD,MAAM,wBAAwB,GAAG,MAAM,kBAAQ,CAAC,cAAc,CAC1D,YAAY,EACZ,eAAe,EACf;YACI,SAAS,EAAE,aAAa;YACxB,aAAa,EAAE;gBACX,KAAK;aACR;YACD,4BAA4B,EAAE,IAAI;YAClC,oBAAoB,EAAE,IAAI;SAC7B,CACM,CAAC;QACZ,IAAI,wBAAwB,KAAK,4BAA4B,EAAE;YAC3D,OAAO;gBACH,uBAAuB,EAAE,wBAAwB;gBACjD,MAAM,EAAE,YAAY;gBACpB,YAAY;aACf,CAAC;SACL;QACD,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,IAAI,CAAC,YAAY,YAAY,gBAAgB,CAAC,CAAC,CAAC;QAClE,IAAI,KAAK,EAAE;YACP,IAAI,CAAC,aAAa,EAAE,YAAY,CAAC,KAAK,CAAC,CAAC;SAC3C;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAEO,KAAK,CAAC,4BAA4B;QACtC,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACxD,IAAI,eAAe,EAAE;YACjB,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBAChC,OAAO,GAAG,eAAe,WAAW,CAAC;aACxC;YACD,OAAO,eAAe,CAAC;SAC1B;QACD,OAAO,eAAe,CAAC;IAC3B,CAAC;IAEO,KAAK,CAAC,YAAY,CAAE,OAAe;QACvC,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,4BAA4B,EAAE,CAAC;QAClE,IAAI,eAAe,EAAE;YACjB,IAAI,eAAe,KAAK,IAAI,CAAC,aAAa,EAAE;gBACxC,MAAM,oBAAoB,GACtB,qCAAqC,eAAe,EAAE;oBACtD,OAAO,OAAO,EAAE,CAAC;gBACrB,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC,CAAC;gBAC7C,OAAO,CAAC,IAAI,CAAC,sBAAU,CAAC,WAAW,CAAC,CAAC;aACxC;SACJ;aAAM;YACH,MAAM,kBAAkB,GACpB,6CAA6C,IAAI,CAAC,WAAW,EAAE,CAAC;YACpE,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,CAAC;SACjD;IACL,CAAC;IAEO,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,iBAAyB;QAC1D,MAAM,mBAAmB,GAAG,CAAC,sCAAsC,CAAC,CAAC;QACrE,MAAM,kBAAkB,GAAG,IAAI,gBAAM,CAAC,QAAQ,CAAC,iBAAiB,EAAE,mBAAmB,CAAC,CAAC;QACvF,IAAI;YACA,gDAAgD;YAChD,mCAAmC;YACnC,MAAM,kBAAkB,CAAC,yBAAyB,EAAE,CAAC;YACrD,OAAO,IAAI,CAAC;SACf;QAAC,MAAM;YACJ,OAAO,KAAK,CAAC;SAChB;IACL,CAAC;CACJ;AA7QD,4BA6QC"}

package/dist/src/verification.d.ts

@@ -1,2 +1,2 @@
-export declare function verify(contractName: string, contractAddress: string, constructorArguments: object): Promise<void>;
-export declare function verifyProxy(contractName: string, proxyAddress: string, constructorArguments: object): Promise<void>;
+export declare const verify: (contractName: string, contractAddress: string, constructorArguments: object) => Promise<void>;
+export declare const verifyProxy: (contractName: string, proxyAddress: string, constructorArguments: object) => Promise<void>;