@hawksightco/hawk-sdk 1.3.9 → 1.3.11

package/dist/src/ixGenerator/MeteoraDlmmIxGenerator.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {

package/dist/src/ixGenerator/OrcaIxGenerator.d.ts

@@ -1,5 +1,6 @@
 import * as web3 from "@solana/web3.js";
 import { IyfMainIxGenerator } from "./IyfMainIxGenerator";
+import { SimplePdaGenerator } from "../classes/SimplePdaGenerator";
 type OrcaLimitClosePositionAutomation = {
     connection: web3.Connection;
     userWallet: web3.PublicKey;
@@ -7,17 +8,81 @@ type OrcaLimitClosePositionAutomation = {
     minBinId: number;
     maxBinId: number;
     useAta?: boolean;
+    is2022Position?: boolean;
+};
+type OrcaAutoOpenPositionWithTokenExtension = {
+    connection: web3.Connection;
+    userWallet: web3.PublicKey;
+    positionMint: web3.PublicKey;
+    whirlpool: web3.PublicKey;
+    tickLowerIndex: number;
+    tickUpperIndex: number;
+    withTokenMetadata: boolean;
+    is2022Position?: boolean;
+    isUsdcFarm?: boolean;
+};
+type OrcaAutoClosePositionWithTokenExtension = {
+    connection: web3.Connection;
+    userWallet: web3.PublicKey;
+    positionMint: web3.PublicKey;
+    is2022Position?: boolean;
+};
+type OrcaOpenPositionWithTokenExtension = {
+    connection: web3.Connection;
+    userWallet: web3.PublicKey;
+    positionMint: web3.PublicKey;
+    whirlpool: web3.PublicKey;
+    tickLowerIndex: number;
+    tickUpperIndex: number;
+    withTokenMetadata: boolean;
+    is2022Position?: boolean;
+};
+type OrcaClosePositionWithTokenExtension = {
+    connection: web3.Connection;
+    userWallet: web3.PublicKey;
+    positionMint: web3.PublicKey;
+    is2022Position?: boolean;
+};
+type OrcaLimitClosePositionAutomationTokenExtension = {
+    connection: web3.Connection;
+    userWallet: web3.PublicKey;
+    position: web3.PublicKey;
+    minTickIndex: number;
+    maxTickIndex: number;
+    is2022Position?: boolean;
+    useAta?: boolean;
 };
 /**
  * Orca IX Generator
  */
 export declare class OrcaIxGenerator {
     private iyfMain;
-    constructor(iyfMain: IyfMainIxGenerator);
+    private pda;
+    constructor(iyfMain: IyfMainIxGenerator, pda: SimplePdaGenerator);
     /**
      * Orca limit close position automation
      */
-    orcaLimitClosePositionAutomation({ connection, userWallet, position, minBinId, maxBinId, useAta, }: OrcaLimitClosePositionAutomation): Promise<web3.TransactionInstruction>;
+    orcaLimitClosePositionAutomation({ connection, userWallet, position, minBinId, maxBinId, useAta, is2022Position, }: OrcaLimitClosePositionAutomation): Promise<web3.TransactionInstruction>;
+    /**
+     * Orca auto open position with Token2022 (Automation)
+     */
+    orcaAutoOpenPositionWithTokenExtension({ connection, userWallet, positionMint, whirlpool, tickLowerIndex, tickUpperIndex, withTokenMetadata, is2022Position, isUsdcFarm, }: OrcaAutoOpenPositionWithTokenExtension): Promise<web3.TransactionInstruction>;
+    /**
+     * Orca auto close position with Token2022 (Automation)
+     */
+    orcaAutoClosePositionWithTokenExtension({ connection, userWallet, positionMint, is2022Position, }: OrcaAutoClosePositionWithTokenExtension): Promise<web3.TransactionInstruction>;
+    /**
+     * Orca open position with Token2022 (User)
+     */
+    orcaOpenPositionWithTokenExtension({ connection, userWallet, positionMint, whirlpool, tickLowerIndex, tickUpperIndex, withTokenMetadata, is2022Position, }: OrcaOpenPositionWithTokenExtension): Promise<web3.TransactionInstruction>;
+    /**
+     * Orca close position with Token2022 (User)
+     */
+    orcaClosePositionWithTokenExtension({ connection, userWallet, positionMint, is2022Position, }: OrcaClosePositionWithTokenExtension): Promise<web3.TransactionInstruction>;
+    /**
+     * Orca limit close position automation with Token2022 support (Automation)
+     */
+    orcaLimitClosePositionAutomationTokenExtension({ connection, userWallet, position, minTickIndex, maxTickIndex, is2022Position, useAta }: OrcaLimitClosePositionAutomationTokenExtension): Promise<web3.TransactionInstruction>;
 }
 export {};
 //# sourceMappingURL=OrcaIxGenerator.d.ts.map

package/dist/src/ixGenerator/OrcaIxGenerator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OrcaIxGenerator.d.ts","sourceRoot":"","sources":["../../../src/ixGenerator/OrcaIxGenerator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AAIxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAG1D,KAAK,gCAAgC,GAAG;IACtC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC;IAC5B,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAA;AAED;;GAEG;AACH,qBAAa,eAAe;IAGxB,OAAO,CAAC,OAAO;gBAAP,OAAO,EAAE,kBAAkB;IAGrC;;OAEG;IACG,gCAAgC,CAAC,EACrC,UAAU,EACV,UAAU,EACV,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,MAAa,GACd,EAAE,gCAAgC,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC;CAsE3E"}
+{"version":3,"file":"OrcaIxGenerator.d.ts","sourceRoot":"","sources":["../../../src/ixGenerator/OrcaIxGenerator.ts"],"names":[],"mappings":"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"}

package/dist/src/ixGenerator/OrcaIxGenerator.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -42,14 +52,15 @@ const orca_1 = require("../orca");
  * Orca IX Generator
  */
 class OrcaIxGenerator {
-    constructor(iyfMain) {
+    constructor(iyfMain, pda) {
         this.iyfMain = iyfMain;
+        this.pda = pda;
     }
     /**
      * Orca limit close position automation
      */
     orcaLimitClosePositionAutomation(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ connection, userWallet, position, minBinId, maxBinId, useAta = true, }) {
+        return __awaiter(this, arguments, void 0, function* ({ connection, userWallet, position, minBinId, maxBinId, useAta = true, is2022Position = false, }) {
             // Initialize anchor
             anchor_1.Anchor.initialize(connection);
             // Generate user pda
@@ -58,7 +69,7 @@ class OrcaIxGenerator {
             const whirlpoolInfo = yield anchor_1.Anchor.instance().orcaProgram.account.whirlpool.fetch(positionInfo.whirlpool);
             const whirlpool = positionInfo.whirlpool;
             const positionMint = positionInfo.positionMint;
-            const positionTokenAccount = (0, functions_1.generateAta)(userPda, positionMint);
+            const positionTokenAccount = this.pda.orca.generatePositionTokenAccount(userPda, positionMint, is2022Position);
             const tokenOwnerAccountA = useAta ? (0, functions_1.generateAta)(userPda, whirlpoolInfo.tokenMintA) : (0, functions_1.generateUserPdaStorageAccount)(userPda, whirlpoolInfo.tokenMintA);
             const tokenOwnerAccountB = useAta ? (0, functions_1.generateAta)(userPda, whirlpoolInfo.tokenMintB) : (0, functions_1.generateUserPdaStorageAccount)(userPda, whirlpoolInfo.tokenMintB);
             const tokenVaultA = whirlpoolInfo.tokenVaultA;
@@ -115,5 +126,216 @@ class OrcaIxGenerator {
             });
         });
     }
+    /**
+     * Orca auto open position with Token2022 (Automation)
+     */
+    orcaAutoOpenPositionWithTokenExtension(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ connection, userWallet, positionMint, whirlpool, tickLowerIndex, tickUpperIndex, withTokenMetadata, is2022Position = true, isUsdcFarm = true, }) {
+            // Initialize anchor
+            anchor_1.Anchor.initialize(connection);
+            // Generate user pda
+            const userPda = (0, functions_1.generateUserPda)(userWallet, isUsdcFarm ? addresses_1.USDC_FARM : addresses_1.SOL_FARM);
+            // Generate position and position token account
+            const position = this.pda.orca.generateOrcaPositionPDA(positionMint);
+            const positionTokenAccount = this.pda.orca.generatePositionTokenAccount(userPda, positionMint, is2022Position);
+            // Generate orca auto open position with token extension instruction
+            // @ts-ignore
+            const ix = yield anchor_1.Anchor.instance().iyfExtension
+                .methods
+                .orcaAutoOpenPositionWithTokenExtension(tickLowerIndex, tickUpperIndex, withTokenMetadata)
+                .accounts({
+                userPda,
+                hawksightAuthority: addresses_1.HS_AUTHORITY,
+                position,
+                positionMint,
+                positionTokenAccount,
+                whirlpool,
+                token2022Program: addresses_1.TOKEN_2022,
+                systemProgram: web3.SystemProgram.programId,
+                associatedTokenProgram: addresses_1.ASSOCIATED_TOKEN_PROGRAM,
+                metadataUpdateAuth: addresses_1.ORCA_METADATA_UPDATE_AUTH,
+                orcaWhirlpoolProgram: addresses_1.ORCA_WHIRLPOOL_PROGRAM,
+            })
+                .instruction();
+            // Wrap instruction in iyf extension executeV2 (iyf-main)
+            return yield this.iyfMain.iyfExtensionExecuteV2(connection, {
+                userPda,
+                authority: addresses_1.HS_AUTHORITY,
+                ix
+            });
+        });
+    }
+    /**
+     * Orca auto close position with Token2022 (Automation)
+     */
+    orcaAutoClosePositionWithTokenExtension(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ connection, userWallet, positionMint, is2022Position = true, }) {
+            // Initialize anchor
+            anchor_1.Anchor.initialize(connection);
+            // Generate user pda
+            const userPda = (0, functions_1.generateUserPda)(userWallet);
+            // Generate position and position token account
+            const position = this.pda.orca.generateOrcaPositionPDA(positionMint);
+            const positionTokenAccount = this.pda.orca.generatePositionTokenAccount(userPda, positionMint, is2022Position);
+            // Generate orca auto close position with token extension instruction
+            // @ts-ignore
+            const ix = yield anchor_1.Anchor.instance().iyfExtension
+                .methods
+                .orcaAutoClosePositionWithTokenExtension()
+                .accounts({
+                userPda,
+                hawksightAuthority: addresses_1.HS_AUTHORITY,
+                position,
+                positionMint,
+                positionTokenAccount,
+                token2022Program: addresses_1.TOKEN_2022,
+                orcaWhirlpoolProgram: addresses_1.ORCA_WHIRLPOOL_PROGRAM,
+            })
+                .instruction();
+            // Wrap instruction in iyf extension executeV2 (iyf-main)
+            return yield this.iyfMain.iyfExtensionExecuteV2(connection, {
+                userPda,
+                authority: addresses_1.HS_AUTHORITY,
+                ix
+            });
+        });
+    }
+    /**
+     * Orca open position with Token2022 (User)
+     */
+    orcaOpenPositionWithTokenExtension(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ connection, userWallet, positionMint, whirlpool, tickLowerIndex, tickUpperIndex, withTokenMetadata, is2022Position = true, }) {
+            // Initialize anchor
+            anchor_1.Anchor.initialize(connection);
+            // Generate user pda
+            const userPda = (0, functions_1.generateUserPda)(userWallet);
+            // Generate position and position token account
+            const position = this.pda.orca.generateOrcaPositionPDA(positionMint);
+            const positionTokenAccount = this.pda.orca.generatePositionTokenAccount(userPda, positionMint, is2022Position);
+            // Generate orca open position with token extension instruction
+            // @ts-ignore
+            const ix = yield anchor_1.Anchor.instance().iyfExtension
+                .methods
+                .orcaOpenPositionWithTokenExtension(tickLowerIndex, tickUpperIndex, withTokenMetadata)
+                .accounts({
+                userPda,
+                authority: userWallet,
+                position,
+                positionMint,
+                positionTokenAccount,
+                whirlpool,
+                token2022Program: addresses_1.TOKEN_2022,
+                systemProgram: web3.SystemProgram.programId,
+                associatedTokenProgram: addresses_1.ASSOCIATED_TOKEN_PROGRAM,
+                metadataUpdateAuth: addresses_1.ORCA_METADATA_UPDATE_AUTH,
+                orcaWhirlpoolProgram: addresses_1.ORCA_WHIRLPOOL_PROGRAM,
+            })
+                .instruction();
+            // Wrap instruction in iyf extension executeV2 (iyf-main)
+            return yield this.iyfMain.iyfExtensionExecuteV2(connection, {
+                userPda,
+                authority: userWallet,
+                ix
+            });
+        });
+    }
+    /**
+     * Orca close position with Token2022 (User)
+     */
+    orcaClosePositionWithTokenExtension(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ connection, userWallet, positionMint, is2022Position = true, }) {
+            // Initialize anchor
+            anchor_1.Anchor.initialize(connection);
+            // Generate user pda
+            const userPda = (0, functions_1.generateUserPda)(userWallet);
+            // Generate position and position token account
+            const position = this.pda.orca.generateOrcaPositionPDA(positionMint);
+            const positionTokenAccount = this.pda.orca.generatePositionTokenAccount(userPda, positionMint, is2022Position);
+            // Generate orca close position with token extension instruction
+            // @ts-ignore
+            const ix = yield anchor_1.Anchor.instance().iyfExtension
+                .methods
+                .orcaClosePositionWithTokenExtension()
+                .accounts({
+                userPda,
+                authority: userWallet,
+                position,
+                positionMint,
+                positionTokenAccount,
+                token2022Program: addresses_1.TOKEN_2022,
+                orcaWhirlpoolProgram: addresses_1.ORCA_WHIRLPOOL_PROGRAM,
+            })
+                .instruction();
+            // Wrap instruction in iyf extension executeV2 (iyf-main)
+            return yield this.iyfMain.iyfExtensionExecuteV2(connection, {
+                userPda,
+                authority: userWallet,
+                ix
+            });
+        });
+    }
+    /**
+     * Orca limit close position automation with Token2022 support (Automation)
+     */
+    orcaLimitClosePositionAutomationTokenExtension(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ connection, userWallet, position, minTickIndex, maxTickIndex, is2022Position = true, useAta = false }) {
+            // Initialize anchor
+            anchor_1.Anchor.initialize(connection);
+            // Generate user pda
+            const userPda = (0, functions_1.generateUserPda)(userWallet);
+            const positionInfo = yield anchor_1.Anchor.instance().orcaProgram.account.position.fetch(position);
+            const whirlpoolInfo = yield anchor_1.Anchor.instance().orcaProgram.account.whirlpool.fetch(positionInfo.whirlpool);
+            const whirlpool = positionInfo.whirlpool;
+            const positionMint = positionInfo.positionMint;
+            const positionTokenAccount = this.pda.orca.generatePositionTokenAccount(userPda, positionMint, is2022Position);
+            const tokenOwnerAccountA = useAta
+                ? (0, functions_1.generateAta)(userPda, whirlpoolInfo.tokenMintA)
+                : (0, functions_1.generateUserPdaStorageAccount)(userPda, whirlpoolInfo.tokenMintA);
+            const tokenOwnerAccountB = useAta
+                ? (0, functions_1.generateAta)(userPda, whirlpoolInfo.tokenMintB)
+                : (0, functions_1.generateUserPdaStorageAccount)(userPda, whirlpoolInfo.tokenMintB);
+            const tokenVaultA = whirlpoolInfo.tokenVaultA;
+            const tokenVaultB = whirlpoolInfo.tokenVaultB;
+            const startIndex = (0, orca_1.getStartTickIndex)(positionInfo.tickLowerIndex, whirlpoolInfo.tickSpacing);
+            const nextIndex = (0, orca_1.getStartTickIndex)(positionInfo.tickUpperIndex, whirlpoolInfo.tickSpacing);
+            const { publicKey: tickArrayLower } = (0, orca_1.getTickArray)(addresses_1.ORCA_WHIRLPOOL_PROGRAM, whirlpool, startIndex);
+            const { publicKey: tickArrayUpper } = (0, orca_1.getTickArray)(addresses_1.ORCA_WHIRLPOOL_PROGRAM, whirlpool, nextIndex);
+            const ownerFeeA = (0, functions_1.generateAta)(addresses_1.SITE_FEE_OWNER, whirlpoolInfo.tokenMintA);
+            const ownerFeeB = (0, functions_1.generateAta)(addresses_1.SITE_FEE_OWNER, whirlpoolInfo.tokenMintB);
+            // Generate orca limit close position automation token extension instruction
+            // @ts-ignore
+            const ix = yield anchor_1.Anchor.instance().iyfExtension
+                .methods
+                .orcaLimitClosePositionAutomationTokenExtension(minTickIndex, maxTickIndex)
+                .accounts({
+                userPda,
+                hawksightAuthority: addresses_1.HS_AUTHORITY,
+                authority: userWallet,
+                orcaWhirlpoolProgram: addresses_1.ORCA_WHIRLPOOL_PROGRAM,
+                positionMint,
+                whirlpool,
+                position,
+                positionTokenAccount,
+                tokenOwnerAccountA,
+                tokenOwnerAccountB,
+                tokenVaultA,
+                tokenVaultB,
+                tickArrayLower,
+                tickArrayUpper,
+                ownerFeeA,
+                ownerFeeB,
+                tokenProgram: addresses_1.TOKEN_PROGRAM_ID, // SPL Token for fees/liquidity
+                token2022Program: addresses_1.TOKEN_2022, // Token2022 for position operations
+                associatedTokenProgram: addresses_1.ASSOCIATED_TOKEN_PROGRAM,
+            })
+                .instruction();
+            // Wrap instruction in iyf extension executeV2 (iyf-main) - AUTOMATION
+            return yield this.iyfMain.iyfExtensionExecuteV2(connection, {
+                userPda,
+                authority: addresses_1.HS_AUTHORITY, // Automation operation
+                ix
+            });
+        });
+    }
 }
 exports.OrcaIxGenerator = OrcaIxGenerator;

package/dist/src/ixGenerator/RaydiumIxGenerator.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -35,7 +45,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAmountsFromLiquidity = exports.getLiquidityFromAmounts = exports.RaydiumIxGenerator = void 0;
+exports.RaydiumIxGenerator = void 0;
+exports.getLiquidityFromAmounts = getLiquidityFromAmounts;
+exports.getAmountsFromLiquidity = getAmountsFromLiquidity;
 const web3 = __importStar(require("@solana/web3.js"));
 const anchor_1 = require("../anchor");
 const functions_1 = require("../functions");
@@ -517,7 +529,6 @@ function getLiquidityFromAmounts(connection, poolId, amountA, amountB, tickLower
         };
     });
 }
-exports.getLiquidityFromAmounts = getLiquidityFromAmounts;
 function getAmountsFromLiquidity(connection, poolId, liquidity, tickLower, tickUpper, slippage, add) {
     return __awaiter(this, void 0, void 0, function* () {
         // Load the Raydium SDK
@@ -561,4 +572,3 @@ function getAmountsFromLiquidity(connection, poolId, liquidity, tickLower, tickU
         };
     });
 }
-exports.getAmountsFromLiquidity = getAmountsFromLiquidity;

package/dist/src/meteora.d.ts

@@ -30,7 +30,7 @@ export declare class MeteoraDLMM {
     getActiveBin(): Promise<import("@meteora-ag/dlmm").BinLiquidity>;
     getPositionsByUserAndLbPair(userPubKey: web3.PublicKey): Promise<{
         activeBin: import("@meteora-ag/dlmm").BinLiquidity;
-        userPositions: LbPosition[];
+        userPositions: Array<LbPosition>;
     }>;
     /**
      * Initializes a position and adds liquidity to the specified strategy, with various steps including

package/dist/src/meteora.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {

package/dist/src/orca.js

@@ -15,18 +15,33 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTickArray = exports.getPreviousStartTick = exports.getNextStartTick = exports.getStartTickIndex = exports.getTickArrayFromTickIndex = exports.PDA_TICK_ARRAY_SEED = exports.MAX_TICK_INDEX = exports.MIN_TICK_INDEX = exports.TICK_ARRAY_SIZE = void 0;
+exports.PDA_TICK_ARRAY_SEED = exports.MAX_TICK_INDEX = exports.MIN_TICK_INDEX = exports.TICK_ARRAY_SIZE = void 0;
+exports.getTickArrayFromTickIndex = getTickArrayFromTickIndex;
+exports.getStartTickIndex = getStartTickIndex;
+exports.getNextStartTick = getNextStartTick;
+exports.getPreviousStartTick = getPreviousStartTick;
+exports.getTickArray = getTickArray;
 const web3 = __importStar(require("@solana/web3.js"));
 const tiny_invariant_1 = __importDefault(require("tiny-invariant"));
 exports.TICK_ARRAY_SIZE = 88;
@@ -48,7 +63,6 @@ function getTickArrayFromTickIndex(tickIndex, tickSpacing, whirlpool, programId,
     const startIndex = getStartTickIndex(tickIndex, tickSpacing, tickArrayOffset);
     return getTickArray(programId, whirlpool, startIndex);
 }
-exports.getTickArrayFromTickIndex = getTickArrayFromTickIndex;
 /**
  * Get the startIndex of the tick array containing tickIndex.
  *
@@ -66,7 +80,6 @@ function getStartTickIndex(tickIndex, tickSpacing, offset = 0) {
     (0, tiny_invariant_1.default)(startTickIndex <= exports.MAX_TICK_INDEX, `startTickIndex is too large - ${startTickIndex}`);
     return startTickIndex;
 }
-exports.getStartTickIndex = getStartTickIndex;
 /**
  * Returns next start tick
  *
@@ -80,7 +93,6 @@ function getNextStartTick(tickIndex, tickSpacing) {
     const nextTick = getStartTickIndex(startTick + multiple, tickSpacing);
     return nextTick;
 }
-exports.getNextStartTick = getNextStartTick;
 /**
  * Returns previous start tick
  *
@@ -94,7 +106,6 @@ function getPreviousStartTick(tickIndex, tickSpacing) {
     const nextTick = getStartTickIndex(startTick - multiple, tickSpacing);
     return nextTick;
 }
-exports.getPreviousStartTick = getPreviousStartTick;
 /**
  * @category Program Derived Addresses
  * @param programId
@@ -110,4 +121,3 @@ function getTickArray(programId, whirlpoolAddress, startTick) {
     ], programId);
     return { bump, publicKey };
 }
-exports.getTickArray = getTickArray;

package/dist/src/pdaGenerator/HawksightPdaGenerator.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HawksightPdaGenerator = void 0;
 const web3 = __importStar(require("@solana/web3.js"));

package/dist/src/pdaGenerator/OrcaPdaGenerator.d.ts

@@ -11,5 +11,13 @@ export declare class OrcaPdaGenerator {
      * @returns
      */
     generateOrcaPositionPDA(positionMint: web3.PublicKey): web3.PublicKey;
+    /**
+     * Generate position token account based on token program type
+     * @param userPda - User PDA account
+     * @param positionMint - Position mint (NFT mint)
+     * @param is2022Position - Whether this is a Token2022 position (default: false)
+     * @returns Position token account address
+     */
+    generatePositionTokenAccount(userPda: web3.PublicKey, positionMint: web3.PublicKey, is2022Position?: boolean): web3.PublicKey;
 }
 //# sourceMappingURL=OrcaPdaGenerator.d.ts.map

package/dist/src/pdaGenerator/OrcaPdaGenerator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OrcaPdaGenerator.d.ts","sourceRoot":"","sources":["../../../src/pdaGenerator/OrcaPdaGenerator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AAGxC;;GAEG;AACH,qBAAa,gBAAgB;IAE3B;;;;;;OAMG;IACH,uBAAuB,CACrB,YAAY,EAAE,IAAI,CAAC,SAAS,GAC3B,IAAI,CAAC,SAAS;CAOlB"}
+{"version":3,"file":"OrcaPdaGenerator.d.ts","sourceRoot":"","sources":["../../../src/pdaGenerator/OrcaPdaGenerator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AAIxC;;GAEG;AACH,qBAAa,gBAAgB;IAE3B;;;;;;OAMG;IACH,uBAAuB,CACrB,YAAY,EAAE,IAAI,CAAC,SAAS,GAC3B,IAAI,CAAC,SAAS;IAQjB;;;;;;OAMG;IACH,4BAA4B,CAC1B,OAAO,EAAE,IAAI,CAAC,SAAS,EACvB,YAAY,EAAE,IAAI,CAAC,SAAS,EAC5B,cAAc,GAAE,OAAe,GAC9B,IAAI,CAAC,SAAS;CAKlB"}