@openzeppelin/upgrades-core 1.9.0 → 1.11.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/LICENSE +22 -0
- package/artifacts/@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol/ERC1967Proxy.dbg.json +1 -1
- package/artifacts/@openzeppelin/contracts/proxy/beacon/BeaconProxy.sol/BeaconProxy.dbg.json +4 -0
- package/artifacts/@openzeppelin/contracts/proxy/beacon/BeaconProxy.sol/BeaconProxy.json +80 -0
- package/artifacts/@openzeppelin/contracts/proxy/beacon/UpgradeableBeacon.sol/UpgradeableBeacon.dbg.json +4 -0
- package/artifacts/@openzeppelin/contracts/proxy/beacon/UpgradeableBeacon.sol/UpgradeableBeacon.json +113 -0
- package/artifacts/AdminUpgradeabilityProxy.json +2 -2
- package/artifacts/contracts/proxy/AdminUpgradeabilityProxy.sol/AdminUpgradeabilityProxy.json +2 -2
- package/dist/ast-dereferencer.js +2 -2
- package/dist/ast-dereferencer.js.map +1 -1
- package/dist/beacon.d.ts +8 -0
- package/dist/beacon.d.ts.map +1 -0
- package/dist/beacon.js +25 -0
- package/dist/beacon.js.map +1 -0
- package/dist/deployment.js +18 -18
- package/dist/deployment.js.map +1 -1
- package/dist/deployment.test.js +39 -39
- package/dist/deployment.test.js.map +1 -1
- package/dist/eip-1967-type.d.ts +4 -0
- package/dist/eip-1967-type.d.ts.map +1 -0
- package/dist/eip-1967-type.js +37 -0
- package/dist/eip-1967-type.js.map +1 -0
- package/dist/eip-1967.d.ts +5 -0
- package/dist/eip-1967.d.ts.map +1 -1
- package/dist/eip-1967.js +22 -15
- package/dist/eip-1967.js.map +1 -1
- package/dist/impl-address.d.ts +19 -0
- package/dist/impl-address.d.ts.map +1 -0
- package/dist/impl-address.js +67 -0
- package/dist/impl-address.js.map +1 -0
- package/dist/impl-store.d.ts.map +1 -1
- package/dist/impl-store.js +8 -6
- package/dist/impl-store.js.map +1 -1
- package/dist/impl-store.test.js +18 -18
- package/dist/impl-store.test.js.map +1 -1
- package/dist/index.d.ts +7 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +23 -3
- package/dist/index.js.map +1 -1
- package/dist/levenshtein.test.js +14 -14
- package/dist/levenshtein.test.js.map +1 -1
- package/dist/link-refs.test.js +4 -4
- package/dist/link-refs.test.js.map +1 -1
- package/dist/manifest-storage-layout.js +8 -8
- package/dist/manifest-storage-layout.js.map +1 -1
- package/dist/manifest-storage-layout.test.js +16 -16
- package/dist/manifest-storage-layout.test.js.map +1 -1
- package/dist/manifest.d.ts +1 -1
- package/dist/manifest.d.ts.map +1 -1
- package/dist/manifest.js +6 -6
- package/dist/manifest.js.map +1 -1
- package/dist/manifest.test.js +2 -2
- package/dist/manifest.test.js.map +1 -1
- package/dist/provider.d.ts +2 -0
- package/dist/provider.d.ts.map +1 -1
- package/dist/provider.js +11 -1
- package/dist/provider.js.map +1 -1
- package/dist/provider.test.js +12 -12
- package/dist/provider.test.js.map +1 -1
- package/dist/proxy-kind.d.ts +12 -0
- package/dist/proxy-kind.d.ts.map +1 -0
- package/dist/proxy-kind.js +50 -0
- package/dist/proxy-kind.js.map +1 -0
- package/dist/scripts/migrate-oz-cli-project.js +1 -1
- package/dist/scripts/migrate-oz-cli-project.js.map +1 -1
- package/dist/scripts/migrate-oz-cli-project.test.js +9 -9
- package/dist/scripts/migrate-oz-cli-project.test.js.map +1 -1
- package/dist/src-decoder.test.js +2 -3
- package/dist/src-decoder.test.js.map +1 -1
- package/dist/standalone.d.ts +19 -0
- package/dist/standalone.d.ts.map +1 -0
- package/dist/standalone.js +24 -0
- package/dist/standalone.js.map +1 -0
- package/dist/standalone.test.d.ts +2 -0
- package/dist/standalone.test.d.ts.map +1 -0
- package/dist/standalone.test.js +33 -0
- package/dist/standalone.test.js.map +1 -0
- package/dist/storage/compare.js +7 -7
- package/dist/storage/compare.js.map +1 -1
- package/dist/storage/extract.js +9 -9
- package/dist/storage/extract.js.map +1 -1
- package/dist/storage/index.d.ts +7 -0
- package/dist/storage/index.d.ts.map +1 -1
- package/dist/storage/index.js +22 -23
- package/dist/storage/index.js.map +1 -1
- package/dist/storage/layout.js +1 -1
- package/dist/storage/layout.js.map +1 -1
- package/dist/storage/report.d.ts +3 -2
- package/dist/storage/report.d.ts.map +1 -1
- package/dist/storage/report.js +17 -11
- package/dist/storage/report.js.map +1 -1
- package/dist/storage/report.test.js +5 -5
- package/dist/storage/report.test.js.map +1 -1
- package/dist/storage.test.js +32 -32
- package/dist/storage.test.js.map +1 -1
- package/dist/stub-provider.d.ts.map +1 -1
- package/dist/stub-provider.js +0 -1
- package/dist/stub-provider.js.map +1 -1
- package/dist/usage-error.d.ts +21 -0
- package/dist/usage-error.d.ts.map +1 -0
- package/dist/usage-error.js +51 -0
- package/dist/usage-error.js.map +1 -0
- package/dist/utils/address.d.ts +8 -0
- package/dist/utils/address.d.ts.map +1 -0
- package/dist/utils/address.js +20 -0
- package/dist/utils/address.js.map +1 -0
- package/dist/utils/debug.js +1 -1
- package/dist/utils/debug.js.map +1 -1
- package/dist/utils/deep-array.test.js +12 -12
- package/dist/utils/deep-array.test.js.map +1 -1
- package/dist/utils/function.js +5 -5
- package/dist/utils/function.js.map +1 -1
- package/dist/utils/function.test.js +4 -4
- package/dist/utils/function.test.js.map +1 -1
- package/dist/utils/is-nullish.test.js +6 -6
- package/dist/utils/is-nullish.test.js.map +1 -1
- package/dist/utils/itemize.js +1 -1
- package/dist/utils/itemize.js.map +1 -1
- package/dist/utils/log.d.ts +2 -0
- package/dist/utils/log.d.ts.map +1 -1
- package/dist/utils/log.js +22 -4
- package/dist/utils/log.js.map +1 -1
- package/dist/utils/make-non-enumerable.d.ts +1 -1
- package/dist/utils/make-non-enumerable.d.ts.map +1 -1
- package/dist/utils/make-non-enumerable.js +0 -1
- package/dist/utils/make-non-enumerable.js.map +1 -1
- package/dist/utils/parse-type-id.js +1 -1
- package/dist/utils/parse-type-id.js.map +1 -1
- package/dist/utils/parse-type-id.test.js +2 -2
- package/dist/utils/parse-type-id.test.js.map +1 -1
- package/dist/utils/type-id.js +1 -1
- package/dist/utils/type-id.js.map +1 -1
- package/dist/validate/error.d.ts.map +1 -1
- package/dist/validate/error.js +2 -67
- package/dist/validate/error.js.map +1 -1
- package/dist/validate/index.d.ts +4 -2
- package/dist/validate/index.d.ts.map +1 -1
- package/dist/validate/index.js +7 -2
- package/dist/validate/index.js.map +1 -1
- package/dist/validate/overrides.d.ts +1 -2
- package/dist/validate/overrides.d.ts.map +1 -1
- package/dist/validate/overrides.js +7 -18
- package/dist/validate/overrides.js.map +1 -1
- package/dist/validate/query.d.ts +3 -1
- package/dist/validate/query.d.ts.map +1 -1
- package/dist/validate/query.js +45 -19
- package/dist/validate/query.js.map +1 -1
- package/dist/validate/query.test.js +4 -4
- package/dist/validate/query.test.js.map +1 -1
- package/dist/validate/report.d.ts +8 -0
- package/dist/validate/report.d.ts.map +1 -0
- package/dist/validate/report.js +79 -0
- package/dist/validate/report.js.map +1 -0
- package/dist/validate/run.js +15 -15
- package/dist/validate/run.js.map +1 -1
- package/dist/validate.test.js +7 -6
- package/dist/validate.test.js.map +1 -1
- package/dist/version.d.ts +3 -3
- package/dist/version.d.ts.map +1 -1
- package/dist/version.js +14 -8
- package/dist/version.js.map +1 -1
- package/dist/version.test.js +11 -11
- package/dist/version.test.js.map +1 -1
- package/package.json +11 -6
- package/src/beacon.ts +20 -0
- package/src/eip-1967-type.ts +35 -0
- package/src/eip-1967.ts +16 -12
- package/src/impl-address.ts +76 -0
- package/src/impl-store.ts +2 -0
- package/src/index.ts +18 -1
- package/src/manifest.ts +2 -2
- package/src/provider.ts +16 -0
- package/src/proxy-kind.ts +59 -0
- package/src/src-decoder.test.ts +0 -2
- package/src/standalone.test.ts +40 -0
- package/src/standalone.ts +41 -0
- package/src/storage/index.ts +23 -20
- package/src/storage/report.ts +10 -5
- package/src/stub-provider.ts +0 -1
- package/src/usage-error.ts +68 -0
- package/src/utils/address.ts +16 -0
- package/src/utils/log.ts +23 -2
- package/src/utils/make-non-enumerable.ts +1 -2
- package/src/validate/error.ts +5 -69
- package/src/validate/index.ts +6 -1
- package/src/validate/overrides.ts +5 -17
- package/src/validate/query.ts +38 -9
- package/src/validate/report.ts +78 -0
- package/src/validate.test.ts +1 -0
- package/src/version.ts +14 -6
- package/CHANGELOG.md +0 -106
- package/dist/set-proxy-kind.d.ts +0 -5
- package/dist/set-proxy-kind.d.ts.map +0 -1
- package/dist/set-proxy-kind.js +0 -25
- package/dist/set-proxy-kind.js.map +0 -1
- package/src/set-proxy-kind.ts +0 -27
package/dist/index.js
CHANGED
|
@@ -10,7 +10,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
10
10
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
11
11
|
};
|
|
12
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
|
-
exports.setProxyKind = exports.logWarning = exports.getStorageLayoutForAddress = void 0;
|
|
13
|
+
exports.assertNotProxy = exports.DeployBeaconProxyKindError = exports.DeployBeaconProxyImplUnknownError = exports.DeployBeaconProxyUnsupportedError = exports.PrepareUpgradeUnsupportedError = exports.LoadProxyUnsupportedError = exports.BeaconProxyUnsupportedError = exports.isBeacon = exports.getImplementationAddressFromProxy = exports.getImplementationAddressFromBeacon = exports.isBeaconProxy = exports.isTransparentOrUUPSProxy = exports.UpgradeableContract = exports.processProxyKind = exports.setProxyKind = exports.logWarning = exports.getStorageLayoutForAddress = void 0;
|
|
14
14
|
__exportStar(require("./validate"), exports);
|
|
15
15
|
__exportStar(require("./impl-store"), exports);
|
|
16
16
|
__exportStar(require("./version"), exports);
|
|
@@ -22,11 +22,31 @@ __exportStar(require("./src-decoder"), exports);
|
|
|
22
22
|
__exportStar(require("./solc-api"), exports);
|
|
23
23
|
__exportStar(require("./deployment"), exports);
|
|
24
24
|
__exportStar(require("./link-refs"), exports);
|
|
25
|
+
__exportStar(require("./error"), exports);
|
|
25
26
|
var manifest_storage_layout_1 = require("./manifest-storage-layout");
|
|
26
27
|
Object.defineProperty(exports, "getStorageLayoutForAddress", { enumerable: true, get: function () { return manifest_storage_layout_1.getStorageLayoutForAddress; } });
|
|
27
28
|
__exportStar(require("./scripts/migrate-oz-cli-project"), exports);
|
|
28
29
|
var log_1 = require("./utils/log");
|
|
29
30
|
Object.defineProperty(exports, "logWarning", { enumerable: true, get: function () { return log_1.logWarning; } });
|
|
30
|
-
var
|
|
31
|
-
Object.defineProperty(exports, "setProxyKind", { enumerable: true, get: function () { return
|
|
31
|
+
var proxy_kind_1 = require("./proxy-kind");
|
|
32
|
+
Object.defineProperty(exports, "setProxyKind", { enumerable: true, get: function () { return proxy_kind_1.setProxyKind; } });
|
|
33
|
+
Object.defineProperty(exports, "processProxyKind", { enumerable: true, get: function () { return proxy_kind_1.processProxyKind; } });
|
|
34
|
+
var standalone_1 = require("./standalone");
|
|
35
|
+
Object.defineProperty(exports, "UpgradeableContract", { enumerable: true, get: function () { return standalone_1.UpgradeableContract; } });
|
|
36
|
+
var eip_1967_type_1 = require("./eip-1967-type");
|
|
37
|
+
Object.defineProperty(exports, "isTransparentOrUUPSProxy", { enumerable: true, get: function () { return eip_1967_type_1.isTransparentOrUUPSProxy; } });
|
|
38
|
+
Object.defineProperty(exports, "isBeaconProxy", { enumerable: true, get: function () { return eip_1967_type_1.isBeaconProxy; } });
|
|
39
|
+
var impl_address_1 = require("./impl-address");
|
|
40
|
+
Object.defineProperty(exports, "getImplementationAddressFromBeacon", { enumerable: true, get: function () { return impl_address_1.getImplementationAddressFromBeacon; } });
|
|
41
|
+
Object.defineProperty(exports, "getImplementationAddressFromProxy", { enumerable: true, get: function () { return impl_address_1.getImplementationAddressFromProxy; } });
|
|
42
|
+
var beacon_1 = require("./beacon");
|
|
43
|
+
Object.defineProperty(exports, "isBeacon", { enumerable: true, get: function () { return beacon_1.isBeacon; } });
|
|
44
|
+
var usage_error_1 = require("./usage-error");
|
|
45
|
+
Object.defineProperty(exports, "BeaconProxyUnsupportedError", { enumerable: true, get: function () { return usage_error_1.BeaconProxyUnsupportedError; } });
|
|
46
|
+
Object.defineProperty(exports, "LoadProxyUnsupportedError", { enumerable: true, get: function () { return usage_error_1.LoadProxyUnsupportedError; } });
|
|
47
|
+
Object.defineProperty(exports, "PrepareUpgradeUnsupportedError", { enumerable: true, get: function () { return usage_error_1.PrepareUpgradeUnsupportedError; } });
|
|
48
|
+
Object.defineProperty(exports, "DeployBeaconProxyUnsupportedError", { enumerable: true, get: function () { return usage_error_1.DeployBeaconProxyUnsupportedError; } });
|
|
49
|
+
Object.defineProperty(exports, "DeployBeaconProxyImplUnknownError", { enumerable: true, get: function () { return usage_error_1.DeployBeaconProxyImplUnknownError; } });
|
|
50
|
+
Object.defineProperty(exports, "DeployBeaconProxyKindError", { enumerable: true, get: function () { return usage_error_1.DeployBeaconProxyKindError; } });
|
|
51
|
+
Object.defineProperty(exports, "assertNotProxy", { enumerable: true, get: function () { return usage_error_1.assertNotProxy; } });
|
|
32
52
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,6CAA2B;AAC3B,+CAA6B;AAC7B,4CAA0B;AAC1B,6CAA2B;AAC3B,4CAA0B;AAC1B,6CAA2B;AAC3B,6CAA2B;AAC3B,gDAA8B;AAC9B,6CAA2B;AAC3B,+CAA6B;AAC7B,8CAA4B;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,6CAA2B;AAC3B,+CAA6B;AAC7B,4CAA0B;AAC1B,6CAA2B;AAC3B,4CAA0B;AAC1B,6CAA2B;AAC3B,6CAA2B;AAC3B,gDAA8B;AAC9B,6CAA2B;AAC3B,+CAA6B;AAC7B,8CAA4B;AAC5B,0CAAwB;AAExB,qEAAuE;AAA9D,qIAAA,0BAA0B,OAAA;AAEnC,mEAAiD;AAEjD,mCAAyC;AAAhC,iGAAA,UAAU,OAAA;AACnB,2CAA8D;AAArD,0GAAA,YAAY,OAAA;AAAE,8GAAA,gBAAgB,OAAA;AAEvC,2CAAmD;AAA1C,iHAAA,mBAAmB,OAAA;AAE5B,iDAA0E;AAAjE,yHAAA,wBAAwB,OAAA;AAAE,8GAAA,aAAa,OAAA;AAChD,+CAAuG;AAA9F,kIAAA,kCAAkC,OAAA;AAAE,iIAAA,iCAAiC,OAAA;AAC9E,mCAAoC;AAA3B,kGAAA,QAAQ,OAAA;AAEjB,6CAQuB;AAPrB,0HAAA,2BAA2B,OAAA;AAC3B,wHAAA,yBAAyB,OAAA;AACzB,6HAAA,8BAA8B,OAAA;AAC9B,gIAAA,iCAAiC,OAAA;AACjC,gIAAA,iCAAiC,OAAA;AACjC,yHAAA,0BAA0B,OAAA;AAC1B,6GAAA,cAAc,OAAA"}
|
package/dist/levenshtein.test.js
CHANGED
|
@@ -6,16 +6,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
const ava_1 = __importDefault(require("ava"));
|
|
7
7
|
const levenshtein_1 = require("./levenshtein");
|
|
8
8
|
const match = (a, b) => (a === b ? undefined : { kind: 'replace', original: a, updated: b });
|
|
9
|
-
ava_1.default('equal', t => {
|
|
9
|
+
(0, ava_1.default)('equal', t => {
|
|
10
10
|
const a = [...'abc'];
|
|
11
11
|
const b = [...'abc'];
|
|
12
|
-
const ops = levenshtein_1.levenshtein(a, b, match);
|
|
12
|
+
const ops = (0, levenshtein_1.levenshtein)(a, b, match);
|
|
13
13
|
t.deepEqual(ops, []);
|
|
14
14
|
});
|
|
15
|
-
ava_1.default('append', t => {
|
|
15
|
+
(0, ava_1.default)('append', t => {
|
|
16
16
|
const a = [...'abc'];
|
|
17
17
|
const b = [...'abcd'];
|
|
18
|
-
const ops = levenshtein_1.levenshtein(a, b, match);
|
|
18
|
+
const ops = (0, levenshtein_1.levenshtein)(a, b, match);
|
|
19
19
|
t.like(ops, {
|
|
20
20
|
length: 1,
|
|
21
21
|
0: {
|
|
@@ -24,10 +24,10 @@ ava_1.default('append', t => {
|
|
|
24
24
|
},
|
|
25
25
|
});
|
|
26
26
|
});
|
|
27
|
-
ava_1.default('delete from end', t => {
|
|
27
|
+
(0, ava_1.default)('delete from end', t => {
|
|
28
28
|
const a = [...'abcd'];
|
|
29
29
|
const b = [...'abc'];
|
|
30
|
-
const ops = levenshtein_1.levenshtein(a, b, match);
|
|
30
|
+
const ops = (0, levenshtein_1.levenshtein)(a, b, match);
|
|
31
31
|
t.like(ops, {
|
|
32
32
|
length: 1,
|
|
33
33
|
0: {
|
|
@@ -36,10 +36,10 @@ ava_1.default('delete from end', t => {
|
|
|
36
36
|
},
|
|
37
37
|
});
|
|
38
38
|
});
|
|
39
|
-
ava_1.default('delete from middle', t => {
|
|
39
|
+
(0, ava_1.default)('delete from middle', t => {
|
|
40
40
|
const a = [...'abc'];
|
|
41
41
|
const b = [...'ac'];
|
|
42
|
-
const ops = levenshtein_1.levenshtein(a, b, match);
|
|
42
|
+
const ops = (0, levenshtein_1.levenshtein)(a, b, match);
|
|
43
43
|
t.like(ops, {
|
|
44
44
|
length: 1,
|
|
45
45
|
0: {
|
|
@@ -48,10 +48,10 @@ ava_1.default('delete from middle', t => {
|
|
|
48
48
|
},
|
|
49
49
|
});
|
|
50
50
|
});
|
|
51
|
-
ava_1.default('delete from beginning', t => {
|
|
51
|
+
(0, ava_1.default)('delete from beginning', t => {
|
|
52
52
|
const a = [...'abc'];
|
|
53
53
|
const b = [...'bc'];
|
|
54
|
-
const ops = levenshtein_1.levenshtein(a, b, match);
|
|
54
|
+
const ops = (0, levenshtein_1.levenshtein)(a, b, match);
|
|
55
55
|
t.like(ops, {
|
|
56
56
|
length: 1,
|
|
57
57
|
0: {
|
|
@@ -60,10 +60,10 @@ ava_1.default('delete from beginning', t => {
|
|
|
60
60
|
},
|
|
61
61
|
});
|
|
62
62
|
});
|
|
63
|
-
ava_1.default('insert', t => {
|
|
63
|
+
(0, ava_1.default)('insert', t => {
|
|
64
64
|
const a = [...'abc'];
|
|
65
65
|
const b = [...'azbc'];
|
|
66
|
-
const ops = levenshtein_1.levenshtein(a, b, match);
|
|
66
|
+
const ops = (0, levenshtein_1.levenshtein)(a, b, match);
|
|
67
67
|
t.like(ops, {
|
|
68
68
|
length: 1,
|
|
69
69
|
0: {
|
|
@@ -72,10 +72,10 @@ ava_1.default('insert', t => {
|
|
|
72
72
|
},
|
|
73
73
|
});
|
|
74
74
|
});
|
|
75
|
-
ava_1.default('replace', t => {
|
|
75
|
+
(0, ava_1.default)('replace', t => {
|
|
76
76
|
const a = [...'abc'];
|
|
77
77
|
const b = [...'axc'];
|
|
78
|
-
const ops = levenshtein_1.levenshtein(a, b, match);
|
|
78
|
+
const ops = (0, levenshtein_1.levenshtein)(a, b, match);
|
|
79
79
|
t.like(ops, {
|
|
80
80
|
length: 1,
|
|
81
81
|
0: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"levenshtein.test.js","sourceRoot":"","sources":["../src/levenshtein.test.ts"],"names":[],"mappings":";;;;;AAAA,8CAAuB;AAEvB,+CAA4C;AAE5C,MAAM,KAAK,GAAG,CAAI,CAAI,EAAE,CAAI,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;AAEtG,aAAI,
|
|
1
|
+
{"version":3,"file":"levenshtein.test.js","sourceRoot":"","sources":["../src/levenshtein.test.ts"],"names":[],"mappings":"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"}
|
package/dist/link-refs.test.js
CHANGED
|
@@ -8,7 +8,7 @@ const link_refs_1 = require("./link-refs");
|
|
|
8
8
|
const bytecodeSolc = '0123456789__lib1____abcdef0123__lib2____4567890abcdef0123456__lib3______________789abcdef0123456789';
|
|
9
9
|
const bytecodeArtifact = '0x' + bytecodeSolc;
|
|
10
10
|
const bytecodeLink = '0x01234567891ADDRLIB01abcdef01232ADDRLIB024567890abcdef01234563ADDRESSLIB030000000789abcdef0123456789';
|
|
11
|
-
ava_1.default('extractLinkReferences', t => {
|
|
11
|
+
(0, ava_1.default)('extractLinkReferences', t => {
|
|
12
12
|
const bytecode = {
|
|
13
13
|
linkReferences: {
|
|
14
14
|
'a.sol': {
|
|
@@ -21,7 +21,7 @@ ava_1.default('extractLinkReferences', t => {
|
|
|
21
21
|
},
|
|
22
22
|
object: bytecodeSolc,
|
|
23
23
|
};
|
|
24
|
-
const linkReferences = link_refs_1.extractLinkReferences(bytecode);
|
|
24
|
+
const linkReferences = (0, link_refs_1.extractLinkReferences)(bytecode);
|
|
25
25
|
t.is(linkReferences.length, 3);
|
|
26
26
|
t.deepEqual(linkReferences[0], {
|
|
27
27
|
src: 'a.sol',
|
|
@@ -45,7 +45,7 @@ ava_1.default('extractLinkReferences', t => {
|
|
|
45
45
|
placeholder: '__lib3______________',
|
|
46
46
|
});
|
|
47
47
|
});
|
|
48
|
-
ava_1.default('unlinkBytecode', t => {
|
|
48
|
+
(0, ava_1.default)('unlinkBytecode', t => {
|
|
49
49
|
const linkReferences = [
|
|
50
50
|
{
|
|
51
51
|
src: 'a.sol',
|
|
@@ -69,7 +69,7 @@ ava_1.default('unlinkBytecode', t => {
|
|
|
69
69
|
placeholder: '__lib3______________',
|
|
70
70
|
},
|
|
71
71
|
];
|
|
72
|
-
const unlinkedBytecode = link_refs_1.unlinkBytecode(bytecodeLink, linkReferences);
|
|
72
|
+
const unlinkedBytecode = (0, link_refs_1.unlinkBytecode)(bytecodeLink, linkReferences);
|
|
73
73
|
t.is(unlinkedBytecode.length, bytecodeArtifact.length);
|
|
74
74
|
t.is(unlinkedBytecode, bytecodeArtifact);
|
|
75
75
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"link-refs.test.js","sourceRoot":"","sources":["../src/link-refs.test.ts"],"names":[],"mappings":";;;;;AAAA,8CAAuB;AAEvB,2CAAmF;AAEnF,MAAM,YAAY,GAChB,qGAAqG,CAAC;AACxG,MAAM,gBAAgB,GAAG,IAAI,GAAG,YAAY,CAAC;AAC7C,MAAM,YAAY,GAChB,uGAAuG,CAAC;AAE1G,aAAI,
|
|
1
|
+
{"version":3,"file":"link-refs.test.js","sourceRoot":"","sources":["../src/link-refs.test.ts"],"names":[],"mappings":";;;;;AAAA,8CAAuB;AAEvB,2CAAmF;AAEnF,MAAM,YAAY,GAChB,qGAAqG,CAAC;AACxG,MAAM,gBAAgB,GAAG,IAAI,GAAG,YAAY,CAAC;AAC7C,MAAM,YAAY,GAChB,uGAAuG,CAAC;AAE1G,IAAA,aAAI,EAAC,uBAAuB,EAAE,CAAC,CAAC,EAAE;IAChC,MAAM,QAAQ,GAAiB;QAC7B,cAAc,EAAE;YACd,OAAO,EAAE;gBACP,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;gBAC/B,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;aACjC;YACD,OAAO,EAAE;gBACP,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;aAClC;SACF;QACD,MAAM,EAAE,YAAY;KACrB,CAAC;IAEF,MAAM,cAAc,GAAoB,IAAA,iCAAqB,EAAC,QAAQ,CAAC,CAAC;IACxE,CAAC,CAAC,EAAE,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAC/B,CAAC,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE;QAC7B,GAAG,EAAE,OAAO;QACZ,IAAI,EAAE,MAAM;QACZ,MAAM,EAAE,CAAC;QACT,KAAK,EAAE,CAAC;QACR,WAAW,EAAE,YAAY;KAC1B,CAAC,CAAC;IACH,CAAC,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE;QAC7B,GAAG,EAAE,OAAO;QACZ,IAAI,EAAE,MAAM;QACZ,MAAM,EAAE,CAAC;QACT,KAAK,EAAE,EAAE;QACT,WAAW,EAAE,YAAY;KAC1B,CAAC,CAAC;IACH,CAAC,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE;QAC7B,GAAG,EAAE,OAAO;QACZ,IAAI,EAAE,MAAM;QACZ,MAAM,EAAE,EAAE;QACV,KAAK,EAAE,EAAE;QACT,WAAW,EAAE,sBAAsB;KACpC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAA,aAAI,EAAC,gBAAgB,EAAE,CAAC,CAAC,EAAE;IACzB,MAAM,cAAc,GAAoB;QACtC;YACE,GAAG,EAAE,OAAO;YACZ,IAAI,EAAE,MAAM;YACZ,MAAM,EAAE,CAAC;YACT,KAAK,EAAE,CAAC;YACR,WAAW,EAAE,YAAY;SAC1B;QACD;YACE,GAAG,EAAE,OAAO;YACZ,IAAI,EAAE,MAAM;YACZ,MAAM,EAAE,CAAC;YACT,KAAK,EAAE,EAAE;YACT,WAAW,EAAE,YAAY;SAC1B;QACD;YACE,GAAG,EAAE,OAAO;YACZ,IAAI,EAAE,MAAM;YACZ,MAAM,EAAE,EAAE;YACV,KAAK,EAAE,EAAE;YACT,WAAW,EAAE,sBAAsB;SACpC;KACF,CAAC;IACF,MAAM,gBAAgB,GAAW,IAAA,0BAAc,EAAC,YAAY,EAAE,cAAc,CAAC,CAAC;IAC9E,CAAC,CAAC,EAAE,CAAC,gBAAgB,CAAC,MAAM,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACvD,CAAC,CAAC,EAAE,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,CAAC;AAC3C,CAAC,CAAC,CAAC"}
|
|
@@ -14,7 +14,7 @@ async function getStorageLayoutForAddress(manifest, validations, implAddress) {
|
|
|
14
14
|
}
|
|
15
15
|
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
16
16
|
const { layout } = data.impls[versionWithoutMetadata];
|
|
17
|
-
if (extract_1.isCurrentLayoutVersion(layout)) {
|
|
17
|
+
if ((0, extract_1.isCurrentLayoutVersion)(layout)) {
|
|
18
18
|
return layout;
|
|
19
19
|
}
|
|
20
20
|
else {
|
|
@@ -45,8 +45,8 @@ function getUpdatedStorageLayout(data, versionWithoutMetadata, layout) {
|
|
|
45
45
|
// the map are the versionWithMetadata of each contract, to avoid storing the
|
|
46
46
|
// same contract multiple times.
|
|
47
47
|
const sameLayout = new Map();
|
|
48
|
-
outer: for (const [contractName, validationRun] of query_1.findVersionWithoutMetadataMatches(data, versionWithoutMetadata)) {
|
|
49
|
-
const updatedLayout = query_1.unfoldStorageLayout(validationRun, contractName);
|
|
48
|
+
outer: for (const [contractName, validationRun] of (0, query_1.findVersionWithoutMetadataMatches)(data, versionWithoutMetadata)) {
|
|
49
|
+
const updatedLayout = (0, query_1.unfoldStorageLayout)(validationRun, contractName);
|
|
50
50
|
// Check that the layout roughly matches the one we already have.
|
|
51
51
|
if (updatedLayout.storage.length !== layout.storage.length) {
|
|
52
52
|
continue;
|
|
@@ -56,7 +56,7 @@ function getUpdatedStorageLayout(data, versionWithoutMetadata, layout) {
|
|
|
56
56
|
if (item.label !== updatedItem.label) {
|
|
57
57
|
continue outer;
|
|
58
58
|
}
|
|
59
|
-
if (type_id_1.stabilizeTypeIdentifier(item.type) !== type_id_1.stabilizeTypeIdentifier(updatedItem.type)) {
|
|
59
|
+
if ((0, type_id_1.stabilizeTypeIdentifier)(item.type) !== (0, type_id_1.stabilizeTypeIdentifier)(updatedItem.type)) {
|
|
60
60
|
continue outer;
|
|
61
61
|
}
|
|
62
62
|
}
|
|
@@ -73,14 +73,14 @@ function getUpdatedStorageLayout(data, versionWithoutMetadata, layout) {
|
|
|
73
73
|
if (item.members === undefined) {
|
|
74
74
|
continue;
|
|
75
75
|
}
|
|
76
|
-
const members = layout_1.isStructMembers(item.members)
|
|
77
|
-
? item.members.map(m => [type_id_1.stabilizeTypeIdentifier(m.type), m.label])
|
|
76
|
+
const members = (0, layout_1.isStructMembers)(item.members)
|
|
77
|
+
? item.members.map(m => [(0, type_id_1.stabilizeTypeIdentifier)(m.type), m.label])
|
|
78
78
|
: item.members;
|
|
79
|
-
const stableId = type_id_1.stabilizeTypeIdentifier(typeId);
|
|
79
|
+
const stableId = (0, type_id_1.stabilizeTypeIdentifier)(typeId);
|
|
80
80
|
if (!typeMembers.has(stableId)) {
|
|
81
81
|
typeMembers.set(stableId, members);
|
|
82
82
|
}
|
|
83
|
-
else if (!deep_array_1.deepEqual(members, typeMembers.get(stableId))) {
|
|
83
|
+
else if (!(0, deep_array_1.deepEqual)(members, typeMembers.get(stableId))) {
|
|
84
84
|
return undefined;
|
|
85
85
|
}
|
|
86
86
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manifest-storage-layout.js","sourceRoot":"","sources":["../src/manifest-storage-layout.ts"],"names":[],"mappings":";;;AACA,+CAA2D;AAC3D,6CAAkE;AAElE,4CAA0F;AAC1F,6CAA0D;AAC1D,mDAA0D;AAEnD,KAAK,UAAU,0BAA0B,CAC9C,QAAkB,EAClB,WAA2B,EAC3B,WAAmB;IAEnB,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;IACnC,MAAM,sBAAsB,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,WAAC,OAAA,CAAA,MAAA,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,0CAAE,OAAO,MAAK,WAAW,CAAA,EAAA,CAAC,CAAC;IACzG,IAAI,sBAAsB,KAAK,SAAS,EAAE;QACxC,MAAM,IAAI,KAAK,CAAC,yBAAyB,WAAW,oBAAoB,CAAC,CAAC;KAC3E;IACD,oEAAoE;IACpE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,sBAAsB,CAAE,CAAC;IAEvD,IAAI,gCAAsB,
|
|
1
|
+
{"version":3,"file":"manifest-storage-layout.js","sourceRoot":"","sources":["../src/manifest-storage-layout.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,15 +14,15 @@ const manifest_storage_layout_1 = require("./manifest-storage-layout");
|
|
|
14
14
|
const test = ava_1.default;
|
|
15
15
|
test.before(async (t) => {
|
|
16
16
|
const buildInfo = await hardhat_1.artifacts.getBuildInfo('contracts/test/ManifestMigrate.sol:ManifestMigrateUnique');
|
|
17
|
-
assert_1.default(buildInfo !== undefined, 'Build info not found');
|
|
18
|
-
const decodeSrc = src_decoder_1.solcInputOutputDecoder(buildInfo.input, buildInfo.output);
|
|
19
|
-
t.context.validationRun = run_1.validate(buildInfo.output, decodeSrc);
|
|
20
|
-
t.context.validationData = data_1.normalizeValidationData([t.context.validationRun]);
|
|
17
|
+
(0, assert_1.default)(buildInfo !== undefined, 'Build info not found');
|
|
18
|
+
const decodeSrc = (0, src_decoder_1.solcInputOutputDecoder)(buildInfo.input, buildInfo.output);
|
|
19
|
+
t.context.validationRun = (0, run_1.validate)(buildInfo.output, decodeSrc);
|
|
20
|
+
t.context.validationData = (0, data_1.normalizeValidationData)([t.context.validationRun]);
|
|
21
21
|
});
|
|
22
22
|
test('getStorageLayoutForAddress - update layout', async (t) => {
|
|
23
23
|
const { version } = t.context.validationRun['ManifestMigrateUnique'];
|
|
24
|
-
assert_1.default(version !== undefined);
|
|
25
|
-
const updatedLayout = query_1.getStorageLayout(t.context.validationData, version);
|
|
24
|
+
(0, assert_1.default)(version !== undefined);
|
|
25
|
+
const updatedLayout = (0, query_1.getStorageLayout)(t.context.validationData, version);
|
|
26
26
|
const outdatedLayout = removeStorageLayoutMembers(updatedLayout);
|
|
27
27
|
const address = '0xCf7Ed3AccA5a467e9e704C703E8D87F634fB0Fc9';
|
|
28
28
|
const manifest = mockManifest({
|
|
@@ -36,7 +36,7 @@ test('getStorageLayoutForAddress - update layout', async (t) => {
|
|
|
36
36
|
},
|
|
37
37
|
proxies: [],
|
|
38
38
|
});
|
|
39
|
-
const layout = await manifest_storage_layout_1.getStorageLayoutForAddress(manifest, t.context.validationData, address);
|
|
39
|
+
const layout = await (0, manifest_storage_layout_1.getStorageLayoutForAddress)(manifest, t.context.validationData, address);
|
|
40
40
|
t.deepEqual(layout, updatedLayout);
|
|
41
41
|
t.like(manifest.data, {
|
|
42
42
|
impls: {
|
|
@@ -51,32 +51,32 @@ test('getStorageLayoutForAddress - update layout', async (t) => {
|
|
|
51
51
|
});
|
|
52
52
|
test('getUpdatedLayout - unique layout match', async (t) => {
|
|
53
53
|
const { version } = t.context.validationRun['ManifestMigrateUnique'];
|
|
54
|
-
assert_1.default(version !== undefined);
|
|
55
|
-
const targetLayout = query_1.getStorageLayout(t.context.validationData, version);
|
|
54
|
+
(0, assert_1.default)(version !== undefined);
|
|
55
|
+
const targetLayout = (0, query_1.getStorageLayout)(t.context.validationData, version);
|
|
56
56
|
const outdatedLayout = removeStorageLayoutMembers(targetLayout);
|
|
57
|
-
const updatedLayout = manifest_storage_layout_1.getUpdatedStorageLayout(t.context.validationData, version.withoutMetadata, outdatedLayout);
|
|
57
|
+
const updatedLayout = (0, manifest_storage_layout_1.getUpdatedStorageLayout)(t.context.validationData, version.withoutMetadata, outdatedLayout);
|
|
58
58
|
t.deepEqual(updatedLayout, targetLayout);
|
|
59
59
|
});
|
|
60
60
|
test('getUpdatedLayout - multiple unambiguous layout matches', async (t) => {
|
|
61
61
|
const { version: version1 } = t.context.validationRun['ManifestMigrateUnambiguous1'];
|
|
62
62
|
const { version: version2 } = t.context.validationRun['ManifestMigrateUnambiguous2'];
|
|
63
|
-
assert_1.default(version1 !== undefined && version2 !== undefined);
|
|
63
|
+
(0, assert_1.default)(version1 !== undefined && version2 !== undefined);
|
|
64
64
|
t.is(version1.withoutMetadata, version2.withoutMetadata, 'version is meant to be ambiguous');
|
|
65
65
|
t.not(version1.withMetadata, version2.withMetadata, 'version with metadata should be different');
|
|
66
|
-
const targetLayout = query_1.getStorageLayout(t.context.validationData, version1);
|
|
66
|
+
const targetLayout = (0, query_1.getStorageLayout)(t.context.validationData, version1);
|
|
67
67
|
const outdatedLayout = removeStorageLayoutMembers(targetLayout);
|
|
68
|
-
const updatedLayout = manifest_storage_layout_1.getUpdatedStorageLayout(t.context.validationData, version1.withoutMetadata, outdatedLayout);
|
|
68
|
+
const updatedLayout = (0, manifest_storage_layout_1.getUpdatedStorageLayout)(t.context.validationData, version1.withoutMetadata, outdatedLayout);
|
|
69
69
|
t.deepEqual(updatedLayout, targetLayout);
|
|
70
70
|
});
|
|
71
71
|
test('getUpdatedLayout - multiple ambiguous layout matches', async (t) => {
|
|
72
72
|
const { version: version1 } = t.context.validationRun['ManifestMigrateAmbiguous1'];
|
|
73
73
|
const { version: version2 } = t.context.validationRun['ManifestMigrateAmbiguous2'];
|
|
74
|
-
assert_1.default(version1 !== undefined && version2 !== undefined);
|
|
74
|
+
(0, assert_1.default)(version1 !== undefined && version2 !== undefined);
|
|
75
75
|
t.is(version1.withoutMetadata, version2.withoutMetadata, 'version is meant to be ambiguous');
|
|
76
76
|
t.not(version1.withMetadata, version2.withMetadata, 'version with metadata should be different');
|
|
77
|
-
const targetLayout = query_1.getStorageLayout(t.context.validationData, version1);
|
|
77
|
+
const targetLayout = (0, query_1.getStorageLayout)(t.context.validationData, version1);
|
|
78
78
|
const outdatedLayout = removeStorageLayoutMembers(targetLayout);
|
|
79
|
-
const updatedLayout = manifest_storage_layout_1.getUpdatedStorageLayout(t.context.validationData, version1.withoutMetadata, outdatedLayout);
|
|
79
|
+
const updatedLayout = (0, manifest_storage_layout_1.getUpdatedStorageLayout)(t.context.validationData, version1.withoutMetadata, outdatedLayout);
|
|
80
80
|
t.is(updatedLayout, undefined);
|
|
81
81
|
});
|
|
82
82
|
function mockManifest(data) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manifest-storage-layout.test.js","sourceRoot":"","sources":["../src/manifest-storage-layout.test.ts"],"names":[],"mappings":";;;;;AAAA,8CAA2C;AAC3C,oDAA4B;AAE5B,qCAAoC;AAEpC,+CAAuD;AACvD,wCAA6D;AAC7D,4CAAoD;AACpD,0CAA0E;AAI1E,uEAAgG;AAOhG,MAAM,IAAI,GAAG,aAA+B,CAAC;AAE7C,IAAI,CAAC,MAAM,CAAC,KAAK,EAAC,CAAC,EAAC,EAAE;IACpB,MAAM,SAAS,GAAG,MAAM,mBAAS,CAAC,YAAY,CAAC,0DAA0D,CAAC,CAAC;IAC3G,gBAAM,
|
|
1
|
+
{"version":3,"file":"manifest-storage-layout.test.js","sourceRoot":"","sources":["../src/manifest-storage-layout.test.ts"],"names":[],"mappings":"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"}
|
package/dist/manifest.d.ts
CHANGED
|
@@ -13,7 +13,7 @@ export interface ImplDeployment extends Deployment {
|
|
|
13
13
|
layout: StorageLayout;
|
|
14
14
|
}
|
|
15
15
|
export interface ProxyDeployment extends Deployment {
|
|
16
|
-
kind: 'uups' | 'transparent';
|
|
16
|
+
kind: 'uups' | 'transparent' | 'beacon';
|
|
17
17
|
}
|
|
18
18
|
export declare class Manifest {
|
|
19
19
|
readonly chainId: number;
|
package/dist/manifest.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manifest.d.ts","sourceRoot":"","sources":["../src/manifest.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAA4B,MAAM,YAAY,CAAC;AAIxE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAM/C,MAAM,WAAW,YAAY;IAC3B,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,EAAE;SACJ,OAAO,IAAI,MAAM,CAAC,CAAC,EAAE,cAAc;KACrC,CAAC;IACF,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,KAAK,CAAC,EAAE,UAAU,CAAC;CACpB;AAED,MAAM,WAAW,cAAe,SAAQ,UAAU;IAChD,MAAM,EAAE,aAAa,CAAC;CACvB;AAED,MAAM,WAAW,eAAgB,SAAQ,UAAU;IACjD,IAAI,EAAE,MAAM,GAAG,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"manifest.d.ts","sourceRoot":"","sources":["../src/manifest.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAA4B,MAAM,YAAY,CAAC;AAIxE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAM/C,MAAM,WAAW,YAAY;IAC3B,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,EAAE;SACJ,OAAO,IAAI,MAAM,CAAC,CAAC,EAAE,cAAc;KACrC,CAAC;IACF,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,KAAK,CAAC,EAAE,UAAU,CAAC;CACpB;AAED,MAAM,WAAW,cAAe,SAAQ,UAAU;IAChD,MAAM,EAAE,aAAa,CAAC;CACvB;AAED,MAAM,WAAW,eAAgB,SAAQ,UAAU;IACjD,IAAI,EAAE,MAAM,GAAG,aAAa,GAAG,QAAQ,CAAC;CACzC;AAYD,qBAAa,QAAQ;IAQP,QAAQ,CAAC,OAAO,EAAE,MAAM;IAPpC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,MAAM,CAAS;WAEV,UAAU,CAAC,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,QAAQ,CAAC;gBAIjD,OAAO,EAAE,MAAM;IAK9B,QAAQ,IAAI,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAI3C,wBAAwB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IASlE,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IAS9D,QAAQ,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAY/C,IAAI,IAAI,OAAO,CAAC,YAAY,CAAC;IAgB7B,KAAK,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAQxC,SAAS,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;YAYtC,IAAI;CASnB;AAgBD,wBAAgB,eAAe,CAAC,IAAI,EAAE,YAAY,GAAG,YAAY,CAUhE;AAED,qBAAa,kBAAmB,SAAQ,KAAK;CAAG"}
|
package/dist/manifest.js
CHANGED
|
@@ -29,7 +29,7 @@ class Manifest {
|
|
|
29
29
|
this.file = path_1.default.join(manifestDir, `${name}.json`);
|
|
30
30
|
}
|
|
31
31
|
static async forNetwork(provider) {
|
|
32
|
-
return new Manifest(await provider_1.getChainId(provider));
|
|
32
|
+
return new Manifest(await (0, provider_1.getChainId)(provider));
|
|
33
33
|
}
|
|
34
34
|
async getAdmin() {
|
|
35
35
|
return (await this.read()).admin;
|
|
@@ -113,10 +113,10 @@ function validateOrUpdateManifestVersion(data) {
|
|
|
113
113
|
if (typeof data.manifestVersion !== 'string') {
|
|
114
114
|
throw new Error('Manifest version is missing');
|
|
115
115
|
}
|
|
116
|
-
else if (compare_versions_1.compare(data.manifestVersion, '3.0', '<')) {
|
|
116
|
+
else if ((0, compare_versions_1.compare)(data.manifestVersion, '3.0', '<')) {
|
|
117
117
|
throw new Error('Found a manifest file for OpenZeppelin CLI. An automated migration is not yet available.');
|
|
118
118
|
}
|
|
119
|
-
else if (compare_versions_1.compare(data.manifestVersion, currentManifestVersion, '<')) {
|
|
119
|
+
else if ((0, compare_versions_1.compare)(data.manifestVersion, currentManifestVersion, '<')) {
|
|
120
120
|
return migrateManifest(data);
|
|
121
121
|
}
|
|
122
122
|
else if (data.manifestVersion === currentManifestVersion) {
|
|
@@ -143,12 +143,12 @@ class DeploymentNotFound extends Error {
|
|
|
143
143
|
exports.DeploymentNotFound = DeploymentNotFound;
|
|
144
144
|
function normalizeManifestData(input) {
|
|
145
145
|
return {
|
|
146
|
-
...pick_1.pick(input, ['manifestVersion', 'admin']),
|
|
146
|
+
...(0, pick_1.pick)(input, ['manifestVersion', 'admin']),
|
|
147
147
|
proxies: input.proxies.map(p => normalizeDeployment(p, ['kind'])),
|
|
148
|
-
impls: map_values_1.mapValues(input.impls, i => i && normalizeDeployment(i, ['layout'])),
|
|
148
|
+
impls: (0, map_values_1.mapValues)(input.impls, i => i && normalizeDeployment(i, ['layout'])),
|
|
149
149
|
};
|
|
150
150
|
}
|
|
151
151
|
function normalizeDeployment(input, include = []) {
|
|
152
|
-
return pick_1.pick(input, ['address', 'txHash', ...include]);
|
|
152
|
+
return (0, pick_1.pick)(input, ['address', 'txHash', ...include]);
|
|
153
153
|
}
|
|
154
154
|
//# sourceMappingURL=manifest.js.map
|
package/dist/manifest.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../src/manifest.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,2BAAoC;AACpC,yCAAwE;AACxE,sEAAuC;AACvC,uDAA8D;AAI9D,uCAAoC;AACpC,mDAA+C;AAE/C,MAAM,sBAAsB,GAAG,KAAK,CAAC;AAmBrC,SAAS,eAAe;IACtB,OAAO;QACL,eAAe,EAAE,sBAAsB;QACvC,KAAK,EAAE,EAAE;QACT,OAAO,EAAE,EAAE;KACZ,CAAC;AACJ,CAAC;AAED,MAAM,WAAW,GAAG,eAAe,CAAC;AAEpC,MAAa,QAAQ;IAQnB,YAAqB,OAAe;;QAAf,YAAO,GAAP,OAAO,CAAQ;QAN5B,WAAM,GAAG,KAAK,CAAC;QAOrB,MAAM,IAAI,GAAG,MAAA,uBAAY,CAAC,OAAO,CAAC,mCAAI,WAAW,OAAO,EAAE,CAAC;QAC3D,IAAI,CAAC,IAAI,GAAG,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,IAAI,OAAO,CAAC,CAAC;IACrD,CAAC;IAPD,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,QAA0B;QAChD,OAAO,IAAI,QAAQ,CAAC,MAAM,qBAAU,
|
|
1
|
+
{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../src/manifest.ts"],"names":[],"mappings":"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"}
|
package/dist/manifest.test.js
CHANGED
|
@@ -5,11 +5,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const ava_1 = __importDefault(require("ava"));
|
|
7
7
|
const manifest_1 = require("./manifest");
|
|
8
|
-
ava_1.default('manifest name for a known network', t => {
|
|
8
|
+
(0, ava_1.default)('manifest name for a known network', t => {
|
|
9
9
|
const manifest = new manifest_1.Manifest(1);
|
|
10
10
|
t.is(manifest.file, '.openzeppelin/mainnet.json');
|
|
11
11
|
});
|
|
12
|
-
ava_1.default('manifest name for an unknown network', t => {
|
|
12
|
+
(0, ava_1.default)('manifest name for an unknown network', t => {
|
|
13
13
|
const id = 55555;
|
|
14
14
|
const manifest = new manifest_1.Manifest(id);
|
|
15
15
|
t.is(manifest.file, `.openzeppelin/unknown-${id}.json`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manifest.test.js","sourceRoot":"","sources":["../src/manifest.test.ts"],"names":[],"mappings":";;;;;AAAA,8CAAuB;AACvB,yCAAsC;AAEtC,aAAI,
|
|
1
|
+
{"version":3,"file":"manifest.test.js","sourceRoot":"","sources":["../src/manifest.test.ts"],"names":[],"mappings":";;;;;AAAA,8CAAuB;AACvB,yCAAsC;AAEtC,IAAA,aAAI,EAAC,mCAAmC,EAAE,CAAC,CAAC,EAAE;IAC5C,MAAM,QAAQ,GAAG,IAAI,mBAAQ,CAAC,CAAC,CAAC,CAAC;IACjC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,4BAA4B,CAAC,CAAC;AACpD,CAAC,CAAC,CAAC;AAEH,IAAA,aAAI,EAAC,sCAAsC,EAAE,CAAC,CAAC,EAAE;IAC/C,MAAM,EAAE,GAAG,KAAK,CAAC;IACjB,MAAM,QAAQ,GAAG,IAAI,mBAAQ,CAAC,EAAE,CAAC,CAAC;IAClC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,yBAAyB,EAAE,OAAO,CAAC,CAAC;AAC1D,CAAC,CAAC,CAAC"}
|
package/dist/provider.d.ts
CHANGED
|
@@ -3,6 +3,7 @@ export interface EthereumProvider {
|
|
|
3
3
|
send(method: 'net_version', params: []): Promise<string>;
|
|
4
4
|
send(method: 'eth_chainId', params: []): Promise<string>;
|
|
5
5
|
send(method: 'eth_getCode', params: [string, string]): Promise<string>;
|
|
6
|
+
send(method: 'eth_call', params: unknown[]): Promise<string>;
|
|
6
7
|
send(method: 'eth_getStorageAt', params: [string, string, string]): Promise<string>;
|
|
7
8
|
send(method: 'eth_getTransactionByHash', params: [string]): Promise<null | EthereumTransaction>;
|
|
8
9
|
send(method: 'eth_getTransactionReceipt', params: [string]): Promise<null | EthereumTransactionReceipt>;
|
|
@@ -25,6 +26,7 @@ export declare function getChainId(provider: EthereumProvider): Promise<number>;
|
|
|
25
26
|
export declare function getClientVersion(provider: EthereumProvider): Promise<string>;
|
|
26
27
|
export declare function getStorageAt(provider: EthereumProvider, address: string, position: string, block?: string): Promise<string>;
|
|
27
28
|
export declare function getCode(provider: EthereumProvider, address: string, block?: string): Promise<string>;
|
|
29
|
+
export declare function call(provider: EthereumProvider, address: string, data: string, block?: string): Promise<string>;
|
|
28
30
|
export declare function hasCode(provider: EthereumProvider, address: string, block?: string): Promise<boolean>;
|
|
29
31
|
export declare function getTransactionByHash(provider: EthereumProvider, txHash: string): Promise<EthereumTransaction | null>;
|
|
30
32
|
export declare function getTransactionReceipt(provider: EthereumProvider, txHash: string): Promise<EthereumTransactionReceipt | null>;
|
package/dist/provider.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../src/provider.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../src/provider.ts"],"names":[],"mappings":"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"}
|
package/dist/provider.js
CHANGED
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.isReceiptSuccessful = exports.isDevelopmentNetwork = exports.networkNames = exports.getTransactionReceipt = exports.getTransactionByHash = exports.hasCode = exports.getCode = exports.getStorageAt = exports.getClientVersion = exports.getChainId = exports.getNetworkId = void 0;
|
|
6
|
+
exports.isReceiptSuccessful = exports.isDevelopmentNetwork = exports.networkNames = exports.getTransactionReceipt = exports.getTransactionByHash = exports.hasCode = exports.call = exports.getCode = exports.getStorageAt = exports.getClientVersion = exports.getChainId = exports.getNetworkId = void 0;
|
|
7
7
|
const bn_js_1 = __importDefault(require("bn.js"));
|
|
8
8
|
async function getNetworkId(provider) {
|
|
9
9
|
return provider.send('net_version', []);
|
|
@@ -28,6 +28,16 @@ async function getCode(provider, address, block = 'latest') {
|
|
|
28
28
|
return provider.send('eth_getCode', [address, block]);
|
|
29
29
|
}
|
|
30
30
|
exports.getCode = getCode;
|
|
31
|
+
async function call(provider, address, data, block = 'latest') {
|
|
32
|
+
return provider.send('eth_call', [
|
|
33
|
+
{
|
|
34
|
+
to: address,
|
|
35
|
+
data: data,
|
|
36
|
+
},
|
|
37
|
+
block,
|
|
38
|
+
]);
|
|
39
|
+
}
|
|
40
|
+
exports.call = call;
|
|
31
41
|
async function hasCode(provider, address, block) {
|
|
32
42
|
const code = await getCode(provider, address, block);
|
|
33
43
|
return code !== '0x';
|
package/dist/provider.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../src/provider.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAuB;
|
|
1
|
+
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../src/provider.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAuB;AA4BhB,KAAK,UAAU,YAAY,CAAC,QAA0B;IAC3D,OAAO,QAAQ,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;AAC1C,CAAC;AAFD,oCAEC;AAEM,KAAK,UAAU,UAAU,CAAC,QAA0B;IACzD,MAAM,EAAE,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;IAClD,OAAO,IAAI,eAAE,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAC;AACzD,CAAC;AAHD,gCAGC;AAEM,KAAK,UAAU,gBAAgB,CAAC,QAA0B;IAC/D,OAAO,QAAQ,CAAC,IAAI,CAAC,oBAAoB,EAAE,EAAE,CAAC,CAAC;AACjD,CAAC;AAFD,4CAEC;AAEM,KAAK,UAAU,YAAY,CAChC,QAA0B,EAC1B,OAAe,EACf,QAAgB,EAChB,KAAK,GAAG,QAAQ;IAEhB,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC;IACpF,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;IAC5D,OAAO,IAAI,GAAG,MAAM,CAAC;AACvB,CAAC;AATD,oCASC;AAEM,KAAK,UAAU,OAAO,CAAC,QAA0B,EAAE,OAAe,EAAE,KAAK,GAAG,QAAQ;IACzF,OAAO,QAAQ,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;AACxD,CAAC;AAFD,0BAEC;AAEM,KAAK,UAAU,IAAI,CACxB,QAA0B,EAC1B,OAAe,EACf,IAAY,EACZ,KAAK,GAAG,QAAQ;IAEhB,OAAO,QAAQ,CAAC,IAAI,CAAC,UAAU,EAAE;QAC/B;YACE,EAAE,EAAE,OAAO;YACX,IAAI,EAAE,IAAI;SACX;QACD,KAAK;KACN,CAAC,CAAC;AACL,CAAC;AAbD,oBAaC;AAEM,KAAK,UAAU,OAAO,CAAC,QAA0B,EAAE,OAAe,EAAE,KAAc;IACvF,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;IACrD,OAAO,IAAI,KAAK,IAAI,CAAC;AACvB,CAAC;AAHD,0BAGC;AAEM,KAAK,UAAU,oBAAoB,CACxC,QAA0B,EAC1B,MAAc;IAEd,OAAO,QAAQ,CAAC,IAAI,CAAC,0BAA0B,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;AAC7D,CAAC;AALD,oDAKC;AAEM,KAAK,UAAU,qBAAqB,CACzC,QAA0B,EAC1B,MAAc;IAEd,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,2BAA2B,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAC3E,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,EAAE;QACnB,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;KACjG;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AATD,sDASC;AAEY,QAAA,YAAY,GAAqC,MAAM,CAAC,MAAM,CAAC;IAC1E,CAAC,EAAE,SAAS;IACZ,CAAC,EAAE,QAAQ;IACX,CAAC,EAAE,SAAS;IACZ,CAAC,EAAE,SAAS;IACZ,CAAC,EAAE,QAAQ;IACX,EAAE,EAAE,OAAO;CACZ,CAAC,CAAC;AAEI,KAAK,UAAU,oBAAoB,CAAC,QAA0B;IACnE,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,QAAQ,CAAC,CAAC;IAC3C,kCAAkC;IAClC,2BAA2B;IAC3B,IAAI,OAAO,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,EAAE;QACzC,OAAO,IAAI,CAAC;KACb;SAAM;QACL,MAAM,aAAa,GAAG,MAAM,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACvD,MAAM,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QAC3C,OAAO,IAAI,KAAK,gBAAgB,IAAI,IAAI,KAAK,oBAAoB,CAAC;KACnE;AACH,CAAC;AAXD,oDAWC;AAED,SAAgB,mBAAmB,CAAC,OAAmD;IACrF,OAAO,OAAO,CAAC,MAAM,KAAK,KAAK,CAAC;AAClC,CAAC;AAFD,kDAEC"}
|
package/dist/provider.test.js
CHANGED
|
@@ -9,33 +9,33 @@ const hash = '0x1234';
|
|
|
9
9
|
function makeProviderReturning(result) {
|
|
10
10
|
return { send: (_method, _params) => Promise.resolve(result) };
|
|
11
11
|
}
|
|
12
|
-
ava_1.default('getTransactionReceipt returns null', async (t) => {
|
|
12
|
+
(0, ava_1.default)('getTransactionReceipt returns null', async (t) => {
|
|
13
13
|
const provider = makeProviderReturning(null);
|
|
14
|
-
t.is(await provider_1.getTransactionReceipt(provider, hash), null);
|
|
14
|
+
t.is(await (0, provider_1.getTransactionReceipt)(provider, hash), null);
|
|
15
15
|
});
|
|
16
|
-
ava_1.default('getTransactionReceipt status returns 0x0', async (t) => {
|
|
16
|
+
(0, ava_1.default)('getTransactionReceipt status returns 0x0', async (t) => {
|
|
17
17
|
const provider = makeProviderReturning({ status: '0x0' });
|
|
18
|
-
const receipt = await provider_1.getTransactionReceipt(provider, hash);
|
|
18
|
+
const receipt = await (0, provider_1.getTransactionReceipt)(provider, hash);
|
|
19
19
|
t.is(receipt === null || receipt === void 0 ? void 0 : receipt.status, '0x0');
|
|
20
20
|
});
|
|
21
|
-
ava_1.default('getTransactionReceipt status returns 0x1', async (t) => {
|
|
21
|
+
(0, ava_1.default)('getTransactionReceipt status returns 0x1', async (t) => {
|
|
22
22
|
const provider = makeProviderReturning({ status: '0x1' });
|
|
23
|
-
const receipt = await provider_1.getTransactionReceipt(provider, hash);
|
|
23
|
+
const receipt = await (0, provider_1.getTransactionReceipt)(provider, hash);
|
|
24
24
|
t.is(receipt === null || receipt === void 0 ? void 0 : receipt.status, '0x1');
|
|
25
25
|
});
|
|
26
|
-
ava_1.default('getTransactionReceipt status normalizes to 0x0', async (t) => {
|
|
26
|
+
(0, ava_1.default)('getTransactionReceipt status normalizes to 0x0', async (t) => {
|
|
27
27
|
const provider = makeProviderReturning({ status: '0x000000000000000000000000' });
|
|
28
|
-
const receipt = await provider_1.getTransactionReceipt(provider, hash);
|
|
28
|
+
const receipt = await (0, provider_1.getTransactionReceipt)(provider, hash);
|
|
29
29
|
t.is(receipt === null || receipt === void 0 ? void 0 : receipt.status, '0x0');
|
|
30
30
|
});
|
|
31
|
-
ava_1.default('getTransactionReceipt status normalizes to 0x1', async (t) => {
|
|
31
|
+
(0, ava_1.default)('getTransactionReceipt status normalizes to 0x1', async (t) => {
|
|
32
32
|
const provider = makeProviderReturning({ status: '0x000000000000000000000001' });
|
|
33
|
-
const receipt = await provider_1.getTransactionReceipt(provider, hash);
|
|
33
|
+
const receipt = await (0, provider_1.getTransactionReceipt)(provider, hash);
|
|
34
34
|
t.is(receipt === null || receipt === void 0 ? void 0 : receipt.status, '0x1');
|
|
35
35
|
});
|
|
36
|
-
ava_1.default('getTransactionReceipt status returns empty hex', async (t) => {
|
|
36
|
+
(0, ava_1.default)('getTransactionReceipt status returns empty hex', async (t) => {
|
|
37
37
|
const provider = makeProviderReturning({ status: '0x' });
|
|
38
|
-
const receipt = await provider_1.getTransactionReceipt(provider, hash);
|
|
38
|
+
const receipt = await (0, provider_1.getTransactionReceipt)(provider, hash);
|
|
39
39
|
t.is(receipt === null || receipt === void 0 ? void 0 : receipt.status, '0x');
|
|
40
40
|
});
|
|
41
41
|
//# sourceMappingURL=provider.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider.test.js","sourceRoot":"","sources":["../src/provider.test.ts"],"names":[],"mappings":";;;;;AAAA,8CAAuB;AACvB,yCAAqE;AAErE,MAAM,IAAI,GAAG,QAAQ,CAAC;AAEtB,SAAS,qBAAqB,CAAC,MAAe;IAC5C,OAAO,EAAE,IAAI,EAAE,CAAC,OAAe,EAAE,OAAkB,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAsB,CAAC;AACxG,CAAC;AAED,aAAI,
|
|
1
|
+
{"version":3,"file":"provider.test.js","sourceRoot":"","sources":["../src/provider.test.ts"],"names":[],"mappings":";;;;;AAAA,8CAAuB;AACvB,yCAAqE;AAErE,MAAM,IAAI,GAAG,QAAQ,CAAC;AAEtB,SAAS,qBAAqB,CAAC,MAAe;IAC5C,OAAO,EAAE,IAAI,EAAE,CAAC,OAAe,EAAE,OAAkB,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAsB,CAAC;AACxG,CAAC;AAED,IAAA,aAAI,EAAC,oCAAoC,EAAE,KAAK,EAAC,CAAC,EAAC,EAAE;IACnD,MAAM,QAAQ,GAAG,qBAAqB,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC,CAAC,EAAE,CAAC,MAAM,IAAA,gCAAqB,EAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC;AAC1D,CAAC,CAAC,CAAC;AAEH,IAAA,aAAI,EAAC,0CAA0C,EAAE,KAAK,EAAC,CAAC,EAAC,EAAE;IACzD,MAAM,QAAQ,GAAG,qBAAqB,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;IAC1D,MAAM,OAAO,GAAG,MAAM,IAAA,gCAAqB,EAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IAC5D,CAAC,CAAC,EAAE,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,EAAE,KAAK,CAAC,CAAC;AAC/B,CAAC,CAAC,CAAC;AAEH,IAAA,aAAI,EAAC,0CAA0C,EAAE,KAAK,EAAC,CAAC,EAAC,EAAE;IACzD,MAAM,QAAQ,GAAG,qBAAqB,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;IAC1D,MAAM,OAAO,GAAG,MAAM,IAAA,gCAAqB,EAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IAC5D,CAAC,CAAC,EAAE,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,EAAE,KAAK,CAAC,CAAC;AAC/B,CAAC,CAAC,CAAC;AAEH,IAAA,aAAI,EAAC,gDAAgD,EAAE,KAAK,EAAC,CAAC,EAAC,EAAE;IAC/D,MAAM,QAAQ,GAAG,qBAAqB,CAAC,EAAE,MAAM,EAAE,4BAA4B,EAAE,CAAC,CAAC;IACjF,MAAM,OAAO,GAAG,MAAM,IAAA,gCAAqB,EAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IAC5D,CAAC,CAAC,EAAE,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,EAAE,KAAK,CAAC,CAAC;AAC/B,CAAC,CAAC,CAAC;AAEH,IAAA,aAAI,EAAC,gDAAgD,EAAE,KAAK,EAAC,CAAC,EAAC,EAAE;IAC/D,MAAM,QAAQ,GAAG,qBAAqB,CAAC,EAAE,MAAM,EAAE,4BAA4B,EAAE,CAAC,CAAC;IACjF,MAAM,OAAO,GAAG,MAAM,IAAA,gCAAqB,EAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IAC5D,CAAC,CAAC,EAAE,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,EAAE,KAAK,CAAC,CAAC;AAC/B,CAAC,CAAC,CAAC;AAEH,IAAA,aAAI,EAAC,gDAAgD,EAAE,KAAK,EAAC,CAAC,EAAC,EAAE;IAC/D,MAAM,QAAQ,GAAG,qBAAqB,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;IACzD,MAAM,OAAO,GAAG,MAAM,IAAA,gCAAqB,EAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IAC5D,CAAC,CAAC,EAAE,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,EAAE,IAAI,CAAC,CAAC;AAC9B,CAAC,CAAC,CAAC"}
|