@skalenetwork/upgrade-tools 2.0.0-refactor.8 → 3.0.0-skale-contracts.0

package/dist/src/upgrader.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -21,120 +12,109 @@ const version_1 = require("./version");
 const fs_1 = require("fs");
 const deploy_1 = require("./deploy");
 const upgrades_core_1 = require("@openzeppelin/upgrades-core");
-const abi_1 = require("./abi");
 const verification_1 = require("./verification");
 const auto_submitter_1 = require("./submitters/auto-submitter");
 class Upgrader {
-    constructor(projectName, targetVersion, abi, contractNamesToUpgrade, submitter = new auto_submitter_1.AutoSubmitter()) {
+    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;
-        this.abi = abi;
+        this.instance = instance;
         this.contractNamesToUpgrade = contractNamesToUpgrade;
         this.projectName = projectName;
         this.transactions = [];
         this.submitter = submitter;
     }
     // public
-    upgrade() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const proxyAdmin = yield (0, admin_1.getManifestAdmin)(hardhat_1.default);
-            const deployedVersion = yield this.getDeployedVersion();
-            const version = yield (0, version_1.getVersion)();
-            if (deployedVersion) {
-                if (deployedVersion !== this.targetVersion) {
-                    console.log(chalk_1.default.red(`This script can't upgrade version ${deployedVersion} to ${version}`));
-                    process.exit(1);
-                }
-            }
-            else {
-                console.log(chalk_1.default.yellow(`Can't check currently deployed version of ${this.projectName}`));
+    async upgrade() {
+        const proxyAdmin = await (0, admin_1.getManifestAdmin)(hardhat_1.default);
+        const deployedVersion = await this.getDeployedVersion();
+        const version = await (0, version_1.getVersion)();
+        if (deployedVersion) {
+            if (deployedVersion !== this.targetVersion) {
+                console.log(chalk_1.default.red(`This script can't upgrade version ${deployedVersion} to ${version}`));
+                process.exit(1);
             }
-            console.log(`Will mark updated version as ${version}`);
-            // Deploy new contracts
-            yield this.deployNewContracts();
-            // Deploy new implementations
-            const contractsToUpgrade = [];
-            for (const contract of this.contractNamesToUpgrade) {
-                const contractFactory = yield this._getContractFactoryAndUpdateManifest(contract);
-                const proxyAddress = this.abi[this._getContractKeyInAbiFile(contract) + "_address"];
-                console.log(`Prepare upgrade of ${contract}`);
-                const newImplementationAddress = yield hardhat_2.upgrades.prepareUpgrade(proxyAddress, contractFactory, {
-                    unsafeAllowLinkedLibraries: true,
-                    unsafeAllowRenames: true
+        }
+        else {
+            console.log(chalk_1.default.yellow(`Can't check currently deployed version of ${this.projectName}`));
+        }
+        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);
+            const proxyAddress = (await this.instance.getContract(contract)).address;
+            console.log(`Prepare upgrade of ${contract}`);
+            const newImplementationAddress = await hardhat_2.upgrades.prepareUpgrade(proxyAddress, contractFactory, {
+                unsafeAllowLinkedLibraries: true,
+                unsafeAllowRenames: true
+            });
+            const currentImplementationAddress = await (0, upgrades_core_1.getImplementationAddress)(hardhat_2.network.provider, proxyAddress);
+            if (newImplementationAddress !== currentImplementationAddress) {
+                contractsToUpgrade.push({
+                    proxyAddress,
+                    implementationAddress: newImplementationAddress,
+                    name: contract
                 });
-                const currentImplementationAddress = yield (0, upgrades_core_1.getImplementationAddress)(hardhat_2.network.provider, proxyAddress);
-                if (newImplementationAddress !== currentImplementationAddress) {
-                    contractsToUpgrade.push({
-                        proxyAddress,
-                        implementationAddress: newImplementationAddress,
-                        name: contract,
-                        abi: (0, abi_1.getAbi)(contractFactory.interface)
-                    });
-                    yield (0, verification_1.verify)(contract, newImplementationAddress, []);
-                }
-                else {
-                    console.log(chalk_1.default.gray(`Contract ${contract} is up to date`));
-                }
+                await (0, verification_1.verify)(contract, newImplementationAddress, []);
             }
-            // 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])
-                });
-                this.abi[this._getContractKeyInAbiFile(contract.name) + "_abi"] = contract.abi;
+            else {
+                console.log(chalk_1.default.gray(`Contract ${contract} is up to date`));
             }
-            yield this.initialize();
-            // write version
-            yield this.setVersion(version);
-            yield fs_1.promises.writeFile(`data/transactions-${version}-${hardhat_2.network.name}.json`, JSON.stringify(this.transactions, null, 4));
-            yield this.submitter.submit(this.transactions);
-            yield fs_1.promises.writeFile(`data/${this.projectName}-${version}-${hardhat_2.network.name}-abi.json`, JSON.stringify(this.abi, null, 4));
-            console.log("Done");
-        });
+        }
+        // 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);
+        console.log("Done");
     }
     // private
-    _getContractFactoryAndUpdateManifest(contract) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const manifest = JSON.parse(yield fs_1.promises.readFile(yield (0, deploy_1.getManifestFile)(), "utf-8"));
-            const { linkReferences } = yield hardhat_2.artifacts.readArtifact(contract);
-            if (!Object.keys(linkReferences).length)
-                return yield hardhat_2.ethers.getContractFactory(contract);
-            const librariesToUpgrade = [];
-            const oldLibraries = {};
-            if (manifest.libraries === undefined) {
-                Object.assign(manifest, { libraries: {} });
+    async _getContractFactoryAndUpdateManifest(contract) {
+        const manifest = JSON.parse(await fs_1.promises.readFile(await (0, deploy_1.getManifestFile)(), "utf-8"));
+        const { linkReferences } = await hardhat_2.artifacts.readArtifact(contract);
+        if (!Object.keys(linkReferences).length)
+            return await hardhat_2.ethers.getContractFactory(contract);
+        const librariesToUpgrade = [];
+        const oldLibraries = {};
+        if (manifest.libraries === undefined) {
+            Object.assign(manifest, { libraries: {} });
+        }
+        for (const key of Object.keys(linkReferences)) {
+            const libraryName = Object.keys(linkReferences[key])[0];
+            const { bytecode } = await hardhat_2.artifacts.readArtifact(libraryName);
+            if (manifest.libraries[libraryName] === undefined) {
+                librariesToUpgrade.push(libraryName);
+                continue;
             }
-            for (const key of Object.keys(linkReferences)) {
-                const libraryName = Object.keys(linkReferences[key])[0];
-                const { bytecode } = yield 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);
-                }
-                else {
-                    oldLibraries[libraryName] = manifest.libraries[libraryName].address;
-                }
+            const libraryBytecodeHash = manifest.libraries[libraryName].bytecodeHash;
+            if ((0, upgrades_core_1.hashBytecode)(bytecode) !== libraryBytecodeHash) {
+                librariesToUpgrade.push(libraryName);
             }
-            const libraries = yield (0, deploy_1.deployLibraries)(librariesToUpgrade);
-            for (const [libraryName, libraryAddress] of libraries.entries()) {
-                const { bytecode } = yield hardhat_2.artifacts.readArtifact(libraryName);
-                manifest.libraries[libraryName] = { "address": libraryAddress, "bytecodeHash": (0, upgrades_core_1.hashBytecode)(bytecode) };
+            else {
+                oldLibraries[libraryName] = manifest.libraries[libraryName].address;
             }
-            Object.assign(libraries, oldLibraries);
-            yield fs_1.promises.writeFile(yield (0, deploy_1.getManifestFile)(), JSON.stringify(manifest, null, 4));
-            return yield (0, deploy_1.getLinkedContractFactory)(contract, libraries);
-        });
-    }
-    _getContractKeyInAbiFile(contract) {
-        return contract.replace(/([a-zA-Z])(?=[A-Z])/g, '$1_').toLowerCase();
+        }
+        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) };
+        }
+        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;

package/dist/src/verification.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -16,38 +7,34 @@ exports.verifyProxy = exports.verify = void 0;
 const hardhat_1 = require("hardhat");
 const chalk_1 = __importDefault(require("chalk"));
 const upgrades_core_1 = require("@openzeppelin/upgrades-core");
-function verify(contractName, contractAddress, constructorArguments) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (![1337, 31337].includes((yield hardhat_1.ethers.provider.getNetwork()).chainId)) {
-            for (let retry = 0; retry <= 5; ++retry) {
-                try {
-                    yield (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);
+async function verify(contractName, contractAddress, constructorArguments) {
+    if (![1337, 31337].includes((await hardhat_1.ethers.provider.getNetwork()).chainId)) {
+        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);
                 }
             }
         }
-    });
+    }
 }
 exports.verify = verify;
-function verifyProxy(contractName, proxyAddress, constructorArguments) {
-    return __awaiter(this, void 0, void 0, function* () {
-        yield verify(contractName, yield (0, upgrades_core_1.getImplementationAddress)(hardhat_1.network.provider, proxyAddress), constructorArguments);
-    });
+async function verifyProxy(contractName, proxyAddress, constructorArguments) {
+    await verify(contractName, await (0, upgrades_core_1.getImplementationAddress)(hardhat_1.network.provider, proxyAddress), constructorArguments);
 }
 exports.verifyProxy = verifyProxy;

package/dist/src/version.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -17,18 +8,16 @@ const fs_1 = require("fs");
 const child_process_1 = require("child_process");
 const util_1 = __importDefault(require("util"));
 const exec = util_1.default.promisify(child_process_1.exec);
-function getVersion() {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (process.env.VERSION) {
-            return process.env.VERSION;
-        }
-        try {
-            const tag = (yield exec("git describe --tags")).stdout.trim();
-            return tag;
-        }
-        catch (_a) {
-            return (yield fs_1.promises.readFile("VERSION", "utf-8")).trim();
-        }
-    });
+async function getVersion() {
+    if (process.env.VERSION) {
+        return process.env.VERSION;
+    }
+    try {
+        const tag = (await exec("git describe --tags")).stdout.trim();
+        return tag;
+    }
+    catch {
+        return (await fs_1.promises.readFile("VERSION", "utf-8")).trim();
+    }
 }
 exports.getVersion = getVersion;

package/dist/typechain-types/AccessControlEnumerableUpgradeable.d.ts

@@ -1,7 +1,7 @@
 import { BaseContract, BigNumber, BigNumberish, BytesLike, CallOverrides, ContractTransaction, Overrides, PopulatedTransaction, Signer, utils } from "ethers";
 import { FunctionFragment, Result, EventFragment } from "@ethersproject/abi";
 import { Listener, Provider } from "@ethersproject/providers";
-import { TypedEventFilter, TypedEvent, TypedListener, OnEvent } from "./common";
+import type { TypedEventFilter, TypedEvent, TypedListener, OnEvent } from "./common";
 export interface AccessControlEnumerableUpgradeableInterface extends utils.Interface {
     contractName: "AccessControlEnumerableUpgradeable";
     functions: {
@@ -44,11 +44,11 @@ export interface AccessControlEnumerableUpgradeableInterface extends utils.Inter
     getEvent(nameOrSignatureOrTopic: "RoleGranted"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "RoleRevoked"): EventFragment;
 }
-export declare type InitializedEvent = TypedEvent<[number], {
+export type InitializedEvent = TypedEvent<[number], {
     version: number;
 }>;
-export declare type InitializedEventFilter = TypedEventFilter<InitializedEvent>;
-export declare type RoleAdminChangedEvent = TypedEvent<[
+export type InitializedEventFilter = TypedEventFilter<InitializedEvent>;
+export type RoleAdminChangedEvent = TypedEvent<[
     string,
     string,
     string
@@ -57,8 +57,8 @@ export declare type RoleAdminChangedEvent = TypedEvent<[
     previousAdminRole: string;
     newAdminRole: string;
 }>;
-export declare type RoleAdminChangedEventFilter = TypedEventFilter<RoleAdminChangedEvent>;
-export declare type RoleGrantedEvent = TypedEvent<[
+export type RoleAdminChangedEventFilter = TypedEventFilter<RoleAdminChangedEvent>;
+export type RoleGrantedEvent = TypedEvent<[
     string,
     string,
     string
@@ -67,8 +67,8 @@ export declare type RoleGrantedEvent = TypedEvent<[
     account: string;
     sender: string;
 }>;
-export declare type RoleGrantedEventFilter = TypedEventFilter<RoleGrantedEvent>;
-export declare type RoleRevokedEvent = TypedEvent<[
+export type RoleGrantedEventFilter = TypedEventFilter<RoleGrantedEvent>;
+export type RoleRevokedEvent = TypedEvent<[
     string,
     string,
     string
@@ -77,7 +77,7 @@ export declare type RoleRevokedEvent = TypedEvent<[
     account: string;
     sender: string;
 }>;
-export declare type RoleRevokedEventFilter = TypedEventFilter<RoleRevokedEvent>;
+export type RoleRevokedEventFilter = TypedEventFilter<RoleRevokedEvent>;
 export interface AccessControlEnumerableUpgradeable extends BaseContract {
     contractName: "AccessControlEnumerableUpgradeable";
     connect(signerOrProvider: Signer | Provider | string): this;

package/dist/typechain-types/AccessControlUpgradeable.d.ts

@@ -1,7 +1,7 @@
 import { BaseContract, BigNumber, BytesLike, CallOverrides, ContractTransaction, Overrides, PopulatedTransaction, Signer, utils } from "ethers";
 import { FunctionFragment, Result, EventFragment } from "@ethersproject/abi";
 import { Listener, Provider } from "@ethersproject/providers";
-import { TypedEventFilter, TypedEvent, TypedListener, OnEvent } from "./common";
+import type { TypedEventFilter, TypedEvent, TypedListener, OnEvent } from "./common";
 export interface AccessControlUpgradeableInterface extends utils.Interface {
     contractName: "AccessControlUpgradeable";
     functions: {
@@ -38,11 +38,11 @@ export interface AccessControlUpgradeableInterface extends utils.Interface {
     getEvent(nameOrSignatureOrTopic: "RoleGranted"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "RoleRevoked"): EventFragment;
 }
-export declare type InitializedEvent = TypedEvent<[number], {
+export type InitializedEvent = TypedEvent<[number], {
     version: number;
 }>;
-export declare type InitializedEventFilter = TypedEventFilter<InitializedEvent>;
-export declare type RoleAdminChangedEvent = TypedEvent<[
+export type InitializedEventFilter = TypedEventFilter<InitializedEvent>;
+export type RoleAdminChangedEvent = TypedEvent<[
     string,
     string,
     string
@@ -51,8 +51,8 @@ export declare type RoleAdminChangedEvent = TypedEvent<[
     previousAdminRole: string;
     newAdminRole: string;
 }>;
-export declare type RoleAdminChangedEventFilter = TypedEventFilter<RoleAdminChangedEvent>;
-export declare type RoleGrantedEvent = TypedEvent<[
+export type RoleAdminChangedEventFilter = TypedEventFilter<RoleAdminChangedEvent>;
+export type RoleGrantedEvent = TypedEvent<[
     string,
     string,
     string
@@ -61,8 +61,8 @@ export declare type RoleGrantedEvent = TypedEvent<[
     account: string;
     sender: string;
 }>;
-export declare type RoleGrantedEventFilter = TypedEventFilter<RoleGrantedEvent>;
-export declare type RoleRevokedEvent = TypedEvent<[
+export type RoleGrantedEventFilter = TypedEventFilter<RoleGrantedEvent>;
+export type RoleRevokedEvent = TypedEvent<[
     string,
     string,
     string
@@ -71,7 +71,7 @@ export declare type RoleRevokedEvent = TypedEvent<[
     account: string;
     sender: string;
 }>;
-export declare type RoleRevokedEventFilter = TypedEventFilter<RoleRevokedEvent>;
+export type RoleRevokedEventFilter = TypedEventFilter<RoleRevokedEvent>;
 export interface AccessControlUpgradeable extends BaseContract {
     contractName: "AccessControlUpgradeable";
     connect(signerOrProvider: Signer | Provider | string): this;

package/dist/typechain-types/AdminUpgradeabilityProxy.d.ts

@@ -1,26 +1,10 @@
-import { BaseContract, BigNumber, BytesLike, CallOverrides, ContractTransaction, Overrides, PayableOverrides, PopulatedTransaction, Signer, utils } from "ethers";
-import { FunctionFragment, Result, EventFragment } from "@ethersproject/abi";
+import { BaseContract, Signer, utils } from "ethers";
+import { EventFragment } from "@ethersproject/abi";
 import { Listener, Provider } from "@ethersproject/providers";
-import { TypedEventFilter, TypedEvent, TypedListener, OnEvent } from "./common";
+import type { TypedEventFilter, TypedEvent, TypedListener, OnEvent } from "./common";
 export interface AdminUpgradeabilityProxyInterface extends utils.Interface {
     contractName: "AdminUpgradeabilityProxy";
-    functions: {
-        "admin()": FunctionFragment;
-        "changeAdmin(address)": FunctionFragment;
-        "implementation()": FunctionFragment;
-        "upgradeTo(address)": FunctionFragment;
-        "upgradeToAndCall(address,bytes)": FunctionFragment;
-    };
-    encodeFunctionData(functionFragment: "admin", values?: undefined): string;
-    encodeFunctionData(functionFragment: "changeAdmin", values: [string]): string;
-    encodeFunctionData(functionFragment: "implementation", values?: undefined): string;
-    encodeFunctionData(functionFragment: "upgradeTo", values: [string]): string;
-    encodeFunctionData(functionFragment: "upgradeToAndCall", values: [string, BytesLike]): string;
-    decodeFunctionResult(functionFragment: "admin", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "changeAdmin", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "implementation", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "upgradeTo", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "upgradeToAndCall", data: BytesLike): Result;
+    functions: {};
     events: {
         "AdminChanged(address,address)": EventFragment;
         "BeaconUpgraded(address)": EventFragment;
@@ -30,22 +14,22 @@ export interface AdminUpgradeabilityProxyInterface extends utils.Interface {
     getEvent(nameOrSignatureOrTopic: "BeaconUpgraded"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "Upgraded"): EventFragment;
 }
-export declare type AdminChangedEvent = TypedEvent<[
+export type AdminChangedEvent = TypedEvent<[
     string,
     string
 ], {
     previousAdmin: string;
     newAdmin: string;
 }>;
-export declare type AdminChangedEventFilter = TypedEventFilter<AdminChangedEvent>;
-export declare type BeaconUpgradedEvent = TypedEvent<[string], {
+export type AdminChangedEventFilter = TypedEventFilter<AdminChangedEvent>;
+export type BeaconUpgradedEvent = TypedEvent<[string], {
     beacon: string;
 }>;
-export declare type BeaconUpgradedEventFilter = TypedEventFilter<BeaconUpgradedEvent>;
-export declare type UpgradedEvent = TypedEvent<[string], {
+export type BeaconUpgradedEventFilter = TypedEventFilter<BeaconUpgradedEvent>;
+export type UpgradedEvent = TypedEvent<[string], {
     implementation: string;
 }>;
-export declare type UpgradedEventFilter = TypedEventFilter<UpgradedEvent>;
+export type UpgradedEventFilter = TypedEventFilter<UpgradedEvent>;
 export interface AdminUpgradeabilityProxy extends BaseContract {
     contractName: "AdminUpgradeabilityProxy";
     connect(signerOrProvider: Signer | Provider | string): this;
@@ -61,45 +45,8 @@ export interface AdminUpgradeabilityProxy extends BaseContract {
     on: OnEvent<this>;
     once: OnEvent<this>;
     removeListener: OnEvent<this>;
-    functions: {
-        admin(overrides?: Overrides & {
-            from?: string | Promise<string>;
-        }): Promise<ContractTransaction>;
-        changeAdmin(newAdmin: string, overrides?: Overrides & {
-            from?: string | Promise<string>;
-        }): Promise<ContractTransaction>;
-        implementation(overrides?: Overrides & {
-            from?: string | Promise<string>;
-        }): Promise<ContractTransaction>;
-        upgradeTo(newImplementation: string, overrides?: Overrides & {
-            from?: string | Promise<string>;
-        }): Promise<ContractTransaction>;
-        upgradeToAndCall(newImplementation: string, data: BytesLike, overrides?: PayableOverrides & {
-            from?: string | Promise<string>;
-        }): Promise<ContractTransaction>;
-    };
-    admin(overrides?: Overrides & {
-        from?: string | Promise<string>;
-    }): Promise<ContractTransaction>;
-    changeAdmin(newAdmin: string, overrides?: Overrides & {
-        from?: string | Promise<string>;
-    }): Promise<ContractTransaction>;
-    implementation(overrides?: Overrides & {
-        from?: string | Promise<string>;
-    }): Promise<ContractTransaction>;
-    upgradeTo(newImplementation: string, overrides?: Overrides & {
-        from?: string | Promise<string>;
-    }): Promise<ContractTransaction>;
-    upgradeToAndCall(newImplementation: string, data: BytesLike, overrides?: PayableOverrides & {
-        from?: string | Promise<string>;
-    }): Promise<ContractTransaction>;
-    callStatic: {
-        admin(overrides?: CallOverrides): Promise<string>;
-        changeAdmin(newAdmin: string, overrides?: CallOverrides): Promise<void>;
-        implementation(overrides?: CallOverrides): Promise<string>;
-        upgradeTo(newImplementation: string, overrides?: CallOverrides): Promise<void>;
-        upgradeToAndCall(newImplementation: string, data: BytesLike, overrides?: CallOverrides): Promise<void>;
-    };
+    functions: {};
+    callStatic: {};
     filters: {
         "AdminChanged(address,address)"(previousAdmin?: null, newAdmin?: null): AdminChangedEventFilter;
         AdminChanged(previousAdmin?: null, newAdmin?: null): AdminChangedEventFilter;
@@ -108,38 +55,6 @@ export interface AdminUpgradeabilityProxy extends BaseContract {
         "Upgraded(address)"(implementation?: string | null): UpgradedEventFilter;
         Upgraded(implementation?: string | null): UpgradedEventFilter;
     };
-    estimateGas: {
-        admin(overrides?: Overrides & {
-            from?: string | Promise<string>;
-        }): Promise<BigNumber>;
-        changeAdmin(newAdmin: string, overrides?: Overrides & {
-            from?: string | Promise<string>;
-        }): Promise<BigNumber>;
-        implementation(overrides?: Overrides & {
-            from?: string | Promise<string>;
-        }): Promise<BigNumber>;
-        upgradeTo(newImplementation: string, overrides?: Overrides & {
-            from?: string | Promise<string>;
-        }): Promise<BigNumber>;
-        upgradeToAndCall(newImplementation: string, data: BytesLike, overrides?: PayableOverrides & {
-            from?: string | Promise<string>;
-        }): Promise<BigNumber>;
-    };
-    populateTransaction: {
-        admin(overrides?: Overrides & {
-            from?: string | Promise<string>;
-        }): Promise<PopulatedTransaction>;
-        changeAdmin(newAdmin: string, overrides?: Overrides & {
-            from?: string | Promise<string>;
-        }): Promise<PopulatedTransaction>;
-        implementation(overrides?: Overrides & {
-            from?: string | Promise<string>;
-        }): Promise<PopulatedTransaction>;
-        upgradeTo(newImplementation: string, overrides?: Overrides & {
-            from?: string | Promise<string>;
-        }): Promise<PopulatedTransaction>;
-        upgradeToAndCall(newImplementation: string, data: BytesLike, overrides?: PayableOverrides & {
-            from?: string | Promise<string>;
-        }): Promise<PopulatedTransaction>;
-    };
+    estimateGas: {};
+    populateTransaction: {};
 }

package/dist/typechain-types/ContextUpgradeable.d.ts

@@ -1,7 +1,7 @@
 import { BaseContract, Signer, utils } from "ethers";
 import { EventFragment } from "@ethersproject/abi";
 import { Listener, Provider } from "@ethersproject/providers";
-import { TypedEventFilter, TypedEvent, TypedListener, OnEvent } from "./common";
+import type { TypedEventFilter, TypedEvent, TypedListener, OnEvent } from "./common";
 export interface ContextUpgradeableInterface extends utils.Interface {
     contractName: "ContextUpgradeable";
     functions: {};
@@ -10,10 +10,10 @@ export interface ContextUpgradeableInterface extends utils.Interface {
     };
     getEvent(nameOrSignatureOrTopic: "Initialized"): EventFragment;
 }
-export declare type InitializedEvent = TypedEvent<[number], {
+export type InitializedEvent = TypedEvent<[number], {
     version: number;
 }>;
-export declare type InitializedEventFilter = TypedEventFilter<InitializedEvent>;
+export type InitializedEventFilter = TypedEventFilter<InitializedEvent>;
 export interface ContextUpgradeable extends BaseContract {
     contractName: "ContextUpgradeable";
     connect(signerOrProvider: Signer | Provider | string): this;

package/dist/typechain-types/ERC165Upgradeable.d.ts

@@ -1,7 +1,7 @@
 import { BaseContract, BigNumber, BytesLike, CallOverrides, PopulatedTransaction, Signer, utils } from "ethers";
 import { FunctionFragment, Result, EventFragment } from "@ethersproject/abi";
 import { Listener, Provider } from "@ethersproject/providers";
-import { TypedEventFilter, TypedEvent, TypedListener, OnEvent } from "./common";
+import type { TypedEventFilter, TypedEvent, TypedListener, OnEvent } from "./common";
 export interface ERC165UpgradeableInterface extends utils.Interface {
     contractName: "ERC165Upgradeable";
     functions: {
@@ -14,10 +14,10 @@ export interface ERC165UpgradeableInterface extends utils.Interface {
     };
     getEvent(nameOrSignatureOrTopic: "Initialized"): EventFragment;
 }
-export declare type InitializedEvent = TypedEvent<[number], {
+export type InitializedEvent = TypedEvent<[number], {
     version: number;
 }>;
-export declare type InitializedEventFilter = TypedEventFilter<InitializedEvent>;
+export type InitializedEventFilter = TypedEventFilter<InitializedEvent>;
 export interface ERC165Upgradeable extends BaseContract {
     contractName: "ERC165Upgradeable";
     connect(signerOrProvider: Signer | Provider | string): this;