@picon-finance/dlmm-sdk 1.12.0 → 1.14.0

package/dist/entities/pool.d.ts

@@ -1,6 +1,7 @@
 import { createSolanaRpc, type Address, type Account, type Instruction, type TransactionSigner, type FetchAccountConfig, type FetchAccountsConfig } from "@solana/kit";
 import { generated } from "..";
 import { type FeeRates, type QuoteOutput, type TransferFee } from "../quote";
+import { type ExtraAccount, type TransferAccounts as TransferHookAccounts } from "../utils/transfer_hook";
 import { Position } from "./position";
 import { type ProgramConfig } from "./types";
 export declare class Pool {
@@ -42,6 +43,8 @@ export declare class Pool {
         quoteOutput: QuoteOutput;
         instructions: Instruction[];
     }>;
+    resolveTransferHookAccountsX(transferAccounts: TransferHookAccounts): Promise<ExtraAccount[]>;
+    resolveTransferHookAccountsY(transferAccounts: TransferHookAccounts): Promise<ExtraAccount[]>;
     quote(params: {
         xToY: boolean;
         amountIn: bigint;

package/dist/entities/pool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pool.d.ts","sourceRoot":"","sources":["../../src/entities/pool.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pool.d.ts","sourceRoot":"","sources":["../../src/entities/pool.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EAEf,KAAK,OAAO,EACZ,KAAK,OAAO,EACZ,KAAK,WAAW,EAChB,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACvB,KAAK,mBAAmB,EACzB,MAAM,aAAa,CAAC;AAMrB,OAAO,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAC/B,OAAO,EAGL,KAAK,QAAQ,EACb,KAAK,WAAW,EAChB,KAAK,WAAW,EACjB,MAAM,UAAU,CAAC;AAUlB,OAAO,EAIL,KAAK,YAAY,EACjB,KAAK,gBAAgB,IAAI,oBAAoB,EAC9C,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EACL,QAAQ,EAKT,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,SAAS,CAAC;AAE7C,qBAAa,IAAI;;IAQf,OAAO,eAYN;IAED,IAAW,GAAG,+5nBAAwB;IAEtC,IAAW,cAAc,YAAmC;IAC5D,IAAW,OAAO,oBAAoC;IACtD,IAAW,IAAI,mBAAiC;IAChD,IAAW,WAAW,WAAoC;IAE1D,IAAW,UAAU,YAAmC;IACxD,IAAW,UAAU,YAAmC;IAExD,IAAW,cAAc,WAAwC;IACjE,IAAW,cAAc,WAAwC;IAEjE,IAAW,WAAW,YAAoC;IAC1D,IAAW,WAAW,YAAoC;IAE1D,IAAW,aAAa,YAAyC;IACjE,IAAW,aAAa,YAAyC;IAEpD,eAAe,IAAI,OAAO,CAAC;QAAE,YAAY,CAAC,EAAE,WAAW,CAAC;QAAC,YAAY,CAAC,EAAE,WAAW,CAAA;KAAE,CAAC,CAMlG;IAEY,WAAW,CAAC,GAAG,GAAE,MAA8C,GAAG,OAAO,CAAC,QAAQ,CAAC,CAE/F;IAEY,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACtD,OAAO,CAAC,MAAM,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAQpD,WAAW,CACtB,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,mBAAmB,GAC3B,OAAO,CAAC,QAAQ,CAAC,CAEnB;IAEY,yBAAyB,CACpC,YAAY,EAAE,OAAO,EACrB,MAAM,CAAC,EAAE,mBAAmB,GAC3B,OAAO,CAAC,QAAQ,CAAC,CAMnB;IAEY,8BAA8B,CACzC,aAAa,EAAE,OAAO,EAAE,EACxB,MAAM,CAAC,EAAE,mBAAmB,GAC3B,OAAO,CAAC,QAAQ,EAAE,CAAC,CAMrB;IAEY,YAAY,CACvB,KAAK,EAAE,iBAAiB,EACxB,YAAY,EAAE,iBAAiB,EAC/B,EAAE,UAAU,EAAE,UAAU,EAAE,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,GACrE,OAAO,CAAC,WAAW,EAAE,CAAC,CAMxB;IAEY,aAAa,CACxB,KAAK,EAAE,iBAAiB,EACxB,YAAY,EAAE,OAAO,GACpB,OAAO,CAAC,WAAW,CAAC,CAKtB;IAEY,IAAI,CACf,IAAI,EAAE,iBAAiB,EACvB,EACE,IAAI,EACJ,QAAQ,EACR,oBAAoB,GACrB,EAAE;QACD,IAAI,EAAE,OAAO,CAAC;QACd,QAAQ,EAAE,MAAM,CAAC;QACjB,oBAAoB,EAAE,MAAM,CAAC;KAC9B,GACA,OAAO,CAAC;QAAE,WAAW,EAAE,WAAW,CAAC;QAAC,YAAY,EAAE,WAAW,EAAE,CAAA;KAAE,CAAC,CAqEpE;IAMY,4BAA4B,CAAC,gBAAgB,EAAE,oBAAoB,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,CAEzG;IAEY,4BAA4B,CAAC,gBAAgB,EAAE,oBAAoB,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,CAEzG;IAWY,KAAK,CAChB,MAAM,EAAE;QAAE,IAAI,EAAE,OAAO,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,oBAAoB,EAAE,MAAM,CAAA;KAAE,GACxE,OAAO,CAAC,WAAW,CAAC,CAGtB;IAmDY,IAAI,CACf,IAAI,EAAE,iBAAiB,EACvB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,WAAW,EAAE,CAAC,CAqBxB;IAEY,mBAAmB,CAC9B,SAAS,EAAE,iBAAiB,EAC5B,gBAAgB,EAAE,SAAS,CAAC,gBAAgB,GAC3C,OAAO,CAAC,WAAW,CAAC,CAMtB;IAEY,gBAAgB,CAC3B,SAAS,EAAE,iBAAiB,EAC5B,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,WAAW,CAAC,CAMtB;IAEY,gBAAgB,CAAC,SAAS,EAAE,iBAAiB,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,CA6DlF;IAED,OAAoB,IAAI,CACtB,GAAG,EAAE,UAAU,CAAC,OAAO,eAAe,CAAC,EACvC,OAAO,EAAE,OAAO,EAChB,cAAc,EAAE,OAAO,EACvB,MAAM,CAAC,EAAE,kBAAkB,GAC1B,OAAO,CAAC,IAAI,CAAC,CAWf;CACF;AAED,wBAAsB,eAAe,CACnC,KAAK,EAAE;IAAE,UAAU,EAAE,OAAO,CAAC;IAAC,UAAU,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,EACrF,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,OAAO,CAAC,CAGlB;AAED,wBAAsB,UAAU,CAC9B,EACE,SAAS,EACT,OAAO,EACP,OAAO,EACP,aAAa,EACb,WAAW,EACX,UAAU,EACV,UAAU,EACV,aAAa,EACb,aAAa,GACd,EAAE;IACD,SAAS,EAAE,iBAAiB,CAAC;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB,aAAa,EAAE,OAAO,CAAC;IACvB,aAAa,EAAE,OAAO,CAAC;CACxB,EACD,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,WAAW,CAAC,CAkBtB"}

package/dist/entities/pool.js

@@ -7,6 +7,7 @@ import { resolveAdminConfigAddress } from "./admin_config";
 import { processAssociatedTokenAccountPair } from "../utils/ata";
 import { getBinArrayIndex, generateBinArrayIndicesForSwap, generateBinArrayIndicesForSync, } from "../utils/bin_location";
 import { resolveTransferFee } from "../utils/transfer_fee";
+import { resolveTransferHookProgram, resolveTransferHookExtraAccounts, toRemainingAccountMeta, } from "../utils/transfer_hook";
 import { MAX_BIN_ARRAYS_PER_TRAVERSAL } from "../utils/constants";
 import { Position, openPosition, closePosition, findPositionAddress, findAllPositionAddresses, } from "./position";
 import { findAllBinArrayAddresses } from "./bin_array";
@@ -80,9 +81,31 @@ export class Pool {
             amountX: xToY ? amountIn : undefined,
             amountY: xToY ? undefined : amountIn,
         });
-        const remainingAccountsScheme = {
-            groups: [{ kind: generated.AccountKind.BinArray, count: binArrayAddresses.length }],
-        };
+        // Each mint's hook accounts are resolved against whichever role it plays in this swap —
+        // input (user -> vault, owner = user) or output (vault -> user, owner = pool PDA).
+        const xTransferAccounts = xToY
+            ? { source: tokenUserAccountX, mint: this.tokenMintX, destination: this.tokenVaultX, owner: user.address }
+            : { source: this.tokenVaultX, mint: this.tokenMintX, destination: tokenUserAccountX, owner: this.address };
+        const yTransferAccounts = xToY
+            ? { source: this.tokenVaultY, mint: this.tokenMintY, destination: tokenUserAccountY, owner: this.address }
+            : { source: tokenUserAccountY, mint: this.tokenMintY, destination: this.tokenVaultY, owner: user.address };
+        const [transferHookXAccounts, transferHookYAccounts] = await Promise.all([
+            this.resolveTransferHookAccountsX(xTransferAccounts),
+            this.resolveTransferHookAccountsY(yTransferAccounts),
+        ]);
+        const groups = [
+            { kind: generated.AccountKind.BinArray, count: binArrayAddresses.length },
+        ];
+        const remainingAccounts = binArrayAddresses.map(address => ({ address, role: AccountRole.WRITABLE }));
+        if (transferHookXAccounts.length > 0) {
+            groups.push({ kind: generated.AccountKind.TransferHookX, count: transferHookXAccounts.length });
+            remainingAccounts.push(...transferHookXAccounts.map(toRemainingAccountMeta));
+        }
+        if (transferHookYAccounts.length > 0) {
+            groups.push({ kind: generated.AccountKind.TransferHookY, count: transferHookYAccounts.length });
+            remainingAccounts.push(...transferHookYAccounts.map(toRemainingAccountMeta));
+        }
+        const remainingAccountsScheme = { groups };
         const swapIx = generated.getSwapInstruction({
             user,
             pool: this.address,
@@ -99,11 +122,26 @@ export class Pool {
             xToY,
             remainingAccountsScheme,
         }, { programAddress: this.#programAddress });
-        const remainingAccounts = binArrayAddresses.map(address => ({ address, role: AccountRole.WRITABLE }));
         const swapIxWithBinArrays = { ...swapIx, accounts: [...swapIx.accounts, ...remainingAccounts] };
         const instructions = [...preInstructions, swapIxWithBinArrays, ...postInstructions];
         return { quoteOutput, instructions };
     }
+    // Public so Position (which only holds a reference to this Pool, not its private mint data)
+    // can resolve hook accounts for its own deposit/withdraw/claimFee instructions without ever
+    // needing a Mint account itself — empty when that mint has no active transfer hook, in which
+    // case the caller should add no group to the scheme for it.
+    async resolveTransferHookAccountsX(transferAccounts) {
+        return await this.#resolveTransferHookAccounts(this.#mintX, transferAccounts);
+    }
+    async resolveTransferHookAccountsY(transferAccounts) {
+        return await this.#resolveTransferHookAccounts(this.#mintY, transferAccounts);
+    }
+    async #resolveTransferHookAccounts(mint, transferAccounts) {
+        const hookProgram = resolveTransferHookProgram(mint.data);
+        if (!hookProgram)
+            return [];
+        return await resolveTransferHookExtraAccounts(this.#rpc, hookProgram, transferAccounts);
+    }
     async quote(params) {
         const { quoteOutput } = await this.#quote(params);
         return quoteOutput;
@@ -163,6 +201,26 @@ export class Pool {
                 tokenProgramY: this.tokenProgramY,
             }),
         ]);
+        // Both legs move vault -> admin, signed by the pool PDA (not the authority signer, which
+        // only gates the on-chain permission check).
+        const [transferHookXAccounts, transferHookYAccounts] = await Promise.all([
+            this.resolveTransferHookAccountsX({
+                source: this.tokenVaultX, mint: this.tokenMintX, destination: tokenAdminAccountX, owner: this.address,
+            }),
+            this.resolveTransferHookAccountsY({
+                source: this.tokenVaultY, mint: this.tokenMintY, destination: tokenAdminAccountY, owner: this.address,
+            }),
+        ]);
+        const groups = [];
+        const remainingAccounts = [];
+        if (transferHookXAccounts.length > 0) {
+            groups.push({ kind: generated.AccountKind.TransferHookX, count: transferHookXAccounts.length });
+            remainingAccounts.push(...transferHookXAccounts.map(toRemainingAccountMeta));
+        }
+        if (transferHookYAccounts.length > 0) {
+            groups.push({ kind: generated.AccountKind.TransferHookY, count: transferHookYAccounts.length });
+            remainingAccounts.push(...transferHookYAccounts.map(toRemainingAccountMeta));
+        }
         const claimProtocolFeeIx = await generated.getClaimProtocolFeeInstructionAsync({
             authority,
             pool: this.address,
@@ -173,11 +231,15 @@ export class Pool {
             tokenVaultY: this.tokenVaultY,
             tokenAdminAccountX,
             tokenAdminAccountY,
-            remainingAccountsScheme: null,
+            remainingAccountsScheme: { groups },
             tokenProgramX: this.tokenProgramX,
             tokenProgramY: this.tokenProgramY,
         }, { programAddress: this.#programAddress });
-        return [...preInstructions, claimProtocolFeeIx, ...postInstructions];
+        const claimProtocolFeeIxWithHookAccounts = {
+            ...claimProtocolFeeIx,
+            accounts: [...claimProtocolFeeIx.accounts, ...remainingAccounts],
+        };
+        return [...preInstructions, claimProtocolFeeIxWithHookAccounts, ...postInstructions];
     }
     static async load(rpc, address, programAddress, config) {
         const pool = await generated.fetchPool(rpc, address, config);

package/dist/entities/position.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"position.d.ts","sourceRoot":"","sources":["../../src/entities/position.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,eAAe,EAGf,KAAK,OAAO,EACZ,KAAK,OAAO,EACZ,KAAK,WAAW,EAChB,KAAK,iBAAiB,EACtB,KAAK,mBAAmB,EAEzB,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAM/B,OAAO,EAIL,KAAK,UAAU,EAChB,MAAM,uBAAuB,CAAC;AAgB/B,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EACL,QAAQ,EAIT,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,aAAa,EAClB,KAAK,eAAe,EACrB,MAAM,SAAS,CAAC;AAEjB,qBAAa,QAAQ;;IAKnB,OAAO,eAQN;IAED,IAAW,OAAO,oBAAoC;IACtD,IAAW,IAAI,uBAAiC;IAChD,IAAW,YAAY,YAAqC;IAC5D,IAAW,SAAS,IAAI,SAAS,QAAQ,EAAE,CAA4B;IAEvE,IAAW,iBAAiB,IAAI;QAAE,aAAa,EAAE,OAAO,CAAC;QAAC,aAAa,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;KAAE,CAI9F;IAEM,WAAW,IAAI,eAAe,EAAE,CAuCtC;IAEY,OAAO,IAAI,OAAO,CAAC,YAAY,CAAC,CA4B5C;IAEY,OAAO,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3F,OAAO,CAAC,MAAM,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAerD,eAAe,CAAC,KAAK,EAAE,iBAAiB,EAAE,EACrD,OAAO,EACP,OAAO,EACP,UAAU,EACV,UAAU,EACV,oBAAoB,EACpB,gBAAgB,GACjB,EAAE;QACD,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,EAAE,MAAM,CAAC;QACnB,UAAU,EAAE,MAAM,EAAE,CAAC;QACrB,oBAAoB,EAAE,MAAM,CAAC;QAC7B,gBAAgB,EAAE,SAAS,CAAC,gBAAgB,CAAC;KAC9C,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,CAmDzB;IAoCY,QAAQ,CACnB,KAAK,EAAE,iBAAiB,EACxB,KAAK,CAAC,EAAE,UAAU,GACjB,OAAO,CAAC,WAAW,EAAE,CAAC,CAsBxB;IAEY,QAAQ,CACnB,KAAK,EAAE,iBAAiB,EACxB,WAAW,EAAE,MAAM,EACnB,KAAK,CAAC,EAAE,UAAU,GACjB,OAAO,CAAC,WAAW,EAAE,CAAC,CA6CxB;IAEY,KAAK,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,WAAW,CAAC,CAKjE;IAED,OAAoB,IAAI,CACtB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,mBAAmB,GAC3B,OAAO,CAAC,QAAQ,CAAC,CAkBnB;IAED,OAAoB,OAAO,CACzB,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,OAAO,EAAE,EACpB,MAAM,CAAC,EAAE,mBAAmB,GAC3B,OAAO,CAAC,QAAQ,EAAE,CAAC,CAkBrB;IAED,OAAoB,UAAU,CAC5B,GAAG,EAAE,UAAU,CAAC,OAAO,eAAe,CAAC,EACvC,SAAS,EAAE,QAAQ,EAAE,EACrB,MAAM,CAAC,EAAE,mBAAmB,GAC3B,OAAO,CAAC,IAAI,CAAC,CAiBf;IAED,OAAoB,YAAY,CAC9B,KAAK,EAAE,iBAAiB,EACxB,SAAS,EAAE,QAAQ,EAAE,EACrB,iBAAiB,GAAE,MAAoC,GACtD,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAqC1B;CACF;AAED,wBAAsB,mBAAmB,CACvC,KAAK,EAAE;IAAE,YAAY,EAAE,OAAO,CAAA;CAAE,EAChC,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,OAAO,CAAC,CAGlB;AAED,wBAAsB,wBAAwB,CAC5C,EAAE,aAAa,EAAE,EAAE;IAAE,aAAa,EAAE,OAAO,EAAE,CAAA;CAAE,EAC/C,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,OAAO,EAAE,CAAC,CAIpB;AAED,wBAAsB,YAAY,CAChC,GAAG,EAAE,UAAU,CAAC,OAAO,eAAe,CAAC,EACvC,EACE,KAAK,EACL,YAAY,EACZ,IAAI,EACJ,UAAU,EACV,UAAU,GACX,EAAE;IACD,KAAK,EAAE,iBAAiB,CAAC;IACzB,YAAY,EAAE,iBAAiB,CAAC;IAChC,IAAI,EAAE,OAAO,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB,EACD,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,WAAW,EAAE,CAAC,CAyBxB;AAED,wBAAsB,aAAa,CACjC,EACE,KAAK,EACL,YAAY,EACZ,QAAQ,GACT,EAAE;IACD,KAAK,EAAE,iBAAiB,CAAC;IACzB,YAAY,EAAE,OAAO,CAAC;IACtB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,EACD,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,WAAW,CAAC,CAWtB"}
+{"version":3,"file":"position.d.ts","sourceRoot":"","sources":["../../src/entities/position.ts"],"names":[],"mappings":"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"}

package/dist/entities/position.js

@@ -2,6 +2,7 @@ import { decodeAccount, assertAccountExists, fetchEncodedAccounts, } from "@sola
 import { generated } from "..";
 import { applyTransferFee } from "../quote";
 import { findPositionTokenAccount, processAssociatedTokenAccountPair, } from "../utils/ata";
+import { toRemainingAccountMeta } from "../utils/transfer_hook";
 import { getBinIndex, getBinArrayIndex, getPositionBinArrayIndices, } from "../utils/bin_location";
 import { assertRangeWithinRange, assertPositionBelongsToPool, } from "../utils/assert";
 import { isUndefined } from "../utils/type_guards";
@@ -113,6 +114,25 @@ export class Position {
                 amountY,
             }),
         ]);
+        // Both legs move owner -> vault (deposit), signed by owner itself.
+        const [transferHookXAccounts, transferHookYAccounts] = await Promise.all([
+            this.#pool.resolveTransferHookAccountsX({
+                source: tokenOwnerAccountX, mint: this.#pool.tokenMintX, destination: this.#pool.tokenVaultX, owner: owner.address,
+            }),
+            this.#pool.resolveTransferHookAccountsY({
+                source: tokenOwnerAccountY, mint: this.#pool.tokenMintY, destination: this.#pool.tokenVaultY, owner: owner.address,
+            }),
+        ]);
+        const groups = [];
+        const remainingAccounts = [];
+        if (transferHookXAccounts.length > 0) {
+            groups.push({ kind: generated.AccountKind.TransferHookX, count: transferHookXAccounts.length });
+            remainingAccounts.push(...transferHookXAccounts.map(toRemainingAccountMeta));
+        }
+        if (transferHookYAccounts.length > 0) {
+            groups.push({ kind: generated.AccountKind.TransferHookY, count: transferHookYAccounts.length });
+            remainingAccounts.push(...transferHookYAccounts.map(toRemainingAccountMeta));
+        }
         const { lowerBinArray, upperBinArray } = this.binArrayAddresses;
         const depositByWeightIx = generated.getDepositByWeightInstruction({
             owner,
@@ -136,17 +156,40 @@ export class Position {
             distributionMode,
             lowerBinId,
             binWeights,
-            remainingAccountsScheme: null,
+            remainingAccountsScheme: { groups },
         }, {
             programAddress: this.#pool.programAddress
         });
-        return [...preInstructions, depositByWeightIx, ...postInstructions];
+        const depositByWeightIxWithHookAccounts = {
+            ...depositByWeightIx,
+            accounts: [...depositByWeightIx.accounts, ...remainingAccounts],
+        };
+        return [...preInstructions, depositByWeightIxWithHookAccounts, ...postInstructions];
     }
     async #buildClaimFeeInstruction(owner, positionTokenAccount, tokenOwnerAccountX, tokenOwnerAccountY, range) {
         const { lowerBinId, upperBinId } = range ?? this.data;
         assertRangeWithinRange({ lowerBinId, upperBinId }, this.data);
+        // Both legs move vault -> owner (fee claim), signed by the pool PDA.
+        const [transferHookXAccounts, transferHookYAccounts] = await Promise.all([
+            this.#pool.resolveTransferHookAccountsX({
+                source: this.#pool.tokenVaultX, mint: this.#pool.tokenMintX, destination: tokenOwnerAccountX, owner: this.#pool.address,
+            }),
+            this.#pool.resolveTransferHookAccountsY({
+                source: this.#pool.tokenVaultY, mint: this.#pool.tokenMintY, destination: tokenOwnerAccountY, owner: this.#pool.address,
+            }),
+        ]);
+        const groups = [];
+        const remainingAccounts = [];
+        if (transferHookXAccounts.length > 0) {
+            groups.push({ kind: generated.AccountKind.TransferHookX, count: transferHookXAccounts.length });
+            remainingAccounts.push(...transferHookXAccounts.map(toRemainingAccountMeta));
+        }
+        if (transferHookYAccounts.length > 0) {
+            groups.push({ kind: generated.AccountKind.TransferHookY, count: transferHookYAccounts.length });
+            remainingAccounts.push(...transferHookYAccounts.map(toRemainingAccountMeta));
+        }
         const { lowerBinArray, upperBinArray } = this.binArrayAddresses;
-        return generated.getClaimFeeInstruction({
+        const claimFeeIx = generated.getClaimFeeInstruction({
             owner,
             pool: this.#pool.address,
             position: this.address,
@@ -163,10 +206,11 @@ export class Position {
             upperBinArray,
             lowerBinId,
             upperBinId,
-            remainingAccountsScheme: null,
+            remainingAccountsScheme: { groups },
         }, {
             programAddress: this.#pool.programAddress
         });
+        return { ...claimFeeIx, accounts: [...claimFeeIx.accounts, ...remainingAccounts] };
     }
     async claimFee(owner, range) {
         const [positionTokenAccount, { ataX: tokenOwnerAccountX, ataY: tokenOwnerAccountY, preInstructions, postInstructions }] = await Promise.all([
@@ -195,6 +239,25 @@ export class Position {
                 tokenProgramY: this.#pool.tokenProgramY,
             }),
         ]);
+        // Both legs move vault -> owner (withdraw), signed by the pool PDA.
+        const [transferHookXAccounts, transferHookYAccounts] = await Promise.all([
+            this.#pool.resolveTransferHookAccountsX({
+                source: this.#pool.tokenVaultX, mint: this.#pool.tokenMintX, destination: tokenOwnerAccountX, owner: this.#pool.address,
+            }),
+            this.#pool.resolveTransferHookAccountsY({
+                source: this.#pool.tokenVaultY, mint: this.#pool.tokenMintY, destination: tokenOwnerAccountY, owner: this.#pool.address,
+            }),
+        ]);
+        const groups = [];
+        const remainingAccounts = [];
+        if (transferHookXAccounts.length > 0) {
+            groups.push({ kind: generated.AccountKind.TransferHookX, count: transferHookXAccounts.length });
+            remainingAccounts.push(...transferHookXAccounts.map(toRemainingAccountMeta));
+        }
+        if (transferHookYAccounts.length > 0) {
+            groups.push({ kind: generated.AccountKind.TransferHookY, count: transferHookYAccounts.length });
+            remainingAccounts.push(...transferHookYAccounts.map(toRemainingAccountMeta));
+        }
         const { lowerBinArray, upperBinArray } = this.binArrayAddresses;
         const withdrawIx = generated.getWithdrawInstruction({
             owner,
@@ -214,11 +277,15 @@ export class Position {
             lowerBinId,
             upperBinId,
             bpsToRemove,
-            remainingAccountsScheme: null,
+            remainingAccountsScheme: { groups },
         }, {
             programAddress: this.#pool.programAddress
         });
-        return [...preInstructions, withdrawIx, ...postInstructions];
+        const withdrawIxWithHookAccounts = {
+            ...withdrawIx,
+            accounts: [...withdrawIx.accounts, ...remainingAccounts],
+        };
+        return [...preInstructions, withdrawIxWithHookAccounts, ...postInstructions];
     }
     async close(owner) {
         return await closePosition({ owner, positionMint: this.data.positionMint, position: this.address }, { programAddress: this.#pool.programAddress });

package/dist/index.d.ts

@@ -3,6 +3,7 @@ export { DistributionMode } from "./generated/types/distributionMode";
 export * as events from "./events";
 export * from "./entities";
 export * from "./utils/constants";
+export * from "./utils/price";
 export { NATIVE_MINT_ADDRESS } from "./utils/ata";
 export type { QuoteOutput, TransferFee, FeeRates } from "./quote";
 export * from "./program_addresses";

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AACtE,OAAO,KAAK,MAAM,MAAM,UAAU,CAAC;AACnC,cAAc,YAAY,CAAC;AAC3B,cAAc,mBAAmB,CAAC;AAClC,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,YAAY,EAAE,WAAW,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAClE,cAAc,qBAAqB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AACtE,OAAO,KAAK,MAAM,MAAM,UAAU,CAAC;AACnC,cAAc,YAAY,CAAC;AAC3B,cAAc,mBAAmB,CAAC;AAClC,cAAc,eAAe,CAAC;AAC9B,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,YAAY,EAAE,WAAW,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAClE,cAAc,qBAAqB,CAAC"}

package/dist/index.js

@@ -3,5 +3,6 @@ export { DistributionMode } from "./generated/types/distributionMode";
 export * as events from "./events";
 export * from "./entities";
 export * from "./utils/constants";
+export * from "./utils/price";
 export { NATIVE_MINT_ADDRESS } from "./utils/ata";
 export * from "./program_addresses";

package/dist/utils/price.d.ts

@@ -0,0 +1,4 @@
+export declare function getBaseBinPrice(binStep: number): bigint;
+export declare function getBinPrice(baseBinPrice: bigint, binId: number): bigint | undefined;
+export declare function getBinPriceFromStep(binStep: number, binId: number): bigint | undefined;
+//# sourceMappingURL=price.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"price.d.ts","sourceRoot":"","sources":["../../src/utils/price.ts"],"names":[],"mappings":"AAGA,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAGvD;AAED,wBAAgB,WAAW,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAmBnF;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAEtF"}

package/dist/utils/price.js

@@ -0,0 +1,27 @@
+import { MAX_BASIS_POINTS } from "./constants";
+import { expBySquaring, MAX, MAX_EXPONENTIAL, ONE, SCALE_OFFSET } from "./u64x64";
+export function getBaseBinPrice(binStep) {
+    const priceStep = (BigInt(binStep) << SCALE_OFFSET) / BigInt(MAX_BASIS_POINTS);
+    return ONE + priceStep;
+}
+export function getBinPrice(baseBinPrice, binId) {
+    if (baseBinPrice < 0n || baseBinPrice > MAX) {
+        throw new Error(`getBinPrice: baseBinPrice out of u128 range (${baseBinPrice})`);
+    }
+    if (baseBinPrice <= ONE)
+        return;
+    if (binId === 0)
+        return ONE;
+    const invert = binId > 0;
+    const absBinId = Math.abs(binId);
+    if (absBinId >= MAX_EXPONENTIAL)
+        return;
+    const invertedBase = MAX / baseBinPrice;
+    const price = expBySquaring(invertedBase, absBinId);
+    if (price === 0n)
+        return;
+    return invert ? MAX / price : price;
+}
+export function getBinPriceFromStep(binStep, binId) {
+    return getBinPrice(getBaseBinPrice(binStep), binId);
+}

package/dist/utils/transfer_hook.d.ts

@@ -1,4 +1,4 @@
-import { createSolanaRpc, type Address } from "@solana/kit";
+import { AccountRole, createSolanaRpc, type Address } from "@solana/kit";
 import type { Mint } from "@solana-program/token-2022";
 export declare function resolveTransferHookProgram(mint: Mint): Address | undefined;
 export declare function getExtraAccountMetaListAddress(mint: Address, hookProgram: Address): Promise<Address>;
@@ -14,4 +14,8 @@ export type TransferAccounts = {
     owner: Address;
 };
 export declare function resolveTransferHookExtraAccounts(rpc: ReturnType<typeof createSolanaRpc>, hookProgram: Address, transferAccounts: TransferAccounts, instructionData?: Uint8Array): Promise<ExtraAccount[]>;
+export declare function toRemainingAccountMeta({ address, isSigner, isWritable }: ExtraAccount): {
+    address: Address;
+    role: AccountRole;
+};
 //# sourceMappingURL=transfer_hook.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"transfer_hook.d.ts","sourceRoot":"","sources":["../../src/utils/transfer_hook.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,eAAe,EAEf,KAAK,OAAO,EACb,MAAM,aAAa,CAAC;AAErB,OAAO,KAAK,EAAE,IAAI,EAAa,MAAM,4BAA4B,CAAC;AA8BlE,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,GAAG,SAAS,CAQ1E;AAKD,wBAAsB,8BAA8B,CAClD,IAAI,EAAE,OAAO,EACb,WAAW,EAAE,OAAO,GACnB,OAAO,CAAC,OAAO,CAAC,CAQlB;AA4ED,MAAM,MAAM,YAAY,GAAG;IACzB,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,EAAE,OAAO,CAAC;CACrB,CAAC;AA+CF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,OAAO,CAAC;IAChB,IAAI,EAAE,OAAO,CAAC;IACd,WAAW,EAAE,OAAO,CAAC;IACrB,KAAK,EAAE,OAAO,CAAC;CAChB,CAAC;AASF,wBAAsB,gCAAgC,CACpD,GAAG,EAAE,UAAU,CAAC,OAAO,eAAe,CAAC,EACvC,WAAW,EAAE,OAAO,EACpB,gBAAgB,EAAE,gBAAgB,EAClC,eAAe,GAAE,UAA6B,GAC7C,OAAO,CAAC,YAAY,EAAE,CAAC,CA2DzB"}
+{"version":3,"file":"transfer_hook.d.ts","sourceRoot":"","sources":["../../src/utils/transfer_hook.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EAIX,eAAe,EAEf,KAAK,OAAO,EACb,MAAM,aAAa,CAAC;AAErB,OAAO,KAAK,EAAE,IAAI,EAAa,MAAM,4BAA4B,CAAC;AA8BlE,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,GAAG,SAAS,CAQ1E;AAKD,wBAAsB,8BAA8B,CAClD,IAAI,EAAE,OAAO,EACb,WAAW,EAAE,OAAO,GACnB,OAAO,CAAC,OAAO,CAAC,CAQlB;AA4ED,MAAM,MAAM,YAAY,GAAG;IACzB,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,EAAE,OAAO,CAAC;CACrB,CAAC;AA+CF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,OAAO,CAAC;IAChB,IAAI,EAAE,OAAO,CAAC;IACd,WAAW,EAAE,OAAO,CAAC;IACrB,KAAK,EAAE,OAAO,CAAC;CAChB,CAAC;AAWF,wBAAsB,gCAAgC,CACpD,GAAG,EAAE,UAAU,CAAC,OAAO,eAAe,CAAC,EACvC,WAAW,EAAE,OAAO,EACpB,gBAAgB,EAAE,gBAAgB,EAClC,eAAe,GAAE,UAA6B,GAC7C,OAAO,CAAC,YAAY,EAAE,CAAC,CAqEzB;AAGD,wBAAgB,sBAAsB,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,YAAY;;;EAKrF"}

package/dist/utils/transfer_hook.js

@@ -1,4 +1,4 @@
-import { getAddressEncoder, getAddressDecoder, getProgramDerivedAddress, unwrapOption, } from "@solana/kit";
+import { AccountRole, getAddressEncoder, getAddressDecoder, getProgramDerivedAddress, unwrapOption, } from "@solana/kit";
 import { SYSTEM_PROGRAM_ADDRESS } from "@solana-program/system";
 const EXTRA_ACCOUNT_METAS_SEED = "extra-account-metas";
 // spl-tlv-account-resolution's on-chain byte layout (verified against the actual Rust crate
@@ -127,13 +127,15 @@ async function resolveSeed(rpc, seed, instructionData, knownAccounts, addressEnc
         }
     }
 }
-// Resolves every extra account a mint's active transfer hook requires for one specific transfer,
-// in the exact order they need to be appended after {source, mint, destination, owner} on the
-// transfer_checked instruction. Faithful port of spl-tlv-account-resolution's resolution
-// algorithm (account.rs's ExtraAccountMeta::resolve + seeds.rs's Seed::unpack_address_config) —
-// a hook can require more than one extra account (each can itself be a PDA seeded off any
-// account already in the list, including earlier-resolved extra accounts), so this always
-// returns an array, not a single address.
+// Resolves every account a mint's active transfer hook requires for one specific transfer, in
+// the exact order they need to be appended after {source, mint, destination, owner} on the
+// transfer_checked instruction: each seed-resolved extra account (in declaration order — a hook
+// can require more than one, each itself possibly a PDA seeded off any account already in the
+// list, including earlier-resolved extras), then the ExtraAccountMetaList PDA, then the hook
+// program itself. Faithful port of spl-transfer-hook-interface's onchain.rs
+// (add_extra_accounts_for_execute_cpi) and spl-tlv-account-resolution's resolution algorithm
+// (account.rs's ExtraAccountMeta::resolve + seeds.rs's Seed::unpack_address_config) — verified
+// against both the real source and its own unit test's expected account list, not guessed.
 export async function resolveTransferHookExtraAccounts(rpc, hookProgram, transferAccounts, instructionData = new Uint8Array()) {
     const addressEncoder = getAddressEncoder();
     const addressDecoder = getAddressDecoder();
@@ -149,11 +151,16 @@ export async function resolveTransferHookExtraAccounts(rpc, hookProgram, transfe
         throw new Error("ExtraAccountMetaList account does not carry the Execute instruction's discriminator");
     }
     const rawMetas = parseExtraAccountMetaList(data);
+    // Matches spl-transfer-hook-interface onchain.rs's add_extra_accounts_for_execute_cpi exactly:
+    // execute_account_infos starts as [source, mint, destination, authority, validate_state_info]
+    // (5 entries) *before* any seed resolution begins — so a Seed::AccountKey{index: 4} means the
+    // ExtraAccountMetaList PDA itself, not the first resolved extra account (which starts at 5).
     const knownAccounts = [
         { address: transferAccounts.source, data: null },
         { address: transferAccounts.mint, data: null },
         { address: transferAccounts.destination, data: null },
         { address: transferAccounts.owner, data: null },
+        { address: extraAccountMetaListAddress, data: null },
     ];
     const resolved = [];
     for (const meta of rawMetas) {
@@ -178,5 +185,16 @@ export async function resolveTransferHookExtraAccounts(rpc, hookProgram, transfe
         resolved.push({ address, isSigner: meta.isSigner, isWritable: meta.isWritable });
         knownAccounts.push({ address, data: null });
     }
+    // add_extra_accounts_for_execute_cpi appends these two last, after every resolved extra
+    // meta — the ExtraAccountMetaList PDA, then the hook program itself, both readonly/non-signer.
+    resolved.push({ address: extraAccountMetaListAddress, isSigner: false, isWritable: false });
+    resolved.push({ address: hookProgram, isSigner: false, isWritable: false });
     return resolved;
 }
+// Converts a resolved hook account into the {address, role} shape instruction builders expect.
+export function toRemainingAccountMeta({ address, isSigner, isWritable }) {
+    const role = isSigner
+        ? (isWritable ? AccountRole.WRITABLE_SIGNER : AccountRole.READONLY_SIGNER)
+        : (isWritable ? AccountRole.WRITABLE : AccountRole.READONLY);
+    return { address, role };
+}

package/dist/utils/u64x64.d.ts

@@ -0,0 +1,6 @@
+export declare const SCALE_OFFSET = 64n;
+export declare const ONE: bigint;
+export declare const MAX: bigint;
+export declare const MAX_EXPONENTIAL = 524288;
+export declare function expBySquaring(base: bigint, exp: number): bigint;
+//# sourceMappingURL=u64x64.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"u64x64.d.ts","sourceRoot":"","sources":["../../src/utils/u64x64.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY,MAAM,CAAC;AAChC,eAAO,MAAM,GAAG,QAAqB,CAAC;AACtC,eAAO,MAAM,GAAG,QAAoB,CAAC;AACrC,eAAO,MAAM,eAAe,SAAU,CAAC;AAQvC,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAgB/D"}

package/dist/utils/u64x64.js

@@ -0,0 +1,25 @@
+export const SCALE_OFFSET = 64n;
+export const ONE = 1n << SCALE_OFFSET;
+export const MAX = (1n << 128n) - 1n; // u128::MAX
+export const MAX_EXPONENTIAL = 0x80000; // 2^19
+function mulU128(a, b) {
+    const product = a * b;
+    if (product > MAX)
+        throw new Error("u64x64: u128 multiplication overflow");
+    return product;
+}
+export function expBySquaring(base, exp) {
+    let result = ONE;
+    let remainingBits = 32 - Math.clz32(exp);
+    for (let bit = 0x1; bit <= 0x40000; bit <<= 1) {
+        if (exp & bit) {
+            result = mulU128(result, base) >> SCALE_OFFSET;
+        }
+        remainingBits -= 1;
+        if (remainingBits === 0) {
+            return result;
+        }
+        base = mulU128(base, base) >> SCALE_OFFSET;
+    }
+    throw new Error(`u64x64.expBySquaring: exp out of range (${exp})`);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@picon-finance/dlmm-sdk",
-  "version": "1.12.0",
+  "version": "1.14.0",
   "description": "Typescript SDK for interacting with the Picon DLMM protocol",
   "author": "Picon Finance",
   "license": "MIT",

package/src/entities/pool.ts

@@ -30,6 +30,13 @@ import {
   generateBinArrayIndicesForSync,
 } from "../utils/bin_location";
 import { resolveTransferFee } from "../utils/transfer_fee";
+import {
+  resolveTransferHookProgram,
+  resolveTransferHookExtraAccounts,
+  toRemainingAccountMeta,
+  type ExtraAccount,
+  type TransferAccounts as TransferHookAccounts,
+} from "../utils/transfer_hook";
 import { MAX_BIN_ARRAYS_PER_TRAVERSAL } from "../utils/constants";
 import {
   Position,
@@ -184,9 +191,35 @@ export class Pool {
       amountY: xToY ? undefined : amountIn,
     });
 
-    const remainingAccountsScheme: generated.RemainingAccountsScheme = {
-      groups: [{ kind: generated.AccountKind.BinArray, count: binArrayAddresses.length }],
-    };
+    // Each mint's hook accounts are resolved against whichever role it plays in this swap —
+    // input (user -> vault, owner = user) or output (vault -> user, owner = pool PDA).
+    const xTransferAccounts: TransferHookAccounts = xToY
+      ? { source: tokenUserAccountX, mint: this.tokenMintX, destination: this.tokenVaultX, owner: user.address }
+      : { source: this.tokenVaultX, mint: this.tokenMintX, destination: tokenUserAccountX, owner: this.address };
+    const yTransferAccounts: TransferHookAccounts = xToY
+      ? { source: this.tokenVaultY, mint: this.tokenMintY, destination: tokenUserAccountY, owner: this.address }
+      : { source: tokenUserAccountY, mint: this.tokenMintY, destination: this.tokenVaultY, owner: user.address };
+
+    const [transferHookXAccounts, transferHookYAccounts] = await Promise.all([
+      this.resolveTransferHookAccountsX(xTransferAccounts),
+      this.resolveTransferHookAccountsY(yTransferAccounts),
+    ]);
+
+    const groups: generated.AccountGroup[] = [
+      { kind: generated.AccountKind.BinArray, count: binArrayAddresses.length },
+    ];
+    const remainingAccounts = binArrayAddresses.map(address => ({ address, role: AccountRole.WRITABLE }));
+
+    if (transferHookXAccounts.length > 0) {
+      groups.push({ kind: generated.AccountKind.TransferHookX, count: transferHookXAccounts.length });
+      remainingAccounts.push(...transferHookXAccounts.map(toRemainingAccountMeta));
+    }
+    if (transferHookYAccounts.length > 0) {
+      groups.push({ kind: generated.AccountKind.TransferHookY, count: transferHookYAccounts.length });
+      remainingAccounts.push(...transferHookYAccounts.map(toRemainingAccountMeta));
+    }
+
+    const remainingAccountsScheme: generated.RemainingAccountsScheme = { groups };
     const swapIx = generated.getSwapInstruction({
       user,
       pool: this.address,
@@ -204,13 +237,33 @@ export class Pool {
       remainingAccountsScheme,
     }, { programAddress: this.#programAddress });
 
-    const remainingAccounts = binArrayAddresses.map(address => ({ address, role: AccountRole.WRITABLE }));
     const swapIxWithBinArrays = { ...swapIx, accounts: [...swapIx.accounts, ...remainingAccounts] };
 
     const instructions = [...preInstructions, swapIxWithBinArrays, ...postInstructions];
     return { quoteOutput, instructions };
   }
 
+  // Public so Position (which only holds a reference to this Pool, not its private mint data)
+  // can resolve hook accounts for its own deposit/withdraw/claimFee instructions without ever
+  // needing a Mint account itself — empty when that mint has no active transfer hook, in which
+  // case the caller should add no group to the scheme for it.
+  public async resolveTransferHookAccountsX(transferAccounts: TransferHookAccounts): Promise<ExtraAccount[]> {
+    return await this.#resolveTransferHookAccounts(this.#mintX, transferAccounts);
+  }
+
+  public async resolveTransferHookAccountsY(transferAccounts: TransferHookAccounts): Promise<ExtraAccount[]> {
+    return await this.#resolveTransferHookAccounts(this.#mintY, transferAccounts);
+  }
+
+  async #resolveTransferHookAccounts(
+    mint: Account<Mint>,
+    transferAccounts: TransferHookAccounts,
+  ): Promise<ExtraAccount[]> {
+    const hookProgram = resolveTransferHookProgram(mint.data);
+    if (!hookProgram) return [];
+    return await resolveTransferHookExtraAccounts(this.#rpc, hookProgram, transferAccounts);
+  }
+
   public async quote(
     params: { xToY: boolean, amountIn: bigint, slippageToleranceBps: number },
   ): Promise<QuoteOutput> {
@@ -332,6 +385,29 @@ export class Pool {
       }),
     ]);
 
+    // Both legs move vault -> admin, signed by the pool PDA (not the authority signer, which
+    // only gates the on-chain permission check).
+    const [transferHookXAccounts, transferHookYAccounts] = await Promise.all([
+      this.resolveTransferHookAccountsX({
+        source: this.tokenVaultX, mint: this.tokenMintX, destination: tokenAdminAccountX, owner: this.address,
+      }),
+      this.resolveTransferHookAccountsY({
+        source: this.tokenVaultY, mint: this.tokenMintY, destination: tokenAdminAccountY, owner: this.address,
+      }),
+    ]);
+
+    const groups: generated.AccountGroup[] = [];
+    const remainingAccounts: { address: Address, role: AccountRole }[] = [];
+
+    if (transferHookXAccounts.length > 0) {
+      groups.push({ kind: generated.AccountKind.TransferHookX, count: transferHookXAccounts.length });
+      remainingAccounts.push(...transferHookXAccounts.map(toRemainingAccountMeta));
+    }
+    if (transferHookYAccounts.length > 0) {
+      groups.push({ kind: generated.AccountKind.TransferHookY, count: transferHookYAccounts.length });
+      remainingAccounts.push(...transferHookYAccounts.map(toRemainingAccountMeta));
+    }
+
     const claimProtocolFeeIx = await generated.getClaimProtocolFeeInstructionAsync({
       authority,
       pool: this.address,
@@ -342,12 +418,17 @@ export class Pool {
       tokenVaultY: this.tokenVaultY,
       tokenAdminAccountX,
       tokenAdminAccountY,
-      remainingAccountsScheme: null,
+      remainingAccountsScheme: { groups },
       tokenProgramX: this.tokenProgramX,
       tokenProgramY: this.tokenProgramY,
     }, { programAddress: this.#programAddress });
 
-    return [...preInstructions, claimProtocolFeeIx, ...postInstructions];
+    const claimProtocolFeeIxWithHookAccounts = {
+      ...claimProtocolFeeIx,
+      accounts: [...claimProtocolFeeIx.accounts, ...remainingAccounts],
+    };
+
+    return [...preInstructions, claimProtocolFeeIxWithHookAccounts, ...postInstructions];
   }
 
   public static async load(

package/src/entities/position.ts

@@ -3,6 +3,7 @@ import {
   createSolanaRpc,
   assertAccountExists,
   fetchEncodedAccounts,
+  type AccountRole,
   type Address,
   type Account,
   type Instruction,
@@ -17,6 +18,7 @@ import {
   findPositionTokenAccount,
   processAssociatedTokenAccountPair,
 } from "../utils/ata";
+import { toRemainingAccountMeta } from "../utils/transfer_hook";
 import {
   getBinIndex,
   getBinArrayIndex,
@@ -200,6 +202,28 @@ export class Position {
       }),
     ]);
 
+    // Both legs move owner -> vault (deposit), signed by owner itself.
+    const [transferHookXAccounts, transferHookYAccounts] = await Promise.all([
+      this.#pool.resolveTransferHookAccountsX({
+        source: tokenOwnerAccountX, mint: this.#pool.tokenMintX, destination: this.#pool.tokenVaultX, owner: owner.address,
+      }),
+      this.#pool.resolveTransferHookAccountsY({
+        source: tokenOwnerAccountY, mint: this.#pool.tokenMintY, destination: this.#pool.tokenVaultY, owner: owner.address,
+      }),
+    ]);
+
+    const groups: generated.AccountGroup[] = [];
+    const remainingAccounts: { address: Address, role: AccountRole }[] = [];
+
+    if (transferHookXAccounts.length > 0) {
+      groups.push({ kind: generated.AccountKind.TransferHookX, count: transferHookXAccounts.length });
+      remainingAccounts.push(...transferHookXAccounts.map(toRemainingAccountMeta));
+    }
+    if (transferHookYAccounts.length > 0) {
+      groups.push({ kind: generated.AccountKind.TransferHookY, count: transferHookYAccounts.length });
+      remainingAccounts.push(...transferHookYAccounts.map(toRemainingAccountMeta));
+    }
+
     const { lowerBinArray, upperBinArray } = this.binArrayAddresses;
     const depositByWeightIx = generated.getDepositByWeightInstruction({
       owner,
@@ -223,12 +247,17 @@ export class Position {
       distributionMode,
       lowerBinId,
       binWeights,
-      remainingAccountsScheme: null,
+      remainingAccountsScheme: { groups },
     }, {
       programAddress: this.#pool.programAddress
     });
 
-    return [...preInstructions, depositByWeightIx, ...postInstructions];
+    const depositByWeightIxWithHookAccounts = {
+      ...depositByWeightIx,
+      accounts: [...depositByWeightIx.accounts, ...remainingAccounts],
+    };
+
+    return [...preInstructions, depositByWeightIxWithHookAccounts, ...postInstructions];
   }
 
   async #buildClaimFeeInstruction(
@@ -241,8 +270,30 @@ export class Position {
     const { lowerBinId, upperBinId } = range ?? this.data;
     assertRangeWithinRange({ lowerBinId, upperBinId }, this.data);
 
+    // Both legs move vault -> owner (fee claim), signed by the pool PDA.
+    const [transferHookXAccounts, transferHookYAccounts] = await Promise.all([
+      this.#pool.resolveTransferHookAccountsX({
+        source: this.#pool.tokenVaultX, mint: this.#pool.tokenMintX, destination: tokenOwnerAccountX, owner: this.#pool.address,
+      }),
+      this.#pool.resolveTransferHookAccountsY({
+        source: this.#pool.tokenVaultY, mint: this.#pool.tokenMintY, destination: tokenOwnerAccountY, owner: this.#pool.address,
+      }),
+    ]);
+
+    const groups: generated.AccountGroup[] = [];
+    const remainingAccounts: { address: Address, role: AccountRole }[] = [];
+
+    if (transferHookXAccounts.length > 0) {
+      groups.push({ kind: generated.AccountKind.TransferHookX, count: transferHookXAccounts.length });
+      remainingAccounts.push(...transferHookXAccounts.map(toRemainingAccountMeta));
+    }
+    if (transferHookYAccounts.length > 0) {
+      groups.push({ kind: generated.AccountKind.TransferHookY, count: transferHookYAccounts.length });
+      remainingAccounts.push(...transferHookYAccounts.map(toRemainingAccountMeta));
+    }
+
     const { lowerBinArray, upperBinArray } = this.binArrayAddresses;
-    return generated.getClaimFeeInstruction({
+    const claimFeeIx = generated.getClaimFeeInstruction({
       owner,
       pool: this.#pool.address,
       position: this.address,
@@ -259,10 +310,12 @@ export class Position {
       upperBinArray,
       lowerBinId,
       upperBinId,
-      remainingAccountsScheme: null,
+      remainingAccountsScheme: { groups },
     }, {
       programAddress: this.#pool.programAddress
     });
+
+    return { ...claimFeeIx, accounts: [...claimFeeIx.accounts, ...remainingAccounts] };
   }
 
   public async claimFee(
@@ -316,6 +369,28 @@ export class Position {
       }),
     ]);
 
+    // Both legs move vault -> owner (withdraw), signed by the pool PDA.
+    const [transferHookXAccounts, transferHookYAccounts] = await Promise.all([
+      this.#pool.resolveTransferHookAccountsX({
+        source: this.#pool.tokenVaultX, mint: this.#pool.tokenMintX, destination: tokenOwnerAccountX, owner: this.#pool.address,
+      }),
+      this.#pool.resolveTransferHookAccountsY({
+        source: this.#pool.tokenVaultY, mint: this.#pool.tokenMintY, destination: tokenOwnerAccountY, owner: this.#pool.address,
+      }),
+    ]);
+
+    const groups: generated.AccountGroup[] = [];
+    const remainingAccounts: { address: Address, role: AccountRole }[] = [];
+
+    if (transferHookXAccounts.length > 0) {
+      groups.push({ kind: generated.AccountKind.TransferHookX, count: transferHookXAccounts.length });
+      remainingAccounts.push(...transferHookXAccounts.map(toRemainingAccountMeta));
+    }
+    if (transferHookYAccounts.length > 0) {
+      groups.push({ kind: generated.AccountKind.TransferHookY, count: transferHookYAccounts.length });
+      remainingAccounts.push(...transferHookYAccounts.map(toRemainingAccountMeta));
+    }
+
     const { lowerBinArray, upperBinArray } = this.binArrayAddresses;
     const withdrawIx = generated.getWithdrawInstruction({
       owner,
@@ -335,12 +410,17 @@ export class Position {
       lowerBinId,
       upperBinId,
       bpsToRemove,
-      remainingAccountsScheme: null,
+      remainingAccountsScheme: { groups },
     }, {
       programAddress: this.#pool.programAddress
     });
 
-    return [...preInstructions, withdrawIx, ...postInstructions];
+    const withdrawIxWithHookAccounts = {
+      ...withdrawIx,
+      accounts: [...withdrawIx.accounts, ...remainingAccounts],
+    };
+
+    return [...preInstructions, withdrawIxWithHookAccounts, ...postInstructions];
   }
 
   public async close(owner: TransactionSigner): Promise<Instruction> {

package/src/index.ts

@@ -3,6 +3,7 @@ export { DistributionMode } from "./generated/types/distributionMode";
 export * as events from "./events";
 export * from "./entities";
 export * from "./utils/constants";
+export * from "./utils/price";
 export { NATIVE_MINT_ADDRESS } from "./utils/ata";
 export type { QuoteOutput, TransferFee, FeeRates } from "./quote";
 export * from "./program_addresses";

package/src/utils/price.ts

@@ -0,0 +1,32 @@
+import { MAX_BASIS_POINTS } from "./constants";
+import { expBySquaring, MAX, MAX_EXPONENTIAL, ONE, SCALE_OFFSET } from "./u64x64";
+
+export function getBaseBinPrice(binStep: number): bigint {
+    const priceStep = (BigInt(binStep) << SCALE_OFFSET) / BigInt(MAX_BASIS_POINTS);
+    return ONE + priceStep;
+}
+
+export function getBinPrice(baseBinPrice: bigint, binId: number): bigint | undefined {
+    if (baseBinPrice < 0n || baseBinPrice > MAX) {
+        throw new Error(`getBinPrice: baseBinPrice out of u128 range (${baseBinPrice})`);
+    }
+
+    if (baseBinPrice <= ONE) return;
+    if (binId === 0) return ONE;
+
+    const invert = binId > 0;
+    const absBinId = Math.abs(binId);
+
+    if (absBinId >= MAX_EXPONENTIAL) return;
+
+    const invertedBase = MAX / baseBinPrice;
+    const price = expBySquaring(invertedBase, absBinId);
+
+    if (price === 0n) return;
+
+    return invert ? MAX / price : price;
+}
+
+export function getBinPriceFromStep(binStep: number, binId: number): bigint | undefined {
+    return getBinPrice(getBaseBinPrice(binStep), binId);
+}

package/src/utils/transfer_hook.ts

@@ -1,4 +1,5 @@
 import {
+  AccountRole,
   getAddressEncoder,
   getAddressDecoder,
   getProgramDerivedAddress,
@@ -195,13 +196,15 @@ export type TransferAccounts = {
   owner: Address;
 };
 
-// Resolves every extra account a mint's active transfer hook requires for one specific transfer,
-// in the exact order they need to be appended after {source, mint, destination, owner} on the
-// transfer_checked instruction. Faithful port of spl-tlv-account-resolution's resolution
-// algorithm (account.rs's ExtraAccountMeta::resolve + seeds.rs's Seed::unpack_address_config) —
-// a hook can require more than one extra account (each can itself be a PDA seeded off any
-// account already in the list, including earlier-resolved extra accounts), so this always
-// returns an array, not a single address.
+// Resolves every account a mint's active transfer hook requires for one specific transfer, in
+// the exact order they need to be appended after {source, mint, destination, owner} on the
+// transfer_checked instruction: each seed-resolved extra account (in declaration order — a hook
+// can require more than one, each itself possibly a PDA seeded off any account already in the
+// list, including earlier-resolved extras), then the ExtraAccountMetaList PDA, then the hook
+// program itself. Faithful port of spl-transfer-hook-interface's onchain.rs
+// (add_extra_accounts_for_execute_cpi) and spl-tlv-account-resolution's resolution algorithm
+// (account.rs's ExtraAccountMeta::resolve + seeds.rs's Seed::unpack_address_config) — verified
+// against both the real source and its own unit test's expected account list, not guessed.
 export async function resolveTransferHookExtraAccounts(
   rpc: ReturnType<typeof createSolanaRpc>,
   hookProgram: Address,
@@ -230,11 +233,16 @@ export async function resolveTransferHookExtraAccounts(
 
   const rawMetas = parseExtraAccountMetaList(data);
 
+  // Matches spl-transfer-hook-interface onchain.rs's add_extra_accounts_for_execute_cpi exactly:
+  // execute_account_infos starts as [source, mint, destination, authority, validate_state_info]
+  // (5 entries) *before* any seed resolution begins — so a Seed::AccountKey{index: 4} means the
+  // ExtraAccountMetaList PDA itself, not the first resolved extra account (which starts at 5).
   const knownAccounts: KnownAccount[] = [
     { address: transferAccounts.source, data: null },
     { address: transferAccounts.mint, data: null },
     { address: transferAccounts.destination, data: null },
     { address: transferAccounts.owner, data: null },
+    { address: extraAccountMetaListAddress, data: null },
   ];
 
   const resolved: ExtraAccount[] = [];
@@ -265,5 +273,18 @@ export async function resolveTransferHookExtraAccounts(
     knownAccounts.push({ address, data: null });
   }
 
+  // add_extra_accounts_for_execute_cpi appends these two last, after every resolved extra
+  // meta — the ExtraAccountMetaList PDA, then the hook program itself, both readonly/non-signer.
+  resolved.push({ address: extraAccountMetaListAddress, isSigner: false, isWritable: false });
+  resolved.push({ address: hookProgram, isSigner: false, isWritable: false });
+
   return resolved;
 }
+
+// Converts a resolved hook account into the {address, role} shape instruction builders expect.
+export function toRemainingAccountMeta({ address, isSigner, isWritable }: ExtraAccount) {
+  const role = isSigner
+    ? (isWritable ? AccountRole.WRITABLE_SIGNER : AccountRole.READONLY_SIGNER)
+    : (isWritable ? AccountRole.WRITABLE : AccountRole.READONLY);
+  return { address, role };
+}

package/src/utils/u64x64.ts

@@ -0,0 +1,28 @@
+export const SCALE_OFFSET = 64n;
+export const ONE = 1n << SCALE_OFFSET;
+export const MAX = (1n << 128n) - 1n; // u128::MAX
+export const MAX_EXPONENTIAL = 0x80000; // 2^19
+
+function mulU128(a: bigint, b: bigint): bigint {
+  const product = a * b;
+  if (product > MAX) throw new Error("u64x64: u128 multiplication overflow");
+  return product;
+}
+
+export function expBySquaring(base: bigint, exp: number): bigint {
+  let result = ONE;
+  let remainingBits = 32 - Math.clz32(exp);
+
+  for (let bit = 0x1; bit <= 0x40000; bit <<= 1) {
+    if (exp & bit) {
+      result = mulU128(result, base) >> SCALE_OFFSET;
+    }
+    remainingBits -= 1;
+    if (remainingBits === 0) {
+      return result;
+    }
+    base = mulU128(base, base) >> SCALE_OFFSET;
+  }
+
+  throw new Error(`u64x64.expBySquaring: exp out of range (${exp})`);
+}