@kamino-finance/kliquidity-sdk 8.1.1 → 8.1.3

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":";;;;;AAUA,oDAGC;AAED,8CAIC;AAED,4EASC;AAED,sEASC;AAED,oDAGC;AAED,gEAKC;AAED,gDAOC;AAED,kDAQC;AAED,oDAGC;AAED,wCAQC;AAvFD,6CAA4C;AAC5C,4DAAiC;AACjC,kEAAuD;AAGvD,8CAAuC;AAEvC,MAAM,eAAe,GAAG,KAAK,CAAC;AAC9B,MAAM,kBAAkB,GAAG,EAAE,CAAC;AAE9B,SAAgB,oBAAoB,CAAC,KAAa,EAAE,WAAmB;IACrE,MAAM,UAAU,GAAG,IAAI,oBAAO,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,IAAI,oBAAO,CAAC,eAAe,CAAC,CAAC,CAAC;IAC9E,OAAO,IAAI,oBAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,oBAAO,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,oBAAO,CAAC,KAAK,CAAC,CAAC,CAAC;AAC7E,CAAC;AAED,SAAgB,iBAAiB,CAAC,KAAc,EAAE,WAAmB,EAAE,GAAY;IACjF,MAAM,UAAU,GAAG,IAAI,oBAAO,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,IAAI,oBAAO,CAAC,eAAe,CAAC,CAAC,CAAC;IAC9E,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,IAAI,oBAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;IAC1E,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;AACzD,CAAC;AAED,SAAgB,gCAAgC,CAC9C,KAAa,EACb,WAAmB,EACnB,SAAiB,EACjB,SAAiB;IAEjB,OAAO,oBAAoB,CAAC,KAAK,EAAE,WAAW,CAAC;SAC5C,GAAG,CAAC,IAAI,oBAAO,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;SACnC,GAAG,CAAC,IAAI,oBAAO,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;AACzC,CAAC;AAED,SAAgB,6BAA6B,CAC3C,KAAc,EACd,WAAmB,EACnB,GAAY,EACZ,SAAiB,EACjB,SAAiB;IAEjB,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,oBAAO,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,oBAAO,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;IAClG,OAAO,iBAAiB,CAAC,WAAW,EAAE,WAAW,EAAE,GAAG,CAAC,CAAC;AAC1D,CAAC;AAED,SAAgB,oBAAoB,CAAC,KAAc,EAAE,SAAiB,EAAE,SAAiB;IACvF,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,oBAAO,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,oBAAO,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;IAClG,OAAO,WAAW,CAAC,GAAG,CAAC,IAAI,oBAAO,CAAC,yBAAO,CAAC,CAAC,CAAC;AAC/C,CAAC;AAED,SAAgB,0BAA0B,CAAC,aAAqB;IAC9D,MAAM,UAAU,GAAG,aAAa,GAAG,kBAAkB,CAAC;IACtD,MAAM,UAAU,GAAG,UAAU,GAAG,kBAAkB,GAAG,CAAC,CAAC;IAEvD,OAAO,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;AAClC,CAAC;AAED,SAAgB,kBAAkB,CAAC,QAAgB,EAAE,QAAkB;IACrE,MAAM,CAAC,UAAU,CAAC,GAAG,0BAA0B,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC3E,MAAM,MAAM,GAAG,QAAQ,GAAG,UAAU,CAAC;IACrC,IAAI,MAAM,IAAI,CAAC,IAAI,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QACjD,OAAO,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC/B,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAgB,mBAAmB,CAAC,QAAgB,EAAE,SAAqB;IACzE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC1C,MAAM,GAAG,GAAG,kBAAkB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;QACvD,IAAI,GAAG,EAAE,CAAC;YACR,OAAO,GAAG,CAAC;QACb,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAgB,oBAAoB,CAAC,KAAS;IAC5C,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,WAAE,CAAC,kBAAkB,CAAC,CAAC,CAAC;IACnE,OAAO,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,WAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;AACnE,CAAC;AAED,SAAgB,cAAc,CAAC,MAAiB,EAAE,KAAS,EAAE,SAAoB;IAC/E,IAAI,aAAyB,CAAC;IAC9B,IAAI,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC;QAClB,aAAa,GAAG,IAAI,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IACrE,CAAC;SAAM,CAAC;QACN,aAAa,GAAG,IAAI,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAC1D,CAAC;IACD,OAAO,mBAAS,CAAC,sBAAsB,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC,OAAO,EAAE,EAAE,aAAa,CAAC,EAAE,SAAS,CAAC,CAAC;AAClH,CAAC"}

package/dist/utils/orca.d.ts

@@ -1,4 +1,3 @@
-import { Address } from '@solana/kit';
-import { ProgramDerivedAddress } from '@solana/addresses/dist/types/program-derived-address';
-export declare function getTickArray(programId: Address, whirlpoolAddress: Address, startTick: number): Promise<ProgramDerivedAddress>;
+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":"AAAA,OAAO,EAAE,OAAO,EAA+C,MAAM,aAAa,CAAC;AACnF,OAAO,EAAE,qBAAqB,EAAE,MAAM,sDAAsD,CAAC;AAI7F,wBAAsB,YAAY,CAChC,SAAS,EAAE,OAAO,EAClB,gBAAgB,EAAE,OAAO,EACzB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,qBAAqB,CAAC,CAKhC"}
+{"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,12 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTickArray = getTickArray;
-const kit_1 = require("@solana/kit");
-const addressEncoder = (0, kit_1.getAddressEncoder)();
-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,
-    });
+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

package/dist/utils/orca.js.map

@@ -1 +1 @@
-{"version":3,"file":"orca.js","sourceRoot":"","sources":["../../src/utils/orca.ts"],"names":[],"mappings":";;AAKA,oCASC;AAdD,qCAAmF;AAGnF,MAAM,cAAc,GAAG,IAAA,uBAAiB,GAAE,CAAC;AAEpC,KAAK,UAAU,YAAY,CAChC,SAAkB,EAClB,gBAAyB,EACzB,SAAiB;IAEjB,OAAO,MAAM,IAAA,8BAAwB,EAAC;QACpC,KAAK,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,cAAc,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC9G,cAAc,EAAE,SAAS;KAC1B,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"orca.js","sourceRoot":"","sources":["../../src/utils/orca.ts"],"names":[],"mappings":";;AAEA,oCASC;AAXD,6CAA4C;AAE5C,SAAgB,YAAY,CAC1B,SAAoB,EACpB,gBAA2B,EAC3B,SAAiB;IAEjB,OAAO,mBAAS,CAAC,sBAAsB,CACrC,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,gBAAgB,CAAC,QAAQ,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC,EAC3F,SAAS,CACV,CAAC;AACJ,CAAC"}

package/dist/utils/pubkey.d.ts

@@ -0,0 +1,66 @@
+import { PublicKey } from '@solana/web3.js';
+import BN from 'bn.js';
+/**
+ * Custom set implementation for PublicKey
+ * Calling toString() on a PublicKey is pretty slow and pubkeys do not support `SameValueZero` comparison, so we use a custom set implementation where keys are compared with `PublicKey.equals(PublicKey)`
+ */
+export declare class PublicKeySet<T extends PublicKey> {
+    private items;
+    constructor(items: Array<T>);
+    add(item: T): void;
+    contains(item: T): boolean;
+    private equals;
+    isEmpty(): boolean;
+    toArray(): T[];
+}
+/**
+ * Custom map implementation for PublicKey, backed by a list for o(n) lookup speed
+ * Calling toString() on a PublicKey is pretty slow and pubkeys do not support `SameValueZero` comparison, so we use a custom map implementation where keys are compared with `PublicKey.equals(PublicKey)`
+ */
+export declare class PublicKeyMap<K extends PublicKey, V> {
+    private record;
+    set(key: K, value: V): void;
+    get(key: K): V | undefined;
+    has(key: K): boolean;
+    delete(key: K): void;
+    private findIndex;
+    clear(): void;
+    forEach(callback: (value: V, key: K) => void): void;
+    keys(): K[];
+    values(): V[];
+    entries(): [K, V][];
+    isEmpty(): boolean;
+}
+/**
+ * Custom map implementation for PublicKey, backed by a hashmap for o(1) lookup speed
+ * Calling toString() on a PublicKey is pretty slow and pubkeys do not support `SameValueZero` comparison, so we use a custom map implementation where keys are compared with `PublicKey.equals(PublicKey)`, and a hash is derived from the final 32 bits of the public key
+ */
+export declare class PubkeyHashMap<K extends PublicKey, V> implements Map<K, V> {
+    private buckets;
+    size: number;
+    constructor(entries?: readonly (readonly [K, V])[] | null);
+    [Symbol.iterator](): IterableIterator<[K, V]>;
+    [Symbol.toStringTag]: string;
+    set(key: K, value: V): this;
+    get(key: K): V | undefined;
+    has(key: K): boolean;
+    delete(key: K): boolean;
+    clear(): void;
+    isEmpty(): boolean;
+    forEach(callbackfn: (value: V, key: K, map: Map<K, V>) => void, thisArg?: any): void;
+    keys(): IterableIterator<K>;
+    values(): IterableIterator<V>;
+    entries(): IterableIterator<[K, V]>;
+}
+export declare class HashablePublicKey extends PublicKey implements IEquality<HashablePublicKey> {
+    static MASK: BN;
+    constructor(value: PublicKey | string | Buffer | Uint8Array | Array<number>);
+    hashCode(): number;
+    private getBN;
+}
+interface IEquality<T extends IEquality<T>> {
+    equals(other: T): boolean;
+    hashCode(): number;
+}
+export {};
+//# sourceMappingURL=pubkey.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"pubkey.d.ts","sourceRoot":"","sources":["../../src/utils/pubkey.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,MAAM,OAAO,CAAC;AAEvB;;;GAGG;AACH,qBAAa,YAAY,CAAC,CAAC,SAAS,SAAS;IAC3C,OAAO,CAAC,KAAK,CAAW;gBAEZ,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;IAI3B,GAAG,CAAC,IAAI,EAAE,CAAC,GAAG,IAAI;IAMlB,QAAQ,CAAC,IAAI,EAAE,CAAC,GAAG,OAAO;IAI1B,OAAO,CAAC,MAAM;IAId,OAAO,IAAI,OAAO;IAIlB,OAAO,IAAI,CAAC,EAAE;CAGf;AAED;;;GAGG;AACH,qBAAa,YAAY,CAAC,CAAC,SAAS,SAAS,EAAE,CAAC;IAC9C,OAAO,CAAC,MAAM,CAA8B;IAE5C,GAAG,CAAC,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,IAAI;IAW3B,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,SAAS;IAK1B,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,OAAO;IAIpB,MAAM,CAAC,GAAG,EAAE,CAAC,GAAG,IAAI;IAOpB,OAAO,CAAC,SAAS;IAIjB,KAAK,IAAI,IAAI;IAIb,OAAO,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,KAAK,IAAI,GAAG,IAAI;IAMnD,IAAI,IAAI,CAAC,EAAE;IAIX,MAAM,IAAI,CAAC,EAAE;IAIb,OAAO,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE;IAInB,OAAO,IAAI,OAAO;CAGnB;AAED;;;GAGG;AACH,qBAAa,aAAa,CAAC,CAAC,SAAS,SAAS,EAAE,CAAC,CAAE,YAAW,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;IACrE,OAAO,CAAC,OAAO,CAMb;IACF,IAAI,EAAE,MAAM,CAAC;gBAED,OAAO,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI;IAUxD,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAQ9C,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,MAAM,CAAmB;IAE/C,GAAG,CAAC,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,IAAI;IAkB3B,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,SAAS;IAU1B,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,OAAO;IAUpB,MAAM,CAAC,GAAG,EAAE,CAAC,GAAG,OAAO;IAkBvB,KAAK,IAAI,IAAI;IAKb,OAAO,IAAI,OAAO;IAIlB,OAAO,CAAC,UAAU,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,IAAI,EAAE,OAAO,CAAC,EAAE,GAAG,GAAG,IAAI;IAQnF,IAAI,IAAI,gBAAgB,CAAC,CAAC,CAAC;IAM3B,MAAM,IAAI,gBAAgB,CAAC,CAAC,CAAC;IAM9B,OAAO,IAAI,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;CAGpC;AAED,qBAAa,iBAAkB,SAAQ,SAAU,YAAW,SAAS,CAAC,iBAAiB,CAAC;IAEtF,MAAM,CAAC,IAAI,KAA8B;gBAC7B,KAAK,EAAE,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC;IAI3E,QAAQ,IAAI,MAAM;IAMlB,OAAO,CAAC,KAAK;CAId;AAED,UAAU,SAAS,CAAC,CAAC,SAAS,SAAS,CAAC,CAAC,CAAC;IACxC,MAAM,CAAC,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC;IAC1B,QAAQ,IAAI,MAAM,CAAC;CACpB"}

package/dist/utils/pubkey.js

@@ -0,0 +1,216 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HashablePublicKey = exports.PubkeyHashMap = exports.PublicKeyMap = exports.PublicKeySet = void 0;
+const web3_js_1 = require("@solana/web3.js");
+const bn_js_1 = __importDefault(require("bn.js"));
+/**
+ * Custom set implementation for PublicKey
+ * Calling toString() on a PublicKey is pretty slow and pubkeys do not support `SameValueZero` comparison, so we use a custom set implementation where keys are compared with `PublicKey.equals(PublicKey)`
+ */
+class PublicKeySet {
+    items = [];
+    constructor(items) {
+        items.forEach((item) => this.add(item));
+    }
+    add(item) {
+        if (!this.contains(item)) {
+            this.items.push(item);
+        }
+    }
+    contains(item) {
+        return this.items.some((existingItem) => this.equals(existingItem, item));
+    }
+    equals(item1, item2) {
+        return item1.equals(item2);
+    }
+    isEmpty() {
+        return this.items.length === 0;
+    }
+    toArray() {
+        return this.items.slice(); // Return a copy of the array to prevent external modifications
+    }
+}
+exports.PublicKeySet = PublicKeySet;
+/**
+ * Custom map implementation for PublicKey, backed by a list for o(n) lookup speed
+ * Calling toString() on a PublicKey is pretty slow and pubkeys do not support `SameValueZero` comparison, so we use a custom map implementation where keys are compared with `PublicKey.equals(PublicKey)`
+ */
+class PublicKeyMap {
+    record = [];
+    set(key, value) {
+        const index = this.findIndex(key);
+        if (index !== -1) {
+            // Update existing entry
+            this.record[index].value = value;
+        }
+        else {
+            // Add new entry
+            this.record.push({ key, value });
+        }
+    }
+    get(key) {
+        const index = this.findIndex(key);
+        return index !== -1 ? this.record[index].value : undefined;
+    }
+    has(key) {
+        return this.findIndex(key) !== -1;
+    }
+    delete(key) {
+        const index = this.findIndex(key);
+        if (index !== -1) {
+            this.record.splice(index, 1);
+        }
+    }
+    findIndex(key) {
+        return this.record.findIndex((entry) => entry.key.equals(key));
+    }
+    clear() {
+        this.record = [];
+    }
+    forEach(callback) {
+        this.record.forEach((entry) => {
+            callback(entry.value, entry.key);
+        });
+    }
+    keys() {
+        return this.record.map((entry) => entry.key);
+    }
+    values() {
+        return this.record.map((entry) => entry.value);
+    }
+    entries() {
+        return this.record.map((entry) => [entry.key, entry.value]);
+    }
+    isEmpty() {
+        return this.record.length === 0;
+    }
+}
+exports.PublicKeyMap = PublicKeyMap;
+/**
+ * Custom map implementation for PublicKey, backed by a hashmap for o(1) lookup speed
+ * Calling toString() on a PublicKey is pretty slow and pubkeys do not support `SameValueZero` comparison, so we use a custom map implementation where keys are compared with `PublicKey.equals(PublicKey)`, and a hash is derived from the final 32 bits of the public key
+ */
+class PubkeyHashMap {
+    buckets;
+    size;
+    constructor(entries) {
+        this.buckets = new Map();
+        this.size = 0;
+        if (entries) {
+            for (const [key, value] of entries) {
+                this.set(key, value);
+            }
+        }
+    }
+    *[Symbol.iterator]() {
+        for (const [, bucket] of this.buckets) {
+            for (const { key, value } of bucket) {
+                yield [key, value];
+            }
+        }
+    }
+    [Symbol.toStringTag] = 'PubkeyHashMap';
+    set(key, value) {
+        const hash = new HashablePublicKey(key).hashCode();
+        const bucket = this.buckets.get(hash);
+        if (!bucket) {
+            this.buckets.set(hash, [{ key, value }]);
+            this.size++;
+        }
+        else {
+            const entry = bucket.find((entry) => entry.key.equals(key));
+            if (entry) {
+                entry.value = value;
+            }
+            else {
+                bucket.push({ key, value });
+                this.size++;
+            }
+        }
+        return this;
+    }
+    get(key) {
+        const hash = new HashablePublicKey(key).hashCode();
+        const bucket = this.buckets.get(hash);
+        if (!bucket) {
+            return undefined;
+        }
+        const entry = bucket.find((entry) => entry.key.equals(key));
+        return entry ? entry.value : undefined;
+    }
+    has(key) {
+        const hash = new HashablePublicKey(key).hashCode();
+        const bucket = this.buckets.get(hash);
+        if (!bucket) {
+            return false;
+        }
+        const entry = bucket.find((entry) => entry.key.equals(key));
+        return !!entry;
+    }
+    delete(key) {
+        const hash = new HashablePublicKey(key).hashCode();
+        const bucket = this.buckets.get(hash);
+        if (!bucket) {
+            return false;
+        }
+        const index = bucket.findIndex((entry) => entry.key.equals(key));
+        if (index === -1) {
+            return false;
+        }
+        bucket.splice(index, 1);
+        if (bucket.length === 0) {
+            this.buckets.delete(hash);
+        }
+        this.size--;
+        return true;
+    }
+    clear() {
+        this.buckets = new Map();
+        this.size = 0;
+    }
+    isEmpty() {
+        return this.size === 0;
+    }
+    forEach(callbackfn, thisArg) {
+        this.buckets.forEach((bucket) => {
+            bucket.forEach((entry) => {
+                callbackfn(entry.value, entry.key, this);
+            }, thisArg);
+        }, thisArg);
+    }
+    *keys() {
+        for (const [key] of this) {
+            yield key;
+        }
+    }
+    *values() {
+        for (const [, value] of this) {
+            yield value;
+        }
+    }
+    entries() {
+        return this[Symbol.iterator]();
+    }
+}
+exports.PubkeyHashMap = PubkeyHashMap;
+class HashablePublicKey extends web3_js_1.PublicKey {
+    // We only use the last 32 bits of the public key for hashing
+    static MASK = new bn_js_1.default(1).shln(32).subn(1);
+    constructor(value) {
+        super(value);
+    }
+    hashCode() {
+        let hash = 13;
+        hash = hash * 7 + this.getBN().clone().iuand(HashablePublicKey.MASK).toNumber();
+        return hash;
+    }
+    getBN() {
+        //@ts-ignore
+        return this._bn;
+    }
+}
+exports.HashablePublicKey = HashablePublicKey;
+//# sourceMappingURL=pubkey.js.map

package/dist/utils/pubkey.js.map

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

package/dist/utils/tokenUtils.d.ts

@@ -1,14 +1,18 @@
-import { Address, IInstruction, TransactionSigner, Rpc, GetAccountInfoApi, Account } from '@solana/kit';
-import { WhirlpoolStrategy } from '../@codegen/kliquidity/accounts';
+import { AccountInfo, Commitment, Connection, PublicKey, Signer, Transaction, TransactionInstruction, TransactionSignature } from '@solana/web3.js';
+import { WhirlpoolStrategy } from '../kamino-client/accounts';
 import Decimal from 'decimal.js';
-import { CollateralInfo } from '../@codegen/kliquidity/types';
-import { Token } from '@solana-program/token-2022';
-export declare const SOL_MINTS: (Address<"So11111111111111111111111111111111111111111"> | Address<"So11111111111111111111111111111111111111112">)[];
+import { CollateralInfo } from '../kamino-client/types';
+export declare const ASSOCIATED_TOKEN_PROGRAM_ID: PublicKey;
+export declare const TOKEN_PROGRAM_ID: PublicKey;
+export declare const SOL_MINTS: PublicKey[];
 export declare const DECIMALS_SOL = 9;
-export declare function getAssociatedTokenAddressAndAccount(connection: Rpc<GetAccountInfoApi>, mint: Address, owner: Address, programId?: Address): Promise<[Address, Account<Token> | null]>;
-export declare function getAssociatedTokenAddress(mint: Address, owner: Address, programId?: Address, associatedTokenProgramId?: Address): Promise<Address>;
-export declare function createAssociatedTokenAccountInstruction(payer: TransactionSigner, associatedToken: Address, owner: Address, mint: Address, programId?: Address, associatedTokenProgramId?: Address): IInstruction;
-export declare function createComputeUnitLimitIx(units?: number): IInstruction;
+export declare function getAssociatedTokenAddressAndData(connection: Connection, mint: PublicKey, owner: PublicKey, programId?: PublicKey): Promise<[PublicKey, AccountInfo<Buffer> | null]>;
+export declare function getAssociatedTokenAddress(mint: PublicKey, owner: PublicKey, allowOwnerOffCurve?: boolean, programId?: PublicKey, associatedTokenProgramId?: PublicKey): Promise<PublicKey>;
+export declare function createAssociatedTokenAccountInstruction(payer: PublicKey, associatedToken: PublicKey, owner: PublicKey, mint: PublicKey, programId?: PublicKey, associatedTokenProgramId?: PublicKey): TransactionInstruction;
+export declare function createAddExtraComputeUnitsIx(units: number): TransactionInstruction;
+export declare function createTransactionWithExtraBudget(extraUnits?: number): Transaction;
+export declare function assignBlockInfoToTransaction(connection: Connection, transaction: Transaction, payer: PublicKey): Promise<Transaction>;
+export declare function sendTransactionWithLogs(connection: Connection, tx: Transaction, payer: PublicKey, signers: Signer[], commitment?: Commitment, skipPreflight?: boolean): Promise<TransactionSignature | null>;
 export declare function getStrategyPriceRangeOrca(tickLowerIndex: number, tickUpperIndex: number, strategy: WhirlpoolStrategy, poolPrice: Decimal): {
     priceLower: Decimal;
     poolPrice: Decimal;
@@ -36,6 +40,7 @@ export declare function getPriceLowerUpper(tickLowerIndex: number, tickUpperInde
     priceUpper: Decimal;
 };
 export declare function getTokenNameFromCollateralInfo(collateralInfo: CollateralInfo): string;
-export declare const isSOLMint: (mint: Address) => boolean;
-export declare function getMintDecimals(rpc: Rpc<GetAccountInfoApi>, mint: Address): Promise<number>;
+export declare const isSOLMint: (mint: PublicKey) => boolean;
+export declare function getMintDecimals(connection: Connection, mint: PublicKey): Promise<number>;
+export declare function removeBudgetAndAtaIxns(ixns: TransactionInstruction[], mints: PublicKey[]): TransactionInstruction[];
 //# sourceMappingURL=tokenUtils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"tokenUtils.d.ts","sourceRoot":"","sources":["../../src/utils/tokenUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,YAAY,EAAW,iBAAiB,EAAE,GAAG,EAAE,iBAAiB,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACjH,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAEpE,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAG9D,OAAO,EAML,KAAK,EACN,MAAM,4BAA4B,CAAC;AAIpC,eAAO,MAAM,SAAS,qHAGrB,CAAC;AACF,eAAO,MAAM,YAAY,IAAI,CAAC;AAE9B,wBAAsB,mCAAmC,CACvD,UAAU,EAAE,GAAG,CAAC,iBAAiB,CAAC,EAClC,IAAI,EAAE,OAAO,EACb,KAAK,EAAE,OAAO,EACd,SAAS,GAAE,OAA+B,GACzC,OAAO,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC,CAI3C;AAED,wBAAsB,yBAAyB,CAC7C,IAAI,EAAE,OAAO,EACb,KAAK,EAAE,OAAO,EACd,SAAS,GAAE,OAA+B,EAC1C,wBAAwB,GAAE,OAA0C,GACnE,OAAO,CAAC,OAAO,CAAC,CAUlB;AAED,wBAAgB,uCAAuC,CACrD,KAAK,EAAE,iBAAiB,EACxB,eAAe,EAAE,OAAO,EACxB,KAAK,EAAE,OAAO,EACd,IAAI,EAAE,OAAO,EACb,SAAS,GAAE,OAA+B,EAC1C,wBAAwB,GAAE,OAA0C,GACnE,YAAY,CAYd;AAED,wBAAgB,wBAAwB,CAAC,KAAK,GAAE,MAAe,GAAG,YAAY,CAE7E;AAED,wBAAgB,yBAAyB,CACvC,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,EACtB,QAAQ,EAAE,iBAAiB,EAC3B,SAAS,EAAE,OAAO;;;;;EAUnB;AAED,wBAAgB,4BAA4B,CAC1C,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,EACtB,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM;;;;;EAMvB;AAED,wBAAgB,4BAA4B,CAC1C,UAAU,EAAE,OAAO,EACnB,UAAU,EAAE,OAAO,EACnB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM;;;;;EAKlB;AAED,wBAAgB,yBAAyB,CACvC,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,EACtB,kBAAkB,EAAE,MAAM,EAC1B,kBAAkB,EAAE,MAAM,EAC1B,OAAO,EAAE,MAAM;;;EAKhB;AAED,wBAAgB,kBAAkB,CAChC,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,EACtB,kBAAkB,EAAE,MAAM,EAC1B,kBAAkB,EAAE,MAAM;;;EAa3B;AAED,wBAAgB,8BAA8B,CAAC,cAAc,EAAE,cAAc,UAE5E;AAED,eAAO,MAAM,SAAS,SAAU,OAAO,KAAG,OAEzC,CAAC;AAEF,wBAAsB,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,iBAAiB,CAAC,EAAE,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CASjG"}
+{"version":3,"file":"tokenUtils.d.ts","sourceRoot":"","sources":["../../src/utils/tokenUtils.ts"],"names":[],"mappings":"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"}