@wildcatfi/wildcat-sdk 1.0.15 → 2.0.1

package/dist/withdrawal-status.js

@@ -0,0 +1,187 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.toQueueWithdrawalTransaction = exports.getAllWithdrawalTransactions = exports.LenderWithdrawalStatus = void 0;
+const constants_1 = require("./constants");
+const utils_1 = require("./utils");
+const withdrawal_batch_1 = require("./withdrawal-batch");
+class LenderWithdrawalStatus {
+    constructor(batch, lender, scaledAmount, normalizedAmountWithdrawn, normalizedAmountOwed, availableWithdrawalAmount, queueTransactions = [], executionTransactions = []) {
+        this.batch = batch;
+        this.lender = lender;
+        this.scaledAmount = scaledAmount;
+        this.normalizedAmountWithdrawn = normalizedAmountWithdrawn;
+        this.normalizedAmountOwed = normalizedAmountOwed;
+        this.availableWithdrawalAmount = availableWithdrawalAmount;
+        this.queueTransactions = queueTransactions;
+        this.executionTransactions = executionTransactions;
+    }
+    async execute() {
+        (0, utils_1.assert)(this.availableWithdrawalAmount.gt(0), "No funds available to withdraw");
+        return this.market.contract.executeWithdrawal(this.lender, this.expiry);
+    }
+    get originalAmount() {
+        return this.queueTransactions.reduce((prev, next) => prev.add(next.originalAmount), this.batch.market.underlyingToken.getAmount(0));
+    }
+    get expiry() {
+        return this.batch.expiry;
+    }
+    get market() {
+        return this.batch.market;
+    }
+    get status() {
+        return this.batch.status;
+    }
+    updateWith(data) {
+        this.scaledAmount = data.scaledAmount;
+        this.normalizedAmountWithdrawn = this.market.underlyingToken.getAmount(data.normalizedAmountWithdrawn);
+        this.normalizedAmountOwed = this.market.underlyingToken.getAmount(data.normalizedAmountOwed);
+        this.availableWithdrawalAmount = this.market.underlyingToken.getAmount(data.availableWithdrawalAmount);
+    }
+    static async addTransactionsToWithdrawals(withdrawals) {
+        if (withdrawals.length === 0)
+            return;
+        const market = withdrawals[0].market;
+        if (!withdrawals.every((w) => w.market.address === market.address)) {
+            throw new Error("All withdrawals must be from the same market");
+        }
+        const { queueTransactions, executionTransactions } = await getAllWithdrawalTransactions(market, (0, utils_1.unique)(withdrawals.map((w) => w.expiry)), (0, utils_1.unique)(withdrawals.map((w) => w.lender)));
+        for (const withdrawal of withdrawals) {
+            withdrawal.queueTransactions = queueTransactions.filter((l) => l.expiry == withdrawal.expiry && l.lender === withdrawal.lender);
+            withdrawal.executionTransactions = executionTransactions.filter((l) => l.expiry == withdrawal.expiry && l.lender === withdrawal.lender);
+        }
+    }
+    static async getAllWithdrawalsInBatch(market, expiry) {
+        const { queueTransactions, executionTransactions } = await getAllWithdrawalTransactions(market, expiry, null);
+        const uniqueLenderWithdrawalStatuses = {};
+        queueTransactions.forEach((l) => {
+            if (!uniqueLenderWithdrawalStatuses[l.lender]) {
+                uniqueLenderWithdrawalStatuses[l.lender] = {
+                    queueTransactions: [],
+                    executionTransactions: []
+                };
+            }
+            uniqueLenderWithdrawalStatuses[l.lender].queueTransactions.push(l);
+        });
+        executionTransactions.forEach((l) => {
+            if (!uniqueLenderWithdrawalStatuses[l.lender]) {
+                uniqueLenderWithdrawalStatuses[l.lender] = {
+                    queueTransactions: [],
+                    executionTransactions: []
+                };
+            }
+            uniqueLenderWithdrawalStatuses[l.lender].executionTransactions.push(l);
+        });
+        const lenders = Object.keys(uniqueLenderWithdrawalStatuses);
+        const lens = (0, constants_1.getLensContract)(market.provider);
+        const batchData = await lens.getWithdrawalBatchDataWithLendersStatus(market.address, expiry, lenders);
+        const batch = withdrawal_batch_1.WithdrawalBatch.fromWithdrawalBatchData(market, batchData.batch);
+        return batchData.statuses.map((status) => {
+            const { queueTransactions, executionTransactions } = uniqueLenderWithdrawalStatuses[status.lender];
+            const withdrawalStatus = LenderWithdrawalStatus.fromWithdrawalBatchLenderStatus(market, batch, status);
+            withdrawalStatus.queueTransactions = queueTransactions;
+            withdrawalStatus.executionTransactions = executionTransactions;
+            return withdrawalStatus;
+        });
+    }
+    static async getAllWithdrawalsForLender(market, lender) {
+        const { queueTransactions, executionTransactions } = await getAllWithdrawalTransactions(market, null, lender);
+        const logsByExpiry = {};
+        for (const log of queueTransactions) {
+            if (!logsByExpiry[log.expiry]) {
+                logsByExpiry[log.expiry] = {
+                    queueTransactions: [],
+                    executionTransactions: []
+                };
+            }
+            logsByExpiry[log.expiry].queueTransactions.push(log);
+        }
+        for (const log of executionTransactions) {
+            if (!logsByExpiry[log.expiry]) {
+                logsByExpiry[log.expiry] = {
+                    queueTransactions: [],
+                    executionTransactions: []
+                };
+            }
+            logsByExpiry[log.expiry].executionTransactions.push(log);
+        }
+        const expiries = (0, utils_1.unique)([
+            ...queueTransactions.map((l) => l.expiry),
+            ...executionTransactions.map((l) => l.expiry)
+        ]);
+        const lens = (0, constants_1.getLensContract)(market.provider);
+        const batchData = await lens.getWithdrawalBatchesDataWithLenderStatus(market.address, expiries, lender);
+        return batchData.map((d) => {
+            const batch = LenderWithdrawalStatus.fromWithdrawalBatchDataWithLenderStatus(market, d);
+            const { queueTransactions, executionTransactions } = logsByExpiry[d.batch.expiry];
+            if (!queueTransactions) {
+                throw new Error(`Could not find queueTransactions for batch ${batch.expiry}`);
+            }
+            batch.queueTransactions = queueTransactions;
+            batch.executionTransactions = executionTransactions;
+            return batch;
+        });
+    }
+    static async getWithdrawalForLender(market, expiry, lender) {
+        const lens = (0, constants_1.getLensContract)(market.provider);
+        const batchData = await lens.getWithdrawalBatchDataWithLenderStatus(market.address, expiry, lender);
+        const batch = withdrawal_batch_1.WithdrawalBatch.fromWithdrawalBatchData(market, batchData.batch);
+        return LenderWithdrawalStatus.fromWithdrawalBatchLenderStatus(market, batch, batchData.lenderStatus);
+    }
+    static fromWithdrawalBatchLenderStatus(market, batch, data) {
+        return new LenderWithdrawalStatus(batch, data.lender, data.scaledAmount, market.underlyingToken.getAmount(data.normalizedAmountWithdrawn), market.underlyingToken.getAmount(data.normalizedAmountOwed), market.underlyingToken.getAmount(data.availableWithdrawalAmount));
+    }
+    static fromWithdrawalBatchDataWithLenderStatus(market, data) {
+        return LenderWithdrawalStatus.fromWithdrawalBatchLenderStatus(market, withdrawal_batch_1.WithdrawalBatch.fromWithdrawalBatchData(market, data.batch), data.lenderStatus);
+    }
+}
+exports.LenderWithdrawalStatus = LenderWithdrawalStatus;
+async function getAllWithdrawalTransactions(market, _expiries, lenders) {
+    const queuedTopic = market.contract.interface.getEventTopic("WithdrawalQueued");
+    const executedTopic = market.contract.interface.getEventTopic("WithdrawalExecuted");
+    const topic0 = [queuedTopic, executedTopic];
+    const expiries = Array.isArray(_expiries) ? _expiries.map(utils_1.encodeUint) : _expiries;
+    lenders = Array.isArray(lenders) ? lenders.map(utils_1.encodeAddress) : lenders;
+    const topics = [topic0, expiries, lenders];
+    const logs = await market.contract.queryFilter({
+        address: market.address,
+        topics: topics
+    }, constants_1.DeploymentBlockNumber);
+    return logs.reduce((prev, log) => {
+        const tx = {
+            transactionHash: log.transactionHash,
+            blockNumber: log.blockNumber,
+            expiry: log.args.expiry.toNumber(),
+            lender: log.args.account,
+            market: log.address
+        };
+        if (log.topics[0] === queuedTopic) {
+            prev.queueTransactions.push({
+                ...tx,
+                scaledAmount: log.args.scaledAmount,
+                originalAmount: market.underlyingToken.getAmount(log.args.normalizedAmount)
+            });
+        }
+        else {
+            prev.executionTransactions.push({
+                ...tx,
+                normalizedAmountWithdrawn: market.underlyingToken.getAmount(log.args.normalizedAmount)
+            });
+        }
+        return prev;
+    }, {
+        queueTransactions: [],
+        executionTransactions: []
+    });
+}
+exports.getAllWithdrawalTransactions = getAllWithdrawalTransactions;
+const toQueueWithdrawalTransaction = (underlyingToken, log) => ({
+    transactionHash: log.transactionHash,
+    blockNumber: log.blockNumber,
+    expiry: log.args.expiry.toNumber(),
+    lender: log.args.account,
+    market: log.address,
+    scaledAmount: log.args.scaledAmount,
+    originalAmount: underlyingToken.getAmount(log.args.normalizedAmount)
+});
+exports.toQueueWithdrawalTransaction = toQueueWithdrawalTransaction;
+//# sourceMappingURL=withdrawal-status.js.map

package/dist/withdrawal-status.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"withdrawal-status.js","sourceRoot":"","sources":["../src/withdrawal-status.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wildcatfi/wildcat-sdk",
-  "version": "1.0.15",
+  "version": "2.0.1",
   "license": "MIT",
   "files": [
     "dist"
@@ -11,7 +11,7 @@
     "@nomicfoundation/hardhat-chai-matchers": "^1.0.5",
     "@nomiclabs/hardhat-ethers": "^2.2.3",
     "@typechain/ethers-v5": "^10.2.1",
-    "@typechain/hardhat": "^6.1.6",
+    "@typechain/hardhat": "^9.1.0",
     "@types/chai": "^4.3.5",
     "@types/dotenv": "^8.2.0",
     "@types/mocha": "^10.0.1",
@@ -33,6 +33,7 @@
     "ethers": "^5.5.3"
   },
   "scripts": {
+    "typechain": "rm -rf typechain cache src/typechain; hardhat compile; cp -r typechain src/typechain; node ./typechain-imports.js",
     "clean": "rm -rf dist",
     "build": "npm run clean && tsc -p ./tsconfig.prod.json",
     "lint": "eslint src/ test/ --ext=ts",

package/dist/factory.d.ts

@@ -1,28 +0,0 @@
-import { Token, TokenAmount } from "./token";
-import { WildcatVaultFactory, WildcatVaultFactory__factory } from "./typechain";
-import { ContractWrapper, Signer, SignerOrProvider } from "./types";
-import { Vault } from "./vault";
-import { MakeOptional } from "./misc";
-export type VaultParameters = {
-    asset: Token;
-    namePrefix: string;
-    symbolPrefix: string;
-    borrower: string;
-    controller: string;
-    maxTotalSupply: TokenAmount;
-    annualInterestBips: number;
-    penaltyFeeBips: number;
-    gracePeriod: number;
-    liquidityCoverageRatio: number;
-    interestFeeBips: number;
-    feeRecipient: string;
-};
-export declare class VaultFactory extends ContractWrapper<WildcatVaultFactory> {
-    address: string;
-    readonly contractFactory: typeof WildcatVaultFactory__factory;
-    constructor(address: string, provider: SignerOrProvider);
-    static getFactory(provider: SignerOrProvider): VaultFactory;
-    deployVault(params: VaultParameters): Promise<Vault>;
-    static deployVault(params: MakeOptional<VaultParameters, "feeRecipient" | "borrower" | "controller">, signer: Signer): Promise<Vault>;
-}
-//# sourceMappingURL=factory.d.ts.map

package/dist/factory.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAC7C,OAAO,EAAE,mBAAmB,EAAE,4BAA4B,EAAE,MAAM,aAAa,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AACpE,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEtC,MAAM,MAAM,eAAe,GAAG;IAC5B,KAAK,EAAE,KAAK,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,WAAW,CAAC;IAC5B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,sBAAsB,EAAE,MAAM,CAAC;IAC/B,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAKF,qBAAa,YAAa,SAAQ,eAAe,CAAC,mBAAmB,CAAC;IAGjD,OAAO,EAAE,MAAM;IAFlC,QAAQ,CAAC,eAAe,sCAAgC;gBAErC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,gBAAgB;IAI9D,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,gBAAgB,GAAG,YAAY;IAIrD,WAAW,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,KAAK,CAAC;WAyB7C,WAAW,CAAC,MAAM,EAAE,YAAY,CAAC,eAAe,EAAE,cAAc,GAAG,UAAU,GAAG,YAAY,CAAC,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;CAS5I"}

package/dist/factory.js

@@ -1,50 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.VaultFactory = void 0;
-/* eslint-disable prettier/prettier */
-const utils_1 = require("ethers/lib/utils");
-const constants_1 = require("./constants");
-const typechain_1 = require("./typechain");
-const types_1 = require("./types");
-const vault_1 = require("./vault");
-const DefaultFeeRecipient = (0, utils_1.getAddress)(`0xf335`.padEnd(42, "0"));
-class VaultFactory extends types_1.ContractWrapper {
-    constructor(address, provider) {
-        super(provider);
-        this.address = address;
-        this.contractFactory = typechain_1.WildcatVaultFactory__factory;
-    }
-    static getFactory(provider) {
-        return new VaultFactory(constants_1.FactoryAddress, provider);
-    }
-    async deployVault(params) {
-        const tx = await this.contract.deployVault({
-            asset: params.asset.address,
-            namePrefix: params.namePrefix,
-            symbolPrefix: params.symbolPrefix,
-            borrower: params.borrower,
-            controller: params.controller,
-            maxTotalSupply: params.maxTotalSupply.raw.toString(),
-            annualInterestBips: params.annualInterestBips,
-            penaltyFeeBips: params.penaltyFeeBips,
-            gracePeriod: params.gracePeriod,
-            liquidityCoverageRatio: params.liquidityCoverageRatio,
-            interestFeeBips: params.interestFeeBips,
-            feeRecipient: params.feeRecipient
-        });
-        await tx.wait();
-        const address = await this.contract.computeVaultAddress(params.controller, await this.signer.getAddress(), params.asset.address);
-        return vault_1.Vault.getVaultData(address, this.provider);
-    }
-    static async deployVault(params, signer) {
-        const factory = VaultFactory.getFactory(signer);
-        return factory.deployVault({
-            feeRecipient: DefaultFeeRecipient,
-            controller: constants_1.ControllerAddress,
-            borrower: await signer.getAddress(),
-            ...params
-        });
-    }
-}
-exports.VaultFactory = VaultFactory;
-//# sourceMappingURL=factory.js.map

package/dist/factory.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"factory.js","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":";;;AAAA,sCAAsC;AACtC,4CAA8C;AAC9C,2CAAgE;AAEhE,2CAAgF;AAChF,mCAAoE;AACpE,mCAAgC;AAmBhC,MAAM,mBAAmB,GAAG,IAAA,kBAAU,EAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC;AAEjE,MAAa,YAAa,SAAQ,uBAAoC;IAGpE,YAAmB,OAAe,EAAE,QAA0B;QAC5D,KAAK,CAAC,QAAQ,CAAC,CAAC;QADC,YAAO,GAAP,OAAO,CAAQ;QAFzB,oBAAe,GAAG,wCAA4B,CAAC;IAIxD,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,QAA0B;QAC1C,OAAO,IAAI,YAAY,CAAC,0BAAc,EAAE,QAAQ,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,MAAuB;QACvC,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC;YACzC,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,OAAO;YAC3B,UAAU,EAAE,MAAM,CAAC,UAAU;YAC7B,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,UAAU,EAAE,MAAM,CAAC,UAAU;YAC7B,cAAc,EAAE,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,EAAE;YACpD,kBAAkB,EAAE,MAAM,CAAC,kBAAkB;YAC7C,cAAc,EAAE,MAAM,CAAC,cAAc;YACrC,WAAW,EAAE,MAAM,CAAC,WAAW;YAC/B,sBAAsB,EAAE,MAAM,CAAC,sBAAsB;YACrD,eAAe,EAAE,MAAM,CAAC,eAAe;YACvC,YAAY,EAAE,MAAM,CAAC,YAAY;SAClC,CAAC,CAAC;QAEH,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC;QAChB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CACrD,MAAM,CAAC,UAAU,EACjB,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,EAC9B,MAAM,CAAC,KAAK,CAAC,OAAO,CACrB,CAAC;QACF,OAAO,aAAK,CAAC,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IACpD,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,MAAiF,EAAE,MAAc;QACxH,MAAM,OAAO,GAAG,YAAY,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAChD,OAAO,OAAO,CAAC,WAAW,CAAC;YACzB,YAAY,EAAE,mBAAmB;YACjC,UAAU,EAAE,6BAAiB;YAC7B,QAAQ,EAAE,MAAM,MAAM,CAAC,UAAU,EAAE;YACnC,GAAG,MAAM;SACV,CAAC,CAAC;IACL,CAAC;CACF;AA7CD,oCA6CC"}

package/dist/misc.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"misc.d.ts","sourceRoot":"","sources":["../src/misc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAGnC,MAAM,MAAM,eAAe,CAAC,CAAC,IAAI;KAC9B,CAAC,IAAI,WAAW,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,WAAW,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,CAAC,SAAS,MAAM,GAC5D,CAAC,SAAS,MAAM,CAAC,GACf,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,GAClC,KAAK,GACL,CAAC,GACH,KAAK,GACP,KAAK,CAAC;AAIV,wBAAgB,WAAW,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,IAAI,CAEnF;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,CAI/E;AAED,MAAM,MAAM,YAAY,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AAElF,eAAO,MAAM,mBAAmB,QAAS,MAAM,KAAG,MAAiD,CAAC;AAEpG,eAAO,MAAM,aAAa,OAAQ,SAAS,4CAAwC,MAMlF,CAAC"}

package/dist/misc.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"misc.js","sourceRoot":"","sources":["../src/misc.ts"],"names":[],"mappings":";;;AACA,4CAA+C;AAc/C,oDAAoD;AAEpD,SAAgB,WAAW,CAAuB,GAAM,EAAE,QAAW,EAAE,GAAM;IAC3E,GAAG,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;AAC3B,CAAC;AAFD,kCAEC;AAED,SAAgB,YAAY,CAAI,GAAM,EAAE,QAAW,EAAE,IAAoB;IACvE,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;QACtB,WAAW,CAAC,GAAG,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;KACjC;AACH,CAAC;AAJD,oCAIC;AAIM,MAAM,mBAAmB,GAAG,CAAC,GAAW,EAAU,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,sBAAsB,EAAE,EAAE,CAAC,CAAC;AAAvF,QAAA,mBAAmB,uBAAoE;AAE7F,MAAM,aAAa,GAAG,CAAC,EAAa,EAAE,QAAQ,GAAG,EAAE,EAAE,SAAS,GAAG,QAAQ,EAAU,EAAE;IAC1F,IAAI,GAAG,GAAG,IAAA,mBAAW,EAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;IACpC,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,SAAS,KAAK,QAAQ,EAAE;QAC/C,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,SAAS,GAAG,CAAC,CAAC,CAAC;KACtD;IACD,OAAO,IAAA,2BAAmB,EAAC,GAAG,CAAC,CAAC;AAClC,CAAC,CAAC;AANW,QAAA,aAAa,iBAMxB"}