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

package/dist/utils/index.d.ts

@@ -1,8 +1,9 @@
+export * from './anchorUtils';
 export * from './batch';
 export * from './tokenUtils';
 export * from './utils';
 export * from './math';
 export * from './types';
 export * from './orca';
-export * from './compat';
+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,SAAS,CAAC;AACxB,cAAc,cAAc,CAAC;AAC7B,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC;AACvB,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC"}
+{"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"}

package/dist/utils/index.js

@@ -14,11 +14,12 @@ 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("./compat"), 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,0CAAwB;AACxB,+CAA6B;AAC7B,0CAAwB;AACxB,yCAAuB;AACvB,0CAAwB;AACxB,yCAAuB;AACvB,2CAAyB"}
+{"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"}

package/dist/utils/instructions.d.ts

@@ -0,0 +1,7 @@
+import { Instruction } from '@jup-ag/api';
+import { TransactionInstruction } from '@solana/web3.js';
+export declare function instructionToTransactionInstruction(ix: Instruction): TransactionInstruction;
+export declare function instructionsToTransactionInstructions(ixs: Instruction[]): TransactionInstruction[];
+export declare function transactionInstructionToInstruction(ix: TransactionInstruction): Instruction;
+export declare function transactionInstructionsToInstructions(ixs: TransactionInstruction[]): Instruction[];
+//# sourceMappingURL=instructions.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"instructions.d.ts","sourceRoot":"","sources":["../../src/utils/instructions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,WAAW,EAAE,MAAM,aAAa,CAAC;AACvD,OAAO,EAAa,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAEpE,wBAAgB,mCAAmC,CAAC,EAAE,EAAE,WAAW,GAAG,sBAAsB,CAY3F;AAED,wBAAgB,qCAAqC,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,sBAAsB,EAAE,CAElG;AAED,wBAAgB,mCAAmC,CAAC,EAAE,EAAE,sBAAsB,GAAG,WAAW,CAY3F;AAED,wBAAgB,qCAAqC,CAAC,GAAG,EAAE,sBAAsB,EAAE,GAAG,WAAW,EAAE,CAElG"}

package/dist/utils/instructions.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.instructionToTransactionInstruction = instructionToTransactionInstruction;
+exports.instructionsToTransactionInstructions = instructionsToTransactionInstructions;
+exports.transactionInstructionToInstruction = transactionInstructionToInstruction;
+exports.transactionInstructionsToInstructions = transactionInstructionsToInstructions;
+const web3_js_1 = require("@solana/web3.js");
+function instructionToTransactionInstruction(ix) {
+    return new web3_js_1.TransactionInstruction({
+        keys: ix.accounts.map((acc) => {
+            return {
+                pubkey: new web3_js_1.PublicKey(acc.pubkey),
+                isSigner: acc.isSigner,
+                isWritable: acc.isWritable,
+            };
+        }),
+        programId: new web3_js_1.PublicKey(ix.programId),
+        data: Buffer.from(ix.data),
+    });
+}
+function instructionsToTransactionInstructions(ixs) {
+    return ixs.map((ix) => instructionToTransactionInstruction(ix));
+}
+function transactionInstructionToInstruction(ix) {
+    return {
+        accounts: ix.keys.map((acc) => {
+            return {
+                pubkey: acc.pubkey.toBase58(),
+                isSigner: acc.isSigner,
+                isWritable: acc.isWritable,
+            };
+        }),
+        programId: ix.programId.toBase58(),
+        data: ix.data.toString(),
+    };
+}
+function transactionInstructionsToInstructions(ixs) {
+    return ixs.map((ix) => transactionInstructionToInstruction(ix));
+}
+//# sourceMappingURL=instructions.js.map

package/dist/utils/instructions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"instructions.js","sourceRoot":"","sources":["../../src/utils/instructions.ts"],"names":[],"mappings":";;AAGA,kFAYC;AAED,sFAEC;AAED,kFAYC;AAED,sFAEC;AApCD,6CAAoE;AAEpE,SAAgB,mCAAmC,CAAC,EAAe;IACjE,OAAO,IAAI,gCAAsB,CAAC;QAChC,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAgB,EAAE,EAAE;YACzC,OAAO;gBACL,MAAM,EAAE,IAAI,mBAAS,CAAC,GAAG,CAAC,MAAM,CAAC;gBACjC,QAAQ,EAAE,GAAG,CAAC,QAAQ;gBACtB,UAAU,EAAE,GAAG,CAAC,UAAU;aAC3B,CAAC;QACJ,CAAC,CAAC;QACF,SAAS,EAAE,IAAI,mBAAS,CAAC,EAAE,CAAC,SAAS,CAAC;QACtC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC;KAC3B,CAAC,CAAC;AACL,CAAC;AAED,SAAgB,qCAAqC,CAAC,GAAkB;IACtE,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,mCAAmC,CAAC,EAAE,CAAC,CAAC,CAAC;AAClE,CAAC;AAED,SAAgB,mCAAmC,CAAC,EAA0B;IAC5E,OAAO;QACL,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YAC5B,OAAO;gBACL,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE;gBAC7B,QAAQ,EAAE,GAAG,CAAC,QAAQ;gBACtB,UAAU,EAAE,GAAG,CAAC,UAAU;aAC3B,CAAC;QACJ,CAAC,CAAC;QACF,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE;QAClC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE;KACzB,CAAC;AACJ,CAAC;AAED,SAAgB,qCAAqC,CAAC,GAA6B;IACjF,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,mCAAmC,CAAC,EAAE,CAAC,CAAC,CAAC;AAClE,CAAC"}

package/dist/utils/lookupTable.d.ts

@@ -1,7 +1,5 @@
-import { Address, Rpc, GetProgramAccountsApi, Account, GetMultipleAccountsApi } from '@solana/kit';
+import { AddressLookupTableAccount, Connection, MessageV0, PublicKey, TransactionInstruction } from '@solana/web3.js';
 import { SolanaCluster } from '@hubbleprotocol/hubble-config';
-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>[]>;
+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>;
 //# 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,EAAE,OAAO,EAAE,GAAG,EAAE,qBAAqB,EAAE,OAAO,EAAE,sBAAsB,EAAsB,MAAM,aAAa,CAAC;AAEvH,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"}
+{"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"}

package/dist/utils/lookupTable.js

@@ -1,65 +1,38 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLookupTable = getLookupTable;
-exports.getAllUserLookupTables = getAllUserLookupTables;
-exports.fetchMultipleLookupTableAccounts = fetchMultipleLookupTableAccounts;
+exports.getTransactionV2Message = getTransactionV2Message;
+const web3_js_1 = require("@solana/web3.js");
 const pubkeys_1 = require("../constants/pubkeys");
-const address_lookup_table_1 = require("@solana-program/address-lookup-table");
-const lutDecoder = (0, address_lookup_table_1.getAddressLookupTableDecoder)();
-async function getLookupTable(cluster, rpc) {
+async function getLookupTable(cluster, connection) {
     if (cluster == 'mainnet-beta' || cluster == 'devnet') {
-        return getAllUserLookupTables(rpc, pubkeys_1.LUT_OWNER_KEY);
+        return await connection
+            .getProgramAccounts(pubkeys_1.ADDRESS_LUT_PROGRAM_ID, {
+            filters: [{ memcmp: { offset: 22, bytes: new web3_js_1.PublicKey(pubkeys_1.LUT_OWNER_KEY).toString() } }],
+        })
+            .then((res) => res.map((raw) => {
+            return new web3_js_1.AddressLookupTableAccount({
+                key: raw.pubkey,
+                state: web3_js_1.AddressLookupTableAccount.deserialize(raw.account.data),
+            });
+        }));
+    }
+    else {
+        throw Error('There is no lookup table for localnet yet');
     }
-    return [];
-}
-async function getAllUserLookupTables(c, user) {
-    const accountInfos = await c
-        .getProgramAccounts(address_lookup_table_1.ADDRESS_LOOKUP_TABLE_PROGRAM_ADDRESS, {
-        filters: [
-            {
-                memcmp: {
-                    offset: 22n,
-                    bytes: user.toString(),
-                    encoding: 'base58',
-                },
-            },
-        ],
-        encoding: 'base64',
-    })
-        .send();
-    return accountInfos.map((info) => {
-        const data = lutDecoder.decode(Buffer.from(info.account.data[0], 'base64'));
-        const acc = {
-            executable: info.account.executable,
-            programAddress: info.account.owner,
-            lamports: info.account.lamports,
-            address: info.pubkey,
-            data: data,
-            space: info.account.space,
-        };
-        return acc;
-    });
 }
-async function fetchMultipleLookupTableAccounts(rpc, addresses) {
-    const accountInfos = await rpc.getMultipleAccounts(addresses).send();
-    const luts = [];
-    for (let i = 0; i < accountInfos.value.length; i++) {
-        const info = accountInfos.value[i];
-        if (info === null) {
-            throw new Error(`Could not get lookup table ${addresses[i]}`);
-        }
-        const address = addresses[i];
-        const data = lutDecoder.decode(Buffer.from(info.data[0], 'base64'));
-        const acc = {
-            executable: info.executable,
-            programAddress: info.owner,
-            lamports: info.lamports,
-            address,
-            data: data,
-            space: info.space,
-        };
-        luts.push(acc);
+async function getTransactionV2Message(cluster, connection, payer, blockhash, instructions) {
+    if (cluster == 'mainnet-beta' || cluster == 'devnet') {
+        const lookupTable = await getLookupTable(cluster, connection);
+        const v2Tx = new web3_js_1.TransactionMessage({
+            payerKey: payer,
+            recentBlockhash: blockhash,
+            instructions: instructions,
+        }).compileToV0Message(lookupTable);
+        return v2Tx;
+    }
+    else {
+        throw Error('No TransactionV2 on localnet as no lookup table was created');
     }
-    return luts;
 }
 //# sourceMappingURL=lookupTable.js.map

package/dist/utils/lookupTable.js.map

@@ -1 +1 @@
-{"version":3,"file":"lookupTable.js","sourceRoot":"","sources":["../../src/utils/lookupTable.ts"],"names":[],"mappings":";;AAWA,wCAQC;AAED,wDA+BC;AAED,4EAwBC;AA7ED,kDAAqD;AAErD,+EAI8C;AAE9C,MAAM,UAAU,GAAG,IAAA,mDAA4B,GAAE,CAAC;AAE3C,KAAK,UAAU,cAAc,CAClC,OAAsB,EACtB,GAA+B;IAE/B,IAAI,OAAO,IAAI,cAAc,IAAI,OAAO,IAAI,QAAQ,EAAE,CAAC;QACrD,OAAO,sBAAsB,CAAC,GAAG,EAAE,uBAAa,CAAC,CAAC;IACpD,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAEM,KAAK,UAAU,sBAAsB,CAC1C,CAA6B,EAC7B,IAAa;IAEb,MAAM,YAAY,GAAG,MAAM,CAAC;SACzB,kBAAkB,CAAC,2DAAoC,EAAE;QACxD,OAAO,EAAE;YACP;gBACE,MAAM,EAAE;oBACN,MAAM,EAAE,GAAG;oBACX,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAwB;oBAC5C,QAAQ,EAAE,QAAQ;iBACnB;aACF;SACF;QACD,QAAQ,EAAE,QAAQ;KACnB,CAAC;SACD,IAAI,EAAE,CAAC;IAEV,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QAC/B,MAAM,IAAI,GAAG,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC;QAC5E,MAAM,GAAG,GAAgC;YACvC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU;YACnC,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK;YAClC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ;YAC/B,OAAO,EAAE,IAAI,CAAC,MAAM;YACpB,IAAI,EAAE,IAAI;YACV,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK;SAC1B,CAAC;QACF,OAAO,GAAG,CAAC;IACb,CAAC,CAAC,CAAC;AACL,CAAC;AAEM,KAAK,UAAU,gCAAgC,CACpD,GAAgC,EAChC,SAAoB;IAEpB,MAAM,YAAY,GAAG,MAAM,GAAG,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,CAAC;IACrE,MAAM,IAAI,GAAkC,EAAE,CAAC;IAC/C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACnD,MAAM,IAAI,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACnC,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,8BAA8B,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAChE,CAAC;QACD,MAAM,OAAO,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;QAC7B,MAAM,IAAI,GAAG,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC;QACpE,MAAM,GAAG,GAAgC;YACvC,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,cAAc,EAAE,IAAI,CAAC,KAAK;YAC1B,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,OAAO;YACP,IAAI,EAAE,IAAI;YACV,KAAK,EAAE,IAAI,CAAC,KAAK;SAClB,CAAC;QACF,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACjB,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}
+{"version":3,"file":"lookupTable.js","sourceRoot":"","sources":["../../src/utils/lookupTable.ts"],"names":[],"mappings":";;AAWA,wCAoBC;AAED,0DAkBC;AAnDD,6CAOyB;AACzB,kDAA6E;AAGtE,KAAK,UAAU,cAAc,CAClC,OAAsB,EACtB,UAAsB;IAEtB,IAAI,OAAO,IAAI,cAAc,IAAI,OAAO,IAAI,QAAQ,EAAE,CAAC;QACrD,OAAO,MAAM,UAAU;aACpB,kBAAkB,CAAC,gCAAsB,EAAE;YAC1C,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,mBAAS,CAAC,uBAAa,CAAC,CAAC,QAAQ,EAAE,EAAE,EAAE,CAAC;SACtF,CAAC;aACD,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CACZ,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YACd,OAAO,IAAI,mCAAyB,CAAC;gBACnC,GAAG,EAAE,GAAG,CAAC,MAAM;gBACf,KAAK,EAAE,mCAAyB,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC;aAC/D,CAAC,CAAC;QACL,CAAC,CAAC,CACH,CAAC;IACN,CAAC;SAAM,CAAC;QACN,MAAM,KAAK,CAAC,2CAA2C,CAAC,CAAC;IAC3D,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,uBAAuB,CAC3C,OAAsB,EACtB,UAAsB,EACtB,KAAgB,EAChB,SAAiB,EACjB,YAA2C;IAE3C,IAAI,OAAO,IAAI,cAAc,IAAI,OAAO,IAAI,QAAQ,EAAE,CAAC;QACrD,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAC9D,MAAM,IAAI,GAAG,IAAI,4BAAkB,CAAC;YAClC,QAAQ,EAAE,KAAK;YACf,eAAe,EAAE,SAAS;YAC1B,YAAY,EAAE,YAAY;SAC3B,CAAC,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;QACnC,OAAO,IAAI,CAAC;IACd,CAAC;SAAM,CAAC;QACN,MAAM,KAAK,CAAC,6DAA6D,CAAC,CAAC;IAC7E,CAAC;AACH,CAAC"}

package/dist/utils/meteora.d.ts

@@ -1,9 +1,8 @@
-import { Address } from '@solana/kit';
+import { PublicKey } from '@solana/web3.js';
 import Decimal from 'decimal.js';
-import { BinArray } from '../@codegen/meteora/accounts';
-import { Bin } from '../@codegen/meteora/types';
+import { BinArray } from '../meteora_client/accounts';
+import { Bin } from '../meteora_client/types';
 import { BN } from '@coral-xyz/anchor';
-import { ProgramDerivedAddress } from '@solana/addresses/dist/types/program-derived-address';
 export declare function getPriceOfBinByBinId(binId: number, tickSpacing: number): Decimal;
 export declare function getBinIdFromPrice(price: Decimal, tickSpacing: number, min: boolean): number;
 export declare function getPriceOfBinByBinIdWithDecimals(binId: number, tickSpacing: number, decimalsA: number, decimalsB: number): Decimal;
@@ -13,9 +12,9 @@ export declare function getBinArrayLowerUpperBinId(binArrayIndex: number): [numb
 export declare function getBinFromBinArray(binIndex: number, binArray: BinArray): Bin | null;
 export declare function getBinFromBinArrays(binIndex: number, binArrays: BinArray[]): Bin | null;
 export declare function binIdToBinArrayIndex(binId: BN): BN;
-export declare function deriveBinArray(lbPair: Address, index: BN, programId: Address): Promise<ProgramDerivedAddress>;
+export declare function deriveBinArray(lbPair: PublicKey, index: BN, programId: PublicKey): [PublicKey, number];
 export type MeteoraPosition = {
-    Address: Address;
+    publicKey: PublicKey;
     amountX: Decimal;
     amountY: Decimal;
 };

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

@@ -1 +1 @@
-{"version":3,"file":"meteora.d.ts","sourceRoot":"","sources":["../../src/utils/meteora.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAA+C,MAAM,aAAa,CAAC;AACnF,OAAO,OAAO,MAAM,YAAY,CAAC;AAEjC,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,GAAG,EAAE,MAAM,2BAA2B,CAAC;AAChD,OAAO,EAAE,EAAE,EAAE,MAAM,mBAAmB,CAAC;AACvC,OAAO,EAAE,qBAAqB,EAAE,MAAM,sDAAsD,CAAC;AAO7F,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAGhF;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,GAAG,MAAM,CAI3F;AAED,wBAAgB,gCAAgC,CAC9C,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,GAChB,OAAO,CAIT;AAED,wBAAgB,6BAA6B,CAC3C,KAAK,EAAE,OAAO,EACd,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,OAAO,EACZ,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,GAChB,MAAM,CAGR;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAGlG;AAED,wBAAgB,0BAA0B,CAAC,aAAa,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAKlF;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,GAAG,GAAG,IAAI,CAOnF;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,GAAG,GAAG,IAAI,CAQvF;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,CAGlD;AAED,wBAAsB,cAAc,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,OAAO,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAYnH;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC"}
+{"version":3,"file":"meteora.d.ts","sourceRoot":"","sources":["../../src/utils/meteora.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,OAAO,MAAM,YAAY,CAAC;AAEjC,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AACtD,OAAO,EAAE,GAAG,EAAE,MAAM,yBAAyB,CAAC;AAC9C,OAAO,EAAE,EAAE,EAAE,MAAM,mBAAmB,CAAC;AAKvC,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAGhF;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,GAAG,MAAM,CAI3F;AAED,wBAAgB,gCAAgC,CAC9C,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,GAChB,OAAO,CAIT;AAED,wBAAgB,6BAA6B,CAC3C,KAAK,EAAE,OAAO,EACd,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,OAAO,EACZ,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,GAChB,MAAM,CAGR;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAGlG;AAED,wBAAgB,0BAA0B,CAAC,aAAa,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAKlF;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,GAAG,GAAG,IAAI,CAOnF;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,GAAG,GAAG,IAAI,CAQvF;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,CAGlD;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,SAAS,uBAQhF;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,SAAS,EAAE,SAAS,CAAC;IACrB,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC"}

package/dist/utils/meteora.js

@@ -13,13 +13,12 @@ exports.getBinFromBinArray = getBinFromBinArray;
 exports.getBinFromBinArrays = getBinFromBinArrays;
 exports.binIdToBinArrayIndex = binIdToBinArrayIndex;
 exports.deriveBinArray = deriveBinArray;
-const kit_1 = require("@solana/kit");
+const web3_js_1 = require("@solana/web3.js");
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const numericalValues_1 = require("../constants/numericalValues");
 const anchor_1 = require("@coral-xyz/anchor");
 const BASIS_POINT_MAX = 10000;
 const MAX_BIN_ARRAY_SIZE = 70;
-const addressEncoder = (0, kit_1.getAddressEncoder)();
 function getPriceOfBinByBinId(binId, tickSpacing) {
     const binStepNum = new decimal_js_1.default(tickSpacing).div(new decimal_js_1.default(BASIS_POINT_MAX));
     return new decimal_js_1.default(1).add(new decimal_js_1.default(binStepNum)).pow(new decimal_js_1.default(binId));
@@ -68,7 +67,7 @@ function binIdToBinArrayIndex(binId) {
     const { div: idx, mod } = binId.divmod(new anchor_1.BN(MAX_BIN_ARRAY_SIZE));
     return binId.isNeg() && !mod.isZero() ? idx.sub(new anchor_1.BN(1)) : idx;
 }
-async function deriveBinArray(lbPair, index, programId) {
+function deriveBinArray(lbPair, index, programId) {
     let binArrayBytes;
     if (index.isNeg()) {
         binArrayBytes = new Uint8Array(index.toTwos(64).toBuffer('le', 8));
@@ -76,10 +75,6 @@ async function deriveBinArray(lbPair, index, programId) {
     else {
         binArrayBytes = new Uint8Array(index.toBuffer('le', 8));
     }
-    const pda = await (0, kit_1.getProgramDerivedAddress)({
-        seeds: [Buffer.from('bin_array'), addressEncoder.encode(lbPair), binArrayBytes],
-        programAddress: programId,
-    });
-    return pda;
+    return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('bin_array'), lbPair.toBytes(), binArrayBytes], programId);
 }
 //# sourceMappingURL=meteora.js.map

package/dist/utils/meteora.js.map

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

package/dist/utils/orca.d.ts

@@ -1,40 +1,3 @@
-import { BN } from '@coral-xyz/anchor';
-import { Address, GetAccountInfoApi, GetMultipleAccountsApi, Rpc } from '@solana/kit';
-import { ProgramDerivedAddress } from '@solana/addresses/dist/types/program-derived-address';
-import { Percentage } from './types';
-import { IncreaseLiquidityQuoteParam } from '@orca-so/whirlpools';
-import { Whirlpool } from '../@codegen/whirlpools/accounts';
-import { IncreaseLiquidityQuote, TransferFee } from '@orca-so/whirlpools-core';
-import { Whirlpool as WhirlpoolAPIResponse } from '../services/OrcaWhirlpoolsResponse';
-import Decimal from 'decimal.js/decimal';
-export declare const defaultSlippagePercentageBPS = 10;
-export declare function getTickArray(programId: Address, whirlpoolAddress: Address, startTick: number): Promise<ProgramDerivedAddress>;
-export declare function getTokenAFromLiquidity(liquidity: BN, sqrtPrice0X64: BN, sqrtPrice1X64: BN, roundUp: boolean): BN;
-export declare function getTokenBFromLiquidity(liquidity: BN, sqrtPrice0X64: BN, sqrtPrice1X64: BN, roundUp: boolean): BN;
-export declare function getNearestValidTickIndexFromTickIndex(tickIndex: number, tickSpacing: number): number;
-export declare function getIncreaseLiquidityQuote(param: IncreaseLiquidityQuoteParam, pool: Whirlpool, tickLowerIndex: number, tickUpperIndex: number, slippageToleranceBps: number, transferFeeA: TransferFee | undefined, transferFeeB: TransferFee | undefined): IncreaseLiquidityQuote;
-export declare function adjustForSlippage(n: BN, { numerator, denominator }: Percentage, adjustUp: boolean): BN;
-export type EstimatedAprs = {
-    fee: number;
-    rewards: number[];
-};
-export declare const ZERO_APR: {
-    fee: number;
-    rewards: number[];
-};
-export declare function estimateAprsForPriceRange(pool: WhirlpoolAPIResponse, tokenPrices: Map<Address, Decimal>, fees24h: number, tickLowerIndex: number, tickUpperIndex: number, rewardsDecimals: Map<Address, number>): EstimatedAprs;
-export declare function getLowestInitializedTickArrayTickIndex(rpc: Rpc<GetAccountInfoApi>, whirlpoolAddress: Address, tickSpacing: number): Promise<number>;
-export declare function getHighestInitializedTickArrayTickIndex(rpc: Rpc<GetAccountInfoApi>, whirlpoolAddress: Address, tickSpacing: number): Promise<number>;
-export type LiquidityDataPoint = {
-    liquidity: Decimal;
-    price: Decimal;
-    tickIndex: number;
-};
-export type WhirlpoolLiquidityDistribution = {
-    currentPrice: Decimal;
-    currentTickIndex: number;
-    datapoints: LiquidityDataPoint[];
-};
-export declare function getLiquidityDistribution(rpc: Rpc<GetMultipleAccountsApi>, poolAddress: Address, poolData: WhirlpoolAPIResponse, tickLower: number, tickUpper: number, whirlpoolProgramId: Address): Promise<WhirlpoolLiquidityDistribution>;
-export declare function getTickArrayPda(programId: Address, poolAddress: Address, startIndex: number): Promise<[Address, number]>;
+import { PublicKey } from '@solana/web3.js';
+export declare function getTickArray(programId: PublicKey, whirlpoolAddress: PublicKey, startTick: number): [PublicKey, number];
 //# sourceMappingURL=orca.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"orca.d.ts","sourceRoot":"","sources":["../../src/utils/orca.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"orca.d.ts","sourceRoot":"","sources":["../../src/utils/orca.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,wBAAgB,YAAY,CAC1B,SAAS,EAAE,SAAS,EACpB,gBAAgB,EAAE,SAAS,EAC3B,SAAS,EAAE,MAAM,GAChB,CAAC,SAAS,EAAE,MAAM,CAAC,CAKrB"}

package/dist/utils/orca.js

@@ -1,254 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ZERO_APR = exports.defaultSlippagePercentageBPS = void 0;
 exports.getTickArray = getTickArray;
-exports.getTokenAFromLiquidity = getTokenAFromLiquidity;
-exports.getTokenBFromLiquidity = getTokenBFromLiquidity;
-exports.getNearestValidTickIndexFromTickIndex = getNearestValidTickIndexFromTickIndex;
-exports.getIncreaseLiquidityQuote = getIncreaseLiquidityQuote;
-exports.adjustForSlippage = adjustForSlippage;
-exports.estimateAprsForPriceRange = estimateAprsForPriceRange;
-exports.getLowestInitializedTickArrayTickIndex = getLowestInitializedTickArrayTickIndex;
-exports.getHighestInitializedTickArrayTickIndex = getHighestInitializedTickArrayTickIndex;
-exports.getLiquidityDistribution = getLiquidityDistribution;
-exports.getTickArrayPda = getTickArrayPda;
-const anchor_1 = require("@coral-xyz/anchor");
-const kit_1 = require("@solana/kit");
-const constants_1 = require("../constants");
-const whirlpools_1 = require("@orca-so/whirlpools");
-const accounts_1 = require("../@codegen/whirlpools/accounts");
-const whirlpools_core_1 = require("@orca-so/whirlpools-core");
-const whirlpools_core_2 = require("@orca-so/whirlpools-core");
-const decimal_1 = __importDefault(require("decimal.js/decimal"));
-const whirlpools_2 = require("./whirlpools");
-const CreationParameters_1 = require("./CreationParameters");
-const whirlpools_client_1 = require("@orca-so/whirlpools-client");
-const utils_1 = require("./utils");
-const math_1 = require("./math");
-exports.defaultSlippagePercentageBPS = 10;
-const addressEncoder = (0, kit_1.getAddressEncoder)();
-const TICK_ARRAY_SIZE = 88;
-const SECONDS_PER_YEAR = 60 * // SECONDS
-    60 * // MINUTES
-    24 * // HOURS
-    365; // DAYS
-function estimateRewardApr(reward, rewardTokenDecimals, concentratedValue, tokenPrices) {
-    const { mint } = reward;
-    const rewardTokenPrice = tokenPrices.get((0, kit_1.address)(mint));
-    const emissionsPerSecond = new decimal_1.default(reward.emissionsPerSecond).div(new decimal_1.default(10).pow(rewardTokenDecimals));
-    if (emissionsPerSecond.eq(math_1.ZERO) || !rewardTokenPrice) {
-        return 0;
-    }
-    const res = emissionsPerSecond.mul(SECONDS_PER_YEAR).mul(rewardTokenPrice).div(concentratedValue).toNumber();
-    return res;
-}
-async function getTickArray(programId, whirlpoolAddress, startTick) {
-    return await (0, kit_1.getProgramDerivedAddress)({
-        seeds: [Buffer.from('tick_array'), addressEncoder.encode(whirlpoolAddress), Buffer.from(startTick.toString())],
-        programAddress: programId,
-    });
-}
-function getTokenAFromLiquidity(liquidity, sqrtPrice0X64, sqrtPrice1X64, roundUp) {
-    const [sqrtPriceLowerX64, sqrtPriceUpperX64] = orderSqrtPrice(sqrtPrice0X64, sqrtPrice1X64);
-    const numerator = liquidity.mul(sqrtPriceUpperX64.sub(sqrtPriceLowerX64)).shln(64);
-    const denominator = sqrtPriceUpperX64.mul(sqrtPriceLowerX64);
-    if (roundUp) {
-        return divRoundUp(numerator, denominator);
-    }
-    else {
-        return numerator.div(denominator);
-    }
-}
-function getTokenBFromLiquidity(liquidity, sqrtPrice0X64, sqrtPrice1X64, roundUp) {
-    const [sqrtPriceLowerX64, sqrtPriceUpperX64] = orderSqrtPrice(sqrtPrice0X64, sqrtPrice1X64);
-    const result = liquidity.mul(sqrtPriceUpperX64.sub(sqrtPriceLowerX64));
-    if (roundUp) {
-        return shiftRightRoundUp(result);
-    }
-    else {
-        return result.shrn(64);
-    }
-}
-function getNearestValidTickIndexFromTickIndex(tickIndex, tickSpacing) {
-    return tickIndex - (tickIndex % tickSpacing);
-}
-function getIncreaseLiquidityQuote(param, pool, tickLowerIndex, tickUpperIndex, slippageToleranceBps, transferFeeA, transferFeeB) {
-    if ('liquidity' in param) {
-        return (0, whirlpools_core_2.increaseLiquidityQuote)(param.liquidity, slippageToleranceBps, BigInt(pool.sqrtPrice.toString()), tickLowerIndex, tickUpperIndex, transferFeeA, transferFeeB);
-    }
-    else if ('tokenA' in param) {
-        return (0, whirlpools_core_2.increaseLiquidityQuoteA)(param.tokenA, slippageToleranceBps, BigInt(pool.sqrtPrice.toString()), tickLowerIndex, tickUpperIndex, transferFeeA, transferFeeB);
-    }
-    else {
-        return (0, whirlpools_core_2.increaseLiquidityQuoteB)(param.tokenB, slippageToleranceBps, BigInt(pool.sqrtPrice.toString()), tickLowerIndex, tickUpperIndex, transferFeeA, transferFeeB);
-    }
-}
-function orderSqrtPrice(sqrtPrice0X64, sqrtPrice1X64) {
-    if (sqrtPrice0X64.lt(sqrtPrice1X64)) {
-        return [sqrtPrice0X64, sqrtPrice1X64];
-    }
-    else {
-        return [sqrtPrice1X64, sqrtPrice0X64];
-    }
-}
-function shiftRightRoundUp(n) {
-    let result = n.shrn(64);
-    if (n.mod(new anchor_1.BN(constants_1.U64_MAX)).gt(constants_1.ZERO_BN)) {
-        result = result.add(constants_1.ONE_BN);
-    }
-    return result;
-}
-function divRoundUp(n0, n1) {
-    const hasRemainder = !n0.mod(n1).eq(constants_1.ZERO_BN);
-    if (hasRemainder) {
-        return n0.div(n1).add(constants_1.ONE_BN);
-    }
-    else {
-        return n0.div(n1);
-    }
-}
-function adjustForSlippage(n, { numerator, denominator }, adjustUp) {
-    if (adjustUp) {
-        return n.mul(denominator.add(numerator)).div(denominator);
-    }
-    else {
-        return n.mul(denominator).div(denominator.add(numerator));
-    }
-}
-exports.ZERO_APR = {
-    fee: 0,
-    rewards: [0, 0, 0],
-};
-function estimateAprsForPriceRange(pool, tokenPrices, fees24h, tickLowerIndex, tickUpperIndex, rewardsDecimals) {
-    const tokenPriceA = tokenPrices.get((0, kit_1.address)(pool.tokenMintA));
-    const tokenPriceB = tokenPrices.get((0, kit_1.address)(pool.tokenMintB));
-    if (!fees24h || !tokenPriceA || !tokenPriceB || tickLowerIndex >= tickUpperIndex) {
-        return exports.ZERO_APR;
-    }
-    // Value of liquidity if the entire liquidity were concentrated between tickLower/Upper
-    // Since this is virtual liquidity, concentratedValue should actually be less than totalValue
-    const { minTokenA, minTokenB } = (0, whirlpools_2.getRemoveLiquidityQuote)({
-        positionAddress: whirlpools_1.DEFAULT_ADDRESS,
-        tickCurrentIndex: pool.tickCurrentIndex,
-        sqrtPrice: new anchor_1.BN(pool.sqrtPrice.toString()),
-        tickLowerIndex,
-        tickUpperIndex,
-        liquidity: new anchor_1.BN(pool.liquidity.toString()),
-        slippageTolerance: { numerator: constants_1.ZERO_BN, denominator: new anchor_1.BN(CreationParameters_1.FullBPS) },
-    });
-    const tokenValueA = getTokenValue(minTokenA, pool.tokenA.decimals, tokenPriceA);
-    const tokenValueB = getTokenValue(minTokenB, pool.tokenB.decimals, tokenPriceB);
-    const concentratedValue = tokenValueA.add(tokenValueB);
-    const feesPerYear = new decimal_1.default(fees24h).mul(365).div(new decimal_1.default(10).pow(6)); // scale from lamports of USDC to tokens
-    const feeApr = feesPerYear.div(concentratedValue).toNumber();
-    const rewards = pool.rewards.map((reward) => {
-        if (rewardsDecimals.has((0, kit_1.address)(reward.mint))) {
-            return estimateRewardApr(reward, rewardsDecimals.get((0, kit_1.address)(reward.mint)), concentratedValue, tokenPrices);
-        }
-        else {
-            return 0;
-        }
-    });
-    return { fee: feeApr, rewards };
-}
-function getTokenValue(tokenAmount, decimals, tokenPrice) {
-    return tokenPrice.mul(new decimal_1.default(tokenAmount.toString()).div(new decimal_1.default(10).pow(decimals)));
-}
-async function getLowestInitializedTickArrayTickIndex(rpc, whirlpoolAddress, tickSpacing) {
-    const minTick = (0, whirlpools_core_1._MIN_TICK_INDEX)();
-    let startTickIndex = (0, whirlpools_core_1.getTickArrayStartTickIndex)(minTick, tickSpacing);
-    // eslint-disable-next-line
-    while (true) {
-        const [tickArrayAddress] = await (0, whirlpools_client_1.getTickArrayAddress)(whirlpoolAddress, startTickIndex);
-        const tickArray = await (0, whirlpools_client_1.fetchMaybeTickArray)(rpc, tickArrayAddress);
-        if (tickArray.exists) {
-            return startTickIndex;
-        }
-        startTickIndex += TICK_ARRAY_SIZE * tickSpacing;
-        await (0, utils_1.sleep)(500);
-    }
-}
-async function getHighestInitializedTickArrayTickIndex(rpc, whirlpoolAddress, tickSpacing) {
-    const maxTick = (0, whirlpools_core_1._MAX_TICK_INDEX)();
-    let startTickIndex = (0, whirlpools_core_1.getTickArrayStartTickIndex)(maxTick, tickSpacing);
-    // eslint-disable-next-line
-    while (true) {
-        const [tickArrayAddress] = await (0, whirlpools_client_1.getTickArrayAddress)(whirlpoolAddress, startTickIndex);
-        const tickArray = await (0, whirlpools_client_1.fetchMaybeTickArray)(rpc, tickArrayAddress);
-        if (tickArray.exists) {
-            return startTickIndex;
-        }
-        startTickIndex -= TICK_ARRAY_SIZE * tickSpacing;
-        await (0, utils_1.sleep)(500);
-    }
-}
-async function getLiquidityDistribution(rpc, poolAddress, poolData, tickLower, tickUpper, whirlpoolProgramId) {
-    const datapoints = [];
-    const tokenDecimalsA = poolData.tokenA.decimals;
-    const tokenDecimalsB = poolData.tokenB.decimals;
-    const tickArrayAddresses = await getSurroundingTickArrayAddresses(poolAddress, poolData, tickLower, tickUpper, whirlpoolProgramId);
-    const tickArrays = await accounts_1.TickArray.fetchMultiple(rpc, tickArrayAddresses, whirlpoolProgramId);
-    const currentLiquidity = new decimal_1.default(poolData.liquidity.toString());
-    let relativeLiquidity = currentLiquidity;
-    let minLiquidity = new decimal_1.default(0);
-    let liquidity = new decimal_1.default(0);
-    tickArrays.forEach((tickArray) => {
-        if (!tickArray) {
-            return;
-        }
-        const startIndex = tickArray.startTickIndex;
-        tickArray.ticks.forEach((tick, index) => {
-            const tickIndex = startIndex + index * poolData.tickSpacing;
-            const price = (0, whirlpools_core_1.tickIndexToPrice)(tickIndex, tokenDecimalsA, tokenDecimalsB);
-            const liquidityNet = new decimal_1.default(tick.liquidityNet.toString());
-            liquidity = liquidity.add(liquidityNet);
-            datapoints.push({ liquidity: new decimal_1.default(liquidity), price: new decimal_1.default(price), tickIndex });
-            minLiquidity = liquidity.lt(minLiquidity) ? liquidity : minLiquidity;
-            if (tickIndex === poolData.tickCurrentIndex) {
-                relativeLiquidity = relativeLiquidity.sub(liquidityNet);
-            }
-        });
-    });
-    if (!relativeLiquidity.eq(currentLiquidity)) {
-        minLiquidity = minLiquidity.add(relativeLiquidity);
-        datapoints.forEach((datapoint) => {
-            datapoint.liquidity = datapoint.liquidity.add(relativeLiquidity);
-        });
-    }
-    if (minLiquidity.lt(0)) {
-        datapoints.forEach((datapoint) => {
-            datapoint.liquidity = datapoint.liquidity.add(minLiquidity.neg());
-        });
-    }
-    return {
-        currentPrice: new decimal_1.default(poolData.price),
-        currentTickIndex: poolData.tickCurrentIndex,
-        datapoints,
-    };
-}
-async function getSurroundingTickArrayAddresses(poolAddress, pool, tickLower, tickUpper, programId) {
-    const tickArrayAddresses = [];
-    let startIndex = (0, whirlpools_core_1.getTickArrayStartTickIndex)(tickLower, pool.tickSpacing);
-    while (startIndex <= tickUpper) {
-        const [address, _bump] = await getTickArrayPda(programId, poolAddress, startIndex);
-        tickArrayAddresses.push(address);
-        try {
-            startIndex = (0, whirlpools_core_1.getTickArrayStartTickIndex)(startIndex, pool.tickSpacing);
-        }
-        catch (_e) {
-            return tickArrayAddresses;
-        }
-    }
-    return tickArrayAddresses;
-}
-async function getTickArrayPda(programId, poolAddress, startIndex) {
-    const pdaWithBump = await (0, kit_1.getProgramDerivedAddress)({
-        seeds: [Buffer.from('tick_array'), addressEncoder.encode(poolAddress), Buffer.from(startIndex.toString())],
-        programAddress: programId,
-    });
-    return [pdaWithBump[0], pdaWithBump[1]];
+const web3_js_1 = require("@solana/web3.js");
+function getTickArray(programId, whirlpoolAddress, startTick) {
+    return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('tick_array'), whirlpoolAddress.toBuffer(), Buffer.from(startTick.toString())], programId);
 }
 //# sourceMappingURL=orca.js.map