@kamino-finance/kliquidity-sdk 8.5.2-beta.0 → 8.5.3

package/dist/utils/orca.js

@@ -1,8 +1,254 @@
 "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;
-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);
+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]];
 }
 //# 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":"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"}

package/dist/utils/tokenUtils.d.ts

@@ -1,22 +1,20 @@
-import { AccountInfo, Commitment, Connection, PublicKey, Signer, Transaction, TransactionInstruction, TransactionSignature } from '@solana/web3.js';
-import { WhirlpoolStrategy } from '../kamino-client/accounts';
+import { Address, Instruction, TransactionSigner, Rpc, GetAccountInfoApi, Account, SolanaRpcApi } 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_MINT: Address<"So11111111111111111111111111111111111111111">;
+export declare const WSOL_MINT: Address<"So11111111111111111111111111111111111111112">;
+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, associatedTokenAddress: Address, owner: Address, mint: Address, programId?: Address, associatedTokenProgramId?: Address): Instruction;
+export declare function createComputeUnitLimitIx(units?: number): Instruction;
 export declare function getStrategyPriceRangeOrca(tickLowerIndex: number, tickUpperIndex: number, strategy: WhirlpoolStrategy, poolPrice: Decimal): {
-    priceLower: Decimal;
+    priceLower: number;
     poolPrice: Decimal;
-    priceUpper: Decimal;
+    priceUpper: number;
     strategyOutOfRange: boolean;
 };
 export declare function getStrategyPriceRangeRaydium(tickLowerIndex: number, tickUpperIndex: number, tickCurrent: number, tokenADecimals: number, tokenBDecimals: number): {
@@ -36,11 +34,13 @@ export declare function getMeteoraPriceLowerUpper(tickLowerIndex: number, tickUp
     priceUpper: Decimal;
 };
 export declare function getPriceLowerUpper(tickLowerIndex: number, tickUpperIndex: number, tokenAMintDecimals: number, tokenBMintDecimals: number): {
-    priceLower: Decimal;
-    priceUpper: Decimal;
+    priceLower: number;
+    priceUpper: number;
 };
 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>;
+export declare function solToWSol(mint: Address): Address;
+export declare function getTokenAccountBalance(rpc: Rpc<SolanaRpcApi>, tokenAccount: Address): Promise<Decimal>;
+export declare function getTokenAccountBalanceLamports(rpc: Rpc<SolanaRpcApi>, tokenAccount: 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":"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"}

package/dist/utils/tokenUtils.js

@@ -1,13 +1,13 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 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 = exports.WSOL_MINT = exports.SOL_MINT = 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 +15,46 @@ 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 whirlpool_sdk_1 = require("@orca-so/whirlpool-sdk");
+exports.solToWSol = solToWSol;
+exports.getTokenAccountBalance = getTokenAccountBalance;
+exports.getTokenAccountBalanceLamports = getTokenAccountBalanceLamports;
+const kit_1 = require("@solana/kit");
+const decimal_js_1 = __importDefault(require("decimal.js"));
 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');
-exports.SOL_MINTS = [
-    new web3_js_1.PublicKey('So11111111111111111111111111111111111111111'),
-    new web3_js_1.PublicKey('So11111111111111111111111111111111111111112'),
-];
+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");
+const whirlpools_core_1 = require("@orca-so/whirlpools-core");
+exports.SOL_MINT = (0, kit_1.address)('So11111111111111111111111111111111111111111');
+exports.WSOL_MINT = (0, kit_1.address)('So11111111111111111111111111111111111111112');
+exports.SOL_MINTS = [exports.SOL_MINT, exports.WSOL_MINT];
 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];
-}
-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);
-}
-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),
-    });
+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 createAddExtraComputeUnitsIx(units) {
-    return web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units });
+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 createTransactionWithExtraBudget(extraUnits = 400000) {
-    return new web3_js_1.Transaction().add(createAddExtraComputeUnitsIx(extraUnits));
+function createAssociatedTokenAccountInstruction(payer, associatedTokenAddress, 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: associatedTokenAddress,
+        payer: payer,
+        tokenProgram: programId,
+        systemProgram: system_1.SYSTEM_PROGRAM_ADDRESS,
+    }, { programAddress: associatedTokenProgramId });
 }
-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()));
@@ -92,9 +63,9 @@ function getStrategyPriceRangeOrca(tickLowerIndex, tickUpperIndex, strategy, poo
 }
 function getStrategyPriceRangeRaydium(tickLowerIndex, tickUpperIndex, tickCurrent, tokenADecimals, tokenBDecimals) {
     const { priceLower, priceUpper } = getPriceLowerUpper(tickLowerIndex, tickUpperIndex, tokenADecimals, tokenBDecimals);
-    const poolPrice = (0, whirlpool_sdk_1.tickIndexToPrice)(tickCurrent, tokenADecimals, tokenBDecimals);
+    const poolPrice = new decimal_js_1.default((0, whirlpools_core_1.tickIndexToPrice)(tickCurrent, tokenADecimals, tokenBDecimals));
     const strategyOutOfRange = poolPrice.lt(priceLower) || poolPrice.gt(priceUpper);
-    return { priceLower, poolPrice, priceUpper, strategyOutOfRange };
+    return { priceLower: new decimal_js_1.default(priceLower), poolPrice, priceUpper: new decimal_js_1.default(priceUpper), strategyOutOfRange };
 }
 function getStrategyPriceRangeMeteora(priceLower, priceUpper, activeBinId, binStep, decimalsA, decimalsB) {
     const poolPrice = (0, meteora_1.getPriceOfBinByBinIdWithDecimals)(activeBinId, binStep, decimalsA, decimalsB);
@@ -107,39 +78,45 @@ function getMeteoraPriceLowerUpper(tickLowerIndex, tickUpperIndex, tokenAMintDec
     return { priceLower, priceUpper };
 }
 function getPriceLowerUpper(tickLowerIndex, tickUpperIndex, tokenAMintDecimals, tokenBMintDecimals) {
-    const priceLower = (0, whirlpool_sdk_1.tickIndexToPrice)(tickLowerIndex, Number(tokenAMintDecimals.toString()), Number(tokenBMintDecimals.toString()));
-    const priceUpper = (0, whirlpool_sdk_1.tickIndexToPrice)(tickUpperIndex, Number(tokenAMintDecimals.toString()), Number(tokenBMintDecimals.toString()));
+    const priceLower = (0, whirlpools_core_1.tickIndexToPrice)(tickLowerIndex, Number(tokenAMintDecimals.toString()), Number(tokenBMintDecimals.toString()));
+    const priceUpper = (0, whirlpools_core_1.tickIndexToPrice)(tickUpperIndex, Number(tokenAMintDecimals.toString()), Number(tokenBMintDecimals.toString()));
     return { priceLower, priceUpper };
 }
 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`);
+    }
+    return acc.data.decimals;
+}
+function solToWSol(mint) {
+    if (mint === exports.SOL_MINT) {
+        return exports.WSOL_MINT;
+    }
+    return mint;
+}
+async function getTokenAccountBalance(rpc, tokenAccount) {
+    const tokenAccountBalance = await rpc.getTokenAccountBalance(tokenAccount).send();
+    if (!tokenAccountBalance.value) {
+        throw new Error(`Could not get token account balance for ${tokenAccount.toString()}.`);
     }
-    const mintInfo = (0, spl_token_1.unpackMint)(mint, acc, acc.owner);
-    return mintInfo.decimals;
+    return new decimal_js_1.default(tokenAccountBalance.value.uiAmountString);
 }
-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;
-    });
+async function getTokenAccountBalanceLamports(rpc, tokenAccount) {
+    const tokenAccountBalance = await rpc.getTokenAccountBalance(tokenAccount).send();
+    if (!tokenAccountBalance.value) {
+        throw new Error(`Could not get token account balance for ${tokenAccount.toString()}.`);
+    }
+    return Number(tokenAccountBalance.value.amount);
 }
 //# 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, Instruction, 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) => Instruction[];
+export declare const createAtaIfMissingIx: (connection: Rpc<GetAccountInfoApi>, mint: Address, owner: TransactionSigner, programId: Address) => Promise<Instruction | undefined>;
+export declare const getAtasWithCreateIxnsIfMissing: (connection: Rpc<any>, mints: [Address, Address][], owner: TransactionSigner) => Promise<Instruction[]>;
+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: Instruction[], mints: Address[]): Instruction[];
+export declare const findAtaBalance: (connection: Rpc<GetTokenAccountBalanceApi>, ata: Address) => Promise<number | null>;
 //# sourceMappingURL=transactions.d.ts.map