@kamino-finance/kliquidity-sdk 8.1.3 → 8.2.0

package/dist/utils/lookupTable.js

@@ -1,38 +1,65 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLookupTable = getLookupTable;
-exports.getTransactionV2Message = getTransactionV2Message;
-const web3_js_1 = require("@solana/web3.js");
+exports.getAllUserLookupTables = getAllUserLookupTables;
+exports.fetchMultipleLookupTableAccounts = fetchMultipleLookupTableAccounts;
 const pubkeys_1 = require("../constants/pubkeys");
-async function getLookupTable(cluster, connection) {
+const address_lookup_table_1 = require("@solana-program/address-lookup-table");
+const lutDecoder = (0, address_lookup_table_1.getAddressLookupTableDecoder)();
+async function getLookupTable(cluster, rpc) {
     if (cluster == 'mainnet-beta' || cluster == 'devnet') {
-        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 getAllUserLookupTables(rpc, pubkeys_1.LUT_OWNER_KEY);
     }
+    return [];
 }
-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');
+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,
+                    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);
     }
+    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,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"}
+{"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;oBACX,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"}

package/dist/utils/meteora.d.ts

@@ -1,8 +1,9 @@
-import { PublicKey } from '@solana/web3.js';
+import { Address } from '@solana/kit';
 import Decimal from 'decimal.js';
-import { BinArray } from '../meteora_client/accounts';
-import { Bin } from '../meteora_client/types';
+import { BinArray } from '../@codegen/meteora/accounts';
+import { Bin } from '../@codegen/meteora/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;
@@ -12,9 +13,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: PublicKey, index: BN, programId: PublicKey): [PublicKey, number];
+export declare function deriveBinArray(lbPair: Address, index: BN, programId: Address): Promise<ProgramDerivedAddress>;
 export type MeteoraPosition = {
-    publicKey: PublicKey;
+    Address: Address;
     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,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"}
+{"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"}

package/dist/utils/meteora.js

@@ -13,12 +13,13 @@ exports.getBinFromBinArray = getBinFromBinArray;
 exports.getBinFromBinArrays = getBinFromBinArrays;
 exports.binIdToBinArrayIndex = binIdToBinArrayIndex;
 exports.deriveBinArray = deriveBinArray;
-const web3_js_1 = require("@solana/web3.js");
+const kit_1 = require("@solana/kit");
 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));
@@ -67,7 +68,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;
 }
-function deriveBinArray(lbPair, index, programId) {
+async function deriveBinArray(lbPair, index, programId) {
     let binArrayBytes;
     if (index.isNeg()) {
         binArrayBytes = new Uint8Array(index.toTwos(64).toBuffer('le', 8));
@@ -75,6 +76,10 @@ function deriveBinArray(lbPair, index, programId) {
     else {
         binArrayBytes = new Uint8Array(index.toBuffer('le', 8));
     }
-    return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('bin_array'), lbPair.toBytes(), binArrayBytes], programId);
+    const pda = await (0, kit_1.getProgramDerivedAddress)({
+        seeds: [Buffer.from('bin_array'), addressEncoder.encode(lbPair), binArrayBytes],
+        programAddress: programId,
+    });
+    return pda;
 }
 //# 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,3 +1,4 @@
-import { PublicKey } from '@solana/web3.js';
-export declare function getTickArray(programId: PublicKey, whirlpoolAddress: PublicKey, startTick: number): [PublicKey, number];
+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>;
 //# 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,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"}
+{"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"}

package/dist/utils/orca.js

@@ -1,8 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTickArray = getTickArray;
-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);
+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,
+    });
 }
 //# 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":";;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"}
+{"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"}

package/dist/utils/tokenUtils.d.ts

@@ -1,18 +1,14 @@
-import { AccountInfo, Commitment, Connection, PublicKey, Signer, Transaction, TransactionInstruction, TransactionSignature } from '@solana/web3.js';
-import { WhirlpoolStrategy } from '../kamino-client/accounts';
+import { Address, IInstruction, TransactionSigner, Rpc, GetAccountInfoApi, Account } from '@solana/kit';
+import { WhirlpoolStrategy } from '../@codegen/kliquidity/accounts';
 import Decimal from 'decimal.js';
-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[];
+import { CollateralInfo } from '../@codegen/kliquidity/types';
+import { Token } from '@solana-program/token-2022';
+export declare const SOL_MINTS: (Address<"So11111111111111111111111111111111111111111"> | Address<"So11111111111111111111111111111111111111112">)[];
 export declare const DECIMALS_SOL = 9;
-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 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 getStrategyPriceRangeOrca(tickLowerIndex: number, tickUpperIndex: number, strategy: WhirlpoolStrategy, poolPrice: Decimal): {
     priceLower: Decimal;
     poolPrice: Decimal;
@@ -40,7 +36,6 @@ export declare function getPriceLowerUpper(tickLowerIndex: number, tickUpperInde
     priceUpper: Decimal;
 };
 export declare function getTokenNameFromCollateralInfo(collateralInfo: CollateralInfo): string;
-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[];
+export declare const isSOLMint: (mint: Address) => boolean;
+export declare function getMintDecimals(rpc: Rpc<GetAccountInfoApi>, mint: Address): Promise<number>;
 //# 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":"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"}
+{"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"}

package/dist/utils/tokenUtils.js

@@ -1,13 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isSOLMint = exports.DECIMALS_SOL = exports.SOL_MINTS = exports.TOKEN_PROGRAM_ID = exports.ASSOCIATED_TOKEN_PROGRAM_ID = void 0;
-exports.getAssociatedTokenAddressAndData = getAssociatedTokenAddressAndData;
+exports.isSOLMint = exports.DECIMALS_SOL = exports.SOL_MINTS = void 0;
+exports.getAssociatedTokenAddressAndAccount = getAssociatedTokenAddressAndAccount;
 exports.getAssociatedTokenAddress = getAssociatedTokenAddress;
 exports.createAssociatedTokenAccountInstruction = createAssociatedTokenAccountInstruction;
-exports.createAddExtraComputeUnitsIx = createAddExtraComputeUnitsIx;
-exports.createTransactionWithExtraBudget = createTransactionWithExtraBudget;
-exports.assignBlockInfoToTransaction = assignBlockInfoToTransaction;
-exports.sendTransactionWithLogs = sendTransactionWithLogs;
+exports.createComputeUnitLimitIx = createComputeUnitLimitIx;
 exports.getStrategyPriceRangeOrca = getStrategyPriceRangeOrca;
 exports.getStrategyPriceRangeRaydium = getStrategyPriceRangeRaydium;
 exports.getStrategyPriceRangeMeteora = getStrategyPriceRangeMeteora;
@@ -15,75 +12,43 @@ exports.getMeteoraPriceLowerUpper = getMeteoraPriceLowerUpper;
 exports.getPriceLowerUpper = getPriceLowerUpper;
 exports.getTokenNameFromCollateralInfo = getTokenNameFromCollateralInfo;
 exports.getMintDecimals = getMintDecimals;
-exports.removeBudgetAndAtaIxns = removeBudgetAndAtaIxns;
-const web3_js_1 = require("@solana/web3.js");
-const utils_1 = require("./utils");
+const kit_1 = require("@solana/kit");
 const whirlpool_sdk_1 = require("@orca-so/whirlpool-sdk");
 const meteora_1 = require("./meteora");
-const spl_token_1 = require("@solana/spl-token");
-exports.ASSOCIATED_TOKEN_PROGRAM_ID = new web3_js_1.PublicKey('ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL');
-exports.TOKEN_PROGRAM_ID = new web3_js_1.PublicKey('TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA');
+const token_1 = require("@solana-program/token");
+const token_2022_1 = require("@solana-program/token-2022");
+const system_1 = require("@solana-program/system");
+const compute_budget_1 = require("@solana-program/compute-budget");
 exports.SOL_MINTS = [
-    new web3_js_1.PublicKey('So11111111111111111111111111111111111111111'),
-    new web3_js_1.PublicKey('So11111111111111111111111111111111111111112'),
+    (0, kit_1.address)('So11111111111111111111111111111111111111111'),
+    (0, kit_1.address)('So11111111111111111111111111111111111111112'),
 ];
 exports.DECIMALS_SOL = 9;
-async function getAssociatedTokenAddressAndData(connection, mint, owner, programId = exports.TOKEN_PROGRAM_ID) {
-    const ata = await getAssociatedTokenAddress(mint, owner, true, programId);
-    const data = await connection.getAccountInfo(ata);
-    return [ata, data];
+async function getAssociatedTokenAddressAndAccount(connection, mint, owner, programId = token_1.TOKEN_PROGRAM_ADDRESS) {
+    const ata = await getAssociatedTokenAddress(mint, owner, programId);
+    const account = await (0, token_2022_1.fetchMaybeToken)(connection, ata);
+    return [ata, account.exists ? account : null];
 }
-function getAssociatedTokenAddress(mint, owner, allowOwnerOffCurve = true, programId = exports.TOKEN_PROGRAM_ID, associatedTokenProgramId = exports.ASSOCIATED_TOKEN_PROGRAM_ID) {
-    return (0, spl_token_1.getAssociatedTokenAddress)(mint, owner, allowOwnerOffCurve, programId, associatedTokenProgramId);
+async function getAssociatedTokenAddress(mint, owner, programId = token_1.TOKEN_PROGRAM_ADDRESS, associatedTokenProgramId = token_2022_1.ASSOCIATED_TOKEN_PROGRAM_ADDRESS) {
+    const [ata] = await (0, token_2022_1.findAssociatedTokenPda)({
+        mint,
+        owner,
+        tokenProgram: programId,
+    }, { programAddress: associatedTokenProgramId });
+    return ata;
 }
-function createAssociatedTokenAccountInstruction(payer, associatedToken, owner, mint, programId = exports.TOKEN_PROGRAM_ID, associatedTokenProgramId = exports.ASSOCIATED_TOKEN_PROGRAM_ID) {
-    const keys = [
-        { pubkey: payer, isSigner: true, isWritable: true },
-        { pubkey: associatedToken, isSigner: false, isWritable: true },
-        { pubkey: owner, isSigner: false, isWritable: false },
-        { pubkey: mint, isSigner: false, isWritable: false },
-        { pubkey: web3_js_1.SystemProgram.programId, isSigner: false, isWritable: false },
-        { pubkey: programId, isSigner: false, isWritable: false },
-    ];
-    return new web3_js_1.TransactionInstruction({
-        keys,
-        programId: associatedTokenProgramId,
-        data: Buffer.alloc(0),
-    });
+function createAssociatedTokenAccountInstruction(payer, associatedToken, owner, mint, programId = token_1.TOKEN_PROGRAM_ADDRESS, associatedTokenProgramId = token_2022_1.ASSOCIATED_TOKEN_PROGRAM_ADDRESS) {
+    return (0, token_2022_1.getCreateAssociatedTokenInstruction)({
+        mint,
+        owner,
+        ata: associatedToken,
+        payer: payer,
+        tokenProgram: programId,
+        systemProgram: system_1.SYSTEM_PROGRAM_ADDRESS,
+    }, { programAddress: associatedTokenProgramId });
 }
-function createAddExtraComputeUnitsIx(units) {
-    return web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units });
-}
-function createTransactionWithExtraBudget(extraUnits = 400000) {
-    return new web3_js_1.Transaction().add(createAddExtraComputeUnitsIx(extraUnits));
-}
-async function assignBlockInfoToTransaction(connection, transaction, payer) {
-    const { blockhash, lastValidBlockHeight } = await connection.getLatestBlockhash();
-    transaction.recentBlockhash = blockhash;
-    transaction.feePayer = payer;
-    transaction.lastValidBlockHeight = lastValidBlockHeight;
-    return transaction;
-}
-async function sendTransactionWithLogs(connection, tx, payer, signers, commitment = 'processed', skipPreflight = false) {
-    const txn = await assignBlockInfoToTransaction(connection, tx, payer);
-    try {
-        const res = await (0, web3_js_1.sendAndConfirmTransaction)(connection, txn, signers, {
-            commitment: commitment,
-            skipPreflight: skipPreflight,
-        });
-        return res;
-    }
-    catch (e) {
-        console.log('ERROR:', e);
-        await (0, utils_1.sleep)(5000);
-        // @ts-ignore
-        const sig = e.toString().split(' failed ')[0].split('Transaction ')[1];
-        const res = await connection.getTransaction(sig, { commitment: 'confirmed' });
-        if (res && res.meta) {
-            console.log('Txn', res.meta.logMessages);
-        }
-        return null;
-    }
+function createComputeUnitLimitIx(units = 400000) {
+    return (0, compute_budget_1.getSetComputeUnitLimitInstruction)({ units });
 }
 function getStrategyPriceRangeOrca(tickLowerIndex, tickUpperIndex, strategy, poolPrice) {
     const { priceLower, priceUpper } = getPriceLowerUpper(tickLowerIndex, tickUpperIndex, Number(strategy.tokenAMintDecimals.toString()), Number(strategy.tokenBMintDecimals.toString()));
@@ -115,31 +80,17 @@ function getTokenNameFromCollateralInfo(collateralInfo) {
     return String.fromCharCode(...collateralInfo.name.filter((x) => x > 0));
 }
 const isSOLMint = (mint) => {
-    return exports.SOL_MINTS.filter((m) => m.equals(mint)).length > 0;
+    return exports.SOL_MINTS.filter((m) => m === mint).length > 0;
 };
 exports.isSOLMint = isSOLMint;
-async function getMintDecimals(connection, mint) {
+async function getMintDecimals(rpc, mint) {
     if ((0, exports.isSOLMint)(mint)) {
         return exports.DECIMALS_SOL;
     }
-    const acc = await connection.getAccountInfo(mint);
-    if (!acc) {
-        throw new Error(`Mint ${mint.toBase58()} not found`);
+    const acc = await (0, token_2022_1.fetchMaybeMint)(rpc, mint);
+    if (!acc.exists) {
+        throw new Error(`Mint ${mint} not found`);
     }
-    const mintInfo = (0, spl_token_1.unpackMint)(mint, acc, acc.owner);
-    return mintInfo.decimals;
-}
-function removeBudgetAndAtaIxns(ixns, mints) {
-    return ixns.filter((ixn) => {
-        const { programId, keys } = ixn;
-        if (programId.equals(web3_js_1.ComputeBudgetProgram.programId)) {
-            return false;
-        }
-        if (programId.equals(exports.ASSOCIATED_TOKEN_PROGRAM_ID)) {
-            const mint = keys[3];
-            return !mints.includes(mint.pubkey);
-        }
-        return true;
-    });
+    return acc.data.decimals;
 }
 //# sourceMappingURL=tokenUtils.js.map

package/dist/utils/tokenUtils.js.map

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

package/dist/utils/transactions.d.ts

@@ -1,14 +1,13 @@
-import { Connection, PublicKey, Transaction, TransactionInstruction } from '@solana/web3.js';
+import { Address, GetAccountInfoApi, GetTokenAccountBalanceApi, IInstruction, Rpc, TransactionSigner } from '@solana/kit';
 import Decimal from 'decimal.js';
 import { CreateAta } from './types';
 export declare const MAX_ACCOUNTS_PER_TRANSACTION = 64;
-export declare const decodeSerializedTransaction: (tx: string | undefined) => Transaction | undefined;
-export declare const getComputeBudgetAndPriorityFeeIxns: (units: number, priorityFeeLamports?: Decimal) => TransactionInstruction[];
-export declare const createAtaIfMissingIx: (connection: Connection, mint: PublicKey, owner: PublicKey, programId: PublicKey) => Promise<TransactionInstruction | undefined>;
-export declare const getAtasWithCreateIxnsIfMissing: (connection: Connection, mints: [PublicKey, PublicKey][], owner: PublicKey) => Promise<TransactionInstruction[]>;
-export declare const createWsolAtaIfMissing: (connection: Connection, amount: Decimal, owner: PublicKey, method?: "deposit" | "withdraw") => Promise<CreateAta>;
+export declare const getComputeBudgetAndPriorityFeeIxns: (units: number, priorityFeeLamports?: Decimal) => IInstruction[];
+export declare const createAtaIfMissingIx: (connection: Rpc<GetAccountInfoApi>, mint: Address, owner: TransactionSigner, programId: Address) => Promise<IInstruction | undefined>;
+export declare const getAtasWithCreateIxnsIfMissing: (connection: Rpc<any>, mints: [Address, Address][], owner: TransactionSigner) => Promise<IInstruction[]>;
+export declare const createWsolAtaIfMissing: (rpc: Rpc<GetAccountInfoApi & GetTokenAccountBalanceApi>, amount: Decimal, owner: TransactionSigner, method?: "deposit" | "withdraw") => Promise<CreateAta>;
 export declare const isWsolInfoInvalid: (wsolAtaAccountInfo: any) => boolean;
-export declare function checkIfAccountExists(connection: Connection, account: PublicKey): Promise<boolean>;
-export declare function removeBudgetAndAtaIxns(ixns: TransactionInstruction[], mints: PublicKey[]): TransactionInstruction[];
-export declare const findAtaBalance: (connection: Connection, ata: PublicKey) => Promise<number | null>;
+export declare function checkIfAccountExists(connection: Rpc<GetAccountInfoApi>, account: Address): Promise<boolean>;
+export declare function removeBudgetAndAtaIxns(ixns: IInstruction[], mints: Address[]): IInstruction[];
+export declare const findAtaBalance: (connection: Rpc<GetTokenAccountBalanceApi>, ata: Address) => Promise<number | null>;
 //# sourceMappingURL=transactions.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"transactions.d.ts","sourceRoot":"","sources":["../../src/utils/transactions.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,UAAU,EACV,SAAS,EAET,WAAW,EACX,sBAAsB,EACvB,MAAM,iBAAiB,CAAC;AACzB,OAAO,OAAO,MAAM,YAAY,CAAC;AASjC,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAEpC,eAAO,MAAM,4BAA4B,KAAK,CAAC;AAE/C,eAAO,MAAM,2BAA2B,OAAQ,MAAM,GAAG,SAAS,4BAKjE,CAAC;AAEF,eAAO,MAAM,kCAAkC,UACtC,MAAM,wBACS,OAAO,KAC5B,sBAAsB,EAUxB,CAAC;AAEF,eAAO,MAAM,oBAAoB,eACnB,UAAU,QAChB,SAAS,SACR,SAAS,aACL,SAAS,KACnB,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAO5C,CAAC;AAEF,eAAO,MAAM,8BAA8B,eAC7B,UAAU,SACf,CAAC,SAAS,EAAE,SAAS,CAAC,EAAE,SACxB,SAAS,KACf,OAAO,CAAC,sBAAsB,EAAE,CAalC,CAAC;AAEF,eAAO,MAAM,sBAAsB,eACrB,UAAU,UACd,OAAO,SACR,SAAS,WACR,SAAS,GAAG,UAAU,KAC7B,OAAO,CAAC,SAAS,CA8DnB,CAAC;AAEF,eAAO,MAAM,iBAAiB,uBAAwB,GAAG,KAAG,OAQ3D,CAAC;AAEF,wBAAsB,oBAAoB,CAAC,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,CAEvG;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,sBAAsB,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,sBAAsB,EAAE,CAgBnH;AAED,eAAO,MAAM,cAAc,eAAsB,UAAU,OAAO,SAAS,KAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAMlG,CAAC"}
+{"version":3,"file":"transactions.d.ts","sourceRoot":"","sources":["../../src/utils/transactions.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACP,iBAAiB,EACjB,yBAAyB,EACzB,YAAY,EACZ,GAAG,EACH,iBAAiB,EAClB,MAAM,aAAa,CAAC;AACrB,OAAO,OAAO,MAAM,YAAY,CAAC;AAGjC,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAgBpC,eAAO,MAAM,4BAA4B,KAAK,CAAC;AAE/C,eAAO,MAAM,kCAAkC,UAAW,MAAM,wBAAwB,OAAO,KAAG,YAAY,EAW7G,CAAC;AAEF,eAAO,MAAM,oBAAoB,eACnB,GAAG,CAAC,iBAAiB,CAAC,QAC5B,OAAO,SACN,iBAAiB,aACb,OAAO,KACjB,OAAO,CAAC,YAAY,GAAG,SAAS,CAOlC,CAAC;AAEF,eAAO,MAAM,8BAA8B,eAC7B,GAAG,CAAC,GAAG,CAAC,SACb,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,SACpB,iBAAiB,KACvB,OAAO,CAAC,YAAY,EAAE,CAaxB,CAAC;AAEF,eAAO,MAAM,sBAAsB,QAC5B,GAAG,CAAC,iBAAiB,GAAG,yBAAyB,CAAC,UAC/C,OAAO,SACR,iBAAiB,WAChB,SAAS,GAAG,UAAU,KAC7B,OAAO,CAAC,SAAS,CA+DnB,CAAC;AAEF,eAAO,MAAM,iBAAiB,uBAAwB,GAAG,KAAG,OAQ3D,CAAC;AAEF,wBAAsB,oBAAoB,CAAC,UAAU,EAAE,GAAG,CAAC,iBAAiB,CAAC,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAEjH;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,YAAY,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,YAAY,EAAE,CAkB7F;AAED,eAAO,MAAM,cAAc,eACb,GAAG,CAAC,yBAAyB,CAAC,OACrC,OAAO,KACX,OAAO,CAAC,MAAM,GAAG,IAAI,CAMvB,CAAC"}