@drift-labs/sdk 2.145.0-beta.2 → 2.145.0-beta.3

package/lib/node/driftClient.js

@@ -42,6 +42,7 @@ const position_1 = require("./math/position");
 const spotBalance_1 = require("./math/spotBalance");
 const userName_1 = require("./userName");
 const pollingDriftClientAccountSubscriber_1 = require("./accounts/pollingDriftClientAccountSubscriber");
+const webSocketDriftClientAccountSubscriber_1 = require("./accounts/webSocketDriftClientAccountSubscriber");
 const retryTxSender_1 = require("./tx/retryTxSender");
 const user_1 = require("./user");
 const config_1 = require("./config");
@@ -72,7 +73,6 @@ const tweetnacl_1 = __importDefault(require("tweetnacl"));
 const oracleId_1 = require("./oracles/oracleId");
 const sha256_1 = require("@noble/hashes/sha256");
 const utils_3 = require("./oracles/utils");
-const webSocketDriftClientAccountSubscriber_1 = require("./accounts/webSocketDriftClientAccountSubscriber");
 const orders_1 = require("./math/orders");
 const builder_1 = require("./math/builder");
 const titanClient_1 = require("./titan/titanClient");
@@ -89,7 +89,7 @@ class DriftClient {
         this._isSubscribed = val;
     }
     constructor(config) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25;
         this.users = new Map();
         this._isSubscribed = false;
         this.perpMarketLastSlotCache = new Map();
@@ -180,13 +180,12 @@ class DriftClient {
                 resubTimeoutMs: (_z = config.accountSubscription) === null || _z === void 0 ? void 0 : _z.resubTimeoutMs,
                 logResubMessages: (_0 = config.accountSubscription) === null || _0 === void 0 ? void 0 : _0.logResubMessages,
                 commitment: (_1 = config.accountSubscription) === null || _1 === void 0 ? void 0 : _1.commitment,
-                programUserAccountSubscriber: (_2 = config.accountSubscription) === null || _2 === void 0 ? void 0 : _2.programUserAccountSubscriber,
             };
             this.userStatsAccountSubscriptionConfig = {
                 type: 'websocket',
-                resubTimeoutMs: (_3 = config.accountSubscription) === null || _3 === void 0 ? void 0 : _3.resubTimeoutMs,
-                logResubMessages: (_4 = config.accountSubscription) === null || _4 === void 0 ? void 0 : _4.logResubMessages,
-                commitment: (_5 = config.accountSubscription) === null || _5 === void 0 ? void 0 : _5.commitment,
+                resubTimeoutMs: (_2 = config.accountSubscription) === null || _2 === void 0 ? void 0 : _2.resubTimeoutMs,
+                logResubMessages: (_3 = config.accountSubscription) === null || _3 === void 0 ? void 0 : _3.logResubMessages,
+                commitment: (_4 = config.accountSubscription) === null || _4 === void 0 ? void 0 : _4.commitment,
             };
         }
         if (config.userStats) {
@@ -208,22 +207,21 @@ class DriftClient {
         const noMarketsAndOraclesSpecified = config.perpMarketIndexes === undefined &&
             config.spotMarketIndexes === undefined &&
             config.oracleInfos === undefined;
-        if (((_6 = config.accountSubscription) === null || _6 === void 0 ? void 0 : _6.type) === 'polling') {
-            this.accountSubscriber = new pollingDriftClientAccountSubscriber_1.PollingDriftClientAccountSubscriber(this.program, config.accountSubscription.accountLoader, (_7 = config.perpMarketIndexes) !== null && _7 !== void 0 ? _7 : [], (_8 = config.spotMarketIndexes) !== null && _8 !== void 0 ? _8 : [], (_9 = config.oracleInfos) !== null && _9 !== void 0 ? _9 : [], noMarketsAndOraclesSpecified, delistedMarketSetting);
-        }
-        else if (((_10 = config.accountSubscription) === null || _10 === void 0 ? void 0 : _10.type) === 'grpc') {
-            const accountSubscriberClass = (_12 = (_11 = config.accountSubscription) === null || _11 === void 0 ? void 0 : _11.driftClientAccountSubscriber) !== null && _12 !== void 0 ? _12 : grpcDriftClientAccountSubscriber_1.grpcDriftClientAccountSubscriber;
-            this.accountSubscriber = new accountSubscriberClass(config.accountSubscription.grpcConfigs, this.program, (_13 = config.perpMarketIndexes) !== null && _13 !== void 0 ? _13 : [], (_14 = config.spotMarketIndexes) !== null && _14 !== void 0 ? _14 : [], (_15 = config.oracleInfos) !== null && _15 !== void 0 ? _15 : [], noMarketsAndOraclesSpecified, delistedMarketSetting, {
-                resubTimeoutMs: (_16 = config.accountSubscription) === null || _16 === void 0 ? void 0 : _16.resubTimeoutMs,
-                logResubMessages: (_17 = config.accountSubscription) === null || _17 === void 0 ? void 0 : _17.logResubMessages,
+        if (((_5 = config.accountSubscription) === null || _5 === void 0 ? void 0 : _5.type) === 'polling') {
+            this.accountSubscriber = new pollingDriftClientAccountSubscriber_1.PollingDriftClientAccountSubscriber(this.program, config.accountSubscription.accountLoader, (_6 = config.perpMarketIndexes) !== null && _6 !== void 0 ? _6 : [], (_7 = config.spotMarketIndexes) !== null && _7 !== void 0 ? _7 : [], (_8 = config.oracleInfos) !== null && _8 !== void 0 ? _8 : [], noMarketsAndOraclesSpecified, delistedMarketSetting);
+        }
+        else if (((_9 = config.accountSubscription) === null || _9 === void 0 ? void 0 : _9.type) === 'grpc') {
+            const accountSubscriberClass = (_11 = (_10 = config.accountSubscription) === null || _10 === void 0 ? void 0 : _10.driftClientAccountSubscriber) !== null && _11 !== void 0 ? _11 : grpcDriftClientAccountSubscriber_1.grpcDriftClientAccountSubscriber;
+            this.accountSubscriber = new accountSubscriberClass(config.accountSubscription.grpcConfigs, this.program, (_12 = config.perpMarketIndexes) !== null && _12 !== void 0 ? _12 : [], (_13 = config.spotMarketIndexes) !== null && _13 !== void 0 ? _13 : [], (_14 = config.oracleInfos) !== null && _14 !== void 0 ? _14 : [], noMarketsAndOraclesSpecified, delistedMarketSetting, {
+                resubTimeoutMs: (_15 = config.accountSubscription) === null || _15 === void 0 ? void 0 : _15.resubTimeoutMs,
+                logResubMessages: (_16 = config.accountSubscription) === null || _16 === void 0 ? void 0 : _16.logResubMessages,
             });
         }
         else {
-            const accountSubscriberClass = (_19 = (_18 = config.accountSubscription) === null || _18 === void 0 ? void 0 : _18.driftClientAccountSubscriber) !== null && _19 !== void 0 ? _19 : webSocketDriftClientAccountSubscriber_1.WebSocketDriftClientAccountSubscriber;
-            this.accountSubscriber = new accountSubscriberClass(this.program, (_20 = config.perpMarketIndexes) !== null && _20 !== void 0 ? _20 : [], (_21 = config.spotMarketIndexes) !== null && _21 !== void 0 ? _21 : [], (_22 = config.oracleInfos) !== null && _22 !== void 0 ? _22 : [], noMarketsAndOraclesSpecified, delistedMarketSetting, {
-                resubTimeoutMs: (_23 = config.accountSubscription) === null || _23 === void 0 ? void 0 : _23.resubTimeoutMs,
-                logResubMessages: (_24 = config.accountSubscription) === null || _24 === void 0 ? void 0 : _24.logResubMessages,
-            }, (_25 = config.accountSubscription) === null || _25 === void 0 ? void 0 : _25.commitment);
+            this.accountSubscriber = new webSocketDriftClientAccountSubscriber_1.WebSocketDriftClientAccountSubscriber(this.program, (_17 = config.perpMarketIndexes) !== null && _17 !== void 0 ? _17 : [], (_18 = config.spotMarketIndexes) !== null && _18 !== void 0 ? _18 : [], (_19 = config.oracleInfos) !== null && _19 !== void 0 ? _19 : [], noMarketsAndOraclesSpecified, delistedMarketSetting, {
+                resubTimeoutMs: (_20 = config.accountSubscription) === null || _20 === void 0 ? void 0 : _20.resubTimeoutMs,
+                logResubMessages: (_21 = config.accountSubscription) === null || _21 === void 0 ? void 0 : _21.logResubMessages,
+            }, (_22 = config.accountSubscription) === null || _22 === void 0 ? void 0 : _22.commitment, (_23 = config.accountSubscription) === null || _23 === void 0 ? void 0 : _23.perpMarketAccountSubscriber, (_24 = config.accountSubscription) === null || _24 === void 0 ? void 0 : _24.oracleAccountSubscriber);
         }
         this.eventEmitter = this.accountSubscriber.eventEmitter;
         this.metricsEventEmitter = new events_1.EventEmitter();
@@ -231,7 +229,7 @@ class DriftClient {
             this.enableMetricsEvents = true;
         }
         this.txSender =
-            (_26 = config.txSender) !== null && _26 !== void 0 ? _26 : new retryTxSender_1.RetryTxSender({
+            (_25 = config.txSender) !== null && _25 !== void 0 ? _25 : new retryTxSender_1.RetryTxSender({
                 connection: this.connection,
                 wallet: this.wallet,
                 opts: this.opts,
@@ -335,17 +333,15 @@ class DriftClient {
             .map((value) => value.data);
     }
     getSpotMarketAccount(marketIndex) {
-        var _a;
-        return (_a = this.accountSubscriber.getSpotMarketAccountAndSlot(marketIndex)) === null || _a === void 0 ? void 0 : _a.data;
+        return this.accountSubscriber.getSpotMarketAccountAndSlot(marketIndex).data;
     }
     /**
      * Forces a fetch to rpc before returning accounts. Useful for anchor tests.
      * @param marketIndex
      */
     async forceGetSpotMarketAccount(marketIndex) {
-        var _a;
         await this.accountSubscriber.fetch();
-        return (_a = this.accountSubscriber.getSpotMarketAccountAndSlot(marketIndex)) === null || _a === void 0 ? void 0 : _a.data;
+        return this.accountSubscriber.getSpotMarketAccountAndSlot(marketIndex).data;
     }
     getSpotMarketAccounts() {
         return this.accountSubscriber
@@ -1594,13 +1590,13 @@ class DriftClient {
      * @param useNative
      * @param tokenProgram
      */
-    async getAssociatedTokenAccount(marketIndex, useNative = true, tokenProgram = spl_token_1.TOKEN_PROGRAM_ID) {
+    async getAssociatedTokenAccount(marketIndex, useNative = true, tokenProgram = spl_token_1.TOKEN_PROGRAM_ID, authority = this.wallet.publicKey, allowOwnerOffCurve = false) {
         const spotMarket = this.getSpotMarketAccount(marketIndex);
         if (useNative && spotMarket.mint.equals(spotMarkets_1.WRAPPED_SOL_MINT)) {
-            return this.wallet.publicKey;
+            return authority;
         }
         const mint = spotMarket.mint;
-        return await (0, spl_token_1.getAssociatedTokenAddress)(mint, this.wallet.publicKey, undefined, tokenProgram);
+        return await (0, spl_token_1.getAssociatedTokenAddress)(mint, authority, allowOwnerOffCurve, tokenProgram);
     }
     createAssociatedTokenAccountIdempotentInstruction(account, payer, owner, mint, tokenProgram = spl_token_1.TOKEN_PROGRAM_ID) {
         return new web3_js_1.TransactionInstruction({
@@ -5913,6 +5909,469 @@ class DriftClient {
             data,
         });
     }
+    async getLpPoolAccount(lpPoolId) {
+        return (await this.program.account.lpPool.fetch((0, pda_1.getLpPoolPublicKey)(this.program.programId, lpPoolId)));
+    }
+    async getConstituentTargetBaseAccount(lpPoolId) {
+        return (await this.program.account.constituentTargetBase.fetch((0, pda_1.getConstituentTargetBasePublicKey)(this.program.programId, (0, pda_1.getLpPoolPublicKey)(this.program.programId, lpPoolId))));
+    }
+    async getAmmCache() {
+        return (await this.program.account.ammCache.fetch((0, pda_1.getAmmCachePublicKey)(this.program.programId)));
+    }
+    async updateLpConstituentTargetBase(lpPoolId, constituents, txParams) {
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getUpdateLpConstituentTargetBaseIx(lpPoolId, constituents), txParams), [], this.opts);
+        return txSig;
+    }
+    async getUpdateLpConstituentTargetBaseIx(lpPoolId, constituents) {
+        const lpPool = (0, pda_1.getLpPoolPublicKey)(this.program.programId, lpPoolId);
+        const ammConstituentMappingPublicKey = (0, pda_1.getAmmConstituentMappingPublicKey)(this.program.programId, lpPool);
+        const constituentTargetBase = (0, pda_1.getConstituentTargetBasePublicKey)(this.program.programId, lpPool);
+        const ammCache = (0, pda_1.getAmmCachePublicKey)(this.program.programId);
+        const remainingAccounts = constituents.map((constituent) => {
+            return {
+                isWritable: false,
+                isSigner: false,
+                pubkey: constituent,
+            };
+        });
+        return this.program.instruction.updateLpConstituentTargetBase({
+            accounts: {
+                keeper: this.wallet.publicKey,
+                lpPool,
+                ammConstituentMapping: ammConstituentMappingPublicKey,
+                constituentTargetBase,
+                state: await this.getStatePublicKey(),
+                ammCache,
+            },
+            remainingAccounts,
+        });
+    }
+    async updateLpPoolAum(lpPool, spotMarketIndexOfConstituents, txParams) {
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getUpdateLpPoolAumIxs(lpPool, spotMarketIndexOfConstituents), txParams), [], this.opts);
+        return txSig;
+    }
+    async getUpdateLpPoolAumIxs(lpPool, spotMarketIndexOfConstituents) {
+        const remainingAccounts = this.getRemainingAccounts({
+            userAccounts: [],
+            readableSpotMarketIndexes: spotMarketIndexOfConstituents,
+        });
+        remainingAccounts.push(...spotMarketIndexOfConstituents.map((index) => {
+            return {
+                pubkey: (0, pda_1.getConstituentPublicKey)(this.program.programId, lpPool.pubkey, index),
+                isSigner: false,
+                isWritable: true,
+            };
+        }));
+        return this.program.instruction.updateLpPoolAum({
+            accounts: {
+                keeper: this.wallet.publicKey,
+                lpPool: lpPool.pubkey,
+                state: await this.getStatePublicKey(),
+                constituentTargetBase: (0, pda_1.getConstituentTargetBasePublicKey)(this.program.programId, lpPool.pubkey),
+                ammCache: (0, pda_1.getAmmCachePublicKey)(this.program.programId),
+            },
+            remainingAccounts,
+        });
+    }
+    async updateAmmCache(perpMarketIndexes, txParams) {
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getUpdateAmmCacheIx(perpMarketIndexes), txParams), [], this.opts);
+        return txSig;
+    }
+    async getUpdateAmmCacheIx(perpMarketIndexes) {
+        if (perpMarketIndexes.length > 50) {
+            throw new Error('Cant update more than 50 markets at once');
+        }
+        const remainingAccounts = this.getRemainingAccounts({
+            userAccounts: [],
+            readablePerpMarketIndex: perpMarketIndexes,
+        });
+        return this.program.instruction.updateAmmCache({
+            accounts: {
+                state: await this.getStatePublicKey(),
+                keeper: this.wallet.publicKey,
+                ammCache: (0, pda_1.getAmmCachePublicKey)(this.program.programId),
+                quoteMarket: this.getSpotMarketAccount(0).pubkey,
+            },
+            remainingAccounts,
+        });
+    }
+    async updateConstituentOracleInfo(constituent) {
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getUpdateConstituentOracleInfoIx(constituent), undefined), [], this.opts);
+        return txSig;
+    }
+    async getUpdateConstituentOracleInfoIx(constituent) {
+        const spotMarket = this.getSpotMarketAccount(constituent.spotMarketIndex);
+        return this.program.instruction.updateConstituentOracleInfo({
+            accounts: {
+                keeper: this.wallet.publicKey,
+                constituent: constituent.pubkey,
+                state: await this.getStatePublicKey(),
+                oracle: spotMarket.oracle,
+                spotMarket: spotMarket.pubkey,
+            },
+        });
+    }
+    async lpPoolSwap(inMarketIndex, outMarketIndex, inAmount, minOutAmount, lpPool, userAuthority, txParams) {
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getLpPoolSwapIx(inMarketIndex, outMarketIndex, inAmount, minOutAmount, lpPool, userAuthority), txParams), [], this.opts);
+        return txSig;
+    }
+    async getLpPoolSwapIx(inMarketIndex, outMarketIndex, inAmount, minOutAmount, lpPool, userAuthority) {
+        const remainingAccounts = this.getRemainingAccounts({
+            userAccounts: [],
+            readableSpotMarketIndexes: [inMarketIndex, outMarketIndex],
+        });
+        const constituentInTokenAccount = (0, pda_1.getConstituentVaultPublicKey)(this.program.programId, lpPool, inMarketIndex);
+        const constituentOutTokenAccount = (0, pda_1.getConstituentVaultPublicKey)(this.program.programId, lpPool, outMarketIndex);
+        const userInTokenAccount = await (0, spl_token_1.getAssociatedTokenAddress)(this.getSpotMarketAccount(inMarketIndex).mint, userAuthority);
+        const userOutTokenAccount = await (0, spl_token_1.getAssociatedTokenAddress)(this.getSpotMarketAccount(outMarketIndex).mint, userAuthority);
+        const inConstituent = (0, pda_1.getConstituentPublicKey)(this.program.programId, lpPool, inMarketIndex);
+        const outConstituent = (0, pda_1.getConstituentPublicKey)(this.program.programId, lpPool, outMarketIndex);
+        const inMarketMint = this.getSpotMarketAccount(inMarketIndex).mint;
+        const outMarketMint = this.getSpotMarketAccount(outMarketIndex).mint;
+        const constituentTargetBase = (0, pda_1.getConstituentTargetBasePublicKey)(this.program.programId, lpPool);
+        return this.program.instruction.lpPoolSwap(inMarketIndex, outMarketIndex, inAmount, minOutAmount, {
+            remainingAccounts,
+            accounts: {
+                state: await this.getStatePublicKey(),
+                lpPool,
+                constituentTargetBase,
+                constituentInTokenAccount,
+                constituentOutTokenAccount,
+                constituentCorrelations: (0, pda_1.getConstituentCorrelationsPublicKey)(this.program.programId, lpPool),
+                userInTokenAccount,
+                userOutTokenAccount,
+                inConstituent,
+                outConstituent,
+                inMarketMint,
+                outMarketMint,
+                authority: this.wallet.publicKey,
+                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            },
+        });
+    }
+    async viewLpPoolSwapFees(inMarketIndex, outMarketIndex, inAmount, inTargetWeight, outTargetWeight, lpPool, constituentTargetBase, constituentInTokenAccount, constituentOutTokenAccount, inConstituent, outConstituent, txParams) {
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getViewLpPoolSwapFeesIx(inMarketIndex, outMarketIndex, inAmount, inTargetWeight, outTargetWeight, lpPool, constituentTargetBase, constituentInTokenAccount, constituentOutTokenAccount, inConstituent, outConstituent), txParams), [], this.opts);
+        return txSig;
+    }
+    async getViewLpPoolSwapFeesIx(inMarketIndex, outMarketIndex, inAmount, inTargetWeight, outTargetWeight, lpPool, constituentTargetBase, constituentInTokenAccount, constituentOutTokenAccount, inConstituent, outConstituent) {
+        const remainingAccounts = this.getRemainingAccounts({
+            userAccounts: [],
+            readableSpotMarketIndexes: [inMarketIndex, outMarketIndex],
+        });
+        return this.program.instruction.viewLpPoolSwapFees(inMarketIndex, outMarketIndex, inAmount, inTargetWeight, outTargetWeight, {
+            remainingAccounts,
+            accounts: {
+                driftSigner: this.getSignerPublicKey(),
+                state: await this.getStatePublicKey(),
+                lpPool,
+                constituentTargetBase,
+                constituentInTokenAccount,
+                constituentOutTokenAccount,
+                constituentCorrelations: (0, pda_1.getConstituentCorrelationsPublicKey)(this.program.programId, lpPool),
+                inConstituent,
+                outConstituent,
+                authority: this.wallet.publicKey,
+                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            },
+        });
+    }
+    async getCreateLpPoolTokenAccountIx(lpPool) {
+        const lpMint = lpPool.mint;
+        const userLpTokenAccount = await (0, pda_1.getLpPoolTokenTokenAccountPublicKey)(lpMint, this.wallet.publicKey);
+        return this.createAssociatedTokenAccountIdempotentInstruction(userLpTokenAccount, this.wallet.publicKey, this.wallet.publicKey, lpMint);
+    }
+    async createLpPoolTokenAccount(lpPool, txParams) {
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getCreateLpPoolTokenAccountIx(lpPool), txParams), [], this.opts);
+        return txSig;
+    }
+    async lpPoolAddLiquidity({ inMarketIndex, inAmount, minMintAmount, lpPool, txParams, }) {
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getLpPoolAddLiquidityIx({
+            inMarketIndex,
+            inAmount,
+            minMintAmount,
+            lpPool,
+        }), txParams), [], this.opts);
+        return txSig;
+    }
+    async getLpPoolAddLiquidityIx({ inMarketIndex, inAmount, minMintAmount, lpPool, }) {
+        const ixs = [];
+        const remainingAccounts = this.getRemainingAccounts({
+            userAccounts: [],
+            writableSpotMarketIndexes: [inMarketIndex],
+        });
+        const spotMarket = this.getSpotMarketAccount(inMarketIndex);
+        const inMarketMint = spotMarket.mint;
+        const isSolMarket = inMarketMint.equals(spotMarkets_1.WRAPPED_SOL_MINT);
+        let wSolTokenAccount;
+        if (isSolMarket) {
+            const { ixs: wSolIxs, pubkey } = await this.getWrappedSolAccountCreationIxs(inAmount, true);
+            wSolTokenAccount = pubkey;
+            ixs.push(...wSolIxs);
+        }
+        const inConstituent = (0, pda_1.getConstituentPublicKey)(this.program.programId, lpPool.pubkey, inMarketIndex);
+        const userInTokenAccount = wSolTokenAccount !== null && wSolTokenAccount !== void 0 ? wSolTokenAccount : (await this.getAssociatedTokenAccount(inMarketIndex, false));
+        const constituentInTokenAccount = (0, pda_1.getConstituentVaultPublicKey)(this.program.programId, lpPool.pubkey, inMarketIndex);
+        const lpMint = lpPool.mint;
+        const userLpTokenAccount = await (0, pda_1.getLpPoolTokenTokenAccountPublicKey)(lpMint, this.wallet.publicKey);
+        if (!(await this.checkIfAccountExists(userLpTokenAccount))) {
+            ixs.push(this.createAssociatedTokenAccountIdempotentInstruction(userLpTokenAccount, this.wallet.publicKey, this.wallet.publicKey, lpMint));
+        }
+        const constituentTargetBase = (0, pda_1.getConstituentTargetBasePublicKey)(this.program.programId, lpPool.pubkey);
+        if (!lpPool.whitelistMint.equals(web3_js_1.PublicKey.default)) {
+            const associatedTokenPublicKey = await (0, spl_token_1.getAssociatedTokenAddress)(lpPool.whitelistMint, this.wallet.publicKey);
+            remainingAccounts.push({
+                pubkey: associatedTokenPublicKey,
+                isWritable: false,
+                isSigner: false,
+            });
+        }
+        const lpPoolAddLiquidityIx = this.program.instruction.lpPoolAddLiquidity(inMarketIndex, inAmount, minMintAmount, {
+            remainingAccounts,
+            accounts: {
+                state: await this.getStatePublicKey(),
+                lpPool: lpPool.pubkey,
+                authority: this.wallet.publicKey,
+                inMarketMint,
+                inConstituent,
+                userInTokenAccount,
+                constituentInTokenAccount,
+                userLpTokenAccount,
+                lpMint,
+                lpPoolTokenVault: (0, pda_1.getLpPoolTokenVaultPublicKey)(this.program.programId, lpPool.pubkey),
+                constituentTargetBase,
+                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            },
+        });
+        ixs.push(lpPoolAddLiquidityIx);
+        if (isSolMarket && wSolTokenAccount) {
+            ixs.push((0, spl_token_1.createCloseAccountInstruction)(wSolTokenAccount, this.wallet.publicKey, this.wallet.publicKey));
+        }
+        return [...ixs];
+    }
+    async viewLpPoolAddLiquidityFees({ inMarketIndex, inAmount, lpPool, txParams, }) {
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getViewLpPoolAddLiquidityFeesIx({
+            inMarketIndex,
+            inAmount,
+            lpPool,
+        }), txParams), [], this.opts);
+        return txSig;
+    }
+    async getViewLpPoolAddLiquidityFeesIx({ inMarketIndex, inAmount, lpPool, }) {
+        const remainingAccounts = this.getRemainingAccounts({
+            userAccounts: [],
+            readableSpotMarketIndexes: [inMarketIndex],
+        });
+        const spotMarket = this.getSpotMarketAccount(inMarketIndex);
+        const inMarketMint = spotMarket.mint;
+        const inConstituent = (0, pda_1.getConstituentPublicKey)(this.program.programId, lpPool.pubkey, inMarketIndex);
+        const lpMint = lpPool.mint;
+        const constituentTargetBase = (0, pda_1.getConstituentTargetBasePublicKey)(this.program.programId, lpPool.pubkey);
+        return this.program.instruction.viewLpPoolAddLiquidityFees(inMarketIndex, inAmount, {
+            accounts: {
+                state: await this.getStatePublicKey(),
+                lpPool: lpPool.pubkey,
+                authority: this.wallet.publicKey,
+                inMarketMint,
+                inConstituent,
+                lpMint,
+                constituentTargetBase,
+            },
+            remainingAccounts,
+        });
+    }
+    async lpPoolRemoveLiquidity({ outMarketIndex, lpToBurn, minAmountOut, lpPool, txParams, }) {
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getLpPoolRemoveLiquidityIx({
+            outMarketIndex,
+            lpToBurn,
+            minAmountOut,
+            lpPool,
+        }), txParams), [], this.opts);
+        return txSig;
+    }
+    async getLpPoolRemoveLiquidityIx({ outMarketIndex, lpToBurn, minAmountOut, lpPool, }) {
+        const ixs = [];
+        const remainingAccounts = this.getRemainingAccounts({
+            userAccounts: [],
+            writableSpotMarketIndexes: [outMarketIndex],
+        });
+        const spotMarket = this.getSpotMarketAccount(outMarketIndex);
+        const outMarketMint = spotMarket.mint;
+        const outConstituent = (0, pda_1.getConstituentPublicKey)(this.program.programId, lpPool.pubkey, outMarketIndex);
+        if (outMarketMint.equals(spotMarkets_1.WRAPPED_SOL_MINT)) {
+            ixs.push((0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(this.wallet.publicKey, await this.getAssociatedTokenAccount(outMarketIndex, false), this.wallet.publicKey, spotMarkets_1.WRAPPED_SOL_MINT));
+        }
+        const userOutTokenAccount = await this.getAssociatedTokenAccount(outMarketIndex, false);
+        const constituentOutTokenAccount = (0, pda_1.getConstituentVaultPublicKey)(this.program.programId, lpPool.pubkey, outMarketIndex);
+        const lpMint = lpPool.mint;
+        const userLpTokenAccount = await (0, spl_token_1.getAssociatedTokenAddress)(lpMint, this.wallet.publicKey, true);
+        const constituentTargetBase = (0, pda_1.getConstituentTargetBasePublicKey)(this.program.programId, lpPool.pubkey);
+        ixs.push(this.program.instruction.lpPoolRemoveLiquidity(outMarketIndex, lpToBurn, minAmountOut, {
+            remainingAccounts,
+            accounts: {
+                driftSigner: this.getSignerPublicKey(),
+                state: await this.getStatePublicKey(),
+                lpPool: lpPool.pubkey,
+                authority: this.wallet.publicKey,
+                outMarketMint,
+                outConstituent,
+                userOutTokenAccount,
+                constituentOutTokenAccount,
+                userLpTokenAccount,
+                spotMarketTokenAccount: spotMarket.vault,
+                lpMint,
+                lpPoolTokenVault: (0, pda_1.getLpPoolTokenVaultPublicKey)(this.program.programId, lpPool.pubkey),
+                constituentTargetBase,
+                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                ammCache: (0, pda_1.getAmmCachePublicKey)(this.program.programId),
+            },
+        }));
+        return ixs;
+    }
+    async viewLpPoolRemoveLiquidityFees({ outMarketIndex, lpToBurn, lpPool, txParams, }) {
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getViewLpPoolRemoveLiquidityFeesIx({
+            outMarketIndex,
+            lpToBurn,
+            lpPool,
+        }), txParams), [], this.opts);
+        return txSig;
+    }
+    async getViewLpPoolRemoveLiquidityFeesIx({ outMarketIndex, lpToBurn, lpPool, }) {
+        const remainingAccounts = this.getRemainingAccounts({
+            userAccounts: [],
+            writableSpotMarketIndexes: [outMarketIndex],
+        });
+        const spotMarket = this.getSpotMarketAccount(outMarketIndex);
+        const outMarketMint = spotMarket.mint;
+        const outConstituent = (0, pda_1.getConstituentPublicKey)(this.program.programId, lpPool.pubkey, outMarketIndex);
+        const lpMint = lpPool.mint;
+        const constituentTargetBase = (0, pda_1.getConstituentTargetBasePublicKey)(this.program.programId, lpPool.pubkey);
+        return this.program.instruction.viewLpPoolRemoveLiquidityFees(outMarketIndex, lpToBurn, {
+            remainingAccounts,
+            accounts: {
+                state: await this.getStatePublicKey(),
+                lpPool: lpPool.pubkey,
+                authority: this.wallet.publicKey,
+                outMarketMint,
+                outConstituent,
+                lpMint,
+                constituentTargetBase,
+            },
+        });
+    }
+    async getAllLpPoolAddLiquidityIxs({ inMarketIndex, inAmount, minMintAmount, lpPool, }, constituentMap, includeUpdateConstituentOracleInfo = true, view = false) {
+        const ixs = [];
+        ixs.push(...(await this.getAllUpdateLpPoolAumIxs(lpPool, constituentMap, includeUpdateConstituentOracleInfo)));
+        if (view) {
+            ixs.push(await this.getViewLpPoolAddLiquidityFeesIx({
+                inMarketIndex,
+                inAmount,
+                lpPool,
+            }));
+        }
+        else {
+            ixs.push(...(await this.getLpPoolAddLiquidityIx({
+                inMarketIndex,
+                inAmount,
+                minMintAmount,
+                lpPool,
+            })));
+        }
+        return ixs;
+    }
+    async getAllLpPoolRemoveLiquidityIxs({ outMarketIndex, lpToBurn, minAmountOut, lpPool, }, constituentMap, includeUpdateConstituentOracleInfo = true, view = false) {
+        const ixs = [];
+        ixs.push(...(await this.getAllSettlePerpToLpPoolIxs(lpPool.lpPoolId, this.getPerpMarketAccounts()
+            .filter((marketAccount) => marketAccount.lpStatus > 0)
+            .map((marketAccount) => marketAccount.marketIndex))));
+        ixs.push(...(await this.getAllUpdateLpPoolAumIxs(lpPool, constituentMap, includeUpdateConstituentOracleInfo)));
+        if (view) {
+            ixs.push(await this.getViewLpPoolRemoveLiquidityFeesIx({
+                outMarketIndex,
+                lpToBurn,
+                lpPool,
+            }));
+        }
+        else {
+            ixs.push(...(await this.getLpPoolRemoveLiquidityIx({
+                outMarketIndex,
+                lpToBurn,
+                minAmountOut,
+                lpPool,
+            })));
+        }
+        return ixs;
+    }
+    async getAllUpdateLpPoolAumIxs(lpPool, constituentMap, includeUpdateConstituentOracleInfo = true) {
+        const ixs = [];
+        const constituents = Array.from(constituentMap.values());
+        if (includeUpdateConstituentOracleInfo) {
+            for (const constituent of constituents) {
+                ixs.push(await this.getUpdateConstituentOracleInfoIx(constituent));
+            }
+        }
+        const spotMarketIndexes = constituents.map((constituent) => constituent.spotMarketIndex);
+        ixs.push(await this.getUpdateLpPoolAumIxs(lpPool, spotMarketIndexes));
+        return ixs;
+    }
+    async getAllUpdateConstituentTargetBaseIxs(perpMarketIndexes, lpPool, constituentMap, includeUpdateConstituentOracleInfo = true) {
+        const ixs = [];
+        ixs.push(await this.getUpdateAmmCacheIx(perpMarketIndexes));
+        const constituents = Array.from(constituentMap.values());
+        if (includeUpdateConstituentOracleInfo) {
+            for (const constituent of constituents) {
+                ixs.push(await this.getUpdateConstituentOracleInfoIx(constituent));
+            }
+        }
+        ixs.push(await this.getUpdateLpConstituentTargetBaseIx(lpPool.lpPoolId, Array.from(constituentMap.values()).map((constituent) => constituent.pubkey)));
+        ixs.push(...(await this.getAllUpdateLpPoolAumIxs(lpPool, constituentMap, false)));
+        return ixs;
+    }
+    async getAllLpPoolSwapIxs(lpPool, constituentMap, inMarketIndex, outMarketIndex, inAmount, minOutAmount, userAuthority) {
+        const ixs = [];
+        ixs.push(...(await this.getAllUpdateLpPoolAumIxs(lpPool, constituentMap)));
+        ixs.push(await this.getLpPoolSwapIx(inMarketIndex, outMarketIndex, inAmount, minOutAmount, lpPool.pubkey, userAuthority));
+        return ixs;
+    }
+    async settlePerpToLpPool(lpPoolId, perpMarketIndexes) {
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getSettlePerpToLpPoolIx(lpPoolId, perpMarketIndexes), undefined), [], this.opts);
+        return txSig;
+    }
+    async getSettlePerpToLpPoolIx(lpPoolId, perpMarketIndexes) {
+        const remainingAccounts = [];
+        remainingAccounts.push(...perpMarketIndexes.map((index) => {
+            return {
+                pubkey: this.getPerpMarketAccount(index).pubkey,
+                isSigner: false,
+                isWritable: true,
+            };
+        }));
+        const quoteSpotMarketAccount = this.getQuoteSpotMarketAccount();
+        const lpPool = (0, pda_1.getLpPoolPublicKey)(this.program.programId, lpPoolId);
+        return this.program.instruction.settlePerpToLpPool({
+            accounts: {
+                driftSigner: this.getSignerPublicKey(),
+                state: await this.getStatePublicKey(),
+                keeper: this.wallet.publicKey,
+                ammCache: (0, pda_1.getAmmCachePublicKey)(this.program.programId),
+                quoteMarket: quoteSpotMarketAccount.pubkey,
+                constituent: (0, pda_1.getConstituentPublicKey)(this.program.programId, lpPool, 0),
+                constituentQuoteTokenAccount: (0, pda_1.getConstituentVaultPublicKey)(this.program.programId, lpPool, 0),
+                lpPool,
+                quoteTokenVault: quoteSpotMarketAccount.vault,
+                tokenProgram: this.getTokenProgramForSpotMarket(quoteSpotMarketAccount),
+            },
+            remainingAccounts,
+        });
+    }
+    async getAllSettlePerpToLpPoolIxs(lpPoolId, marketIndexes) {
+        const ixs = [];
+        ixs.push(await this.getUpdateAmmCacheIx(marketIndexes));
+        ixs.push(await this.getSettlePerpToLpPoolIx(lpPoolId, marketIndexes));
+        return ixs;
+    }
+    /**
+     * Below here are the transaction sending functions
+     */
     handleSignedTransaction(signedTxs) {
         if (this.enableMetricsEvents && this.metricsEventEmitter) {
             this.metricsEventEmitter.emit('txSigned', signedTxs);

package/lib/node/driftClientConfig.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 /// <reference types="node" />
 import { Commitment, ConfirmOptions, Connection, PublicKey, TransactionVersion } from '@solana/web3.js';
-import { IWallet, TxParams, UserAccount } from './types';
+import { IWallet, TxParams } from './types';
 import { OracleInfo } from './oracles/types';
 import { BulkAccountLoader } from './accounts/bulkAccountLoader';
 import { DriftEnv } from './config';
@@ -11,9 +11,6 @@ import { GrpcConfigs, ResubOpts, DelistedMarketSetting } from './accounts/types'
 import { Coder, Program } from '@coral-xyz/anchor';
 import { WebSocketAccountSubscriber } from './accounts/webSocketAccountSubscriber';
 import { WebSocketAccountSubscriberV2 } from './accounts/webSocketAccountSubscriberV2';
-import { WebSocketProgramAccountSubscriber } from './accounts/webSocketProgramAccountSubscriber';
-import { WebSocketDriftClientAccountSubscriberV2 } from './accounts/webSocketDriftClientAccountSubscriberV2';
-import { WebSocketDriftClientAccountSubscriber } from './accounts/webSocketDriftClientAccountSubscriber';
 import { grpcDriftClientAccountSubscriberV2 } from './accounts/grpcDriftClientAccountSubscriberV2';
 import { grpcDriftClientAccountSubscriber } from './accounts/grpcDriftClientAccountSubscriber';
 import { grpcMultiUserAccountSubscriber } from './accounts/grpcMultiUserAccountSubscriber';
@@ -59,10 +56,8 @@ export type DriftClientSubscriptionConfig = {
     resubTimeoutMs?: number;
     logResubMessages?: boolean;
     commitment?: Commitment;
-    programUserAccountSubscriber?: WebSocketProgramAccountSubscriber<UserAccount>;
     perpMarketAccountSubscriber?: new (accountName: string, program: Program, accountPublicKey: PublicKey, decodeBuffer?: (buffer: Buffer) => any, resubOpts?: ResubOpts, commitment?: Commitment) => WebSocketAccountSubscriberV2<any> | WebSocketAccountSubscriber<any>;
-    /** If you use V2 here, whatever you pass for perpMarketAccountSubscriber and oracleAccountSubscriber will be ignored and it will use v2 under the hood regardless */
-    driftClientAccountSubscriber?: new (program: Program, perpMarketIndexes: number[], spotMarketIndexes: number[], oracleInfos: OracleInfo[], shouldFindAllMarketsAndOracles: boolean, delistedMarketSetting: DelistedMarketSetting) => WebSocketDriftClientAccountSubscriber | WebSocketDriftClientAccountSubscriberV2;
+    oracleAccountSubscriber?: new (accountName: string, program: Program, accountPublicKey: PublicKey, decodeBuffer?: (buffer: Buffer) => any, resubOpts?: ResubOpts, commitment?: Commitment) => WebSocketAccountSubscriberV2<any> | WebSocketAccountSubscriber<any>;
 } | {
     type: 'polling';
     accountLoader: BulkAccountLoader;

package/lib/node/driftClientConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"driftClientConfig.d.ts","sourceRoot":"","sources":["../../src/driftClientConfig.ts"],"names":[],"mappings":";;AAAA,OAAO,EACN,UAAU,EACV,cAAc,EACd,UAAU,EACV,SAAS,EACT,kBAAkB,EAClB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EACN,WAAW,EACX,SAAS,EACT,qBAAqB,EACrB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,0BAA0B,EAAE,MAAM,uCAAuC,CAAC;AACnF,OAAO,EAAE,4BAA4B,EAAE,MAAM,yCAAyC,CAAC;AACvF,OAAO,EAAE,iCAAiC,EAAE,MAAM,8CAA8C,CAAC;AACjG,OAAO,EAAE,uCAAuC,EAAE,MAAM,oDAAoD,CAAC;AAC7G,OAAO,EAAE,qCAAqC,EAAE,MAAM,kDAAkD,CAAC;AACzG,OAAO,EAAE,kCAAkC,EAAE,MAAM,+CAA+C,CAAC;AACnG,OAAO,EAAE,gCAAgC,EAAE,MAAM,6CAA6C,CAAC;AAC/F,OAAO,EAAE,8BAA8B,EAAE,MAAM,2CAA2C,CAAC;AAE3F,MAAM,MAAM,iBAAiB,GAAG;IAC/B,UAAU,EAAE,UAAU,CAAC;IACvB,MAAM,EAAE,OAAO,CAAC;IAChB,GAAG,CAAC,EAAE,QAAQ,CAAC;IACf,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,mBAAmB,CAAC,EAAE,6BAA6B,CAAC;IACpD,IAAI,CAAC,EAAE,cAAc,CAAC;IACtB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,yCAAyC;IACzC,iBAAiB,CAAC,EAAE,SAAS,CAAC;IAC9B,kBAAkB,CAAC,EAAE,SAAS,EAAE,CAAC;IACjC,WAAW,CAAC,EAAE,UAAU,EAAE,CAAC;IAC3B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,sBAAsB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAC/C,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,SAAS,CAAC,EAAE,kBAAkB,CAAC;IAC/B,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,qBAAqB,CAAC,EAAE,qBAAqB,CAAC;IAC9C,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,KAAK,CAAC,EAAE,KAAK,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,6BAA6B,GACtC;IACA,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,WAAW,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,4BAA4B,CAAC,EAAE,KAC9B,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,OAAO,EAChB,iBAAiB,EAAE,MAAM,EAAE,EAC3B,iBAAiB,EAAE,MAAM,EAAE,EAC3B,WAAW,EAAE,UAAU,EAAE,EACzB,8BAA8B,EAAE,OAAO,EACvC,qBAAqB,EAAE,qBAAqB,KAE1C,kCAAkC,GAClC,gCAAgC,CAAC;IACpC,8BAA8B,CAAC,EAAE,8BAA8B,CAAC;CAC/D,GACD;IACA,IAAI,EAAE,WAAW,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,4BAA4B,CAAC,EAAE,iCAAiC,CAAC,WAAW,CAAC,CAAC;IAC9E,2BAA2B,CAAC,EAAE,KAC7B,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,OAAO,EAChB,gBAAgB,EAAE,SAAS,EAC3B,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,GAAG,EACtC,SAAS,CAAC,EAAE,SAAS,EACrB,UAAU,CAAC,EAAE,UAAU,KACnB,4BAA4B,CAAC,GAAG,CAAC,GAAG,0BAA0B,CAAC,GAAG,CAAC,CAAC;IACzE,qKAAqK;IACrK,4BAA4B,CAAC,EAAE,KAC9B,OAAO,EAAE,OAAO,EAChB,iBAAiB,EAAE,MAAM,EAAE,EAC3B,iBAAiB,EAAE,MAAM,EAAE,EAC3B,WAAW,EAAE,UAAU,EAAE,EACzB,8BAA8B,EAAE,OAAO,EACvC,qBAAqB,EAAE,qBAAqB,KAE1C,qCAAqC,GACrC,uCAAuC,CAAC;CAC1C,GACD;IACA,IAAI,EAAE,SAAS,CAAC;IAChB,aAAa,EAAE,iBAAiB,CAAC;CAChC,CAAC"}
+{"version":3,"file":"driftClientConfig.d.ts","sourceRoot":"","sources":["../../src/driftClientConfig.ts"],"names":[],"mappings":";;AAAA,OAAO,EACN,UAAU,EACV,cAAc,EACd,UAAU,EACV,SAAS,EACT,kBAAkB,EAClB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EACN,WAAW,EACX,SAAS,EACT,qBAAqB,EACrB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,0BAA0B,EAAE,MAAM,uCAAuC,CAAC;AACnF,OAAO,EAAE,4BAA4B,EAAE,MAAM,yCAAyC,CAAC;AACvF,OAAO,EAAE,kCAAkC,EAAE,MAAM,+CAA+C,CAAC;AACnG,OAAO,EAAE,gCAAgC,EAAE,MAAM,6CAA6C,CAAC;AAC/F,OAAO,EAAE,8BAA8B,EAAE,MAAM,2CAA2C,CAAC;AAE3F,MAAM,MAAM,iBAAiB,GAAG;IAC/B,UAAU,EAAE,UAAU,CAAC;IACvB,MAAM,EAAE,OAAO,CAAC;IAChB,GAAG,CAAC,EAAE,QAAQ,CAAC;IACf,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,mBAAmB,CAAC,EAAE,6BAA6B,CAAC;IACpD,IAAI,CAAC,EAAE,cAAc,CAAC;IACtB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,yCAAyC;IACzC,iBAAiB,CAAC,EAAE,SAAS,CAAC;IAC9B,kBAAkB,CAAC,EAAE,SAAS,EAAE,CAAC;IACjC,WAAW,CAAC,EAAE,UAAU,EAAE,CAAC;IAC3B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,sBAAsB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAC/C,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,SAAS,CAAC,EAAE,kBAAkB,CAAC;IAC/B,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,qBAAqB,CAAC,EAAE,qBAAqB,CAAC;IAC9C,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,KAAK,CAAC,EAAE,KAAK,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,6BAA6B,GACtC;IACA,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,WAAW,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,4BAA4B,CAAC,EAAE,KAC9B,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,OAAO,EAChB,iBAAiB,EAAE,MAAM,EAAE,EAC3B,iBAAiB,EAAE,MAAM,EAAE,EAC3B,WAAW,EAAE,UAAU,EAAE,EACzB,8BAA8B,EAAE,OAAO,EACvC,qBAAqB,EAAE,qBAAqB,KAE1C,kCAAkC,GAClC,gCAAgC,CAAC;IACpC,8BAA8B,CAAC,EAAE,8BAA8B,CAAC;CAC/D,GACD;IACA,IAAI,EAAE,WAAW,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,2BAA2B,CAAC,EAAE,KAC7B,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,OAAO,EAChB,gBAAgB,EAAE,SAAS,EAC3B,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,GAAG,EACtC,SAAS,CAAC,EAAE,SAAS,EACrB,UAAU,CAAC,EAAE,UAAU,KACnB,4BAA4B,CAAC,GAAG,CAAC,GAAG,0BAA0B,CAAC,GAAG,CAAC,CAAC;IACzE,uBAAuB,CAAC,EAAE,KACzB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,OAAO,EAChB,gBAAgB,EAAE,SAAS,EAC3B,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,GAAG,EACtC,SAAS,CAAC,EAAE,SAAS,EACrB,UAAU,CAAC,EAAE,UAAU,KACnB,4BAA4B,CAAC,GAAG,CAAC,GAAG,0BAA0B,CAAC,GAAG,CAAC,CAAC;CACxE,GACD;IACA,IAAI,EAAE,SAAS,CAAC;IAChB,aAAa,EAAE,iBAAiB,CAAC;CAChC,CAAC"}