@skalenetwork/upgrade-tools 3.0.0-verification.0 → 4.0.0-develop.1

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,CAAC;YACvC,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,MAAM,CAAC,kCAAkC,CAAC,CAAC,CAAC;QAClE,CAAC;aAAM,CAAC;YACJ,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;QAChD,CAAC;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/{typechain-types/AccessControlUpgradeable.js → src/types/upgrader.js}

@@ -1,2 +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,33 @@
-import { UnsignedTransaction } from "ethers";
+import { Transaction } from "ethers";
+import { Project } from "./types/upgrader";
+import { Instance } from "@skalenetwork/skale-contracts-ethers-v6";
 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[];
-    submitter: Submitter;
-    constructor(projectName: string, targetVersion: string, instance: Instance, contractNamesToUpgrade: string[], submitter?: Submitter);
+    private targetVersion;
+    private contractNamesToUpgrade;
+    private projectName;
+    private submitter;
+    private nonceProvider?;
+    private deploySemaphore;
+    protected instance: Instance;
+    protected transactions: Transaction[];
+    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>;
+    getOwner(): Promise<string>;
+    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;
 }

package/dist/src/upgrader.js

@@ -4,126 +4,176 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Upgrader = void 0;
-const hardhat_1 = __importDefault(require("hardhat"));
+const hardhat_1 = require("hardhat");
+const proxyAdmin_1 = require("./proxyAdmin");
+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 contractFactory_1 = require("./contractFactory");
 const upgrades_core_1 = require("@openzeppelin/upgrades-core");
+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';
+    constructor(project, submitter) {
+        this.targetVersion = project.version;
+        if (!project.version.includes("-")) {
+            this.targetVersion = `${project.version}-stable.0`;
         }
-        this.instance = instance;
-        this.contractNamesToUpgrade = contractNamesToUpgrade;
-        this.projectName = projectName;
+        this.instance = project.instance;
+        this.contractNamesToUpgrade = project.contractNamesToUpgrade;
+        this.projectName = project.name;
         this.transactions = [];
-        this.submitter = submitter;
+        this.submitter = submitter ?? new auto_submitter_1.AutoSubmitter(this);
+        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 (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);
+        const version = await this.prepareVersion();
+        await this.callDeployNewContracts();
+        const contractsToUpgrade = await this.deployNewImplementations();
+        await this.switchToNewImplementations(contractsToUpgrade);
+        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");
+    }
+    async getOwner() {
+        const proxyAddresses = await Promise.all(this.contractNamesToUpgrade.map((contract) => this.instance.getContractAddress(contract), this));
+        const admins = await Promise.all(proxyAddresses.map((proxy) => (0, proxyAdmin_1.getProxyAdmin)(proxy)));
+        const owners = await Promise.all(admins.map((admin) => admin.owner()));
+        return owners.reduce((owner1, owner2) => {
+            if (owner1 !== owner2) {
+                throw Error("Proxies have different owners");
             }
+            return owner1;
+        });
+    }
+    // Private
+    async callInitialize() {
+        if (typeof this.initialize !== "undefined") {
+            await this.initialize();
         }
-        else {
-            console.log(chalk_1.default.yellow(`Can't check currently deployed version of ${this.projectName}`));
+    }
+    async callDeployNewContracts() {
+        if (typeof this.deployNewContracts !== "undefined") {
+            // Deploy new contracts
+            await this.deployNewContracts();
         }
+    }
+    async prepareVersion() {
+        const version = await (0, version_1.getVersion)();
+        await this.checkVersion(version);
         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
-            });
-            if (newImplementationAddress !== currentImplementationAddress) {
-                contractsToUpgrade.push({
-                    proxyAddress,
-                    implementationAddress: newImplementationAddress,
-                    name: contract
-                });
-            }
-            else {
-                console.log(chalk_1.default.gray(`Contract ${contract} is up to date`));
-            }
-        }
-        // 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])
-            });
-        }
-        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);
+        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("Start verification");
-            for (const contract of contractsToUpgrade) {
-                await (0, verification_1.verify)(contract.name, contract.implementationAddress, []);
-            }
+            await Promise.all(contractsToUpgrade.map((contract) => (0, verification_1.verify)(contract.name, contract.implementationAddress)));
         }
-        console.log("Done");
     }
-    // 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: {} });
+    async switchToNewImplementations(contractsToUpgrade) {
+        const upgradeTransactions = await Promise.all(contractsToUpgrade.map((contract) => (0, proxyAdmin_1.getUpgradeTransaction)(contract.proxyAddress, contract.implementationAddress)));
+        contractsToUpgrade.forEach((contract, index) => {
+            const infoMessage = `Prepare transaction to upgrade ${contract.name}` +
+                ` at ${contract.proxyAddress}` +
+                ` to ${contract.implementationAddress}`;
+            console.log(chalk_1.default.yellowBright(infoMessage));
+            this.transactions.push(upgradeTransactions[index]);
+        });
+    }
+    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);
         }
-        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);
+        finally {
+            this.deploySemaphore.release();
+        }
+        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(chalk_1.default.gray(`Contract ${contractName} is up to date`));
+        if (nonce) {
+            this.nonceProvider?.releaseNonce(nonce);
+        }
+        return null;
+    }
+    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));
         }
-        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":"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"}

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) => Promise<void>;
+export declare const verifyProxy: (contractName: string, proxyAddress: string) => Promise<void>;

package/dist/src/verification.js

@@ -5,38 +5,79 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.verifyProxy = exports.verify = void 0;
 const hardhat_1 = require("hardhat");
-const chain_config_1 = require("@nomicfoundation/hardhat-verify/internal/chain-config");
+const blockscoutVerifier_1 = require("./verifiers/blockscoutVerifier");
+const etherscanVerifier_1 = require("./verifiers/etherscanVerifier");
+const skaleBlockscoutVerifier_1 = require("./verifiers/skaleBlockscoutVerifier");
 const chalk_1 = __importDefault(require("chalk"));
 const upgrades_core_1 = require("@openzeppelin/upgrades-core");
-async function verify(contractName, contractAddress, constructorArguments) {
-    const chainId = (await hardhat_1.ethers.provider.getNetwork()).chainId;
-    if (chain_config_1.builtinChains.find(chain => chain.chainId === chainId) !== undefined) {
-        for (let retry = 0; retry <= 5; ++retry) {
-            try {
-                await (0, hardhat_1.run)("verify:verify", {
-                    address: contractAddress,
-                    constructorArguments
-                });
-                break;
-            }
-            catch (e) {
-                if (e instanceof Error) {
-                    if (e.toString().includes("Contract source code already verified")) {
-                        console.log(chalk_1.default.grey(`${contractName} is already verified`));
-                        return;
-                    }
-                    console.log(chalk_1.default.red(`Contract ${contractName} was not verified on etherscan`));
-                    console.log(e.toString());
-                }
-                else {
-                    console.log("Unknown exception type:", e);
-                }
+const setupEtherscan = async (chainId) => {
+    if (process.env.ETHERSCAN) {
+        if (await etherscanVerifier_1.EtherscanVerifier.isChainSupported(chainId)) {
+            return new etherscanVerifier_1.EtherscanVerifier(process.env.ETHERSCAN, chainId);
+        }
+        console.log(chalk_1.default.gray(`Etherscan does not support chainId ${chainId}. Skipping verification on Etherscan.`));
+    }
+    else {
+        console.log(chalk_1.default.yellow(`No etherscan API key provided. Skipping verification on Etherscan.`));
+    }
+    return null;
+};
+const setupBlockscout = (chainId) => {
+    const verifier = blockscoutVerifier_1.BlockscoutVerifier.createFromChainId(chainId);
+    if (verifier) {
+        return verifier;
+    }
+    console.log(chalk_1.default.gray(`Blockscout API url is not known for chainId ${chainId}.`));
+    if (process.env.EXPLORER_URL) {
+        console.log(chalk_1.default.gray("Using EXPLORER_URL to setup verification."));
+        return new blockscoutVerifier_1.BlockscoutVerifier(`${process.env.EXPLORER_URL}/api`, process.env.EXPLORER_URL);
+    }
+    console.log(chalk_1.default.gray("Skipping verification on Blockscout."));
+    return null;
+};
+const setupSkale = async () => {
+    if (process.env.ENDPOINT) {
+        try {
+            const verifier = await skaleBlockscoutVerifier_1.SkaleBlockscoutVerifier.createFromEndpoint(process.env.ENDPOINT);
+            if (verifier) {
+                return verifier;
             }
         }
+        catch (error) {
+            console.log(chalk_1.default.yellow(error));
+        }
+    }
+    else {
+        console.log(chalk_1.default.gray("ENDPOINT is not provided. Can't determine SKALE block explorer API url."));
+    }
+    console.log(chalk_1.default.gray("Skipping verification on SKALE block explorer."));
+    return null;
+};
+const verifiers = [];
+let verifiersSetup = false;
+const setupVerifiers = async () => {
+    if (!verifiersSetup) {
+        verifiersSetup = true;
+        const { chainId } = await hardhat_1.ethers.provider.getNetwork();
+        const candidates = [
+            await setupEtherscan(chainId),
+            setupBlockscout(chainId),
+            await setupSkale()
+        ];
+        verifiers.push(...candidates.filter(item => item !== null));
     }
-}
+};
+const verify = async (contractName, contractAddress) => {
+    await setupVerifiers();
+    await Promise.all(verifiers.map(verifier => verifier.verify({
+        contractAddress,
+        contractName
+    })));
+};
 exports.verify = verify;
-async function verifyProxy(contractName, proxyAddress, constructorArguments) {
-    await verify(contractName, await (0, upgrades_core_1.getImplementationAddress)(hardhat_1.network.provider, proxyAddress), constructorArguments);
-}
+const verifyProxy = async (contractName, proxyAddress) => {
+    await (0, exports.verify)(contractName, await (0, upgrades_core_1.getImplementationAddress)(hardhat_1.network.provider, proxyAddress));
+    await (0, exports.verify)("TransparentUpgradeableProxy", proxyAddress);
+};
 exports.verifyProxy = verifyProxy;
+//# sourceMappingURL=verification.js.map

package/dist/src/verification.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"verification.js","sourceRoot":"","sources":["../../src/verification.ts"],"names":[],"mappings":"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"}

package/dist/src/verifiers/blockscoutVerifier.d.ts

@@ -0,0 +1,11 @@
+import { ContractVerifier, VerificationRequestParameters, VerificationTarget } from "../contractVerifier";
+import { ValidationResponse } from "@nomicfoundation/hardhat-verify/internal/utilities";
+export declare class BlockscoutVerifier extends ContractVerifier {
+    name: string;
+    private readonly blockscout;
+    constructor(apiURL: string, browserURL: string);
+    static createFromChainId(chainId: bigint): BlockscoutVerifier | null;
+    protected isAlreadyVerified(verificationTarget: VerificationTarget): Promise<boolean>;
+    protected submitVerificationRequest(target: VerificationTarget, params: VerificationRequestParameters): Promise<ValidationResponse>;
+    protected getContractUrl(verificationTarget: VerificationTarget): string;
+}