@keplr-wallet/background 0.12.281-rc.3 → 0.12.282

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.
Files changed (9) hide show
  1. package/build/keyring-cosmos/messages.d.ts +4 -12
  2. package/build/keyring-cosmos/messages.js +2 -2
  3. package/build/keyring-cosmos/messages.js.map +1 -1
  4. package/build/keyring-ethereum/service.d.ts +2 -0
  5. package/build/keyring-ethereum/service.js +56 -6
  6. package/build/keyring-ethereum/service.js.map +1 -1
  7. package/package.json +13 -13
  8. package/src/keyring-cosmos/messages.ts +4 -8
  9. package/src/keyring-ethereum/service.ts +97 -14
package/build/keyring-cosmos/messages.d.ts CHANGED
@@ -22,13 +22,9 @@ export declare class RequestCosmosSignAminoMsg extends Message<AminoSignResponse
22
22
  readonly chainId: string;
23
23
  readonly signer: string;
24
24
  readonly signDoc: StdSignDoc;
25
- readonly signOptions: KeplrSignOptions & {
26
- forceTopUp?: boolean;
27
- };
25
+ readonly signOptions: KeplrSignOptions;
28
26
  static type(): string;
29
- constructor(chainId: string, signer: string, signDoc: StdSignDoc, signOptions: KeplrSignOptions & {
30
- forceTopUp?: boolean;
31
- });
27
+ constructor(chainId: string, signer: string, signDoc: StdSignDoc, signOptions: KeplrSignOptions);
32
28
  validateBasic(): void;
33
29
  approveExternal(): boolean;
34
30
  route(): string;
@@ -51,18 +47,14 @@ export declare class RequestCosmosSignDirectMsg extends Message<{
51
47
  chainId?: string;
52
48
  accountNumber?: string;
53
49
  };
54
- readonly signOptions: KeplrSignOptions & {
55
- forceTopUp?: boolean;
56
- };
50
+ readonly signOptions: KeplrSignOptions;
57
51
  static type(): string;
58
52
  constructor(chainId: string, signer: string, signDoc: {
59
53
  bodyBytes?: Uint8Array;
60
54
  authInfoBytes?: Uint8Array;
61
55
  chainId?: string;
62
56
  accountNumber?: string;
63
- }, signOptions?: KeplrSignOptions & {
64
- forceTopUp?: boolean;
65
- });
57
+ }, signOptions?: KeplrSignOptions);
66
58
  validateBasic(): void;
67
59
  approveExternal(): boolean;
68
60
  route(): string;
package/build/keyring-cosmos/messages.js CHANGED
@@ -97,7 +97,7 @@ class RequestCosmosSignAminoMsg extends router_1.Message {
97
97
  }
98
98
  }
99
99
  approveExternal() {
100
- return !this.signOptions.forceTopUp;
100
+ return true;
101
101
  }
102
102
  route() {
103
103
  return constants_1.ROUTE;
@@ -141,7 +141,7 @@ class RequestCosmosSignDirectMsg extends router_1.Message {
141
141
  }
142
142
  }
143
143
  approveExternal() {
144
- return !this.signOptions.forceTopUp;
144
+ return true;
145
145
  }
146
146
  route() {
147
147
  return constants_1.ROUTE;
package/build/keyring-cosmos/messages.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"messages.js","sourceRoot":"","sources":["../../src/keyring-cosmos/messages.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"messages.js","sourceRoot":"","sources":["../../src/keyring-cosmos/messages.ts"],"names":[],"mappings":"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"}
package/build/keyring-ethereum/service.d.ts CHANGED
@@ -30,4 +30,6 @@ export declare class KeyRingEthereumService {
30
30
  private getCurrentChainId;
31
31
  private forceGetCurrentChainId;
32
32
  private getEVMChainId;
33
+ private toHexQty;
34
+ private normalizeUnsignedTx;
33
35
  }
package/build/keyring-ethereum/service.js CHANGED
@@ -235,7 +235,7 @@ class KeyRingEthereumService {
235
235
  throw new Error("The chain id must be provided for the internal message.");
236
236
  }
237
237
  const result = (yield (() => __awaiter(this, void 0, void 0, function* () {
238
- var _a, _b, _c;
238
+ var _a;
239
239
  switch (method) {
240
240
  case "keplr_initProviderState": {
241
241
  const currentChainId = this.getCurrentChainId(origin, chainId);
@@ -310,7 +310,7 @@ class KeyRingEthereumService {
310
310
  throw new router_1.EthereumProviderRpcError(-32602, "Must provide a transaction.");
311
311
  }
312
312
  const currentChainId = this.forceGetCurrentChainId(origin, chainId);
313
- const { from: sender, gas, authorizationList } = tx, restTx = __rest(tx, ["from", "gas", "authorizationList"]);
313
+ const { from: sender, authorizationList } = tx, restTx = __rest(tx, ["from", "authorizationList"]);
314
314
  if (authorizationList) {
315
315
  throw new Error("EIP-7702 transactions are not supported.");
316
316
  }
@@ -336,7 +336,7 @@ class KeyRingEthereumService {
336
336
  const selectedAddress = `0x${buffer_1.Buffer.from(pubkey.getEthAddress()).toString("hex")}`;
337
337
  const transactionCount = yield this.request(env, origin, "eth_getTransactionCount", [selectedAddress, "pending"], providerId, chainId);
338
338
  const nonce = parseInt(transactionCount, 16);
339
- const unsignedTx = Object.assign(Object.assign({}, restTx), { gasLimit: (_a = restTx === null || restTx === void 0 ? void 0 : restTx.gasLimit) !== null && _a !== void 0 ? _a : gas, chainId: this.getEVMChainId(currentChainId), nonce });
339
+ const unsignedTx = this.normalizeUnsignedTx(restTx, currentChainId, nonce);
340
340
  try {
341
341
  const { signingData, signature } = yield this.signEthereumSelected(env, origin, currentChainId, sender, buffer_1.Buffer.from(JSON.stringify(unsignedTx)), types_1.EthSignType.TRANSACTION);
342
342
  const signingTx = JSON.parse(buffer_1.Buffer.from(signingData).toString());
@@ -364,7 +364,7 @@ class KeyRingEthereumService {
364
364
  throw new router_1.EthereumProviderRpcError(-32602, "Must provide a transaction.");
365
365
  }
366
366
  const currentChainId = this.forceGetCurrentChainId(origin, chainId);
367
- const { from: sender, gas, authorizationList } = tx, restTx = __rest(tx, ["from", "gas", "authorizationList"]);
367
+ const { from: sender, authorizationList } = tx, restTx = __rest(tx, ["from", "authorizationList"]);
368
368
  if (authorizationList) {
369
369
  throw new Error("EIP-7702 transactions are not supported.");
370
370
  }
@@ -390,7 +390,7 @@ class KeyRingEthereumService {
390
390
  const selectedAddress = `0x${buffer_1.Buffer.from(pubkey.getEthAddress()).toString("hex")}`;
391
391
  const transactionCount = yield this.request(env, origin, "eth_getTransactionCount", [selectedAddress, "pending"], providerId, chainId);
392
392
  const nonce = parseInt(transactionCount, 16);
393
- const unsignedTx = Object.assign(Object.assign({}, restTx), { gasLimit: (_b = restTx === null || restTx === void 0 ? void 0 : restTx.gasLimit) !== null && _b !== void 0 ? _b : gas, chainId: this.getEVMChainId(currentChainId), nonce });
393
+ const unsignedTx = this.normalizeUnsignedTx(restTx, currentChainId, nonce);
394
394
  try {
395
395
  const { signingData, signature } = yield this.signEthereumSelected(env, origin, currentChainId, sender, buffer_1.Buffer.from(JSON.stringify(unsignedTx)), types_1.EthSignType.TRANSACTION);
396
396
  const signingTx = JSON.parse(buffer_1.Buffer.from(signingData).toString());
@@ -608,7 +608,7 @@ class KeyRingEthereumService {
608
608
  throw new router_1.EthereumProviderRpcError(-32602, "Must provide a single object parameter.");
609
609
  }
610
610
  const evmChainId = (0, helper_1.validateEVMChainId)(parseInt(param.chainId, 16));
611
- const chainInfo = (_c = this.chainsService.getChainInfoByEVMChainId(evmChainId)) !== null && _c !== void 0 ? _c : (yield (() => __awaiter(this, void 0, void 0, function* () {
611
+ const chainInfo = (_a = this.chainsService.getChainInfoByEVMChainId(evmChainId)) !== null && _a !== void 0 ? _a : (yield (() => __awaiter(this, void 0, void 0, function* () {
612
612
  const rpc = param.rpcUrls.find((url) => {
613
613
  try {
614
614
  const urlObject = new URL(url);
@@ -817,6 +817,56 @@ class KeyRingEthereumService {
817
817
  const evmInfo = this.chainsService.getEVMInfoOrThrow(chainId);
818
818
  return evmInfo.chainId;
819
819
  }
820
+ toHexQty(x) {
821
+ if (x === undefined || x === null) {
822
+ return undefined;
823
+ }
824
+ if (typeof x === "bigint") {
825
+ return `0x${x.toString(16)}`;
826
+ }
827
+ if (typeof x === "number") {
828
+ const n = Number.isFinite(x) ? Math.max(0, Math.floor(x)) : 0;
829
+ return `0x${n.toString(16)}`;
830
+ }
831
+ x = x.trim();
832
+ if (x.length === 0 || x === "0x") {
833
+ return undefined;
834
+ }
835
+ let q;
836
+ try {
837
+ q = BigInt(x);
838
+ }
839
+ catch (_a) {
840
+ if (!x.startsWith("0x")) {
841
+ x = `0x${x}`;
842
+ }
843
+ try {
844
+ q = BigInt(x);
845
+ }
846
+ catch (_b) {
847
+ return undefined;
848
+ }
849
+ }
850
+ return `0x${q.toString(16)}`;
851
+ }
852
+ normalizeUnsignedTx(tx, chainId, nonce) {
853
+ const { value, gas, gasLimit, gasPrice, maxFeePerGas, maxPriorityFeePerGas, data } = tx, restTx = __rest(tx, ["value", "gas", "gasLimit", "gasPrice", "maxFeePerGas", "maxPriorityFeePerGas", "data"]);
854
+ const unsignedTx = Object.assign(Object.assign({}, restTx), { value: this.toHexQty(value), gasLimit: this.toHexQty(gasLimit !== null && gasLimit !== void 0 ? gasLimit : gas), gasPrice: this.toHexQty(gasPrice), maxFeePerGas: this.toHexQty(maxFeePerGas), maxPriorityFeePerGas: this.toHexQty(maxPriorityFeePerGas), chainId: this.getEVMChainId(chainId), nonce });
855
+ if (data != null && typeof data === "string") {
856
+ unsignedTx.data = data.startsWith("0x") ? data : `0x${data}`;
857
+ }
858
+ const isLegacy = unsignedTx.gasPrice !== undefined;
859
+ const isEIP1559 = unsignedTx.maxFeePerGas !== undefined &&
860
+ unsignedTx.maxPriorityFeePerGas !== undefined;
861
+ if (isEIP1559) {
862
+ delete unsignedTx.gasPrice;
863
+ }
864
+ else if (isLegacy) {
865
+ delete unsignedTx.maxFeePerGas;
866
+ delete unsignedTx.maxPriorityFeePerGas;
867
+ }
868
+ return unsignedTx;
869
+ }
820
870
  }
821
871
  exports.KeyRingEthereumService = KeyRingEthereumService;
822
872
  //# sourceMappingURL=service.js.map
package/build/keyring-ethereum/service.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/keyring-ethereum/service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/keyring-ethereum/service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA,sCAA0C;AAC1C,wCAA4C;AAG5C,iDAI8B;AAC9B,+CAI6B;AAC7B,iDAAqD;AACrD,oCAAiC;AACjC,sDAK2B;AAC3B,8DAIqC;AACrC,6DAAyD;AACzD,8CAAgF;AAGhF,qCAA8C;AAC9C,+BAAmC;AAEnC,2CAAmE;AAEnE,MAAa,sBAAsB;IAGjC,YACqB,aAA4B,EAC5B,cAA8B;IACjD,2EAA2E;IAC3E,kCAAkC;IACf,oBAA0C,EAC1C,kBAAsC,EACtC,gBAAkC,EAClC,iBAAoC,EACpC,4BAA0D,EAC1D,2BAAwD,EACxD,iBAAoC;QAVpC,kBAAa,GAAb,aAAa,CAAe;QAC5B,mBAAc,GAAd,cAAc,CAAgB;QAG9B,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,iCAA4B,GAA5B,4BAA4B,CAA8B;QAC1D,gCAA2B,GAA3B,2BAA2B,CAA6B;QACxD,sBAAiB,GAAjB,iBAAiB,CAAmB;QAb/C,6BAAwB,GAAG,IAAI,GAAG,EAAqB,CAAC;IAc/D,CAAC;IAEE,IAAI;;YACR,UAAU;QACZ,CAAC;KAAA;IAEK,oBAAoB,CACxB,GAAQ,EACR,MAAc,EACd,OAAe,EACf,MAAc,EACd,OAAmB,EACnB,QAAqB;;YAErB,OAAO,MAAM,IAAI,CAAC,YAAY,CAC5B,GAAG,EACH,MAAM,EACN,IAAI,CAAC,cAAc,CAAC,eAAe,EACnC,OAAO,EACP,MAAM,EACN,OAAO,EACP,QAAQ,CACT,CAAC;QACJ,CAAC;KAAA;IAEK,YAAY,CAChB,GAAQ,EACR,MAAc,EACd,OAAe,EACf,OAAe,EACf,MAAc,EACd,OAAmB,EACnB,QAAqB;;;YAErB,MAAM,SAAS,GAAG,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;YAClE,IAAI,SAAS,CAAC,QAAQ,EAAE;gBACtB,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;aAChD;YACD,MAAM,eAAe,GAAG,wBAAc,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;YAClE,MAAM,OAAO,GAAG,sBAAa,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;YACpD,MAAM,cAAc,GAAG,MAAA,SAAS,CAAC,QAAQ,0CAAE,QAAQ,CACjD,yBAAyB,CAC1B,CAAC;YAEF,IAAI,CAAC,eAAe,IAAI,CAAC,OAAO,EAAE;gBAChC,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;aACrD;YAED,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YACxD,IAAI,CAAC,OAAO,EAAE;gBACZ,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;aAClC;YAED,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,cAAc,EAAE;gBAChD,qCAAoB,CAAC,8CAA8C,CACjE,OAAO,CACR,CAAC;aACH;YAED,IAAI,QAAQ,KAAK,mBAAW,CAAC,WAAW,EAAE;gBACxC,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAC/D,IAAI,UAAU,CAAC,iBAAiB,EAAE;oBAChC,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;iBAC7D;aACF;YAED,IAAI;gBACF,sBAAa,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;aAChC;YAAC,WAAM;gBACN,6BAA6B;gBAC7B,MAAM,GAAG,CACP,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,GAAG,MAAM,CACzD,CAAC,WAAW,EAAE,CAAC;aACjB;YAED,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YACrE,IACE,MAAM,KAAK,GAAG,CAAC,aAAa;gBAC5B,MAAM,KAAK,GAAG,CAAC,kBAAkB,CAAC,WAAW,EAAE,EAC/C;gBACA,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;aACtC;YAED,OAAO,MAAM,IAAI,CAAC,kBAAkB,CAAC,aAAa,CAChD,GAAG,EACH,gBAAgB,EAChB,uBAAuB,EACvB;gBACE,MAAM;gBACN,OAAO;gBACP,MAAM;gBACN,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,OAAO;gBACP,QAAQ;gBACR,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,cAAc,EAAE,OAAO,CAAC,WAAW;aACpC,EACD,CAAO,GAAwD,EAAE,EAAE;gBACjE,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC,GAAS,EAAE;oBACnD,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ,IAAI,OAAO,CAAC,IAAI,KAAK,UAAU,EAAE;wBAC5D,IAAI,CAAC,GAAG,CAAC,SAAS,IAAI,GAAG,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE;4BAChD,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;yBACtD;wBAED,OAAO;4BACL,WAAW,EAAE,GAAG,CAAC,WAAW;4BAC5B,SAAS,EAAE,GAAG,CAAC,SAAS;yBACzB,CAAC;qBACH;yBAAM;wBACL,QAAQ,QAAQ,EAAE;4BAChB,KAAK,mBAAW,CAAC,OAAO,CAAC,CAAC;gCACxB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAC9C,OAAO,EACP,OAAO,EACP,eAAM,CAAC,MAAM,CAAC;oCACZ,eAAM,CAAC,IAAI,CAAC,gCAAgC,CAAC;oCAC7C,eAAM,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;oCAC9C,GAAG,CAAC,WAAW;iCAChB,CAAC,EACF,WAAW,CACZ,CAAC;gCAEF,OAAO;oCACL,WAAW,EAAE,GAAG,CAAC,WAAW;oCAC5B,SAAS,EAAE,eAAM,CAAC,MAAM,CAAC;wCACvB,SAAS,CAAC,CAAC;wCACX,SAAS,CAAC,CAAC;wCACX,8FAA8F;wCAC9F,SAAS,CAAC,CAAC;4CACT,CAAC,CAAC,eAAM,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC;4CAC1B,CAAC,CAAC,eAAM,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC;qCAC7B,CAAC;iCACH,CAAC;6BACH;4BACD,KAAK,mBAAW,CAAC,WAAW,CAAC,CAAC;gCAC5B,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAC3B,eAAM,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CACxC,CAAC;gCAEF,MAAM,SAAS,GACb,CAAC,CAAC,UAAU,CAAC,YAAY;oCACzB,CAAC,CAAC,UAAU,CAAC,oBAAoB,CAAC;gCACpC,IAAI,SAAS,EAAE;oCACb,UAAU,CAAC,IAAI,GAAG,+BAAgB,CAAC,OAAO,CAAC;iCAC5C;gCAED,OAAO,UAAU,CAAC,IAAI,CAAC;gCAEvB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAC9C,OAAO,EACP,OAAO,EACP,eAAM,CAAC,IAAI,CAAC,IAAA,wBAAS,EAAC,UAAU,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,KAAK,CAAC,EAC3D,WAAW,CACZ,CAAC;gCAEF,OAAO;oCACL,WAAW,EAAE,GAAG,CAAC,WAAW;oCAC5B,SAAS,EAAE,eAAM,CAAC,MAAM,CAAC;wCACvB,SAAS,CAAC,CAAC;wCACX,SAAS,CAAC,CAAC;wCACX,8FAA8F;wCAC9F,SAAS,CAAC,CAAC;4CACT,CAAC,CAAC,eAAM,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC;4CAC1B,CAAC,CAAC,eAAM,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC;qCAC7B,CAAC;iCACH,CAAC;6BACH;4BACD,KAAK,mBAAW,CAAC,MAAM,CAAC,CAAC;gCACvB,MAAM,IAAI,GAAG,MAAM,uCAAsB,CAAC,aAAa,CACrD,IAAI,CAAC,KAAK,CAAC,eAAM,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CAAC,CACpD,CAAC;gCACF,6FAA6F;gCAC7F,6DAA6D;gCAC7D,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAC9C,OAAO,EACP,OAAO,EACP,eAAM,CAAC,MAAM,CAAC;oCACZ,gBAAgB;oCAChB,eAAM,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC;oCACxB,aAAa;oCACb,eAAM,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC;oCACxB,eAAM,CAAC,IAAI,CAAC,IAAA,2BAAU,EAAC,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,KAAK,CAAC;oCACtD,eAAM,CAAC,IAAI,CAAC,IAAA,4BAAW,EAAC,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,KAAK,CAAC;iCACxD,CAAC,EACF,WAAW,CACZ,CAAC;gCAEF,OAAO;oCACL,WAAW,EAAE,GAAG,CAAC,WAAW;oCAC5B,SAAS,EAAE,eAAM,CAAC,MAAM,CAAC;wCACvB,SAAS,CAAC,CAAC;wCACX,SAAS,CAAC,CAAC;wCACX,8FAA8F;wCAC9F,SAAS,CAAC,CAAC;4CACT,CAAC,CAAC,eAAM,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC;4CAC1B,CAAC,CAAC,eAAM,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC;qCAC7B,CAAC;iCACH,CAAC;6BACH;4BACD;gCACE,MAAM,IAAI,KAAK,CAAC,sBAAsB,QAAQ,EAAE,CAAC,CAAC;yBACrD;qBACF;gBACH,CAAC,CAAA,CAAC,EAAE,CAAC;gBAEL,IAAI;oBACF,MAAM,EAAE,GACN,QAAQ,KAAK,mBAAW,CAAC,WAAW;wBAClC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,eAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CAAC;wBACjD,CAAC,CAAC,SAAS,CAAC;oBAChB,MAAM,SAAS,GAAG,MAAM,CAAC,GAAS,EAAE;;wBAClC,IAAI,QAAQ,KAAK,mBAAW,CAAC,WAAW,EAAE;4BACxC,OAAO;yBACR;wBAED,IAAI,EAAE,CAAC,EAAE,IAAI,IAAI,IAAI,EAAE,CAAC,EAAE,KAAK,IAAI,EAAE;4BACnC,OAAO,iBAAiB,CAAC;yBAC1B;wBAED,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,OAAO,CACzC,GAAG,EACH,MAAM,EACN,aAAa,EACb,CAAC,EAAE,CAAC,EAAE,EAAE,QAAQ,CAAC,EACjB,SAAS,EACT,OAAO,CACR,CAAC;wBACF,IACE,CAAC,EAAE,CAAC,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC,IAAI,KAAK,IAAI,CAAC;4BACrC,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC;4BACpB,gBAAgB,KAAK,IAAI,EACzB;4BACA,OAAO,aAAa,CAAC;yBACtB;wBAED,IAAI,MAAA,EAAE,CAAC,IAAI,0CAAE,UAAU,CAAC,YAAY,CAAC,EAAE;4BACrC,OAAO,6BAA6B,CAAC;yBACtC;wBAED,OAAO,kBAAkB,CAAC;oBAC5B,CAAC,CAAA,CAAC,EAAE,CAAC;oBAEL,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,eAAe,gCACvD,OAAO,EACP,UAAU,EAAE,GAAG,CAAC,aAAa,EAC7B,MAAM,EACN,OAAO,EAAE,OAAO,CAAC,IAAI,EACrB,WAAW,EAAE,QAAQ,IAClB,CAAC,QAAQ,KAAK,mBAAW,CAAC,WAAW,IAAI;wBAC1C,SAAS;qBACV,CAAC,GACC,CAAC,SAAS;wBACX,SAAS,CAAC,UAAU,CAAC,kBAAkB,CAAC;wBACxC,EAAE,IAAI;wBACJ,eAAe,EAAE,EAAE,CAAC,EAAE;qBACvB,CAAC,EACJ,CAAC;iBACJ;gBAAC,OAAO,CAAC,EAAE;oBACV,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;iBAChB;gBAED,OAAO;oBACL,WAAW;oBACX,SAAS;iBACV,CAAC;YACJ,CAAC,CAAA,CACF,CAAC;;KACH;IAEK,OAAO,CACX,GAAQ,EACR,MAAc,EACd,MAAc,EACd,MAA4C,EAC5C,UAAmB,EACnB,OAAgB;;YAEhB,IAAI,GAAG,CAAC,aAAa,IAAI,OAAO,IAAI,IAAI,EAAE;gBACxC,MAAM,IAAI,KAAK,CACb,yDAAyD,CAC1D,CAAC;aACH;YAED,MAAM,MAAM,GAAG,CAAC,MAAM,CAAC,GAAS,EAAE;;gBAChC,QAAQ,MAAM,EAAE;oBACd,KAAK,yBAAyB,CAAC,CAAC;wBAC9B,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;wBAC/D,IAAI,cAAc,IAAI,IAAI,EAAE;4BAC1B,OAAO;gCACL,iBAAiB,EAAE,IAAI;gCACvB,cAAc,EAAE,IAAI;gCACpB,eAAe,EAAE,IAAI;6BACjB,CAAC;yBACR;wBAED,IAAI;4BACF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,iBAAiB,CACxD,cAAc,CACf,CAAC;4BACF,MAAM,eAAe,GAAG,KAAK,eAAM,CAAC,IAAI,CACtC,MAAM,CAAC,aAAa,EAAE,CACvB,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;4BAEpB,OAAO;gCACL,iBAAiB,EAAE,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;gCACrD,cAAc,EAAE,cAAc;gCAC9B,eAAe;6BAChB,CAAC;yBACH;wBAAC,OAAO,CAAC,EAAE;4BACV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;4BACjB,OAAO,IAAI,CAAC;yBACb;qBACF;oBACD,KAAK,eAAe,CAAC,CAAC;wBACpB,IAAI;4BACF,MAAM,cAAc,GAAG,IAAI,CAAC,sBAAsB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;4BACpE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,iBAAiB,CACxD,cAAc,CACf,CAAC;4BACF,MAAM,eAAe,GAAG,KAAK,eAAM,CAAC,IAAI,CACtC,MAAM,CAAC,aAAa,EAAE,CACvB,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;4BAEpB,OAAO;gCACL,iBAAiB,EAAE,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;gCACrD,cAAc,EAAE,cAAc;gCAC9B,eAAe;6BAChB,CAAC;yBACH;wBAAC,OAAO,CAAC,EAAE;4BACV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;4BACjB,OAAO,IAAI,CAAC;yBACb;qBACF;oBACD,KAAK,kBAAkB,CAAC,CAAC;wBACvB,OAAO,IAAI,CAAC,iBAAiB,CAAC,uBAAuB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;qBACjE;oBACD,KAAK,aAAa,CAAC,CAAC;wBAClB,MAAM,cAAc,GAAG,IAAI,CAAC,sBAAsB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;wBACpE,OAAO,KAAK,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;qBAC/D;oBACD,KAAK,aAAa,CAAC,CAAC;wBAClB,MAAM,cAAc,GAAG,IAAI,CAAC,sBAAsB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;wBACpE,OAAO,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC,QAAQ,EAAE,CAAC;qBACtD;oBACD,KAAK,cAAc,CAAC,CAAC;wBACnB,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;wBAC/D,IAAI,cAAc,IAAI,IAAI,EAAE;4BAC1B,OAAO,EAAO,CAAC;yBAChB;wBAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,iBAAiB,CACxD,cAAc,CACf,CAAC;wBACF,MAAM,eAAe,GAAG,KAAK,eAAM,CAAC,IAAI,CACtC,MAAM,CAAC,aAAa,EAAE,CACvB,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;wBAEpB,OAAO,CAAC,eAAe,CAAC,CAAC;qBAC1B;oBACD,KAAK,qBAAqB,CAAC,CAAC;wBAC1B,MAAM,cAAc,GAAG,IAAI,CAAC,sBAAsB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;wBACpE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,iBAAiB,CACxD,cAAc,CACf,CAAC;wBACF,MAAM,eAAe,GAAG,KAAK,eAAM,CAAC,IAAI,CACtC,MAAM,CAAC,aAAa,EAAE,CACvB,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;wBAEpB,OAAO,CAAC,eAAe,CAAC,CAAC;qBAC1B;oBACD,KAAK,qBAAqB,CAAC,CAAC;wBAC1B,MAAM,EAAE,GACN,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;6BACnB,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAG,CAAC,CAcT,CAAA,CAAC;4BACL,IAAI,CAAC;wBACP,IAAI,CAAC,EAAE,EAAE;4BACP,MAAM,IAAI,iCAAwB,CAChC,CAAC,KAAK,EACN,6BAA6B,CAC9B,CAAC;yBACH;wBAED,MAAM,cAAc,GAAG,IAAI,CAAC,sBAAsB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;wBAEpE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,iBAAiB,KAAgB,EAAE,EAAb,MAAM,UAAK,EAAE,EAAnD,6BAA8C,CAAK,CAAC;wBAE1D,IAAI,iBAAiB,EAAE;4BACrB,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;yBAC7D;wBAED,IAAI,EAAE,CAAC,OAAO,EAAE;4BACd,MAAM,gBAAgB,GAAW,IAAA,2BAAkB,EACjD,CAAC,GAAG,EAAE;gCACJ,IAAI,OAAO,EAAE,CAAC,OAAO,KAAK,QAAQ,EAAE;oCAClC,IAAI,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;wCAC/B,OAAO,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;qCACjC;yCAAM;wCACL,OAAO,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;qCACjC;iCACF;qCAAM;oCACL,OAAO,EAAE,CAAC,OAAO,CAAC;iCACnB;4BACH,CAAC,CAAC,EAAE,CACL,CAAC;4BACF,IAAI,gBAAgB,KAAK,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,EAAE;gCAC3D,MAAM,IAAI,KAAK,CACb,wEAAwE,CACzE,CAAC;6BACH;yBACF;wBAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,iBAAiB,CACxD,cAAc,CACf,CAAC;wBACF,MAAM,eAAe,GAAG,KAAK,eAAM,CAAC,IAAI,CACtC,MAAM,CAAC,aAAa,EAAE,CACvB,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;wBAEpB,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,OAAO,CACzC,GAAG,EACH,MAAM,EACN,yBAAyB,EACzB,CAAC,eAAe,EAAE,SAAS,CAAC,EAC5B,UAAU,EACV,OAAO,CACR,CAAC;wBACF,MAAM,KAAK,GAAG,QAAQ,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC;wBAE7C,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,CACzC,MAAM,EACN,cAAc,EACd,KAAK,CACN,CAAC;wBAEF,IAAI;4BACF,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAChE,GAAG,EACH,MAAM,EACN,cAAc,EACd,MAAM,EACN,eAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,EACvC,mBAAW,CAAC,WAAW,CACxB,CAAC;4BAEF,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,eAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;4BAElE,MAAM,SAAS,GACb,CAAC,CAAC,SAAS,CAAC,YAAY,IAAI,CAAC,CAAC,SAAS,CAAC,oBAAoB,CAAC;4BAC/D,IAAI,SAAS,EAAE;gCACb,SAAS,CAAC,IAAI,GAAG,+BAAgB,CAAC,OAAO,CAAC;6BAC3C;4BAED,MAAM,QAAQ,GAAG,eAAM,CAAC,IAAI,CAC1B,IAAA,wBAAS,EAAC,SAAS,EAAE,SAAS,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,EACjD,KAAK,CACN,CAAC;4BAEF,MAAM,MAAM,GACV,MAAM,IAAI,CAAC,2BAA2B,CAAC,cAAc,CACnD,MAAM,EACN,cAAc,EACd,QAAQ,EACR,EAAE,CACH,CAAC;4BAEJ,OAAO,MAAM,CAAC;yBACf;wBAAC,OAAO,CAAC,EAAE;4BACV,IACE,CAAC,CAAC,YAAY,KAAK,IAAI,CAAC,CAAC,OAAO,KAAK,kBAAkB,CAAC;gCACxD,CAAC,KAAK,kBAAkB,EACxB;gCACA,MAAM,IAAI,iCAAwB,CAAC,IAAI,EAAE,uBAAuB,CAAC,CAAC;6BACnE;4BACD,MAAM,CAAC,CAAC;yBACT;qBACF;oBACD,KAAK,qBAAqB,CAAC,CAAC;wBAC1B,MAAM,EAAE,GACN,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;6BACnB,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAG,CAAC,CAcT,CAAA,CAAC;4BACL,IAAI,CAAC;wBACP,IAAI,CAAC,EAAE,EAAE;4BACP,MAAM,IAAI,iCAAwB,CAChC,CAAC,KAAK,EACN,6BAA6B,CAC9B,CAAC;yBACH;wBAED,MAAM,cAAc,GAAG,IAAI,CAAC,sBAAsB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;wBAEpE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,iBAAiB,KAAgB,EAAE,EAAb,MAAM,UAAK,EAAE,EAAnD,6BAA8C,CAAK,CAAC;wBAE1D,IAAI,iBAAiB,EAAE;4BACrB,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;yBAC7D;wBAED,IAAI,EAAE,CAAC,OAAO,EAAE;4BACd,MAAM,gBAAgB,GAAW,IAAA,2BAAkB,EACjD,CAAC,GAAG,EAAE;gCACJ,IAAI,OAAO,EAAE,CAAC,OAAO,KAAK,QAAQ,EAAE;oCAClC,IAAI,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;wCAC/B,OAAO,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;qCACjC;yCAAM;wCACL,OAAO,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;qCACjC;iCACF;qCAAM;oCACL,OAAO,EAAE,CAAC,OAAO,CAAC;iCACnB;4BACH,CAAC,CAAC,EAAE,CACL,CAAC;4BACF,IAAI,gBAAgB,KAAK,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,EAAE;gCAC3D,MAAM,IAAI,KAAK,CACb,wEAAwE,CACzE,CAAC;6BACH;yBACF;wBAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,iBAAiB,CACxD,cAAc,CACf,CAAC;wBACF,MAAM,eAAe,GAAG,KAAK,eAAM,CAAC,IAAI,CACtC,MAAM,CAAC,aAAa,EAAE,CACvB,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;wBAEpB,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,OAAO,CACzC,GAAG,EACH,MAAM,EACN,yBAAyB,EACzB,CAAC,eAAe,EAAE,SAAS,CAAC,EAC5B,UAAU,EACV,OAAO,CACR,CAAC;wBACF,MAAM,KAAK,GAAG,QAAQ,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC;wBAE7C,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,CACzC,MAAM,EACN,cAAc,EACd,KAAK,CACN,CAAC;wBAEF,IAAI;4BACF,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAChE,GAAG,EACH,MAAM,EACN,cAAc,EACd,MAAM,EACN,eAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,EACvC,mBAAW,CAAC,WAAW,CACxB,CAAC;4BAEF,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,eAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;4BAElE,MAAM,SAAS,GACb,CAAC,CAAC,SAAS,CAAC,YAAY,IAAI,CAAC,CAAC,SAAS,CAAC,oBAAoB,CAAC;4BAC/D,IAAI,SAAS,EAAE;gCACb,SAAS,CAAC,IAAI,GAAG,+BAAgB,CAAC,OAAO,CAAC;6BAC3C;4BAED,MAAM,QAAQ,GAAG,IAAA,wBAAS,EAAC,SAAS,EAAE,SAAS,CAAC,CAAC;4BAEjD,OAAO,QAAQ,CAAC;yBACjB;wBAAC,OAAO,CAAC,EAAE;4BACV,IACE,CAAC,CAAC,YAAY,KAAK,IAAI,CAAC,CAAC,OAAO,KAAK,kBAAkB,CAAC;gCACxD,CAAC,KAAK,kBAAkB,EACxB;gCACA,MAAM,IAAI,iCAAwB,CAAC,IAAI,EAAE,uBAAuB,CAAC,CAAC;6BACnE;4BACD,MAAM,CAAC,CAAC;yBACT;qBACF;oBACD,KAAK,eAAe,CAAC,CAAC;wBACpB,MAAM,OAAO,GACX,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAG,CAAC,CAAY,CAAA,CAAC,IAAI,SAAS,CAAC;wBAClE,IAAI,CAAC,OAAO,EAAE;4BACZ,MAAM,IAAI,iCAAwB,CAChC,CAAC,KAAK,EACN,qCAAqC,CACtC,CAAC;yBACH;wBAED,MAAM,MAAM,GACV,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAG,CAAC,CAAY,CAAA,CAAC,IAAI,SAAS,CAAC;wBAClE,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,EAAE;4BAC5D,MAAM,IAAI,iCAAwB,CAChC,CAAC,KAAK,EACN,mCAAmC,CACpC,CAAC;yBACH;wBAED,MAAM,cAAc,GAAG,IAAI,CAAC,sBAAsB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;wBACpE,IAAI;4BACF,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,IAAI,CAAC,oBAAoB,CACnD,GAAG,EACH,MAAM,EACN,cAAc,EACd,MAAM,EACN,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC;gCACtB,CAAC,CAAC,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC;gCACtC,CAAC,CAAC,eAAM,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,EAChC,mBAAW,CAAC,OAAO,CACpB,CAAC;4BAEF,OAAO,KAAK,eAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;yBACtD;wBAAC,OAAO,CAAC,EAAE;4BACV,IACE,CAAC,CAAC,YAAY,KAAK,IAAI,CAAC,CAAC,OAAO,KAAK,kBAAkB,CAAC;gCACxD,CAAC,KAAK,kBAAkB,EACxB;gCACA,MAAM,IAAI,iCAAwB,CAAC,IAAI,EAAE,uBAAuB,CAAC,CAAC;6BACnE;4BACD,MAAM,CAAC,CAAC;yBACT;qBACF;oBACD,KAAK,sBAAsB,CAAC,CAAC,yBAAyB;oBACtD,KAAK,sBAAsB,CAAC,CAAC;wBAC3B,MAAM,MAAM,GACV,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAG,CAAC,CAAY,CAAA,CAAC,IAAI,SAAS,CAAC;wBAClE,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,EAAE;4BAC5D,MAAM,IAAI,iCAAwB,CAChC,CAAC,KAAK,EACN,mCAAmC,CACpC,CAAC;yBACH;wBAED,MAAM,SAAS,GACb,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAG,CAAC,CAAS,CAAA,CAAC,IAAI,SAAS,CAAC;wBAE/D,MAAM,cAAc,GAAG,IAAI,CAAC,sBAAsB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;wBAEpE,MAAM,EAAE,KAAK,EAAE,kBAAkB,EAAE,KAAK,EAAE,GACxC,uCAAsB,CAAC,QAAQ,CAC7B,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAClE,CAAC;wBACJ,IAAI,KAAK,EAAE;4BACT,MAAM,IAAI,iCAAwB,CAChC,CAAC,KAAK,EACN,yCAAyC,CAC1C,CAAC;yBACH;wBAED,MAAM,iBAAiB,GAAG,kBAAkB,CAAC,MAAM,CAAC,SAAS,CAGhD,CAAC;wBACd,IAAI,iBAAiB,KAAK,SAAS,EAAE;4BACnC,MAAM,uBAAuB,GAAG,IAAA,2BAAkB,EAChD,OAAO,iBAAiB,KAAK,QAAQ;gCACnC,CAAC,CAAC,QAAQ,CAAC,iBAAiB,CAAC;gCAC7B,CAAC,CAAC,iBAAiB,CACtB,CAAC;4BACF,MAAM,oBAAoB,GAAG,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC;4BAEhE,IAAI,uBAAuB,KAAK,oBAAoB,EAAE;gCACpD,MAAM,IAAI,iCAAwB,CAChC,CAAC,KAAK,EACN,+BAA+B,oBAAoB,yCAAyC,uBAAuB,GAAG,CACvH,CAAC;6BACH;yBACF;wBAED,IAAI;4BACF,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,IAAI,CAAC,oBAAoB,CACnD,GAAG,EACH,MAAM,EACN,cAAc,EACd,MAAM,EACN,eAAM,CAAC,IAAI,CACT,OAAO,SAAS,KAAK,QAAQ;gCAC3B,CAAC,CAAC,SAAS;gCACX,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAC9B,EACD,mBAAW,CAAC,MAAM,CACnB,CAAC;4BAEF,OAAO,KAAK,eAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;yBACtD;wBAAC,OAAO,CAAC,EAAE;4BACV,IACE,CAAC,CAAC,YAAY,KAAK,IAAI,CAAC,CAAC,OAAO,KAAK,kBAAkB,CAAC;gCACxD,CAAC,KAAK,kBAAkB,EACxB;gCACA,MAAM,IAAI,iCAAwB,CAAC,IAAI,EAAE,uBAAuB,CAAC,CAAC;6BACnE;4BACD,MAAM,CAAC,CAAC;yBACT;qBACF;oBACD,KAAK,eAAe,CAAC,CAAC;wBACpB,MAAM,cAAc,GAAG,IAAI,CAAC,sBAAsB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;wBACpE,MAAM,mBAAmB,GACvB,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC;wBACvD,IAAI,CAAC,mBAAmB,CAAC,SAAS,EAAE;4BAClC,MAAM,IAAI,KAAK,CACb,sEAAsE,CACvE,CAAC;yBACH;wBAED,MAAM,EAAE,GAAG,IAAI,SAAS,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;wBACxD,MAAM,cAAc,GAAW,MAAM,IAAI,OAAO,CAC9C,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;4BAClB,MAAM,UAAU,GAAG,GAAG,EAAE;gCACtB,EAAE,CAAC,IAAI,CACL,IAAI,CAAC,SAAS,CAAC;oCACb,OAAO,EAAE,KAAK;oCACd,EAAE,EAAE,CAAC;oCACL,MAAM;oCACN,MAAM;iCACP,CAAC,CACH,CAAC;4BACJ,CAAC,CAAC;4BACF,MAAM,aAAa,GAAG,CAAC,KAAmB,EAAE,EAAE;gCAC5C,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gCACzC,IAAI,SAAS,CAAC,KAAK,EAAE;oCACnB,EAAE,CAAC,KAAK,EAAE,CAAC;oCAEX,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;iCACzB;qCAAM;oCACL,IAAI,SAAS,CAAC,MAAM,KAAK,kBAAkB,EAAE;wCAC3C,IAAI,CAAC,kBAAkB,CAAC,aAAa,CACnC,qBAAY,EACZ,uBAAuB,EACvB;4CACE,MAAM;4CACN,UAAU;4CACV,IAAI,EAAE;gDACJ,YAAY,EAAE,SAAS,CAAC,MAAM,CAAC,YAAY;gDAC3C,MAAM,EAAE,SAAS,CAAC,MAAM,CAAC,MAAM;6CAChC;yCACF,CACF,CAAC;qCACH;yCAAM;wCACL,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;qCAC3B;iCACF;4BACH,CAAC,CAAC;4BACF,MAAM,WAAW,GAAG,GAAG,EAAE;gCACvB,EAAE,CAAC,KAAK,EAAE,CAAC;gCAEX,MAAM,CACJ,IAAI,KAAK,CACP,oDAAoD,CACrD,CACF,CAAC;4BACJ,CAAC,CAAC;4BAEF,EAAE,CAAC,gBAAgB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;4BACxC,EAAE,CAAC,gBAAgB,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;4BAC9C,EAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;4BAC1C,EAAE,CAAC,gBAAgB,CACjB,OAAO,EACP,GAAG,EAAE;gCACH,EAAE,CAAC,mBAAmB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;gCAC3C,EAAE,CAAC,mBAAmB,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;gCACjD,EAAE,CAAC,mBAAmB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;4BAC/C,CAAC,EACD,EAAE,IAAI,EAAE,IAAI,EAAE,CACf,CAAC;wBACJ,CAAC,CACF,CAAC;wBACF,IAAA,kBAAW,EAAC,GAAG,EAAE;4BACf,MAAM,GAAG,GAAG,GAAG,cAAc,IAAI,UAAU,EAAE,CAAC;4BAC9C,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;wBAC7C,CAAC,CAAC,CAAC;wBAEH,OAAO,cAAc,CAAC;qBACvB;oBACD,KAAK,iBAAiB,CAAC,CAAC;wBACtB,MAAM,cAAc,GAClB,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAG,CAAC,CAAY,CAAA,CAAC,IAAI,SAAS,CAAC;wBAClE,IAAI,CAAC,cAAc,EAAE;4BACnB,MAAM,IAAI,iCAAwB,CAChC,CAAC,KAAK,EACN,iCAAiC,CAClC,CAAC;yBACH;wBAED,MAAM,cAAc,GAAG,IAAI,CAAC,sBAAsB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;wBACpE,MAAM,mBAAmB,GACvB,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC;wBACvD,IAAI,CAAC,mBAAmB,CAAC,SAAS,EAAE;4BAClC,MAAM,IAAI,KAAK,CACb,sEAAsE,CACvE,CAAC;yBACH;wBAED,MAAM,YAAY,GAChB,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;wBACpD,IAAI,CAAC,YAAY,EAAE;4BACjB,OAAO,KAAK,CAAC;yBACd;wBAED,MAAM,EAAE,GAAG,IAAI,SAAS,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;wBACxD,MAAM,MAAM,GAAG,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;4BACnD,MAAM,UAAU,GAAG,GAAG,EAAE;gCACtB,EAAE,CAAC,IAAI,CACL,IAAI,CAAC,SAAS,CAAC;oCACb,OAAO,EAAE,KAAK;oCACd,EAAE,EAAE,CAAC;oCACL,MAAM;oCACN,MAAM;iCACP,CAAC,CACH,CAAC;4BACJ,CAAC,CAAC;4BACF,MAAM,aAAa,GAAG,CAAC,KAAmB,EAAE,EAAE;gCAC5C,EAAE,CAAC,KAAK,EAAE,CAAC;gCAEX,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gCACzC,IAAI,SAAS,CAAC,KAAK,EAAE;oCACnB,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;iCACzB;qCAAM;oCACL,YAAY,CAAC,KAAK,EAAE,CAAC;oCACrB,IAAA,kBAAW,EAAC,GAAG,EAAE;wCACf,MAAM,GAAG,GAAG,GAAG,cAAc,IAAI,UAAU,EAAE,CAAC;wCAC9C,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;oCAC5C,CAAC,CAAC,CAAC;oCACH,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;iCAC3B;4BACH,CAAC,CAAC;4BACF,MAAM,WAAW,GAAG,GAAG,EAAE;gCACvB,EAAE,CAAC,KAAK,EAAE,CAAC;gCAEX,MAAM,CACJ,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAChE,CAAC;4BACJ,CAAC,CAAC;4BAEF,EAAE,CAAC,gBAAgB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;4BACxC,EAAE,CAAC,gBAAgB,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;4BAC9C,EAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;4BAC1C,EAAE,CAAC,gBAAgB,CACjB,OAAO,EACP,GAAG,EAAE;gCACH,EAAE,CAAC,mBAAmB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;gCAC3C,EAAE,CAAC,mBAAmB,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;gCACjD,EAAE,CAAC,mBAAmB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;4BAC/C,CAAC,EACD,EAAE,IAAI,EAAE,IAAI,EAAE,CACf,CAAC;wBACJ,CAAC,CAAC,CAAC;wBAEH,OAAO,MAAM,CAAC;qBACf;oBACD,KAAK,4BAA4B,CAAC,CAAC;wBACjC,MAAM,iBAAiB,GAAG,IAAI,CAAC,+BAA+B,CAC5D,MAAM,EACN,MAAM,CACP,CAAC;wBACF,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;wBAC/D;wBACE,sHAAsH;wBACtH,iBAAiB,IAAI,IAAI;4BACzB,cAAc,KAAK,iBAAiB,EACpC;4BACA,OAAO,IAAI,CAAC;yBACb;wBAED,IAAI;4BACF,MAAM,IAAI,CAAC,iBAAiB,CAAC,0BAA0B,CACrD,GAAG,EACH,MAAM,EACN,iBAAiB,CAClB,CAAC;yBACH;wBAAC,OAAO,CAAC,EAAE;4BACV,IACE,CAAC,CAAC,YAAY,KAAK,IAAI,CAAC,CAAC,OAAO,KAAK,kBAAkB,CAAC;gCACxD,CAAC,KAAK,kBAAkB,EACxB;gCACA,MAAM,IAAI,iCAAwB,CAAC,IAAI,EAAE,uBAAuB,CAAC,CAAC;6BACnE;4BACD,MAAM,CAAC,CAAC;yBACT;wBAED,OAAO,IAAI,CAAC;qBACb;oBACD,KAAK,yBAAyB,CAAC,CAAC;wBAC9B,MAAM,KAAK,GACT,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;6BACpB,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAG,CAAC,CAUT,CAAA,CAAC;wBACL,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;4BACvC,MAAM,IAAI,iCAAwB,CAChC,CAAC,KAAK,EACN,yCAAyC,CAC1C,CAAC;yBACH;wBAED,MAAM,UAAU,GAAG,IAAA,2BAAkB,EAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;wBAEnE,MAAM,SAAS,GACb,MAAA,IAAI,CAAC,aAAa,CAAC,wBAAwB,CAAC,UAAU,CAAC,mCACvD,CAAC,MAAM,CAAC,GAAS,EAAE;4BACjB,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;gCACrC,IAAI;oCACF,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;oCAC/B,OAAO,CACL,SAAS,CAAC,QAAQ,KAAK,OAAO;wCAC9B,SAAS,CAAC,QAAQ,KAAK,QAAQ,CAChC,CAAC;iCACH;gCAAC,WAAM;oCACN,OAAO,KAAK,CAAC;iCACd;4BACH,CAAC,CAAC,CAAC;4BACH,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;gCAC3C,IAAI;oCACF,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;oCAC/B,OAAO,CACL,SAAS,CAAC,QAAQ,KAAK,KAAK;wCAC5B,SAAS,CAAC,QAAQ,KAAK,MAAM,CAC9B,CAAC;iCACH;gCAAC,WAAM;oCACN,OAAO,KAAK,CAAC;iCACd;4BACH,CAAC,CAAC,CAAC;4BACH,4GAA4G;4BAC5G,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;4BAEtD,MAAM,eAAe,GAAG;gCACtB,GAAG;gCACH,IAAI,EAAE,GAAG;gCACT,OAAO,EAAE,UAAU,UAAU,EAAE;gCAC/B,KAAK,EAAE;oCACL,QAAQ,EAAE,EAAE;iCACb;gCACD,SAAS;gCACT,aAAa,EAAE;oCACb,SAAS,EAAE,cAAc,CAAC,MAAM;oCAChC,gBAAgB,EAAE,cAAc,CAAC,MAAM;oCACvC,YAAY,EAAE,cAAc,CAAC,QAAQ;iCACtC;gCACD,UAAU,EAAE;oCACV;wCACE,SAAS,EAAE,cAAc,CAAC,MAAM;wCAChC,gBAAgB,EAAE,cAAc,CAAC,MAAM;wCACvC,YAAY,EAAE,cAAc,CAAC,QAAQ;qCACtC;iCACF;gCACD,aAAa,EAAE;oCACb;wCACE,SAAS,EAAE,cAAc,CAAC,MAAM;wCAChC,gBAAgB,EAAE,cAAc,CAAC,MAAM;wCACvC,YAAY,EAAE,cAAc,CAAC,QAAQ;qCACtC;iCACF;gCACD,GAAG,EAAE;oCACH,OAAO,EAAE,UAAU;oCACnB,GAAG;oCACH,SAAS;iCACV;gCACD,QAAQ,EAAE,CAAC,iBAAiB,EAAE,cAAc,CAAC;gCAC7C,mBAAmB,EACjB,QAAQ,IAAI,OAAO,QAAQ,CAAC,CAAC,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;oCAC1D,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;oCACb,CAAC,CAAC,SAAS;gCACf,IAAI,EAAE,IAAI;6BACE,CAAC;4BAEf,IAAI;gCACF,MAAM,IAAI,CAAC,aAAa,CAAC,gBAAgB,CACvC,GAAG,EACH,eAAe,EACf,MAAM,CACP,CAAC;6BACH;4BAAC,OAAO,CAAC,EAAE;gCACV,IACE,CAAC,CAAC,YAAY,KAAK,IAAI,CAAC,CAAC,OAAO,KAAK,kBAAkB,CAAC;oCACxD,CAAC,KAAK,kBAAkB,EACxB;oCACA,MAAM,IAAI,iCAAwB,CAChC,IAAI,EACJ,uBAAuB,CACxB,CAAC;iCACH;gCACD,MAAM,CAAC,CAAC;6BACT;4BAED,OAAO,eAAe,CAAC;wBACzB,CAAC,CAAA,CAAC,EAAE,CAAC,CAAC;wBAER,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAClC,CAAC,SAAS,CAAC,OAAO,CAAC,EACnB,IAAA,yCAA4B,GAAE,EAC9B,CAAC,MAAM,CAAC,CACT,CAAC;wBAEF,IAAI;4BACF,MAAM,IAAI,CAAC,iBAAiB,CAAC,0BAA0B,CACrD,GAAG,EACH,MAAM,EACN,SAAS,CAAC,OAAO,CAClB,CAAC;yBACH;wBAAC,OAAO,CAAC,EAAE;4BACV,IACE,CAAC,CAAC,YAAY,KAAK,IAAI,CAAC,CAAC,OAAO,KAAK,kBAAkB,CAAC;gCACxD,CAAC,KAAK,kBAAkB,EACxB;gCACA,MAAM,IAAI,iCAAwB,CAAC,IAAI,EAAE,uBAAuB,CAAC,CAAC;6BACnE;4BACD,MAAM,CAAC,CAAC;yBACT;wBAED,OAAO,IAAI,CAAC;qBACb;oBACD,KAAK,uBAAuB,CAAC;oBAC7B,mFAAmF;oBACnF,gEAAgE;oBAChE,KAAK,2BAA2B,CAAC,CAAC;wBAChC,OAAO,CAAC,EAAE,gBAAgB,EAAE,cAAc,EAAE,CAAC,CAAC;qBAC/C;oBACD,KAAK,0BAA0B,CAAC,CAAC;wBAC/B,MAAM,KAAK,GACT,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAG,CAAC,CAA4B,CAAA,CAAC;wBACnE,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;4BACvC,MAAM,IAAI,iCAAwB,CAChC,CAAC,KAAK,EACN,yCAAyC,CAC1C,CAAC;yBACH;wBAED,IAAI,KAAK,CAAC,cAAc,CAAC,IAAI,IAAI,EAAE;4BACjC,MAAM,IAAI,iCAAwB,CAChC,CAAC,KAAK,EACN,qEAAqE,CACtE,CAAC;yBACH;wBAED,MAAM,IAAI,CAAC,iBAAiB,CAAC,uBAAuB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;wBAE/D,OAAO,IAAI,CAAC;qBACb;oBACD,KAAK,mBAAmB,CAAC,CAAC;wBACxB,MAAM,KAAK,GAAG,MAWD,CAAC;wBACd,IAAI,CAAC,KAAK,EAAE;4BACV,MAAM,IAAI,iCAAwB,CAChC,CAAC,KAAK,EACN,yCAAyC,CAC1C,CAAC;yBACH;wBAED,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE;4BAC1B,MAAM,IAAI,iCAAwB,CAChC,CAAC,KAAK,EACN,2DAA2D,CAC5D,CAAC;yBACH;wBAED,MAAM,eAAe,GAAG,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,CAAC,OAAO,CAAC;wBAE/C,MAAM,cAAc,GAAG,IAAI,CAAC,sBAAsB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;wBAEpE,IAAI;4BACF,MAAM,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,CAC5C,GAAG,EACH,cAAc,EACd,eAAe,CAChB,CAAC;yBACH;wBAAC,OAAO,CAAC,EAAE;4BACV,IACE,CAAC,CAAC,YAAY,KAAK,IAAI,CAAC,CAAC,OAAO,KAAK,kBAAkB,CAAC;gCACxD,CAAC,KAAK,kBAAkB,EACxB;gCACA,MAAM,IAAI,iCAAwB,CAAC,IAAI,EAAE,uBAAuB,CAAC,CAAC;6BACnE;4BACD,MAAM,CAAC,CAAC;yBACT;wBAED,OAAO,IAAI,CAAC;qBACb;oBACD,KAAK,UAAU,CAAC;oBAChB,KAAK,iBAAiB,CAAC;oBACvB,KAAK,yBAAyB,CAAC;oBAC/B,KAAK,0BAA0B,CAAC;oBAChC,KAAK,uCAAuC,CAAC;oBAC7C,KAAK,yCAAyC,CAAC;oBAC/C,KAAK,0BAA0B,CAAC;oBAChC,KAAK,2BAA2B,CAAC;oBACjC,KAAK,wBAAwB,CAAC;oBAC9B,KAAK,qBAAqB,CAAC;oBAC3B,KAAK,aAAa,CAAC;oBACnB,KAAK,aAAa,CAAC;oBACnB,KAAK,aAAa,CAAC;oBACnB,KAAK,cAAc,CAAC;oBACpB,KAAK,kBAAkB,CAAC;oBACxB,KAAK,gBAAgB,CAAC;oBACtB,KAAK,iBAAiB,CAAC;oBACvB,KAAK,oBAAoB,CAAC;oBAC1B,KAAK,sBAAsB,CAAC;oBAC5B,KAAK,cAAc,CAAC;oBACpB,KAAK,gBAAgB,CAAC;oBACtB,KAAK,0BAA0B,CAAC,CAAC;wBAC/B,MAAM,cAAc,GAAG,IAAI,CAAC,sBAAsB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;wBACpE,MAAM,mBAAmB,GACvB,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC;wBAEvD,OAAO,CACL,MAAM,IAAA,0BAAW,EAKd,mBAAmB,CAAC,GAAG,EAAE;4BAC1B,MAAM,EAAE,MAAM;4BACd,OAAO,EAAE;gCACP,cAAc,EAAE,kBAAkB;gCAClC,gBAAgB,EAAE,MAAM;6BACzB;4BACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;gCACnB,OAAO,EAAE,KAAK;gCACd,MAAM;gCACN,MAAM;gCACN,EAAE,EAAE,CAAC;6BACN,CAAC;yBACH,CAAC,CACH,CAAC,IAAI,CAAC,MAAM,CAAC;qBACf;oBACD,OAAO,CAAC,CAAC;wBACP,MAAM,IAAI,iCAAwB,CAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC;qBAChE;iBACF;YACH,CAAC,CAAA,CAAC,EAAE,CAAM,CAAC;YAEX,OAAO,MAAM,CAAC;QAChB,CAAC;KAAA;IAED,+BAA+B,CAC7B,MAAc,EACd,MAA4C;QAE5C,QAAQ,MAAM,EAAE;YACd,KAAK,4BAA4B,CAAC,CAAC;gBACjC,MAAM,KAAK,GACT,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAG,CAAC,CAAyB,CAAA,CAAC;oBAC/D,SAAS,CAAC;gBACZ,IAAI,CAAC,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,CAAA,EAAE;oBACnB,MAAM,IAAI,iCAAwB,CAChC,CAAC,KAAK,EACN,0BAA0B,CAC3B,CAAC;iBACH;gBAED,MAAM,aAAa,GAAG,IAAA,2BAAkB,EAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;gBACtE,MAAM,SAAS,GACb,IAAI,CAAC,aAAa,CAAC,wBAAwB,CAAC,aAAa,CAAC,CAAC;gBAC7D,IAAI,CAAC,SAAS,EAAE;oBACd,MAAM,IAAI,iCAAwB,CAChC,IAAI,EACJ,0BAA0B,aAAa,8DAA8D,CACtG,CAAC;iBACH;gBAED,OAAO,SAAS,CAAC,OAAO,CAAC;aAC1B;YACD,OAAO,CAAC,CAAC;gBACP,OAAO;aACR;SACF;IACH,CAAC;IAED,qBAAqB,CAAC,MAAc;QAClC,IAAI,gDAAoC,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;YACzD,OAAO,KAAK,CAAC;SACd;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,iBAAiB,CAAC,MAAc,EAAE,OAAgB;QACxD,OAAO,OAAO,IAAI,IAAI,CAAC,iBAAiB,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;IAC3E,CAAC;IAEO,sBAAsB,CAAC,MAAc,EAAE,OAAgB;QAC7D,OAAO,CACL,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,OAAO,CAAC;YACvC,oFAAoF;YACpF,UAAU,CACX,CAAC;IACJ,CAAC;IAEO,aAAa,CAAC,OAAe;QACnC,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAE9D,OAAO,OAAO,CAAC,OAAO,CAAC;IACzB,CAAC;IAEO,QAAQ,CAAC,CAA4B;QAC3C,IAAI,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,IAAI,EAAE;YACjC,OAAO,SAAS,CAAC;SAClB;QAED,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE;YACzB,OAAO,KAAK,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;SAC9B;QAED,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE;YACzB,MAAM,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9D,OAAO,KAAK,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;SAC9B;QAED,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;QACb,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;YAChC,OAAO,SAAS,CAAC;SAClB;QAED,IAAI,CAAS,CAAC;QAEd,IAAI;YACF,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;SACf;QAAC,WAAM;YACN,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;gBACvB,CAAC,GAAG,KAAK,CAAC,EAAE,CAAC;aACd;YACD,IAAI;gBACF,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;aACf;YAAC,WAAM;gBACN,OAAO,SAAS,CAAC;aAClB;SACF;QAED,OAAO,KAAK,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;IAC/B,CAAC;IAEO,mBAAmB,CACzB,EAAO,EACP,OAAe,EACf,KAAa;QAEb,MAAM,EACJ,KAAK,EACL,GAAG,EACH,QAAQ,EACR,QAAQ,EACR,YAAY,EACZ,oBAAoB,EACpB,IAAI,KAEF,EAAE,EADD,MAAM,UACP,EAAE,EATA,wFASL,CAAK,CAAC;QAEP,MAAM,UAAU,mCACX,MAAM,KACT,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAC3B,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,GAAG,CAAC,EACxC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EACjC,YAAY,EAAE,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,EACzC,oBAAoB,EAAE,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAC,EACzD,OAAO,EAAE,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,EACpC,KAAK,GACN,CAAC;QAEF,IAAI,IAAI,IAAI,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;YAC5C,UAAU,CAAC,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;SAC9D;QAED,MAAM,QAAQ,GAAG,UAAU,CAAC,QAAQ,KAAK,SAAS,CAAC;QACnD,MAAM,SAAS,GACb,UAAU,CAAC,YAAY,KAAK,SAAS;YACrC,UAAU,CAAC,oBAAoB,KAAK,SAAS,CAAC;QAEhD,IAAI,SAAS,EAAE;YACb,OAAO,UAAU,CAAC,QAAQ,CAAC;SAC5B;aAAM,IAAI,QAAQ,EAAE;YACnB,OAAO,UAAU,CAAC,YAAY,CAAC;YAC/B,OAAO,UAAU,CAAC,oBAAoB,CAAC;SACxC;QAED,OAAO,UAAU,CAAC;IACpB,CAAC;CACF;AA/yCD,wDA+yCC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@keplr-wallet/background",
3
- "version": "0.12.281-rc.3",
3
+ "version": "0.12.282",
4
4
  "main": "build/index.js",
5
5
  "author": "chainapsis",
6
6
  "license": "Apache-2.0",
@@ -28,17 +28,17 @@
28
28
  "@ethersproject/hash": "^5.7.0",
29
29
  "@ethersproject/transactions": "^5.7.0",
30
30
  "@ethersproject/wallet": "^5.7.0",
31
- "@keplr-wallet/chain-validator": "0.12.281-rc.3",
32
- "@keplr-wallet/common": "0.12.281-rc.3",
33
- "@keplr-wallet/cosmos": "0.12.281-rc.3",
34
- "@keplr-wallet/crypto": "0.12.281-rc.3",
35
- "@keplr-wallet/ledger-cosmos": "0.12.281-rc.3",
36
- "@keplr-wallet/popup": "0.12.281-rc.3",
37
- "@keplr-wallet/proto-types": "0.12.281-rc.3",
38
- "@keplr-wallet/router": "0.12.281-rc.3",
39
- "@keplr-wallet/simple-fetch": "0.12.281-rc.3",
40
- "@keplr-wallet/types": "0.12.281-rc.3",
41
- "@keplr-wallet/unit": "0.12.281-rc.3",
31
+ "@keplr-wallet/chain-validator": "0.12.282",
32
+ "@keplr-wallet/common": "0.12.282",
33
+ "@keplr-wallet/cosmos": "0.12.282",
34
+ "@keplr-wallet/crypto": "0.12.282",
35
+ "@keplr-wallet/ledger-cosmos": "0.12.282",
36
+ "@keplr-wallet/popup": "0.12.282",
37
+ "@keplr-wallet/proto-types": "0.12.282",
38
+ "@keplr-wallet/router": "0.12.282",
39
+ "@keplr-wallet/simple-fetch": "0.12.282",
40
+ "@keplr-wallet/types": "0.12.282",
41
+ "@keplr-wallet/unit": "0.12.282",
42
42
  "@ledgerhq/hw-app-eth": "^6.40.3",
43
43
  "@ledgerhq/hw-app-starknet": "^3.0.1",
44
44
  "@ledgerhq/hw-transport": "^6.31.4",
@@ -65,5 +65,5 @@
65
65
  "mobx-utils": "^6",
66
66
  "starknet": "^7"
67
67
  },
68
- "gitHead": "510e66721599ef4df6d7464fc1af9b297f40caf3"
68
+ "gitHead": "4fcd2f6d29b28bbc5b3ce90a25f122777f84164c"
69
69
  }
package/src/keyring-cosmos/messages.ts CHANGED
@@ -92,9 +92,7 @@ export class RequestCosmosSignAminoMsg extends Message<AminoSignResponse> {
92
92
  public readonly chainId: string,
93
93
  public readonly signer: string,
94
94
  public readonly signDoc: StdSignDoc,
95
- public readonly signOptions: KeplrSignOptions & {
96
- forceTopUp?: boolean;
97
- }
95
+ public readonly signOptions: KeplrSignOptions
98
96
  ) {
99
97
  super();
100
98
  }
@@ -133,7 +131,7 @@ export class RequestCosmosSignAminoMsg extends Message<AminoSignResponse> {
133
131
  }
134
132
 
135
133
  override approveExternal(): boolean {
136
- return !this.signOptions.forceTopUp;
134
+ return true;
137
135
  }
138
136
 
139
137
  route(): string {
@@ -167,9 +165,7 @@ export class RequestCosmosSignDirectMsg extends Message<{
167
165
  chainId?: string;
168
166
  accountNumber?: string;
169
167
  },
170
- public readonly signOptions: KeplrSignOptions & {
171
- forceTopUp?: boolean;
172
- } = {}
168
+ public readonly signOptions: KeplrSignOptions = {}
173
169
  ) {
174
170
  super();
175
171
  }
@@ -207,7 +203,7 @@ export class RequestCosmosSignDirectMsg extends Message<{
207
203
  }
208
204
 
209
205
  override approveExternal(): boolean {
210
- return !this.signOptions.forceTopUp;
206
+ return true;
211
207
  }
212
208
 
213
209
  route(): string {
package/src/keyring-ethereum/service.ts CHANGED
@@ -425,6 +425,7 @@ export class KeyRingEthereumService {
425
425
  (params?.[0] as {
426
426
  chainId?: string | number;
427
427
  from: string;
428
+ value?: string;
428
429
  gas?: string;
429
430
  gasLimit?: string;
430
431
  authorizationList?: {
@@ -446,7 +447,7 @@ export class KeyRingEthereumService {
446
447
 
447
448
  const currentChainId = this.forceGetCurrentChainId(origin, chainId);
448
449
 
449
- const { from: sender, gas, authorizationList, ...restTx } = tx;
450
+ const { from: sender, authorizationList, ...restTx } = tx;
450
451
 
451
452
  if (authorizationList) {
452
453
  throw new Error("EIP-7702 transactions are not supported.");
@@ -490,12 +491,11 @@ export class KeyRingEthereumService {
490
491
  );
491
492
  const nonce = parseInt(transactionCount, 16);
492
493
 
493
- const unsignedTx: UnsignedTransaction = {
494
- ...restTx,
495
- gasLimit: restTx?.gasLimit ?? gas,
496
- chainId: this.getEVMChainId(currentChainId),
497
- nonce,
498
- };
494
+ const unsignedTx = this.normalizeUnsignedTx(
495
+ restTx,
496
+ currentChainId,
497
+ nonce
498
+ );
499
499
 
500
500
  try {
501
501
  const { signingData, signature } = await this.signEthereumSelected(
@@ -545,6 +545,7 @@ export class KeyRingEthereumService {
545
545
  (params?.[0] as {
546
546
  chainId?: string | number;
547
547
  from: string;
548
+ value?: string;
548
549
  gas?: string;
549
550
  gasLimit?: string;
550
551
  authorizationList?: {
@@ -566,7 +567,7 @@ export class KeyRingEthereumService {
566
567
 
567
568
  const currentChainId = this.forceGetCurrentChainId(origin, chainId);
568
569
 
569
- const { from: sender, gas, authorizationList, ...restTx } = tx;
570
+ const { from: sender, authorizationList, ...restTx } = tx;
570
571
 
571
572
  if (authorizationList) {
572
573
  throw new Error("EIP-7702 transactions are not supported.");
@@ -610,12 +611,11 @@ export class KeyRingEthereumService {
610
611
  );
611
612
  const nonce = parseInt(transactionCount, 16);
612
613
 
613
- const unsignedTx: UnsignedTransaction = {
614
- ...restTx,
615
- gasLimit: restTx?.gasLimit ?? gas,
616
- chainId: this.getEVMChainId(currentChainId),
617
- nonce,
618
- };
614
+ const unsignedTx = this.normalizeUnsignedTx(
615
+ restTx,
616
+ currentChainId,
617
+ nonce
618
+ );
619
619
 
620
620
  try {
621
621
  const { signingData, signature } = await this.signEthereumSelected(
@@ -1278,4 +1278,87 @@ export class KeyRingEthereumService {
1278
1278
 
1279
1279
  return evmInfo.chainId;
1280
1280
  }
1281
+
1282
+ private toHexQty(x?: string | number | bigint): string | undefined {
1283
+ if (x === undefined || x === null) {
1284
+ return undefined;
1285
+ }
1286
+
1287
+ if (typeof x === "bigint") {
1288
+ return `0x${x.toString(16)}`;
1289
+ }
1290
+
1291
+ if (typeof x === "number") {
1292
+ const n = Number.isFinite(x) ? Math.max(0, Math.floor(x)) : 0;
1293
+ return `0x${n.toString(16)}`;
1294
+ }
1295
+
1296
+ x = x.trim();
1297
+ if (x.length === 0 || x === "0x") {
1298
+ return undefined;
1299
+ }
1300
+
1301
+ let q: bigint;
1302
+
1303
+ try {
1304
+ q = BigInt(x);
1305
+ } catch {
1306
+ if (!x.startsWith("0x")) {
1307
+ x = `0x${x}`;
1308
+ }
1309
+ try {
1310
+ q = BigInt(x);
1311
+ } catch {
1312
+ return undefined;
1313
+ }
1314
+ }
1315
+
1316
+ return `0x${q.toString(16)}`;
1317
+ }
1318
+
1319
+ private normalizeUnsignedTx(
1320
+ tx: any,
1321
+ chainId: string,
1322
+ nonce: number
1323
+ ): UnsignedTransaction {
1324
+ const {
1325
+ value,
1326
+ gas,
1327
+ gasLimit,
1328
+ gasPrice,
1329
+ maxFeePerGas,
1330
+ maxPriorityFeePerGas,
1331
+ data,
1332
+ ...restTx
1333
+ } = tx;
1334
+
1335
+ const unsignedTx: UnsignedTransaction = {
1336
+ ...restTx,
1337
+ value: this.toHexQty(value),
1338
+ gasLimit: this.toHexQty(gasLimit ?? gas),
1339
+ gasPrice: this.toHexQty(gasPrice),
1340
+ maxFeePerGas: this.toHexQty(maxFeePerGas),
1341
+ maxPriorityFeePerGas: this.toHexQty(maxPriorityFeePerGas),
1342
+ chainId: this.getEVMChainId(chainId),
1343
+ nonce,
1344
+ };
1345
+
1346
+ if (data != null && typeof data === "string") {
1347
+ unsignedTx.data = data.startsWith("0x") ? data : `0x${data}`;
1348
+ }
1349
+
1350
+ const isLegacy = unsignedTx.gasPrice !== undefined;
1351
+ const isEIP1559 =
1352
+ unsignedTx.maxFeePerGas !== undefined &&
1353
+ unsignedTx.maxPriorityFeePerGas !== undefined;
1354
+
1355
+ if (isEIP1559) {
1356
+ delete unsignedTx.gasPrice;
1357
+ } else if (isLegacy) {
1358
+ delete unsignedTx.maxFeePerGas;
1359
+ delete unsignedTx.maxPriorityFeePerGas;
1360
+ }
1361
+
1362
+ return unsignedTx;
1363
+ }
1281
1364
  }