@picon-finance/dlmm-sdk 1.16.4 → 1.17.0

package/README.md

@@ -98,7 +98,7 @@ const depositIxs = await position.depositByWeight(ownerSigner, {
 
 // Later: claim fees, withdraw (partially or fully, by bps), close.
 const claimFeeIxs = await position.claimFee(ownerSigner);
-const withdrawIxs = await position.withdraw(ownerSigner, 5_000); // bps, out of 10_000 = 100%
+const withdrawIxs = await position.withdraw(ownerSigner, { bpsToRemove: 5_000 }); // bps, out of 10_000 = 100%
 const closeIx = await position.close(ownerSigner);
 ```
 

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":"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"}

package/dist/entities/pool.js

@@ -7,7 +7,7 @@ import { resolveAdminConfigAddress } from "./admin_config";
 import { processAssociatedTokenAccountPair } from "../utils/ata";
 import { getBinArrayIndex, getBinArrayIndexSequence, generateBinArrayIndicesForSwap, generateBinArrayIndicesForSync, } from "../utils/bin_location";
 import { resolveTransferFee } from "../utils/transfer_fee";
-import { resolveTransferHookProgram, resolveTransferHookExtraAccounts, toRemainingAccountMeta, } from "../utils/transfer_hook";
+import { appendRemainingAccounts, buildTransferHookScheme, resolveTransferHookProgram, resolveTransferHookExtraAccounts, } from "../utils/transfer_hook";
 import { MAX_BIN_ARRAYS_PER_TRAVERSAL } from "../utils/constants";
 import { Position, openPosition, closePosition, findPositionAddress, findAllPositionAddresses, } from "./position";
 import { BinArray, findAllBinArrayAddresses } from "./bin_array";
@@ -147,25 +147,21 @@ export class Pool {
             this.resolveTransferHookAccountsX(xTransferAccounts),
             this.resolveTransferHookAccountsY(yTransferAccounts),
         ]);
+        const hookScheme = buildTransferHookScheme(transferHookXAccounts, transferHookYAccounts);
         const groups = [
             { kind: generated.AccountKind.BinArray, count: binArrayAddresses.length },
+            ...hookScheme.groups,
+        ];
+        const remainingAccounts = [
+            ...binArrayAddresses.map(address => ({ address, role: AccountRole.WRITABLE })),
+            ...hookScheme.remainingAccounts,
         ];
-        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 swapIx = buildSwapIx({
             tokenUserAccountX,
             tokenUserAccountY,
             remainingAccountsScheme: { groups },
         });
-        const swapIxWithBinArrays = { ...swapIx, accounts: [...(swapIx.accounts ?? []), ...remainingAccounts] };
-        return [...preInstructions, swapIxWithBinArrays, ...postInstructions];
+        return [...preInstructions, appendRemainingAccounts(swapIx, remainingAccounts), ...postInstructions];
     }
     // 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
@@ -283,16 +279,7 @@ export class Pool {
                 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 { groups, remainingAccounts } = buildTransferHookScheme(transferHookXAccounts, transferHookYAccounts);
         const claimProtocolFeeIx = await generated.getClaimProtocolFeeInstructionAsync({
             authority,
             pool: this.address,
@@ -307,11 +294,7 @@ export class Pool {
             tokenProgramX: this.tokenProgramX,
             tokenProgramY: this.tokenProgramY,
         }, { programAddress: this.#programAddress });
-        const claimProtocolFeeIxWithHookAccounts = {
-            ...claimProtocolFeeIx,
-            accounts: [...claimProtocolFeeIx.accounts, ...remainingAccounts],
-        };
-        return [...preInstructions, claimProtocolFeeIxWithHookAccounts, ...postInstructions];
+        return [...preInstructions, appendRemainingAccounts(claimProtocolFeeIx, remainingAccounts), ...postInstructions];
     }
     static async load(rpc, address, programAddress, config) {
         const pool = await generated.fetchPool(rpc, address, config);

package/dist/entities/position.d.ts

@@ -27,8 +27,13 @@ export declare class Position {
         maxActiveBinSlippage: number;
         distributionMode: generated.DistributionMode;
     }): Promise<Instruction[]>;
-    claimFee(owner: TransactionSigner, range?: BinIdRange): Promise<Instruction[]>;
-    withdraw(owner: TransactionSigner, bpsToRemove: number, range?: BinIdRange): Promise<Instruction[]>;
+    claimFee(owner: TransactionSigner, { range }?: {
+        range?: BinIdRange;
+    }): Promise<Instruction[]>;
+    withdraw(owner: TransactionSigner, { bpsToRemove, range }: {
+        bpsToRemove: number;
+        range?: BinIdRange;
+    }): Promise<Instruction[]>;
     close(owner: TransactionSigner): Promise<Instruction>;
     static load(pool: Pool, address: Address, config?: FetchAccountsConfig): Promise<Position>;
     static loadAll(pool: Pool, addresses: Address[], config?: FetchAccountsConfig): Promise<Position[]>;

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

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

package/dist/entities/position.js

@@ -2,7 +2,7 @@ import { decodeAccount, assertAccountExists, fetchEncodedAccounts, } from "@sola
 import { generated } from "..";
 import { getAmountAfterTransferFee } from "../quote";
 import { findPositionTokenAccount, processAssociatedTokenAccountPair, } from "../utils/ata";
-import { toRemainingAccountMeta } from "../utils/transfer_hook";
+import { appendRemainingAccounts, buildTransferHookScheme, } from "../utils/transfer_hook";
 import { getBinIndex, getBinArrayIndex, getPositionBinArrayIndices, } from "../utils/bin_location";
 import { assertRangeWithinRange, assertPositionBelongsToPool, } from "../utils/assert";
 import { isUndefined } from "../utils/type_guards";
@@ -97,12 +97,14 @@ export class Position {
         }
         const [position, binArrays] = arg;
         this.#account = position;
-        this.#binArrays.forEach((b, i) => b.refresh(binArrays[i]));
+        await Promise.all(this.#binArrays.map((b, i) => b.refresh(binArrays[i])));
     }
-    async depositByWeight(owner, { amountX, amountY, lowerBinId, binWeights, maxActiveBinSlippage, distributionMode, }) {
-        const upperBinId = lowerBinId + binWeights.length - 1;
-        assertRangeWithinRange({ lowerBinId, upperBinId }, this.data);
-        const [positionTokenAccount, { ataX: tokenOwnerAccountX, ataY: tokenOwnerAccountY, preInstructions, postInstructions }] = await Promise.all([
+    // Shared by depositByWeight/claimFee/withdraw — each needs the owner's position-NFT token
+    // account plus its X/Y ATAs (creating either that don't exist yet, funding wSOL if native).
+    // amounts is only relevant for a deposit (it decides how much wSOL to wrap); omitted for
+    // claim/withdraw, which only ever receive tokens.
+    async #prepareOwnerAccounts(owner, amounts) {
+        return await Promise.all([
             findPositionTokenAccount({ owner: owner.address, positionMint: this.data.positionMint }),
             processAssociatedTokenAccountPair({
                 owner,
@@ -110,10 +112,15 @@ export class Position {
                 tokenMintY: this.#pool.tokenMintY,
                 tokenProgramX: this.#pool.tokenProgramX,
                 tokenProgramY: this.#pool.tokenProgramY,
-                amountX,
-                amountY,
+                amountX: amounts?.amountX,
+                amountY: amounts?.amountY,
             }),
         ]);
+    }
+    async depositByWeight(owner, { amountX, amountY, lowerBinId, binWeights, maxActiveBinSlippage, distributionMode, }) {
+        const upperBinId = lowerBinId + binWeights.length - 1;
+        assertRangeWithinRange({ lowerBinId, upperBinId }, this.data);
+        const [positionTokenAccount, { ataX: tokenOwnerAccountX, ataY: tokenOwnerAccountY, preInstructions, postInstructions }] = await this.#prepareOwnerAccounts(owner, { amountX, amountY });
         // Both legs move owner -> vault (deposit), signed by owner itself.
         const [transferHookXAccounts, transferHookYAccounts] = await Promise.all([
             this.#pool.resolveTransferHookAccountsX({
@@ -123,16 +130,7 @@ export class Position {
                 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 { groups, remainingAccounts } = buildTransferHookScheme(transferHookXAccounts, transferHookYAccounts);
         const { lowerBinArray, upperBinArray } = this.binArrayAddresses;
         const depositByWeightIx = generated.getDepositByWeightInstruction({
             owner,
@@ -160,11 +158,7 @@ export class Position {
         }, {
             programAddress: this.#pool.programAddress
         });
-        const depositByWeightIxWithHookAccounts = {
-            ...depositByWeightIx,
-            accounts: [...depositByWeightIx.accounts, ...remainingAccounts],
-        };
-        return [...preInstructions, depositByWeightIxWithHookAccounts, ...postInstructions];
+        return [...preInstructions, appendRemainingAccounts(depositByWeightIx, remainingAccounts), ...postInstructions];
     }
     async #buildClaimFeeInstruction(owner, positionTokenAccount, tokenOwnerAccountX, tokenOwnerAccountY, range) {
         const { lowerBinId, upperBinId } = range ?? this.data;
@@ -178,16 +172,7 @@ export class Position {
                 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 { groups, remainingAccounts } = buildTransferHookScheme(transferHookXAccounts, transferHookYAccounts);
         const { lowerBinArray, upperBinArray } = this.binArrayAddresses;
         const claimFeeIx = generated.getClaimFeeInstruction({
             owner,
@@ -210,35 +195,17 @@ export class Position {
         }, {
             programAddress: this.#pool.programAddress
         });
-        return { ...claimFeeIx, accounts: [...claimFeeIx.accounts, ...remainingAccounts] };
+        return appendRemainingAccounts(claimFeeIx, remainingAccounts);
     }
-    async claimFee(owner, range) {
-        const [positionTokenAccount, { ataX: tokenOwnerAccountX, ataY: tokenOwnerAccountY, preInstructions, postInstructions }] = await Promise.all([
-            findPositionTokenAccount({ owner: owner.address, positionMint: this.data.positionMint }),
-            processAssociatedTokenAccountPair({
-                owner,
-                tokenMintX: this.#pool.tokenMintX,
-                tokenMintY: this.#pool.tokenMintY,
-                tokenProgramX: this.#pool.tokenProgramX,
-                tokenProgramY: this.#pool.tokenProgramY,
-            }),
-        ]);
+    async claimFee(owner, { range } = {}) {
+        const [positionTokenAccount, { ataX: tokenOwnerAccountX, ataY: tokenOwnerAccountY, preInstructions, postInstructions }] = await this.#prepareOwnerAccounts(owner);
         const claimFeeIx = await this.#buildClaimFeeInstruction(owner, positionTokenAccount, tokenOwnerAccountX, tokenOwnerAccountY, range);
         return [...preInstructions, claimFeeIx, ...postInstructions];
     }
-    async withdraw(owner, bpsToRemove, range) {
+    async withdraw(owner, { bpsToRemove, range }) {
         const { lowerBinId, upperBinId } = range ?? this.data;
         assertRangeWithinRange({ lowerBinId, upperBinId }, this.data);
-        const [positionTokenAccount, { ataX: tokenOwnerAccountX, ataY: tokenOwnerAccountY, preInstructions, postInstructions }] = await Promise.all([
-            findPositionTokenAccount({ owner: owner.address, positionMint: this.data.positionMint }),
-            processAssociatedTokenAccountPair({
-                owner,
-                tokenMintX: this.#pool.tokenMintX,
-                tokenMintY: this.#pool.tokenMintY,
-                tokenProgramX: this.#pool.tokenProgramX,
-                tokenProgramY: this.#pool.tokenProgramY,
-            }),
-        ]);
+        const [positionTokenAccount, { ataX: tokenOwnerAccountX, ataY: tokenOwnerAccountY, preInstructions, postInstructions }] = await this.#prepareOwnerAccounts(owner);
         // Both legs move vault -> owner (withdraw), signed by the pool PDA.
         const [transferHookXAccounts, transferHookYAccounts] = await Promise.all([
             this.#pool.resolveTransferHookAccountsX({
@@ -248,16 +215,7 @@ export class Position {
                 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 { groups, remainingAccounts } = buildTransferHookScheme(transferHookXAccounts, transferHookYAccounts);
         const { lowerBinArray, upperBinArray } = this.binArrayAddresses;
         const withdrawIx = generated.getWithdrawInstruction({
             owner,
@@ -281,11 +239,7 @@ export class Position {
         }, {
             programAddress: this.#pool.programAddress
         });
-        const withdrawIxWithHookAccounts = {
-            ...withdrawIx,
-            accounts: [...withdrawIx.accounts, ...remainingAccounts],
-        };
-        return [...preInstructions, withdrawIxWithHookAccounts, ...postInstructions];
+        return [...preInstructions, appendRemainingAccounts(withdrawIx, remainingAccounts), ...postInstructions];
     }
     async close(owner) {
         return await closePosition({ owner, positionMint: this.data.positionMint, position: this.address }, { programAddress: this.#pool.programAddress });

package/dist/utils/ata.d.ts

@@ -9,16 +9,6 @@ export declare function findPositionTokenAccount({ owner, positionMint, }: {
     owner: Address;
     positionMint: Address;
 }): Promise<Address>;
-export declare function findPoolTokenVaults({ pool, tokenMintX, tokenMintY, tokenProgramX, tokenProgramY, }: {
-    pool: Address;
-    tokenMintX: Address;
-    tokenMintY: Address;
-    tokenProgramX: Address;
-    tokenProgramY: Address;
-}): Promise<{
-    tokenVaultX: Address;
-    tokenVaultY: Address;
-}>;
 interface ProcessAssociatedTokenAccountParams {
     owner: TransactionSigner;
     mint: Address;

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

@@ -1 +1 @@
-{"version":3,"file":"ata.d.ts","sourceRoot":"","sources":["../../src/utils/ata.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,OAAO,EACZ,KAAK,WAAW,EAChB,KAAK,iBAAiB,EACvB,MAAM,aAAa,CAAC;AAerB,eAAO,MAAM,mBAAmB,EAAoD,OAAO,CAAC;AAE5F,wBAAsB,oCAAoC,CAAC,MAAM,EAAE;IACjE,KAAK,EAAE,OAAO,CAAC;IACf,IAAI,EAAE,OAAO,CAAC;IACd,YAAY,EAAE,OAAO,CAAC;CACvB,4BAIA;AAID,wBAAgB,wBAAwB,CAAC,EACvC,KAAK,EACL,YAAY,GACb,EAAE;IACD,KAAK,EAAE,OAAO,CAAC;IACf,YAAY,EAAE,OAAO,CAAC;CACvB,GAAG,OAAO,CAAC,OAAO,CAAC,CAEnB;AAID,wBAAsB,mBAAmB,CAAC,EACxC,IAAI,EACJ,UAAU,EACV,UAAU,EACV,aAAa,EACb,aAAa,GACd,EAAE;IACD,IAAI,EAAE,OAAO,CAAC;IACd,UAAU,EAAE,OAAO,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB,aAAa,EAAE,OAAO,CAAC;IACvB,aAAa,EAAE,OAAO,CAAC;CACxB,GAAG,OAAO,CAAC;IAAE,WAAW,EAAE,OAAO,CAAC;IAAC,WAAW,EAAE,OAAO,CAAA;CAAE,CAAC,CAM1D;AAED,UAAU,mCAAmC;IAC3C,KAAK,EAAE,iBAAiB,CAAC;IACzB,IAAI,EAAE,OAAO,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,OAAO,CAAC;CACvB;AAED,UAAU,mCAAmC;IAC3C,GAAG,EAAE,OAAO,CAAC;IACb,eAAe,EAAE,WAAW,EAAE,CAAC;IAC/B,gBAAgB,EAAE,WAAW,EAAE,CAAC;CACjC;AAED,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,mCAAmC,GAAG,OAAO,CAAC,mCAAmC,CAAC,CAMvI;AAKD,wBAAsB,iCAAiC,CAAC,EACtD,KAAK,EACL,UAAU,EACV,UAAU,EACV,aAAa,EACb,aAAa,EACb,OAAO,EACP,OAAO,GACR,EAAE;IACD,KAAK,EAAE,iBAAiB,CAAC;IACzB,UAAU,EAAE,OAAO,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB,aAAa,EAAE,OAAO,CAAC;IACvB,aAAa,EAAE,OAAO,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GAAG,OAAO,CAAC;IACV,IAAI,EAAE,OAAO,CAAC;IACd,IAAI,EAAE,OAAO,CAAC;IACd,eAAe,EAAE,WAAW,EAAE,CAAC;IAC/B,gBAAgB,EAAE,WAAW,EAAE,CAAC;CACjC,CAAC,CAWD"}
+{"version":3,"file":"ata.d.ts","sourceRoot":"","sources":["../../src/utils/ata.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,OAAO,EACZ,KAAK,WAAW,EAChB,KAAK,iBAAiB,EACvB,MAAM,aAAa,CAAC;AAerB,eAAO,MAAM,mBAAmB,EAAoD,OAAO,CAAC;AAE5F,wBAAsB,oCAAoC,CAAC,MAAM,EAAE;IACjE,KAAK,EAAE,OAAO,CAAC;IACf,IAAI,EAAE,OAAO,CAAC;IACd,YAAY,EAAE,OAAO,CAAC;CACvB,4BAIA;AAID,wBAAgB,wBAAwB,CAAC,EACvC,KAAK,EACL,YAAY,GACb,EAAE;IACD,KAAK,EAAE,OAAO,CAAC;IACf,YAAY,EAAE,OAAO,CAAC;CACvB,GAAG,OAAO,CAAC,OAAO,CAAC,CAEnB;AAED,UAAU,mCAAmC;IAC3C,KAAK,EAAE,iBAAiB,CAAC;IACzB,IAAI,EAAE,OAAO,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,OAAO,CAAC;CACvB;AAED,UAAU,mCAAmC;IAC3C,GAAG,EAAE,OAAO,CAAC;IACb,eAAe,EAAE,WAAW,EAAE,CAAC;IAC/B,gBAAgB,EAAE,WAAW,EAAE,CAAC;CACjC;AAED,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,mCAAmC,GAAG,OAAO,CAAC,mCAAmC,CAAC,CAMvI;AAKD,wBAAsB,iCAAiC,CAAC,EACtD,KAAK,EACL,UAAU,EACV,UAAU,EACV,aAAa,EACb,aAAa,EACb,OAAO,EACP,OAAO,GACR,EAAE;IACD,KAAK,EAAE,iBAAiB,CAAC;IACzB,UAAU,EAAE,OAAO,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB,aAAa,EAAE,OAAO,CAAC;IACvB,aAAa,EAAE,OAAO,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GAAG,OAAO,CAAC;IACV,IAAI,EAAE,OAAO,CAAC;IACd,IAAI,EAAE,OAAO,CAAC;IACd,eAAe,EAAE,WAAW,EAAE,CAAC;IAC/B,gBAAgB,EAAE,WAAW,EAAE,CAAC;CACjC,CAAC,CAWD"}

package/dist/utils/ata.js

@@ -12,15 +12,6 @@ export async function findAssociatedTokenPdaByTokenProgram(params) {
 export function findPositionTokenAccount({ owner, positionMint, }) {
     return findAssociatedTokenPdaByTokenProgram({ owner, mint: positionMint, tokenProgram: TOKEN_2022_PROGRAM_ADDRESS });
 }
-// A pool's X/Y vaults — shared by every instruction that moves tokens through a pool
-// (withdraw, claim_fee, claim_multiple_fees, claim_protocol_fee, deposit_by_weight, swap).
-export async function findPoolTokenVaults({ pool, tokenMintX, tokenMintY, tokenProgramX, tokenProgramY, }) {
-    const [tokenVaultX, tokenVaultY] = await Promise.all([
-        findAssociatedTokenPdaByTokenProgram({ owner: pool, mint: tokenMintX, tokenProgram: tokenProgramX }),
-        findAssociatedTokenPdaByTokenProgram({ owner: pool, mint: tokenMintY, tokenProgram: tokenProgramY }),
-    ]);
-    return { tokenVaultX, tokenVaultY };
-}
 export function processAssociatedTokenAccount(params) {
     if (params.mint === NATIVE_MINT_ADDRESS) {
         return processWsolAssociatedTokenAccount(params);

package/dist/utils/transfer_hook.d.ts

@@ -1,5 +1,6 @@
 import { AccountRole, createSolanaRpc, type Address } from "@solana/kit";
 import type { Mint } from "@solana-program/token-2022";
+import * as generated from "../generated";
 export declare function resolveTransferHookProgram(mint: Mint): Address | undefined;
 export declare function getExtraAccountMetaListAddress(mint: Address, hookProgram: Address): Promise<Address>;
 export type ExtraAccount = {
@@ -18,4 +19,15 @@ export declare function toRemainingAccountMeta({ address, isSigner, isWritable }
     address: Address;
     role: AccountRole;
 };
+export type RemainingAccountMeta = {
+    address: Address;
+    role: AccountRole;
+};
+export declare function buildTransferHookScheme(transferHookXAccounts: ExtraAccount[], transferHookYAccounts: ExtraAccount[]): {
+    groups: generated.AccountGroup[];
+    remainingAccounts: RemainingAccountMeta[];
+};
+export declare function appendRemainingAccounts<TIx extends {
+    accounts?: readonly unknown[];
+}>(instruction: TIx, remainingAccounts: RemainingAccountMeta[]): TIx;
 //# 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,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"}
+{"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;AAClE,OAAO,KAAK,SAAS,MAAM,cAAc,CAAC;AA8B1C,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;AAED,MAAM,MAAM,oBAAoB,GAAG;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,IAAI,EAAE,WAAW,CAAA;CAAE,CAAC;AAO3E,wBAAgB,uBAAuB,CACrC,qBAAqB,EAAE,YAAY,EAAE,EACrC,qBAAqB,EAAE,YAAY,EAAE,GACpC;IAAE,MAAM,EAAE,SAAS,CAAC,YAAY,EAAE,CAAC;IAAC,iBAAiB,EAAE,oBAAoB,EAAE,CAAA;CAAE,CAcjF;AAKD,wBAAgB,uBAAuB,CAAC,GAAG,SAAS;IAAE,QAAQ,CAAC,EAAE,SAAS,OAAO,EAAE,CAAA;CAAE,EACnF,WAAW,EAAE,GAAG,EAChB,iBAAiB,EAAE,oBAAoB,EAAE,GACxC,GAAG,CAEL"}

package/dist/utils/transfer_hook.js

@@ -1,5 +1,6 @@
 import { AccountRole, getAddressEncoder, getAddressDecoder, getProgramDerivedAddress, unwrapOption, } from "@solana/kit";
 import { SYSTEM_PROGRAM_ADDRESS } from "@solana-program/system";
+import * as generated from "../generated";
 const EXTRA_ACCOUNT_METAS_SEED = "extra-account-metas";
 // spl-tlv-account-resolution's on-chain byte layout (verified against the actual Rust crate
 // source, spl-tlv-account-resolution 0.4.0's account.rs/state.rs/seeds.rs — not guessed):
@@ -198,3 +199,27 @@ export function toRemainingAccountMeta({ address, isSigner, isWritable }) {
         : (isWritable ? AccountRole.WRITABLE : AccountRole.READONLY);
     return { address, role };
 }
+// Builds the TransferHookX/TransferHookY groups + their remaining-account metas from a resolved
+// pair of hook accounts — one group per side, omitted entirely when that side has no active hook
+// (mirrors the on-chain program's own RemainingAccountsScheme, which only expects a group to be
+// present when the corresponding mint actually carries a hook). Callers that also need a group
+// ahead of these (e.g. swap's BinArray group) prepend their own groups/accounts to the result.
+export function buildTransferHookScheme(transferHookXAccounts, transferHookYAccounts) {
+    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));
+    }
+    return { groups, remainingAccounts };
+}
+// Appends resolved remaining-account metas (transfer hook accounts, bin arrays, ...) onto an
+// already-built instruction — the one-line splice every instruction builder in entities/ needs
+// after computing its own RemainingAccountsScheme.
+export function appendRemainingAccounts(instruction, remainingAccounts) {
+    return { ...instruction, accounts: [...(instruction.accounts ?? []), ...remainingAccounts] };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@picon-finance/dlmm-sdk",
-  "version": "1.16.4",
+  "version": "1.17.0",
   "description": "Typescript SDK for interacting with the Picon DLMM protocol",
   "author": "Picon Finance",
   "license": "MIT",
@@ -52,8 +52,8 @@
   },
   "devDependencies": {
     "@types/bun": "latest",
-    "@codama/nodes-from-anchor": "^1.5.2",
-    "@codama/renderers-js": "^2.3.0",
-    "codama": "^1.9.0"
+    "@codama/nodes-from-anchor": "^1.5.3",
+    "@codama/renderers-js": "^2.3.1",
+    "codama": "^1.10.0"
   }
 }

package/src/entities/pool.ts

@@ -34,9 +34,10 @@ import {
 } from "../utils/bin_location";
 import { resolveTransferFee } from "../utils/transfer_fee";
 import {
+  appendRemainingAccounts,
+  buildTransferHookScheme,
   resolveTransferHookProgram,
   resolveTransferHookExtraAccounts,
-  toRemainingAccountMeta,
   type ExtraAccount,
   type TransferAccounts as TransferHookAccounts,
 } from "../utils/transfer_hook";
@@ -311,28 +312,23 @@ export class Pool {
       this.resolveTransferHookAccountsY(yTransferAccounts),
     ]);
 
+    const hookScheme = buildTransferHookScheme(transferHookXAccounts, transferHookYAccounts);
     const groups: generated.AccountGroup[] = [
       { kind: generated.AccountKind.BinArray, count: binArrayAddresses.length },
+      ...hookScheme.groups,
+    ];
+    const remainingAccounts = [
+      ...binArrayAddresses.map(address => ({ address, role: AccountRole.WRITABLE })),
+      ...hookScheme.remainingAccounts,
     ];
-    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 swapIx = buildSwapIx({
       tokenUserAccountX,
       tokenUserAccountY,
       remainingAccountsScheme: { groups },
     });
-    const swapIxWithBinArrays = { ...swapIx, accounts: [...(swapIx.accounts ?? []), ...remainingAccounts] };
 
-    return [...preInstructions, swapIxWithBinArrays, ...postInstructions];
+    return [...preInstructions, appendRemainingAccounts(swapIx, remainingAccounts), ...postInstructions];
   }
 
   // Public so Position (which only holds a reference to this Pool, not its private mint data)
@@ -548,17 +544,7 @@ export class Pool {
       }),
     ]);
 
-    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 { groups, remainingAccounts } = buildTransferHookScheme(transferHookXAccounts, transferHookYAccounts);
 
     const claimProtocolFeeIx = await generated.getClaimProtocolFeeInstructionAsync({
       authority,
@@ -575,12 +561,7 @@ export class Pool {
       tokenProgramY: this.tokenProgramY,
     }, { programAddress: this.#programAddress });
 
-    const claimProtocolFeeIxWithHookAccounts = {
-      ...claimProtocolFeeIx,
-      accounts: [...claimProtocolFeeIx.accounts, ...remainingAccounts],
-    };
-
-    return [...preInstructions, claimProtocolFeeIxWithHookAccounts, ...postInstructions];
+    return [...preInstructions, appendRemainingAccounts(claimProtocolFeeIx, remainingAccounts), ...postInstructions];
   }
 
   public static async load(

package/src/entities/position.ts

@@ -3,7 +3,6 @@ import {
   createSolanaRpc,
   assertAccountExists,
   fetchEncodedAccounts,
-  type AccountRole,
   type Address,
   type Account,
   type Instruction,
@@ -18,7 +17,10 @@ import {
   findPositionTokenAccount,
   processAssociatedTokenAccountPair,
 } from "../utils/ata";
-import { toRemainingAccountMeta } from "../utils/transfer_hook";
+import {
+  appendRemainingAccounts,
+  buildTransferHookScheme,
+} from "../utils/transfer_hook";
 import {
   getBinIndex,
   getBinArrayIndex,
@@ -163,7 +165,29 @@ export class Position {
     }
     const [position, binArrays] = arg;
     this.#account = position;
-    this.#binArrays.forEach((b, i) => b.refresh(binArrays[i]));
+    await Promise.all(this.#binArrays.map((b, i) => b.refresh(binArrays[i])));
+  }
+
+  // Shared by depositByWeight/claimFee/withdraw — each needs the owner's position-NFT token
+  // account plus its X/Y ATAs (creating either that don't exist yet, funding wSOL if native).
+  // amounts is only relevant for a deposit (it decides how much wSOL to wrap); omitted for
+  // claim/withdraw, which only ever receive tokens.
+  async #prepareOwnerAccounts(
+    owner: TransactionSigner,
+    amounts?: { amountX: bigint, amountY: bigint },
+  ) {
+    return await Promise.all([
+      findPositionTokenAccount({ owner: owner.address, positionMint: this.data.positionMint }),
+      processAssociatedTokenAccountPair({
+        owner,
+        tokenMintX: this.#pool.tokenMintX,
+        tokenMintY: this.#pool.tokenMintY,
+        tokenProgramX: this.#pool.tokenProgramX,
+        tokenProgramY: this.#pool.tokenProgramY,
+        amountX: amounts?.amountX,
+        amountY: amounts?.amountY,
+      }),
+    ]);
   }
 
   public async depositByWeight(owner: TransactionSigner, {
@@ -189,18 +213,7 @@ export class Position {
       ataY: tokenOwnerAccountY,
       preInstructions,
       postInstructions
-    }] = await Promise.all([
-      findPositionTokenAccount({ owner: owner.address, positionMint: this.data.positionMint }),
-      processAssociatedTokenAccountPair({
-        owner,
-        tokenMintX: this.#pool.tokenMintX,
-        tokenMintY: this.#pool.tokenMintY,
-        tokenProgramX: this.#pool.tokenProgramX,
-        tokenProgramY: this.#pool.tokenProgramY,
-        amountX,
-        amountY,
-      }),
-    ]);
+    }] = await this.#prepareOwnerAccounts(owner, { amountX, amountY });
 
     // Both legs move owner -> vault (deposit), signed by owner itself.
     const [transferHookXAccounts, transferHookYAccounts] = await Promise.all([
@@ -212,17 +225,7 @@ export class Position {
       }),
     ]);
 
-    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 { groups, remainingAccounts } = buildTransferHookScheme(transferHookXAccounts, transferHookYAccounts);
 
     const { lowerBinArray, upperBinArray } = this.binArrayAddresses;
     const depositByWeightIx = generated.getDepositByWeightInstruction({
@@ -252,12 +255,7 @@ export class Position {
       programAddress: this.#pool.programAddress
     });
 
-    const depositByWeightIxWithHookAccounts = {
-      ...depositByWeightIx,
-      accounts: [...depositByWeightIx.accounts, ...remainingAccounts],
-    };
-
-    return [...preInstructions, depositByWeightIxWithHookAccounts, ...postInstructions];
+    return [...preInstructions, appendRemainingAccounts(depositByWeightIx, remainingAccounts), ...postInstructions];
   }
 
   async #buildClaimFeeInstruction(
@@ -280,17 +278,7 @@ export class Position {
       }),
     ]);
 
-    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 { groups, remainingAccounts } = buildTransferHookScheme(transferHookXAccounts, transferHookYAccounts);
 
     const { lowerBinArray, upperBinArray } = this.binArrayAddresses;
     const claimFeeIx = generated.getClaimFeeInstruction({
@@ -315,28 +303,19 @@ export class Position {
       programAddress: this.#pool.programAddress
     });
 
-    return { ...claimFeeIx, accounts: [...claimFeeIx.accounts, ...remainingAccounts] };
+    return appendRemainingAccounts(claimFeeIx, remainingAccounts);
   }
 
   public async claimFee(
     owner: TransactionSigner,
-    range?: BinIdRange,
+    { range }: { range?: BinIdRange } = {},
   ): Promise<Instruction[]> {
     const [positionTokenAccount, {
       ataX: tokenOwnerAccountX,
       ataY: tokenOwnerAccountY,
       preInstructions,
       postInstructions
-    }] = await Promise.all([
-      findPositionTokenAccount({ owner: owner.address, positionMint: this.data.positionMint }),
-      processAssociatedTokenAccountPair({
-        owner,
-        tokenMintX: this.#pool.tokenMintX,
-        tokenMintY: this.#pool.tokenMintY,
-        tokenProgramX: this.#pool.tokenProgramX,
-        tokenProgramY: this.#pool.tokenProgramY,
-      }),
-    ]);
+    }] = await this.#prepareOwnerAccounts(owner);
 
     const claimFeeIx = await this.#buildClaimFeeInstruction(
       owner, positionTokenAccount, tokenOwnerAccountX, tokenOwnerAccountY, range,
@@ -347,8 +326,7 @@ export class Position {
 
   public async withdraw(
     owner: TransactionSigner,
-    bpsToRemove: number,
-    range?: BinIdRange,
+    { bpsToRemove, range }: { bpsToRemove: number, range?: BinIdRange },
   ): Promise<Instruction[]> {
     const { lowerBinId, upperBinId } = range ?? this.data;
     assertRangeWithinRange({ lowerBinId, upperBinId }, this.data);
@@ -358,16 +336,7 @@ export class Position {
       ataY: tokenOwnerAccountY,
       preInstructions,
       postInstructions
-    }] = await Promise.all([
-      findPositionTokenAccount({ owner: owner.address, positionMint: this.data.positionMint }),
-      processAssociatedTokenAccountPair({
-        owner,
-        tokenMintX: this.#pool.tokenMintX,
-        tokenMintY: this.#pool.tokenMintY,
-        tokenProgramX: this.#pool.tokenProgramX,
-        tokenProgramY: this.#pool.tokenProgramY,
-      }),
-    ]);
+    }] = await this.#prepareOwnerAccounts(owner);
 
     // Both legs move vault -> owner (withdraw), signed by the pool PDA.
     const [transferHookXAccounts, transferHookYAccounts] = await Promise.all([
@@ -379,17 +348,7 @@ export class Position {
       }),
     ]);
 
-    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 { groups, remainingAccounts } = buildTransferHookScheme(transferHookXAccounts, transferHookYAccounts);
 
     const { lowerBinArray, upperBinArray } = this.binArrayAddresses;
     const withdrawIx = generated.getWithdrawInstruction({
@@ -415,12 +374,7 @@ export class Position {
       programAddress: this.#pool.programAddress
     });
 
-    const withdrawIxWithHookAccounts = {
-      ...withdrawIx,
-      accounts: [...withdrawIx.accounts, ...remainingAccounts],
-    };
-
-    return [...preInstructions, withdrawIxWithHookAccounts, ...postInstructions];
+    return [...preInstructions, appendRemainingAccounts(withdrawIx, remainingAccounts), ...postInstructions];
   }
 
   public async close(owner: TransactionSigner): Promise<Instruction> {

package/src/utils/ata.ts

@@ -41,28 +41,6 @@ export function findPositionTokenAccount({
   return findAssociatedTokenPdaByTokenProgram({ owner, mint: positionMint, tokenProgram: TOKEN_2022_PROGRAM_ADDRESS });
 }
 
-// A pool's X/Y vaults — shared by every instruction that moves tokens through a pool
-// (withdraw, claim_fee, claim_multiple_fees, claim_protocol_fee, deposit_by_weight, swap).
-export async function findPoolTokenVaults({
-  pool,
-  tokenMintX,
-  tokenMintY,
-  tokenProgramX,
-  tokenProgramY,
-}: {
-  pool: Address,
-  tokenMintX: Address,
-  tokenMintY: Address,
-  tokenProgramX: Address,
-  tokenProgramY: Address,
-}): Promise<{ tokenVaultX: Address; tokenVaultY: Address }> {
-  const [tokenVaultX, tokenVaultY] = await Promise.all([
-    findAssociatedTokenPdaByTokenProgram({ owner: pool, mint: tokenMintX, tokenProgram: tokenProgramX }),
-    findAssociatedTokenPdaByTokenProgram({ owner: pool, mint: tokenMintY, tokenProgram: tokenProgramY }),
-  ]);
-  return { tokenVaultX, tokenVaultY };
-}
-
 interface ProcessAssociatedTokenAccountParams {
   owner: TransactionSigner,
   mint: Address,

package/src/utils/transfer_hook.ts

@@ -9,6 +9,7 @@ import {
 } from "@solana/kit";
 import { SYSTEM_PROGRAM_ADDRESS } from "@solana-program/system";
 import type { Mint, Extension } from "@solana-program/token-2022";
+import * as generated from "../generated";
 
 const EXTRA_ACCOUNT_METAS_SEED = "extra-account-metas";
 
@@ -288,3 +289,39 @@ export function toRemainingAccountMeta({ address, isSigner, isWritable }: ExtraA
     : (isWritable ? AccountRole.WRITABLE : AccountRole.READONLY);
   return { address, role };
 }
+
+export type RemainingAccountMeta = { address: Address, role: AccountRole };
+
+// Builds the TransferHookX/TransferHookY groups + their remaining-account metas from a resolved
+// pair of hook accounts — one group per side, omitted entirely when that side has no active hook
+// (mirrors the on-chain program's own RemainingAccountsScheme, which only expects a group to be
+// present when the corresponding mint actually carries a hook). Callers that also need a group
+// ahead of these (e.g. swap's BinArray group) prepend their own groups/accounts to the result.
+export function buildTransferHookScheme(
+  transferHookXAccounts: ExtraAccount[],
+  transferHookYAccounts: ExtraAccount[],
+): { groups: generated.AccountGroup[], remainingAccounts: RemainingAccountMeta[] } {
+  const groups: generated.AccountGroup[] = [];
+  const remainingAccounts: RemainingAccountMeta[] = [];
+
+  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));
+  }
+
+  return { groups, remainingAccounts };
+}
+
+// Appends resolved remaining-account metas (transfer hook accounts, bin arrays, ...) onto an
+// already-built instruction — the one-line splice every instruction builder in entities/ needs
+// after computing its own RemainingAccountsScheme.
+export function appendRemainingAccounts<TIx extends { accounts?: readonly unknown[] }>(
+  instruction: TIx,
+  remainingAccounts: RemainingAccountMeta[],
+): TIx {
+  return { ...instruction, accounts: [...(instruction.accounts ?? []), ...remainingAccounts] };
+}