@kamino-finance/kliquidity-sdk 8.2.1 → 8.3.1

package/dist/services/OrcaService.js

@@ -4,26 +4,28 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OrcaService = void 0;
-const web3_js_1 = require("@solana/web3.js");
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const whirlpool_sdk_1 = require("@orca-so/whirlpool-sdk");
 const axios_1 = __importDefault(require("axios"));
-const whirlpools_client_1 = require("../whirlpools-client");
+const accounts_1 = require("../@codegen/whirlpools/accounts");
 const utils_1 = require("../utils");
-const programId_1 = require("../whirlpools-client/programId");
+const programId_1 = require("../@codegen/whirlpools/programId");
+const compat_1 = require("@solana/compat");
 class OrcaService {
-    _connection;
-    _whirilpoolProgramId;
+    _rpc;
+    _legacyConnection;
+    _whirlpoolProgramId;
     _orcaNetwork;
     _orcaApiUrl;
-    constructor(connection, cluster, whirlpoolProgramId = programId_1.WHIRLPOOL_PROGRAM_ID) {
-        this._connection = connection;
-        this._whirilpoolProgramId = whirlpoolProgramId;
+    constructor(rpc, legacyConnection, cluster, whirlpoolProgramId = programId_1.PROGRAM_ID) {
+        this._rpc = rpc;
+        this._legacyConnection = legacyConnection;
+        this._whirlpoolProgramId = whirlpoolProgramId;
         this._orcaNetwork = cluster === 'mainnet-beta' ? whirlpool_sdk_1.OrcaNetwork.MAINNET : whirlpool_sdk_1.OrcaNetwork.DEVNET;
         this._orcaApiUrl = `https://api.${cluster === 'mainnet-beta' ? 'mainnet' : 'devnet'}.orca.so`;
     }
     getWhirlpoolProgramId() {
-        return this._whirilpoolProgramId;
+        return this._whirlpoolProgramId;
     }
     async getOrcaWhirlpools() {
         return (await axios_1.default.get(`${this._orcaApiUrl}/v1/whirlpool/list`)).data;
@@ -87,17 +89,17 @@ class OrcaService {
     }
     async getPool(poolAddress) {
         const orca = new whirlpool_sdk_1.OrcaWhirlpoolClient({
-            connection: this._connection,
+            connection: this._legacyConnection,
             network: this._orcaNetwork,
         });
-        return await orca.getPool(poolAddress);
+        return orca.getPool(poolAddress);
     }
     async getStrategyWhirlpoolPoolAprApy(strategy, collateralInfos, prices, whirlpools) {
         const orca = new whirlpool_sdk_1.OrcaWhirlpoolClient({
-            connection: this._connection,
+            connection: this._legacyConnection,
             network: this._orcaNetwork,
         });
-        const position = await whirlpools_client_1.Position.fetch(this._connection, strategy.position);
+        const position = await accounts_1.Position.fetch(this._rpc, strategy.position);
         if (!position) {
             throw new Error(`Position ${strategy.position.toString()} does not exist`);
         }
@@ -105,7 +107,7 @@ class OrcaService {
         if (!whirlpools) {
             ({ whirlpools } = await this.getOrcaWhirlpools());
         }
-        const whirlpool = whirlpools?.find((x) => x.address === strategy.pool.toString());
+        const whirlpool = whirlpools?.find((x) => x.address === strategy.pool);
         if (!pool || !whirlpool) {
             throw Error(`Could not get orca pool data for ${strategy.pool.toString()}`);
         }
@@ -142,7 +144,7 @@ class OrcaService {
     // strongly recommended to pass lowestTick and highestTick because fetching the lowest and highest existent takes very long
     async getWhirlpoolLiquidityDistribution(pool, keepOrder = true, lowestTick, highestTick) {
         const orca = new whirlpool_sdk_1.OrcaWhirlpoolClient({
-            connection: this._connection,
+            connection: this._legacyConnection,
             network: this._orcaNetwork,
         });
         const poolData = await orca.getPool(pool);
@@ -185,7 +187,7 @@ class OrcaService {
     }
     async getWhirlpoolPositionAprApy(poolPubkey, priceLower, priceUpper, prices, whirlpools) {
         const orca = new whirlpool_sdk_1.OrcaWhirlpoolClient({
-            connection: this._connection,
+            connection: this._legacyConnection,
             network: this._orcaNetwork,
         });
         const pool = await orca.getPool(poolPubkey);
@@ -239,7 +241,7 @@ class OrcaService {
     }
     async getGenericPoolInfo(poolPubkey, whirlpools) {
         const orca = new whirlpool_sdk_1.OrcaWhirlpoolClient({
-            connection: this._connection,
+            connection: this._legacyConnection,
             network: this._orcaNetwork,
         });
         const poolString = poolPubkey.toString();
@@ -253,9 +255,9 @@ class OrcaService {
         }
         const poolInfo = {
             dex: 'ORCA',
-            address: new web3_js_1.PublicKey(poolPubkey),
-            tokenMintA: pool.tokenMintA,
-            tokenMintB: pool.tokenMintB,
+            address: poolPubkey,
+            tokenMintA: (0, compat_1.fromLegacyPublicKey)(pool.tokenMintA),
+            tokenMintB: (0, compat_1.fromLegacyPublicKey)(pool.tokenMintB),
             price: pool.price,
             feeRate: pool.feePercentage,
             volumeOnLast7d: whirlpool.volume ? new decimal_js_1.default(whirlpool.volume?.week) : undefined,
@@ -267,14 +269,16 @@ class OrcaService {
         return poolInfo;
     }
     async getPositionsCountByPool(pool) {
-        const rawPositions = await this._connection.getProgramAccounts(programId_1.WHIRLPOOL_PROGRAM_ID, {
+        const rawPositions = await this._rpc
+            .getProgramAccounts(programId_1.PROGRAM_ID, {
             commitment: 'confirmed',
             filters: [
                 // account LAYOUT: https://github.com/orca-so/whirlpools/blob/main/programs/whirlpool/src/state/position.rs#L20
-                { dataSize: 216 },
-                { memcmp: { bytes: pool.toBase58(), offset: 8 } },
+                { dataSize: 216n },
+                { memcmp: { bytes: pool, offset: 8n, encoding: 'base58' } },
             ],
-        });
+        })
+            .send();
         return rawPositions.length;
     }
 }

package/dist/services/OrcaService.js.map

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

package/dist/services/PoolSimulationService.d.ts

@@ -1,8 +1,8 @@
 import { PoolSimulationResponse } from '../models/PoolSimulationResponseData';
 import Decimal from 'decimal.js';
-import { PublicKey } from '@solana/web3.js';
+import { Address } from '@solana/kit';
 export type SimulationParameters = {
-    poolAddress: PublicKey;
+    poolAddress: Address;
     depositDate: string;
     endDate: string;
 };

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

@@ -1 +1 @@
-{"version":3,"file":"PoolSimulationService.d.ts","sourceRoot":"","sources":["../../src/services/PoolSimulationService.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAC9E,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,MAAM,MAAM,oBAAoB,GAAG;IACjC,WAAW,EAAE,SAAS,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,8BAA8B,GAAG,oBAAoB,GAAG;IAClE,UAAU,EAAE,OAAO,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,kCAAkC,GAAG,oBAAoB,GAAG;IACtE,oBAAoB,EAAE,MAAM,CAAC;IAC7B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,wBAAwB,CAAC,EAAE,MAAM,CAAC;CACnC,CAAC;AAEF,wBAAsB,kBAAkB,CAAC,MAAM,EAAE,8BAA8B,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAShH;AAED,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,kCAAkC,GACzC,OAAO,CAAC,sBAAsB,CAAC,CAKjC"}
+{"version":3,"file":"PoolSimulationService.d.ts","sourceRoot":"","sources":["../../src/services/PoolSimulationService.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAC9E,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,MAAM,MAAM,oBAAoB,GAAG;IACjC,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,8BAA8B,GAAG,oBAAoB,GAAG;IAClE,UAAU,EAAE,OAAO,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,kCAAkC,GAAG,oBAAoB,GAAG;IACtE,oBAAoB,EAAE,MAAM,CAAC;IAC7B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,wBAAwB,CAAC,EAAE,MAAM,CAAC;CACnC,CAAC;AAEF,wBAAsB,kBAAkB,CAAC,MAAM,EAAE,8BAA8B,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAShH;AAED,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,kCAAkC,GACzC,OAAO,CAAC,sBAAsB,CAAC,CAKjC"}

package/dist/services/RaydiumPoolsResponse.d.ts

@@ -1,4 +1,4 @@
-import { ClmmConfigInfo } from "@raydium-io/raydium-sdk-v2/lib";
+import { ClmmConfigInfo } from '@raydium-io/raydium-sdk-v2/lib';
 export interface RaydiumPoolsResponse {
     data: Pool[];
 }

package/dist/services/RaydiumService.d.ts

@@ -1,21 +1,23 @@
-import { Connection, PublicKey } from '@solana/web3.js';
+import { Address, Rpc, SolanaRpcApi } from '@solana/kit';
 import { Pool, RaydiumPoolsResponse } from './RaydiumPoolsResponse';
 import Decimal from 'decimal.js';
 import { WhirlpoolAprApy } from './WhirlpoolAprApy';
-import { WhirlpoolStrategy } from '../kamino-client/accounts';
+import { WhirlpoolStrategy } from '../@codegen/kliquidity/accounts';
 import { GenericPoolInfo, LiquidityDistribution } from '../utils';
 import { ApiV3PoolInfoConcentratedItem } from '@raydium-io/raydium-sdk-v2/lib';
+import { Connection } from '@solana/web3.js';
 export declare class RaydiumService {
-    private readonly _connection;
+    private readonly _rpc;
+    private readonly _legacyConnection;
     private readonly _raydiumProgramId;
-    constructor(connection: Connection, raydiumProgramId?: PublicKey);
-    getRaydiumProgramId(): PublicKey;
+    constructor(rpc: Rpc<SolanaRpcApi>, legacyConnection: Connection, raydiumProgramId?: Address);
+    getRaydiumProgramId(): Address;
     getRaydiumWhirlpools(): Promise<RaydiumPoolsResponse>;
-    getRaydiumPoolInfo(poolPubkey: PublicKey): Promise<ApiV3PoolInfoConcentratedItem>;
-    getRaydiumPoolLiquidityDistribution(pool: PublicKey, keepOrder?: boolean, lowestTick?: number, highestTick?: number): Promise<LiquidityDistribution>;
+    getRaydiumPoolInfo(poolPubkey: Address): Promise<ApiV3PoolInfoConcentratedItem>;
+    getRaydiumPoolLiquidityDistribution(pool: Address, keepOrder?: boolean, lowestTick?: number, highestTick?: number): Promise<LiquidityDistribution>;
     getStrategyWhirlpoolPoolAprApy: (strategy: WhirlpoolStrategy, pools?: Pool[]) => Promise<WhirlpoolAprApy>;
-    getRaydiumPositionAprApy: (poolPubkey: PublicKey, priceLower: Decimal, priceUpper: Decimal, pools?: Pool[]) => Promise<WhirlpoolAprApy>;
-    getGenericPoolInfo(poolPubkey: PublicKey, pools?: Pool[]): Promise<GenericPoolInfo>;
-    getPositionsCountByPool(pool: PublicKey): Promise<number>;
+    getRaydiumPositionAprApy: (poolPubkey: Address, priceLower: Decimal, priceUpper: Decimal, pools?: Pool[]) => Promise<WhirlpoolAprApy>;
+    getGenericPoolInfo(poolPubkey: Address, pools?: Pool[]): Promise<GenericPoolInfo>;
+    getPositionsCountByPool(pool: Address): Promise<number>;
 }
 //# sourceMappingURL=RaydiumService.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"RaydiumService.d.ts","sourceRoot":"","sources":["../../src/services/RaydiumService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAEL,IAAI,EACJ,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAEL,eAAe,EAEf,qBAAqB,EAGtB,MAAM,UAAU,CAAC;AAKlB,OAAO,EACL,6BAA6B,EAQ9B,MAAM,gCAAgC,CAAC;AAExC,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,oBAAoB,IAAI,OAAO,CAAC,oBAAoB,CAAC;IAIrD,kBAAkB,CAAC,UAAU,EAAE,SAAS,GAAG,OAAO,CAAC,6BAA6B,CAAC;IASjF,mCAAmC,CACvC,IAAI,EAAE,SAAS,EACf,SAAS,GAAE,OAAc,EACzB,UAAU,CAAC,EAAE,MAAM,EACnB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,qBAAqB,CAAC;IAuDjC,8BAA8B,aAAoB,iBAAiB,UAAU,IAAI,EAAE,KAAG,OAAO,CAAC,eAAe,CAAC,CAsE5G;IAEF,wBAAwB,eACV,SAAS,cACT,OAAO,cACP,OAAO,UACX,IAAI,EAAE,KACb,OAAO,CAAC,eAAe,CAAC,CA+EzB;IAEI,kBAAkB,CAAC,UAAU,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC;IAmCnF,uBAAuB,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;CAWhE"}
+{"version":3,"file":"RaydiumService.d.ts","sourceRoot":"","sources":["../../src/services/RaydiumService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EAEL,IAAI,EACJ,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAEL,eAAe,EAEf,qBAAqB,EAGtB,MAAM,UAAU,CAAC;AAKlB,OAAO,EACL,6BAA6B,EAQ9B,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAoB;IACzC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAa;IAC/C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAU;gBAEhC,GAAG,EAAE,GAAG,CAAC,YAAY,CAAC,EAAE,gBAAgB,EAAE,UAAU,EAAE,gBAAgB,GAAE,OAA4B;IAMhH,mBAAmB,IAAI,OAAO;IAIxB,oBAAoB,IAAI,OAAO,CAAC,oBAAoB,CAAC;IAIrD,kBAAkB,CAAC,UAAU,EAAE,OAAO,GAAG,OAAO,CAAC,6BAA6B,CAAC;IAS/E,mCAAmC,CACvC,IAAI,EAAE,OAAO,EACb,SAAS,GAAE,OAAc,EACzB,UAAU,CAAC,EAAE,MAAM,EACnB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,qBAAqB,CAAC;IAuDjC,8BAA8B,aAAoB,iBAAiB,UAAU,IAAI,EAAE,KAAG,OAAO,CAAC,eAAe,CAAC,CAsE5G;IAEF,wBAAwB,eACV,OAAO,cACP,OAAO,cACP,OAAO,UACX,IAAI,EAAE,KACb,OAAO,CAAC,eAAe,CAAC,CA+EzB;IAEI,kBAAkB,CAAC,UAAU,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC;IAmCjF,uBAAuB,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;CAa9D"}

package/dist/services/RaydiumService.js

@@ -4,21 +4,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RaydiumService = void 0;
-const web3_js_1 = require("@solana/web3.js");
-const raydium_client_1 = require("../raydium_client");
+const accounts_1 = require("../@codegen/raydium/accounts");
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const utils_1 = require("../utils");
 const axios_1 = __importDefault(require("axios"));
 const CreationParameters_1 = require("../utils/CreationParameters");
-const programId_1 = require("../raydium_client/programId");
+const programId_1 = require("../@codegen/raydium/programId");
 const raydium_1 = require("../utils/raydium");
 const lib_1 = require("@raydium-io/raydium-sdk-v2/lib");
 class RaydiumService {
-    _connection;
+    _rpc;
+    _legacyConnection;
     _raydiumProgramId;
-    constructor(connection, raydiumProgramId = programId_1.PROGRAM_ID) {
+    constructor(rpc, legacyConnection, raydiumProgramId = programId_1.PROGRAM_ID) {
+        this._rpc = rpc;
+        this._legacyConnection = legacyConnection;
         this._raydiumProgramId = raydiumProgramId;
-        this._connection = connection;
     }
     getRaydiumProgramId() {
         return this._raydiumProgramId;
@@ -27,7 +28,7 @@ class RaydiumService {
         return (await axios_1.default.get(`https://api.kamino.finance/v2/raydium/ammPools`)).data;
     }
     async getRaydiumPoolInfo(poolPubkey) {
-        const raydiumLoadParams = { connection: this._connection };
+        const raydiumLoadParams = { connection: this._legacyConnection };
         const raydium = await lib_1.Raydium.load(raydiumLoadParams);
         const rayClmm = new lib_1.Clmm({ scope: raydium, moduleName: '' });
         const otherPoolInfo = await rayClmm.getPoolInfoFromRpc(poolPubkey.toString());
@@ -36,7 +37,7 @@ class RaydiumService {
     }
     async getRaydiumPoolLiquidityDistribution(pool, keepOrder = true, lowestTick, highestTick) {
         const raydiumLiqDistribution = (await axios_1.default.get(`https://api.kamino.finance/v2/raydium/positionLine/${pool.toString()}`)).data;
-        const poolState = await raydium_client_1.PoolState.fetch(this._connection, pool);
+        const poolState = await accounts_1.PoolState.fetch(this._rpc, pool);
         if (!poolState) {
             throw Error(`Raydium pool state ${pool} does not exist`);
         }
@@ -72,11 +73,11 @@ class RaydiumService {
         return liqDistribution;
     }
     getStrategyWhirlpoolPoolAprApy = async (strategy, pools) => {
-        const position = await raydium_client_1.PersonalPositionState.fetch(this._connection, strategy.position);
+        const position = await accounts_1.PersonalPositionState.fetch(this._rpc, strategy.position);
         if (!position) {
             throw Error(`Position ${strategy.position} does not exist`);
         }
-        const poolState = await raydium_client_1.PoolState.fetch(this._connection, strategy.pool);
+        const poolState = await accounts_1.PoolState.fetch(this._rpc, strategy.pool);
         if (!poolState) {
             throw Error(`Raydium pool state ${strategy.pool} does not exist`);
         }
@@ -125,7 +126,7 @@ class RaydiumService {
         };
     };
     getRaydiumPositionAprApy = async (poolPubkey, priceLower, priceUpper, pools) => {
-        const poolState = await raydium_client_1.PoolState.fetch(this._connection, poolPubkey);
+        const poolState = await accounts_1.PoolState.fetch(this._rpc, poolPubkey);
         if (!poolState) {
             throw Error(`Raydium pool state ${poolPubkey} does not exist`);
         }
@@ -175,7 +176,7 @@ class RaydiumService {
         };
     };
     async getGenericPoolInfo(poolPubkey, pools) {
-        const poolState = await raydium_client_1.PoolState.fetch(this._connection, poolPubkey);
+        const poolState = await accounts_1.PoolState.fetch(this._rpc, poolPubkey);
         if (!poolState) {
             throw Error(`Raydium pool state ${poolPubkey} does not exist`);
         }
@@ -191,7 +192,7 @@ class RaydiumService {
         }
         const poolInfo = {
             dex: 'RAYDIUM',
-            address: new web3_js_1.PublicKey(poolPubkey),
+            address: poolPubkey,
             tokenMintA: poolState.tokenMint0,
             tokenMintB: poolState.tokenMint1,
             price: new decimal_js_1.default(raydiumPool.price),
@@ -205,13 +206,15 @@ class RaydiumService {
         return poolInfo;
     }
     async getPositionsCountByPool(pool) {
-        const positions = await this._connection.getProgramAccounts(this._raydiumProgramId, {
+        const positions = await this._rpc
+            .getProgramAccounts(this._raydiumProgramId, {
             commitment: 'confirmed',
             filters: [
-                { dataSize: lib_1.PositionInfoLayout.span },
-                { memcmp: { bytes: pool.toBase58(), offset: lib_1.PositionInfoLayout.offsetOf('poolId') } },
+                { dataSize: BigInt(lib_1.PositionInfoLayout.span) },
+                { memcmp: { bytes: pool, offset: BigInt(lib_1.PositionInfoLayout.offsetOf('poolId')), encoding: 'base58' } },
             ],
-        });
+        })
+            .send();
         return positions.length;
     }
 }

package/dist/services/RaydiumService.js.map

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

package/dist/utils/CreationParameters.d.ts

@@ -1,4 +1,4 @@
-import { PublicKey } from '@solana/web3.js';
+import { Address } from '@solana/kit';
 import Decimal from 'decimal.js';
 import { Dex } from './utils';
 export declare const FullBPS = 10000;
@@ -10,8 +10,8 @@ export declare const DefaultUpperPercentageBPS: number;
 export declare const DefaultUpperPercentageBPSDecimal: Decimal;
 export declare const DefaultLowerPriceDifferenceBPS: number;
 export declare const DefaultUpperPriceDifferenceBPS: number;
-export declare const DefaultMintTokenA: PublicKey;
-export declare const DefaultMintTokenB: PublicKey;
+export declare const DefaultMintTokenA: Address;
+export declare const DefaultMintTokenB: Address;
 export declare const DefaultFeeTierOrca: Decimal;
 export declare const DefaultTickSpacing: number;
 export declare const DefaultDex: Dex;

package/dist/utils/CreationParameters.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CreationParameters.d.ts","sourceRoot":"","sources":["../../src/utils/CreationParameters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAW5C,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,GAAG,EAAE,MAAM,SAAS,CAAC;AAE9B,eAAO,MAAM,OAAO,QAAS,CAAC;AAC9B,eAAO,MAAM,cAAc,SAAuB,CAAC;AACnD,eAAO,MAAM,cAAc,MAAM,CAAC;AAElC,eAAO,MAAM,yBAAyB,EAAE,MAAa,CAAC;AACtD,eAAO,MAAM,gCAAgC,EAAE,OAAgD,CAAC;AAChG,eAAO,MAAM,yBAAyB,EAAE,MAAa,CAAC;AACtD,eAAO,MAAM,gCAAgC,EAAE,OAAgD,CAAC;AAGhG,eAAO,MAAM,8BAA8B,EAAE,MAAY,CAAC;AAC1D,eAAO,MAAM,8BAA8B,EAAE,MAAY,CAAC;AAE1D,eAAO,MAAM,iBAAiB,EAAE,SAAwE,CAAC;AACzG,eAAO,MAAM,iBAAiB,EAAE,SAAyE,CAAC;AAC1G,eAAO,MAAM,kBAAkB,EAAE,OAA6B,CAAC;AAC/D,eAAO,MAAM,kBAAkB,EAAE,MAAU,CAAC;AAC5C,eAAO,MAAM,UAAU,EAAE,GAAY,CAAC;AAEtC,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;IACjB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,eAAO,MAAM,qBAAqB,EAAE,eAOnC,CAAC;AACF,eAAO,MAAM,8BAA8B,EAAE,eAO5C,CAAC;AACF,eAAO,MAAM,4CAA4C,EAAE,eAO1D,CAAC;AACF,eAAO,MAAM,oBAAoB,EAAE,eAMlC,CAAC;AACF,eAAO,MAAM,gBAAgB,EAAE,eAM9B,CAAC;AACF,eAAO,MAAM,uBAAuB,EAAE,eAMrC,CAAC;AACF,eAAO,MAAM,cAAc,EAAE,eAM5B,CAAC;AACF,eAAO,MAAM,eAAe,EAAE,eAM7B,CAAC"}
+{"version":3,"file":"CreationParameters.d.ts","sourceRoot":"","sources":["../../src/utils/CreationParameters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,OAAO,EAAE,MAAM,aAAa,CAAC;AAW/C,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,GAAG,EAAE,MAAM,SAAS,CAAC;AAE9B,eAAO,MAAM,OAAO,QAAS,CAAC;AAC9B,eAAO,MAAM,cAAc,SAAuB,CAAC;AACnD,eAAO,MAAM,cAAc,MAAM,CAAC;AAElC,eAAO,MAAM,yBAAyB,EAAE,MAAa,CAAC;AACtD,eAAO,MAAM,gCAAgC,EAAE,OAAgD,CAAC;AAChG,eAAO,MAAM,yBAAyB,EAAE,MAAa,CAAC;AACtD,eAAO,MAAM,gCAAgC,EAAE,OAAgD,CAAC;AAGhG,eAAO,MAAM,8BAA8B,EAAE,MAAY,CAAC;AAC1D,eAAO,MAAM,8BAA8B,EAAE,MAAY,CAAC;AAE1D,eAAO,MAAM,iBAAiB,EAAE,OAAgE,CAAC;AACjG,eAAO,MAAM,iBAAiB,EAAE,OAAiE,CAAC;AAClG,eAAO,MAAM,kBAAkB,EAAE,OAA6B,CAAC;AAC/D,eAAO,MAAM,kBAAkB,EAAE,MAAU,CAAC;AAC5C,eAAO,MAAM,UAAU,EAAE,GAAY,CAAC;AAEtC,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;IACjB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,eAAO,MAAM,qBAAqB,EAAE,eAOnC,CAAC;AACF,eAAO,MAAM,8BAA8B,EAAE,eAO5C,CAAC;AACF,eAAO,MAAM,4CAA4C,EAAE,eAO1D,CAAC;AACF,eAAO,MAAM,oBAAoB,EAAE,eAMlC,CAAC;AACF,eAAO,MAAM,gBAAgB,EAAE,eAM9B,CAAC;AACF,eAAO,MAAM,uBAAuB,EAAE,eAMrC,CAAC;AACF,eAAO,MAAM,cAAc,EAAE,eAM5B,CAAC;AACF,eAAO,MAAM,eAAe,EAAE,eAM7B,CAAC"}

package/dist/utils/CreationParameters.js

@@ -4,8 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AutodriftMethod = exports.ExpanderMethod = exports.PeriodicRebalanceMethod = exports.TakeProfitMethod = exports.DriftRebalanceMethod = exports.PricePercentageWithResetRangeRebalanceMethod = exports.PricePercentageRebalanceMethod = exports.ManualRebalanceMethod = exports.DefaultDex = exports.DefaultTickSpacing = exports.DefaultFeeTierOrca = exports.DefaultMintTokenB = exports.DefaultMintTokenA = exports.DefaultUpperPriceDifferenceBPS = exports.DefaultLowerPriceDifferenceBPS = exports.DefaultUpperPercentageBPSDecimal = exports.DefaultUpperPercentageBPS = exports.DefaultLowerPercentageBPSDecimal = exports.DefaultLowerPercentageBPS = exports.FullPercentage = exports.FullBPSDecimal = exports.FullBPS = void 0;
-const web3_js_1 = require("@solana/web3.js");
-const RebalanceType_1 = require("../kamino-client/types/RebalanceType");
+const kit_1 = require("@solana/kit");
+const RebalanceType_1 = require("../@codegen/kliquidity/types/RebalanceType");
 const decimal_js_1 = __importDefault(require("decimal.js"));
 exports.FullBPS = 10_000;
 exports.FullBPSDecimal = new decimal_js_1.default(exports.FullBPS);
@@ -17,8 +17,8 @@ exports.DefaultUpperPercentageBPSDecimal = new decimal_js_1.default(exports.Defa
 // the default parameters for the manual rebalance, 5% above and below the current price
 exports.DefaultLowerPriceDifferenceBPS = 500;
 exports.DefaultUpperPriceDifferenceBPS = 500;
-exports.DefaultMintTokenA = new web3_js_1.PublicKey('So11111111111111111111111111111111111111112');
-exports.DefaultMintTokenB = new web3_js_1.PublicKey('EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v');
+exports.DefaultMintTokenA = (0, kit_1.address)('So11111111111111111111111111111111111111112');
+exports.DefaultMintTokenB = (0, kit_1.address)('EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v');
 exports.DefaultFeeTierOrca = new decimal_js_1.default(0.0005);
 exports.DefaultTickSpacing = 1;
 exports.DefaultDex = 'ORCA';

package/dist/utils/CreationParameters.js.map

@@ -1 +1 @@
-{"version":3,"file":"CreationParameters.js","sourceRoot":"","sources":["../../src/utils/CreationParameters.ts"],"names":[],"mappings":";;;;;;AAAA,6CAA4C;AAC5C,wEAS8C;AAC9C,4DAAiC;AAGpB,QAAA,OAAO,GAAG,MAAM,CAAC;AACjB,QAAA,cAAc,GAAG,IAAI,oBAAO,CAAC,eAAO,CAAC,CAAC;AACtC,QAAA,cAAc,GAAG,GAAG,CAAC;AAErB,QAAA,yBAAyB,GAAW,IAAI,CAAC;AACzC,QAAA,gCAAgC,GAAY,IAAI,oBAAO,CAAC,iCAAyB,CAAC,CAAC;AACnF,QAAA,yBAAyB,GAAW,IAAI,CAAC;AACzC,QAAA,gCAAgC,GAAY,IAAI,oBAAO,CAAC,iCAAyB,CAAC,CAAC;AAEhG,wFAAwF;AAC3E,QAAA,8BAA8B,GAAW,GAAG,CAAC;AAC7C,QAAA,8BAA8B,GAAW,GAAG,CAAC;AAE7C,QAAA,iBAAiB,GAAc,IAAI,mBAAS,CAAC,6CAA6C,CAAC,CAAC;AAC5F,QAAA,iBAAiB,GAAc,IAAI,mBAAS,CAAC,8CAA8C,CAAC,CAAC;AAC7F,QAAA,kBAAkB,GAAY,IAAI,oBAAO,CAAC,MAAM,CAAC,CAAC;AAClD,QAAA,kBAAkB,GAAW,CAAC,CAAC;AAC/B,QAAA,UAAU,GAAQ,MAAM,CAAC;AAUzB,QAAA,qBAAqB,GAAoB;IACpD,KAAK,EAAE,aAAa;IACpB,KAAK,EAAE,sBAAM,CAAC,aAAa;IAC3B,OAAO,EAAE,IAAI;IACb,gBAAgB,EAAE,iCAAiC;IACnD,WAAW,EACT,6OAA6O;CAChP,CAAC;AACW,QAAA,8BAA8B,GAAoB;IAC7D,KAAK,EAAE,SAAS;IAChB,KAAK,EAAE,+BAAe,CAAC,aAAa;IACpC,OAAO,EAAE,IAAI;IACb,gBAAgB,EAAE,8BAA8B;IAChD,WAAW,EACT,4PAA4P;CAC/P,CAAC;AACW,QAAA,4CAA4C,GAAoB;IAC3E,KAAK,EAAE,mCAAmC;IAC1C,KAAK,EAAE,wCAAwB,CAAC,aAAa;IAC7C,OAAO,EAAE,KAAK;IACd,qCAAqC;IACrC,WAAW,EACT,2NAA2N;CAC9N,CAAC;AACW,QAAA,oBAAoB,GAAoB;IACnD,KAAK,EAAE,OAAO;IACd,KAAK,EAAE,qBAAK,CAAC,aAAa;IAC1B,OAAO,EAAE,KAAK;IACd,8BAA8B;IAC9B,WAAW,EAAE,2EAA2E;CACzF,CAAC;AACW,QAAA,gBAAgB,GAAoB;IAC/C,KAAK,EAAE,aAAa;IACpB,KAAK,EAAE,0BAAU,CAAC,aAAa;IAC/B,OAAO,EAAE,KAAK;IACd,8BAA8B;IAC9B,WAAW,EAAE,iFAAiF;CAC/F,CAAC;AACW,QAAA,uBAAuB,GAAoB;IACtD,KAAK,EAAE,oBAAoB;IAC3B,KAAK,EAAE,iCAAiB,CAAC,aAAa;IACtC,OAAO,EAAE,KAAK;IACd,8BAA8B;IAC9B,WAAW,EAAE,wFAAwF;CACtG,CAAC;AACW,QAAA,cAAc,GAAoB;IAC7C,KAAK,EAAE,UAAU;IACjB,KAAK,EAAE,wBAAQ,CAAC,aAAa;IAC7B,OAAO,EAAE,KAAK;IACd,8BAA8B;IAC9B,WAAW,EAAE,8EAA8E;CAC5F,CAAC;AACW,QAAA,eAAe,GAAoB;IAC9C,KAAK,EAAE,WAAW;IAClB,KAAK,EAAE,yBAAS,CAAC,aAAa;IAC9B,OAAO,EAAE,KAAK;IACd,8BAA8B;IAC9B,WAAW,EAAE,2EAA2E;CACzF,CAAC"}
+{"version":3,"file":"CreationParameters.js","sourceRoot":"","sources":["../../src/utils/CreationParameters.ts"],"names":[],"mappings":";;;;;;AAAA,qCAA+C;AAC/C,8EASoD;AACpD,4DAAiC;AAGpB,QAAA,OAAO,GAAG,MAAM,CAAC;AACjB,QAAA,cAAc,GAAG,IAAI,oBAAO,CAAC,eAAO,CAAC,CAAC;AACtC,QAAA,cAAc,GAAG,GAAG,CAAC;AAErB,QAAA,yBAAyB,GAAW,IAAI,CAAC;AACzC,QAAA,gCAAgC,GAAY,IAAI,oBAAO,CAAC,iCAAyB,CAAC,CAAC;AACnF,QAAA,yBAAyB,GAAW,IAAI,CAAC;AACzC,QAAA,gCAAgC,GAAY,IAAI,oBAAO,CAAC,iCAAyB,CAAC,CAAC;AAEhG,wFAAwF;AAC3E,QAAA,8BAA8B,GAAW,GAAG,CAAC;AAC7C,QAAA,8BAA8B,GAAW,GAAG,CAAC;AAE7C,QAAA,iBAAiB,GAAY,IAAA,aAAO,EAAC,6CAA6C,CAAC,CAAC;AACpF,QAAA,iBAAiB,GAAY,IAAA,aAAO,EAAC,8CAA8C,CAAC,CAAC;AACrF,QAAA,kBAAkB,GAAY,IAAI,oBAAO,CAAC,MAAM,CAAC,CAAC;AAClD,QAAA,kBAAkB,GAAW,CAAC,CAAC;AAC/B,QAAA,UAAU,GAAQ,MAAM,CAAC;AAUzB,QAAA,qBAAqB,GAAoB;IACpD,KAAK,EAAE,aAAa;IACpB,KAAK,EAAE,sBAAM,CAAC,aAAa;IAC3B,OAAO,EAAE,IAAI;IACb,gBAAgB,EAAE,iCAAiC;IACnD,WAAW,EACT,6OAA6O;CAChP,CAAC;AACW,QAAA,8BAA8B,GAAoB;IAC7D,KAAK,EAAE,SAAS;IAChB,KAAK,EAAE,+BAAe,CAAC,aAAa;IACpC,OAAO,EAAE,IAAI;IACb,gBAAgB,EAAE,8BAA8B;IAChD,WAAW,EACT,4PAA4P;CAC/P,CAAC;AACW,QAAA,4CAA4C,GAAoB;IAC3E,KAAK,EAAE,mCAAmC;IAC1C,KAAK,EAAE,wCAAwB,CAAC,aAAa;IAC7C,OAAO,EAAE,KAAK;IACd,qCAAqC;IACrC,WAAW,EACT,2NAA2N;CAC9N,CAAC;AACW,QAAA,oBAAoB,GAAoB;IACnD,KAAK,EAAE,OAAO;IACd,KAAK,EAAE,qBAAK,CAAC,aAAa;IAC1B,OAAO,EAAE,KAAK;IACd,8BAA8B;IAC9B,WAAW,EAAE,2EAA2E;CACzF,CAAC;AACW,QAAA,gBAAgB,GAAoB;IAC/C,KAAK,EAAE,aAAa;IACpB,KAAK,EAAE,0BAAU,CAAC,aAAa;IAC/B,OAAO,EAAE,KAAK;IACd,8BAA8B;IAC9B,WAAW,EAAE,iFAAiF;CAC/F,CAAC;AACW,QAAA,uBAAuB,GAAoB;IACtD,KAAK,EAAE,oBAAoB;IAC3B,KAAK,EAAE,iCAAiB,CAAC,aAAa;IACtC,OAAO,EAAE,KAAK;IACd,8BAA8B;IAC9B,WAAW,EAAE,wFAAwF;CACtG,CAAC;AACW,QAAA,cAAc,GAAoB;IAC7C,KAAK,EAAE,UAAU;IACjB,KAAK,EAAE,wBAAQ,CAAC,aAAa;IAC7B,OAAO,EAAE,KAAK;IACd,8BAA8B;IAC9B,WAAW,EAAE,8EAA8E;CAC5F,CAAC;AACW,QAAA,eAAe,GAAoB;IAC9C,KAAK,EAAE,WAAW;IAClB,KAAK,EAAE,yBAAS,CAAC,aAAa;IAC9B,OAAO,EAAE,KAAK;IACd,8BAA8B;IAC9B,WAAW,EAAE,2EAA2E;CACzF,CAAC"}

package/dist/utils/compat.d.ts

@@ -0,0 +1,4 @@
+import { PublicKey } from '@solana/web3.js';
+import { Address } from '@solana/kit';
+export declare function toLegacyPublicKey(address: Address): PublicKey;
+//# sourceMappingURL=compat.d.ts.map

package/dist/utils/compat.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"compat.d.ts","sourceRoot":"","sources":["../../src/utils/compat.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,OAAO,GAAG,SAAS,CAE7D"}

package/dist/utils/compat.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.toLegacyPublicKey = toLegacyPublicKey;
+const web3_js_1 = require("@solana/web3.js");
+function toLegacyPublicKey(address) {
+    return new web3_js_1.PublicKey(address.toString());
+}
+//# sourceMappingURL=compat.js.map

package/dist/utils/compat.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"compat.js","sourceRoot":"","sources":["../../src/utils/compat.ts"],"names":[],"mappings":";;AAGA,8CAEC;AALD,6CAA4C;AAG5C,SAAgB,iBAAiB,CAAC,OAAgB;IAChD,OAAO,IAAI,mBAAS,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;AAC3C,CAAC"}

package/dist/utils/index.d.ts

@@ -1,9 +1,7 @@
-export * from './anchorUtils';
 export * from './batch';
 export * from './tokenUtils';
 export * from './utils';
 export * from './math';
 export * from './types';
 export * from './orca';
-export * from './instructions';
 //# sourceMappingURL=index.d.ts.map

package/dist/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,SAAS,CAAC;AACxB,cAAc,cAAc,CAAC;AAC7B,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC;AACvB,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC;AACvB,cAAc,gBAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,cAAc,CAAC;AAC7B,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC;AACvB,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC"}

package/dist/utils/index.js

@@ -14,12 +14,10 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./anchorUtils"), exports);
 __exportStar(require("./batch"), exports);
 __exportStar(require("./tokenUtils"), exports);
 __exportStar(require("./utils"), exports);
 __exportStar(require("./math"), exports);
 __exportStar(require("./types"), exports);
 __exportStar(require("./orca"), exports);
-__exportStar(require("./instructions"), exports);
 //# sourceMappingURL=index.js.map

package/dist/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA8B;AAC9B,0CAAwB;AACxB,+CAA6B;AAC7B,0CAAwB;AACxB,yCAAuB;AACvB,0CAAwB;AACxB,yCAAuB;AACvB,iDAA+B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,+CAA6B;AAC7B,0CAAwB;AACxB,yCAAuB;AACvB,0CAAwB;AACxB,yCAAuB"}

package/dist/utils/jupiter.d.ts

@@ -0,0 +1,9 @@
+import { Instruction } from '@jup-ag/api';
+import { AccountRole, IInstruction } from '@solana/kit';
+export declare function instructionToIInstruction(ix: Instruction): IInstruction;
+export declare function instructionsToIInstructions(ixs: Instruction[]): IInstruction[];
+export declare function getAccountRole({ isSigner, isMut }: {
+    isSigner: boolean;
+    isMut: boolean;
+}): AccountRole;
+//# sourceMappingURL=jupiter.d.ts.map

package/dist/utils/jupiter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"jupiter.d.ts","sourceRoot":"","sources":["../../src/utils/jupiter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAW,YAAY,EAAE,MAAM,aAAa,CAAC;AAEjE,wBAAgB,yBAAyB,CAAC,EAAE,EAAE,WAAW,GAAG,YAAY,CASvE;AAED,wBAAgB,2BAA2B,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,YAAY,EAAE,CAE9E;AAED,wBAAgB,cAAc,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE;IAAE,QAAQ,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,GAAG,WAAW,CAWtG"}

package/dist/utils/jupiter.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.instructionToIInstruction = instructionToIInstruction;
+exports.instructionsToIInstructions = instructionsToIInstructions;
+exports.getAccountRole = getAccountRole;
+const kit_1 = require("@solana/kit");
+function instructionToIInstruction(ix) {
+    return {
+        data: ix.data ? Buffer.from(ix.data, 'base64') : undefined,
+        programAddress: (0, kit_1.address)(ix.programId),
+        accounts: ix.accounts.map((k) => ({
+            address: (0, kit_1.address)(k.pubkey),
+            role: getAccountRole({ isSigner: k.isSigner, isMut: k.isWritable }),
+        })),
+    };
+}
+function instructionsToIInstructions(ixs) {
+    return ixs.map((ix) => instructionToIInstruction(ix));
+}
+function getAccountRole({ isSigner, isMut }) {
+    if (isSigner && isMut) {
+        return kit_1.AccountRole.WRITABLE_SIGNER;
+    }
+    if (isSigner && !isMut) {
+        return kit_1.AccountRole.READONLY_SIGNER;
+    }
+    if (!isSigner && isMut) {
+        return kit_1.AccountRole.WRITABLE;
+    }
+    return kit_1.AccountRole.READONLY;
+}
+//# sourceMappingURL=jupiter.js.map

package/dist/utils/jupiter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"jupiter.js","sourceRoot":"","sources":["../../src/utils/jupiter.ts"],"names":[],"mappings":";;AAGA,8DASC;AAED,kEAEC;AAED,wCAWC;AA5BD,qCAAiE;AAEjE,SAAgB,yBAAyB,CAAC,EAAe;IACvD,OAAO;QACL,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS;QAC1D,cAAc,EAAE,IAAA,aAAO,EAAC,EAAE,CAAC,SAAS,CAAC;QACrC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAChC,OAAO,EAAE,IAAA,aAAO,EAAC,CAAC,CAAC,MAAM,CAAC;YAC1B,IAAI,EAAE,cAAc,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC,UAAU,EAAE,CAAC;SACpE,CAAC,CAAC;KACJ,CAAC;AACJ,CAAC;AAED,SAAgB,2BAA2B,CAAC,GAAkB;IAC5D,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,yBAAyB,CAAC,EAAE,CAAC,CAAC,CAAC;AACxD,CAAC;AAED,SAAgB,cAAc,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAyC;IACvF,IAAI,QAAQ,IAAI,KAAK,EAAE,CAAC;QACtB,OAAO,iBAAW,CAAC,eAAe,CAAC;IACrC,CAAC;IACD,IAAI,QAAQ,IAAI,CAAC,KAAK,EAAE,CAAC;QACvB,OAAO,iBAAW,CAAC,eAAe,CAAC;IACrC,CAAC;IACD,IAAI,CAAC,QAAQ,IAAI,KAAK,EAAE,CAAC;QACvB,OAAO,iBAAW,CAAC,QAAQ,CAAC;IAC9B,CAAC;IACD,OAAO,iBAAW,CAAC,QAAQ,CAAC;AAC9B,CAAC"}

package/dist/utils/lookupTable.d.ts

@@ -1,5 +1,7 @@
-import { AddressLookupTableAccount, Connection, MessageV0, PublicKey, TransactionInstruction } from '@solana/web3.js';
+import { Address, Rpc, GetProgramAccountsApi, Account, GetMultipleAccountsApi } from '@solana/kit';
 import { SolanaCluster } from '@hubbleprotocol/hubble-config';
-export declare function getLookupTable(cluster: SolanaCluster, connection: Connection): Promise<AddressLookupTableAccount[]>;
-export declare function getTransactionV2Message(cluster: SolanaCluster, connection: Connection, payer: PublicKey, blockhash: string, instructions: Array<TransactionInstruction>): Promise<MessageV0>;
+import { AddressLookupTable } from '@solana-program/address-lookup-table';
+export declare function getLookupTable(cluster: SolanaCluster, rpc: Rpc<GetProgramAccountsApi>): Promise<Account<AddressLookupTable>[]>;
+export declare function getAllUserLookupTables(c: Rpc<GetProgramAccountsApi>, user: Address): Promise<Account<AddressLookupTable>[]>;
+export declare function fetchMultipleLookupTableAccounts(rpc: Rpc<GetMultipleAccountsApi>, addresses: Address[]): Promise<Account<AddressLookupTable>[]>;
 //# sourceMappingURL=lookupTable.d.ts.map

package/dist/utils/lookupTable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lookupTable.d.ts","sourceRoot":"","sources":["../../src/utils/lookupTable.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,yBAAyB,EACzB,UAAU,EACV,SAAS,EACT,SAAS,EACT,sBAAsB,EAEvB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAE9D,wBAAsB,cAAc,CAClC,OAAO,EAAE,aAAa,EACtB,UAAU,EAAE,UAAU,GACrB,OAAO,CAAC,yBAAyB,EAAE,CAAC,CAiBtC;AAED,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,aAAa,EACtB,UAAU,EAAE,UAAU,EACtB,KAAK,EAAE,SAAS,EAChB,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,KAAK,CAAC,sBAAsB,CAAC,GAC1C,OAAO,CAAC,SAAS,CAAC,CAYpB"}
+{"version":3,"file":"lookupTable.d.ts","sourceRoot":"","sources":["../../src/utils/lookupTable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,qBAAqB,EAAE,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAEnG,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAEL,kBAAkB,EAEnB,MAAM,sCAAsC,CAAC;AAI9C,wBAAsB,cAAc,CAClC,OAAO,EAAE,aAAa,EACtB,GAAG,EAAE,GAAG,CAAC,qBAAqB,CAAC,GAC9B,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAKxC;AAED,wBAAsB,sBAAsB,CAC1C,CAAC,EAAE,GAAG,CAAC,qBAAqB,CAAC,EAC7B,IAAI,EAAE,OAAO,GACZ,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,EAAE,CAAC,CA4BxC;AAED,wBAAsB,gCAAgC,CACpD,GAAG,EAAE,GAAG,CAAC,sBAAsB,CAAC,EAChC,SAAS,EAAE,OAAO,EAAE,GACnB,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAqBxC"}