@picon-finance/dlmm-sdk 1.16.0 → 1.16.2

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

@@ -72,41 +72,8 @@ export class Pool {
     }
     async swapExactIn(user, { xToY, amountIn, slippageToleranceBps, }) {
         const { quoteOutput, binArrayAddresses } = await this.#quoteExactIn({ xToY, amountIn, slippageToleranceBps });
-        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,
-        });
-        // 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.getSwapExactInInstruction({
+        // 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,
@@ -121,26 +88,47 @@ export class Pool {
             minAmountOut: quoteOutput.minAmountOut,
             xToY,
             remainingAccountsScheme,
-        }, { programAddress: this.#programAddress });
-        const swapIxWithBinArrays = { ...swapIx, accounts: [...swapIx.accounts, ...remainingAccounts] };
-        const instructions = [...preInstructions, swapIxWithBinArrays, ...postInstructions];
+        }, { 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,
-            // Funds the wSOL leg (if any) with the worst-case input, since the real amount isn't known
-            // until the swap executes — any excess is unwrapped back to the owner in postInstructions.
-            amountX: xToY ? quoteOutput.maxAmountIn : undefined,
-            amountY: xToY ? undefined : quoteOutput.maxAmountIn,
+            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 };
@@ -163,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.getSwapExactOutInstruction({
-            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,
-            amountOut,
-            maxAmountIn: quoteOutput.maxAmountIn,
-            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

package/dist/picon_dlmm.json

@@ -2,7 +2,7 @@
     "address": "pDLMMk3KW3CUSxE1Wgjhx3jSmm2spe6Ry7Mq2HT26rC",
     "metadata": {
         "name": "picon_dlmm",
-        "version": "1.1.0",
+        "version": "1.1.1",
         "spec": "0.1.0",
         "description": "Created with Anchor"
     },

package/dist/utils/price.d.ts

@@ -1,4 +1,5 @@
 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;
+export declare function getBinIdFromPrice(binStep: number, price: bigint): number | undefined;
 //# sourceMappingURL=price.d.ts.map

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

@@ -1 +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"}
+{"version":3,"file":"price.d.ts","sourceRoot":"","sources":["../../src/utils/price.ts"],"names":[],"mappings":"AAIA,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;AA8BD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAsCpF"}

package/dist/utils/price.js

@@ -1,4 +1,5 @@
 import { MAX_BASIS_POINTS } from "./constants";
+import { isUndefined } from "./type_guards";
 import { expBySquaring, MAX, MAX_EXPONENTIAL, ONE, SCALE_OFFSET } from "./u64x64";
 export function getBaseBinPrice(binStep) {
     const priceStep = (BigInt(binStep) << SCALE_OFFSET) / BigInt(MAX_BASIS_POINTS);
@@ -16,8 +17,8 @@ export function getBinPrice(baseBinPrice, binId) {
     const absBinId = Math.abs(binId);
     if (absBinId >= MAX_EXPONENTIAL)
         return;
-    const invertedBase = MAX / baseBinPrice;
-    const price = expBySquaring(invertedBase, absBinId);
+    const invertedBaseBinPrice = MAX / baseBinPrice;
+    const price = expBySquaring(invertedBaseBinPrice, absBinId);
     if (price === 0n)
         return;
     return invert ? MAX / price : price;
@@ -25,3 +26,64 @@ export function getBinPrice(baseBinPrice, binId) {
 export function getBinPriceFromStep(binStep, binId) {
     return getBinPrice(getBaseBinPrice(binStep), binId);
 }
+const MAX_BIN_ID_BY_BIN_STEP = new Map([
+    [1, 443636],
+    [2, 221829],
+    [4, 110925],
+    [5, 88745],
+    [8, 55473],
+    [10, 44383],
+    [15, 29596],
+    [16, 27748],
+    [20, 22202],
+    [25, 17759],
+    [30, 14809],
+    [50, 8893],
+    [75, 5937],
+    [80, 5567],
+    [100, 4456],
+    [125, 3571],
+    [150, 2979],
+    [160, 2794],
+    [200, 2239],
+    [250, 1796],
+    [300, 1500],
+    [400, 1130],
+]);
+const MIN_PRICE = 1n;
+const MAX_PRICE = MAX;
+export function getBinIdFromPrice(binStep, price) {
+    if (price <= 0n)
+        return;
+    const maxBinId = MAX_BIN_ID_BY_BIN_STEP.get(binStep);
+    if (isUndefined(maxBinId)) {
+        throw new Error(`getBinIdFromPrice: unsupported binStep (${binStep})`);
+    }
+    if (price <= MIN_PRICE)
+        return -maxBinId;
+    if (price >= MAX_PRICE)
+        return maxBinId;
+    const baseBinPrice = getBaseBinPrice(binStep);
+    let lowerBinId = -maxBinId;
+    let upperBinId = maxBinId;
+    let currentPrice = MAX_PRICE;
+    let previousPrice;
+    while (lowerBinId < upperBinId) {
+        const middleBinId = lowerBinId + Math.floor((upperBinId - lowerBinId) / 2);
+        const middlePrice = getBinPrice(baseBinPrice, middleBinId);
+        if (middlePrice < price) {
+            lowerBinId = middleBinId + 1;
+            previousPrice = middlePrice;
+        }
+        else {
+            upperBinId = middleBinId;
+            currentPrice = middlePrice;
+        }
+    }
+    if (isUndefined(previousPrice))
+        return lowerBinId;
+    // previousPrice < price <= currentPrice always holds here, so both distances are non-negative.
+    const previousPriceDistance = price - previousPrice;
+    const currentPriceDistance = currentPrice - price;
+    return previousPriceDistance < currentPriceDistance ? lowerBinId - 1 : lowerBinId;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@picon-finance/dlmm-sdk",
-  "version": "1.16.0",
+  "version": "1.16.2",
   "description": "Typescript SDK for interacting with the Picon DLMM protocol",
   "author": "Picon Finance",
   "license": "MIT",
@@ -23,7 +23,8 @@
   },
   "files": [
     "./dist/",
-    "./src/"
+    "./src/",
+    "!**/*.test.ts"
   ],
   "scripts": {
     "clean": "rm -rf ./dist/",
@@ -36,9 +37,10 @@
     "build-wasm-bindings-web": "wasm-bindgen ../target/wasm32-unknown-unknown/release/picon_dlmm_quote.wasm --out-dir ./src/quote/wasm-web --target web --typescript",
     "build-wasm": "bun run build-wasm-crate && bun run clean-wasm && bun run build-wasm-bindings-node && bun run build-wasm-bindings-web",
     "copy-wasm-binaries": "mkdir -p ./dist/quote/wasm-node ./dist/quote/wasm-web && cp ./src/quote/wasm-node/*.wasm ./src/quote/wasm-node/*.js ./src/quote/wasm-node/*.d.ts ./dist/quote/wasm-node/ && cp ./src/quote/wasm-web/*.wasm ./src/quote/wasm-web/*.js ./src/quote/wasm-web/*.d.ts ./dist/quote/wasm-web/",
-    "compile": "bun run clean && npx tsc && bun run copy-wasm-binaries",
+    "compile": "bun run clean && npx tsc -p tsconfig.build.json && bun run copy-wasm-binaries",
     "build": "bun run codama-generate-js && bun run build-wasm && bun run compile",
-    "prepublishOnly": "bun run build"
+    "prepublishOnly": "bun run build",
+    "test": "bun test"
   },
   "dependencies": {
     "@solana-program/system": "^0.13.0",

package/src/entities/pool.ts

@@ -178,70 +178,31 @@ export class Pool {
     const { quoteOutput, binArrayAddresses } =
       await this.#quoteExactIn({ xToY, amountIn, slippageToleranceBps });
 
-    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,
-    });
-
-    // 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.getSwapExactInInstruction({
+    // The input leg is fixed, so it funds the wSOL leg (if any) directly.
+    const instructions = await this.#assembleSwapInstructions(
       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 });
-
-    const swapIxWithBinArrays = { ...swapIx, accounts: [...swapIx.accounts, ...remainingAccounts] };
+      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 }),
+    );
 
-    const instructions = [...preInstructions, swapIxWithBinArrays, ...postInstructions];
     return { quoteOutput, instructions };
   }
 
@@ -260,6 +221,52 @@ export class Pool {
     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: TransactionSigner,
+    xToY: boolean,
+    fundingAmount: bigint,
+    binArrayAddresses: Address[],
+    buildSwapIx: (accounts: {
+      tokenUserAccountX: Address,
+      tokenUserAccountY: Address,
+      remainingAccountsScheme: generated.RemainingAccountsScheme,
+    }) => Instruction,
+  ): Promise<Instruction[]> {
     const {
       ataX: tokenUserAccountX,
       ataY: tokenUserAccountY,
@@ -271,14 +278,10 @@ export class Pool {
       tokenMintY: this.tokenMintY,
       tokenProgramX: this.tokenProgramX,
       tokenProgramY: this.tokenProgramY,
-      // Funds the wSOL leg (if any) with the worst-case input, since the real amount isn't known
-      // until the swap executes — any excess is unwrapped back to the owner in postInstructions.
-      amountX: xToY ? quoteOutput.maxAmountIn : undefined,
-      amountY: xToY ? undefined : quoteOutput.maxAmountIn,
+      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: TransferHookAccounts = xToY
       ? { source: tokenUserAccountX, mint: this.tokenMintX, destination: this.tokenVaultX, owner: user.address }
       : { source: this.tokenVaultX, mint: this.tokenMintX, destination: tokenUserAccountX, owner: this.address };
@@ -305,28 +308,14 @@ export class Pool {
       remainingAccounts.push(...transferHookYAccounts.map(toRemainingAccountMeta));
     }
 
-    const remainingAccountsScheme: generated.RemainingAccountsScheme = { groups };
-    const swapIx = generated.getSwapExactOutInstruction({
-      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,
-      amountOut,
-      maxAmountIn: quoteOutput.maxAmountIn,
-      xToY,
-      remainingAccountsScheme,
-    }, { programAddress: this.#programAddress });
-
-    const swapIxWithBinArrays = { ...swapIx, accounts: [...swapIx.accounts, ...remainingAccounts] };
+      remainingAccountsScheme: { groups },
+    });
+    const swapIxWithBinArrays = { ...swapIx, accounts: [...(swapIx.accounts ?? []), ...remainingAccounts] };
 
-    const instructions = [...preInstructions, swapIxWithBinArrays, ...postInstructions];
-    return { quoteOutput, instructions };
+    return [...preInstructions, swapIxWithBinArrays, ...postInstructions];
   }
 
   // Public so Position (which only holds a reference to this Pool, not its private mint data)

package/src/entities/position.ts

@@ -30,12 +30,12 @@ import {
   assertPositionBelongsToPool,
 } from "../utils/assert";
 import { isUndefined } from "../utils/type_guards";
-import { 
+import {
   chunk,
   fetchInChunks,
 } from "../utils/chunk";
 import { resolveAdminConfigAddress } from "./admin_config";
-import { 
+import {
   DEFAULT_POSITIONS_PER_CLAIM,
   MAX_ACCOUNTS_PER_RPC_BATCH,
 } from "../utils/constants";

package/src/picon_dlmm.json

@@ -2,7 +2,7 @@
   "address": "pDLMMk3KW3CUSxE1Wgjhx3jSmm2spe6Ry7Mq2HT26rC",
   "metadata": {
     "name": "picon_dlmm",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "spec": "0.1.0",
     "description": "Created with Anchor"
   },

package/src/utils/price.ts

@@ -1,4 +1,5 @@
 import { MAX_BASIS_POINTS } from "./constants";
+import { isUndefined } from "./type_guards";
 import { expBySquaring, MAX, MAX_EXPONENTIAL, ONE, SCALE_OFFSET } from "./u64x64";
 
 export function getBaseBinPrice(binStep: number): bigint {
@@ -19,8 +20,8 @@ export function getBinPrice(baseBinPrice: bigint, binId: number): bigint | undef
 
   if (absBinId >= MAX_EXPONENTIAL) return;
 
-  const invertedBase = MAX / baseBinPrice;
-  const price = expBySquaring(invertedBase, absBinId);
+  const invertedBaseBinPrice = MAX / baseBinPrice;
+  const price = expBySquaring(invertedBaseBinPrice, absBinId);
 
   if (price === 0n) return;
 
@@ -30,3 +31,71 @@ export function getBinPrice(baseBinPrice: bigint, binId: number): bigint | undef
 export function getBinPriceFromStep(binStep: number, binId: number): bigint | undefined {
   return getBinPrice(getBaseBinPrice(binStep), binId);
 }
+
+const MAX_BIN_ID_BY_BIN_STEP = new Map<number, number>([
+  [1, 443636],
+  [2, 221829],
+  [4, 110925],
+  [5, 88745],
+  [8, 55473],
+  [10, 44383],
+  [15, 29596],
+  [16, 27748],
+  [20, 22202],
+  [25, 17759],
+  [30, 14809],
+  [50, 8893],
+  [75, 5937],
+  [80, 5567],
+  [100, 4456],
+  [125, 3571],
+  [150, 2979],
+  [160, 2794],
+  [200, 2239],
+  [250, 1796],
+  [300, 1500],
+  [400, 1130],
+]);
+
+const MIN_PRICE = 1n;
+const MAX_PRICE = MAX;
+
+export function getBinIdFromPrice(binStep: number, price: bigint): number | undefined {
+  if (price <= 0n) return;
+
+  const maxBinId = MAX_BIN_ID_BY_BIN_STEP.get(binStep);
+  if (isUndefined(maxBinId)) {
+    throw new Error(`getBinIdFromPrice: unsupported binStep (${binStep})`);
+  }
+
+  if (price <= MIN_PRICE) return -maxBinId;
+  if (price >= MAX_PRICE) return maxBinId;
+
+  const baseBinPrice = getBaseBinPrice(binStep);
+
+  let lowerBinId = -maxBinId;
+  let upperBinId = maxBinId;
+
+  let currentPrice = MAX_PRICE;
+  let previousPrice: bigint | undefined;
+
+  while (lowerBinId < upperBinId) {
+    const middleBinId = lowerBinId + Math.floor((upperBinId - lowerBinId) / 2);
+    const middlePrice = getBinPrice(baseBinPrice, middleBinId)!;
+
+    if (middlePrice < price) {
+      lowerBinId = middleBinId + 1;
+      previousPrice = middlePrice;
+    } else {
+      upperBinId = middleBinId;
+      currentPrice = middlePrice;
+    }
+  }
+
+  if (isUndefined(previousPrice)) return lowerBinId;
+
+  // previousPrice < price <= currentPrice always holds here, so both distances are non-negative.
+  const previousPriceDistance = price - previousPrice;
+  const currentPriceDistance = currentPrice - price;
+  return previousPriceDistance < currentPriceDistance ? lowerBinId - 1 : lowerBinId;
+}