@kamino-finance/kliquidity-sdk 8.4.7 → 8.4.8-beta.0

package/dist/services/MeteoraService.d.ts

@@ -1,29 +1,26 @@
-import { Address, Rpc, SolanaRpcApi } from '@solana/kit';
+import { Connection, PublicKey } from '@solana/web3.js';
 import Decimal from 'decimal.js';
-import { WhirlpoolStrategy } from '../@codegen/kliquidity/accounts';
+import { WhirlpoolStrategy } from '../kamino-client/accounts';
 import { GenericPoolInfo, LiquidityDistribution } from '../utils';
-import { LbPair, PositionV2 } from '../@codegen/meteora/accounts';
+import { LbPair, PositionV2 } from '../meteora_client/accounts';
 import { WhirlpoolAprApy } from './WhirlpoolAprApy';
-import { MeteoraPoolAPI } from './MeteoraPoolsResponse';
 export interface MeteoraPool {
-    key: Address;
+    key: PublicKey;
     pool: LbPair;
 }
 export declare class MeteoraService {
-    private readonly _rpc;
+    private readonly _connection;
     private readonly _meteoraProgramId;
-    private readonly _meteoraApiUrl;
-    constructor(rpc: Rpc<SolanaRpcApi>, meteoraProgramId?: Address);
-    getMeteoraProgramId(): Address;
-    getPool(poolAddress: Address): Promise<LbPair | null>;
-    getPosition(position: Address): Promise<PositionV2 | null>;
+    constructor(connection: Connection, meteoraProgramId?: PublicKey);
+    getMeteoraProgramId(): PublicKey;
+    getPool(poolAddress: PublicKey): Promise<LbPair | null>;
+    getPosition(position: PublicKey): Promise<PositionV2 | null>;
     getMeteoraPools(): Promise<MeteoraPool[]>;
-    getMeteoraPoolsFromAPI(tokens?: Address[], maxPages?: number, maxPageSize?: number): Promise<MeteoraPoolAPI[]>;
     getStrategyMeteoraPoolAprApy(strategy: WhirlpoolStrategy): Promise<WhirlpoolAprApy>;
-    getMeteoraLiquidityDistribution(poolKey: Address, keepOrder?: boolean, lowestTick?: number, highestTick?: number): Promise<LiquidityDistribution>;
-    getMeteoraPositionAprApy(poolPubkey: Address, priceLower: Decimal, priceUpper: Decimal): Promise<WhirlpoolAprApy>;
-    getGenericPoolInfo(poolPubkey: Address): Promise<GenericPoolInfo>;
-    getPositionsCountByPool(pool: Address): Promise<number>;
+    getMeteoraLiquidityDistribution(poolKey: PublicKey, keepOrder?: boolean, lowestTick?: number, highestTick?: number): Promise<LiquidityDistribution>;
+    getMeteoraPositionAprApy(poolPubkey: PublicKey, priceLower: Decimal, priceUpper: Decimal): Promise<WhirlpoolAprApy>;
+    getGenericPoolInfo(poolPubkey: PublicKey): Promise<GenericPoolInfo>;
+    getPositionsCountByPool(pool: PublicKey): Promise<number>;
 }
 export declare function computeMeteoraFee(pool: LbPair): Decimal;
 //# sourceMappingURL=MeteoraService.d.ts.map

package/dist/services/MeteoraService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MeteoraService.d.ts","sourceRoot":"","sources":["../../src/services/MeteoraService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,OAAO,EAAsB,GAAG,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AACtF,OAAO,OAAO,MAAM,YAAY,CAAC;AAEjC,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAEL,eAAe,EAIf,qBAAqB,EAEtB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAKpD,OAAO,EAAE,cAAc,EAAwB,MAAM,wBAAwB,CAAC;AAE9E,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,OAAO,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAoB;IACzC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAU;IAC5C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAS;gBAE5B,GAAG,EAAE,GAAG,CAAC,YAAY,CAAC,EAAE,gBAAgB,GAAE,OAA4B;IAMlF,mBAAmB,IAAI,OAAO;IAIxB,OAAO,CAAC,WAAW,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAIrD,WAAW,CAAC,QAAQ,EAAE,OAAO,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;IAI1D,eAAe,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;IAwBzC,sBAAsB,CAAC,MAAM,GAAE,OAAO,EAAO,EAAE,QAAQ,SAAM,EAAE,WAAW,SAAM,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IA2D5G,4BAA4B,CAAC,QAAQ,EAAE,iBAAiB,GAAG,OAAO,CAAC,eAAe,CAAC;IA6DnF,+BAA+B,CACnC,OAAO,EAAE,OAAO,EAChB,SAAS,GAAE,OAAc,EACzB,UAAU,CAAC,EAAE,MAAM,EACnB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,qBAAqB,CAAC;IAiC3B,wBAAwB,CAC5B,UAAU,EAAE,OAAO,EACnB,UAAU,EAAE,OAAO,EACnB,UAAU,EAAE,OAAO,GAClB,OAAO,CAAC,eAAe,CAAC;IAmDrB,kBAAkB,CAAC,UAAU,EAAE,OAAO,GAAG,OAAO,CAAC,eAAe,CAAC;IAqCjE,uBAAuB,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;CAa9D;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEvD"}
+{"version":3,"file":"MeteoraService.d.ts","sourceRoot":"","sources":["../../src/services/MeteoraService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAEL,eAAe,EAIf,qBAAqB,EAEtB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAIpD,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,SAAS,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd;AAED,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAa;IACzC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAY;gBAElC,UAAU,EAAE,UAAU,EAAE,gBAAgB,GAAE,SAA8B;IAKpF,mBAAmB,IAAI,SAAS;IAI1B,OAAO,CAAC,WAAW,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAIvD,WAAW,CAAC,QAAQ,EAAE,SAAS,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;IAI5D,eAAe,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;IAiBzC,4BAA4B,CAAC,QAAQ,EAAE,iBAAiB,GAAG,OAAO,CAAC,eAAe,CAAC;IA6DnF,+BAA+B,CACnC,OAAO,EAAE,SAAS,EAClB,SAAS,GAAE,OAAc,EACzB,UAAU,CAAC,EAAE,MAAM,EACnB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,qBAAqB,CAAC;IAiC3B,wBAAwB,CAC5B,UAAU,EAAE,SAAS,EACrB,UAAU,EAAE,OAAO,EACnB,UAAU,EAAE,OAAO,GAClB,OAAO,CAAC,eAAe,CAAC;IAmDrB,kBAAkB,CAAC,UAAU,EAAE,SAAS,GAAG,OAAO,CAAC,eAAe,CAAC;IAqCnE,uBAAuB,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;CAQhE;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEvD"}

package/dist/services/MeteoraService.js

@@ -5,47 +5,37 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MeteoraService = void 0;
 exports.computeMeteoraFee = computeMeteoraFee;
-const kit_1 = require("@solana/kit");
+const web3_js_1 = require("@solana/web3.js");
 const decimal_js_1 = __importDefault(require("decimal.js"));
-const axios_1 = __importDefault(require("axios"));
 const utils_1 = require("../utils");
-const accounts_1 = require("../@codegen/meteora/accounts");
-const programId_1 = require("../@codegen/meteora/programId");
+const accounts_1 = require("../meteora_client/accounts");
+const programId_1 = require("../meteora_client/programId");
 const meteora_1 = require("../utils/meteora");
-const pubkeys_1 = require("../constants/pubkeys");
-const fzstd_1 = require("fzstd");
 class MeteoraService {
-    _rpc;
+    _connection;
     _meteoraProgramId;
-    _meteoraApiUrl;
-    constructor(rpc, meteoraProgramId = programId_1.PROGRAM_ID) {
-        this._rpc = rpc;
+    constructor(connection, meteoraProgramId = programId_1.METEORA_PROGRAM_ID) {
+        this._connection = connection;
         this._meteoraProgramId = meteoraProgramId;
-        this._meteoraApiUrl = 'https://dlmm-api.meteora.ag';
     }
     getMeteoraProgramId() {
         return this._meteoraProgramId;
     }
     async getPool(poolAddress) {
-        return await accounts_1.LbPair.fetch(this._rpc, poolAddress);
+        return await accounts_1.LbPair.fetch(this._connection, poolAddress);
     }
     async getPosition(position) {
-        return await accounts_1.PositionV2.fetch(this._rpc, position);
+        return await accounts_1.PositionV2.fetch(this._connection, position);
     }
     async getMeteoraPools() {
-        const rawPools = await this._rpc
-            .getProgramAccounts(programId_1.PROGRAM_ID, {
+        const rawPools = await this._connection.getProgramAccounts(programId_1.METEORA_PROGRAM_ID, {
             commitment: 'confirmed',
-            filters: [{ dataSize: 904n }],
-            encoding: 'base64+zstd',
-        })
-            .send();
+            filters: [{ dataSize: 904 }],
+        });
         const pools = [];
         for (let i = 0; i < rawPools.length; i++) {
             try {
-                const compressedData = Buffer.from(rawPools[i].account.data[0], 'base64');
-                const decompressedData = (0, fzstd_1.decompress)(compressedData);
-                const lbPair = accounts_1.LbPair.decode(Buffer.from(decompressedData));
+                const lbPair = accounts_1.LbPair.decode(rawPools[i].account.data);
                 pools.push({ pool: lbPair, key: rawPools[i].pubkey });
             }
             catch (e) {
@@ -54,58 +44,6 @@ class MeteoraService {
         }
         return pools;
     }
-    // Fetch all Meteora pools from their API with pagination support
-    async getMeteoraPoolsFromAPI(tokens = [], maxPages = 300, maxPageSize = 100) {
-        const allPoolsAPI = [];
-        let offset = 0;
-        let hasMore = true;
-        let pageCount = 0;
-        // First, fetch all pool data from the API
-        while (hasMore && pageCount < maxPages) {
-            pageCount++;
-            const url = new URL(`${this._meteoraApiUrl}/pair/all_with_pagination`);
-            url.searchParams.set('limit', maxPageSize.toString());
-            url.searchParams.set('offset', offset.toString());
-            // Add token filtering if provided
-            if (tokens.length === 1) {
-                url.searchParams.set('token', tokens[0]);
-            }
-            else if (tokens.length === 2) {
-                url.searchParams.set('token_x', tokens[0]);
-                url.searchParams.set('token_y', tokens[1]);
-            }
-            const response = await axios_1.default.get(url.toString());
-            const data = response.data;
-            // Add pools from this page to our collection
-            // The Meteora API returns { pairs: [...pools...], total: number }
-            if (data.pairs && Array.isArray(data.pairs) && data.pairs.length > 0) {
-                allPoolsAPI.push(...data.pairs);
-                offset += data.pairs.length;
-            }
-            // Check if there are more pages
-            const responseLength = data.pairs ? data.pairs.length : 0;
-            if (responseLength < maxPageSize) {
-                hasMore = false;
-            }
-            // Check total if available
-            if (data.total && allPoolsAPI.length >= data.total) {
-                hasMore = false;
-            }
-            // Check pagination metadata if available
-            if (data.meta) {
-                if (data.meta.cursor && !data.meta.cursor.next) {
-                    hasMore = false;
-                }
-                if (data.meta.total && allPoolsAPI.length >= data.meta.total) {
-                    hasMore = false;
-                }
-            }
-        }
-        if (pageCount >= maxPages) {
-            throw new Error(`Reached maximum page limit (${maxPages}). There might be more pools available.`);
-        }
-        return allPoolsAPI;
-    }
     async getStrategyMeteoraPoolAprApy(strategy) {
         const position = await this.getPosition(strategy.position);
         const pool = await this.getPool(strategy.pool);
@@ -164,8 +102,8 @@ class MeteoraService {
             };
         }
         const currentTickIndex = pool.activeId;
-        const tokenXDecimals = await (0, utils_1.getMintDecimals)(this._rpc, pool.tokenXMint);
-        const tokenYDecimals = await (0, utils_1.getMintDecimals)(this._rpc, pool.tokenYMint);
+        const tokenXDecimals = await (0, utils_1.getMintDecimals)(this._connection, pool.tokenXMint);
+        const tokenYDecimals = await (0, utils_1.getMintDecimals)(this._connection, pool.tokenYMint);
         const currentPrice = (0, meteora_1.getPriceOfBinByBinIdWithDecimals)(currentTickIndex, pool.binStep, tokenXDecimals, tokenYDecimals);
         // TODO: add actual distribution
         return {
@@ -190,8 +128,8 @@ class MeteoraService {
                 totalApr: utils_1.ZERO,
             };
         }
-        const tokenXDecimals = await (0, utils_1.getMintDecimals)(this._rpc, pool.tokenXMint);
-        const tokenYDecimals = await (0, utils_1.getMintDecimals)(this._rpc, pool.tokenYMint);
+        const tokenXDecimals = await (0, utils_1.getMintDecimals)(this._connection, pool.tokenXMint);
+        const tokenYDecimals = await (0, utils_1.getMintDecimals)(this._connection, pool.tokenYMint);
         const priceRange = (0, utils_1.getStrategyPriceRangeMeteora)(priceLower, priceUpper, pool.activeId, pool.binStep, tokenXDecimals, tokenYDecimals);
         if (priceRange.strategyOutOfRange) {
             return {
@@ -222,9 +160,9 @@ class MeteoraService {
         if (!pool) {
             return {
                 dex: 'METEORA',
-                address: pubkeys_1.DEFAULT_PUBLIC_KEY,
-                tokenMintA: pubkeys_1.DEFAULT_PUBLIC_KEY,
-                tokenMintB: pubkeys_1.DEFAULT_PUBLIC_KEY,
+                address: new web3_js_1.PublicKey(0),
+                tokenMintA: new web3_js_1.PublicKey(0),
+                tokenMintB: new web3_js_1.PublicKey(0),
                 price: new decimal_js_1.default(0),
                 feeRate: new decimal_js_1.default(0),
                 volumeOnLast7d: new decimal_js_1.default(0),
@@ -233,12 +171,12 @@ class MeteoraService {
                 positions: new decimal_js_1.default(0),
             };
         }
-        const tokenXDecimals = await (0, utils_1.getMintDecimals)(this._rpc, pool.tokenXMint);
-        const tokenYDecimals = await (0, utils_1.getMintDecimals)(this._rpc, pool.tokenYMint);
+        const tokenXDecimals = await (0, utils_1.getMintDecimals)(this._connection, pool.tokenXMint);
+        const tokenYDecimals = await (0, utils_1.getMintDecimals)(this._connection, pool.tokenYMint);
         const price = (0, meteora_1.getPriceOfBinByBinIdWithDecimals)(pool.activeId, pool.binStep, tokenXDecimals, tokenYDecimals);
         const poolInfo = {
             dex: 'METEORA',
-            address: (0, kit_1.address)(poolPubkey),
+            address: new web3_js_1.PublicKey(poolPubkey),
             tokenMintA: pool.tokenXMint,
             tokenMintB: pool.tokenYMint,
             price,
@@ -253,15 +191,10 @@ class MeteoraService {
         return poolInfo;
     }
     async getPositionsCountByPool(pool) {
-        const rawPositions = await this._rpc
-            .getProgramAccounts(programId_1.PROGRAM_ID, {
+        const rawPositions = await this._connection.getProgramAccounts(programId_1.METEORA_PROGRAM_ID, {
             commitment: 'confirmed',
-            filters: [
-                { dataSize: 8120n },
-                { memcmp: { bytes: pool.toString(), offset: 8n, encoding: 'base58' } },
-            ],
-        })
-            .send();
+            filters: [{ dataSize: 8120 }, { memcmp: { bytes: pool.toBase58(), offset: 8 } }],
+        });
         return rawPositions.length;
     }
 }

package/dist/services/MeteoraService.js.map

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

package/dist/services/OrcaService.d.ts

@@ -1,19 +1,21 @@
-import { Address, Rpc, SolanaRpcApi } from '@solana/kit';
+import { Connection, PublicKey } from '@solana/web3.js';
 import Decimal from 'decimal.js';
-import { Whirlpool as WhirlpoolAPIResponse } from './OrcaWhirlpoolsResponse';
-import { WhirlpoolStrategy } from '../@codegen/kliquidity/accounts';
+import { PoolData } from '@orca-so/whirlpool-sdk';
+import { OrcaWhirlpoolsResponse, Whirlpool } from './OrcaWhirlpoolsResponse';
+import { SolanaCluster } from '@hubbleprotocol/hubble-config';
+import { WhirlpoolStrategy } from '../kamino-client/accounts';
 import { WhirlpoolAprApy } from './WhirlpoolAprApy';
 import { GenericPoolInfo, LiquidityDistribution } from '../utils';
-import { CollateralInfo } from '../@codegen/kliquidity/types';
+import { CollateralInfo } from '../kamino-client/types';
 import { KaminoPrices } from '../models';
 export declare class OrcaService {
-    private readonly _rpc;
-    private readonly _whirlpoolProgramId;
+    private readonly _connection;
+    private readonly _whirilpoolProgramId;
+    private readonly _orcaNetwork;
     private readonly _orcaApiUrl;
-    constructor(rpc: Rpc<SolanaRpcApi>, whirlpoolProgramId?: Address);
-    getWhirlpoolProgramId(): Address;
-    getOrcaWhirlpools(tokens?: Address[]): Promise<WhirlpoolAPIResponse[]>;
-    getOrcaWhirlpool(poolAddress: Address): Promise<WhirlpoolAPIResponse>;
+    constructor(connection: Connection, cluster: SolanaCluster, whirlpoolProgramId?: PublicKey);
+    getWhirlpoolProgramId(): PublicKey;
+    getOrcaWhirlpools(): Promise<OrcaWhirlpoolsResponse>;
     /**
      * Get token prices for a strategy - for use with orca sdk
      * @param strategy
@@ -24,10 +26,11 @@ export declare class OrcaService {
      */
     private getTokenPrices;
     private getPoolTokensPrices;
-    getStrategyWhirlpoolPoolAprApy(strategy: WhirlpoolStrategy, collateralInfos: CollateralInfo[], prices: KaminoPrices): Promise<WhirlpoolAprApy>;
-    getWhirlpoolLiquidityDistribution(pool: Address, keepOrder?: boolean, lowestTick?: number, highestTick?: number): Promise<LiquidityDistribution>;
-    getWhirlpoolPositionAprApy(poolPubkey: Address, priceLower: Decimal, priceUpper: Decimal, prices: KaminoPrices, rewardsDecimals: Map<Address, number>): Promise<WhirlpoolAprApy>;
-    getGenericPoolInfo(poolPubkey: Address): Promise<GenericPoolInfo>;
-    getPositionsCountByPool(pool: Address): Promise<number>;
+    getPool(poolAddress: PublicKey): Promise<PoolData | null>;
+    getStrategyWhirlpoolPoolAprApy(strategy: WhirlpoolStrategy, collateralInfos: CollateralInfo[], prices: KaminoPrices, whirlpools?: Whirlpool[]): Promise<WhirlpoolAprApy>;
+    getWhirlpoolLiquidityDistribution(pool: PublicKey, keepOrder?: boolean, lowestTick?: number, highestTick?: number): Promise<LiquidityDistribution>;
+    getWhirlpoolPositionAprApy(poolPubkey: PublicKey, priceLower: Decimal, priceUpper: Decimal, prices: KaminoPrices, whirlpools?: Whirlpool[]): Promise<WhirlpoolAprApy>;
+    getGenericPoolInfo(poolPubkey: PublicKey, whirlpools?: Whirlpool[]): Promise<GenericPoolInfo>;
+    getPositionsCountByPool(pool: PublicKey): Promise<number>;
 }
 //# sourceMappingURL=OrcaService.d.ts.map

package/dist/services/OrcaService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OrcaService.d.ts","sourceRoot":"","sources":["../../src/services/OrcaService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,OAAO,EAAsB,GAAG,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AACtF,OAAO,OAAO,MAAM,YAAY,CAAC;AAEjC,OAAO,EAA0B,SAAS,IAAI,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AACrG,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAEpE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAGL,eAAe,EAMf,qBAAqB,EAGtB,MAAM,UAAU,CAAC;AAElB,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAGzC,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAoB;IACzC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAU;IAC9C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;gBAGnC,GAAG,EAAE,GAAG,CAAC,YAAY,CAAC,EACtB,kBAAkB,GAAE,OAA+B;IAOrD,qBAAqB,IAAI,OAAO;IAK1B,iBAAiB,CAAC,MAAM,GAAE,OAAO,EAAO,GAAG,OAAO,CAAC,oBAAoB,EAAE,CAAC;IAqD1E,gBAAgB,CAAC,WAAW,EAAE,OAAO,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAW3E;;;;;;;OAOG;IACH,OAAO,CAAC,cAAc;IAuCtB,OAAO,CAAC,mBAAmB;IAsBrB,8BAA8B,CAClC,QAAQ,EAAE,iBAAiB,EAC3B,eAAe,EAAE,cAAc,EAAE,EACjC,MAAM,EAAE,YAAY,GACnB,OAAO,CAAC,eAAe,CAAC;IA6ErB,iCAAiC,CACrC,IAAI,EAAE,OAAO,EACb,SAAS,GAAE,OAAc,EACzB,UAAU,CAAC,EAAE,MAAM,EACnB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,qBAAqB,CAAC;IAoD3B,0BAA0B,CAC9B,UAAU,EAAE,OAAO,EACnB,UAAU,EAAE,OAAO,EACnB,UAAU,EAAE,OAAO,EACnB,MAAM,EAAE,YAAY,EACpB,eAAe,EAAE,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,GACpC,OAAO,CAAC,eAAe,CAAC;IAiErB,kBAAkB,CAAC,UAAU,EAAE,OAAO;IAsBtC,uBAAuB,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;CAc9D"}
+{"version":3,"file":"OrcaService.d.ts","sourceRoot":"","sources":["../../src/services/OrcaService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAML,QAAQ,EACT,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,sBAAsB,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAE9D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAEL,eAAe,EAEf,qBAAqB,EAGtB,MAAM,UAAU,CAAC;AAElB,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEzC,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAa;IACzC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAY;IACjD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAc;IAC3C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;gBAEzB,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,aAAa,EAAE,kBAAkB,GAAE,SAAgC;IAOhH,qBAAqB,IAAI,SAAS;IAI5B,iBAAiB;IAIvB;;;;;;;OAOG;IACH,OAAO,CAAC,cAAc;IAuCtB,OAAO,CAAC,mBAAmB;IAsBrB,OAAO,CAAC,WAAW,EAAE,SAAS;IAQ9B,8BAA8B,CAClC,QAAQ,EAAE,iBAAiB,EAC3B,eAAe,EAAE,cAAc,EAAE,EACjC,MAAM,EAAE,YAAY,EACpB,UAAU,CAAC,EAAE,SAAS,EAAE,GACvB,OAAO,CAAC,eAAe,CAAC;IAkErB,iCAAiC,CACrC,IAAI,EAAE,SAAS,EACf,SAAS,GAAE,OAAc,EACzB,UAAU,CAAC,EAAE,MAAM,EACnB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,qBAAqB,CAAC;IAqD3B,0BAA0B,CAC9B,UAAU,EAAE,SAAS,EACrB,UAAU,EAAE,OAAO,EACnB,UAAU,EAAE,OAAO,EACnB,MAAM,EAAE,YAAY,EACpB,UAAU,CAAC,EAAE,SAAS,EAAE,GACvB,OAAO,CAAC,eAAe,CAAC;IAqErB,kBAAkB,CAAC,UAAU,EAAE,SAAS,EAAE,UAAU,CAAC,EAAE,SAAS,EAAE;IAkClE,uBAAuB,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;CAYhE"}