@skalenetwork/upgrade-tools 4.0.0-beacon.0 → 4.0.0-beacon.2
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/index.d.ts +1 -0
- package/dist/src/index.js +1 -0
- package/dist/src/index.js.map +1 -1
- package/dist/src/proxyUpgrader.js +7 -4
- package/dist/src/proxyUpgrader.js.map +1 -1
- package/dist/src/upgrader.d.ts +0 -1
- package/dist/src/upgrader.js +31 -7
- package/dist/src/upgrader.js.map +1 -1
- package/dist/src/upgraders/abstractTransparentProxyUpgrader.d.ts +12 -4
- package/dist/src/upgraders/abstractTransparentProxyUpgrader.js +13 -17
- package/dist/src/upgraders/abstractTransparentProxyUpgrader.js.map +1 -1
- package/package.json +1 -1
package/dist/src/index.d.ts
CHANGED
package/dist/src/index.js
CHANGED
|
@@ -22,5 +22,6 @@ __exportStar(require("./submitters"), exports);
|
|
|
22
22
|
__exportStar(require("./verification"), exports);
|
|
23
23
|
__exportStar(require("./version"), exports);
|
|
24
24
|
__exportStar(require("./upgrader"), exports);
|
|
25
|
+
__exportStar(require("./upgraders/abstractTransparentProxyUpgrader"), exports);
|
|
25
26
|
__exportStar(require("./upgraders/beaconUpgrader"), exports);
|
|
26
27
|
//# sourceMappingURL=index.js.map
|
package/dist/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wCAAsB;AACtB,2CAAyB;AACzB,gDAA8B;AAC9B,kDAAgC;AAChC,+CAA6B;AAC7B,iDAA+B;AAC/B,4CAA0B;AAC1B,6CAA2B;AAC3B,6DAA0C"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wCAAsB;AACtB,2CAAyB;AACzB,gDAA8B;AAC9B,kDAAgC;AAChC,+CAA6B;AAC7B,iDAA+B;AAC/B,4CAA0B;AAC1B,6CAA2B;AAC3B,+EAA6D;AAC7D,6DAA0C"}
|
|
@@ -6,9 +6,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.ProxyUpgrader = void 0;
|
|
7
7
|
const hardhat_1 = require("hardhat");
|
|
8
8
|
const chalk_1 = __importDefault(require("chalk"));
|
|
9
|
-
const upgrader_1 = require("./upgrader");
|
|
10
9
|
const contractFactory_1 = require("./contractFactory");
|
|
11
10
|
const upgrades_core_1 = require("@openzeppelin/upgrades-core");
|
|
11
|
+
// 10 minutes
|
|
12
|
+
const deployTimeout = 60e4;
|
|
12
13
|
class ProxyUpgrader {
|
|
13
14
|
constructor(contractName, proxyAddress, nonceProvider) {
|
|
14
15
|
this.newImplementationAddress = null;
|
|
@@ -49,17 +50,19 @@ class ProxyUpgrader {
|
|
|
49
50
|
const currentImplementationAddress = await (0, upgrades_core_1.getImplementationAddress)(hardhat_1.network.provider, await hardhat_1.ethers.resolveAddress(this.proxyAddress));
|
|
50
51
|
const nonce = this.nonceProvider?.reserveNonce();
|
|
51
52
|
const newImplementationAddress = await hardhat_1.upgrades.prepareUpgrade(await hardhat_1.ethers.resolveAddress(this.proxyAddress), contractFactory, {
|
|
52
|
-
"timeout":
|
|
53
|
+
"timeout": deployTimeout,
|
|
53
54
|
"txOverrides": {
|
|
54
55
|
nonce
|
|
55
56
|
},
|
|
56
57
|
"unsafeAllowLinkedLibraries": true,
|
|
57
58
|
"unsafeAllowRenames": true
|
|
58
59
|
});
|
|
59
|
-
if (newImplementationAddress
|
|
60
|
+
if (newImplementationAddress === currentImplementationAddress) {
|
|
61
|
+
console.log(chalk_1.default.gray(`Contract ${this.contractName} is up to date`));
|
|
62
|
+
}
|
|
63
|
+
else {
|
|
60
64
|
this.newImplementationAddress = newImplementationAddress;
|
|
61
65
|
}
|
|
62
|
-
console.log(chalk_1.default.gray(`Contract ${this.contractName} is up to date`));
|
|
63
66
|
if (nonce) {
|
|
64
67
|
this.nonceProvider?.releaseNonce(nonce);
|
|
65
68
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxyUpgrader.js","sourceRoot":"","sources":["../../src/proxyUpgrader.ts"],"names":[],"mappings":";;;;;;AACA,qCAAkD;AAElD,kDAA0B;AAC1B,
|
|
1
|
+
{"version":3,"file":"proxyUpgrader.js","sourceRoot":"","sources":["../../src/proxyUpgrader.ts"],"names":[],"mappings":";;;;;;AACA,qCAAkD;AAElD,kDAA0B;AAC1B,uDAAsE;AACtE,+DAAqE;AAGrE,gCAAgC;AAChC,MAAM,aAAa,GAAG,IAAI,CAAC;AAE3B,MAAsB,aAAa;IAM/B,YACI,YAAoB,EACpB,YAAyB,EACzB,aAA6B;QAPvB,6BAAwB,GAAuB,IAAI,CAAC;QAS1D,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACvC,CAAC;IAED,SAAS;IAEF,KAAK,CAAC,uBAAuB;QAChC,MAAM,eAAe,GAAG,MAAM,IAAA,qDAAmC,EAC7D,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,aAAa,CACrB,CAAC;QACF,OAAO,CAAC,GAAG,CAAC,sBAAsB,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;QACvD,OAAO,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC;IAChD,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,wBAAwB,KAAK,IAAI,CAAC;IAClD,CAAC;IAEM,KAAK,CAAC,qBAAqB;QAC9B,IAAI,IAAI,CAAC,wBAAwB,KAAK,IAAI,EAAE,CAAC;YACzC,MAAM,IAAI,KAAK,CACX,cAAc,IAAI,CAAC,YAAY,gCAAgC,CAClE,CAAC;QACN,CAAC;QACD,MAAM,WAAW,GACb,kCAAkC,IAAI,CAAC,YAAY,EAAE;YACrD,OAAO,IAAI,CAAC,YAAY,EAAE;YAC1B,OAAO,IAAI,CAAC,wBAAwB,EAAE,CAAC;QAC3C,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,CAAC;QAC7C,OAAO,MAAM,IAAI,CAAC,sBAAsB,EAAE,CAAC;IAC/C,CAAC;IAEM,eAAe;QAClB,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;IAEM,2BAA2B;QAC9B,IAAI,IAAI,CAAC,wBAAwB,KAAK,IAAI,EAAE,CAAC;YACzC,MAAM,IAAI,KAAK,CACX,8CAA8C,IAAI,CAAC,YAAY,EAAE,CACpE,CAAC;QACN,CAAC;QACD,OAAO,IAAI,CAAC,wBAAwB,CAAC;IACzC,CAAC;IAQD,UAAU;IAEF,KAAK,CAAC,cAAc,CAAC,eAAgC;QACzD,MAAM,4BAA4B,GAAG,MAAM,IAAA,wCAAwB,EAC/D,iBAAO,CAAC,QAAQ,EAChB,MAAM,gBAAM,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,CACjD,CAAC;QAEF,MAAM,KAAK,GAAG,IAAI,CAAC,aAAa,EAAE,YAAY,EAAE,CAAC;QAEjD,MAAM,wBAAwB,GAAG,MAAM,kBAAQ,CAAC,cAAc,CAC1D,MAAM,gBAAM,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,EAC9C,eAAe,EACf;YACI,SAAS,EAAE,aAAa;YACxB,aAAa,EAAE;gBACX,KAAK;aACR;YACD,4BAA4B,EAAE,IAAI;YAClC,oBAAoB,EAAE,IAAI;SAC7B,CACW,CAAC;QACjB,IAAI,wBAAwB,KAAK,4BAA4B,EAAE,CAAC;YAC5D,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,YAAY,gBAAgB,CAAC,CAAC,CAAC;QAC3E,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,wBAAwB,GAAG,wBAAwB,CAAC;QAC7D,CAAC;QACD,IAAI,KAAK,EAAE,CAAC;YACR,IAAI,CAAC,aAAa,EAAE,YAAY,CAAC,KAAK,CAAC,CAAC;QAC5C,CAAC;IACL,CAAC;CACJ;AA/FD,sCA+FC"}
|
package/dist/src/upgrader.d.ts
CHANGED
|
@@ -4,7 +4,6 @@ import { Project } from "./types/upgrader";
|
|
|
4
4
|
import { ProxyUpgrader } from "./proxyUpgrader";
|
|
5
5
|
import { Submitter } from "./submitters/submitter";
|
|
6
6
|
import { Transaction } from "ethers";
|
|
7
|
-
export declare const deployTimeout = 600000;
|
|
8
7
|
export declare abstract class Upgrader {
|
|
9
8
|
private targetVersion;
|
|
10
9
|
private contractNamesToUpgrade;
|
package/dist/src/upgrader.js
CHANGED
|
@@ -3,13 +3,15 @@ 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.Upgrader =
|
|
6
|
+
exports.Upgrader = void 0;
|
|
7
7
|
const hardhat_1 = require("hardhat");
|
|
8
8
|
const abstractTransparentProxyUpgrader_1 = require("./upgraders/abstractTransparentProxyUpgrader");
|
|
9
9
|
const auto_submitter_1 = require("./submitters/auto-submitter");
|
|
10
10
|
const exitCodes_1 = require("./exitCodes");
|
|
11
11
|
const nonceProvider_1 = require("./nonceProvider");
|
|
12
12
|
const semaphore_async_await_1 = __importDefault(require("semaphore-async-await"));
|
|
13
|
+
const transparentProxyUpgrader_1 = require("./upgraders/transparentProxyUpgrader");
|
|
14
|
+
const v4TransparentProxyUpgrader_1 = require("./upgraders/v4TransparentProxyUpgrader");
|
|
13
15
|
const chalk_1 = __importDefault(require("chalk"));
|
|
14
16
|
const fs_1 = require("fs");
|
|
15
17
|
const version_1 = require("./version");
|
|
@@ -18,8 +20,6 @@ const withoutNull = (array) => array.
|
|
|
18
20
|
filter((element) => element !== null);
|
|
19
21
|
// TODO: Set to 8 when upgrade plugins become thread safe
|
|
20
22
|
const maxSimultaneousDeployments = 1;
|
|
21
|
-
// 10 minutes
|
|
22
|
-
exports.deployTimeout = 60e4;
|
|
23
23
|
class Upgrader {
|
|
24
24
|
constructor(project, submitter) {
|
|
25
25
|
this.proxyUpgraders = [];
|
|
@@ -36,8 +36,28 @@ class Upgrader {
|
|
|
36
36
|
}
|
|
37
37
|
async createProxyUpgrader(contractName) {
|
|
38
38
|
const proxyAddress = await this.instance.getContractAddress(contractName);
|
|
39
|
-
const
|
|
40
|
-
|
|
39
|
+
const proxyAdmin = await abstractTransparentProxyUpgrader_1.AbstractTransparentProxyUpgrader.getProxyAdmin(proxyAddress);
|
|
40
|
+
const proxyAdminVersion = await abstractTransparentProxyUpgrader_1.AbstractTransparentProxyUpgrader.getProxyAdminVersion(proxyAdmin);
|
|
41
|
+
const defaultProxyAdminVersion = "5.0.0";
|
|
42
|
+
if (proxyAdminVersion === defaultProxyAdminVersion) {
|
|
43
|
+
console.log(chalk_1.default.gray(`${contractName} uses ProxyAdmin version ${proxyAdminVersion}`));
|
|
44
|
+
return new transparentProxyUpgrader_1.TransparentProxyUpgrader({
|
|
45
|
+
contractName,
|
|
46
|
+
nonceProvider: this.nonceProvider,
|
|
47
|
+
proxyAddress,
|
|
48
|
+
proxyAdmin
|
|
49
|
+
});
|
|
50
|
+
}
|
|
51
|
+
else if (proxyAdminVersion === null) {
|
|
52
|
+
console.log(chalk_1.default.gray(`${contractName} uses old ProxyAdmin (v4 or lower)`));
|
|
53
|
+
return new v4TransparentProxyUpgrader_1.V4TransparentProxyUpgrader({
|
|
54
|
+
contractName,
|
|
55
|
+
nonceProvider: this.nonceProvider,
|
|
56
|
+
proxyAddress,
|
|
57
|
+
proxyAdmin
|
|
58
|
+
});
|
|
59
|
+
}
|
|
60
|
+
throw new Error(`Unsupported ProxyAdmin version: ${proxyAdminVersion}`);
|
|
41
61
|
}
|
|
42
62
|
// Public
|
|
43
63
|
async upgrade() {
|
|
@@ -74,7 +94,11 @@ class Upgrader {
|
|
|
74
94
|
this.proxyUpgraders = await Promise.all(this.contractNamesToUpgrade.map(this.createProxyUpgrader, this));
|
|
75
95
|
}
|
|
76
96
|
async callInitialize() {
|
|
77
|
-
if (typeof this.initialize
|
|
97
|
+
if (typeof this.initialize === "undefined") {
|
|
98
|
+
console.log(chalk_1.default.gray("No initialize function defined, skipping"));
|
|
99
|
+
}
|
|
100
|
+
else {
|
|
101
|
+
console.log("Generating initialize transaction(s)");
|
|
78
102
|
await this.initialize();
|
|
79
103
|
}
|
|
80
104
|
}
|
|
@@ -106,7 +130,7 @@ class Upgrader {
|
|
|
106
130
|
async switchToNewImplementations() {
|
|
107
131
|
this.transactions = [
|
|
108
132
|
...this.transactions,
|
|
109
|
-
...await Promise.all(this.
|
|
133
|
+
...await Promise.all(this.getChangedContracts().map((upgrader) => upgrader.getUpgradeTransaction()))
|
|
110
134
|
];
|
|
111
135
|
}
|
|
112
136
|
async deployNewImplementations() {
|
package/dist/src/upgrader.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgrader.js","sourceRoot":"","sources":["../../src/upgrader.ts"],"names":[],"mappings":";;;;;;AAAA,qCAAwC;AACxC,mGAA8F;AAC9F,gEAA0D;AAC1D,2CAAuC;AAEvC,mDAA8C;AAG9C,kFAA8C;AAG9C,kDAA0B;AAC1B,2BAAkC;AAClC,uCAAqC;AACrC,iDAAsC;AAGtC,MAAM,WAAW,GAAG,CAAI,KAAsB,EAAE,EAAE,CAAC,KAAK;IACpD,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,KAAK,IAAI,CAAa,CAAC;AAEtD,yDAAyD;AACzD,MAAM,0BAA0B,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"upgrader.js","sourceRoot":"","sources":["../../src/upgrader.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,18 @@
|
|
|
1
1
|
import { AddressLike, Contract } from "ethers";
|
|
2
2
|
import { NonceProvider } from "../nonceProvider";
|
|
3
3
|
import { ProxyUpgrader } from "../proxyUpgrader";
|
|
4
|
+
interface TransparentProxyUpgraderConstructorArguments {
|
|
5
|
+
contractName: string;
|
|
6
|
+
proxyAddress: AddressLike;
|
|
7
|
+
proxyAdmin: Contract;
|
|
8
|
+
nonceProvider?: NonceProvider;
|
|
9
|
+
}
|
|
4
10
|
export declare abstract class AbstractTransparentProxyUpgrader extends ProxyUpgrader {
|
|
5
|
-
protected proxyAdmin: Contract
|
|
6
|
-
|
|
11
|
+
protected proxyAdmin: Contract;
|
|
12
|
+
constructor(options: TransparentProxyUpgraderConstructorArguments);
|
|
7
13
|
getOwner(): Promise<string>;
|
|
8
|
-
|
|
9
|
-
|
|
14
|
+
static getProxyAdmin(proxy: AddressLike): Promise<Contract>;
|
|
15
|
+
static getProxyAdminVersion(proxyAdmin: Contract): Promise<string | null>;
|
|
16
|
+
static isNewProxyAdmin(proxyAdmin: Contract): Promise<boolean>;
|
|
10
17
|
}
|
|
18
|
+
export {};
|
|
@@ -6,29 +6,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.AbstractTransparentProxyUpgrader = void 0;
|
|
7
7
|
const hardhat_1 = require("hardhat");
|
|
8
8
|
const proxyUpgrader_1 = require("../proxyUpgrader");
|
|
9
|
-
const transparentProxyUpgrader_1 = require("./transparentProxyUpgrader");
|
|
10
9
|
const chalk_1 = __importDefault(require("chalk"));
|
|
11
10
|
class AbstractTransparentProxyUpgrader extends proxyUpgrader_1.ProxyUpgrader {
|
|
12
|
-
constructor() {
|
|
13
|
-
super(
|
|
14
|
-
this.proxyAdmin =
|
|
15
|
-
}
|
|
16
|
-
static async create(contractName, proxyAddress, nonceProvider) {
|
|
17
|
-
const proxyAdmin = await this.getProxyAdmin(proxyAddress);
|
|
18
|
-
let upgrader = null;
|
|
19
|
-
if (await this.isNewProxyAdmin(proxyAdmin)) {
|
|
20
|
-
upgrader = new transparentProxyUpgrader_1.TransparentProxyUpgrader(contractName, proxyAddress, nonceProvider);
|
|
21
|
-
}
|
|
22
|
-
else {
|
|
23
|
-
upgrader = new transparentProxyUpgrader_1.TransparentProxyUpgrader(contractName, proxyAddress, nonceProvider);
|
|
24
|
-
}
|
|
25
|
-
upgrader.proxyAdmin = proxyAdmin;
|
|
26
|
-
return upgrader;
|
|
11
|
+
constructor(options) {
|
|
12
|
+
super(options.contractName, options.proxyAddress, options.nonceProvider);
|
|
13
|
+
this.proxyAdmin = options.proxyAdmin;
|
|
27
14
|
}
|
|
28
15
|
async getOwner() {
|
|
29
16
|
return await this.proxyAdmin.owner();
|
|
30
17
|
}
|
|
31
|
-
// Private
|
|
32
18
|
static async getProxyAdmin(proxy) {
|
|
33
19
|
const proxyAdminAddress = await hardhat_1.upgrades.erc1967.getAdminAddress(await hardhat_1.ethers.resolveAddress(proxy));
|
|
34
20
|
const generalProxyAdminAbi = [
|
|
@@ -39,6 +25,16 @@ class AbstractTransparentProxyUpgrader extends proxyUpgrader_1.ProxyUpgrader {
|
|
|
39
25
|
];
|
|
40
26
|
return new hardhat_1.ethers.Contract(proxyAdminAddress, generalProxyAdminAbi, await hardhat_1.ethers.provider.getSigner());
|
|
41
27
|
}
|
|
28
|
+
static async getProxyAdminVersion(proxyAdmin) {
|
|
29
|
+
try {
|
|
30
|
+
// This function name is set in external library
|
|
31
|
+
// eslint-disable-next-line new-cap
|
|
32
|
+
return await proxyAdmin.UPGRADE_INTERFACE_VERSION();
|
|
33
|
+
}
|
|
34
|
+
catch (error) {
|
|
35
|
+
return null;
|
|
36
|
+
}
|
|
37
|
+
}
|
|
42
38
|
static async isNewProxyAdmin(proxyAdmin) {
|
|
43
39
|
try {
|
|
44
40
|
console.log(chalk_1.default.gray(`ProxyAdmin version ${
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abstractTransparentProxyUpgrader.js","sourceRoot":"","sources":["../../../src/upgraders/abstractTransparentProxyUpgrader.ts"],"names":[],"mappings":";;;;;;AACA,qCAAyC;AAEzC,oDAA+C;AAC/C,
|
|
1
|
+
{"version":3,"file":"abstractTransparentProxyUpgrader.js","sourceRoot":"","sources":["../../../src/upgraders/abstractTransparentProxyUpgrader.ts"],"names":[],"mappings":";;;;;;AACA,qCAAyC;AAEzC,oDAA+C;AAC/C,kDAA0B;AAS1B,MAAsB,gCAAiC,SAAQ,6BAAa;IAGxE,YACI,OAAqD;QAErD,KAAK,CAAC,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;QACzE,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;IACzC,CAAC;IAEM,KAAK,CAAC,QAAQ;QACjB,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;IACzC,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,KAAkB;QAChD,MAAM,iBAAiB,GAAG,MAAM,kBAAQ,CAAC,OAAO,CAAC,eAAe,CAC5D,MAAM,gBAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CACrC,CAAC;QACF,MAAM,oBAAoB,GAAG;YACzB,4DAA4D;YAC5D,mCAAmC;YACnC,wDAAwD;YACxD,yCAAyC;SAC5C,CAAC;QACF,OAAO,IAAI,gBAAM,CAAC,QAAQ,CACtB,iBAAiB,EACjB,oBAAoB,EACpB,MAAM,gBAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,CACpC,CAAC;IACN,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,UAAoB;QACzD,IAAI,CAAC;YACD,gDAAgD;YAChD,mCAAmC;YACnC,OAAO,MAAM,UAAU,CAAC,yBAAyB,EAAY,CAAC;QAClE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,UAAoB;QACpD,IAAI,CAAC;YACD,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,IAAI,CAAC,sBAAsB;YACzC,gDAAgD;YAChD,mCAAmC;YACnC,MAAM,UAAU,CAAC,yBAAyB,EAC9C,EAAE,CAAC,CAAC,CAAC;YACL,OAAO,IAAI,CAAC;QAChB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC;YAC9C,OAAO,KAAK,CAAC;QACjB,CAAC;IACL,CAAC;CACJ;AAtDD,4EAsDC"}
|