@skalenetwork/upgrade-tools 3.0.0-update-deploy-lib.18 → 3.0.0-update-verify.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/contractFactory.d.ts +0 -11
- package/dist/src/contractFactory.js +4 -7
- package/dist/src/contractFactory.js.map +1 -1
- package/dist/src/contractVerifier.js +1 -3
- package/dist/src/contractVerifier.js.map +1 -1
- package/dist/src/deploy.js +0 -2
- package/dist/src/deploy.js.map +1 -1
- package/dist/src/gnosis-safe.js +1 -1
- package/dist/src/gnosis-safe.js.map +1 -1
- package/dist/src/submitters/auto-submitter.js +1 -3
- package/dist/src/submitters/auto-submitter.js.map +1 -1
- package/dist/src/submitters/safe-to-ima-submitter.js +0 -4
- package/dist/src/submitters/safe-to-ima-submitter.js.map +1 -1
- package/dist/src/upgrader.js +0 -1
- package/dist/src/upgrader.js.map +1 -1
- package/dist/src/verification.d.ts +1 -0
- package/dist/src/verification.js +16 -18
- package/dist/src/verification.js.map +1 -1
- package/package.json +3 -2
- package/dist/src/migration/clients/clientStrategyFactory.d.ts +0 -8
- package/dist/src/migration/clients/clientStrategyFactory.js +0 -22
- package/dist/src/migration/clients/clientStrategyFactory.js.map +0 -1
- package/dist/src/migration/clients/erigonClientStrategy.d.ts +0 -8
- package/dist/src/migration/clients/erigonClientStrategy.js +0 -46
- package/dist/src/migration/clients/erigonClientStrategy.js.map +0 -1
- package/dist/src/migration/clients/gethClientStrategy.d.ts +0 -8
- package/dist/src/migration/clients/gethClientStrategy.js +0 -40
- package/dist/src/migration/clients/gethClientStrategy.js.map +0 -1
- package/dist/src/migration/clients/iClientStrategy.d.ts +0 -9
- package/dist/src/migration/clients/iClientStrategy.js +0 -6
- package/dist/src/migration/clients/iClientStrategy.js.map +0 -1
- package/dist/src/migration/contractMigration.d.ts +0 -27
- package/dist/src/migration/contractMigration.js +0 -150
- package/dist/src/migration/contractMigration.js.map +0 -1
- package/dist/src/migration/migrator.d.ts +0 -24
- package/dist/src/migration/migrator.js +0 -86
- package/dist/src/migration/migrator.js.map +0 -1
|
@@ -1,15 +1,4 @@
|
|
|
1
1
|
import { LinkReferences } from "hardhat/types";
|
|
2
2
|
import { NonceProvider } from "./nonceProvider";
|
|
3
|
-
import { SkaleManifestData } from "./types/SkaleManifestData";
|
|
4
|
-
export declare const getSkaleManifest: () => Promise<SkaleManifestData>;
|
|
5
|
-
export declare const updateManifest: (manifest: SkaleManifestData, libraries: Map<string, string>, oldLibraries: {
|
|
6
|
-
[k: string]: string;
|
|
7
|
-
}) => Promise<void>;
|
|
8
3
|
export declare const getLibrariesNames: (linkReferences: LinkReferences) => string[];
|
|
9
|
-
export declare const getLibrariesToUpgrade: (manifest: SkaleManifestData, linkReferences: LinkReferences) => Promise<{
|
|
10
|
-
librariesToUpgrade: string[];
|
|
11
|
-
oldLibraries: {
|
|
12
|
-
[k: string]: string;
|
|
13
|
-
};
|
|
14
|
-
}>;
|
|
15
4
|
export declare const getContractFactoryAndUpdateManifest: (contract: string, nonceProvider?: NonceProvider) => Promise<import("ethers").ContractFactory<any[], import("ethers").BaseContract>>;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getContractFactoryAndUpdateManifest = exports.
|
|
3
|
+
exports.getContractFactoryAndUpdateManifest = exports.getLibrariesNames = void 0;
|
|
4
4
|
const hardhat_1 = require("hardhat");
|
|
5
5
|
const deploy_1 = require("./deploy");
|
|
6
6
|
const fs_1 = require("fs");
|
|
@@ -12,7 +12,6 @@ const getSkaleManifest = async () => {
|
|
|
12
12
|
}
|
|
13
13
|
return manifest;
|
|
14
14
|
};
|
|
15
|
-
exports.getSkaleManifest = getSkaleManifest;
|
|
16
15
|
const loadBytesCodes = async (libraryNames) => {
|
|
17
16
|
const byteCodes = new Map();
|
|
18
17
|
(await Promise.
|
|
@@ -39,7 +38,6 @@ const updateManifest = async (manifest, libraries, oldLibraries) => {
|
|
|
39
38
|
const indentation = 4;
|
|
40
39
|
await fs_1.promises.writeFile(await (0, deploy_1.getManifestFile)(), JSON.stringify(manifest, null, indentation));
|
|
41
40
|
};
|
|
42
|
-
exports.updateManifest = updateManifest;
|
|
43
41
|
const getLibrariesNames = (linkReferences) => {
|
|
44
42
|
const libraryNames = [];
|
|
45
43
|
for (const libraryFile of Object.values(linkReferences)) {
|
|
@@ -71,16 +69,15 @@ const getLibrariesToUpgrade = async (manifest, linkReferences) => {
|
|
|
71
69
|
oldLibraries
|
|
72
70
|
};
|
|
73
71
|
};
|
|
74
|
-
exports.getLibrariesToUpgrade = getLibrariesToUpgrade;
|
|
75
72
|
const getContractFactoryAndUpdateManifest = async (contract, nonceProvider) => {
|
|
76
73
|
const { linkReferences } = await hardhat_1.artifacts.readArtifact(contract);
|
|
77
74
|
if (!Object.keys(linkReferences).length) {
|
|
78
75
|
return await hardhat_1.ethers.getContractFactory(contract);
|
|
79
76
|
}
|
|
80
|
-
const manifest = await
|
|
81
|
-
const { librariesToUpgrade, oldLibraries } = await
|
|
77
|
+
const manifest = await getSkaleManifest();
|
|
78
|
+
const { librariesToUpgrade, oldLibraries } = await getLibrariesToUpgrade(manifest, linkReferences);
|
|
82
79
|
const libraries = await (0, deploy_1.deployLibraries)(librariesToUpgrade, nonceProvider);
|
|
83
|
-
await
|
|
80
|
+
await updateManifest(manifest, libraries, oldLibraries);
|
|
84
81
|
return await hardhat_1.ethers.getContractFactory(contract, { "libraries": Object.fromEntries(libraries) });
|
|
85
82
|
};
|
|
86
83
|
exports.getContractFactoryAndUpdateManifest = getContractFactoryAndUpdateManifest;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contractFactory.js","sourceRoot":"","sources":["../../src/contractFactory.ts"],"names":[],"mappings":";;;AAAA,qCAA0C;AAC1C,qCAGkB;AAIlB,2BAAkC;AAClC,+DAAyD;
|
|
1
|
+
{"version":3,"file":"contractFactory.js","sourceRoot":"","sources":["../../src/contractFactory.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,9 +14,7 @@ class ContractVerifier {
|
|
|
14
14
|
this.apiURL = target.explorerUrls.apiURL;
|
|
15
15
|
this.browserURL = target.explorerUrls.browserURL;
|
|
16
16
|
this.isEtherscan = Boolean(target.isEtherscan);
|
|
17
|
-
this.etherscan = new etherscan_1.Etherscan(process.env.ETHERSCAN ?? "", this.apiURL, this.browserURL,
|
|
18
|
-
// eslint-disable-next-line no-undefined
|
|
19
|
-
undefined);
|
|
17
|
+
this.etherscan = new etherscan_1.Etherscan(process.env.ETHERSCAN ?? "", this.apiURL, this.browserURL, target.chainId);
|
|
20
18
|
}
|
|
21
19
|
async isAlreadyVerified() {
|
|
22
20
|
let verified = false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contractVerifier.js","sourceRoot":"","sources":["../../src/contractVerifier.ts"],"names":[],"mappings":";;;;;;AAAA,iDAIwB;AACxB,yEAAoE;AACpE,kDAA0B;AAE1B,MAAa,gBAAgB;IAQzB,YAAY,MAA0B;QAClC,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;QACxC,IAAI,CAAC,eAAe,GAAG,MAAM,CAAC,eAAe,CAAC;QAC9C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC;QACzC,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC;QACjD,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAC/C,IAAI,CAAC,SAAS,GAAG,IAAI,qBAAS,CAC1B,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,EAAE,EAC3B,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,UAAU
|
|
1
|
+
{"version":3,"file":"contractVerifier.js","sourceRoot":"","sources":["../../src/contractVerifier.ts"],"names":[],"mappings":"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"}
|
package/dist/src/deploy.js
CHANGED
|
@@ -16,7 +16,6 @@ const deployLibrary = async (libraryName, nonceProvider) => {
|
|
|
16
16
|
const deployLibrariesSequential = async (libraryNames, nonceProvider) => {
|
|
17
17
|
const [deployer] = await hardhat_1.ethers.getSigners();
|
|
18
18
|
const initializedNonceProvider = nonceProvider ??
|
|
19
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
20
19
|
await nonceProvider_1.NonceProvider.createForWallet(deployer);
|
|
21
20
|
const libraries = new Map();
|
|
22
21
|
for (const lib of libraryNames) {
|
|
@@ -30,7 +29,6 @@ exports.deployLibrariesSequential = deployLibrariesSequential;
|
|
|
30
29
|
const deployLibraries = async (libraryNames, nonceProvider) => {
|
|
31
30
|
const [deployer] = await hardhat_1.ethers.getSigners();
|
|
32
31
|
const initializedNonceProvider = nonceProvider ??
|
|
33
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
34
32
|
await nonceProvider_1.NonceProvider.createForWallet(deployer);
|
|
35
33
|
const libraries = new Map();
|
|
36
34
|
(await Promise.all(libraryNames.map((libraryName) => (async () => [
|
package/dist/src/deploy.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../src/deploy.ts"],"names":[],"mappings":";;;AAAA,+DAAmE;AACnE,qCAA0C;AAC1C,mDAA8C;AAE9C,2BAAkC;AAClC,uDAAoD;AAOpD,MAAM,aAAa,GAAG,KAAK,EACvB,WAAmB,EACnB,aAA4B,EAC9B,EAAE;IACA,MAAM,OAAO,GAAG,MAAM,gBAAM,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;IAC7D,MAAM,OAAO,GAAG,MAAM,OAAO;QACzB,MAAM,CAAC,EAAC,OAAO,EAAE,aAAa,CAAC,YAAY,EAAE,EAAC,CAAC,CAAC;IACpD,MAAM,OAAO,CAAC,iBAAiB,EAAE,CAAA;IACjC,OAAO,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC;AACtC,CAAC,CAAC;AAEK,MAAO,yBAAyB,GAAG,KAAK,EAC3C,YAAsB,EACtB,aAA6B,EAC/B,EAAE;IACA,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,gBAAM,CAAC,UAAU,EAAE,CAAC;IAC7C,MAAM,wBAAwB,GAAG,aAAa;QACzC,
|
|
1
|
+
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../src/deploy.ts"],"names":[],"mappings":"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"}
|
package/dist/src/gnosis-safe.js
CHANGED
|
@@ -111,7 +111,7 @@ const createMultiSendTransaction = async (safeAddress, chainId, transactions) =>
|
|
|
111
111
|
* Transaction cannot be executed until
|
|
112
112
|
* Safe's nonce is not equal to this nonce
|
|
113
113
|
*/
|
|
114
|
-
nonce
|
|
114
|
+
nonce
|
|
115
115
|
}
|
|
116
116
|
};
|
|
117
117
|
const safeSdk = await protocol_kit_1.default.init({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gnosis-safe.js","sourceRoot":"","sources":["../../src/gnosis-safe.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"gnosis-safe.js","sourceRoot":"","sources":["../../src/gnosis-safe.ts"],"names":[],"mappings":"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"}
|
|
@@ -89,9 +89,7 @@ class AutoSubmitter extends submitter_1.Submitter {
|
|
|
89
89
|
process.exit(exitCodes_1.EXIT_CODES.UNKNOWN_MAINNET_ENDPOINT);
|
|
90
90
|
}
|
|
91
91
|
const mainnetProvider = new ethers_1.JsonRpcProvider(process.env.MAINNET_ENDPOINT);
|
|
92
|
-
const contractsNetwork =
|
|
93
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
94
|
-
await skale_contracts_ethers_v6_1.skaleContracts.getNetworkByProvider(mainnetProvider);
|
|
92
|
+
const contractsNetwork = await skale_contracts_ethers_v6_1.skaleContracts.getNetworkByProvider(mainnetProvider);
|
|
95
93
|
const ima = contractsNetwork.getProject("mainnet-ima");
|
|
96
94
|
return await ima.getInstance(process.env.IMA);
|
|
97
95
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auto-submitter.js","sourceRoot":"","sources":["../../../src/submitters/auto-submitter.ts"],"names":[],"mappings":";;;;;;AAAA,mCAAoD;AACpD,4CAAwC;AACxC,mDAA6C;AAC7C,mDAAsD;AACtD,iGAEgD;AAChD,qDAA+C;AAC/C,2CAAsC;AAEtC,kDAA0B;AAC1B,qCAA+B;AAC/B,uFAAuE;AAGvE,MAAa,aAAc,SAAQ,qBAAS;IAIxC,YACI,QAAkB;QAElB,KAAK,EAAE,CAAC;QANZ,SAAI,GAAG,gBAAgB,CAAC;QAOpB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAC5B,CAAC;IAkBD,KAAK,CAAC,MAAM,CAAE,YAA2B;QACrC,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QACvC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAC5C,MAAM,SAAS,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IACzC,CAAC;IAED,UAAU;IAEF,KAAK,CAAC,YAAY;QACtB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;QAC7C,IAAI,MAAM,gBAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC;YAChD,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;YACvC,OAAO,IAAI,4BAAY,EAAE,CAAC;QAC9B,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;QACnC,OAAO,aAAa,CAAC,4BAA4B,CAAC,KAAK,CAAC,CAAC;IAC7D,CAAC;IAEO,MAAM,CAAC,KAAK,CAAC,4BAA4B,CAAE,KAAa;QAC5D,MAAM,cAAc,GAAG,aAAa,CAAC,iBAAiB,EAAE,CAAC;QACzD,IAAI,gBAAM,CAAC,UAAU,CAAC,KAAK,CAAC;YACxB,gBAAM,CAAC,UAAU,CAAC,+BAAkB,CAAC,EAAE,CAAC;YACxC,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC;YAE5C,MAAM,WAAW,GAAG,MAAM,aAAa,CAAC,cAAc,EAAE,CAAC;YACzD,MAAM,WAAW,GAAG,aAAa,CAAC,cAAc,EAAE,CAAC;YACnD,MAAM,UAAU,GAAG,aAAa,CAAC,aAAa,EAAE,CAAC;YAEjD;;;;;;;;;;;;;;;;;;;;;;;;eAwBG;YACH,OAAO,IAAI,uEAAgC,CACvC,WAAW,EACX,WAAW,EACX;gBACI,cAAc;gBACd,kBAAkB,EAAE,UAAU;aACjC,CACJ,CAAC;QACN,CAAC;QAED,kCAAkC;QAClC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;QAEjC,OAAO,IAAI,8BAAa,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;IACpD,CAAC;IAEO,MAAM,CAAC,KAAK,CAAC,cAAc;QAC/B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;YACnB,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,sBAAsB;gBACxC,8BAA8B,CAAC,CAAC,CAAC;YACrC,OAAO,CAAC,IAAI,CAAC,sBAAU,CAAC,WAAW,CAAC,CAAC;QACzC,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;YAChC,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,sBAAsB;gBACxC,2CAA2C,CAAC,CAAC,CAAC;YAClD,OAAO,CAAC,IAAI,CAAC,sBAAU,CAAC,wBAAwB,CAAC,CAAC;QACtD,CAAC;QACD,MAAM,eAAe,GAAG,IAAI,wBAAe,CACvC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAC/B,CAAC;QACF,MAAM,gBAAgB
|
|
1
|
+
{"version":3,"file":"auto-submitter.js","sourceRoot":"","sources":["../../../src/submitters/auto-submitter.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,9 +15,6 @@ class SafeToImaSubmitter extends safe_submitter_1.SafeSubmitter {
|
|
|
15
15
|
SafeToImaSubmitter.atomicityWarning();
|
|
16
16
|
}
|
|
17
17
|
const messageProxyForMainnet = await this.getMessageProxyForMainnet();
|
|
18
|
-
if (!messageProxyForMainnet) {
|
|
19
|
-
throw Error("MainnetImaProxyForMainnet not found");
|
|
20
|
-
}
|
|
21
18
|
const messageProxyForMainnetAddress = await messageProxyForMainnet.getAddress();
|
|
22
19
|
const transactionsToIma = transactions.map((transaction) => ethers_1.Transaction.from({
|
|
23
20
|
"data": messageProxyForMainnet.interface.encodeFunctionData("postOutgoingMessage", [
|
|
@@ -32,7 +29,6 @@ class SafeToImaSubmitter extends safe_submitter_1.SafeSubmitter {
|
|
|
32
29
|
async getMessageProxyForMainnet() {
|
|
33
30
|
if (typeof this.messageProxyForMainnet === "undefined") {
|
|
34
31
|
this.messageProxyForMainnet =
|
|
35
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
36
32
|
await this.imaInstance.getContract("MessageProxyForMainnet");
|
|
37
33
|
}
|
|
38
34
|
return this.messageProxyForMainnet;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"safe-to-ima-submitter.js","sourceRoot":"","sources":["../../../src/submitters/safe-to-ima-submitter.ts"],"names":[],"mappings":";;;AAAA,mCAA4D;AAE5D,qDAA+C;AAQ/C,MAAa,kBAAmB,SAAQ,8BAAa;IAOjD,YACI,WAAmB,EACnB,WAAqB,EACrB,OAAgB;QAEhB,KAAK,CACD,WAAW,EACX,OAAO,CAAC,cAAc,CACzB,CAAC;QACF,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,MAAM,CAAE,YAA2B;QACrC,MAAM,iBAAiB,GAAG,CAAC,CAAC;QAC5B,IAAI,YAAY,CAAC,MAAM,GAAG,iBAAiB,EAAE,CAAC;YAC1C,kBAAkB,CAAC,gBAAgB,EAAE,CAAC;QAC1C,CAAC;QACD,MAAM,sBAAsB,GAAG,MAAM,IAAI,CAAC,yBAAyB,EAAE,CAAC;QACtE,
|
|
1
|
+
{"version":3,"file":"safe-to-ima-submitter.js","sourceRoot":"","sources":["../../../src/submitters/safe-to-ima-submitter.ts"],"names":[],"mappings":";;;AAAA,mCAA4D;AAE5D,qDAA+C;AAQ/C,MAAa,kBAAmB,SAAQ,8BAAa;IAOjD,YACI,WAAmB,EACnB,WAAqB,EACrB,OAAgB;QAEhB,KAAK,CACD,WAAW,EACX,OAAO,CAAC,cAAc,CACzB,CAAC;QACF,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,MAAM,CAAE,YAA2B;QACrC,MAAM,iBAAiB,GAAG,CAAC,CAAC;QAC5B,IAAI,YAAY,CAAC,MAAM,GAAG,iBAAiB,EAAE,CAAC;YAC1C,kBAAkB,CAAC,gBAAgB,EAAE,CAAC;QAC1C,CAAC;QACD,MAAM,sBAAsB,GAAG,MAAM,IAAI,CAAC,yBAAyB,EAAE,CAAC;QACtE,MAAM,6BAA6B,GAAG,MAAM,sBAAsB,CAAC,UAAU,EAAE,CAAC;QAChF,MAAM,iBAAiB,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,oBAAW,CAAC,IAAI,CAAC;YACzE,MAAM,EAAE,sBAAsB,CAAC,SAAS,CAAC,kBAAkB,CACvD,qBAAqB,EACrB;gBACI,IAAI,CAAC,gBAAgB;gBACrB,WAAW,CAAC,EAAE;gBACd,WAAW,CAAC,IAAI;aACnB,CACJ;YACD,IAAI,EAAE,6BAA6B;SACtC,CAAC,CAAC,CAAC;QACJ,MAAM,KAAK,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;IAC1C,CAAC;IAEO,KAAK,CAAC,yBAAyB;QACnC,IAAI,OAAO,IAAI,CAAC,sBAAsB,KAAK,WAAW,EAAE,CAAC;YACrD,IAAI,CAAC,sBAAsB;gBACvB,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,wBAAwB,CAAC,CAAC;QACrE,CAAC;QACD,OAAO,IAAI,CAAC,sBAAsB,CAAC;IACvC,CAAC;CACJ;AAhDD,gDAgDC"}
|
package/dist/src/upgrader.js
CHANGED
|
@@ -103,7 +103,6 @@ class Upgrader {
|
|
|
103
103
|
}
|
|
104
104
|
async deployNewImplementations() {
|
|
105
105
|
const [deployer] = await hardhat_1.ethers.getSigners();
|
|
106
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
107
106
|
this.nonceProvider ?? (this.nonceProvider = await nonceProvider_1.NonceProvider.createForWallet(deployer));
|
|
108
107
|
const contracts = await Promise.all(this.contractNamesToUpgrade.
|
|
109
108
|
map(this.protectedDeployNewImplementation, this));
|
package/dist/src/upgrader.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgrader.js","sourceRoot":"","sources":["../../src/upgrader.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"upgrader.js","sourceRoot":"","sources":["../../src/upgrader.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ export interface VerificationTarget {
|
|
|
6
6
|
apiURL: string;
|
|
7
7
|
};
|
|
8
8
|
isEtherscan?: boolean;
|
|
9
|
+
chainId?: number;
|
|
9
10
|
}
|
|
10
11
|
export declare const isVerifiedOnBlockscout: (apiURL: string, address: string) => Promise<boolean>;
|
|
11
12
|
export declare const getVerifyParameters: (contractName: string) => Promise<{
|
package/dist/src/verification.js
CHANGED
|
@@ -157,10 +157,11 @@ const verifyOnEtherscan = async (contractName, contractAddress, chainConfig) =>
|
|
|
157
157
|
}
|
|
158
158
|
const explorerUrls = await getExplorerUrls(chainConfig);
|
|
159
159
|
await verifyWithRetry({
|
|
160
|
+
chainId: chainConfig.chainId,
|
|
160
161
|
contractAddress,
|
|
161
162
|
contractName,
|
|
162
163
|
explorerUrls,
|
|
163
|
-
isEtherscan: true
|
|
164
|
+
isEtherscan: true,
|
|
164
165
|
}, RETRIES_AMOUNT);
|
|
165
166
|
};
|
|
166
167
|
const verifyOnBlockscout = async (contractName, contractAddress, chainConfig) => {
|
|
@@ -179,29 +180,26 @@ const verifyOnSkale = async (contractName, contractAddress) => {
|
|
|
179
180
|
explorerUrls
|
|
180
181
|
}, RETRIES_AMOUNT);
|
|
181
182
|
};
|
|
182
|
-
// eslint-disable-next-line max-statements
|
|
183
183
|
const verify = async (contractName, contractAddress) => {
|
|
184
184
|
const { chainId } = await hardhat_1.ethers.provider.getNetwork();
|
|
185
|
-
|
|
186
|
-
*BuiltinChains.push({
|
|
187
|
-
* chainId: 560048,
|
|
188
|
-
* network: "hoodi",
|
|
189
|
-
* urls: {
|
|
190
|
-
* apiURL: "https://api-hoodi.etherscan.io/api",
|
|
191
|
-
* browserURL: "https://hoodi.etherscan.io",
|
|
192
|
-
* }
|
|
193
|
-
*});
|
|
194
|
-
*/
|
|
195
|
-
const etherscanConfig = chain_config_1.builtinChains.find(config => config.chainId === Number(chainId));
|
|
185
|
+
let etherscanConfig = chain_config_1.builtinChains.find(config => config.chainId === Number(chainId));
|
|
196
186
|
const blockscoutConfig = blockscoutChains.find(config => config.chainId === Number(chainId));
|
|
197
|
-
const isSkaleChain = !etherscanConfig && !blockscoutConfig;
|
|
198
|
-
if (etherscanConfig) {
|
|
199
|
-
await verifyOnEtherscan(contractName, contractAddress, etherscanConfig);
|
|
200
|
-
}
|
|
201
187
|
if (blockscoutConfig) {
|
|
188
|
+
etherscanConfig = {
|
|
189
|
+
chainId: blockscoutConfig.chainId,
|
|
190
|
+
network: blockscoutConfig.network,
|
|
191
|
+
urls: {
|
|
192
|
+
apiURL: "https://api.etherscan.io/v2/api",
|
|
193
|
+
browserURL: "https://etherscan.io",
|
|
194
|
+
}
|
|
195
|
+
};
|
|
202
196
|
await verifyOnBlockscout(contractName, contractAddress, blockscoutConfig);
|
|
203
197
|
}
|
|
204
|
-
if (
|
|
198
|
+
if (etherscanConfig) {
|
|
199
|
+
await verifyOnEtherscan(contractName, contractAddress, etherscanConfig);
|
|
200
|
+
}
|
|
201
|
+
// Is probably SkaleChain
|
|
202
|
+
if (!etherscanConfig && !blockscoutConfig) {
|
|
205
203
|
await verifyOnSkale(contractName, contractAddress);
|
|
206
204
|
}
|
|
207
205
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verification.js","sourceRoot":"","sources":["../../src/verification.ts"],"names":[],"mappings":";;;;;;AAAA,qCAAmD;AAEnD,yDAAoD;AACpD,wFAE+D;AAC/D,kDAA0B;AAC1B,+DAAqE;AACrE,2NACsJ;AACtJ,kHAAsF;AAEtF,wCAAwC;AAExC,MAAM,cAAc,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"verification.js","sourceRoot":"","sources":["../../src/verification.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@skalenetwork/upgrade-tools",
|
|
3
|
-
"version": "3.0.0-update-
|
|
3
|
+
"version": "3.0.0-update-verify.0",
|
|
4
4
|
"description": "Scripts to support upgrades of smart contracts",
|
|
5
5
|
"files": [
|
|
6
6
|
"dist/**/*"
|
|
@@ -10,6 +10,7 @@
|
|
|
10
10
|
"repository": "git@github.com:skalenetwork/upgrade-tools.git",
|
|
11
11
|
"author": "Dmytro Stebaiev <dmytro@skalelabs.com>",
|
|
12
12
|
"license": "AGPL-3.0",
|
|
13
|
+
"private": false,
|
|
13
14
|
"scripts": {
|
|
14
15
|
"prepare": "yarn hooks && yarn install-peers",
|
|
15
16
|
"compile": "npx hardhat typechain && tsc",
|
|
@@ -47,7 +48,7 @@
|
|
|
47
48
|
},
|
|
48
49
|
"peerDependencies": {
|
|
49
50
|
"@nomicfoundation/hardhat-ethers": "^3.0.0",
|
|
50
|
-
"@nomicfoundation/hardhat-verify": "
|
|
51
|
+
"@nomicfoundation/hardhat-verify": "2.0.14",
|
|
51
52
|
"@openzeppelin/hardhat-upgrades": "^3.1.1",
|
|
52
53
|
"@openzeppelin/upgrades-core": "^1.27.1",
|
|
53
54
|
"@types/mocha": "^9.1.0",
|
|
@@ -1,8 +0,0 @@
|
|
|
1
|
-
import { ErigonClientStrategy } from "./erigonClientStrategy";
|
|
2
|
-
import { GethClientStrategy } from "./gethClientStrategy";
|
|
3
|
-
import { JsonRpcProvider } from "ethers";
|
|
4
|
-
export declare enum Client {
|
|
5
|
-
GETH = "geth",
|
|
6
|
-
ERIGON = "erigon"
|
|
7
|
-
}
|
|
8
|
-
export declare const clientStrategyFactory: (clientType: Client, provider: JsonRpcProvider) => ErigonClientStrategy | GethClientStrategy;
|
|
@@ -1,22 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.clientStrategyFactory = exports.Client = void 0;
|
|
4
|
-
const erigonClientStrategy_1 = require("./erigonClientStrategy");
|
|
5
|
-
const gethClientStrategy_1 = require("./gethClientStrategy");
|
|
6
|
-
var Client;
|
|
7
|
-
(function (Client) {
|
|
8
|
-
Client["GETH"] = "geth";
|
|
9
|
-
Client["ERIGON"] = "erigon";
|
|
10
|
-
})(Client || (exports.Client = Client = {}));
|
|
11
|
-
const clientStrategyFactory = (clientType, provider) => {
|
|
12
|
-
switch (clientType) {
|
|
13
|
-
case Client.GETH:
|
|
14
|
-
return new gethClientStrategy_1.GethClientStrategy(provider);
|
|
15
|
-
case Client.ERIGON:
|
|
16
|
-
return new erigonClientStrategy_1.ErigonClientStrategy(provider);
|
|
17
|
-
default:
|
|
18
|
-
throw Error(`Unable to create Client ${clientType}`);
|
|
19
|
-
}
|
|
20
|
-
};
|
|
21
|
-
exports.clientStrategyFactory = clientStrategyFactory;
|
|
22
|
-
//# sourceMappingURL=clientStrategyFactory.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"clientStrategyFactory.js","sourceRoot":"","sources":["../../../../src/migration/clients/clientStrategyFactory.ts"],"names":[],"mappings":";;;AAAA,iEAA4D;AAC5D,6DAAwD;AAGxD,IAAY,MAGX;AAHD,WAAY,MAAM;IACd,uBAAa,CAAA;IACb,2BAAiB,CAAA;AACrB,CAAC,EAHW,MAAM,sBAAN,MAAM,QAGjB;AAEM,MAAM,qBAAqB,GAAG,CAAC,UAAkB,EAAE,QAAyB,EAAE,EAAE;IACnF,QAAQ,UAAU,EAAE,CAAC;QACjB,KAAK,MAAM,CAAC,IAAI;YACZ,OAAO,IAAI,uCAAkB,CAAC,QAAQ,CAAC,CAAC;QAC5C,KAAK,MAAM,CAAC,MAAM;YACd,OAAO,IAAI,2CAAoB,CAAC,QAAQ,CAAC,CAAC;QAE9C;YACI,MAAM,KAAK,CAAC,2BAA2B,UAAU,EAAE,CAAC,CAAC;IAC7D,CAAC;AACL,CAAC,CAAA;AAVY,QAAA,qBAAqB,yBAUjC"}
|
|
@@ -1,8 +0,0 @@
|
|
|
1
|
-
import { IClientStrategy, Slot } from "./iClientStrategy";
|
|
2
|
-
import { JsonRpcProvider } from "ethers";
|
|
3
|
-
export declare class ErigonClientStrategy implements IClientStrategy {
|
|
4
|
-
private provider;
|
|
5
|
-
constructor(provider: JsonRpcProvider);
|
|
6
|
-
dumpStorageForContract(contractAddress: string, blockHash: string): Promise<Slot[]>;
|
|
7
|
-
getBalance(account: string): Promise<bigint>;
|
|
8
|
-
}
|
|
@@ -1,46 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ErigonClientStrategy = void 0;
|
|
4
|
-
const iClientStrategy_1 = require("./iClientStrategy");
|
|
5
|
-
const DEFAULT_TX_INDEX = 0;
|
|
6
|
-
/*
|
|
7
|
-
* Changing might produce unwanted behavior for erigon
|
|
8
|
-
* NextKey in erigon is the original (preimage) key, and not the hashed in.
|
|
9
|
-
* However, when requesting multiple slots, they do not appear to be ordered by original slot key
|
|
10
|
-
* For predictable behavior, maintain at 1
|
|
11
|
-
*/
|
|
12
|
-
const DEFAULT_N_SLOTS_TO_FETCH = 1;
|
|
13
|
-
class ErigonClientStrategy {
|
|
14
|
-
constructor(provider) {
|
|
15
|
-
this.provider = provider;
|
|
16
|
-
}
|
|
17
|
-
async dumpStorageForContract(contractAddress, blockHash) {
|
|
18
|
-
let startSlot = iClientStrategy_1.ZERO_KEY;
|
|
19
|
-
const slots = [];
|
|
20
|
-
// eslint-disable-next-line no-constant-condition
|
|
21
|
-
while (startSlot) {
|
|
22
|
-
// eslint-disable-next-line no-await-in-loop
|
|
23
|
-
const { storage, nextKey } = await this.provider.send('debug_storageRangeAt', [
|
|
24
|
-
blockHash,
|
|
25
|
-
DEFAULT_TX_INDEX,
|
|
26
|
-
contractAddress,
|
|
27
|
-
startSlot,
|
|
28
|
-
DEFAULT_N_SLOTS_TO_FETCH
|
|
29
|
-
]);
|
|
30
|
-
Object.entries(storage).forEach((entry) => {
|
|
31
|
-
// eslint-disable-next-line no-magic-numbers
|
|
32
|
-
const slot = entry[1];
|
|
33
|
-
if (slot.key !== null) {
|
|
34
|
-
slots.push(slot);
|
|
35
|
-
}
|
|
36
|
-
});
|
|
37
|
-
startSlot = nextKey;
|
|
38
|
-
}
|
|
39
|
-
return slots;
|
|
40
|
-
}
|
|
41
|
-
async getBalance(account) {
|
|
42
|
-
return await this.provider.getBalance(account);
|
|
43
|
-
}
|
|
44
|
-
}
|
|
45
|
-
exports.ErigonClientStrategy = ErigonClientStrategy;
|
|
46
|
-
//# sourceMappingURL=erigonClientStrategy.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"erigonClientStrategy.js","sourceRoot":"","sources":["../../../../src/migration/clients/erigonClientStrategy.ts"],"names":[],"mappings":";;;AAAA,uDAAkE;AAElE,MAAM,gBAAgB,GAAG,CAAC,CAAC;AAE3B;;;;;GAKG;AACH,MAAM,wBAAwB,GAAG,CAAC,CAAC;AAEnC,MAAa,oBAAoB;IAG7B,YAAY,QAAyB;QACjC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,sBAAsB,CACxB,eAAuB,EACvB,SAAiB;QAEjB,IAAI,SAAS,GAAG,0BAAQ,CAAC;QACzB,MAAM,KAAK,GAAW,EAAE,CAAC;QACzB,iDAAiD;QACjD,OAAO,SAAS,EAAE,CAAC;YACf,4CAA4C;YAC5C,MAAM,EAAC,OAAO,EAAE,OAAO,EAAC,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAC/C,sBAAsB,EACtB;gBACI,SAAS;gBACT,gBAAgB;gBAChB,eAAe;gBACf,SAAS;gBACT,wBAAwB;aAC3B,CACJ,CAAC;YACF,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;gBACtC,4CAA4C;gBAC5C,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAS,CAAC;gBAC9B,IAAK,IAAI,CAAC,GAAG,KAAK,IAAI,EAAG,CAAC;oBACtB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACrB,CAAC;YACL,CAAC,CAAC,CAAC;YAEH,SAAS,GAAG,OAAO,CAAC;QACxB,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,OAAe;QAC5B,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IACnD,CAAC;CACJ;AA1CD,oDA0CC"}
|
|
@@ -1,8 +0,0 @@
|
|
|
1
|
-
import { IClientStrategy, Slot } from "./iClientStrategy";
|
|
2
|
-
import { JsonRpcProvider } from "ethers";
|
|
3
|
-
export declare class GethClientStrategy implements IClientStrategy {
|
|
4
|
-
private provider;
|
|
5
|
-
constructor(provider: JsonRpcProvider);
|
|
6
|
-
dumpStorageForContract(contractAddress: string, blockHash: string): Promise<Slot[]>;
|
|
7
|
-
getBalance(account: string): Promise<bigint>;
|
|
8
|
-
}
|
|
@@ -1,40 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.GethClientStrategy = void 0;
|
|
4
|
-
const iClientStrategy_1 = require("./iClientStrategy");
|
|
5
|
-
const DEFAULT_TX_INDEX = 0;
|
|
6
|
-
const DEFAULT_N_SLOTS_TO_FETCH = 1;
|
|
7
|
-
class GethClientStrategy {
|
|
8
|
-
constructor(provider) {
|
|
9
|
-
this.provider = provider;
|
|
10
|
-
}
|
|
11
|
-
async dumpStorageForContract(contractAddress, blockHash) {
|
|
12
|
-
let hashedKey = iClientStrategy_1.ZERO_KEY;
|
|
13
|
-
const slots = [];
|
|
14
|
-
// eslint-disable-next-line no-constant-condition
|
|
15
|
-
while (hashedKey) {
|
|
16
|
-
// eslint-disable-next-line no-await-in-loop
|
|
17
|
-
const { storage, nextKey } = await this.provider.send('debug_storageRangeAt', [
|
|
18
|
-
blockHash,
|
|
19
|
-
DEFAULT_TX_INDEX,
|
|
20
|
-
contractAddress,
|
|
21
|
-
hashedKey,
|
|
22
|
-
DEFAULT_N_SLOTS_TO_FETCH
|
|
23
|
-
]);
|
|
24
|
-
Object.entries(storage).forEach((entry) => {
|
|
25
|
-
// eslint-disable-next-line no-magic-numbers
|
|
26
|
-
const slot = entry[1];
|
|
27
|
-
if (slot.key !== null) {
|
|
28
|
-
slots.push(slot);
|
|
29
|
-
}
|
|
30
|
-
});
|
|
31
|
-
hashedKey = nextKey;
|
|
32
|
-
}
|
|
33
|
-
return slots;
|
|
34
|
-
}
|
|
35
|
-
async getBalance(account) {
|
|
36
|
-
return await this.provider.getBalance(account);
|
|
37
|
-
}
|
|
38
|
-
}
|
|
39
|
-
exports.GethClientStrategy = GethClientStrategy;
|
|
40
|
-
//# sourceMappingURL=gethClientStrategy.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"gethClientStrategy.js","sourceRoot":"","sources":["../../../../src/migration/clients/gethClientStrategy.ts"],"names":[],"mappings":";;;AAAA,uDAAkE;AAElE,MAAM,gBAAgB,GAAG,CAAC,CAAC;AAC3B,MAAM,wBAAwB,GAAG,CAAC,CAAC;AAEnC,MAAa,kBAAkB;IAG3B,YAAY,QAAyB;QACjC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,sBAAsB,CACxB,eAAuB,EACvB,SAAiB;QAEjB,IAAI,SAAS,GAAG,0BAAQ,CAAC;QACzB,MAAM,KAAK,GAAW,EAAE,CAAC;QACzB,iDAAiD;QACjD,OAAO,SAAS,EAAE,CAAC;YACf,4CAA4C;YAC5C,MAAM,EAAC,OAAO,EAAE,OAAO,EAAC,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAC/C,sBAAsB,EACtB;gBACI,SAAS;gBACT,gBAAgB;gBAChB,eAAe;gBACf,SAAS;gBACT,wBAAwB;aAC3B,CACJ,CAAC;YACF,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;gBACtC,4CAA4C;gBAC5C,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAS,CAAC;gBAC9B,IAAK,IAAI,CAAC,GAAG,KAAK,IAAI,EAAG,CAAC;oBACtB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACrB,CAAC;YACL,CAAC,CAAC,CAAC;YACH,SAAS,GAAG,OAAO,CAAC;QACxB,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,KAAK,CAAC,UAAU,CAAC,OAAe;QAC5B,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IACnD,CAAC;CACJ;AAxCD,gDAwCC"}
|
|
@@ -1,9 +0,0 @@
|
|
|
1
|
-
export type Slot = {
|
|
2
|
-
key: string;
|
|
3
|
-
value: string;
|
|
4
|
-
};
|
|
5
|
-
export declare const ZERO_KEY: string;
|
|
6
|
-
export interface IClientStrategy {
|
|
7
|
-
dumpStorageForContract(contractAddress: string, blockHash: string): Promise<Slot[]>;
|
|
8
|
-
getBalance(account: string): Promise<bigint>;
|
|
9
|
-
}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"iClientStrategy.js","sourceRoot":"","sources":["../../../../src/migration/clients/iClientStrategy.ts"],"names":[],"mappings":";;;AACA,4CAA4C;AAC/B,QAAA,QAAQ,GAAG,KAAK,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC"}
|
|
@@ -1,27 +0,0 @@
|
|
|
1
|
-
import { IClientStrategy, Slot } from "./clients/iClientStrategy";
|
|
2
|
-
export interface IContractMigrationOptions {
|
|
3
|
-
contractName: string;
|
|
4
|
-
oldAddress: string;
|
|
5
|
-
client: IClientStrategy;
|
|
6
|
-
blockHash: string;
|
|
7
|
-
txPerBlock?: number;
|
|
8
|
-
}
|
|
9
|
-
export declare class ContractMigration {
|
|
10
|
-
contractName: string;
|
|
11
|
-
oldAddress: string;
|
|
12
|
-
newAddress: string | undefined;
|
|
13
|
-
storage: Slot[];
|
|
14
|
-
client: IClientStrategy;
|
|
15
|
-
blockHash: string;
|
|
16
|
-
private txPerBlock;
|
|
17
|
-
constructor(options: IContractMigrationOptions);
|
|
18
|
-
init(): Promise<this>;
|
|
19
|
-
dumpStorage(): Promise<Slot[]>;
|
|
20
|
-
migrateData(valuesToUpdate: Map<string, string>): Promise<void>;
|
|
21
|
-
private deployRawStorageSetter;
|
|
22
|
-
upgrade(): Promise<void>;
|
|
23
|
-
verify(): Promise<void>;
|
|
24
|
-
private updateValues;
|
|
25
|
-
private getContractFactoryAndUpdateManifest;
|
|
26
|
-
transferETH(): Promise<void>;
|
|
27
|
-
}
|
|
@@ -1,150 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
/* eslint-disable no-await-in-loop */
|
|
3
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
-
exports.ContractMigration = void 0;
|
|
5
|
-
const hardhat_1 = require("hardhat");
|
|
6
|
-
const contractFactory_1 = require("../contractFactory");
|
|
7
|
-
const ethers_1 = require("ethers");
|
|
8
|
-
const verification_1 = require("../verification");
|
|
9
|
-
// Constant slots defined by EIP-1967 (do not override)
|
|
10
|
-
const IMPL_ADDRESS_SLOT = "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc";
|
|
11
|
-
const ADMIN_ADDRESS_SLOT = "0xb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103";
|
|
12
|
-
const ADDRESS_SIZE = 32;
|
|
13
|
-
/*
|
|
14
|
-
* This should be safe limit
|
|
15
|
-
* However, it's possible to set the limit for 1 if reliability is crucial.
|
|
16
|
-
* Incidents such as rate-limits by the provider can cause the script to hang or terminate
|
|
17
|
-
*/
|
|
18
|
-
const MAX_TX_PER_BLOCK = 3;
|
|
19
|
-
const deployLibraries = async (libraryNames) => {
|
|
20
|
-
const libraries = new Map();
|
|
21
|
-
for (const lib of libraryNames) {
|
|
22
|
-
const Library = await hardhat_1.ethers.getContractFactory(lib);
|
|
23
|
-
const library = await Library.
|
|
24
|
-
deploy();
|
|
25
|
-
await library.waitForDeployment();
|
|
26
|
-
const address = await library.getAddress();
|
|
27
|
-
libraries.set(lib, address);
|
|
28
|
-
}
|
|
29
|
-
return libraries;
|
|
30
|
-
};
|
|
31
|
-
class ContractMigration {
|
|
32
|
-
constructor(options) {
|
|
33
|
-
this.storage = [];
|
|
34
|
-
this.contractName = options.contractName;
|
|
35
|
-
this.oldAddress = options.oldAddress;
|
|
36
|
-
this.client = options.client;
|
|
37
|
-
this.blockHash = options.blockHash;
|
|
38
|
-
this.txPerBlock = options.txPerBlock ?? MAX_TX_PER_BLOCK;
|
|
39
|
-
}
|
|
40
|
-
async init() {
|
|
41
|
-
await this.deployRawStorageSetter();
|
|
42
|
-
return this;
|
|
43
|
-
}
|
|
44
|
-
async dumpStorage() {
|
|
45
|
-
this.storage = await this.client.dumpStorageForContract(this.oldAddress, this.blockHash);
|
|
46
|
-
console.log("Found", this.storage.length, "entries for", this.contractName);
|
|
47
|
-
return this.storage;
|
|
48
|
-
}
|
|
49
|
-
// eslint-disable-next-line max-statements
|
|
50
|
-
async migrateData(valuesToUpdate) {
|
|
51
|
-
this.updateValues(valuesToUpdate);
|
|
52
|
-
const storageSetter = await hardhat_1.ethers.getContractAt("RawStorageSetter", this.newAddress);
|
|
53
|
-
const receipts = [];
|
|
54
|
-
let sent = 0;
|
|
55
|
-
for (const { key, value } of this.storage) {
|
|
56
|
-
if (key !== IMPL_ADDRESS_SLOT && key !== ADMIN_ADDRESS_SLOT) {
|
|
57
|
-
const tx = await storageSetter.setStorage(key, value);
|
|
58
|
-
// eslint-disable-next-line no-plusplus
|
|
59
|
-
sent++;
|
|
60
|
-
receipts.push(tx.wait());
|
|
61
|
-
if (!(sent % this.txPerBlock)) {
|
|
62
|
-
// eslint-disable-next-line no-ternary, no-magic-numbers
|
|
63
|
-
const len = this.storage.length > 2 ? this.storage.length - 2 : 0;
|
|
64
|
-
console.log("Waiting batch", sent / this.txPerBlock, "of", Math.ceil(len / this.txPerBlock));
|
|
65
|
-
await Promise.all(receipts);
|
|
66
|
-
receipts.length = 0;
|
|
67
|
-
}
|
|
68
|
-
}
|
|
69
|
-
}
|
|
70
|
-
await Promise.all(receipts);
|
|
71
|
-
console.log(`finished migrating data of: ${this.contractName}`);
|
|
72
|
-
}
|
|
73
|
-
async deployRawStorageSetter() {
|
|
74
|
-
const rawStorageSetter = await hardhat_1.ethers.getContractFactory("RawStorageSetter");
|
|
75
|
-
const contractProxy = await hardhat_1.upgrades.deployProxy(rawStorageSetter, []);
|
|
76
|
-
await contractProxy.waitForDeployment();
|
|
77
|
-
this.newAddress = await (0, ethers_1.resolveAddress)(contractProxy);
|
|
78
|
-
console.log("Deployed new proxy for", this.contractName, "at", this.newAddress);
|
|
79
|
-
}
|
|
80
|
-
async upgrade() {
|
|
81
|
-
const realContractFactory = await this.getContractFactoryAndUpdateManifest();
|
|
82
|
-
await hardhat_1.upgrades.upgradeProxy(this.newAddress, realContractFactory, {
|
|
83
|
-
unsafeAllowLinkedLibraries: true
|
|
84
|
-
});
|
|
85
|
-
console.log("Upgraded", this.contractName);
|
|
86
|
-
}
|
|
87
|
-
async verify() {
|
|
88
|
-
// TODO: check
|
|
89
|
-
try {
|
|
90
|
-
await (0, verification_1.verifyProxy)(this.contractName, this.newAddress);
|
|
91
|
-
console.log("Verified", this.contractName);
|
|
92
|
-
}
|
|
93
|
-
catch (error) {
|
|
94
|
-
console.log(`Failed verifying ${this.contractName}. Cause: ${error}`);
|
|
95
|
-
}
|
|
96
|
-
}
|
|
97
|
-
updateValues(valuesToUpdate) {
|
|
98
|
-
const filteredSlots = [];
|
|
99
|
-
for (const slot of this.storage) {
|
|
100
|
-
for (const [oldVal, newVal] of valuesToUpdate.entries()) {
|
|
101
|
-
/*
|
|
102
|
-
* For each place where the slot value corresponded to the contract address in the old chain
|
|
103
|
-
* Replace with the address of the New deployment
|
|
104
|
-
*/
|
|
105
|
-
if (slot.value === (0, ethers_1.zeroPadValue)(oldVal, ADDRESS_SIZE)) {
|
|
106
|
-
slot.value = (0, ethers_1.zeroPadValue)(newVal, ADDRESS_SIZE);
|
|
107
|
-
}
|
|
108
|
-
}
|
|
109
|
-
filteredSlots.push(slot);
|
|
110
|
-
}
|
|
111
|
-
this.storage = filteredSlots;
|
|
112
|
-
}
|
|
113
|
-
async getContractFactoryAndUpdateManifest() {
|
|
114
|
-
const { linkReferences } = await hardhat_1.artifacts.readArtifact(this.contractName);
|
|
115
|
-
if (!Object.keys(linkReferences).length) {
|
|
116
|
-
return await hardhat_1.ethers.getContractFactory(this.contractName);
|
|
117
|
-
}
|
|
118
|
-
const manifest = await (0, contractFactory_1.getSkaleManifest)();
|
|
119
|
-
const { librariesToUpgrade, oldLibraries } = await (0, contractFactory_1.getLibrariesToUpgrade)(manifest, linkReferences);
|
|
120
|
-
const libraries = await deployLibraries(librariesToUpgrade);
|
|
121
|
-
await (0, contractFactory_1.updateManifest)(manifest, libraries, oldLibraries);
|
|
122
|
-
return await hardhat_1.ethers.getContractFactory(this.contractName, { "libraries": Object.fromEntries(libraries) });
|
|
123
|
-
}
|
|
124
|
-
// eslint-disable-next-line max-statements
|
|
125
|
-
async transferETH() {
|
|
126
|
-
let balance = await this.client.getBalance(this.oldAddress);
|
|
127
|
-
// eslint-disable-next-line no-magic-numbers
|
|
128
|
-
if (balance === 0n) {
|
|
129
|
-
return;
|
|
130
|
-
}
|
|
131
|
-
if (balance > hardhat_1.ethers.parseEther("5")) {
|
|
132
|
-
console.log(`Balance of ${this.contractName} is bigger than 5TH.`);
|
|
133
|
-
console.log(`Missing top up ${this.newAddress} with: ${balance - hardhat_1.ethers.parseEther("5")}`);
|
|
134
|
-
balance = hardhat_1.ethers.parseEther("5");
|
|
135
|
-
}
|
|
136
|
-
// eslint-disable-next-line no-magic-numbers
|
|
137
|
-
const sender = (await hardhat_1.ethers.getSigners()).at(0);
|
|
138
|
-
if (!sender) {
|
|
139
|
-
return;
|
|
140
|
-
}
|
|
141
|
-
const tx = await sender.sendTransaction({
|
|
142
|
-
to: this.newAddress,
|
|
143
|
-
value: balance,
|
|
144
|
-
});
|
|
145
|
-
await tx.wait();
|
|
146
|
-
console.log("Transferred", hardhat_1.ethers.formatEther(balance.toString()), "to", this.contractName);
|
|
147
|
-
}
|
|
148
|
-
}
|
|
149
|
-
exports.ContractMigration = ContractMigration;
|
|
150
|
-
//# sourceMappingURL=contractMigration.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"contractMigration.js","sourceRoot":"","sources":["../../../src/migration/contractMigration.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,24 +0,0 @@
|
|
|
1
|
-
import { Client } from "./clients/clientStrategyFactory";
|
|
2
|
-
import { ContractMigration } from "./contractMigration";
|
|
3
|
-
import { JsonRpcProvider } from "ethers";
|
|
4
|
-
import { Project } from "../types/upgrader";
|
|
5
|
-
export interface IMigratorOptions {
|
|
6
|
-
blockHash: string;
|
|
7
|
-
migrations: ContractMigration[];
|
|
8
|
-
valuesToReplace?: Map<string, string>;
|
|
9
|
-
}
|
|
10
|
-
export declare class Migrator {
|
|
11
|
-
private migrations;
|
|
12
|
-
private blockHash;
|
|
13
|
-
private valuesToReplace;
|
|
14
|
-
constructor(options: IMigratorOptions);
|
|
15
|
-
static createFromProject(project: Project, provider: JsonRpcProvider, maxTxPerBlock?: number, block?: string, clientType?: Client): Promise<Migrator>;
|
|
16
|
-
setDefaultValuesToUpdate(): void;
|
|
17
|
-
addValueToUpdate(oldValue: string, newValue: string): void;
|
|
18
|
-
upgrade(): Promise<void>;
|
|
19
|
-
verify(): Promise<void>;
|
|
20
|
-
migrateData(): Promise<void>;
|
|
21
|
-
dumpStorage(): Promise<void>;
|
|
22
|
-
init(): Promise<void>;
|
|
23
|
-
getContractNewAddress(name: string): string | undefined;
|
|
24
|
-
}
|
|
@@ -1,86 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.Migrator = void 0;
|
|
4
|
-
/* eslint-disable no-await-in-loop */
|
|
5
|
-
const clientStrategyFactory_1 = require("./clients/clientStrategyFactory");
|
|
6
|
-
const contractMigration_1 = require("./contractMigration");
|
|
7
|
-
class Migrator {
|
|
8
|
-
constructor(options) {
|
|
9
|
-
this.migrations = [];
|
|
10
|
-
this.blockHash = options.blockHash;
|
|
11
|
-
this.migrations = options.migrations;
|
|
12
|
-
this.valuesToReplace = options.valuesToReplace ?? new Map();
|
|
13
|
-
}
|
|
14
|
-
// eslint-disable-next-line max-params
|
|
15
|
-
static async createFromProject(project, provider, maxTxPerBlock, block = "latest", clientType = clientStrategyFactory_1.Client.GETH) {
|
|
16
|
-
const client = (0, clientStrategyFactory_1.clientStrategyFactory)(clientType, provider);
|
|
17
|
-
const blockHash = (await provider.getBlock(block))?.hash;
|
|
18
|
-
if (!blockHash) {
|
|
19
|
-
throw Error(`Unable to get blockHash for block: ${block}`);
|
|
20
|
-
}
|
|
21
|
-
const migrations = [];
|
|
22
|
-
for (const contract of project.contractNamesToUpgrade) {
|
|
23
|
-
const address = await project.instance.getContractAddress(contract);
|
|
24
|
-
const migrationOptions = {
|
|
25
|
-
blockHash,
|
|
26
|
-
client,
|
|
27
|
-
contractName: contract,
|
|
28
|
-
oldAddress: address,
|
|
29
|
-
txPerBlock: maxTxPerBlock
|
|
30
|
-
};
|
|
31
|
-
const migration = new contractMigration_1.ContractMigration(migrationOptions);
|
|
32
|
-
migrations.push(migration);
|
|
33
|
-
}
|
|
34
|
-
return new Migrator({ blockHash, migrations });
|
|
35
|
-
}
|
|
36
|
-
setDefaultValuesToUpdate() {
|
|
37
|
-
/*
|
|
38
|
-
* By default, values that contain contract addresses from old instance
|
|
39
|
-
* must be replaced by the addresses on the new instance
|
|
40
|
-
*/
|
|
41
|
-
for (const migration of this.migrations) {
|
|
42
|
-
if (migration.newAddress) {
|
|
43
|
-
this.addValueToUpdate(migration.oldAddress, migration.newAddress);
|
|
44
|
-
}
|
|
45
|
-
}
|
|
46
|
-
}
|
|
47
|
-
addValueToUpdate(oldValue, newValue) {
|
|
48
|
-
this.valuesToReplace.set(oldValue, newValue);
|
|
49
|
-
}
|
|
50
|
-
async upgrade() {
|
|
51
|
-
for (const migration of this.migrations) {
|
|
52
|
-
await migration.upgrade();
|
|
53
|
-
}
|
|
54
|
-
}
|
|
55
|
-
async verify() {
|
|
56
|
-
for (const migration of this.migrations) {
|
|
57
|
-
await migration.verify();
|
|
58
|
-
}
|
|
59
|
-
}
|
|
60
|
-
async migrateData() {
|
|
61
|
-
for (const migration of this.migrations) {
|
|
62
|
-
await migration.migrateData(this.valuesToReplace);
|
|
63
|
-
try {
|
|
64
|
-
await migration.transferETH();
|
|
65
|
-
}
|
|
66
|
-
catch (error) {
|
|
67
|
-
console.log("Failed transferring ETH to:", migration.contractName);
|
|
68
|
-
throw error;
|
|
69
|
-
}
|
|
70
|
-
}
|
|
71
|
-
}
|
|
72
|
-
async dumpStorage() {
|
|
73
|
-
await Promise.all(this.migrations.map(migration => migration.dumpStorage()));
|
|
74
|
-
}
|
|
75
|
-
async init() {
|
|
76
|
-
for (const migration of this.migrations) {
|
|
77
|
-
await migration.init();
|
|
78
|
-
}
|
|
79
|
-
}
|
|
80
|
-
getContractNewAddress(name) {
|
|
81
|
-
const migration = this.migrations.find(mig => mig.contractName === name);
|
|
82
|
-
return migration?.newAddress;
|
|
83
|
-
}
|
|
84
|
-
}
|
|
85
|
-
exports.Migrator = Migrator;
|
|
86
|
-
//# sourceMappingURL=migrator.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"migrator.js","sourceRoot":"","sources":["../../../src/migration/migrator.ts"],"names":[],"mappings":"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"}
|