@picon-finance/dlmm-sdk 1.14.0 → 1.16.1

package/README.md

@@ -36,8 +36,10 @@ const dlmmProgram = new DlmmProgram(rpc, DEVNET_PROGRAM_ADDRESS);
 // Fetch and cache a pool's account data, mints, and token programs in one call.
 const pool = await dlmmProgram.getPool(poolAddress);
 
-// Quote, then build the matching swap instructions against that same quote.
-const { quoteOutput, instructions } = await pool.quoteAndSwap(userSigner, {
+// Pool.swapExactIn() quotes internally (right-sizing exactly which bin arrays it needs) and
+// returns both the quote and the matching swap instructions built against it — no separate
+// quote step. Pool.swapExactOut() is the mirror image, fixing the output instead of the input.
+const { quoteOutput, instructions } = await pool.swapExactIn(userSigner, {
   xToY: true,
   amountIn: 1_000_000n,
   slippageToleranceBps: 50,
@@ -123,17 +125,33 @@ const { transferFeeX, transferFeeY } = await pool.getTransferFees();
 const { baseFeeRate, dynamicFeeRate, totalFeeRate } = await pool.getFeeRates();
 ```
 
-`swap`/`quote`/`quoteAndSwap`/`sync` all accept an optional `binArrayCount` (default: the protocol max for that instruction) to cap how many bin arrays get included — useful for capping compute/account budget on a swap you know won't need the full range. It must be at least 2 (one below the active bin array's index and the active bin array itself, or vice versa — the active bin array is always required):
+`swapExactIn`/`swapExactOut`/`quoteExactIn`/`quoteExactOut`/`sync` don't take a bin-array-count parameter — the quote methods always quote against the protocol max traversal window (`MAX_BIN_ARRAYS_PER_TRAVERSAL`) internally, then the matching swap method trims the bin-array set down to only what the quote says it actually needs (plus a one-array drift margin), so you never pay for more accounts than the trade is likely to touch:
 
 ```ts
-const instructions = await pool.swap(userSigner, {
+// quoteExactIn() is a thin wrapper — same internal fetch/simulate/trim as swapExactIn(), just
+// returns the QuoteExactInOutput without building instructions.
+const quoteOutput = await pool.quoteExactIn({ xToY: true, amountIn: 1_000_000n, slippageToleranceBps: 50 });
+
+const { quoteOutput: sameQuote, instructions } = await pool.swapExactIn(userSigner, {
   xToY: true,
   amountIn: 1_000_000n,
-  minAmountOut: 0n,
-  binArrayCount: 4,
+  slippageToleranceBps: 50,
+});
+
+// swapExactOut()/quoteExactOut() fix the output amount instead — the trader specifies exactly
+// what they want to receive, and pays whatever gross input that requires (capped by
+// slippageToleranceBps via QuoteExactOutOutput.maxAmountIn).
+const { quoteOutput: exactOutQuote, instructions: exactOutInstructions } = await pool.swapExactOut(userSigner, {
+  xToY: true,
+  amountOut: 1_000_000n,
+  slippageToleranceBps: 50,
 });
 ```
 
+`Pool.sync(user, desiredBinId)` repositions the pool's active bin toward `desiredBinId` across empty bins only — also always uses the max traversal window, no count parameter.
+
+If either mint carries an active Token-2022 `TransferHook` extension, `swapExactIn()`/`swapExactOut()` (and every position method below) resolve and append its extra accounts automatically — nothing to configure. `Pool.resolveTransferHookAccountsX(transferAccounts)`/`resolveTransferHookAccountsY(transferAccounts)` are exposed publicly if you need to resolve them yourself for a custom instruction.
+
 Refresh a position's cached state after it changes on-chain (e.g. after a deposit lands):
 
 ```ts
@@ -159,7 +177,7 @@ Or fetch a single position directly if you already know its address:
 const positionByAddress = await pool.getPosition(positionAddress);
 ```
 
-Claim fees across many positions at once with `Position.claimAllFees()` — it skips positions with nothing pending (checked locally, no extra RPC) and batches the rest into `MAX_POSITIONS_PER_CLAIM`-sized (overridable via a third argument) instruction groups, one per transaction, sharing a single set of ATA setup/teardown instructions across the whole batch rather than repeating them per position. All positions must belong to the same pool:
+Claim fees across many positions at once with `Position.claimAllFees()` — it skips positions with nothing pending (checked locally, no extra RPC) and batches the rest into `DEFAULT_POSITIONS_PER_CLAIM`-sized (overridable via a third argument) instruction groups, one per transaction, sharing a single set of ATA setup/teardown instructions across the whole batch rather than repeating them per position. All positions must belong to the same pool:
 
 ```ts
 const positions = await pool.getAllPositionsByPositionMints(positionMints);
@@ -170,6 +188,24 @@ for (const claimIxs of claimTxs) {
 }
 ```
 
+### Admin
+
+`Pool.claimProtocolFee(authority)` drains `pool.data.protocolFeeX`/`protocolFeeY` to the admin's associated token accounts — `authority` must match `AdminConfig.authority`. `Pool.setProtocolShare(authority, protocolShare)` and `Pool.setDynamicFeeConfig(authority, config)` are similarly admin-gated single instructions:
+
+```ts
+const claimProtocolFeeIxs = await pool.claimProtocolFee(adminSigner);
+```
+
+### Price math
+
+`getBaseBinPrice(binStep)`, `getBinPrice(baseBinPrice, binId)`, and `getBinPriceFromStep(binStep, binId)` are direct `bigint` ports of the on-chain Q64.64 price math (`bin_math.rs`'s `base_bin_price`/`bin_price`/`bin_price_from_step`) — useful for computing a bin's price without an RPC round trip, e.g. when picking `lowerBinId`/`upperBinId` for a new position before it exists on-chain. `getBinPrice`/`getBinPriceFromStep` return `undefined` (mirroring the Rust `Option`) if `binId` is outside the representable range for that `binStep`:
+
+```ts
+import { getBinPriceFromStep } from "@picon-finance/dlmm-sdk";
+
+const rawPrice = getBinPriceFromStep(pool.data.binStep, pool.activeBinId); // Q64.64, or undefined
+```
+
 ### Events
 
 Event decoding and subscriptions are a separate, opt-in feature under the `events` namespace — independent of `DlmmProgram`/`Pool`/`Position`/`BinArray`:

package/dist/entities/dlmm_program.d.ts

@@ -1,5 +1,5 @@
 import { createSolanaRpc, type Address, type Account, type Instruction, type TransactionSigner, type FetchAccountConfig, type FetchAccountsConfig } from "@solana/kit";
-import type { QuoteOutput } from "../quote";
+import type { QuoteExactInOutput, QuoteExactOutOutput } from "../quote";
 import { Pool } from "./pool";
 import { generated } from "..";
 export declare class DlmmProgram {
@@ -18,19 +18,32 @@ export declare class DlmmProgram {
         tokenProgramX: Address;
         tokenProgramY: Address;
     }): Promise<Instruction>;
-    swap(user: TransactionSigner, poolAddress: Address, params: {
+    swapExactIn(user: TransactionSigner, poolAddress: Address, params: {
         xToY: boolean;
         amountIn: bigint;
         slippageToleranceBps: number;
     }, config?: FetchAccountConfig): Promise<{
-        quoteOutput: QuoteOutput;
+        quoteOutput: QuoteExactInOutput;
         instructions: Instruction[];
     }>;
-    quote(poolAddress: Address, params: {
+    swapExactOut(user: TransactionSigner, poolAddress: Address, params: {
+        xToY: boolean;
+        amountOut: bigint;
+        slippageToleranceBps: number;
+    }, config?: FetchAccountConfig): Promise<{
+        quoteOutput: QuoteExactOutOutput;
+        instructions: Instruction[];
+    }>;
+    quoteExactIn(poolAddress: Address, params: {
         xToY: boolean;
         amountIn: bigint;
         slippageToleranceBps: number;
-    }, config?: FetchAccountConfig): Promise<QuoteOutput>;
+    }, config?: FetchAccountConfig): Promise<QuoteExactInOutput>;
+    quoteExactOut(poolAddress: Address, params: {
+        xToY: boolean;
+        amountOut: bigint;
+        slippageToleranceBps: number;
+    }, config?: FetchAccountConfig): Promise<QuoteExactOutOutput>;
     getAllPositionMintsByOwner(owner: Address, config?: FetchAccountsConfig): Promise<Map<Address, Address[]>>;
     createAdminConfig(deployer: TransactionSigner): Promise<Instruction>;
     resetAdminAuthority(deployer: TransactionSigner): Promise<Instruction>;

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

@@ -1 +1 @@
-{"version":3,"file":"dlmm_program.d.ts","sourceRoot":"","sources":["../../src/entities/dlmm_program.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EAEf,KAAK,OAAO,EACZ,KAAK,OAAO,EACZ,KAAK,WAAW,EAEhB,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACvB,KAAK,mBAAmB,EAGzB,MAAM,aAAa,CAAC;AAOrB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EACL,IAAI,EAEL,MAAM,QAAQ,CAAC;AAYhB,OAAO,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAE/B,qBAAa,WAAW;;IAItB,YACE,GAAG,EAAE,UAAU,CAAC,OAAO,eAAe,CAAC,EACvC,cAAc,GAAE,OAAiC,EAIlD;IAED,IAAW,GAAG,+5nBAAwB;IACtC,IAAW,cAAc,YAAmC;IAE/C,OAAO,CAClB,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,kBAAkB,GAC1B,OAAO,CAAC,IAAI,CAAC,CAEf;IAEY,UAAU,CACrB,SAAS,EAAE,iBAAiB,EAC5B,MAAM,EAAE;QACN,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;QAChB,aAAa,EAAE,MAAM,CAAC;QACtB,WAAW,EAAE,MAAM,CAAC;QACpB,UAAU,EAAE,OAAO,CAAC;QACpB,UAAU,EAAE,OAAO,CAAC;QACpB,aAAa,EAAE,OAAO,CAAC;QACvB,aAAa,EAAE,OAAO,CAAC;KACxB,GACA,OAAO,CAAC,WAAW,CAAC,CAKtB;IAEY,IAAI,CACf,IAAI,EAAE,iBAAiB,EACvB,WAAW,EAAE,OAAO,EACpB,MAAM,EAAE;QAAE,IAAI,EAAE,OAAO,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,oBAAoB,EAAE,MAAM,CAAA;KAAE,EACzE,MAAM,CAAC,EAAE,kBAAkB,GAC1B,OAAO,CAAC;QAAE,WAAW,EAAE,WAAW,CAAC;QAAC,YAAY,EAAE,WAAW,EAAE,CAAA;KAAE,CAAC,CAGpE;IAEY,KAAK,CAChB,WAAW,EAAE,OAAO,EACpB,MAAM,EAAE;QAAE,IAAI,EAAE,OAAO,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,oBAAoB,EAAE,MAAM,CAAA;KAAE,EACzE,MAAM,CAAC,EAAE,kBAAkB,GAC1B,OAAO,CAAC,WAAW,CAAC,CAGtB;IAEY,0BAA0B,CACrC,KAAK,EAAE,OAAO,EACd,MAAM,CAAC,EAAE,mBAAmB,GAC3B,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,CA+BlC;IAEY,iBAAiB,CAAC,QAAQ,EAAE,iBAAiB,GAAG,OAAO,CAAC,WAAW,CAAC,CAKhF;IAEY,mBAAmB,CAAC,QAAQ,EAAE,iBAAiB,GAAG,OAAO,CAAC,WAAW,CAAC,CAKlF;IAEY,sBAAsB,CACjC,SAAS,EAAE,iBAAiB,EAC5B,YAAY,EAAE,OAAO,GACpB,OAAO,CAAC,WAAW,CAAC,CAKtB;IAEY,oBAAoB,CAC/B,gBAAgB,EAAE,iBAAiB,GAClC,OAAO,CAAC,WAAW,CAAC,CAKtB;IAEY,0BAA0B,CACrC,SAAS,EAAE,iBAAiB,EAC5B,uBAAuB,EAAE,OAAO,GAC/B,OAAO,CAAC,WAAW,CAAC,CAKtB;IAEY,cAAc,CACzB,MAAM,CAAC,EAAE,kBAAkB,GAC1B,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAKzC;IAEY,mBAAmB,CAC9B,MAAM,CAAC,EAAE,kBAAkB,GAC1B,OAAO,CAAC,OAAO,CAAC,CAKlB;CACF"}
+{"version":3,"file":"dlmm_program.d.ts","sourceRoot":"","sources":["../../src/entities/dlmm_program.ts"],"names":[],"mappings":"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"}

package/dist/entities/dlmm_program.js

@@ -20,13 +20,21 @@ export class DlmmProgram {
     async createPool(authority, params) {
         return await createPool({ authority, ...params }, { programAddress: this.#programAddress });
     }
-    async swap(user, poolAddress, params, config) {
+    async swapExactIn(user, poolAddress, params, config) {
         const pool = await this.getPool(poolAddress, config);
-        return await pool.swap(user, params);
+        return await pool.swapExactIn(user, params);
     }
-    async quote(poolAddress, params, config) {
+    async swapExactOut(user, poolAddress, params, config) {
         const pool = await this.getPool(poolAddress, config);
-        return await pool.quote(params);
+        return await pool.swapExactOut(user, params);
+    }
+    async quoteExactIn(poolAddress, params, config) {
+        const pool = await this.getPool(poolAddress, config);
+        return await pool.quoteExactIn(params);
+    }
+    async quoteExactOut(poolAddress, params, config) {
+        const pool = await this.getPool(poolAddress, config);
+        return await pool.quoteExactOut(params);
     }
     async getAllPositionMintsByOwner(owner, config) {
         const { commitment, minContextSlot, abortSignal } = config ?? {};

package/dist/entities/pool.d.ts

@@ -1,6 +1,6 @@
 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 FeeRates, type QuoteExactInOutput, type QuoteExactOutOutput, type TransferFee } from "../quote";
 import { type ExtraAccount, type TransferAccounts as TransferHookAccounts } from "../utils/transfer_hook";
 import { Position } from "./position";
 import { type ProgramConfig } from "./types";
@@ -35,21 +35,34 @@ export declare class Pool {
         upperBinId: number;
     }): Promise<Instruction[]>;
     closePosition(owner: TransactionSigner, positionMint: Address): Promise<Instruction>;
-    swap(user: TransactionSigner, { xToY, amountIn, slippageToleranceBps, }: {
+    swapExactIn(user: TransactionSigner, { xToY, amountIn, slippageToleranceBps, }: {
         xToY: boolean;
         amountIn: bigint;
         slippageToleranceBps: number;
     }): Promise<{
-        quoteOutput: QuoteOutput;
+        quoteOutput: QuoteExactInOutput;
+        instructions: Instruction[];
+    }>;
+    swapExactOut(user: TransactionSigner, { xToY, amountOut, slippageToleranceBps, }: {
+        xToY: boolean;
+        amountOut: bigint;
+        slippageToleranceBps: number;
+    }): Promise<{
+        quoteOutput: QuoteExactOutOutput;
         instructions: Instruction[];
     }>;
     resolveTransferHookAccountsX(transferAccounts: TransferHookAccounts): Promise<ExtraAccount[]>;
     resolveTransferHookAccountsY(transferAccounts: TransferHookAccounts): Promise<ExtraAccount[]>;
-    quote(params: {
+    quoteExactIn(params: {
         xToY: boolean;
         amountIn: bigint;
         slippageToleranceBps: number;
-    }): Promise<QuoteOutput>;
+    }): Promise<QuoteExactInOutput>;
+    quoteExactOut(params: {
+        xToY: boolean;
+        amountOut: bigint;
+        slippageToleranceBps: number;
+    }): Promise<QuoteExactOutOutput>;
     sync(user: TransactionSigner, desiredBinId: number): Promise<Instruction[]>;
     setDynamicFeeConfig(authority: TransactionSigner, dynamicFeeConfig: generated.DynamicFeeConfig): Promise<Instruction>;
     setProtocolShare(authority: TransactionSigner, protocolShare: number): Promise<Instruction>;

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,EAIL,KAAK,QAAQ,EACb,KAAK,kBAAkB,EACvB,KAAK,mBAAmB,EACxB,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,WAAW,CACtB,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,kBAAkB,CAAC;QAAC,YAAY,EAAE,WAAW,EAAE,CAAA;KAAE,CAAC,CA8B3E;IAEY,YAAY,CACvB,IAAI,EAAE,iBAAiB,EACvB,EACE,IAAI,EACJ,SAAS,EACT,oBAAoB,GACrB,EAAE;QACD,IAAI,EAAE,OAAO,CAAC;QACd,SAAS,EAAE,MAAM,CAAC;QAClB,oBAAoB,EAAE,MAAM,CAAC;KAC9B,GACA,OAAO,CAAC;QAAE,WAAW,EAAE,mBAAmB,CAAC;QAAC,YAAY,EAAE,WAAW,EAAE,CAAA;KAAE,CAAC,CA+B5E;IA0EY,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,YAAY,CACvB,MAAM,EAAE;QAAE,IAAI,EAAE,OAAO,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,oBAAoB,EAAE,MAAM,CAAA;KAAE,GACxE,OAAO,CAAC,kBAAkB,CAAC,CAG7B;IAEY,aAAa,CACxB,MAAM,EAAE;QAAE,IAAI,EAAE,OAAO,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,oBAAoB,EAAE,MAAM,CAAA;KAAE,GACzE,OAAO,CAAC,mBAAmB,CAAC,CAG9B;IAwGY,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

@@ -1,7 +1,7 @@
 import { AccountRole, } from "@solana/kit";
 import { fetchAllMint, } from "@solana-program/token-2022";
 import { generated } from "..";
-import { quote, getPoolFeeRates, } from "../quote";
+import { quoteExactIn, quoteExactOut, getPoolFeeRates, } from "../quote";
 import { isAccount } from "../utils/type_guards";
 import { resolveAdminConfigAddress } from "./admin_config";
 import { processAssociatedTokenAccountPair } from "../utils/ata";
@@ -70,19 +70,65 @@ export class Pool {
     async closePosition(owner, positionMint) {
         return await closePosition({ owner, positionMint }, { programAddress: this.#programAddress });
     }
-    async swap(user, { xToY, amountIn, slippageToleranceBps, }) {
-        const { quoteOutput, binArrayAddresses } = await this.#quote({ xToY, amountIn, slippageToleranceBps });
+    async swapExactIn(user, { xToY, amountIn, slippageToleranceBps, }) {
+        const { quoteOutput, binArrayAddresses } = await this.#quoteExactIn({ xToY, amountIn, slippageToleranceBps });
+        // The input leg is fixed, so it funds the wSOL leg (if any) directly.
+        const instructions = await this.#assembleSwapInstructions(user, xToY, amountIn, binArrayAddresses, ({ tokenUserAccountX, tokenUserAccountY, remainingAccountsScheme }) => generated.getSwapExactInInstruction({
+            user,
+            pool: this.address,
+            tokenMintX: this.tokenMintX,
+            tokenMintY: this.tokenMintY,
+            tokenUserAccountX,
+            tokenUserAccountY,
+            tokenVaultX: this.tokenVaultX,
+            tokenVaultY: this.tokenVaultY,
+            tokenProgramX: this.tokenProgramX,
+            tokenProgramY: this.tokenProgramY,
+            amountIn,
+            minAmountOut: quoteOutput.minAmountOut,
+            xToY,
+            remainingAccountsScheme,
+        }, { programAddress: this.#programAddress }));
+        return { quoteOutput, instructions };
+    }
+    async swapExactOut(user, { xToY, amountOut, slippageToleranceBps, }) {
+        const { quoteOutput, binArrayAddresses } = await this.#quoteExactOut({ xToY, amountOut, slippageToleranceBps });
+        // The real input isn't known until the swap executes, so the wSOL leg (if any) is funded with
+        // the worst-case maxAmountIn — any excess is unwrapped back to the owner in postInstructions.
+        const instructions = await this.#assembleSwapInstructions(user, xToY, quoteOutput.maxAmountIn, binArrayAddresses, ({ tokenUserAccountX, tokenUserAccountY, remainingAccountsScheme }) => generated.getSwapExactOutInstruction({
+            user,
+            pool: this.address,
+            tokenMintX: this.tokenMintX,
+            tokenMintY: this.tokenMintY,
+            tokenUserAccountX,
+            tokenUserAccountY,
+            tokenVaultX: this.tokenVaultX,
+            tokenVaultY: this.tokenVaultY,
+            tokenProgramX: this.tokenProgramX,
+            tokenProgramY: this.tokenProgramY,
+            amountOut,
+            maxAmountIn: quoteOutput.maxAmountIn,
+            xToY,
+            remainingAccountsScheme,
+        }, { programAddress: this.#programAddress }));
+        return { quoteOutput, instructions };
+    }
+    // Shared tail of both swap directions: sets up the user's X/Y ATAs (funding the wSOL leg, if
+    // any, with `fundingAmount`), resolves each mint's transfer-hook accounts against the role it
+    // plays in this swap — input (user -> vault, owner = user) or output (vault -> user, owner =
+    // pool PDA) — builds the remaining-accounts scheme, and splices the bin arrays + resolved hook
+    // accounts onto the instruction `buildSwapIx` produces. Only the funding amount and the
+    // instruction itself differ between exact-in and exact-out.
+    async #assembleSwapInstructions(user, xToY, fundingAmount, binArrayAddresses, buildSwapIx) {
         const { ataX: tokenUserAccountX, ataY: tokenUserAccountY, preInstructions, postInstructions, } = await processAssociatedTokenAccountPair({
             owner: user,
             tokenMintX: this.tokenMintX,
             tokenMintY: this.tokenMintY,
             tokenProgramX: this.tokenProgramX,
             tokenProgramY: this.tokenProgramY,
-            amountX: xToY ? amountIn : undefined,
-            amountY: xToY ? undefined : amountIn,
+            amountX: xToY ? fundingAmount : undefined,
+            amountY: xToY ? undefined : fundingAmount,
         });
-        // 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 };
@@ -105,26 +151,13 @@ export class Pool {
             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,
-            tokenMintX: this.tokenMintX,
-            tokenMintY: this.tokenMintY,
+        const swapIx = buildSwapIx({
             tokenUserAccountX,
             tokenUserAccountY,
-            tokenVaultX: this.tokenVaultX,
-            tokenVaultY: this.tokenVaultY,
-            tokenProgramX: this.tokenProgramX,
-            tokenProgramY: this.tokenProgramY,
-            amountIn,
-            minAmountOut: quoteOutput.minAmountOut,
-            xToY,
-            remainingAccountsScheme,
-        }, { programAddress: this.#programAddress });
-        const swapIxWithBinArrays = { ...swapIx, accounts: [...swapIx.accounts, ...remainingAccounts] };
-        const instructions = [...preInstructions, swapIxWithBinArrays, ...postInstructions];
-        return { quoteOutput, instructions };
+            remainingAccountsScheme: { groups },
+        });
+        const swapIxWithBinArrays = { ...swapIx, accounts: [...(swapIx.accounts ?? []), ...remainingAccounts] };
+        return [...preInstructions, swapIxWithBinArrays, ...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
@@ -142,19 +175,17 @@ export class Pool {
             return [];
         return await resolveTransferHookExtraAccounts(this.#rpc, hookProgram, transferAccounts);
     }
-    async quote(params) {
-        const { quoteOutput } = await this.#quote(params);
+    async quoteExactIn(params) {
+        const { quoteOutput } = await this.#quoteExactIn(params);
         return quoteOutput;
     }
-    async #quote({ xToY, amountIn, slippageToleranceBps, }) {
-        const indices = generateBinArrayIndicesForSwap(this.activeBinId, xToY, MAX_BIN_ARRAYS_PER_TRAVERSAL);
-        const maxBinArrayAddresses = await findAllBinArrayAddresses({ pool: this.address, indices }, { programAddress: this.#programAddress });
-        const [maybeBinArrays, { transferFeeX, transferFeeY }] = await Promise.all([
-            generated.fetchAllMaybeBinArray(this.#rpc, maxBinArrayAddresses),
-            this.getTransferFees(),
-        ]);
-        const binArrays = maybeBinArrays.map(maybeBinArray => maybeBinArray.exists ? maybeBinArray.data : undefined);
-        const quoteOutput = await quote({
+    async quoteExactOut(params) {
+        const { quoteOutput } = await this.#quoteExactOut(params);
+        return quoteOutput;
+    }
+    async #quoteExactIn({ xToY, amountIn, slippageToleranceBps, }) {
+        const { indices, maxBinArrayAddresses, binArrays, transferFeeX, transferFeeY } = await this.#resolveSwapBinArrays(xToY);
+        const quoteOutput = await quoteExactIn({
             amountIn,
             xToY,
             slippageToleranceBps,
@@ -164,13 +195,46 @@ export class Pool {
             outputTransferFee: xToY ? transferFeeY : transferFeeX,
             binArrays,
         });
+        const binArrayAddresses = this.#binArrayAddressesForQuote(xToY, indices, maxBinArrayAddresses, quoteOutput.postActiveBinId);
+        return { quoteOutput, binArrayAddresses };
+    }
+    async #quoteExactOut({ xToY, amountOut, slippageToleranceBps, }) {
+        const { indices, maxBinArrayAddresses, binArrays, transferFeeX, transferFeeY } = await this.#resolveSwapBinArrays(xToY);
+        const quoteOutput = await quoteExactOut({
+            amountOut,
+            xToY,
+            slippageToleranceBps,
+            now: BigInt(Math.floor(Date.now() / 1000)),
+            poolState: this.data,
+            inputTransferFee: xToY ? transferFeeX : transferFeeY,
+            outputTransferFee: xToY ? transferFeeY : transferFeeX,
+            binArrays,
+        });
+        const binArrayAddresses = this.#binArrayAddressesForQuote(xToY, indices, maxBinArrayAddresses, quoteOutput.postActiveBinId);
+        return { quoteOutput, binArrayAddresses };
+    }
+    // The bin array window a quote might touch, before the quote itself narrows down how much of
+    // it was actually crossed — shared by both quote directions, which differ only in which
+    // `quoteExact{In,Out}` call they make against this same window.
+    async #resolveSwapBinArrays(xToY) {
+        const indices = generateBinArrayIndicesForSwap(this.activeBinId, xToY, MAX_BIN_ARRAYS_PER_TRAVERSAL);
+        const maxBinArrayAddresses = await findAllBinArrayAddresses({ pool: this.address, indices }, { programAddress: this.#programAddress });
+        const [maybeBinArrays, { transferFeeX, transferFeeY }] = await Promise.all([
+            generated.fetchAllMaybeBinArray(this.#rpc, maxBinArrayAddresses),
+            this.getTransferFees(),
+        ]);
+        const binArrays = maybeBinArrays.map(maybeBinArray => maybeBinArray.exists ? maybeBinArray.data : undefined);
+        return { indices, maxBinArrayAddresses, binArrays, transferFeeX, transferFeeY };
+    }
+    // Narrows the bin array window down to what a quote (already run against the full window)
+    // actually needs to re-traverse at swap time, based on where it left the active bin.
+    #binArrayAddressesForQuote(xToY, indices, maxBinArrayAddresses, postActiveBinId) {
         const safeOffset = xToY ? -1 : 1;
-        const targetBinArrayIndex = getBinArrayIndex(quoteOutput.postActiveBinId) + safeOffset;
+        const targetBinArrayIndex = getBinArrayIndex(postActiveBinId) + safeOffset;
         const localTargetBinArrayIndex = targetBinArrayIndex - indices[0];
-        const binArrayAddresses = xToY
+        return xToY
             ? maxBinArrayAddresses.slice(Math.max(0, localTargetBinArrayIndex))
             : maxBinArrayAddresses.slice(0, localTargetBinArrayIndex + 1);
-        return { quoteOutput, binArrayAddresses };
     }
     async sync(user, desiredBinId) {
         const indices = generateBinArrayIndicesForSync(this.activeBinId, desiredBinId, MAX_BIN_ARRAYS_PER_TRAVERSAL);

package/dist/entities/position.js

@@ -1,6 +1,6 @@
 import { decodeAccount, assertAccountExists, fetchEncodedAccounts, } from "@solana/kit";
 import { generated } from "..";
-import { applyTransferFee } from "../quote";
+import { getAmountAfterTransferFee } from "../quote";
 import { findPositionTokenAccount, processAssociatedTokenAccountPair, } from "../utils/ata";
 import { toRemainingAccountMeta } from "../utils/transfer_hook";
 import { getBinIndex, getBinArrayIndex, getPositionBinArrayIndices, } from "../utils/bin_location";
@@ -74,10 +74,10 @@ export class Position {
         }), { amountX: 0n, amountY: 0n, feeX: 0n, feeY: 0n });
         const { transferFeeX, transferFeeY } = await this.#pool.getTransferFees();
         const [netAmountX, netAmountY, netFeeX, netFeeY] = await Promise.all([
-            applyTransferFee(gross.amountX, transferFeeX),
-            applyTransferFee(gross.amountY, transferFeeY),
-            applyTransferFee(gross.feeX, transferFeeX),
-            applyTransferFee(gross.feeY, transferFeeY),
+            getAmountAfterTransferFee(gross.amountX, transferFeeX),
+            getAmountAfterTransferFee(gross.amountY, transferFeeY),
+            getAmountAfterTransferFee(gross.feeX, transferFeeX),
+            getAmountAfterTransferFee(gross.feeY, transferFeeY),
         ]);
         return {
             bins,

package/dist/generated/instructions/index.d.ts

@@ -19,7 +19,8 @@ export * from "./resetAdminAuthority";
 export * from "./setMetadataUpdateAuthority";
 export * from "./setPoolDynamicFeeConfig";
 export * from "./setPoolProtocolShare";
-export * from "./swap";
+export * from "./swapExactIn";
+export * from "./swapExactOut";
 export * from "./syncPool";
 export * from "./transferAdminAuthority";
 export * from "./withdraw";

package/dist/generated/instructions/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/generated/instructions/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,cAAc,wBAAwB,CAAC;AACvC,cAAc,YAAY,CAAC;AAC3B,cAAc,oBAAoB,CAAC;AACnC,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,kBAAkB,CAAC;AACjC,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC;AACtC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC;AACvC,cAAc,QAAQ,CAAC;AACvB,cAAc,YAAY,CAAC;AAC3B,cAAc,0BAA0B,CAAC;AACzC,cAAc,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/generated/instructions/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,cAAc,wBAAwB,CAAC;AACvC,cAAc,YAAY,CAAC;AAC3B,cAAc,oBAAoB,CAAC;AACnC,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,kBAAkB,CAAC;AACjC,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC;AACtC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC;AACvC,cAAc,eAAe,CAAC;AAC9B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,YAAY,CAAC;AAC3B,cAAc,0BAA0B,CAAC;AACzC,cAAc,YAAY,CAAC"}

package/dist/generated/instructions/index.js

@@ -19,7 +19,8 @@ export * from "./resetAdminAuthority";
 export * from "./setMetadataUpdateAuthority";
 export * from "./setPoolDynamicFeeConfig";
 export * from "./setPoolProtocolShare";
-export * from "./swap";
+export * from "./swapExactIn";
+export * from "./swapExactOut";
 export * from "./syncPool";
 export * from "./transferAdminAuthority";
 export * from "./withdraw";

package/dist/generated/instructions/swapExactIn.d.ts

@@ -0,0 +1,78 @@
+/**
+ * This code was AUTOGENERATED using the Codama library.
+ * Please DO NOT EDIT THIS FILE, instead use visitors
+ * to add features, then rerun Codama to update it.
+ *
+ * @see https://github.com/codama-idl/codama
+ */
+import { type AccountMeta, type AccountSignerMeta, type Address, type Codec, type Decoder, type Encoder, type Instruction, type InstructionWithAccounts, type InstructionWithData, type ReadonlyAccount, type ReadonlySignerAccount, type ReadonlyUint8Array, type TransactionSigner, type WritableAccount } from "@solana/kit";
+import { PICON_DLMM_PROGRAM_ADDRESS } from "../programs";
+import { type RemainingAccountsScheme, type RemainingAccountsSchemeArgs } from "../types";
+export declare const SWAP_EXACT_IN_DISCRIMINATOR: ReadonlyUint8Array;
+export declare function getSwapExactInDiscriminatorBytes(): ReadonlyUint8Array;
+export type SwapExactInInstruction<TProgram extends string = typeof PICON_DLMM_PROGRAM_ADDRESS, TAccountUser extends string | AccountMeta<string> = string, TAccountPool extends string | AccountMeta<string> = string, TAccountTokenMintX extends string | AccountMeta<string> = string, TAccountTokenMintY extends string | AccountMeta<string> = string, TAccountTokenUserAccountX extends string | AccountMeta<string> = string, TAccountTokenUserAccountY extends string | AccountMeta<string> = string, TAccountTokenVaultX extends string | AccountMeta<string> = string, TAccountTokenVaultY extends string | AccountMeta<string> = string, TAccountTokenProgramX extends string | AccountMeta<string> = string, TAccountTokenProgramY extends string | AccountMeta<string> = string, TRemainingAccounts extends readonly AccountMeta<string>[] = []> = Instruction<TProgram> & InstructionWithData<ReadonlyUint8Array> & InstructionWithAccounts<[
+    TAccountUser extends string ? ReadonlySignerAccount<TAccountUser> & AccountSignerMeta<TAccountUser> : TAccountUser,
+    TAccountPool extends string ? WritableAccount<TAccountPool> : TAccountPool,
+    TAccountTokenMintX extends string ? ReadonlyAccount<TAccountTokenMintX> : TAccountTokenMintX,
+    TAccountTokenMintY extends string ? ReadonlyAccount<TAccountTokenMintY> : TAccountTokenMintY,
+    TAccountTokenUserAccountX extends string ? WritableAccount<TAccountTokenUserAccountX> : TAccountTokenUserAccountX,
+    TAccountTokenUserAccountY extends string ? WritableAccount<TAccountTokenUserAccountY> : TAccountTokenUserAccountY,
+    TAccountTokenVaultX extends string ? WritableAccount<TAccountTokenVaultX> : TAccountTokenVaultX,
+    TAccountTokenVaultY extends string ? WritableAccount<TAccountTokenVaultY> : TAccountTokenVaultY,
+    TAccountTokenProgramX extends string ? ReadonlyAccount<TAccountTokenProgramX> : TAccountTokenProgramX,
+    TAccountTokenProgramY extends string ? ReadonlyAccount<TAccountTokenProgramY> : TAccountTokenProgramY,
+    ...TRemainingAccounts
+]>;
+export type SwapExactInInstructionData = {
+    discriminator: ReadonlyUint8Array;
+    amountIn: bigint;
+    minAmountOut: bigint;
+    xToY: boolean;
+    remainingAccountsScheme: RemainingAccountsScheme;
+};
+export type SwapExactInInstructionDataArgs = {
+    amountIn: number | bigint;
+    minAmountOut: number | bigint;
+    xToY: boolean;
+    remainingAccountsScheme: RemainingAccountsSchemeArgs;
+};
+export declare function getSwapExactInInstructionDataEncoder(): Encoder<SwapExactInInstructionDataArgs>;
+export declare function getSwapExactInInstructionDataDecoder(): Decoder<SwapExactInInstructionData>;
+export declare function getSwapExactInInstructionDataCodec(): Codec<SwapExactInInstructionDataArgs, SwapExactInInstructionData>;
+export type SwapExactInInput<TAccountUser extends string = string, TAccountPool extends string = string, TAccountTokenMintX extends string = string, TAccountTokenMintY extends string = string, TAccountTokenUserAccountX extends string = string, TAccountTokenUserAccountY extends string = string, TAccountTokenVaultX extends string = string, TAccountTokenVaultY extends string = string, TAccountTokenProgramX extends string = string, TAccountTokenProgramY extends string = string> = {
+    user: TransactionSigner<TAccountUser>;
+    pool: Address<TAccountPool>;
+    tokenMintX: Address<TAccountTokenMintX>;
+    tokenMintY: Address<TAccountTokenMintY>;
+    tokenUserAccountX: Address<TAccountTokenUserAccountX>;
+    tokenUserAccountY: Address<TAccountTokenUserAccountY>;
+    tokenVaultX: Address<TAccountTokenVaultX>;
+    tokenVaultY: Address<TAccountTokenVaultY>;
+    tokenProgramX: Address<TAccountTokenProgramX>;
+    tokenProgramY: Address<TAccountTokenProgramY>;
+    amountIn: SwapExactInInstructionDataArgs["amountIn"];
+    minAmountOut: SwapExactInInstructionDataArgs["minAmountOut"];
+    xToY: SwapExactInInstructionDataArgs["xToY"];
+    remainingAccountsScheme: SwapExactInInstructionDataArgs["remainingAccountsScheme"];
+};
+export declare function getSwapExactInInstruction<TAccountUser extends string, TAccountPool extends string, TAccountTokenMintX extends string, TAccountTokenMintY extends string, TAccountTokenUserAccountX extends string, TAccountTokenUserAccountY extends string, TAccountTokenVaultX extends string, TAccountTokenVaultY extends string, TAccountTokenProgramX extends string, TAccountTokenProgramY extends string, TProgramAddress extends Address = typeof PICON_DLMM_PROGRAM_ADDRESS>(input: SwapExactInInput<TAccountUser, TAccountPool, TAccountTokenMintX, TAccountTokenMintY, TAccountTokenUserAccountX, TAccountTokenUserAccountY, TAccountTokenVaultX, TAccountTokenVaultY, TAccountTokenProgramX, TAccountTokenProgramY>, config?: {
+    programAddress?: TProgramAddress;
+}): SwapExactInInstruction<TProgramAddress, TAccountUser, TAccountPool, TAccountTokenMintX, TAccountTokenMintY, TAccountTokenUserAccountX, TAccountTokenUserAccountY, TAccountTokenVaultX, TAccountTokenVaultY, TAccountTokenProgramX, TAccountTokenProgramY>;
+export type ParsedSwapExactInInstruction<TProgram extends string = typeof PICON_DLMM_PROGRAM_ADDRESS, TAccountMetas extends readonly AccountMeta[] = readonly AccountMeta[]> = {
+    programAddress: Address<TProgram>;
+    accounts: {
+        user: TAccountMetas[0];
+        pool: TAccountMetas[1];
+        tokenMintX: TAccountMetas[2];
+        tokenMintY: TAccountMetas[3];
+        tokenUserAccountX: TAccountMetas[4];
+        tokenUserAccountY: TAccountMetas[5];
+        tokenVaultX: TAccountMetas[6];
+        tokenVaultY: TAccountMetas[7];
+        tokenProgramX: TAccountMetas[8];
+        tokenProgramY: TAccountMetas[9];
+    };
+    data: SwapExactInInstructionData;
+};
+export declare function parseSwapExactInInstruction<TProgram extends string, TAccountMetas extends readonly AccountMeta[]>(instruction: Instruction<TProgram> & InstructionWithAccounts<TAccountMetas> & InstructionWithData<ReadonlyUint8Array>): ParsedSwapExactInInstruction<TProgram, TAccountMetas>;
+//# sourceMappingURL=swapExactIn.d.ts.map

package/dist/generated/instructions/swapExactIn.d.ts.map

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