@skalenetwork/upgrade-tools 4.0.0-update-verify.5 → 4.0.0-update-gnosis-service.0

package/dist/src/contractVerifier.d.ts

@@ -1,14 +1,25 @@
-import { VerificationTarget } from "./verification";
-export declare class ContractVerifier {
-    private readonly contractName;
-    private readonly contractAddress;
-    private readonly apiURL;
-    private readonly browserURL;
-    private readonly isEtherscan;
-    private readonly etherscan;
-    constructor(target: VerificationTarget);
-    private isAlreadyVerified;
-    private submitVerification;
+import { ValidationResponse } from "@nomicfoundation/hardhat-verify/internal/utilities";
+export interface VerificationTarget {
+    contractName: string;
+    contractAddress: string;
+}
+export interface VerificationRequestParameters {
+    solcInputJson: string;
+    fullContractName: string;
+    compilerVersion: string;
+}
+export declare abstract class ContractVerifier {
+    abstract name: string;
+    private readonly PROXY_CONTRACT_NAME;
+    verify: (verificationTarget: VerificationTarget, attempts?: number) => Promise<void>;
+    attemptVerification(verificationTarget: VerificationTarget): Promise<boolean>;
+    protected abstract isAlreadyVerified(verificationTarget: VerificationTarget): Promise<boolean>;
+    protected abstract submitVerificationRequest(target: VerificationTarget, params: VerificationRequestParameters): Promise<ValidationResponse>;
+    protected abstract getContractUrl(verificationTarget: VerificationTarget): string;
+    protected getVerifyParameters(contractName: string): Promise<{
+        compilerVersion: string;
+        fullContractName: string;
+        solcInputJson: string;
+    }>;
     private checkVerificationStatus;
-    attempt(): Promise<boolean>;
 }

package/dist/src/contractVerifier.js

@@ -4,63 +4,67 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ContractVerifier = void 0;
-const verification_1 = require("./verification");
-const etherscan_1 = require("@nomicfoundation/hardhat-verify/etherscan");
+const hardhat_1 = require("hardhat");
 const chalk_1 = __importDefault(require("chalk"));
+const TransparentUpgradeableProxy_json_1 = __importDefault(require("@openzeppelin/upgrades-core/artifacts/@openzeppelin/contracts-v5/proxy/transparent/TransparentUpgradeableProxy.sol/TransparentUpgradeableProxy.json"));
+const build_info_v5_json_1 = __importDefault(require("@openzeppelin/upgrades-core/artifacts/build-info-v5.json"));
+const DEFAULT_RETRIES_AMOUNT = 5;
 class ContractVerifier {
-    constructor(target) {
-        this.contractName = target.contractName;
-        this.contractAddress = target.contractAddress;
-        this.apiURL = target.explorerUrls.apiURL;
-        this.browserURL = target.explorerUrls.browserURL;
-        this.isEtherscan = Boolean(target.isEtherscan);
-        this.etherscan = new etherscan_1.Etherscan(process.env.ETHERSCAN ?? "", this.apiURL, this.browserURL, target.chainId);
+    constructor() {
+        this.PROXY_CONTRACT_NAME = "TransparentUpgradeableProxy";
+        this.verify = async (verificationTarget, attempts = DEFAULT_RETRIES_AMOUNT) => {
+            const limit = 0;
+            if (attempts > limit) {
+                if (!await this.attemptVerification(verificationTarget)) {
+                    const failedAttempts = 1;
+                    await this.verify(verificationTarget, attempts - failedAttempts);
+                }
+            }
+        };
     }
-    async isAlreadyVerified() {
-        let verified = false;
-        if (this.isEtherscan) {
-            verified = await this.etherscan.isVerified(this.contractAddress);
-        }
-        if (!verified) {
-            verified = await (0, verification_1.isVerifiedOnBlockscout)(this.apiURL, this.contractAddress);
-        }
-        if (verified) {
-            console.log(`${this.contractName} is already verified on: ${this.etherscan.getContractUrl(this.contractAddress)}`);
+    async attemptVerification(verificationTarget) {
+        if (await this.isAlreadyVerified(verificationTarget)) {
+            console.log(chalk_1.default.cyan(`${verificationTarget.contractName} is already verified on ${this.name}:\n${this.getContractUrl(verificationTarget)}`));
+            return true;
         }
-        return verified;
-    }
-    async submitVerification(params) {
+        const params = await this.getVerifyParameters(verificationTarget.contractName);
         try {
-            const res = await this.etherscan.verify(this.contractAddress, params.solcInputJson, params.fullContractName, params.compilerVersion, "");
-            return res.message;
+            const response = await this.submitVerificationRequest(verificationTarget, params);
+            return this.checkVerificationStatus(verificationTarget, response);
         }
         catch (error) {
-            console.log(chalk_1.default.yellow(`Verification attempt for ${this.contractName} failed with error: ${error}`));
-            return null;
-        }
-    }
-    async checkVerificationStatus(guid) {
-        const status = await this.etherscan.getVerificationStatus(guid);
-        if (status.isFailure()) {
-            console.log(chalk_1.default.red(`Failed to verify contract ${this.contractName}`));
+            console.log(chalk_1.default.yellow(`Verification attempt for ${verificationTarget.contractName} failed on ${this.name} with error: ${error}`));
             return false;
         }
-        console.log(`${this.contractName} is successfully verified on: ${this.etherscan.getContractUrl(this.contractAddress)}`);
-        return true;
     }
-    async attempt() {
-        if (await this.isAlreadyVerified()) {
-            return true;
+    async getVerifyParameters(contractName) {
+        if (contractName === this.PROXY_CONTRACT_NAME) {
+            return {
+                compilerVersion: build_info_v5_json_1.default.solcLongVersion,
+                fullContractName: `${TransparentUpgradeableProxy_json_1.default.sourceName}:${contractName}`,
+                solcInputJson: JSON.stringify(build_info_v5_json_1.default.input)
+            };
         }
-        const params = await (0, verification_1.getVerifyParameters)(this.contractName);
-        if (this.isEtherscan) {
-            params.compilerVersion = `v${params.compilerVersion}`;
+        const artifact = await hardhat_1.artifacts.readArtifact(contractName);
+        const fullContractName = `${artifact.sourceName}:${contractName}`;
+        const buildInfo = await hardhat_1.artifacts.getBuildInfo(fullContractName);
+        if (!buildInfo) {
+            throw new Error(`No build-info for ${contractName}`);
         }
-        const guid = await this.submitVerification(params);
-        if (!guid) {
+        return {
+            compilerVersion: buildInfo.solcLongVersion,
+            fullContractName,
+            solcInputJson: JSON.stringify(buildInfo.input)
+        };
+    }
+    // Private
+    checkVerificationStatus(verificationTarget, response) {
+        if (response.isFailure()) {
+            console.log(chalk_1.default.red(`Failed to verify contract ${verificationTarget.contractName}`));
             return false;
         }
-        return this.checkVerificationStatus(guid);
+        console.log(chalk_1.default.cyan(`${verificationTarget.contractName} is successfully verified on ${this.name}:\n${this.getContractUrl(verificationTarget)}`));
+        return true;
     }
 }
 exports.ContractVerifier = ContractVerifier;

package/dist/src/contractVerifier.js.map

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

package/dist/src/gnosis-safe.js

@@ -5,38 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createMultiSendTransaction = void 0;
 const safe_core_sdk_types_1 = require("@safe-global/safe-core-sdk-types");
-const ethers_1 = require("ethers");
 const hardhat_1 = require("hardhat");
 const protocol_kit_1 = __importDefault(require("@safe-global/protocol-kit"));
 const api_kit_1 = __importDefault(require("@safe-global/api-kit"));
 // Cspell:words arbitrum celo sepolia xdai holesky
-// Constants
-const URLS = {
-    "safe_transaction": {
-        [ethers_1.Network.from("mainnet").chainId.toString()]: "https://safe-transaction-mainnet.safe.global/api",
-        [ethers_1.Network.from("arbitrum").chainId.toString()]: "https://safe-transaction-arbitrum.safe.global/api",
-        [ethers_1.Network.from("base").chainId.toString()]: "https://safe-transaction-base.safe.global/api",
-        [ethers_1.Network.from("base-sepolia").chainId.toString()]: "https://safe-transaction-base-sepolia.safe.global/api",
-        [ethers_1.Network.from("bnb").chainId.toString()]: "https://safe-transaction-bsc.safe.global/api",
-        [ethers_1.Network.from("xdai").chainId.toString()]: "https://safe-transaction-gnosis-chain.safe.global/api",
-        [ethers_1.Network.from("optimism").chainId.toString()]: "https://safe-transaction-optimism.safe.global/api",
-        [ethers_1.Network.from("matic").chainId.toString()]: "https://safe-transaction-polygon.safe.global/api",
-        [ethers_1.Network.from("sepolia").chainId.toString()]: "https://safe-transaction-sepolia.safe.global/api",
-        [ethers_1.Network.from("holesky").chainId.toString()]: "https://transaction-holesky.holesky-safe.protofire.io/api",
-        // Aurora
-        "0x4e454152": "https://safe-transaction-aurora.safe.global/api",
-        // Polygon zkEVM
-        "1101": "https://safe-transaction-zkevm.safe.global/api",
-        // ZkSync Era Mainnet
-        "324": "https://safe-transaction-zksync.safe.global/api",
-        // Celo
-        "42220": "https://safe-transaction-celo.safe.global/api",
-        // Avalanche
-        "43114": "https://safe-transaction-avalanche.safe.global/api",
-        // Scroll
-        "534352": "https://safe-transaction-scroll.safe.global/api",
-    }
-};
 const defaultOptions = {
     /*
      * Gas costs not related to the transaction execution
@@ -69,17 +41,14 @@ const getSafeTransactionData = (transactions) => {
     }
     return safeTransactionData;
 };
-const getSafeTransactionUrl = (chainId) => {
-    if (Object.keys(URLS.safe_transaction).includes(chainId.toString())) {
-        return URLS.safe_transaction[Number(chainId)];
-    }
-    throw Error("Can't get Safe Transaction Service url" +
-        ` at network with chainId = ${chainId}`);
-};
 const getSafeService = (chainId) => {
+    if (!process.env.GNOSIS_API_KEY) {
+        throw new Error("GNOSIS_API_KEY is not set");
+    }
     const safeService = new api_kit_1.default({
+        apiKey: process.env.GNOSIS_API_KEY,
         chainId,
-        "txServiceUrl": getSafeTransactionUrl(chainId)
+        // Does not need the URL because chainId is provided
     });
     return safeService;
 };
@@ -111,7 +80,7 @@ const createMultiSendTransaction = async (safeAddress, chainId, transactions) =>
              * Transaction cannot be executed until
              * Safe's nonce is not equal to this nonce
              */
-            nonce
+            nonce: parseInt(nonce, 10)
         }
     };
     const safeSdk = await protocol_kit_1.default.init({

package/dist/src/gnosis-safe.js.map

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

package/dist/src/index.d.ts

@@ -1,7 +1,10 @@
 export * from "./abi";
 export * from "./deploy";
 export * from "./gnosis-safe";
+export * from "./proxyUpgrader";
 export * from "./submitters";
 export * from "./verification";
 export * from "./version";
 export * from "./upgrader";
+export * from "./upgraders/abstractTransparentProxyUpgrader";
+export * from "./upgraders/beaconUpgrader";

package/dist/src/index.js

@@ -17,8 +17,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./abi"), exports);
 __exportStar(require("./deploy"), exports);
 __exportStar(require("./gnosis-safe"), exports);
+__exportStar(require("./proxyUpgrader"), exports);
 __exportStar(require("./submitters"), exports);
 __exportStar(require("./verification"), exports);
 __exportStar(require("./version"), exports);
 __exportStar(require("./upgrader"), exports);
+__exportStar(require("./upgraders/abstractTransparentProxyUpgrader"), exports);
+__exportStar(require("./upgraders/beaconUpgrader"), exports);
 //# sourceMappingURL=index.js.map

package/dist/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wCAAsB;AACtB,2CAAyB;AACzB,gDAA8B;AAC9B,+CAA6B;AAC7B,iDAA+B;AAC/B,4CAA0B;AAC1B,6CAA2B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wCAAsB;AACtB,2CAAyB;AACzB,gDAA8B;AAC9B,kDAAgC;AAChC,+CAA6B;AAC7B,iDAA+B;AAC/B,4CAA0B;AAC1B,6CAA2B;AAC3B,+EAA6D;AAC7D,6DAA0C"}

package/dist/src/proxyUpgrader.d.ts

@@ -0,0 +1,18 @@
+import { AddressLike, Transaction } from "ethers";
+import { NonceProvider } from "./nonceProvider";
+export declare abstract class ProxyUpgrader {
+    protected proxyAddress: AddressLike;
+    protected newImplementationAddress: AddressLike | null;
+    private contractName;
+    private nonceProvider?;
+    constructor(contractName: string, proxyAddress: AddressLike, nonceProvider?: NonceProvider);
+    deployNewImplementation(): Promise<void>;
+    needsUpgrade(): boolean;
+    getUpgradeTransaction(): Promise<Transaction>;
+    getContractName(): string;
+    getNewImplementationAddress(): AddressLike;
+    abstract getOwner(): Promise<string>;
+    protected abstract makeUpgradeTransaction(): Promise<Transaction>;
+    protected abstract getCurrentImplementationAddress(): Promise<AddressLike>;
+    private prepareUpgrade;
+}

package/dist/src/proxyUpgrader.js

@@ -0,0 +1,72 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProxyUpgrader = void 0;
+const hardhat_1 = require("hardhat");
+const chalk_1 = __importDefault(require("chalk"));
+const contractFactory_1 = require("./contractFactory");
+//                    10 minutes
+const deployTimeout = 60e4;
+class ProxyUpgrader {
+    constructor(contractName, proxyAddress, nonceProvider) {
+        this.newImplementationAddress = null;
+        this.contractName = contractName;
+        this.proxyAddress = proxyAddress;
+        this.nonceProvider = nonceProvider;
+    }
+    // Public
+    async deployNewImplementation() {
+        const contractFactory = await (0, contractFactory_1.getContractFactoryAndUpdateManifest)(this.contractName, this.nonceProvider);
+        console.log(`Prepare upgrade of ${this.contractName}`);
+        return this.prepareUpgrade(contractFactory);
+    }
+    needsUpgrade() {
+        return this.newImplementationAddress !== null;
+    }
+    async getUpgradeTransaction() {
+        if (this.newImplementationAddress === null) {
+            throw new Error(`Upgrade of ${this.contractName} is not prepared or not needed`);
+        }
+        const infoMessage = `Prepare transaction to upgrade ${this.contractName}` +
+            ` at ${this.proxyAddress}` +
+            ` to ${this.newImplementationAddress}`;
+        console.log(chalk_1.default.yellowBright(infoMessage));
+        return await this.makeUpgradeTransaction();
+    }
+    getContractName() {
+        return this.contractName;
+    }
+    getNewImplementationAddress() {
+        if (this.newImplementationAddress === null) {
+            throw new Error(`There is no new implementation address for ${this.contractName}`);
+        }
+        return this.newImplementationAddress;
+    }
+    // Private
+    async prepareUpgrade(contractFactory) {
+        const currentImplementationAddress = await this.getCurrentImplementationAddress();
+        const nonce = this.nonceProvider?.reserveNonce();
+        const newImplementationAddress = await hardhat_1.upgrades.prepareUpgrade(await hardhat_1.ethers.resolveAddress(this.proxyAddress), contractFactory, {
+            "timeout": deployTimeout,
+            "txOverrides": {
+                nonce
+            },
+            "unsafeAllowLinkedLibraries": true,
+            "unsafeAllowRenames": true
+        });
+        if (newImplementationAddress === currentImplementationAddress) {
+            console.log(chalk_1.default.gray(`Contract ${this.contractName} is up to date`));
+            // Release only if no upgrade is needed
+            if (nonce) {
+                this.nonceProvider?.releaseNonce(nonce);
+            }
+        }
+        else {
+            this.newImplementationAddress = newImplementationAddress;
+        }
+    }
+}
+exports.ProxyUpgrader = ProxyUpgrader;
+//# sourceMappingURL=proxyUpgrader.js.map

package/dist/src/proxyUpgrader.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"proxyUpgrader.js","sourceRoot":"","sources":["../../src/proxyUpgrader.ts"],"names":[],"mappings":";;;;;;AACA,qCAAyC;AAEzC,kDAA0B;AAC1B,uDAAsE;AAGtE,gCAAgC;AAChC,MAAM,aAAa,GAAG,IAAI,CAAC;AAE3B,MAAsB,aAAa;IAM/B,YACI,YAAoB,EACpB,YAAyB,EACzB,aAA6B;QAPvB,6BAAwB,GAAuB,IAAI,CAAC;QAS1D,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACvC,CAAC;IAED,SAAS;IAEF,KAAK,CAAC,uBAAuB;QAChC,MAAM,eAAe,GAAG,MAAM,IAAA,qDAAmC,EAC7D,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,aAAa,CACrB,CAAC;QACF,OAAO,CAAC,GAAG,CAAC,sBAAsB,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;QACvD,OAAO,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC;IAChD,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,wBAAwB,KAAK,IAAI,CAAC;IAClD,CAAC;IAEM,KAAK,CAAC,qBAAqB;QAC9B,IAAI,IAAI,CAAC,wBAAwB,KAAK,IAAI,EAAE,CAAC;YACzC,MAAM,IAAI,KAAK,CACX,cAAc,IAAI,CAAC,YAAY,gCAAgC,CAClE,CAAC;QACN,CAAC;QACD,MAAM,WAAW,GACb,kCAAkC,IAAI,CAAC,YAAY,EAAE;YACrD,OAAO,IAAI,CAAC,YAAY,EAAE;YAC1B,OAAO,IAAI,CAAC,wBAAwB,EAAE,CAAC;QAC3C,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,CAAC;QAC7C,OAAO,MAAM,IAAI,CAAC,sBAAsB,EAAE,CAAC;IAC/C,CAAC;IAEM,eAAe;QAClB,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;IAEM,2BAA2B;QAC9B,IAAI,IAAI,CAAC,wBAAwB,KAAK,IAAI,EAAE,CAAC;YACzC,MAAM,IAAI,KAAK,CACX,8CAA8C,IAAI,CAAC,YAAY,EAAE,CACpE,CAAC;QACN,CAAC;QACD,OAAO,IAAI,CAAC,wBAAwB,CAAC;IACzC,CAAC;IASD,UAAU;IAEF,KAAK,CAAC,cAAc,CAAC,eAAgC;QACzD,MAAM,4BAA4B,GAAG,MAAM,IAAI,CAAC,+BAA+B,EAAE,CAAC;QAElF,MAAM,KAAK,GAAG,IAAI,CAAC,aAAa,EAAE,YAAY,EAAE,CAAC;QAEjD,MAAM,wBAAwB,GAAG,MAAM,kBAAQ,CAAC,cAAc,CAC1D,MAAM,gBAAM,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,EAC9C,eAAe,EACf;YACI,SAAS,EAAE,aAAa;YACxB,aAAa,EAAE;gBACX,KAAK;aACR;YACD,4BAA4B,EAAE,IAAI;YAClC,oBAAoB,EAAE,IAAI;SAC7B,CACW,CAAC;QACjB,IAAI,wBAAwB,KAAK,4BAA4B,EAAE,CAAC;YAC5D,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,YAAY,gBAAgB,CAAC,CAAC,CAAC;YACvE,uCAAuC;YACvC,IAAI,KAAK,EAAE,CAAC;gBACR,IAAI,CAAC,aAAa,EAAE,YAAY,CAAC,KAAK,CAAC,CAAC;YAC5C,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,wBAAwB,GAAG,wBAAwB,CAAC;QAC7D,CAAC;IACL,CAAC;CACJ;AA9FD,sCA8FC"}

package/dist/src/upgrader.d.ts

@@ -1,14 +1,17 @@
-import { Transaction } from "ethers";
-import { Project } from "./types/upgrader";
 import { Instance } from "@skalenetwork/skale-contracts-ethers-v6";
+import { NonceProvider } from "./nonceProvider";
+import { Project } from "./types/upgrader";
+import { ProxyUpgrader } from "./proxyUpgrader";
 import { Submitter } from "./submitters/submitter";
+import { Transaction } from "ethers";
 export declare abstract class Upgrader {
     private targetVersion;
     private contractNamesToUpgrade;
     private projectName;
     private submitter;
-    private nonceProvider?;
     private deploySemaphore;
+    private proxyUpgraders;
+    protected nonceProvider?: NonceProvider;
     protected instance: Instance;
     protected transactions: Transaction[];
     constructor(project: Project, submitter?: Submitter);
@@ -16,18 +19,20 @@ export declare abstract class Upgrader {
     abstract setVersion: (newVersion: string) => Promise<void>;
     deployNewContracts?: () => Promise<void>;
     initialize?: () => Promise<void>;
+    protected createProxyUpgrader(contractName: string): Promise<ProxyUpgrader>;
     upgrade(): Promise<void>;
     getOwner(): Promise<string>;
+    private upgradeOldContracts;
+    private getChangedContracts;
+    private createProxyUpgraders;
     private callInitialize;
     private callDeployNewContracts;
     private prepareVersion;
     private writeTransactions;
-    private static verify;
+    private verify;
     private switchToNewImplementations;
     private deployNewImplementations;
     private protectedDeployNewImplementation;
-    private deployNewImplementation;
-    private prepareUpgrade;
     private getNormalizedDeployedVersion;
     private checkVersion;
 }

package/dist/src/upgrader.js

@@ -5,25 +5,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Upgrader = void 0;
 const hardhat_1 = require("hardhat");
-const proxyAdmin_1 = require("./proxyAdmin");
+const abstractTransparentProxyUpgrader_1 = require("./upgraders/abstractTransparentProxyUpgrader");
 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 transparentProxyUpgrader_1 = require("./upgraders/transparentProxyUpgrader");
+const v4TransparentProxyUpgrader_1 = require("./upgraders/v4TransparentProxyUpgrader");
 const chalk_1 = __importDefault(require("chalk"));
 const fs_1 = require("fs");
-const contractFactory_1 = require("./contractFactory");
-const upgrades_core_1 = require("@openzeppelin/upgrades-core");
 const version_1 = require("./version");
 const verification_1 = require("./verification");
 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(project, submitter) {
+        this.proxyUpgraders = [];
         this.targetVersion = project.version;
         if (!project.version.includes("-")) {
             this.targetVersion = `${project.version}-stable.0`;
@@ -35,24 +34,46 @@ class Upgrader {
         this.submitter = submitter ?? new auto_submitter_1.AutoSubmitter(this);
         this.deploySemaphore = new semaphore_async_await_1.default(maxSimultaneousDeployments);
     }
+    async createProxyUpgrader(contractName) {
+        const proxyAddress = await this.instance.getContractAddress(contractName);
+        const proxyAdmin = await abstractTransparentProxyUpgrader_1.AbstractTransparentProxyUpgrader.getProxyAdmin(proxyAddress);
+        const proxyAdminVersion = await abstractTransparentProxyUpgrader_1.AbstractTransparentProxyUpgrader.getProxyAdminVersion(proxyAdmin);
+        const defaultProxyAdminVersion = "5.0.0";
+        if (proxyAdminVersion === defaultProxyAdminVersion) {
+            console.log(chalk_1.default.gray(`${contractName} uses ProxyAdmin version ${proxyAdminVersion}`));
+            return new transparentProxyUpgrader_1.TransparentProxyUpgrader({
+                contractName,
+                nonceProvider: this.nonceProvider,
+                proxyAddress,
+                proxyAdmin
+            });
+        }
+        else if (proxyAdminVersion === null) {
+            console.log(chalk_1.default.gray(`${contractName} uses old ProxyAdmin (v4 or lower)`));
+            return new v4TransparentProxyUpgrader_1.V4TransparentProxyUpgrader({
+                contractName,
+                nonceProvider: this.nonceProvider,
+                proxyAddress,
+                proxyAdmin
+            });
+        }
+        throw new Error(`Unsupported ProxyAdmin version: ${proxyAdminVersion}`);
+    }
     // Public
     async upgrade() {
         const version = await this.prepareVersion();
         await this.callDeployNewContracts();
-        const contractsToUpgrade = await this.deployNewImplementations();
-        await this.switchToNewImplementations(contractsToUpgrade);
+        await this.upgradeOldContracts();
         await this.callInitialize();
         // Write version
         await this.setVersion(version);
         await this.writeTransactions(version);
         await this.submitter.submit(this.transactions);
-        await Upgrader.verify(contractsToUpgrade);
+        await this.verify();
         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()));
+        const owners = await Promise.all(this.proxyUpgraders.map((upgrader) => upgrader.getOwner()));
         return owners.reduce((owner1, owner2) => {
             if (owner1 !== owner2) {
                 throw Error("Proxies have different owners");
@@ -60,9 +81,26 @@ class Upgrader {
             return owner1;
         });
     }
+    async upgradeOldContracts() {
+        await this.createProxyUpgraders();
+        await this.deployNewImplementations();
+        await this.switchToNewImplementations();
+    }
     // Private
+    getChangedContracts() {
+        return this.proxyUpgraders.filter((upgrader) => upgrader.needsUpgrade());
+    }
+    async createProxyUpgraders() {
+        const [deployer] = await hardhat_1.ethers.getSigners();
+        this.nonceProvider ?? (this.nonceProvider = await nonceProvider_1.NonceProvider.createForWallet(deployer));
+        this.proxyUpgraders = await Promise.all(this.contractNamesToUpgrade.map(this.createProxyUpgrader, this));
+    }
     async callInitialize() {
-        if (typeof this.initialize !== "undefined") {
+        if (typeof this.initialize === "undefined") {
+            console.log(chalk_1.default.gray("No initialize function defined, skipping"));
+        }
+        else {
+            console.log("Generating initialize transaction(s)");
             await this.initialize();
         }
     }
@@ -82,72 +120,34 @@ class Upgrader {
         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) {
+    async verify() {
         if (process.env.NO_VERIFY) {
             console.log("Skip verification");
         }
         else {
             console.log("Start verification");
-            await Promise.all(contractsToUpgrade.map((contract) => (0, verification_1.verify)(contract.name, contract.implementationAddress)));
+            await Promise.all(this.getChangedContracts().map((upgrader) => (0, verification_1.verify)(upgrader.getContractName(), upgrader.getNewImplementationAddress())));
         }
     }
-    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 switchToNewImplementations() {
+        this.transactions = [
+            ...this.transactions,
+            ...await Promise.all(this.getChangedContracts().map((upgrader) => upgrader.getUpgradeTransaction()))
+        ];
     }
     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));
+        const contracts = await Promise.all(this.proxyUpgraders.
+            map((upgrader) => this.protectedDeployNewImplementation(upgrader), this));
         return withoutNull(contracts);
     }
-    async protectedDeployNewImplementation(contract) {
+    async protectedDeployNewImplementation(upgrader) {
         await this.deploySemaphore.acquire();
-        let result = null;
         try {
-            result = await this.deployNewImplementation(contract);
+            await upgrader.deployNewImplementation();
         }
         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();