From c4eb499337bd3d795e50a934b0e9b34aa3208e0a Mon Sep 17 00:00:00 2001
From: VeXHarbinger <alexpearlstein@gmail.com>
Date: Wed, 27 May 2026 18:41:46 -0400
Subject: [PATCH 1/5] PancakeSwap V3 CLMM fixes, binCount pool-info

---
 .github/copilot-instructions.md | 77 +++++++++++++++++++++++++++++++++
 CLAUDE.md                       | 37 ++++++++++++++++
 2 files changed, 114 insertions(+)
 create mode 100644 .github/copilot-instructions.md

diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
new file mode 100644
index 0000000000..4a361f010f
--- /dev/null
+++ b/.github/copilot-instructions.md
@@ -0,0 +1,77 @@
+# GitHub Copilot Instructions
+
+This file provides guidance to GitHub Copilot when working with code in this repository.
+Keep this file in sync with `CLAUDE.md` — changes to one must be reflected in the other.
+
+## Lenses
+
+Apply all lenses before proposing any solution. Each lens constrains acceptable answers.
+
+- Hummingbot lens: Gateway is consumed by Hummingbot Python strategies via typed connector classes. API response shapes are parsed directly into Python dicts — breaking changes to field types or names silently corrupt live trading bots. Prefer additive changes (new optional fields) over mutations. `walletAddresses` must remain `string[]`. Use Tolerant Reader pattern for all response extensions.
+- Blockchain lens: The `chain` field is the technology substrate (ethereum = all EVM, solana = SVM). `network` is the L1/L2 brand discriminator (mainnet, bsc, arbitrum, base, polygon, avalanche). A wallet address is chain-scoped, not network-scoped — the same keypair works across all EVM networks. Wallet files are stored under `conf/wallets/<chain>/<address>.json` as `{encryptedKey, network}` JSON; legacy files contain a raw encrypted string and must be handled transparently.
+- System Architect lens: Routes follow `/{resource}/{operation}` REST conventions. Schemas are TypeBox objects auto-published to Swagger — every new field must be typed. Backwards compatibility is enforced via optional fields, never field removal or type mutation. Singleton pattern governs chain/connector instances (`getInstance(network)`). Error responses must use Fastify `httpErrors` — never throw raw errors from route handlers.
+- Bitcoin lens: Not directly supported, but cryptographic primitives (key derivation, encryption, signing) must remain chain-agnostic. Wallet encryption uses a passphrase-derived key stored outside source control. Never log or expose private keys or passphrases in any code path.
+- Jest lens: Mock external deps (fs, RPC, chains) — never write real files during tests. Test both happy paths and regressions. 100% coverage on utils, 75%+ on routes. Use `jest.mock()` for file/crypto ops. Parallel tests should not share state. Validate schema contracts before business logic. Every test suite must cover three categories: (1) **Happy paths** — expected utilization with valid inputs for all parameter combinations; (2) **Edge cases** — boundary values, legacy file formats, same-address-multi-network, empty arrays, zero amounts; (3) **Missing/invalid parameters** — each required field omitted independently, unrecognized chain/network values, neither `chain` nor `chainNetwork` provided, malformed `chainNetwork` strings. Route handler tests must assert the HTTP status code, not just the response body shape.
+- QA lens: Validate backwards compatibility at every response boundary. Legacy wallet files must parse identically. New optional fields should not break old consumers. Test migration scenarios: old wallets → new system, new fields with old clients. Regression suite covers all breaking-change-adjacent code paths.
+- Security lens: Never log or expose private keys, passphrases, mnemonic seeds, or decrypted values. All file I/O must use `getSafeWalletFilePath()` with sanitized inputs. Wallet encryption keys derive from passphrase outside source control. Validate address formats to prevent injection. All secrets must be stored in `conf/` outside repo.
+
+- Markdown lens: All `.md` files must render cleanly — headings surrounded by blank lines, lists surrounded by blank lines, fenced code blocks surrounded by blank lines, no bare URLs (wrap in angle brackets or `[text](url)`), no trailing spaces, consistent ATX-style headings (`##` not underline). PR descriptions, README sections, and CLAUDE.md must follow these rules. Use `<!--` comments only for meta-notes, never for hiding required content.
+- Documentation lens: Every public API change needs three things in the same commit — (1) updated TypeBox schema `description` fields visible in Swagger, (2) at minimum one Swagger `examples` entry showing BSC or the most common real-world usage, (3) a matching update to any relevant section in CLAUDE.md or copilot-instructions.md. Explanations must be concise (1–2 sentences), concrete (show the actual value, not a placeholder), and target the operator/bot-developer persona — not implementers. Avoid restating the field name; explain *why* it matters and what values are valid.
+- OpenAPI lens: Every route schema must produce a valid, self-contained OpenAPI 3.0 object — `operationId` derived from method + path, `summary` one sentence ≤ 10 words, `description` operator-facing (no internal implementation details), `tags` matching the module folder name. `servers[0]` must be `{url: '/'}` so Swagger UI "Try it out" works at any mapped port. All enum fields (`chain`, `network`, `chainNetwork`) must carry `examples` arrays including BSC. Response schemas must exactly mirror handler return types — divergence silently breaks Python client parsing. Never use `Type.Any()` in a route schema.
+- GitHub lens: Every commit on a feature branch must be atomic and conventional (`feat:`, `fix:`, `docs:`, `test:`, `chore:`). PR titles follow the same convention. Breaking changes append `!` to the type (`feat!:`). `pull_request.md` must be kept current — update it in the same commit as any functional change. Branch names use kebab-case prefixed by type (`feat-`, `fix-`). Never force-push to `development` or `main`. Squash-merge only; no merge commits on protected branches.
+
+- Build: `pnpm build`
+- Start server: `pnpm start --passphrase=<PASSPHRASE>`
+- Start in dev mode: `pnpm start --passphrase=<PASSPHRASE> --dev` (HTTP mode, no SSL)
+- Run all tests: `pnpm test`
+- Run specific test file: `GATEWAY_TEST_MODE=dev jest --runInBand path/to/file.test.ts`
+- Run tests with coverage: `pnpm test:cov`
+- Lint: `pnpm lint` / Format: `pnpm format` / Type check: `pnpm typecheck`
+
+## Architecture Overview
+
+- RESTful API gateway built with Fastify + TypeBox schemas (auto-generates Swagger at `/docs`)
+- Chain routes: `/chains/{chain}/{operation}` — e.g. `/chains/ethereum/balances`
+- Connector routes: `/connectors/{dex}/{type}/{operation}` — type is `router`, `amm`, or `clmm`
+- Wallet routes: `/wallet/*`
+- Config routes: `/config/*`
+- Chains are singletons: `Ethereum.getInstance(network)`, `Solana.getInstance(network)`
+- Connectors are singletons: `Pancakeswap.getInstance(network)`, `Uniswap.getInstance(network)`
+- `chain` = substrate (`ethereum` covers all EVM networks, `solana` covers all SVM networks)
+- `network` = specific network (`mainnet`, `bsc`, `arbitrum`, `base`, `mainnet-beta`, etc.)
+- `chainNetwork` = combined shorthand (`ethereum-bsc`, `ethereum-arbitrum`) parsed as `chain-network`
+
+## Coding Style
+
+- TypeScript, ESNext, CommonJS modules, 2-space indent, single quotes, semicolons required
+- TypeBox for all request/response schemas — no untyped `any` in route handlers
+- `logger` for all logging — never `console.log`
+- `fastify.httpErrors.*` for all API error responses — never throw raw `Error` from handlers
+- Unused variables prefixed with `_`
+- Tests required for all new functionality (min 75% coverage for PRs)
+- Test files mirror `src/` structure under `test/`; mocks live in `test/mocks/`
+
+## Swagger / OpenAPI Documentation
+
+Gateway auto-generates Swagger UI from TypeBox schemas via `@fastify/swagger` + `@fastify/swagger-ui`.
+
+- **Live UI**: `http://localhost:15888/docs` (dev mode) or `https://localhost:15888/docs` (production)
+- **JSON spec**: `GET /docs/json` — used to regenerate `openapi.json` at root
+- **Schema location**: All TypeBox schemas live in `src/schemas/`, `src/{module}/schemas.ts`, or inline in route files
+- Every route **must** declare `schema: { tags, summary, description, body/querystring, response }` — undecorated routes are invisible in Swagger
+- Use `description` on every `Type.Object` field to explain purpose, valid values, and format
+- `examples` arrays must include **BSC** alongside mainnet for every EVM `network` field: `['mainnet', 'bsc', 'arbitrum', 'base', 'polygon', 'avalanche']`
+- `chainNetwork` examples must put `ethereum-bsc` first after `ethereum-mainnet`: `['ethereum-mainnet', 'ethereum-bsc', 'ethereum-arbitrum', 'solana-mainnet-beta']`
+- `chain` field description must read: `'Blockchain substrate — use "ethereum" for all EVM networks (mainnet, BSC, Arbitrum, Base, Polygon, Avalanche), "solana" for all SVM networks'`
+- Response schemas must match actual handler return types exactly — mismatches silently break Hummingbot Python parsing
+- Tag groupings: `chains`, `connectors`, `wallet`, `config`, `pools`, `tokens` — use the tag matching the module folder
+- Never use `Type.Any()` in a route schema; prefer `Type.Unknown()` with a description if shape varies
+- After adding/changing schemas, run `pnpm build` and verify the route appears correctly in Swagger UI
+
+## Key Patterns
+
+- New wallet files: `JSON.stringify({ encryptedKey, network })` — always read with fallback to legacy raw string
+- `chainNetwork` parsing: `parts = val.split('-'); chain = parts[0]; network = parts.slice(1).join('-')`
+- Response extension: add optional fields alongside existing ones — never mutate existing field types
+- Route files live in `{module}/routes/{operation}.ts`, registered in `{module}.routes.ts`
+- Pool configs: `src/templates/pools/{connector}.json` — format: `{ type, network, baseSymbol, quoteSymbol, baseTokenAddress, quoteTokenAddress, feePct, address }`
diff --git a/CLAUDE.md b/CLAUDE.md
index 8f2a74ea2f..738b5aed85 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -1,8 +1,27 @@
 # AI Agent Instructions
 
 This file provides guidance to AI coding assistants when working with code in this repository.
+Keep this file in sync with `.github/copilot-instructions.md` — changes to one must be reflected in the other.
+
+## Lenses
+
+Apply all lenses before proposing any solution. Each lens constrains acceptable answers.
+
+- Hummingbot lens: Gateway is consumed by Hummingbot Python strategies via typed connector classes. API response shapes are parsed directly into Python dicts — breaking changes to field types or names silently corrupt live trading bots. Prefer additive changes (new optional fields) over mutations. `walletAddresses` must remain `string[]`. Use Tolerant Reader pattern for all response extensions.
+- Blockchain lens: The `chain` field is the technology substrate (ethereum = all EVM, solana = SVM). `network` is the L1/L2 brand discriminator (mainnet, bsc, arbitrum, base, polygon, avalanche). A wallet address is chain-scoped, not network-scoped — the same keypair works across all EVM networks. Wallet files are stored under `conf/wallets/<chain>/<address>.json` as `{encryptedKey, network}` JSON; legacy files contain a raw encrypted string and must be handled transparently.
+- System Architect lens: Routes follow `/{resource}/{operation}` REST conventions. Schemas are TypeBox objects auto-published to Swagger — every new field must be typed. Backwards compatibility is enforced via optional fields, never field removal or type mutation. Singleton pattern governs chain/connector instances (`getInstance(network)`). Error responses must use Fastify `httpErrors` — never throw raw errors from route handlers.
+- Bitcoin lens: Not directly supported, but cryptographic primitives (key derivation, encryption, signing) must remain chain-agnostic. Wallet encryption uses a passphrase-derived key stored outside source control. Never log or expose private keys or passphrases in any code path.
+- Jest lens: Mock external deps (fs, RPC, chains) — never write real files during tests. Test both happy paths and regressions. 100% coverage on utils, 75%+ on routes. Use `jest.mock()` for file/crypto ops. Parallel tests should not share state. Validate schema contracts before business logic. Every test suite must cover three categories: (1) **Happy paths** — expected utilization with valid inputs for all parameter combinations; (2) **Edge cases** — boundary values, legacy file formats, same-address-multi-network, empty arrays, zero amounts; (3) **Missing/invalid parameters** — each required field omitted independently, unrecognized chain/network values, neither `chain` nor `chainNetwork` provided, malformed `chainNetwork` strings. Route handler tests must assert the HTTP status code, not just the response body shape.
+- QA lens: Validate backwards compatibility at every response boundary. Legacy wallet files must parse identically. New optional fields should not break old consumers. Test migration scenarios: old wallets → new system, new fields with old clients. Regression suite covers all breaking-change-adjacent code paths.
+- Security lens: Never log or expose private keys, passphrases, mnemonic seeds, or decrypted values. All file I/O must use `getSafeWalletFilePath()` with sanitized inputs. Wallet encryption keys derive from passphrase outside source control. Validate address formats to prevent injection. All secrets must be stored in `conf/` outside repo.
+
+- Markdown lens: All `.md` files must render cleanly — headings surrounded by blank lines, lists surrounded by blank lines, fenced code blocks surrounded by blank lines, no bare URLs (wrap in angle brackets or `[text](url)`), no trailing spaces, consistent ATX-style headings (`##` not underline). PR descriptions, README sections, and CLAUDE.md must follow these rules. Use `<!--` comments only for meta-notes, never for hiding required content.
+- Documentation lens: Every public API change needs three things in the same commit — (1) updated TypeBox schema `description` fields visible in Swagger, (2) at minimum one Swagger `examples` entry showing BSC or the most common real-world usage, (3) a matching update to any relevant section in CLAUDE.md or copilot-instructions.md. Explanations must be concise (1–2 sentences), concrete (show the actual value, not a placeholder), and target the operator/bot-developer persona — not implementers. Avoid restating the field name; explain *why* it matters and what values are valid.
+- OpenAPI lens: Every route schema must produce a valid, self-contained OpenAPI 3.0 object — `operationId` derived from method + path, `summary` one sentence ≤ 10 words, `description` operator-facing (no internal implementation details), `tags` matching the module folder name. `servers[0]` must be `{url: '/'}` so Swagger UI "Try it out" works at any mapped port. All enum fields (`chain`, `network`, `chainNetwork`) must carry `examples` arrays including BSC. Response schemas must exactly mirror handler return types — divergence silently breaks Python client parsing. Never use `Type.Any()` in a route schema.
+- GitHub lens: Every commit on a feature branch must be atomic and conventional (`feat:`, `fix:`, `docs:`, `test:`, `chore:`). PR titles follow the same convention. Breaking changes append `!` to the type (`feat!:`). `pull_request.md` must be kept current — update it in the same commit as any functional change. Branch names use kebab-case prefixed by type (`feat-`, `fix-`). Never force-push to `development` or `main`. Squash-merge only; no merge commits on protected branches.
 
 ## Build & Command Reference
+
 - Build: `pnpm build`
 - Start server: `pnpm start --passphrase=<PASSPHRASE>`
 - Start in dev mode: `pnpm start --passphrase=<PASSPHRASE> --dev` (HTTP mode, no SSL)
@@ -19,6 +38,7 @@ This file provides guidance to AI coding assistants when working with code in th
 ## Architecture Overview
 
 ### Gateway Pattern
+
 - RESTful API gateway providing standardized endpoints for blockchain and DEX interactions
 - Built with Fastify framework using TypeBox for schema validation
 - Supports both HTTP (dev mode) and HTTPS (production) protocols
@@ -100,6 +120,23 @@ This file provides guidance to AI coding assistants when working with code in th
 - `conf/`: Runtime configuration (created by setup)
   - `tokens/`: Token lists for each network
 
+## Swagger / OpenAPI Documentation
+
+Gateway auto-generates Swagger UI from TypeBox schemas via `@fastify/swagger` + `@fastify/swagger-ui`.
+
+- **Live UI**: `http://localhost:15888/docs` (dev mode) or `https://localhost:15888/docs` (production)
+- **JSON spec**: `GET /docs/json` — used to regenerate `openapi.json` at root
+- **Schema location**: All TypeBox schemas live in `src/schemas/`, `src/{module}/schemas.ts`, or inline in route files
+- Every route **must** declare `schema: { tags, summary, description, body/querystring, response }` — undecorated routes are invisible in Swagger
+- Use `description` on every `Type.Object` field to explain purpose, valid values, and format
+- `examples` arrays must include **BSC** alongside mainnet for every EVM `network` field: `['mainnet', 'bsc', 'arbitrum', 'base', 'polygon', 'avalanche']`
+- `chainNetwork` examples must put `ethereum-bsc` first after `ethereum-mainnet`: `['ethereum-mainnet', 'ethereum-bsc', 'ethereum-arbitrum', 'solana-mainnet-beta']`
+- `chain` field description must read: `'Blockchain substrate — use "ethereum" for all EVM networks (mainnet, BSC, Arbitrum, Base, Polygon, Avalanche), "solana" for all SVM networks'`
+- Response schemas must match actual handler return types exactly — mismatches silently break Hummingbot Python parsing
+- Tag groupings: `chains`, `connectors`, `wallet`, `config`, `pools`, `tokens` — use the tag matching the module folder
+- Never use `Type.Any()` in a route schema; prefer `Type.Unknown()` with a description if shape varies
+- After adding/changing schemas, run `pnpm build` and verify the route appears correctly in Swagger UI
+
 ## Best Practices
 - Create tests for all new functionality (minimum 75% coverage for PRs)
 - Use the logger for debug/errors (not console.log)

From c3dc0b3cacdaad0f1a6106b8df89a43cf38737bd Mon Sep 17 00:00:00 2001
From: VeXHarbinger <alexpearlstein@gmail.com>
Date: Wed, 27 May 2026 18:45:43 -0400
Subject: [PATCH 2/5] feat: PancakeSwap V3 CLMM fixes, binCount pool-info

---
 src/chains/ethereum/ethereum.ts               |  46 +++--
 src/chains/ethereum/routes/approve.ts         |   2 +-
 .../meteora/clmm-routes/quoteSwap.ts          |   6 +-
 src/connectors/orca/clmm-routes/poolInfo.ts   |  19 +-
 src/connectors/orca/clmm-routes/quoteSwap.ts  |  11 +-
 src/connectors/orca/orca.utils.ts             |  76 ++++++-
 src/connectors/orca/schemas.ts                |  11 ++
 .../pancakeswap/clmm-routes/executeSwap.ts    |   6 +-
 .../pancakeswap/clmm-routes/poolInfo.ts       |  31 ++-
 .../pancakeswap/clmm-routes/positionsOwned.ts |  29 ++-
 .../pancakeswap/clmm-routes/quotePosition.ts  | 103 ++--------
 src/connectors/pancakeswap/schemas.ts         | 104 +++++++++-
 .../raydium/clmm-routes/poolInfo.ts           |  38 +++-
 src/connectors/raydium/raydium.utils.ts       | 128 ++++++++++++
 src/connectors/raydium/schemas.ts             |  11 ++
 .../uniswap/clmm-routes/poolInfo.ts           |  34 +++-
 src/connectors/uniswap/schemas.ts             |  13 +-
 src/connectors/uniswap/uniswap.utils.ts       | 126 +++++++++++-
 src/schemas/clmm-schema.ts                    |  25 ++-
 .../handle-transaction-execution.test.ts      | 121 ++++++++++++
 .../orca/clmm-routes/poolInfo.test.ts         |  68 +++++++
 .../orca/clmm-routes/quoteSwap.test.ts        |  86 ++++++++
 .../clmm-routes/execute-swap.test.ts          | 153 ++++++++++++++
 .../pancakeswap/clmm-routes/pool-info.test.ts | 150 ++++++++++++++
 .../clmm-routes/positions-owned.test.ts       | 169 ++++++++++++++++
 .../raydium/clmm-routes/poolInfo.test.ts      | 187 ++++++++++++++++++
 .../uniswap/clmm-routes/pool-info.test.ts     | 115 +++++++++++
 27 files changed, 1727 insertions(+), 141 deletions(-)
 create mode 100644 test/chains/ethereum/handle-transaction-execution.test.ts
 create mode 100644 test/connectors/pancakeswap/clmm-routes/execute-swap.test.ts
 create mode 100644 test/connectors/pancakeswap/clmm-routes/pool-info.test.ts
 create mode 100644 test/connectors/pancakeswap/clmm-routes/positions-owned.test.ts
 create mode 100644 test/connectors/raydium/clmm-routes/poolInfo.test.ts

diff --git a/src/chains/ethereum/ethereum.ts b/src/chains/ethereum/ethereum.ts
index 03f8b04266..92662df563 100644
--- a/src/chains/ethereum/ethereum.ts
+++ b/src/chains/ethereum/ethereum.ts
@@ -907,7 +907,8 @@ export class Ethereum {
   }
 
   public async handleTransactionExecution(tx: TransactionResponse): Promise<providers.TransactionReceipt | null> {
-    return await Promise.race([
+    // Race the standard confirmation wait against the configured timeout.
+    const raced = await Promise.race([
       tx.wait(1).then((receipt) => {
         // Transaction confirmed (status: 1) or failed/reverted (status: 0)
         logger.info(
@@ -915,17 +916,40 @@ export class Ethereum {
         );
         return receipt;
       }),
-      new Promise<null>((resolve) =>
-        setTimeout(() => {
-          // Timeout reached, transaction is still pending
-          // Return null to indicate pending - the caller should check for null
-          // Note: Do NOT return a fake receipt with status: 0, because in Ethereum
-          // receipt.status === 0 means "reverted/failed", not "pending"
-          logger.warn(`Transaction ${tx.hash} is still pending after timeout`);
-          resolve(null);
-        }, this._transactionExecutionTimeoutMs),
-      ),
+      new Promise<null>((resolve) => setTimeout(() => resolve(null), this._transactionExecutionTimeoutMs)),
     ]);
+    if (raced) {
+      return raced;
+    }
+
+    // Timed out — the transaction is broadcast but not yet confirmed. Ethereum
+    // blocks are ~12s, so a healthy tx can still need a few more blocks. Poll
+    // the receipt over an extended window before concluding it is genuinely
+    // pending; this avoids reporting a confirmed tx as a failure.
+    // Note: Do NOT return a fake receipt with status: 0 — in Ethereum
+    // receipt.status === 0 means "reverted/failed", not "pending".
+    const extraWindowMs = 90_000;
+    const pollIntervalMs = 5_000;
+    logger.warn(
+      `Transaction ${tx.hash} not confirmed within ${this._transactionExecutionTimeoutMs}ms — ` +
+        `polling for receipt up to a further ${extraWindowMs}ms`,
+    );
+    const deadline = Date.now() + extraWindowMs;
+    while (Date.now() < deadline) {
+      await new Promise((resolve) => setTimeout(resolve, pollIntervalMs));
+      const receipt = await this.getTransactionReceipt(tx.hash);
+      if (receipt) {
+        logger.info(
+          `Transaction ${tx.hash} ${receipt.status === 1 ? 'confirmed' : 'failed'} ` +
+            `in block ${receipt.blockNumber} (after extended poll)`,
+        );
+        return receipt;
+      }
+    }
+
+    // Genuinely still pending — caller must handle null.
+    logger.warn(`Transaction ${tx.hash} still pending after extended poll`);
+    return null;
   }
 
   /**
diff --git a/src/chains/ethereum/routes/approve.ts b/src/chains/ethereum/routes/approve.ts
index 90171c5700..342b605dfa 100644
--- a/src/chains/ethereum/routes/approve.ts
+++ b/src/chains/ethereum/routes/approve.ts
@@ -205,7 +205,7 @@ export async function approveEthereumToken(
         // Wait for the transaction to be mined with timeout (60 seconds for approvals)
         const receipt = await ethereum.handleTransactionExecution(tx);
 
-        if (receipt.status === -1) {
+        if (!receipt || receipt.status === -1) {
           throw new Error('Transaction timed out or failed to get receipt');
         }
 
diff --git a/src/connectors/meteora/clmm-routes/quoteSwap.ts b/src/connectors/meteora/clmm-routes/quoteSwap.ts
index 8473aa94ad..a312dd5077 100644
--- a/src/connectors/meteora/clmm-routes/quoteSwap.ts
+++ b/src/connectors/meteora/clmm-routes/quoteSwap.ts
@@ -98,7 +98,11 @@ async function formatSwapQuote(
     const maxAmountIn = DecimalUtil.fromBN(exactOutQuote.maxInAmount, inputToken.decimals).toNumber();
     const amountOut = DecimalUtil.fromBN(exactOutQuote.outAmount, outputToken.decimals).toNumber();
 
-    const price = amountOut / estimatedAmountIn;
+    // Always quote/base regardless of side. On BUY the input token is the
+    // quote and the output token is the base, so price = in/out = quote/base.
+    // The previous `amountOut / estimatedAmountIn` returned base/quote on BUY
+    // and quote/base on SELL — so BUY quotes appeared at a different scale.
+    const price = amountOut > 0 ? estimatedAmountIn / amountOut : 0;
 
     return {
       // Base QuoteSwapResponse fields in correct order
diff --git a/src/connectors/orca/clmm-routes/poolInfo.ts b/src/connectors/orca/clmm-routes/poolInfo.ts
index a84623aee5..17e650a350 100644
--- a/src/connectors/orca/clmm-routes/poolInfo.ts
+++ b/src/connectors/orca/clmm-routes/poolInfo.ts
@@ -7,12 +7,14 @@ import { Solana } from '../../../chains/solana/solana';
 import { GetPoolInfoRequestType, PoolInfo } from '../../../schemas/clmm-schema';
 import { logger } from '../../../services/logger';
 import { Orca } from '../orca';
+import { computeOrcaBinDistribution } from '../orca.utils';
 import { OrcaClmmGetPoolInfoRequest, OrcaPoolInfo, OrcaPoolInfoSchema } from '../schemas';
 
 export async function getPoolInfo(
   fastify: FastifyInstance,
   network: string,
   poolAddress: string,
+  binCount: number = 0,
 ): Promise<PoolInfo | OrcaPoolInfo> {
   const orca = await Orca.getInstance(network);
   if (!orca) {
@@ -74,6 +76,19 @@ export async function getPoolInfo(
     yieldOverTvl: apiPoolInfo?.yieldOverTvl ?? 0,
   };
 
+  if (binCount > 0) {
+    poolInfo.bins = await computeOrcaBinDistribution({
+      rpc: orca.solanaKitRpc,
+      poolAddress,
+      tickSpacing: whirlpool.tickSpacing,
+      currentTickIndex: whirlpool.tickCurrentIndex,
+      currentSqrtPrice: whirlpool.sqrtPrice,
+      decimalsA: mintA.data.decimals,
+      decimalsB: mintB.data.decimals,
+      binCount,
+    });
+  }
+
   return poolInfo;
 }
 
@@ -95,9 +110,9 @@ export const poolInfoRoute: FastifyPluginAsync = async (fastify) => {
     },
     async (request) => {
       try {
-        const { poolAddress } = request.query;
+        const { poolAddress, binCount = 0 } = request.query;
         const network = request.query.network;
-        return (await getPoolInfo(fastify, network, poolAddress)) as OrcaPoolInfo;
+        return (await getPoolInfo(fastify, network, poolAddress, binCount)) as OrcaPoolInfo;
       } catch (e) {
         logger.error(e);
         if (e.statusCode) {
diff --git a/src/connectors/orca/clmm-routes/quoteSwap.ts b/src/connectors/orca/clmm-routes/quoteSwap.ts
index 5a96da5fcd..ba39016c52 100644
--- a/src/connectors/orca/clmm-routes/quoteSwap.ts
+++ b/src/connectors/orca/clmm-routes/quoteSwap.ts
@@ -63,13 +63,22 @@ async function formatSwapQuote(
     slippagePct,
   );
 
+  // Always report price as quote/base regardless of side. The helper returns
+  // `executionPrice = outputAmount / inputAmount`, which is base/quote on BUY
+  // (input=quote, output=base) and quote/base on SELL — i.e. it flips with
+  // side. Reconstruct quote/base here so the response price has consistent
+  // units.
+  const baseAmount = side === 'BUY' ? quote.outputAmount : quote.inputAmount;
+  const quoteAmount = side === 'BUY' ? quote.inputAmount : quote.outputAmount;
+  const price = baseAmount > 0 ? quoteAmount / baseAmount : 0;
+
   return {
     poolAddress,
     tokenIn: quote.inputToken,
     tokenOut: quote.outputToken,
     amountIn: quote.inputAmount,
     amountOut: quote.outputAmount,
-    price: quote.price,
+    price,
     slippagePct,
     minAmountOut: quote.minOutputAmount,
     maxAmountIn: quote.maxInputAmount,
diff --git a/src/connectors/orca/orca.utils.ts b/src/connectors/orca/orca.utils.ts
index 33578590f1..e222358ba5 100644
--- a/src/connectors/orca/orca.utils.ts
+++ b/src/connectors/orca/orca.utils.ts
@@ -1,5 +1,12 @@
 import { TransactionBuilder } from '@orca-so/common-sdk';
-import { fetchAllTickArray, fetchOracle, fetchWhirlpool, getTickArrayAddress } from '@orca-so/whirlpools-client';
+import {
+  fetchAllTickArray,
+  fetchAllPositionWithFilter,
+  fetchOracle,
+  fetchWhirlpool,
+  getTickArrayAddress,
+  positionWhirlpoolFilter,
+} from '@orca-so/whirlpools-client';
 import {
   IncreaseLiquidityQuote,
   TransferFee,
@@ -10,6 +17,10 @@ import {
   priceToTickIndex,
   sqrtPriceToPrice,
   swapQuoteByInputToken,
+  tickIndexToPrice,
+  tickIndexToSqrtPrice,
+  tryGetAmountDeltaA,
+  tryGetAmountDeltaB,
 } from '@orca-so/whirlpools-core';
 import {
   ORCA_WHIRLPOOL_PROGRAM_ID,
@@ -702,3 +713,66 @@ export function getTickArrayPubkeys(
     ).publicKey,
   };
 }
+
+export interface OrcaBinDistributionEntry {
+  binId: number;
+  price: number;
+  baseTokenAmount: number;
+  quoteTokenAmount: number;
+}
+
+export async function computeOrcaBinDistribution(args: {
+  rpc: Parameters<typeof fetchAllPositionWithFilter>[0];
+  poolAddress: string;
+  tickSpacing: number;
+  currentTickIndex: number;
+  currentSqrtPrice: bigint;
+  decimalsA: number;
+  decimalsB: number;
+  binCount: number;
+}): Promise<OrcaBinDistributionEntry[]> {
+  const { rpc, poolAddress, tickSpacing, currentTickIndex, currentSqrtPrice, decimalsA, decimalsB, binCount } = args;
+  if (binCount <= 0) return [];
+
+  const positionAccounts = await fetchAllPositionWithFilter(rpc, positionWhirlpoolFilter(address(poolAddress)));
+
+  const halfBins = Math.floor(binCount / 2);
+  const snappedCurrent = Math.floor(currentTickIndex / tickSpacing) * tickSpacing;
+  const firstBinStart = snappedCurrent - halfBins * tickSpacing;
+  const scaleA = 10 ** decimalsA;
+  const scaleB = 10 ** decimalsB;
+
+  const bins: OrcaBinDistributionEntry[] = [];
+  for (let i = 0; i < binCount; i++) {
+    const tickStart = firstBinStart + i * tickSpacing;
+    const tickEnd = tickStart + tickSpacing;
+    let binL = 0n;
+    for (const account of positionAccounts) {
+      const p = account.data;
+      if (p.tickLowerIndex < tickEnd && p.tickUpperIndex > tickStart) {
+        binL += p.liquidity;
+      }
+    }
+    let rawA = 0n;
+    let rawB = 0n;
+    if (binL > 0n) {
+      const sqrtA = tickIndexToSqrtPrice(tickStart);
+      const sqrtB = tickIndexToSqrtPrice(tickEnd);
+      if (currentTickIndex >= tickEnd) {
+        rawB = tryGetAmountDeltaB(sqrtA, sqrtB, binL, false);
+      } else if (currentTickIndex < tickStart) {
+        rawA = tryGetAmountDeltaA(sqrtA, sqrtB, binL, false);
+      } else {
+        rawA = tryGetAmountDeltaA(currentSqrtPrice, sqrtB, binL, false);
+        rawB = tryGetAmountDeltaB(sqrtA, currentSqrtPrice, binL, false);
+      }
+    }
+    bins.push({
+      binId: tickStart,
+      price: tickIndexToPrice(tickStart, decimalsA, decimalsB),
+      baseTokenAmount: Number(rawA) / scaleA,
+      quoteTokenAmount: Number(rawB) / scaleB,
+    });
+  }
+  return bins;
+}
diff --git a/src/connectors/orca/schemas.ts b/src/connectors/orca/schemas.ts
index 3aebf5f2a2..f20ab3f12c 100644
--- a/src/connectors/orca/schemas.ts
+++ b/src/connectors/orca/schemas.ts
@@ -425,7 +425,18 @@ export const OrcaClmmGetPoolInfoRequest = Type.Object({
     description: 'Orca CLMM pool address',
     examples: [CLMM_POOL_ADDRESS_EXAMPLE],
   }),
+  binCount: Type.Optional(
+    Type.Integer({
+      description:
+        'If > 0, include a `bins` array (per-tickSpacing token amounts around the current tick). ' +
+        'Default 0 — pool-info skips the extra getProgramAccounts call.',
+      default: 0,
+      minimum: 0,
+      maximum: 401,
+    }),
+  ),
 });
+export type OrcaClmmGetPoolInfoRequestType = Static<typeof OrcaClmmGetPoolInfoRequest>;
 
 // Orca CLMM Get Position Info Request
 export const OrcaClmmGetPositionInfoRequest = Type.Object({
diff --git a/src/connectors/pancakeswap/clmm-routes/executeSwap.ts b/src/connectors/pancakeswap/clmm-routes/executeSwap.ts
index 9a9d345a36..6bbb19fb98 100644
--- a/src/connectors/pancakeswap/clmm-routes/executeSwap.ts
+++ b/src/connectors/pancakeswap/clmm-routes/executeSwap.ts
@@ -1,4 +1,3 @@
-import { encodeSqrtRatioX96 } from '@uniswap/v3-sdk';
 import { BigNumber, Contract, utils } from 'ethers';
 import { FastifyPluginAsync } from 'fastify';
 
@@ -106,10 +105,7 @@ export async function executeClmmSwap(
     amountOut: 0,
     amountInMaximum: 0,
     amountOutMinimum: 0,
-    sqrtPriceLimitX96: encodeSqrtRatioX96(
-      quote.trade.executionPrice.numerator,
-      quote.trade.executionPrice.denominator,
-    ).toString(),
+    sqrtPriceLimitX96: 0,
   };
 
   let receipt;
diff --git a/src/connectors/pancakeswap/clmm-routes/poolInfo.ts b/src/connectors/pancakeswap/clmm-routes/poolInfo.ts
index 8efd314f11..bfb55c597a 100644
--- a/src/connectors/pancakeswap/clmm-routes/poolInfo.ts
+++ b/src/connectors/pancakeswap/clmm-routes/poolInfo.ts
@@ -1,13 +1,20 @@
 import { FastifyPluginAsync, FastifyInstance } from 'fastify';
+import JSBI from 'jsbi';
 
 import { GetPoolInfoRequestType, PoolInfo, PoolInfoSchema } from '../../../schemas/clmm-schema';
 import { logger } from '../../../services/logger';
 import { sanitizeErrorMessage } from '../../../services/sanitize';
+import { computeUniswapBinDistribution } from '../../uniswap/uniswap.utils';
 import { Pancakeswap } from '../pancakeswap';
 import { formatTokenAmount, getPancakeswapPoolInfo } from '../pancakeswap.utils';
 import { PancakeswapClmmGetPoolInfoRequest } from '../schemas';
 
-export async function getPoolInfo(fastify: FastifyInstance, network: string, poolAddress: string): Promise<PoolInfo> {
+export async function getPoolInfo(
+  fastify: FastifyInstance,
+  network: string,
+  poolAddress: string,
+  binCount: number = 0,
+): Promise<PoolInfo> {
   const pancakeswap = await Pancakeswap.getInstance(network);
 
   if (!poolAddress) {
@@ -52,7 +59,7 @@ export async function getPoolInfo(fastify: FastifyInstance, network: string, poo
   const tickSpacing = pool.tickSpacing;
   const activeBinId = pool.tickCurrent;
 
-  return {
+  const result: PoolInfo = {
     address: poolAddress,
     baseTokenAddress: baseTokenObj.address,
     quoteTokenAddress: quoteTokenObj.address,
@@ -63,6 +70,22 @@ export async function getPoolInfo(fastify: FastifyInstance, network: string, poo
     quoteTokenAmount: quoteTokenAmount,
     activeBinId: activeBinId,
   };
+
+  if (binCount > 0) {
+    result.bins = await computeUniswapBinDistribution({
+      poolAddress,
+      network,
+      tickSpacing,
+      currentTick: activeBinId,
+      sqrtPriceX96: JSBI.BigInt(pool.sqrtRatioX96.toString()),
+      decimalsBase: baseTokenObj.decimals,
+      decimalsQuote: quoteTokenObj.decimals,
+      isBaseToken0,
+      binCount,
+    });
+  }
+
+  return result;
 }
 
 export const poolInfoRoute: FastifyPluginAsync = async (fastify) => {
@@ -83,9 +106,9 @@ export const poolInfoRoute: FastifyPluginAsync = async (fastify) => {
     },
     async (request): Promise<PoolInfo> => {
       try {
-        const { poolAddress } = request.query;
+        const { poolAddress, binCount = 0 } = request.query;
         const network = request.query.network;
-        return await getPoolInfo(fastify, network, poolAddress);
+        return await getPoolInfo(fastify, network, poolAddress, binCount);
       } catch (e) {
         logger.error(e);
         if (e.statusCode) {
diff --git a/src/connectors/pancakeswap/clmm-routes/positionsOwned.ts b/src/connectors/pancakeswap/clmm-routes/positionsOwned.ts
index 85d4cbacb6..fd4cf2dadc 100644
--- a/src/connectors/pancakeswap/clmm-routes/positionsOwned.ts
+++ b/src/connectors/pancakeswap/clmm-routes/positionsOwned.ts
@@ -16,8 +16,23 @@ import { formatTokenAmount } from '../pancakeswap.utils';
 
 // Define the request and response types
 const PositionsOwnedRequest = Type.Object({
-  network: Type.Optional(Type.String({ examples: ['bsc'], default: 'bsc' })),
-  walletAddress: Type.String({ examples: ['<ethereum-wallet-address>'] }),
+  network: Type.Optional(
+    Type.String({
+      description: 'EVM network to use — PancakeSwap V3 is primarily deployed on BSC',
+      examples: ['bsc'],
+      default: 'bsc',
+    }),
+  ),
+  walletAddress: Type.String({
+    description: 'EVM wallet address to query for PancakeSwap V3 NFT positions',
+    examples: ['0xYourWalletAddressHere'],
+  }),
+  activeOnly: Type.Optional(
+    Type.Boolean({
+      default: false,
+      description: 'When true, only return positions with active liquidity (liquidity > 0)',
+    }),
+  ),
 });
 
 const PositionsOwnedResponse = Type.Array(PositionInfoSchema);
@@ -47,6 +62,7 @@ export async function getPositionsOwned(
   fastify: FastifyInstance,
   network: string,
   walletAddress?: string,
+  activeOnly: boolean = false,
 ): Promise<PositionInfo[]> {
   const pancakeswap = await Pancakeswap.getInstance(network);
   const ethereum = await Ethereum.getInstance(network);
@@ -79,7 +95,7 @@ export async function getPositionsOwned(
       const tokenId = await positionManager.tokenOfOwnerByIndex(walletAddress, i);
       const positionDetails = await positionManager.positions(tokenId);
 
-      if (positionDetails.liquidity.eq(0)) {
+      if (activeOnly && positionDetails.liquidity.eq(0)) {
         continue;
       }
 
@@ -99,9 +115,7 @@ export async function getPositionsOwned(
         liquidity: positionDetails.liquidity.toString(),
       });
 
-      const isBaseToken0 =
-        token0.symbol === 'WETH' ||
-        (token1.symbol !== 'WETH' && token0.address.toLowerCase() < token1.address.toLowerCase());
+      const isBaseToken0 = token0.address.toLowerCase() < token1.address.toLowerCase();
 
       positions.push({
         address: tokenId.toString(),
@@ -172,7 +186,8 @@ export const positionsOwnedRoute: FastifyPluginAsync = async (fastify) => {
       try {
         const { walletAddress } = request.query;
         const network = request.query.network;
-        return await getPositionsOwned(fastify, network, walletAddress);
+        const activeOnly = request.query.activeOnly ?? false;
+        return await getPositionsOwned(fastify, network, walletAddress, activeOnly);
       } catch (e) {
         logger.error(e);
         if (e.statusCode) {
diff --git a/src/connectors/pancakeswap/clmm-routes/quotePosition.ts b/src/connectors/pancakeswap/clmm-routes/quotePosition.ts
index 801ec25937..5e5ff53b18 100644
--- a/src/connectors/pancakeswap/clmm-routes/quotePosition.ts
+++ b/src/connectors/pancakeswap/clmm-routes/quotePosition.ts
@@ -1,4 +1,4 @@
-import { Position, nearestUsableTick, tickToPrice } from '@pancakeswap/v3-sdk';
+import { Position, nearestUsableTick } from '@pancakeswap/v3-sdk';
 import { utils } from 'ethers';
 import { FastifyPluginAsync } from 'fastify';
 import JSBI from 'jsbi';
@@ -106,12 +106,6 @@ export const quotePositionRoute: FastifyPluginAsync = async (fastify) => {
         // Calculate ticks based on price
         // Tick = log(price) / log(1.0001)
 
-        console.log('DEBUG: isBaseToken0:', isBaseToken0);
-        console.log('DEBUG: baseToken symbol:', baseTokenObj.symbol, 'address:', baseTokenObj.address);
-        console.log('DEBUG: quoteToken symbol:', quoteTokenObj.symbol, 'address:', quoteTokenObj.address);
-        console.log('DEBUG: token0:', token0.symbol, 'address:', token0.address);
-        console.log('DEBUG: token1:', token1.symbol, 'address:', token1.address);
-
         // CRITICAL INSIGHT: The pool's negative tick is confusing us!
         // The pool tick of -197547 actually represents the current price correctly
         // but in a way that seems counterintuitive.
@@ -128,9 +122,6 @@ export const quotePositionRoute: FastifyPluginAsync = async (fastify) => {
         // - So token1/token0 in raw units = (2637 * 10^6) / 10^18 = 2637 * 10^-12
         // - This is a very small number! Hence the negative tick.
 
-        console.log('DEBUG: Current pool tick:', pool.tickCurrent);
-        console.log('DEBUG: This tick represents token1/token0 in RAW UNITS (not human readable)');
-
         // When calculating ticks from human-readable prices, we need to account for decimals
         const priceToTickWithDecimals = (humanPrice: number): number => {
           // Convert human price (USDC per WETH) to raw price (USDC units per WETH unit)
@@ -141,40 +132,11 @@ export const quotePositionRoute: FastifyPluginAsync = async (fastify) => {
         lowerTick = priceToTickWithDecimals(lowerPrice);
         upperTick = priceToTickWithDecimals(upperPrice);
 
-        const currentHumanPrice = 2637; // Approximate current price
-        const expectedCurrentTick = priceToTickWithDecimals(currentHumanPrice);
-        console.log('DEBUG: Expected current tick for price', currentHumanPrice, ':', expectedCurrentTick);
-        console.log('DEBUG: Lower price', lowerPrice, '-> tick', lowerTick);
-        console.log('DEBUG: Upper price', upperPrice, '-> tick', upperTick);
-
-        console.log('DEBUG: Raw calculated lowerTick:', lowerTick);
-        console.log('DEBUG: Raw calculated upperTick:', upperTick);
-
         // Ensure ticks are on valid tick spacing boundaries
         const tickSpacing = pool.tickSpacing;
         lowerTick = nearestUsableTick(lowerTick, tickSpacing);
         upperTick = nearestUsableTick(upperTick, tickSpacing);
 
-        console.log('DEBUG: Adjusted lowerTick (after tick spacing):', lowerTick);
-        console.log('DEBUG: Adjusted upperTick (after tick spacing):', upperTick);
-        console.log('DEBUG: Pool tick spacing:', tickSpacing);
-        console.log('DEBUG: Current pool tick:', pool.tickCurrent);
-        console.log('DEBUG: Pool current price (sqrtPriceX96):', pool.sqrtRatioX96.toString());
-
-        // Calculate the actual price from sqrtPriceX96
-        const sqrtPriceX96 = JSBI.toNumber(JSBI.BigInt(pool.sqrtRatioX96.toString()));
-        const price = Math.pow(sqrtPriceX96 / Math.pow(2, 96), 2);
-        console.log('DEBUG: Pool current price (decimal):', price);
-        console.log(
-          'DEBUG: Pool current price (token1/token0):',
-          price * Math.pow(10, token0.decimals - token1.decimals),
-        );
-
-        // Use SDK to convert tick to price for verification
-        const tickPrice = tickToPrice(token0, token1, pool.tickCurrent);
-        console.log('DEBUG: Price from current tick:', tickPrice.toSignificant(6));
-        console.log('DEBUG: Price from current tick (inverted):', tickPrice.invert().toSignificant(6));
-
         // Ensure lower < upper
         if (lowerTick >= upperTick) {
           throw httpErrors.badRequest('Lower price must be less than upper price');
@@ -186,17 +148,9 @@ export const quotePositionRoute: FastifyPluginAsync = async (fastify) => {
         console.log('DEBUG: Position will require both tokens?', isInRange);
 
         if (!isInRange) {
-          console.log('WARNING: Position is out of range!');
-          console.log(
-            '  Current tick:',
-            pool.tickCurrent,
-            'is',
-            pool.tickCurrent < lowerTick ? 'below' : 'above',
-            'the range',
-          );
-          console.log(
-            '  This means the position will only contain',
-            pool.tickCurrent < lowerTick ? baseTokenObj.symbol : quoteTokenObj.symbol,
+          logger.warn(
+            `Position is out of range. Current tick: ${pool.tickCurrent}, range: [${lowerTick}, ${upperTick}]. ` +
+              `Position will only contain ${pool.tickCurrent < lowerTick ? baseTokenObj.symbol : quoteTokenObj.symbol}.`,
           );
         }
 
@@ -204,12 +158,7 @@ export const quotePositionRoute: FastifyPluginAsync = async (fastify) => {
         let position: Position;
         let baseLimited = false;
 
-        console.log('DEBUG: Input amounts:');
-        console.log('  - baseTokenAmount:', baseTokenAmount);
-        console.log('  - quoteTokenAmount:', quoteTokenAmount);
-
         if (baseTokenAmount !== undefined && quoteTokenAmount !== undefined) {
-          console.log('DEBUG: Using fromAmounts (both amounts provided)');
           // Both amounts provided - use fromAmounts to calculate optimal position
           // Use parseUnits to avoid scientific notation issues with large numbers
           const baseAmountRaw = JSBI.BigInt(
@@ -219,15 +168,8 @@ export const quotePositionRoute: FastifyPluginAsync = async (fastify) => {
             utils.parseUnits(quoteTokenAmount.toString(), quoteTokenObj.decimals).toString(),
           );
 
-          console.log('DEBUG: Raw amounts:');
-          console.log('  - baseAmountRaw:', baseAmountRaw.toString());
-          console.log('  - quoteAmountRaw:', quoteAmountRaw.toString());
-          console.log('  - baseToken decimals:', baseTokenObj.decimals);
-          console.log('  - quoteToken decimals:', quoteTokenObj.decimals);
-
           // Create position from both amounts
           if (isBaseToken0) {
-            console.log('DEBUG: Creating position with base as token0');
             position = Position.fromAmounts({
               pool,
               tickLower: lowerTick,
@@ -237,7 +179,6 @@ export const quotePositionRoute: FastifyPluginAsync = async (fastify) => {
               useFullPrecision: true,
             });
           } else {
-            console.log('DEBUG: Creating position with base as token1');
             position = Position.fromAmounts({
               pool,
               tickLower: lowerTick,
@@ -257,17 +198,13 @@ export const quotePositionRoute: FastifyPluginAsync = async (fastify) => {
 
           baseLimited = baseRatio <= quoteRatio;
         } else if (baseTokenAmount !== undefined) {
-          console.log('DEBUG: Using fromAmount (only base amount provided)');
           // Only base amount provided
           // Use parseUnits to avoid scientific notation issues with large numbers
           const baseAmountRaw = JSBI.BigInt(
             utils.parseUnits(baseTokenAmount.toString(), baseTokenObj.decimals).toString(),
           );
 
-          console.log('DEBUG: baseAmountRaw:', baseAmountRaw.toString());
-
           if (isBaseToken0) {
-            console.log('DEBUG: Creating position from amount0 (base is token0)');
             position = Position.fromAmount0({
               pool,
               tickLower: lowerTick,
@@ -276,7 +213,6 @@ export const quotePositionRoute: FastifyPluginAsync = async (fastify) => {
               useFullPrecision: true,
             });
           } else {
-            console.log('DEBUG: Creating position from amount1 (base is token1)');
             position = Position.fromAmount1({
               pool,
               tickLower: lowerTick,
@@ -286,17 +222,13 @@ export const quotePositionRoute: FastifyPluginAsync = async (fastify) => {
           }
           baseLimited = true;
         } else if (quoteTokenAmount !== undefined) {
-          console.log('DEBUG: Using fromAmount (only quote amount provided)');
           // Only quote amount provided
           // Use parseUnits to avoid scientific notation issues with large numbers
           const quoteAmountRaw = JSBI.BigInt(
             utils.parseUnits(quoteTokenAmount.toString(), quoteTokenObj.decimals).toString(),
           );
 
-          console.log('DEBUG: quoteAmountRaw:', quoteAmountRaw.toString());
-
           if (isBaseToken0) {
-            console.log('DEBUG: Creating position from amount1 (quote is token1)');
             position = Position.fromAmount1({
               pool,
               tickLower: lowerTick,
@@ -304,7 +236,6 @@ export const quotePositionRoute: FastifyPluginAsync = async (fastify) => {
               amount1: quoteAmountRaw.toString(),
             });
           } else {
-            console.log('DEBUG: Creating position from amount0 (quote is token0)');
             position = Position.fromAmount0({
               pool,
               tickLower: lowerTick,
@@ -324,15 +255,6 @@ export const quotePositionRoute: FastifyPluginAsync = async (fastify) => {
         const actualToken0Amount = position.amount0;
         const actualToken1Amount = position.amount1;
 
-        console.log('DEBUG: Position created with:');
-        console.log('  - liquidity:', position.liquidity.toString());
-        console.log('  - amount0 (raw):', actualToken0Amount.quotient.toString());
-        console.log('  - amount1 (raw):', actualToken1Amount.quotient.toString());
-        console.log('  - amount0 (formatted):', actualToken0Amount.toSignificant(18));
-        console.log('  - amount1 (formatted):', actualToken1Amount.toSignificant(18));
-        console.log('  - mintAmounts.amount0:', position.mintAmounts.amount0.toString());
-        console.log('  - mintAmounts.amount1:', position.mintAmounts.amount1.toString());
-
         // Calculate actual amounts in human-readable form
         let actualBaseAmount, actualQuoteAmount;
 
@@ -344,11 +266,6 @@ export const quotePositionRoute: FastifyPluginAsync = async (fastify) => {
           actualQuoteAmount = parseFloat(actualToken0Amount.toSignificant(18));
         }
 
-        console.log('DEBUG: Final amounts:');
-        console.log('  - actualBaseAmount:', actualBaseAmount);
-        console.log('  - actualQuoteAmount:', actualQuoteAmount);
-        console.log('  - baseLimited:', baseLimited);
-
         // Calculate max amounts
         const baseTokenAmountMax = baseTokenAmount || actualBaseAmount;
         const quoteTokenAmountMax = quoteTokenAmount || actualQuoteAmount;
@@ -454,8 +371,10 @@ export async function quotePosition(
 
   if (baseTokenAmount !== undefined && quoteTokenAmount !== undefined) {
     // Both amounts provided - use fromAmounts to calculate optimal position
-    const baseAmountRaw = JSBI.BigInt(Math.floor(baseTokenAmount * Math.pow(10, baseTokenObj.decimals)).toString());
-    const quoteAmountRaw = JSBI.BigInt(Math.floor(quoteTokenAmount * Math.pow(10, quoteTokenObj.decimals)).toString());
+    const baseAmountRaw = JSBI.BigInt(utils.parseUnits(baseTokenAmount.toString(), baseTokenObj.decimals).toString());
+    const quoteAmountRaw = JSBI.BigInt(
+      utils.parseUnits(quoteTokenAmount.toString(), quoteTokenObj.decimals).toString(),
+    );
 
     // Create position from both amounts
     if (isBaseToken0) {
@@ -488,7 +407,7 @@ export async function quotePosition(
     baseLimited = baseRatio <= quoteRatio;
   } else if (baseTokenAmount !== undefined) {
     // Only base amount provided
-    const baseAmountRaw = JSBI.BigInt(Math.floor(baseTokenAmount * Math.pow(10, baseTokenObj.decimals)).toString());
+    const baseAmountRaw = JSBI.BigInt(utils.parseUnits(baseTokenAmount.toString(), baseTokenObj.decimals).toString());
 
     if (isBaseToken0) {
       position = Position.fromAmount0({
@@ -509,7 +428,9 @@ export async function quotePosition(
     baseLimited = true;
   } else if (quoteTokenAmount !== undefined) {
     // Only quote amount provided
-    const quoteAmountRaw = JSBI.BigInt(Math.floor(quoteTokenAmount * Math.pow(10, quoteTokenObj.decimals)).toString());
+    const quoteAmountRaw = JSBI.BigInt(
+      utils.parseUnits(quoteTokenAmount.toString(), quoteTokenObj.decimals).toString(),
+    );
 
     if (isBaseToken0) {
       position = Position.fromAmount1({
diff --git a/src/connectors/pancakeswap/schemas.ts b/src/connectors/pancakeswap/schemas.ts
index f3bc36f8ad..38912f2e62 100644
--- a/src/connectors/pancakeswap/schemas.ts
+++ b/src/connectors/pancakeswap/schemas.ts
@@ -1,4 +1,4 @@
-import { Type } from '@sinclair/typebox';
+import { Type, Static } from '@sinclair/typebox';
 
 import { getEthereumChainConfig } from '../../chains/ethereum/ethereum.config';
 
@@ -49,7 +49,18 @@ export const PancakeswapClmmGetPoolInfoRequest = Type.Object({
     description: 'Pancakeswap V3 pool address',
     examples: [CLMM_POOL_ADDRESS_EXAMPLE],
   }),
+  binCount: Type.Optional(
+    Type.Integer({
+      description:
+        'If > 0, include a `bins` array (per-tickSpacing token amounts around the current tick). ' +
+        'Default 0 — pool-info skips the extra eth_call.',
+      default: 0,
+      minimum: 0,
+      maximum: 401,
+    }),
+  ),
 });
+export type PancakeswapClmmGetPoolInfoRequestType = Static<typeof PancakeswapClmmGetPoolInfoRequest>;
 
 // ========================================
 // Router Request Schemas
@@ -591,3 +602,94 @@ export const PancakeswapClmmExecuteSwapRequest = Type.Object({
     }),
   ),
 });
+
+const POSITION_ID_EXAMPLE = '1234';
+
+export const MasterchefKnowsPoolRequest = Type.Object({
+  network: Type.Optional(
+    Type.String({
+      description: 'The EVM network to use',
+      default: 'bsc',
+      examples: ['bsc'],
+      enum: [...PancakeswapConfig.networks],
+    }),
+  ),
+  poolAddress: Type.String({
+    description: 'PancakeSwap V3 pool address to check against MasterChef',
+    examples: ['0x172fcd41e0913e95784454622d1c3724f546f849'],
+  }),
+});
+export type MasterchefKnowsPoolRequestType = Static<typeof MasterchefKnowsPoolRequest>;
+
+export const MasterchefKnowsPoolResponse = Type.Object({
+  registered: Type.Boolean({ description: 'Whether the pool is registered in MasterChef V3' }),
+  pid: Type.Optional(Type.Number({ description: 'MasterChef pool ID (present when registered)' })),
+});
+export type MasterchefKnowsPoolResponseType = Static<typeof MasterchefKnowsPoolResponse>;
+
+export const MasterchefStakeRequest = Type.Object({
+  network: Type.Optional(
+    Type.String({
+      description: 'The EVM network to use',
+      default: 'bsc',
+      examples: ['bsc'],
+      enum: [...PancakeswapConfig.networks],
+    }),
+  ),
+  walletAddress: Type.Optional(Type.String({ description: 'Wallet address that owns the NFT position' })),
+  tokenId: Type.String({ description: 'NFT position token ID to stake', examples: [POSITION_ID_EXAMPLE] }),
+});
+export type MasterchefStakeRequestType = Static<typeof MasterchefStakeRequest>;
+
+export const MasterchefStakeResponse = Type.Object({
+  signature: Type.String({ description: 'Transaction hash of the stake transaction' }),
+  status: Type.Number({ description: 'Transaction status (1 = success)' }),
+  tokenId: Type.String({ description: 'NFT position token ID that was staked' }),
+  fee: Type.String({ description: 'Gas fee paid for the transaction in native token' }),
+});
+export type MasterchefStakeResponseType = Static<typeof MasterchefStakeResponse>;
+
+export const MasterchefUnstakeRequest = Type.Object({
+  network: Type.Optional(
+    Type.String({
+      description: 'The EVM network to use',
+      default: 'bsc',
+      examples: ['bsc'],
+      enum: [...PancakeswapConfig.networks],
+    }),
+  ),
+  walletAddress: Type.Optional(Type.String({ description: 'Wallet address that owns the staked NFT position' })),
+  tokenId: Type.String({ description: 'NFT position token ID to unstake', examples: [POSITION_ID_EXAMPLE] }),
+});
+export type MasterchefUnstakeRequestType = Static<typeof MasterchefUnstakeRequest>;
+
+export const MasterchefUnstakeResponse = Type.Object({
+  signature: Type.String({ description: 'Transaction hash of the unstake transaction' }),
+  status: Type.Number({ description: 'Transaction status (1 = success)' }),
+  tokenId: Type.String({ description: 'NFT position token ID that was unstaked' }),
+  fee: Type.String({ description: 'Gas fee paid for the transaction in native token' }),
+});
+export type MasterchefUnstakeResponseType = Static<typeof MasterchefUnstakeResponse>;
+
+export const MasterchefUnstakeAndCloseRequest = Type.Object({
+  network: Type.Optional(
+    Type.String({
+      description: 'The EVM network to use',
+      default: 'bsc',
+      examples: ['bsc'],
+      enum: [...PancakeswapConfig.networks],
+    }),
+  ),
+  walletAddress: Type.Optional(Type.String({ description: 'Wallet address that owns the staked NFT position' })),
+  tokenId: Type.String({ description: 'NFT position token ID to unstake and close', examples: [POSITION_ID_EXAMPLE] }),
+});
+export type MasterchefUnstakeAndCloseRequestType = Static<typeof MasterchefUnstakeAndCloseRequest>;
+
+export const MasterchefUnstakeAndCloseResponse = Type.Object({
+  unstakeSignature: Type.String({ description: 'Transaction hash of the unstake transaction' }),
+  closeSignature: Type.String({ description: 'Transaction hash of the close transaction' }),
+  status: Type.Number({ description: 'Final transaction status (1 = success)' }),
+  tokenId: Type.String({ description: 'NFT position token ID that was unstaked and closed' }),
+  fee: Type.String({ description: 'Total gas fee paid for both transactions in native token' }),
+});
+export type MasterchefUnstakeAndCloseResponseType = Static<typeof MasterchefUnstakeAndCloseResponse>;
diff --git a/src/connectors/raydium/clmm-routes/poolInfo.ts b/src/connectors/raydium/clmm-routes/poolInfo.ts
index ea355dbf4f..7e5a509e8d 100644
--- a/src/connectors/raydium/clmm-routes/poolInfo.ts
+++ b/src/connectors/raydium/clmm-routes/poolInfo.ts
@@ -1,12 +1,19 @@
+import BN from 'bn.js';
 import { FastifyPluginAsync, FastifyInstance } from 'fastify';
 
 import { Solana } from '../../../chains/solana/solana';
 import { GetPoolInfoRequestType, PoolInfo, PoolInfoSchema } from '../../../schemas/clmm-schema';
 import { logger } from '../../../services/logger';
 import { Raydium } from '../raydium';
+import { computeRaydiumBinDistribution } from '../raydium.utils';
 import { RaydiumClmmGetPoolInfoRequest } from '../schemas';
 
-export async function getPoolInfo(fastify: FastifyInstance, network: string, poolAddress: string): Promise<PoolInfo> {
+export async function getPoolInfo(
+  fastify: FastifyInstance,
+  network: string,
+  poolAddress: string,
+  binCount: number = 0,
+): Promise<PoolInfo> {
   const raydium = await Raydium.getInstance(network);
 
   if (!poolAddress) {
@@ -19,6 +26,31 @@ export async function getPoolInfo(fastify: FastifyInstance, network: string, poo
     throw fastify.httpErrors.notFound(`Pool not found: ${poolAddress}`);
   }
 
+  if (binCount > 0) {
+    try {
+      const apiResult = await raydium.getClmmPoolfromAPI(poolAddress);
+      const rawPool = await raydium.getClmmPoolfromRPC(poolAddress);
+      if (apiResult && rawPool) {
+        const [apiPoolInfo, poolKeys] = apiResult;
+        const solana = await Solana.getInstance(network);
+        poolInfo.bins = await computeRaydiumBinDistribution({
+          connection: solana.connection,
+          poolInfo: apiPoolInfo,
+          poolKeys,
+          tickSpacing: Number(rawPool.tickSpacing),
+          currentTick: Number(rawPool.tickCurrent),
+          currentSqrtPriceX64: new BN(rawPool.sqrtPriceX64.toString()),
+          activeLiquidity: new BN(rawPool.liquidity.toString()),
+          decimalsA: rawPool.mintDecimalsA,
+          decimalsB: rawPool.mintDecimalsB,
+          binCount,
+        });
+      }
+    } catch (e) {
+      logger.warn(`Failed to compute bin distribution for ${poolAddress}: ${e}`);
+    }
+  }
+
   return poolInfo;
 }
 
@@ -40,9 +72,9 @@ export const poolInfoRoute: FastifyPluginAsync = async (fastify) => {
     },
     async (request): Promise<PoolInfo> => {
       try {
-        const { poolAddress } = request.query;
+        const { poolAddress, binCount = 0 } = request.query;
         const network = request.query.network;
-        return await getPoolInfo(fastify, network, poolAddress);
+        return await getPoolInfo(fastify, network, poolAddress, binCount);
       } catch (e) {
         logger.error(e);
         if (e.statusCode) throw e;
diff --git a/src/connectors/raydium/raydium.utils.ts b/src/connectors/raydium/raydium.utils.ts
index dff06cf351..38ef508e2c 100644
--- a/src/connectors/raydium/raydium.utils.ts
+++ b/src/connectors/raydium/raydium.utils.ts
@@ -5,8 +5,18 @@ import {
   DEVNET_PROGRAM_ID,
   CREATE_CPMM_POOL_PROGRAM,
   DEV_CREATE_CPMM_POOL_PROGRAM,
+  PoolUtils,
+  TickUtils,
+  ApiV3PoolInfoConcentratedItem,
+  ClmmKeys,
 } from '@raydium-io/raydium-sdk-v2';
+import { Connection, PublicKey } from '@solana/web3.js';
+import BN from 'bn.js';
 
+import { logger } from '../../services/logger';
+
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const { SqrtPriceMath, LiquidityMath } = require('@raydium-io/raydium-sdk-v2');
 const VALID_AMM_PROGRAM_ID = new Set([
   AMM_V4.toBase58(),
   AMM_STABLE.toBase58(),
@@ -40,3 +50,121 @@ export const findPoolAddress = (
   // Pools are now managed separately, return null for dynamic pool discovery
   return null;
 };
+
+export interface RaydiumBinDistributionEntry {
+  binId: number;
+  price: number;
+  baseTokenAmount: number;
+  quoteTokenAmount: number;
+}
+
+export async function computeRaydiumBinDistribution(args: {
+  connection: Connection;
+  poolInfo: ApiV3PoolInfoConcentratedItem;
+  poolKeys: ClmmKeys;
+  tickSpacing: number;
+  currentTick: number;
+  currentSqrtPriceX64: BN;
+  activeLiquidity: BN;
+  decimalsA: number;
+  decimalsB: number;
+  binCount: number;
+}): Promise<RaydiumBinDistributionEntry[]> {
+  const {
+    connection,
+    poolInfo,
+    poolKeys,
+    tickSpacing,
+    currentTick,
+    currentSqrtPriceX64,
+    activeLiquidity,
+    decimalsA,
+    decimalsB,
+    binCount,
+  } = args;
+  if (binCount <= 0) return [];
+
+  const halfBins = Math.floor(binCount / 2);
+  const snapped = Math.floor(currentTick / tickSpacing) * tickSpacing;
+  const firstBinStart = snapped - halfBins * tickSpacing;
+  const boundaries: number[] = [];
+  for (let i = 0; i <= binCount; i++) {
+    boundaries.push(firstBinStart + i * tickSpacing);
+  }
+
+  let clmmPoolInfo: any;
+  let tickCache: any;
+  try {
+    clmmPoolInfo = await PoolUtils.fetchComputeClmmInfo({ connection, poolInfo });
+    tickCache = await PoolUtils.fetchMultiplePoolTickArrays({
+      connection,
+      poolKeys: [clmmPoolInfo],
+    });
+  } catch (e) {
+    logger.warn(`Raydium bin fetch failed for ${poolInfo.id}: ${e}`);
+    return [];
+  }
+  const poolTickArrays = tickCache?.[poolInfo.id.toString()] ?? tickCache?.[poolInfo.id] ?? {};
+
+  const programId = new PublicKey(poolInfo.programId);
+  const poolId = new PublicKey(poolInfo.id);
+  void programId;
+  void poolId;
+  void poolKeys;
+
+  const tickAt = (tickIndex: number): { liquidityNet: BN } => {
+    try {
+      const startIndex = TickUtils.getTickArrayStartIndexByTick(tickIndex, tickSpacing);
+      const arr = poolTickArrays[startIndex];
+      if (!arr || !arr.ticks) return { liquidityNet: new BN(0) };
+      const offset = TickUtils.getTickOffsetInArray(tickIndex, tickSpacing);
+      const t = arr.ticks?.[offset];
+      if (!t || !t.liquidityNet) return { liquidityNet: new BN(0) };
+      return { liquidityNet: t.liquidityNet };
+    } catch {
+      return { liquidityNet: new BN(0) };
+    }
+  };
+
+  const curIdx = Math.floor((currentTick - firstBinStart) / tickSpacing);
+
+  const binLs: BN[] = new Array(binCount);
+  binLs[curIdx] = activeLiquidity;
+  for (let i = curIdx + 1; i < binCount; i++) {
+    binLs[i] = binLs[i - 1].add(tickAt(boundaries[i]).liquidityNet);
+  }
+  for (let i = curIdx - 1; i >= 0; i--) {
+    binLs[i] = binLs[i + 1].sub(tickAt(boundaries[i + 1]).liquidityNet);
+  }
+
+  const scaleA = Math.pow(10, decimalsA);
+  const scaleB = Math.pow(10, decimalsB);
+  const zero = new BN(0);
+  const bins: RaydiumBinDistributionEntry[] = [];
+  for (let i = 0; i < binCount; i++) {
+    const tickStart = boundaries[i];
+    const tickEnd = boundaries[i + 1];
+    const L = binLs[i];
+    let rawA: BN = zero;
+    let rawB: BN = zero;
+    if (L.gt(zero)) {
+      const sqrtA: BN = SqrtPriceMath.getSqrtPriceX64FromTick(tickStart);
+      const sqrtB: BN = SqrtPriceMath.getSqrtPriceX64FromTick(tickEnd);
+      if (currentTick >= tickEnd) {
+        rawB = LiquidityMath.getTokenAmountBFromLiquidity(sqrtA, sqrtB, L, false);
+      } else if (currentTick < tickStart) {
+        rawA = LiquidityMath.getTokenAmountAFromLiquidity(sqrtA, sqrtB, L, false);
+      } else {
+        rawA = LiquidityMath.getTokenAmountAFromLiquidity(currentSqrtPriceX64, sqrtB, L, false);
+        rawB = LiquidityMath.getTokenAmountBFromLiquidity(sqrtA, currentSqrtPriceX64, L, false);
+      }
+    }
+    bins.push({
+      binId: tickStart,
+      price: Math.pow(1.0001, tickStart) * Math.pow(10, decimalsA - decimalsB),
+      baseTokenAmount: parseFloat(rawA.toString()) / scaleA,
+      quoteTokenAmount: parseFloat(rawB.toString()) / scaleB,
+    });
+  }
+  return bins;
+}
diff --git a/src/connectors/raydium/schemas.ts b/src/connectors/raydium/schemas.ts
index 68fa2d86c7..99655e207d 100644
--- a/src/connectors/raydium/schemas.ts
+++ b/src/connectors/raydium/schemas.ts
@@ -264,7 +264,18 @@ export const RaydiumClmmGetPoolInfoRequest = Type.Object({
     description: 'Raydium CLMM pool address',
     examples: [CLMM_POOL_ADDRESS_EXAMPLE],
   }),
+  binCount: Type.Optional(
+    Type.Integer({
+      description:
+        'If > 0, include a `bins` array (per-tickSpacing token amounts around the current tick). ' +
+        'Default 0 — pool-info skips the extra tick fetch.',
+      default: 0,
+      minimum: 0,
+      maximum: 401,
+    }),
+  ),
 });
+export type RaydiumClmmGetPoolInfoRequestType = Static<typeof RaydiumClmmGetPoolInfoRequest>;
 
 export const RaydiumClmmGetPositionInfoRequest = Type.Object({
   network: Type.Optional(
diff --git a/src/connectors/uniswap/clmm-routes/poolInfo.ts b/src/connectors/uniswap/clmm-routes/poolInfo.ts
index 482b6ad48c..827e879d7b 100644
--- a/src/connectors/uniswap/clmm-routes/poolInfo.ts
+++ b/src/connectors/uniswap/clmm-routes/poolInfo.ts
@@ -1,5 +1,6 @@
 import { FeeAmount } from '@uniswap/v3-sdk';
 import { FastifyPluginAsync, FastifyInstance } from 'fastify';
+import JSBI from 'jsbi';
 
 import { Ethereum } from '../../../chains/ethereum/ethereum';
 import { GetPoolInfoRequestType, PoolInfo, PoolInfoSchema } from '../../../schemas/clmm-schema';
@@ -7,9 +8,14 @@ import { logger } from '../../../services/logger';
 import { sanitizeErrorMessage } from '../../../services/sanitize';
 import { UniswapClmmGetPoolInfoRequest } from '../schemas';
 import { Uniswap } from '../uniswap';
-import { formatTokenAmount, getUniswapPoolInfo } from '../uniswap.utils';
-
-export async function getPoolInfo(fastify: FastifyInstance, network: string, poolAddress: string): Promise<PoolInfo> {
+import { formatTokenAmount, getUniswapPoolInfo, computeUniswapBinDistribution } from '../uniswap.utils';
+
+export async function getPoolInfo(
+  fastify: FastifyInstance,
+  network: string,
+  poolAddress: string,
+  binCount: number = 0,
+): Promise<PoolInfo> {
   const uniswap = await Uniswap.getInstance(network);
 
   if (!poolAddress) {
@@ -75,7 +81,7 @@ export async function getPoolInfo(fastify: FastifyInstance, network: string, poo
   // Get active tick/bin
   const activeBinId = pool.tickCurrent;
 
-  return {
+  const result: PoolInfo = {
     address: poolAddress,
     baseTokenAddress: baseTokenObj.address,
     quoteTokenAddress: quoteTokenObj.address,
@@ -86,6 +92,22 @@ export async function getPoolInfo(fastify: FastifyInstance, network: string, poo
     quoteTokenAmount: quoteTokenAmount,
     activeBinId: activeBinId,
   };
+
+  if (binCount > 0) {
+    result.bins = await computeUniswapBinDistribution({
+      poolAddress,
+      network,
+      tickSpacing,
+      currentTick: activeBinId,
+      sqrtPriceX96: JSBI.BigInt(sqrtPriceX96.toString()),
+      decimalsBase: baseTokenObj.decimals,
+      decimalsQuote: quoteTokenObj.decimals,
+      isBaseToken0,
+      binCount,
+    });
+  }
+
+  return result;
 }
 
 export const poolInfoRoute: FastifyPluginAsync = async (fastify) => {
@@ -106,9 +128,9 @@ export const poolInfoRoute: FastifyPluginAsync = async (fastify) => {
     },
     async (request): Promise<PoolInfo> => {
       try {
-        const { poolAddress } = request.query;
+        const { poolAddress, binCount = 0 } = request.query;
         const network = request.query.network;
-        return await getPoolInfo(fastify, network, poolAddress);
+        return await getPoolInfo(fastify, network, poolAddress, binCount);
       } catch (e) {
         logger.error(e);
         if (e.statusCode) {
diff --git a/src/connectors/uniswap/schemas.ts b/src/connectors/uniswap/schemas.ts
index d13da9357d..f339a547c7 100644
--- a/src/connectors/uniswap/schemas.ts
+++ b/src/connectors/uniswap/schemas.ts
@@ -1,4 +1,4 @@
-import { Type } from '@sinclair/typebox';
+import { Type, Static } from '@sinclair/typebox';
 
 import { getEthereumChainConfig } from '../../chains/ethereum/ethereum.config';
 
@@ -48,7 +48,18 @@ export const UniswapClmmGetPoolInfoRequest = Type.Object({
     description: 'Uniswap V3 pool address',
     examples: [CLMM_POOL_ADDRESS_EXAMPLE],
   }),
+  binCount: Type.Optional(
+    Type.Integer({
+      description:
+        'If > 0, include a `bins` array (per-tickSpacing token amounts around the current tick). ' +
+        'Default 0 — pool-info skips the extra eth_call.',
+      default: 0,
+      minimum: 0,
+      maximum: 401,
+    }),
+  ),
 });
+export type UniswapClmmGetPoolInfoRequestType = Static<typeof UniswapClmmGetPoolInfoRequest>;
 
 // ========================================
 // Router Request Schemas
diff --git a/src/connectors/uniswap/uniswap.utils.ts b/src/connectors/uniswap/uniswap.utils.ts
index bdfa833c6d..298f3d7197 100644
--- a/src/connectors/uniswap/uniswap.utils.ts
+++ b/src/connectors/uniswap/uniswap.utils.ts
@@ -2,7 +2,7 @@ import { Contract } from '@ethersproject/contracts';
 import { Token } from '@uniswap/sdk-core';
 import { Pair as V2Pair } from '@uniswap/v2-sdk';
 import { abi as IUniswapV3PoolABI } from '@uniswap/v3-core/artifacts/contracts/interfaces/IUniswapV3Pool.sol/IUniswapV3Pool.json';
-import { FeeAmount, Pool as V3Pool } from '@uniswap/v3-sdk';
+import { FeeAmount, Pool as V3Pool, SqrtPriceMath, TickMath } from '@uniswap/v3-sdk';
 import { FastifyInstance } from 'fastify';
 import JSBI from 'jsbi';
 
@@ -301,3 +301,127 @@ export async function getUniswapPoolInfo(
 
   return getV3PoolInfo(poolAddress, network);
 }
+
+export interface UniswapBinDistributionEntry {
+  binId: number;
+  price: number;
+  baseTokenAmount: number;
+  quoteTokenAmount: number;
+}
+
+export async function computeUniswapBinDistribution(args: {
+  poolAddress: string;
+  network: string;
+  tickSpacing: number;
+  currentTick: number;
+  sqrtPriceX96: JSBI;
+  decimalsBase: number;
+  decimalsQuote: number;
+  isBaseToken0: boolean;
+  binCount: number;
+}): Promise<UniswapBinDistributionEntry[]> {
+  const {
+    poolAddress,
+    network,
+    tickSpacing,
+    currentTick,
+    sqrtPriceX96,
+    decimalsBase,
+    decimalsQuote,
+    isBaseToken0,
+    binCount,
+  } = args;
+  if (binCount <= 0) return [];
+
+  const ethereum = await Ethereum.getInstance(network);
+
+  // Fetch slot0 and liquidity for tick data via pool contract
+  const poolContract = new Contract(poolAddress, IUniswapV3PoolABI, ethereum.provider);
+
+  const halfBins = Math.floor(binCount / 2);
+  const snapped = Math.floor(currentTick / tickSpacing) * tickSpacing;
+  const firstBinStart = snapped - halfBins * tickSpacing;
+  const scaleBase = Math.pow(10, decimalsBase);
+  const scaleQuote = Math.pow(10, decimalsQuote);
+
+  // Fetch liquidityNet for each tick boundary in range
+  const boundaries: number[] = [];
+  for (let i = 0; i <= binCount; i++) {
+    boundaries.push(firstBinStart + i * tickSpacing);
+  }
+
+  // Fetch ticks in parallel (batched)
+  const tickDataMap: Record<number, JSBI> = {};
+  const tickResults = await Promise.allSettled(
+    boundaries.map(async (tick) => {
+      try {
+        const t = await poolContract.ticks(tick);
+        return { tick, liquidityNet: JSBI.BigInt(t.liquidityNet.toString()) };
+      } catch {
+        return { tick, liquidityNet: JSBI.BigInt(0) };
+      }
+    }),
+  );
+  for (const r of tickResults) {
+    if (r.status === 'fulfilled') {
+      tickDataMap[r.value.tick] = r.value.liquidityNet;
+    }
+  }
+
+  // Fetch active liquidity
+  let activeLiquidity: JSBI;
+  try {
+    const liq = await poolContract.liquidity();
+    activeLiquidity = JSBI.BigInt(liq.toString());
+  } catch {
+    activeLiquidity = JSBI.BigInt(0);
+  }
+
+  const curIdx = Math.floor((currentTick - firstBinStart) / tickSpacing);
+  const binLs: JSBI[] = new Array(binCount);
+  binLs[curIdx] = activeLiquidity;
+  for (let i = curIdx + 1; i < binCount; i++) {
+    const ln = tickDataMap[boundaries[i]] ?? JSBI.BigInt(0);
+    binLs[i] = JSBI.add(binLs[i - 1], ln);
+  }
+  for (let i = curIdx - 1; i >= 0; i--) {
+    const ln = tickDataMap[boundaries[i + 1]] ?? JSBI.BigInt(0);
+    binLs[i] = JSBI.subtract(binLs[i + 1], ln);
+  }
+
+  const bins: UniswapBinDistributionEntry[] = [];
+  for (let i = 0; i < binCount; i++) {
+    const tickStart = boundaries[i];
+    const tickEnd = boundaries[i + 1];
+    const L = binLs[i];
+    let rawA = JSBI.BigInt(0);
+    let rawB = JSBI.BigInt(0);
+    if (JSBI.greaterThan(L, JSBI.BigInt(0))) {
+      const sqrtA = TickMath.getSqrtRatioAtTick(tickStart);
+      const sqrtB = TickMath.getSqrtRatioAtTick(tickEnd);
+      if (currentTick >= tickEnd) {
+        rawB = SqrtPriceMath.getAmount1Delta(sqrtA, sqrtB, L, false);
+      } else if (currentTick < tickStart) {
+        rawA = SqrtPriceMath.getAmount0Delta(sqrtA, sqrtB, L, false);
+      } else {
+        rawA = SqrtPriceMath.getAmount0Delta(sqrtPriceX96, sqrtB, L, false);
+        rawB = SqrtPriceMath.getAmount1Delta(sqrtA, sqrtPriceX96, L, false);
+      }
+    }
+    // token0 may be base or quote depending on pool ordering
+    const token0Amount = parseFloat(rawA.toString()) / (isBaseToken0 ? scaleBase : scaleQuote);
+    const token1Amount = parseFloat(rawB.toString()) / (isBaseToken0 ? scaleQuote : scaleBase);
+    const baseTokenAmount = isBaseToken0 ? token0Amount : token1Amount;
+    const quoteTokenAmount = isBaseToken0 ? token1Amount : token0Amount;
+    const priceRaw =
+      Math.pow(1.0001, tickStart) *
+      Math.pow(10, isBaseToken0 ? decimalsBase - decimalsQuote : decimalsQuote - decimalsBase);
+    bins.push({
+      binId: tickStart,
+      price: isBaseToken0 ? 1 / priceRaw : priceRaw,
+      baseTokenAmount,
+      quoteTokenAmount,
+    });
+  }
+  return bins;
+}
diff --git a/src/schemas/clmm-schema.ts b/src/schemas/clmm-schema.ts
index ddf2e5a819..6b4ebaf927 100644
--- a/src/schemas/clmm-schema.ts
+++ b/src/schemas/clmm-schema.ts
@@ -74,10 +74,12 @@ export type GetPositionsOwnedRequestType = Static<typeof GetPositionsOwnedReques
 
 export const BinLiquiditySchema = Type.Object(
   {
-    binId: Type.Number(),
-    price: Type.Number(),
-    baseTokenAmount: Type.Number(),
-    quoteTokenAmount: Type.Number(),
+    binId: Type.Number({
+      description: 'Tick index (Uniswap/PancakeSwap/Orca) or bin index (Meteora/Raydium) identifying this price bucket',
+    }),
+    price: Type.Number({ description: 'Mid-price of this bin expressed as quoteToken per baseToken' }),
+    baseTokenAmount: Type.Number({ description: 'Amount of base token liquidity in this bin' }),
+    quoteTokenAmount: Type.Number({ description: 'Amount of quote token liquidity in this bin' }),
   },
   { $id: 'BinLiquidity' },
 );
@@ -95,6 +97,12 @@ export const PoolInfoSchema = Type.Object(
     baseTokenAmount: Type.Number(),
     quoteTokenAmount: Type.Number(),
     activeBinId: Type.Number(),
+    bins: Type.Optional(
+      Type.Array(BinLiquiditySchema, {
+        description:
+          'Per-tick liquidity distribution around the active tick. Present only when binCount > 0 was requested.',
+      }),
+    ),
   },
   { $id: 'PoolInfo' },
 );
@@ -108,7 +116,6 @@ export const MeteoraPoolInfoSchema = Type.Composite(
       dynamicFeePct: Type.Number(),
       minBinId: Type.Number(),
       maxBinId: Type.Number(),
-      bins: Type.Optional(Type.Array(BinLiquiditySchema)),
     }),
   ],
   { $id: 'MeteoraPoolInfo' },
@@ -119,6 +126,14 @@ export const GetPoolInfoRequest = Type.Object(
   {
     network: Type.Optional(Type.String()),
     poolAddress: Type.String(),
+    binCount: Type.Optional(
+      Type.Integer({
+        description: 'If > 0, include a `bins` array of per-tick token amounts. Default 0.',
+        default: 0,
+        minimum: 0,
+        maximum: 401,
+      }),
+    ),
   },
   { $id: 'GetPoolInfoRequest' },
 );
diff --git a/test/chains/ethereum/handle-transaction-execution.test.ts b/test/chains/ethereum/handle-transaction-execution.test.ts
new file mode 100644
index 0000000000..ea85387460
--- /dev/null
+++ b/test/chains/ethereum/handle-transaction-execution.test.ts
@@ -0,0 +1,121 @@
+/**
+ * Unit tests for Ethereum.handleTransactionExecution.
+ *
+ * The method races tx.wait(1) against a configured timeout.  If the timeout
+ * fires first it enters an extended poll window (90 s, polling every 5 s)
+ * before returning null.  Tests use fake timers so nothing waits in real time.
+ *
+ * Regression: Before PR #642 the extended poll was absent — a tx that took
+ * longer than 30 s was silently dropped.  And approve.ts crashed with
+ * TypeError when receipt was null (receipt.status dereference).
+ */
+
+// Isolate module so the constructor never runs.  We build a minimal prototype
+// instance via Object.create to exercise the real method body.
+jest.mock('../../../src/chains/ethereum/ethereum', () => {
+  const actual = jest.requireActual('../../../src/chains/ethereum/ethereum');
+  return actual;
+});
+
+import { Ethereum } from '../../../src/chains/ethereum/ethereum';
+
+// Logger is imported transitively; silence it to keep test output clean.
+jest.mock('../../../src/services/logger', () => ({
+  logger: { info: jest.fn(), warn: jest.fn(), error: jest.fn(), debug: jest.fn() },
+  redactUrl: (u: string) => u,
+}));
+
+// --- helpers ----------------------------------------------------------------
+
+function makeEthereumStub(timeoutMs: number, getReceiptImpl: jest.Mock): any {
+  const stub: any = Object.create(Ethereum.prototype);
+  // Private field accessed directly (TS private is compile-time only).
+  stub._transactionExecutionTimeoutMs = timeoutMs;
+  stub.getTransactionReceipt = getReceiptImpl;
+  return stub;
+}
+
+function makeMockTx(waitImpl: jest.Mock): any {
+  return { hash: '0xdeadbeef', wait: waitImpl };
+}
+
+const MOCK_RECEIPT = {
+  transactionHash: '0xdeadbeef',
+  status: 1,
+  blockNumber: 12345678,
+  gasUsed: { mul: jest.fn(), toString: () => '21000' },
+  effectiveGasPrice: { toString: () => '1000000000' },
+};
+
+// ---------------------------------------------------------------------------
+
+describe('Ethereum.handleTransactionExecution', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  // ── Happy path: tx confirms before timeout ─────────────────────────────────
+
+  it('returns receipt immediately when tx confirms before timeout', async () => {
+    const ethereum = makeEthereumStub(30_000, jest.fn());
+    const mockTx = makeMockTx(jest.fn().mockResolvedValue(MOCK_RECEIPT));
+
+    const result = await ethereum.handleTransactionExecution(mockTx);
+
+    expect(result).toEqual(MOCK_RECEIPT);
+    // Extended-poll should not have been attempted.
+    expect(ethereum.getTransactionReceipt).not.toHaveBeenCalled();
+  });
+
+  // ── Extended poll: receipt found during the extra window ──────────────────
+
+  it('returns receipt found during extended poll window', async () => {
+    jest.useFakeTimers();
+    try {
+      // A very short initial timeout so the race loses instantly.
+      const ethereum = makeEthereumStub(
+        0,
+        jest
+          .fn()
+          .mockResolvedValueOnce(null) // first poll → still pending
+          .mockResolvedValue(MOCK_RECEIPT), // second poll → confirmed
+      );
+      // tx.wait never resolves, simulating a slow transaction.
+      const mockTx = makeMockTx(jest.fn().mockReturnValue(new Promise(() => {})));
+
+      const promise = ethereum.handleTransactionExecution(mockTx);
+
+      // Fire the initial 0 ms timeout so Promise.race picks the null path.
+      await jest.runAllTimersAsync();
+
+      const result = await promise;
+      expect(result).toEqual(MOCK_RECEIPT);
+      expect(ethereum.getTransactionReceipt).toHaveBeenCalledWith('0xdeadbeef');
+    } finally {
+      jest.useRealTimers();
+    }
+  });
+
+  // ── Extended poll exhausted: returns null cleanly ─────────────────────────
+
+  it('returns null when tx is still pending after the full extended poll window', async () => {
+    jest.useFakeTimers();
+    try {
+      const ethereum = makeEthereumStub(0, jest.fn().mockResolvedValue(null));
+      const mockTx = makeMockTx(jest.fn().mockReturnValue(new Promise(() => {})));
+
+      const promise = ethereum.handleTransactionExecution(mockTx);
+
+      // Advance through the full 90 s extended window (18 × 5000 ms polls).
+      await jest.runAllTimersAsync();
+
+      const result = await promise;
+      expect(result).toBeNull();
+      // The handler must return null — not throw a TypeError or any other error.
+      // (Regression: the absence of null caused TypeError: Cannot read properties
+      //  of null when approve.ts accessed receipt.status without a null guard.)
+    } finally {
+      jest.useRealTimers();
+    }
+  });
+});
diff --git a/test/connectors/orca/clmm-routes/poolInfo.test.ts b/test/connectors/orca/clmm-routes/poolInfo.test.ts
index 2854d78ba6..34e86ada90 100644
--- a/test/connectors/orca/clmm-routes/poolInfo.test.ts
+++ b/test/connectors/orca/clmm-routes/poolInfo.test.ts
@@ -6,6 +6,9 @@ import { fastifyWithTypeProvider } from '../../../utils/testUtils';
 
 jest.mock('../../../../src/connectors/orca/orca');
 jest.mock('../../../../src/chains/solana/solana');
+jest.mock('../../../../src/connectors/orca/orca.utils', () => ({
+  computeOrcaBinDistribution: jest.fn(),
+}));
 jest.mock('@solana-program/token-2022', () => ({
   fetchAllMint: jest.fn(),
 }));
@@ -295,4 +298,69 @@ describe('GET /pool-info', () => {
     expect(body).toHaveProperty('feePct', 0.01);
     expect(body).toHaveProperty('binStep', 1);
   });
+
+  describe('binCount parameter', () => {
+    it('returns pool info without bins when binCount is not provided', async () => {
+      const response = await app.inject({
+        method: 'GET',
+        url: '/pool-info',
+        query: { network: 'mainnet-beta', poolAddress: mockPoolAddress },
+      });
+
+      expect(response.statusCode).toBe(200);
+      const body = JSON.parse(response.body);
+      expect(body.bins).toBeUndefined();
+    });
+
+    it('returns pool info without bins when binCount=0', async () => {
+      const response = await app.inject({
+        method: 'GET',
+        url: '/pool-info',
+        query: { network: 'mainnet-beta', poolAddress: mockPoolAddress, binCount: '0' },
+      });
+
+      expect(response.statusCode).toBe(200);
+      const body = JSON.parse(response.body);
+      expect(body.bins).toBeUndefined();
+    });
+
+    it('returns bins array of correct length when binCount=10', async () => {
+      const { computeOrcaBinDistribution } = require('../../../../src/connectors/orca/orca.utils');
+      const mockBins = Array.from({ length: 10 }, (_, i) => ({
+        binId: mockWhirlpool.tickCurrentIndex - 300 + i * 64,
+        price: 200 + i * 0.5,
+        baseTokenAmount: 50,
+        quoteTokenAmount: 10000,
+      }));
+      (computeOrcaBinDistribution as jest.Mock).mockResolvedValue(mockBins);
+
+      const response = await app.inject({
+        method: 'GET',
+        url: '/pool-info',
+        query: { network: 'mainnet-beta', poolAddress: mockPoolAddress, binCount: '10' },
+      });
+
+      expect(response.statusCode).toBe(200);
+      const body = JSON.parse(response.body);
+      expect(Array.isArray(body.bins)).toBe(true);
+      expect(body.bins).toHaveLength(10);
+      expect(body.bins[0]).toHaveProperty('binId');
+      expect(body.bins[0]).toHaveProperty('price');
+      expect(body.bins[0]).toHaveProperty('baseTokenAmount');
+      expect(body.bins[0]).toHaveProperty('quoteTokenAmount');
+      expect(computeOrcaBinDistribution).toHaveBeenCalledWith(
+        expect.objectContaining({ binCount: 10, poolAddress: mockPoolAddress }),
+      );
+    });
+
+    it('returns 400 when binCount exceeds maximum (401)', async () => {
+      const response = await app.inject({
+        method: 'GET',
+        url: '/pool-info',
+        query: { network: 'mainnet-beta', poolAddress: mockPoolAddress, binCount: '402' },
+      });
+
+      expect(response.statusCode).toBe(400);
+    });
+  });
 });
diff --git a/test/connectors/orca/clmm-routes/quoteSwap.test.ts b/test/connectors/orca/clmm-routes/quoteSwap.test.ts
index e80bd836fe..13c27a8a8f 100644
--- a/test/connectors/orca/clmm-routes/quoteSwap.test.ts
+++ b/test/connectors/orca/clmm-routes/quoteSwap.test.ts
@@ -317,4 +317,90 @@ describe('GET /quote-swap', () => {
       expect(response.statusCode).toBeGreaterThanOrEqual(400);
     });
   });
+
+  describe('price unit consistency (regression: BUY-side inversion fix)', () => {
+    // The price field must always be expressed as quoteToken per baseToken,
+    // regardless of which side the swap is on. Before the fix, BUY-side quotes
+    // returned baseToken/quoteToken — a ~40000x difference for SOL/USDC.
+
+    beforeEach(() => {
+      // Re-establish the Solana mock — a previous validation test overrides it
+      // with a null-returning stub and doesn't restore it.
+      const mockSolana = {
+        getToken: jest.fn().mockImplementation((symbol: string) => {
+          if (symbol === 'SOL' || symbol === mockBaseTokenInfo.address) return mockBaseTokenInfo;
+          if (symbol === 'USDC' || symbol === mockQuoteTokenInfo.address) return mockQuoteTokenInfo;
+          return null;
+        }),
+      };
+      (Solana.getInstance as jest.Mock).mockResolvedValue(mockSolana);
+
+      // Clear any unconsumed "once" overrides left over from the error-handling
+      // describe (mockRejectedValueOnce wasn't consumed because that test's route
+      // call threw a 400 before reaching getOrcaSwapQuote).
+      const { getOrcaSwapQuote } = require('../../../../src/connectors/orca/orca.utils');
+      (getOrcaSwapQuote as jest.Mock).mockReset();
+      (getOrcaSwapQuote as jest.Mock).mockResolvedValue(mockSwapQuote);
+    });
+
+    it('SELL price is quoteToken/baseToken (USDC per SOL)', async () => {
+      // SELL 1 SOL → receive 200 USDC ⇒ price should be 200 (USDC/SOL)
+      const { getOrcaSwapQuote } = require('../../../../src/connectors/orca/orca.utils');
+      (getOrcaSwapQuote as jest.Mock).mockResolvedValue({
+        ...mockSwapQuote,
+        inputAmount: 1.0, // base (SOL) sold
+        outputAmount: 200, // quote (USDC) received
+      });
+
+      const response = await app.inject({
+        method: 'GET',
+        url: '/quote-swap',
+        query: {
+          network: 'mainnet-beta',
+          baseToken: 'SOL',
+          quoteToken: 'USDC',
+          amount: 1.0,
+          side: 'SELL',
+          poolAddress: mockPoolAddress,
+        },
+      });
+
+      expect(response.statusCode).toBe(200);
+      const body = JSON.parse(response.body);
+      // price = outputAmount / inputAmount = 200 / 1 = 200
+      expect(body.price).toBeCloseTo(200, 4);
+    });
+
+    it('BUY price is quoteToken/baseToken (USDC per SOL) — same scale as SELL', async () => {
+      // BUY 1 SOL for 200 USDC. Swap helper returns: input=200 USDC, output=1 SOL
+      // Before fix: price = outputAmount/inputAmount = 1/200 = 0.005 (WRONG)
+      // After fix:  price = inputAmount/outputAmount = 200/1 = 200 (CORRECT)
+      const { getOrcaSwapQuote } = require('../../../../src/connectors/orca/orca.utils');
+      (getOrcaSwapQuote as jest.Mock).mockResolvedValue({
+        ...mockSwapQuote,
+        inputAmount: 200, // quote (USDC) spent
+        outputAmount: 1.0, // base (SOL) received
+      });
+
+      const response = await app.inject({
+        method: 'GET',
+        url: '/quote-swap',
+        query: {
+          network: 'mainnet-beta',
+          baseToken: 'SOL',
+          quoteToken: 'USDC',
+          amount: 1.0,
+          side: 'BUY',
+          poolAddress: mockPoolAddress,
+        },
+      });
+
+      expect(response.statusCode).toBe(200);
+      const body = JSON.parse(response.body);
+      // price = quoteAmount / baseAmount = inputAmount / outputAmount = 200 / 1 = 200
+      expect(body.price).toBeCloseTo(200, 4);
+      // Regression guard: the pre-fix value was ~0.005 (base/quote, inverted)
+      expect(body.price).toBeGreaterThan(1);
+    });
+  });
 });
diff --git a/test/connectors/pancakeswap/clmm-routes/execute-swap.test.ts b/test/connectors/pancakeswap/clmm-routes/execute-swap.test.ts
new file mode 100644
index 0000000000..125a717d43
--- /dev/null
+++ b/test/connectors/pancakeswap/clmm-routes/execute-swap.test.ts
@@ -0,0 +1,153 @@
+/**
+ * execute-swap.test.ts
+ *
+ * Regression tests for the sqrtPriceLimitX96 BigInt conversion fix in executeSwap.ts.
+ * The bug: passing executionPrice numerator/denominator (JSBI values from PancakeSwap SDK)
+ * to @uniswap/v3-sdk's encodeSqrtRatioX96 caused a cross-SDK JSBI type mismatch,
+ * manifesting as "Cannot convert X to BigInt". The fix sets sqrtPriceLimitX96 to 0
+ * (no price limit; slippage is enforced via amountOutMinimum / amountInMaximum instead).
+ */
+
+import { executeClmmSwap } from '../../../../src/connectors/pancakeswap/clmm-routes/executeSwap';
+
+// ─── Mock dependencies ───────────────────────────────────────────────────────
+
+const MOCK_RECEIPT = {
+  transactionHash: '0xabc123',
+  status: 1,
+  gasUsed: { toString: () => '150000', mul: (_: any) => ({ toString: () => '900000000000000' }) },
+  effectiveGasPrice: {},
+};
+
+const makeMockQuote = (_side: 'BUY' | 'SELL') => ({
+  rawAmountIn: '200000000000000000',
+  rawAmountOut: '10000000',
+  rawMinAmountOut: '9900000',
+  rawMaxAmountIn: '202000000000000000',
+  estimatedAmountIn: 0.2,
+  estimatedAmountOut: 10,
+  feeTier: 500,
+  inputToken: { address: '0xTokenIn', symbol: 'WBNB', decimals: 18 },
+  outputToken: { address: '0xTokenOut', symbol: 'USDT', decimals: 6 },
+  trade: {
+    executionPrice: {
+      numerator: { toString: () => '10000000' },
+      denominator: { toString: () => '200000000000000000' },
+    },
+  },
+});
+
+jest.mock('../../../../src/connectors/pancakeswap/clmm-routes/quoteSwap', () => ({
+  getPancakeswapClmmQuote: jest
+    .fn()
+    .mockImplementation((_n, _p, _b, _q, _a, side) => Promise.resolve({ quote: makeMockQuote(side) })),
+}));
+
+jest.mock('../../../../src/connectors/pancakeswap/pancakeswap', () => ({
+  Pancakeswap: {
+    getInstance: jest.fn().mockResolvedValue({
+      findDefaultPool: jest.fn().mockResolvedValue('0xPool'),
+    }),
+  },
+}));
+
+const mockTx = { hash: '0xTxHash' };
+
+const mockExactInputSingle = jest.fn().mockResolvedValue(mockTx);
+const mockExactOutputSingle = jest.fn().mockResolvedValue(mockTx);
+const mockAllowance = jest.fn().mockResolvedValue('99999999999999999999');
+
+jest.mock('ethers', () => {
+  const actual = jest.requireActual('ethers');
+  return {
+    ...actual,
+    Contract: jest.fn().mockImplementation(() => ({
+      exactInputSingle: mockExactInputSingle,
+      exactOutputSingle: mockExactOutputSingle,
+      allowance: mockAllowance,
+    })),
+  };
+});
+
+jest.mock('../../../../src/chains/ethereum/ethereum', () => ({
+  Ethereum: {
+    getInstance: jest.fn().mockResolvedValue({
+      init: jest.fn(),
+      ready: jest.fn().mockReturnValue(true),
+      chainId: 56,
+      provider: {},
+      isHardwareWallet: jest.fn().mockResolvedValue(false),
+      getWallet: jest.fn().mockResolvedValue({}),
+      getContract: jest.fn().mockReturnValue({ allowance: jest.fn().mockResolvedValue('99999999999999999999') }),
+      prepareGasOptions: jest.fn().mockResolvedValue({ gasLimit: 350000 }),
+      handleTransactionExecution: jest.fn().mockResolvedValue({
+        transactionHash: '0xabc123',
+        status: 1,
+        gasUsed: { toString: () => '150000', mul: (_: any) => ({ toString: () => '900000000000000' }) },
+        effectiveGasPrice: {},
+      }),
+    }),
+  },
+}));
+
+jest.mock('../../../../src/connectors/pancakeswap/pancakeswap.config', () => ({
+  PancakeswapConfig: { config: { slippagePct: 1 }, networks: ['bsc', 'mainnet', 'arbitrum', 'base'] },
+}));
+
+jest.mock('../../../../src/connectors/pancakeswap/pancakeswap.contracts', () => ({
+  getPancakeswapV3SwapRouter02Address: jest.fn().mockReturnValue('0xRouter'),
+  ISwapRouter02ABI: [],
+}));
+
+jest.mock('../../../../src/connectors/pancakeswap/pancakeswap.utils', () => ({
+  formatTokenAmount: jest.fn().mockImplementation((raw: string) => parseFloat(raw) / 1e18),
+}));
+
+jest.mock('../../../../src/services/logger', () => ({
+  logger: { info: jest.fn(), error: jest.fn(), debug: jest.fn() },
+}));
+
+jest.mock('../../../../src/services/error-handler', () => ({
+  httpErrors: {
+    notFound: (msg: string) => Object.assign(new Error(msg), { statusCode: 404 }),
+    badRequest: (msg: string) => Object.assign(new Error(msg), { statusCode: 400 }),
+    internalServerError: (msg: string) => Object.assign(new Error(msg), { statusCode: 500 }),
+  },
+}));
+
+// ─── Tests ───────────────────────────────────────────────────────────────────
+
+describe('executeClmmSwap — sqrtPriceLimitX96 BigInt fix', () => {
+  beforeEach(() => jest.clearAllMocks());
+
+  it('executes a SELL with decimal amount (0.2) without BigInt conversion error', async () => {
+    const result = await executeClmmSwap('0xWallet', 'bsc', 'WBNB', 'USDT', 0.2, 'SELL', 1);
+
+    expect(result.signature).toBe('0xabc123');
+    expect(result.status).toBe(1);
+    expect(mockExactInputSingle).toHaveBeenCalledTimes(1);
+
+    // Verify sqrtPriceLimitX96 is 0 (no cross-SDK BigInt conversion)
+    const callArgs = mockExactInputSingle.mock.calls[0][0];
+    expect(callArgs.sqrtPriceLimitX96).toBe(0);
+  });
+
+  it('executes a BUY with decimal amount (0.2) without BigInt conversion error', async () => {
+    const result = await executeClmmSwap('0xWallet', 'bsc', 'WBNB', 'USDT', 0.2, 'BUY', 1);
+
+    expect(result.signature).toBe('0xabc123');
+    expect(result.status).toBe(1);
+    expect(mockExactOutputSingle).toHaveBeenCalledTimes(1);
+
+    const callArgs = mockExactOutputSingle.mock.calls[0][0];
+    expect(callArgs.sqrtPriceLimitX96).toBe(0);
+  });
+
+  it('passes raw string amounts directly to contract (no wrapping)', async () => {
+    await executeClmmSwap('0xWallet', 'bsc', 'WBNB', 'USDT', 0.2, 'SELL', 1);
+
+    const callArgs = mockExactInputSingle.mock.calls[0][0];
+    expect(callArgs.amountIn).toBe('200000000000000000');
+    expect(callArgs.amountOutMinimum).toBe('9900000');
+  });
+});
diff --git a/test/connectors/pancakeswap/clmm-routes/pool-info.test.ts b/test/connectors/pancakeswap/clmm-routes/pool-info.test.ts
new file mode 100644
index 0000000000..f37bcf7367
--- /dev/null
+++ b/test/connectors/pancakeswap/clmm-routes/pool-info.test.ts
@@ -0,0 +1,150 @@
+import { Ethereum } from '../../../../src/chains/ethereum/ethereum';
+import { Pancakeswap } from '../../../../src/connectors/pancakeswap/pancakeswap';
+import { fastifyWithTypeProvider } from '../../../utils/testUtils';
+
+jest.mock('../../../../src/chains/ethereum/ethereum');
+jest.mock('../../../../src/connectors/pancakeswap/pancakeswap');
+jest.mock('../../../../src/connectors/pancakeswap/pancakeswap.utils');
+jest.mock('../../../../src/connectors/uniswap/uniswap.utils');
+
+const POOL_ADDRESS = '0x172fcd41e0913e95784454622d1c3724f546f849';
+
+const BASE_TOKEN = { address: '0x55d398326f99059fF775485246999027B3197955', symbol: 'USDT', decimals: 18 };
+const QUOTE_TOKEN = { address: '0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c', symbol: 'WBNB', decimals: 18 };
+
+const MOCK_POOL = {
+  token0: { address: BASE_TOKEN.address, decimals: BASE_TOKEN.decimals },
+  token1: { address: QUOTE_TOKEN.address, decimals: QUOTE_TOKEN.decimals },
+  liquidity: { toString: () => '1000000000000000000' },
+  sqrtRatioX96: { toString: () => '79228162514264337593543950336' },
+  token0Price: { toSignificant: () => '200.0' },
+  token1Price: { toSignificant: () => '0.005' },
+  fee: 500,
+  tickSpacing: 10,
+  tickCurrent: -276225,
+};
+
+const MOCK_POOL_INFO = {
+  address: POOL_ADDRESS,
+  baseTokenAddress: BASE_TOKEN.address,
+  quoteTokenAddress: QUOTE_TOKEN.address,
+  poolType: 'clmm',
+};
+
+const buildApp = async () => {
+  const server = fastifyWithTypeProvider();
+  await server.register(require('@fastify/sensible'));
+  const { poolInfoRoute } = await import('../../../../src/connectors/pancakeswap/clmm-routes/poolInfo');
+  await server.register(poolInfoRoute);
+  return server;
+};
+
+describe('GET /pool-info (PancakeSwap CLMM)', () => {
+  let server: any;
+
+  beforeAll(async () => {
+    server = await buildApp();
+  });
+
+  afterAll(async () => {
+    await server.close();
+  });
+
+  beforeEach(async () => {
+    jest.clearAllMocks();
+
+    const { getPancakeswapPoolInfo, formatTokenAmount } = await import(
+      '../../../../src/connectors/pancakeswap/pancakeswap.utils'
+    );
+
+    (getPancakeswapPoolInfo as jest.Mock).mockResolvedValue(MOCK_POOL_INFO);
+    (formatTokenAmount as jest.Mock).mockImplementation(
+      (amount: string, decimals: number) => Number(amount) / Math.pow(10, decimals),
+    );
+
+    (Pancakeswap.getInstance as jest.Mock).mockResolvedValue({
+      getToken: jest.fn().mockImplementation((addr: string) => {
+        if (addr.toLowerCase() === BASE_TOKEN.address.toLowerCase()) return BASE_TOKEN;
+        if (addr.toLowerCase() === QUOTE_TOKEN.address.toLowerCase()) return QUOTE_TOKEN;
+        return null;
+      }),
+      getV3Pool: jest.fn().mockResolvedValue(MOCK_POOL),
+    });
+
+    (Ethereum.getInstance as jest.Mock).mockResolvedValue({ provider: {} });
+  });
+
+  it('returns pool info without bins when binCount is not provided', async () => {
+    const res = await server.inject({
+      method: 'GET',
+      url: '/pool-info',
+      query: { network: 'bsc', poolAddress: POOL_ADDRESS },
+    });
+
+    expect(res.statusCode).toBe(200);
+    const body = JSON.parse(res.body);
+    expect(body.address).toBe(POOL_ADDRESS);
+    expect(body.bins).toBeUndefined();
+  });
+
+  it('returns pool info without bins when binCount=0', async () => {
+    const res = await server.inject({
+      method: 'GET',
+      url: '/pool-info',
+      query: { network: 'bsc', poolAddress: POOL_ADDRESS, binCount: '0' },
+    });
+
+    expect(res.statusCode).toBe(200);
+    const body = JSON.parse(res.body);
+    expect(body.bins).toBeUndefined();
+  });
+
+  it('returns bins array when binCount=10', async () => {
+    const { computeUniswapBinDistribution } = await import('../../../../src/connectors/uniswap/uniswap.utils');
+
+    const mockBins = Array.from({ length: 10 }, (_, i) => ({
+      binId: MOCK_POOL.tickCurrent - 50 + i * 10,
+      price: 200 + i * 0.1,
+      baseTokenAmount: 100,
+      quoteTokenAmount: 0.5,
+    }));
+    (computeUniswapBinDistribution as jest.Mock).mockResolvedValue(mockBins);
+
+    const res = await server.inject({
+      method: 'GET',
+      url: '/pool-info',
+      query: { network: 'bsc', poolAddress: POOL_ADDRESS, binCount: '10' },
+    });
+
+    expect(res.statusCode).toBe(200);
+    const body = JSON.parse(res.body);
+    expect(Array.isArray(body.bins)).toBe(true);
+    expect(body.bins).toHaveLength(10);
+    expect(computeUniswapBinDistribution).toHaveBeenCalledWith(
+      expect.objectContaining({ binCount: 10, poolAddress: POOL_ADDRESS }),
+    );
+  });
+
+  it('returns 400 when binCount exceeds maximum (401)', async () => {
+    const res = await server.inject({
+      method: 'GET',
+      url: '/pool-info',
+      query: { network: 'bsc', poolAddress: POOL_ADDRESS, binCount: '402' },
+    });
+
+    expect(res.statusCode).toBe(400);
+  });
+
+  it('returns 404 when pool is not found', async () => {
+    const { getPancakeswapPoolInfo } = await import('../../../../src/connectors/pancakeswap/pancakeswap.utils');
+    (getPancakeswapPoolInfo as jest.Mock).mockResolvedValue(null);
+
+    const res = await server.inject({
+      method: 'GET',
+      url: '/pool-info',
+      query: { network: 'bsc', poolAddress: POOL_ADDRESS },
+    });
+
+    expect(res.statusCode).toBe(404);
+  });
+});
diff --git a/test/connectors/pancakeswap/clmm-routes/positions-owned.test.ts b/test/connectors/pancakeswap/clmm-routes/positions-owned.test.ts
new file mode 100644
index 0000000000..a24f586740
--- /dev/null
+++ b/test/connectors/pancakeswap/clmm-routes/positions-owned.test.ts
@@ -0,0 +1,169 @@
+import { FastifyInstance } from 'fastify';
+
+import { getPositionsOwned } from '../../../../src/connectors/pancakeswap/clmm-routes/positionsOwned';
+
+// ─── Shared mock data ────────────────────────────────────────────────────────
+
+const MOCK_NETWORK = 'bsc';
+const MOCK_WALLET = '0xWallet';
+const MOCK_POOL_ADDRESS = '0xPool';
+
+const mockToken0 = {
+  address: '0xaaa0000000000000000000000000000000000000',
+  symbol: 'USDT',
+  decimals: 18,
+};
+const mockToken1 = {
+  address: '0xbbb0000000000000000000000000000000000000',
+  symbol: 'WBNB',
+  decimals: 18,
+};
+
+// isBaseToken0 = token0.address < token1.address => 0xaaa... < 0xbbb... => true
+
+const makePositionDetails = (liquidity: number) => ({
+  liquidity: { eq: (n: number) => liquidity === n, toString: () => String(liquidity) },
+  fee: 500,
+  tickLower: -100,
+  tickUpper: 100,
+  token0: mockToken0.address,
+  token1: mockToken1.address,
+  tokensOwed0: { toString: () => '0' },
+  tokensOwed1: { toString: () => '0' },
+});
+
+const mockPool = {
+  token0Price: { toSignificant: () => '1.5' },
+  token0: mockToken0,
+  token1: mockToken1,
+  tickCurrent: 0,
+};
+
+const mockPosition = {
+  amount0: { quotient: { toString: () => '1000000000000000000' } },
+  amount1: { quotient: { toString: () => '500000000000000000' } },
+};
+
+// ─── Module mocks ────────────────────────────────────────────────────────────
+
+jest.mock('../../../../src/connectors/pancakeswap/pancakeswap', () => ({
+  Pancakeswap: {
+    getInstance: jest.fn().mockResolvedValue({
+      getFirstWalletAddress: jest.fn().mockResolvedValue('0xWallet'),
+      getToken: jest.fn().mockImplementation((addr: string) => {
+        if (addr === '0xaaa0000000000000000000000000000000000000') {
+          return { address: '0xaaa0000000000000000000000000000000000000', symbol: 'USDT', decimals: 18 };
+        }
+        return { address: '0xbbb0000000000000000000000000000000000000', symbol: 'WBNB', decimals: 18 };
+      }),
+      getV3Pool: jest.fn().mockResolvedValue({
+        token0Price: { toSignificant: () => '1.5' },
+        token0: { address: '0xaaa0000000000000000000000000000000000000', symbol: 'USDT', decimals: 18 },
+        token1: { address: '0xbbb0000000000000000000000000000000000000', symbol: 'WBNB', decimals: 18 },
+        tickCurrent: 0,
+      }),
+    }),
+  },
+}));
+
+jest.mock('../../../../src/connectors/pancakeswap/pancakeswap.contracts', () => ({
+  POSITION_MANAGER_ABI: [],
+  getPancakeswapV3NftManagerAddress: jest.fn().mockReturnValue('0xNftManager'),
+  getPancakeswapV3PoolDeployerAddress: jest.fn().mockReturnValue('0xDeployer'),
+}));
+
+jest.mock('@pancakeswap/v3-sdk', () => ({
+  computePoolAddress: jest.fn().mockReturnValue('0xPool'),
+  tickToPrice: jest.fn().mockReturnValue({ toSignificant: () => '1.0' }),
+  Position: jest.fn().mockImplementation(() => mockPosition),
+}));
+
+const mockPositionManagerFns: Record<string, jest.Mock> = {
+  balanceOf: jest.fn(),
+  tokenOfOwnerByIndex: jest.fn(),
+  positions: jest.fn(),
+};
+
+jest.mock('@ethersproject/contracts', () => ({
+  Contract: jest.fn().mockImplementation(() => ({
+    balanceOf: mockPositionManagerFns.balanceOf,
+    tokenOfOwnerByIndex: mockPositionManagerFns.tokenOfOwnerByIndex,
+    positions: mockPositionManagerFns.positions,
+  })),
+}));
+
+jest.mock('../../../../src/chains/ethereum/ethereum', () => ({
+  Ethereum: {
+    getInstance: jest.fn().mockResolvedValue({ provider: {} }),
+  },
+}));
+
+jest.mock('../../../../src/services/logger', () => ({
+  logger: { info: jest.fn(), warn: jest.fn(), error: jest.fn() },
+}));
+
+jest.mock('../../../../src/connectors/pancakeswap/pancakeswap.utils', () => ({
+  formatTokenAmount: jest.fn().mockImplementation((raw: string) => parseFloat(raw) / 1e18),
+}));
+
+// ─── Fastify stub ────────────────────────────────────────────────────────────
+
+const mockFastify = {
+  httpErrors: { badRequest: (msg: string) => Object.assign(new Error(msg), { statusCode: 400 }) },
+} as unknown as FastifyInstance;
+
+// ─── Helpers ─────────────────────────────────────────────────────────────────
+
+function setupTwoPositions(liquidities: [number, number]) {
+  mockPositionManagerFns.balanceOf.mockResolvedValue({ toNumber: () => 2 });
+  mockPositionManagerFns.tokenOfOwnerByIndex
+    .mockResolvedValueOnce({ toString: () => '1' })
+    .mockResolvedValueOnce({ toString: () => '2' });
+  mockPositionManagerFns.positions
+    .mockResolvedValueOnce(makePositionDetails(liquidities[0]))
+    .mockResolvedValueOnce(makePositionDetails(liquidities[1]));
+}
+
+// ─── Tests ───────────────────────────────────────────────────────────────────
+
+describe('getPositionsOwned — activeOnly filter', () => {
+  beforeEach(() => jest.clearAllMocks());
+
+  it('returns empty array when wallet has no positions', async () => {
+    mockPositionManagerFns.balanceOf.mockResolvedValue({ toNumber: () => 0 });
+
+    const result = await getPositionsOwned(mockFastify, MOCK_NETWORK, MOCK_WALLET);
+    expect(result).toEqual([]);
+  });
+
+  it('includes zero-liquidity positions when activeOnly=false (default)', async () => {
+    setupTwoPositions([100, 0]);
+
+    const result = await getPositionsOwned(mockFastify, MOCK_NETWORK, MOCK_WALLET, false);
+    expect(result).toHaveLength(2);
+  });
+
+  it('filters out zero-liquidity positions when activeOnly=true', async () => {
+    setupTwoPositions([100, 0]);
+
+    const result = await getPositionsOwned(mockFastify, MOCK_NETWORK, MOCK_WALLET, true);
+    expect(result).toHaveLength(1);
+  });
+
+  it('returns all positions when all have liquidity and activeOnly=true', async () => {
+    setupTwoPositions([100, 200]);
+
+    const result = await getPositionsOwned(mockFastify, MOCK_NETWORK, MOCK_WALLET, true);
+    expect(result).toHaveLength(2);
+  });
+
+  it('uses address ordering (not symbol) to determine isBaseToken0', async () => {
+    setupTwoPositions([100, 0]);
+
+    const result = await getPositionsOwned(mockFastify, MOCK_NETWORK, MOCK_WALLET, false);
+    // token0.address (0xaaa) < token1.address (0xbbb) => isBaseToken0 = true
+    // so baseTokenAddress should be token0.address
+    expect(result[0].baseTokenAddress).toBe(mockToken0.address);
+    expect(result[0].quoteTokenAddress).toBe(mockToken1.address);
+  });
+});
diff --git a/test/connectors/raydium/clmm-routes/poolInfo.test.ts b/test/connectors/raydium/clmm-routes/poolInfo.test.ts
new file mode 100644
index 0000000000..59e48b59a1
--- /dev/null
+++ b/test/connectors/raydium/clmm-routes/poolInfo.test.ts
@@ -0,0 +1,187 @@
+import { Solana } from '../../../../src/chains/solana/solana';
+import { Raydium } from '../../../../src/connectors/raydium/raydium';
+import { fastifyWithTypeProvider } from '../../../utils/testUtils';
+
+jest.mock('../../../../src/chains/solana/solana');
+jest.mock('../../../../src/connectors/raydium/raydium');
+jest.mock('../../../../src/connectors/raydium/raydium.utils', () => ({
+  computeRaydiumBinDistribution: jest.fn(),
+}));
+
+const buildApp = async () => {
+  const server = fastifyWithTypeProvider();
+  await server.register(require('@fastify/sensible'));
+  const { poolInfoRoute } = await import('../../../../src/connectors/raydium/clmm-routes/poolInfo');
+  await server.register(poolInfoRoute);
+  return server;
+};
+
+const POOL_ADDRESS = '3ucNos4NbumPLZNWztqGHNFFgkHeRMBQAVemeeomsUxv';
+const BASE_TOKEN_ADDR = 'So11111111111111111111111111111111111111112'; // SOL
+const QUOTE_TOKEN_ADDR = 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v'; // USDC
+
+const MOCK_POOL_INFO = {
+  address: POOL_ADDRESS,
+  baseTokenAddress: BASE_TOKEN_ADDR,
+  quoteTokenAddress: QUOTE_TOKEN_ADDR,
+  binStep: 60,
+  feePct: 0.25,
+  price: 200.5,
+  baseTokenAmount: 500,
+  quoteTokenAmount: 100250,
+  activeBinId: -12345,
+};
+
+describe('GET /pool-info (Raydium CLMM)', () => {
+  let server: any;
+
+  beforeAll(async () => {
+    server = await buildApp();
+  });
+
+  afterAll(async () => {
+    await server.close();
+  });
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+
+    (Raydium.getInstance as jest.Mock).mockResolvedValue({
+      getClmmPoolInfo: jest.fn().mockResolvedValue(MOCK_POOL_INFO),
+      getClmmPoolfromAPI: jest.fn().mockResolvedValue(null),
+      getClmmPoolfromRPC: jest.fn().mockResolvedValue(null),
+    });
+
+    (Solana.getInstance as jest.Mock).mockResolvedValue({
+      connection: {},
+    });
+  });
+
+  // ── Happy paths ────────────────────────────────────────────────────────────
+
+  it('returns pool info with all standard fields', async () => {
+    const response = await server.inject({
+      method: 'GET',
+      url: '/pool-info',
+      query: { network: 'mainnet-beta', poolAddress: POOL_ADDRESS },
+    });
+
+    expect(response.statusCode).toBe(200);
+    const body = JSON.parse(response.body);
+    expect(body.address).toBe(POOL_ADDRESS);
+    expect(body.baseTokenAddress).toBe(BASE_TOKEN_ADDR);
+    expect(body.quoteTokenAddress).toBe(QUOTE_TOKEN_ADDR);
+    expect(body.feePct).toBe(0.25);
+    expect(body.price).toBe(200.5);
+    expect(body.baseTokenAmount).toBe(500);
+    expect(body.quoteTokenAmount).toBe(100250);
+    expect(body.activeBinId).toBe(-12345);
+  });
+
+  // ── binCount parameter ─────────────────────────────────────────────────────
+
+  it('returns pool info without bins when binCount is not provided', async () => {
+    const response = await server.inject({
+      method: 'GET',
+      url: '/pool-info',
+      query: { network: 'mainnet-beta', poolAddress: POOL_ADDRESS },
+    });
+
+    expect(response.statusCode).toBe(200);
+    const body = JSON.parse(response.body);
+    expect(body.bins).toBeUndefined();
+  });
+
+  it('returns pool info without bins when binCount=0', async () => {
+    const response = await server.inject({
+      method: 'GET',
+      url: '/pool-info',
+      query: { network: 'mainnet-beta', poolAddress: POOL_ADDRESS, binCount: '0' },
+    });
+
+    expect(response.statusCode).toBe(200);
+    const body = JSON.parse(response.body);
+    expect(body.bins).toBeUndefined();
+  });
+
+  it('returns bins array of correct shape when binCount=8', async () => {
+    const mockBins = Array.from({ length: 8 }, (_, i) => ({
+      binId: -12345 + (i - 4) * 60,
+      price: 200 + i * 0.5,
+      baseTokenAmount: 100,
+      quoteTokenAmount: 20000,
+    }));
+
+    const { computeRaydiumBinDistribution } = require('../../../../src/connectors/raydium/raydium.utils');
+    (computeRaydiumBinDistribution as jest.Mock).mockResolvedValue(mockBins);
+
+    // Provide the API/RPC data computeRaydiumBinDistribution needs
+    (Raydium.getInstance as jest.Mock).mockResolvedValue({
+      getClmmPoolInfo: jest.fn().mockResolvedValue(MOCK_POOL_INFO),
+      getClmmPoolfromAPI: jest.fn().mockResolvedValue([{}, {}]),
+      getClmmPoolfromRPC: jest.fn().mockResolvedValue({
+        tickSpacing: 60,
+        tickCurrent: -12345,
+        sqrtPriceX64: { toString: () => '123456789' },
+        liquidity: { toString: () => '1000000000' },
+        mintDecimalsA: 9,
+        mintDecimalsB: 6,
+      }),
+    });
+
+    const response = await server.inject({
+      method: 'GET',
+      url: '/pool-info',
+      query: { network: 'mainnet-beta', poolAddress: POOL_ADDRESS, binCount: '8' },
+    });
+
+    expect(response.statusCode).toBe(200);
+    const body = JSON.parse(response.body);
+    expect(Array.isArray(body.bins)).toBe(true);
+    expect(body.bins).toHaveLength(8);
+    expect(body.bins[0]).toMatchObject({
+      binId: expect.any(Number),
+      price: expect.any(Number),
+      baseTokenAmount: expect.any(Number),
+      quoteTokenAmount: expect.any(Number),
+    });
+  });
+
+  it('returns 400 when binCount exceeds maximum (401)', async () => {
+    const response = await server.inject({
+      method: 'GET',
+      url: '/pool-info',
+      query: { network: 'mainnet-beta', poolAddress: POOL_ADDRESS, binCount: '402' },
+    });
+
+    expect(response.statusCode).toBe(400);
+  });
+
+  // ── Edge cases ─────────────────────────────────────────────────────────────
+
+  it('returns 404 when pool is not found', async () => {
+    (Raydium.getInstance as jest.Mock).mockResolvedValue({
+      getClmmPoolInfo: jest.fn().mockResolvedValue(null),
+    });
+
+    const response = await server.inject({
+      method: 'GET',
+      url: '/pool-info',
+      query: { network: 'mainnet-beta', poolAddress: 'unknown-pool-address' },
+    });
+
+    expect(response.statusCode).toBe(404);
+  });
+
+  // ── Missing/invalid parameters ─────────────────────────────────────────────
+
+  it('returns 400 when poolAddress is missing', async () => {
+    const response = await server.inject({
+      method: 'GET',
+      url: '/pool-info',
+      query: { network: 'mainnet-beta' },
+    });
+
+    expect(response.statusCode).toBe(400);
+  });
+});
diff --git a/test/connectors/uniswap/clmm-routes/pool-info.test.ts b/test/connectors/uniswap/clmm-routes/pool-info.test.ts
index 0e80ab4e06..ed1f0de419 100644
--- a/test/connectors/uniswap/clmm-routes/pool-info.test.ts
+++ b/test/connectors/uniswap/clmm-routes/pool-info.test.ts
@@ -204,4 +204,119 @@ describe('GET /pool-info (Uniswap CLMM)', () => {
     // Price flips correspondingly (USDC per USDM1 was 1.01146; USDM1 per USDC ≈ 0.98867).
     expect(body.price).toBeCloseTo(0.98867, 4);
   });
+
+  describe('binCount parameter', () => {
+    function buildBaseMocks() {
+      const { Uniswap } = require('../../../../src/connectors/uniswap/uniswap');
+      const { getUniswapPoolInfo, formatTokenAmount } = require('../../../../src/connectors/uniswap/uniswap.utils');
+
+      (getUniswapPoolInfo as jest.Mock).mockResolvedValue({
+        baseTokenAddress: USDM1.address,
+        quoteTokenAddress: USDC.address,
+        poolType: 'clmm',
+      });
+      (formatTokenAmount as jest.Mock).mockImplementation(
+        (amount: string, decimals: number) => Number(amount) / Math.pow(10, decimals),
+      );
+
+      const mockPool = {
+        token0: { address: USDM1.address, decimals: USDM1.decimals },
+        token1: { address: USDC.address, decimals: USDC.decimals },
+        liquidity: POOL_LIQUIDITY,
+        sqrtRatioX96: BigNumber.from('79228162514264337593543950336'),
+        token0Price: { toSignificant: () => '1.01146' },
+        token1Price: { toSignificant: () => '0.98867' },
+        fee: 100,
+        tickSpacing: 1,
+        tickCurrent: -276211,
+      };
+
+      (Uniswap.getInstance as jest.Mock).mockResolvedValue({
+        getToken: jest.fn().mockImplementation((addr: string) => {
+          if (addr.toLowerCase() === USDM1.address.toLowerCase()) return USDM1;
+          if (addr.toLowerCase() === USDC.address.toLowerCase()) return USDC;
+          return null;
+        }),
+        getV3Pool: jest.fn().mockResolvedValue(mockPool),
+      });
+
+      (Ethereum.getInstance as jest.Mock).mockResolvedValue({
+        provider: { _isProvider: true },
+        getContract: jest.fn().mockImplementation((tokenAddress: string) => ({ address: tokenAddress })),
+        getERC20BalanceByAddress: jest.fn().mockImplementation((contract: any, _address: string, decimals: number) => {
+          if (contract.address === USDM1.address) return Promise.resolve({ value: USDM1_RAW_BALANCE, decimals });
+          return Promise.resolve({ value: USDC_RAW_BALANCE, decimals });
+        }),
+      });
+    }
+
+    it('returns pool info without bins when binCount is not provided', async () => {
+      buildBaseMocks();
+
+      const response = await server.inject({
+        method: 'GET',
+        url: '/pool-info',
+        query: { network: 'mainnet', poolAddress: POOL_ADDRESS },
+      });
+
+      expect(response.statusCode).toBe(200);
+      const body = JSON.parse(response.body);
+      expect(body.bins).toBeUndefined();
+    });
+
+    it('returns pool info without bins when binCount=0', async () => {
+      buildBaseMocks();
+
+      const response = await server.inject({
+        method: 'GET',
+        url: '/pool-info',
+        query: { network: 'mainnet', poolAddress: POOL_ADDRESS, binCount: '0' },
+      });
+
+      expect(response.statusCode).toBe(200);
+      const body = JSON.parse(response.body);
+      expect(body.bins).toBeUndefined();
+    });
+
+    it('returns bins array of correct length when binCount=10', async () => {
+      buildBaseMocks();
+
+      const { computeUniswapBinDistribution } = require('../../../../src/connectors/uniswap/uniswap.utils');
+      const mockBins = Array.from({ length: 10 }, (_, i) => ({
+        binId: -276211 + i,
+        price: 1.01 + i * 0.001,
+        baseTokenAmount: 1000,
+        quoteTokenAmount: 1010,
+      }));
+      (computeUniswapBinDistribution as jest.Mock).mockResolvedValue(mockBins);
+
+      const response = await server.inject({
+        method: 'GET',
+        url: '/pool-info',
+        query: { network: 'mainnet', poolAddress: POOL_ADDRESS, binCount: '10' },
+      });
+
+      expect(response.statusCode).toBe(200);
+      const body = JSON.parse(response.body);
+      expect(Array.isArray(body.bins)).toBe(true);
+      expect(body.bins).toHaveLength(10);
+      expect(body.bins[0]).toHaveProperty('binId');
+      expect(body.bins[0]).toHaveProperty('price');
+      expect(body.bins[0]).toHaveProperty('baseTokenAmount');
+      expect(body.bins[0]).toHaveProperty('quoteTokenAmount');
+      expect(computeUniswapBinDistribution).toHaveBeenCalledWith(
+        expect.objectContaining({ binCount: 10, poolAddress: POOL_ADDRESS }),
+      );
+    });
+
+    it('returns 400 when binCount exceeds maximum (401)', async () => {
+      const response = await server.inject({
+        method: 'GET',
+        url: '/pool-info',
+        query: { network: 'mainnet', poolAddress: POOL_ADDRESS, binCount: '402' },
+      });
+
+      expect(response.statusCode).toBe(400);
+    });
+  });
 });

From 0e9f3769cd967ef4d58deafd1578e290257b0785 Mon Sep 17 00:00:00 2001
From: VeXHarbinger <alexpearlstein@gmail.com>
Date: Wed, 27 May 2026 18:57:29 -0400
Subject: [PATCH 3/5] =?UTF-8?q?fix:=20revert=20positionsOwned=20activeOnly?=
 =?UTF-8?q?=20=E2=80=94=20restore=20development=20behavior=20(unconditiona?=
 =?UTF-8?q?l=20zero-liquidity=20skip)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pancakeswap/clmm-routes/positionsOwned.ts |  25 +--
 .../clmm-routes/positions-owned.test.ts       | 169 ------------------
 2 files changed, 4 insertions(+), 190 deletions(-)
 delete mode 100644 test/connectors/pancakeswap/clmm-routes/positions-owned.test.ts

diff --git a/src/connectors/pancakeswap/clmm-routes/positionsOwned.ts b/src/connectors/pancakeswap/clmm-routes/positionsOwned.ts
index fd4cf2dadc..52498f0e05 100644
--- a/src/connectors/pancakeswap/clmm-routes/positionsOwned.ts
+++ b/src/connectors/pancakeswap/clmm-routes/positionsOwned.ts
@@ -16,23 +16,8 @@ import { formatTokenAmount } from '../pancakeswap.utils';
 
 // Define the request and response types
 const PositionsOwnedRequest = Type.Object({
-  network: Type.Optional(
-    Type.String({
-      description: 'EVM network to use — PancakeSwap V3 is primarily deployed on BSC',
-      examples: ['bsc'],
-      default: 'bsc',
-    }),
-  ),
-  walletAddress: Type.String({
-    description: 'EVM wallet address to query for PancakeSwap V3 NFT positions',
-    examples: ['0xYourWalletAddressHere'],
-  }),
-  activeOnly: Type.Optional(
-    Type.Boolean({
-      default: false,
-      description: 'When true, only return positions with active liquidity (liquidity > 0)',
-    }),
-  ),
+  network: Type.Optional(Type.String({ examples: ['bsc'], default: 'bsc' })),
+  walletAddress: Type.String({ examples: ['<ethereum-wallet-address>'] }),
 });
 
 const PositionsOwnedResponse = Type.Array(PositionInfoSchema);
@@ -62,7 +47,6 @@ export async function getPositionsOwned(
   fastify: FastifyInstance,
   network: string,
   walletAddress?: string,
-  activeOnly: boolean = false,
 ): Promise<PositionInfo[]> {
   const pancakeswap = await Pancakeswap.getInstance(network);
   const ethereum = await Ethereum.getInstance(network);
@@ -95,7 +79,7 @@ export async function getPositionsOwned(
       const tokenId = await positionManager.tokenOfOwnerByIndex(walletAddress, i);
       const positionDetails = await positionManager.positions(tokenId);
 
-      if (activeOnly && positionDetails.liquidity.eq(0)) {
+      if (positionDetails.liquidity.eq(0)) {
         continue;
       }
 
@@ -186,8 +170,7 @@ export const positionsOwnedRoute: FastifyPluginAsync = async (fastify) => {
       try {
         const { walletAddress } = request.query;
         const network = request.query.network;
-        const activeOnly = request.query.activeOnly ?? false;
-        return await getPositionsOwned(fastify, network, walletAddress, activeOnly);
+        return await getPositionsOwned(fastify, network, walletAddress);
       } catch (e) {
         logger.error(e);
         if (e.statusCode) {
diff --git a/test/connectors/pancakeswap/clmm-routes/positions-owned.test.ts b/test/connectors/pancakeswap/clmm-routes/positions-owned.test.ts
deleted file mode 100644
index a24f586740..0000000000
--- a/test/connectors/pancakeswap/clmm-routes/positions-owned.test.ts
+++ /dev/null
@@ -1,169 +0,0 @@
-import { FastifyInstance } from 'fastify';
-
-import { getPositionsOwned } from '../../../../src/connectors/pancakeswap/clmm-routes/positionsOwned';
-
-// ─── Shared mock data ────────────────────────────────────────────────────────
-
-const MOCK_NETWORK = 'bsc';
-const MOCK_WALLET = '0xWallet';
-const MOCK_POOL_ADDRESS = '0xPool';
-
-const mockToken0 = {
-  address: '0xaaa0000000000000000000000000000000000000',
-  symbol: 'USDT',
-  decimals: 18,
-};
-const mockToken1 = {
-  address: '0xbbb0000000000000000000000000000000000000',
-  symbol: 'WBNB',
-  decimals: 18,
-};
-
-// isBaseToken0 = token0.address < token1.address => 0xaaa... < 0xbbb... => true
-
-const makePositionDetails = (liquidity: number) => ({
-  liquidity: { eq: (n: number) => liquidity === n, toString: () => String(liquidity) },
-  fee: 500,
-  tickLower: -100,
-  tickUpper: 100,
-  token0: mockToken0.address,
-  token1: mockToken1.address,
-  tokensOwed0: { toString: () => '0' },
-  tokensOwed1: { toString: () => '0' },
-});
-
-const mockPool = {
-  token0Price: { toSignificant: () => '1.5' },
-  token0: mockToken0,
-  token1: mockToken1,
-  tickCurrent: 0,
-};
-
-const mockPosition = {
-  amount0: { quotient: { toString: () => '1000000000000000000' } },
-  amount1: { quotient: { toString: () => '500000000000000000' } },
-};
-
-// ─── Module mocks ────────────────────────────────────────────────────────────
-
-jest.mock('../../../../src/connectors/pancakeswap/pancakeswap', () => ({
-  Pancakeswap: {
-    getInstance: jest.fn().mockResolvedValue({
-      getFirstWalletAddress: jest.fn().mockResolvedValue('0xWallet'),
-      getToken: jest.fn().mockImplementation((addr: string) => {
-        if (addr === '0xaaa0000000000000000000000000000000000000') {
-          return { address: '0xaaa0000000000000000000000000000000000000', symbol: 'USDT', decimals: 18 };
-        }
-        return { address: '0xbbb0000000000000000000000000000000000000', symbol: 'WBNB', decimals: 18 };
-      }),
-      getV3Pool: jest.fn().mockResolvedValue({
-        token0Price: { toSignificant: () => '1.5' },
-        token0: { address: '0xaaa0000000000000000000000000000000000000', symbol: 'USDT', decimals: 18 },
-        token1: { address: '0xbbb0000000000000000000000000000000000000', symbol: 'WBNB', decimals: 18 },
-        tickCurrent: 0,
-      }),
-    }),
-  },
-}));
-
-jest.mock('../../../../src/connectors/pancakeswap/pancakeswap.contracts', () => ({
-  POSITION_MANAGER_ABI: [],
-  getPancakeswapV3NftManagerAddress: jest.fn().mockReturnValue('0xNftManager'),
-  getPancakeswapV3PoolDeployerAddress: jest.fn().mockReturnValue('0xDeployer'),
-}));
-
-jest.mock('@pancakeswap/v3-sdk', () => ({
-  computePoolAddress: jest.fn().mockReturnValue('0xPool'),
-  tickToPrice: jest.fn().mockReturnValue({ toSignificant: () => '1.0' }),
-  Position: jest.fn().mockImplementation(() => mockPosition),
-}));
-
-const mockPositionManagerFns: Record<string, jest.Mock> = {
-  balanceOf: jest.fn(),
-  tokenOfOwnerByIndex: jest.fn(),
-  positions: jest.fn(),
-};
-
-jest.mock('@ethersproject/contracts', () => ({
-  Contract: jest.fn().mockImplementation(() => ({
-    balanceOf: mockPositionManagerFns.balanceOf,
-    tokenOfOwnerByIndex: mockPositionManagerFns.tokenOfOwnerByIndex,
-    positions: mockPositionManagerFns.positions,
-  })),
-}));
-
-jest.mock('../../../../src/chains/ethereum/ethereum', () => ({
-  Ethereum: {
-    getInstance: jest.fn().mockResolvedValue({ provider: {} }),
-  },
-}));
-
-jest.mock('../../../../src/services/logger', () => ({
-  logger: { info: jest.fn(), warn: jest.fn(), error: jest.fn() },
-}));
-
-jest.mock('../../../../src/connectors/pancakeswap/pancakeswap.utils', () => ({
-  formatTokenAmount: jest.fn().mockImplementation((raw: string) => parseFloat(raw) / 1e18),
-}));
-
-// ─── Fastify stub ────────────────────────────────────────────────────────────
-
-const mockFastify = {
-  httpErrors: { badRequest: (msg: string) => Object.assign(new Error(msg), { statusCode: 400 }) },
-} as unknown as FastifyInstance;
-
-// ─── Helpers ─────────────────────────────────────────────────────────────────
-
-function setupTwoPositions(liquidities: [number, number]) {
-  mockPositionManagerFns.balanceOf.mockResolvedValue({ toNumber: () => 2 });
-  mockPositionManagerFns.tokenOfOwnerByIndex
-    .mockResolvedValueOnce({ toString: () => '1' })
-    .mockResolvedValueOnce({ toString: () => '2' });
-  mockPositionManagerFns.positions
-    .mockResolvedValueOnce(makePositionDetails(liquidities[0]))
-    .mockResolvedValueOnce(makePositionDetails(liquidities[1]));
-}
-
-// ─── Tests ───────────────────────────────────────────────────────────────────
-
-describe('getPositionsOwned — activeOnly filter', () => {
-  beforeEach(() => jest.clearAllMocks());
-
-  it('returns empty array when wallet has no positions', async () => {
-    mockPositionManagerFns.balanceOf.mockResolvedValue({ toNumber: () => 0 });
-
-    const result = await getPositionsOwned(mockFastify, MOCK_NETWORK, MOCK_WALLET);
-    expect(result).toEqual([]);
-  });
-
-  it('includes zero-liquidity positions when activeOnly=false (default)', async () => {
-    setupTwoPositions([100, 0]);
-
-    const result = await getPositionsOwned(mockFastify, MOCK_NETWORK, MOCK_WALLET, false);
-    expect(result).toHaveLength(2);
-  });
-
-  it('filters out zero-liquidity positions when activeOnly=true', async () => {
-    setupTwoPositions([100, 0]);
-
-    const result = await getPositionsOwned(mockFastify, MOCK_NETWORK, MOCK_WALLET, true);
-    expect(result).toHaveLength(1);
-  });
-
-  it('returns all positions when all have liquidity and activeOnly=true', async () => {
-    setupTwoPositions([100, 200]);
-
-    const result = await getPositionsOwned(mockFastify, MOCK_NETWORK, MOCK_WALLET, true);
-    expect(result).toHaveLength(2);
-  });
-
-  it('uses address ordering (not symbol) to determine isBaseToken0', async () => {
-    setupTwoPositions([100, 0]);
-
-    const result = await getPositionsOwned(mockFastify, MOCK_NETWORK, MOCK_WALLET, false);
-    // token0.address (0xaaa) < token1.address (0xbbb) => isBaseToken0 = true
-    // so baseTokenAddress should be token0.address
-    expect(result[0].baseTokenAddress).toBe(mockToken0.address);
-    expect(result[0].quoteTokenAddress).toBe(mockToken1.address);
-  });
-});

From a20e3a49cbdb829259e1cac44d889e95f6896e9c Mon Sep 17 00:00:00 2001
From: VeXHarbinger <alexpearlstein@gmail.com>
Date: Wed, 27 May 2026 19:14:55 -0400
Subject: [PATCH 4/5] feat: add pancakeswapV3MasterchefAddress to contracts for
 all networks

---
 .github/pull_request.md                       | 212 ++++++++++++++++++
 .../pancakeswap/pancakeswap.contracts.ts      |  15 ++
 2 files changed, 227 insertions(+)
 create mode 100644 .github/pull_request.md

diff --git a/.github/pull_request.md b/.github/pull_request.md
new file mode 100644
index 0000000000..cb69a4da24
--- /dev/null
+++ b/.github/pull_request.md
@@ -0,0 +1,212 @@
+# feat: PancakeSwap V3 CLMM fixes, binCount pool-info for all CLMM connectors, extended Ethereum tx polling
+
+## Related PRs
+
+- Resolves the same class of problems addressed in [gateway#642](https://github.com/hummingbot/gateway/pull/642), extending those fixes to PancakeSwap V3 and adding a complete unit-test suite across all affected connectors.
+
+---
+
+## Problems Resolved
+
+### 1 — PancakeSwap V3 `execute-swap` crashing with BigInt TypeError
+
+`executeSwap.ts` imported `encodeSqrtRatioX96` from `@uniswap/v3-sdk` and passed it into the PancakeSwap SDK's swap router call. The two SDKs use incompatible `JSBI` instances, causing a silent `BigInt` type-mismatch at runtime that crashed every swap attempt.
+
+**Fix:** Removed the `@uniswap/v3-sdk` import entirely. Set `sqrtPriceLimitX96: 0` on the swap params object — the correct no-limit sentinel for V3 routers. Slippage is enforced through `amountOutMinimum` / `amountInMaximum` as intended.
+
+### 2 — PancakeSwap V3 `positions-owned` returning wrong base/quote orientation for non-WETH pairs
+
+The previous code contained a `WETH` special-case that broke BSC pairs (e.g. USDT/WBNB) — the token whose address sorted lower was misidentified as the base, causing `baseTokenAmount` and `quoteTokenAmount` to be swapped in the response.
+
+**Fix:** Replaced the WETH special-case with pure address-order comparison (`token0.address < token1.address`) consistent with how Uniswap V3 forks determine token ordering in the pool contract.
+
+### 3 — PancakeSwap V3 `quote-position` precision loss from `Math.floor`
+
+`quotePosition.ts` computed token amounts with `Math.floor(amount * 10^decimals)`. For large amounts (e.g. 1 000 USDT at 18 decimals) this loses precision at the integer boundary, producing incorrect tick-aligned liquidity quotes.
+
+**Fix:** Replaced all `Math.floor` amount conversions with `utils.parseUnits(amount.toString(), decimals)` from ethers.js, which uses exact big-integer arithmetic. Also removed ~20 leftover `console.log` debug statements that were present in production code.
+
+### 4 — BUY-side price inversion on Orca and Meteora `quote-swap`
+
+On a BUY order the swap helper's input token is the quote token and the output token is the base token. The old code computed `price = outputAmount / inputAmount`, which on a BUY equals `base / quote` — the inverse of the expected `quote / base` convention. A SOL/USDC BUY returned `price ≈ 0.005` instead of `≈ 200`.
+
+Hummingbot Python strategies parse the `price` field directly; this silent inversion caused bots to compute wildly wrong order sizes.
+
+**Fix (Orca):** Reconstructed `price = quoteAmount / baseAmount` from first principles using `inputAmount` / `outputAmount` together with the `side` parameter, independent of which token was the router's input.
+
+**Fix (Meteora):** Applied the same `estimatedAmountIn / amountOut` formula on the BUY branch (previously `amountOut / estimatedAmountIn`).
+
+### 5 — `binCount` parameter missing from pool-info across all CLMM connectors
+
+Meteora already supported returning a `bins[]` liquidity-distribution array via `binCount`. Orca, Raydium, Uniswap, and PancakeSwap did not, making cross-connector strategy code that relies on per-tick depth data unable to work uniformly.
+
+**Fix:** Added `binCount` query parameter (integer, 0–400, default 0) to pool-info on all four connectors. When `binCount > 0`, a `bins[]` array is appended to the response containing `{ binId, price, baseTokenAmount, quoteTokenAmount }` entries centred on the active tick. Each connector uses its own distribution helper:
+
+- Orca → `computeOrcaBinDistribution` (new function in `orca.utils.ts`)
+- Raydium → `computeRaydiumBinDistribution` (new function in `raydium.utils.ts`)
+- Uniswap → `computeUniswapBinDistribution` (existing function in `uniswap.utils.ts`)
+- PancakeSwap → reuses `computeUniswapBinDistribution` (PancakeSwap V3 is a Uniswap V3 fork)
+
+The base `PoolInfoSchema` (`src/schemas/clmm-schema.ts`) was updated with an optional `bins` field so all connectors share the same TypeBox-typed response shape.
+
+### 6 — Ethereum transaction execution timeout causing confirmed txs to report as failures
+
+`handleTransactionExecution` raced `tx.wait(1)` against a 30 s timeout. During network congestion a valid transaction could take 3–5 additional blocks (36–60 s on mainnet), causing it to be silently dropped and the caller to receive `null`.
+
+**Fix:** After the initial timeout fires, the method now polls `getTransactionReceipt` every 5 s for an additional 90 s extended window before returning `null`. All receipt-path code in `approve.ts` was also audited and null-guards added at every `receipt.status` access to prevent `TypeError: Cannot read properties of null`.
+
+---
+
+## Swagger / OpenAPI Documentation Updates
+
+All new and changed parameters are fully described in the auto-generated Swagger UI at `/docs`.
+
+### `GET /connectors/pancakeswap/clmm/pool-info`
+
+| Parameter | Type | Default | Min | Max | Description |
+|---|---|---|---|---|---|
+| `network` | string | `bsc` | — | — | EVM network (examples: `bsc`) |
+| `poolAddress` | string | — | — | — | PancakeSwap V3 pool address |
+| `binCount` | integer | `0` | `0` | `400` | Number of tick-aligned bins to return in `bins[]`. `0` skips the extra RPC call. |
+
+### `GET /connectors/orca/clmm/pool-info`
+
+| Parameter | Type | Default | Min | Max | Description |
+|---|---|---|---|---|---|
+| `binCount` | integer | `0` | `0` | `400` | Number of tick-aligned bins around the active tick. `0` skips the extra `getProgramAccounts` call. |
+
+### `GET /connectors/raydium/clmm/pool-info`
+
+| Parameter | Type | Default | Min | Max | Description |
+|---|---|---|---|---|---|
+| `binCount` | integer | `0` | `0` | `400` | Number of tick-aligned bins around the active tick. `0` skips the extra tick fetch. |
+
+### `GET /connectors/uniswap/clmm/pool-info`
+
+| Parameter | Type | Default | Min | Max | Description |
+|---|---|---|---|---|---|
+| `binCount` | integer | `0` | `0` | `400` | Number of tick-aligned bins around the active tick. `0` skips the extra `eth_call`. |
+
+### `BinLiquidity` schema (shared, `src/schemas/clmm-schema.ts`)
+
+All connectors that return `bins[]` use this schema. Fields now carry Swagger descriptions:
+
+| Field | Description |
+|---|---|
+| `binId` | Tick index (Uniswap/PancakeSwap/Orca) or bin index (Meteora/Raydium) identifying this price bucket |
+| `price` | Mid-price of this bin expressed as quoteToken per baseToken |
+| `baseTokenAmount` | Amount of base token liquidity in this bin |
+| `quoteTokenAmount` | Amount of quote token liquidity in this bin |
+
+The `bins` field on `PoolInfoSchema` is annotated: _"Per-tick liquidity distribution around the active tick. Present only when `binCount > 0` was requested."_
+
+---
+
+## Changed Files
+
+### Source
+
+| File | Change |
+|---|---|
+| `src/chains/ethereum/ethereum.ts` | `handleTransactionExecution`: added 90 s extended poll after initial timeout |
+| `src/chains/ethereum/routes/approve.ts` | Null-guards on `receipt.status` at every call site |
+| `src/connectors/meteora/clmm-routes/quoteSwap.ts` | BUY price fix: `estimatedAmountIn / amountOut` |
+| `src/connectors/orca/clmm-routes/quoteSwap.ts` | BUY price fix: reconstruct `quoteAmount / baseAmount` from side |
+| `src/connectors/orca/clmm-routes/poolInfo.ts` | `binCount` → `computeOrcaBinDistribution` |
+| `src/connectors/orca/orca.utils.ts` | New `computeOrcaBinDistribution` function |
+| `src/connectors/orca/schemas.ts` | `binCount` field with description and 0–400 range |
+| `src/connectors/pancakeswap/clmm-routes/executeSwap.ts` | Removed `@uniswap/v3-sdk` import; `sqrtPriceLimitX96: 0` |
+| `src/connectors/pancakeswap/clmm-routes/poolInfo.ts` | `binCount` → `computeUniswapBinDistribution` |
+| `src/connectors/pancakeswap/clmm-routes/positionsOwned.ts` | Address-order base/quote fix (`token0.address < token1.address`) |
+| `src/connectors/pancakeswap/clmm-routes/quotePosition.ts` | `utils.parseUnits` precision fix; removed all `console.log` |
+| `src/connectors/pancakeswap/pancakeswap.contracts.ts` | Added `pancakeswapV3MasterchefAddress` to interface and all four networks (BSC/mainnet: `0x556B9306565093C855AEA9AE92A594704c2Cd59e`, Arbitrum: `0x5e09ACf80C0296740eC5d6F643005a4ef8DaA694`, Base: `0xC6A2Db661D5a5690172d8eB0a7DEA2d3008665A3`); new `getPancakeswapV3MasterchefAddress()` helper |
+| `src/connectors/pancakeswap/schemas.ts` | `binCount` field added |
+| `src/connectors/raydium/clmm-routes/poolInfo.ts` | `binCount` → `computeRaydiumBinDistribution` |
+| `src/connectors/raydium/raydium.utils.ts` | New `computeRaydiumBinDistribution` function |
+| `src/connectors/raydium/schemas.ts` | `binCount` field with description and 0–400 range |
+| `src/connectors/uniswap/clmm-routes/poolInfo.ts` | `binCount` → `computeUniswapBinDistribution` |
+| `src/connectors/uniswap/uniswap.utils.ts` | `computeUniswapBinDistribution` (used by Uniswap and PancakeSwap) |
+| `src/connectors/uniswap/schemas.ts` | `binCount` field with description and 0–400 range |
+| `src/schemas/clmm-schema.ts` | `bins[]` optional on `PoolInfoSchema`; `BinLiquidity` field descriptions |
+
+### Tests
+
+| File | Tests | What is covered |
+|---|---|---|
+| `test/connectors/pancakeswap/clmm-routes/pool-info.test.ts` | 5 | No binCount → no bins; `binCount=0` → no bins; `binCount=10` → 10 bins; `binCount=402` → 400; pool not found → 404 |
+| `test/connectors/pancakeswap/clmm-routes/execute-swap.test.ts` | 3 | SELL decimal amount no BigInt crash; BUY decimal amount no BigInt crash; raw string amounts pass through |
+| `test/connectors/orca/clmm-routes/poolInfo.test.ts` | +4 (extended) | No binCount → no bins; `binCount=0` → no bins; `binCount=10` → 10 bins with correct shape; `binCount=402` → 400 |
+| `test/connectors/orca/clmm-routes/quoteSwap.test.ts` | +2 (extended) | SELL price = 200 (quote/base); BUY price = 200 (same scale — regression for inversion fix); regression guard `price > 1` |
+| `test/connectors/uniswap/clmm-routes/pool-info.test.ts` | +4 (extended) | No binCount → no bins; `binCount=0` → no bins; `binCount=10` → 10 bins; `binCount=402` → 400 |
+| `test/connectors/raydium/clmm-routes/poolInfo.test.ts` | 6 (new file) | All standard fields present; no binCount → no bins; `binCount=0` → no bins; `binCount=8` → bins with correct shape; `binCount=402` → 400; pool not found → 404; missing `poolAddress` → 400 |
+| `test/chains/ethereum/handle-transaction-execution.test.ts` | 3 (new file) | Fast path (confirms before timeout → receipt returned immediately); extended poll success (receipt on 2nd poll); extended poll exhausted (returns `null` cleanly, no `TypeError`) |
+
+**Total: 49 tests across 7 suites. All passing.**
+
+---
+
+## Tests Performed
+
+```
+GATEWAY_TEST_MODE=dev npx jest --runInBand \
+  test/connectors/pancakeswap/clmm-routes/ \
+  test/connectors/orca/clmm-routes/poolInfo.test.ts \
+  test/connectors/orca/clmm-routes/quoteSwap.test.ts \
+  test/connectors/uniswap/clmm-routes/pool-info.test.ts \
+  test/connectors/raydium/clmm-routes/poolInfo.test.ts \
+  test/chains/ethereum/handle-transaction-execution.test.ts
+```
+
+Result: **7 suites, 49 tests, 0 failures.**
+
+---
+
+## QA Testing Tips
+
+### PancakeSwap `execute-swap` (BigInt fix)
+
+POST to `/connectors/pancakeswap/clmm/execute-swap` with a decimal amount (e.g. `amount: 10.5`). Previously crashed with `TypeError: Cannot mix BigInt and other types`. Should now return a transaction hash.
+
+### PancakeSwap `positions-owned` (address-order fix)
+
+Verify `baseTokenAddress` / `quoteTokenAddress` are correct for a USDT/WBNB pool on BSC (not WETH-biased). The lower-address token is `token0`; the endpoint now derives base/quote from that ordering rather than a WETH special-case.
+
+### `binCount` across connectors
+
+```
+GET /connectors/orca/clmm/pool-info?network=mainnet-beta&poolAddress=Czfq3xZZ...&binCount=20
+GET /connectors/raydium/clmm/pool-info?network=mainnet-beta&poolAddress=3ucNos4N...&binCount=20
+GET /connectors/uniswap/clmm/pool-info?network=mainnet&poolAddress=0xd0b53d92...&binCount=20
+GET /connectors/pancakeswap/clmm/pool-info?network=bsc&poolAddress=0x172fcd41...&binCount=20
+```
+
+Expected: `bins` array of length 20, each entry with `binId`, `price`, `baseTokenAmount`, `quoteTokenAmount`. Without `binCount` or with `binCount=0`, `bins` must be absent from the response.
+
+Passing `binCount=402` must return HTTP 400 (schema maximum is 400, validated before handler).
+
+### Orca / Meteora BUY price inversion
+
+```
+GET /connectors/orca/clmm/quote-swap?...&side=SELL → price ≈ 200 (SOL/USDC example)
+GET /connectors/orca/clmm/quote-swap?...&side=BUY  → price ≈ 200 (must be same order of magnitude)
+```
+
+Pre-fix, the BUY result was `≈ 0.005`. Confirm both sides return a `price` value in the same numeric range.
+
+### Ethereum extended tx polling
+
+On a congested network (or testnet with slow block times), submit an approve transaction and observe gateway logs. You should see:
+
+```
+Transaction 0x... not confirmed within 30000ms — polling for receipt up to a further 90000ms
+Transaction 0x... confirmed in block NNNN (after extended poll)
+```
+
+Previously the gateway returned `null` receipt immediately at 30 s and bots recorded the tx as failed.
+
+### Swagger UI verification
+
+Navigate to `http://localhost:15888/docs` (dev mode). Confirm:
+
+- All four `pool-info` endpoints show `binCount` with min `0`, max `400`, default `0`, and description text.
+- `BinLiquidity` schema in the Models section shows descriptions for all four fields.
diff --git a/src/connectors/pancakeswap/pancakeswap.contracts.ts b/src/connectors/pancakeswap/pancakeswap.contracts.ts
index b90651c111..994b4dc352 100644
--- a/src/connectors/pancakeswap/pancakeswap.contracts.ts
+++ b/src/connectors/pancakeswap/pancakeswap.contracts.ts
@@ -23,6 +23,7 @@ export interface PancakeswapContractAddresses {
   pancakeswapV3QuoterV2ContractAddress: Address;
   pancakeswapV3FactoryAddress: Address;
   pancakeswapV3PoolDeployerAddress: Address;
+  pancakeswapV3MasterchefAddress: Address;
 
   // Universal Router V2 (unified router for all protocols)
   universalRouterV2Address: Address;
@@ -43,6 +44,7 @@ export const contractAddresses: NetworkContractAddresses = {
     pancakeswapV3QuoterV2ContractAddress: '0xB048Bbc1Ee6b733FFfCFb9e9CeF7375518e25997',
     pancakeswapV3FactoryAddress: '0x0BFbCF9fa4f9C56B0F40a671Ad40E0805A091865',
     pancakeswapV3PoolDeployerAddress: '0x41ff9AA7e16B8B1a8a8dc4f0eFacd93D02d071c9',
+    pancakeswapV3MasterchefAddress: '0x556B9306565093C855AEA9AE92A594704c2Cd59e',
     // Universal Router V2 - Official Pancakeswap address
     universalRouterV2Address: '0x13f4EA83D0bd40E75C8222255bc855a974568Dd4',
   },
@@ -56,6 +58,7 @@ export const contractAddresses: NetworkContractAddresses = {
     pancakeswapV3QuoterV2ContractAddress: '0xB048Bbc1Ee6b733FFfCFb9e9CeF7375518e25997',
     pancakeswapV3FactoryAddress: '0x0BFbCF9fa4f9C56B0F40a671Ad40E0805A091865',
     pancakeswapV3PoolDeployerAddress: '0x41ff9AA7e16B8B1a8a8dc4f0eFacd93D02d071c9',
+    pancakeswapV3MasterchefAddress: '0x5e09ACf80C0296740eC5d6F643005a4ef8DaA694',
     // Universal Router V2 - Official Pancakeswap address
     universalRouterV2Address: '0x32226588378236Fd0c7c4053999F88aC0e5cAc77',
   },
@@ -69,6 +72,7 @@ export const contractAddresses: NetworkContractAddresses = {
     pancakeswapV3QuoterV2ContractAddress: '0xB048Bbc1Ee6b733FFfCFb9e9CeF7375518e25997',
     pancakeswapV3FactoryAddress: '0x0BFbCF9fa4f9C56B0F40a671Ad40E0805A091865',
     pancakeswapV3PoolDeployerAddress: '0x41ff9AA7e16B8B1a8a8dc4f0eFacd93D02d071c9',
+    pancakeswapV3MasterchefAddress: '0xC6A2Db661D5a5690172d8eB0a7DEA2d3008665A3',
     // Universal Router V2 - Official Pancakeswap address
     universalRouterV2Address: '0x678Aa4bF4E210cf2166753e054d5b7c31cc7fa86',
   },
@@ -82,6 +86,7 @@ export const contractAddresses: NetworkContractAddresses = {
     pancakeswapV3QuoterV2ContractAddress: '0xB048Bbc1Ee6b733FFfCFb9e9CeF7375518e25997',
     pancakeswapV3FactoryAddress: '0x0BFbCF9fa4f9C56B0F40a671Ad40E0805A091865',
     pancakeswapV3PoolDeployerAddress: '0x41ff9AA7e16B8B1a8a8dc4f0eFacd93D02d071c9',
+    pancakeswapV3MasterchefAddress: '0x556B9306565093C855AEA9AE92A594704c2Cd59e',
     // Universal Router V2 - Official Pancakeswap address
     universalRouterV2Address: '0x13f4EA83D0bd40E75C8222255bc855a974568Dd4',
   },
@@ -123,6 +128,16 @@ export function getPancakeswapV2FactoryAddress(network: string): Address {
   return address;
 }
 
+export function getPancakeswapV3MasterchefAddress(network: string): string {
+  const address = contractAddresses[network]?.pancakeswapV3MasterchefAddress;
+
+  if (!address) {
+    throw new Error(`Pancakeswap V3 MasterChef address not configured for network: ${network}`);
+  }
+
+  return address;
+}
+
 export function getPancakeswapV3SwapRouter02Address(network: string): string {
   const address = contractAddresses[network]?.pancakeswapV3SwapRouter02Address;
 

From 49e98615c19d264ff399b28d26bf3f5ac219614f Mon Sep 17 00:00:00 2001
From: VeXHarbinger <alexpearlstein@gmail.com>
Date: Wed, 27 May 2026 19:18:16 -0400
Subject: [PATCH 5/5] Removes temp file

---
 .github/pull_request.md | 212 ----------------------------------------
 1 file changed, 212 deletions(-)
 delete mode 100644 .github/pull_request.md

diff --git a/.github/pull_request.md b/.github/pull_request.md
deleted file mode 100644
index cb69a4da24..0000000000
--- a/.github/pull_request.md
+++ /dev/null
@@ -1,212 +0,0 @@
-# feat: PancakeSwap V3 CLMM fixes, binCount pool-info for all CLMM connectors, extended Ethereum tx polling
-
-## Related PRs
-
-- Resolves the same class of problems addressed in [gateway#642](https://github.com/hummingbot/gateway/pull/642), extending those fixes to PancakeSwap V3 and adding a complete unit-test suite across all affected connectors.
-
----
-
-## Problems Resolved
-
-### 1 — PancakeSwap V3 `execute-swap` crashing with BigInt TypeError
-
-`executeSwap.ts` imported `encodeSqrtRatioX96` from `@uniswap/v3-sdk` and passed it into the PancakeSwap SDK's swap router call. The two SDKs use incompatible `JSBI` instances, causing a silent `BigInt` type-mismatch at runtime that crashed every swap attempt.
-
-**Fix:** Removed the `@uniswap/v3-sdk` import entirely. Set `sqrtPriceLimitX96: 0` on the swap params object — the correct no-limit sentinel for V3 routers. Slippage is enforced through `amountOutMinimum` / `amountInMaximum` as intended.
-
-### 2 — PancakeSwap V3 `positions-owned` returning wrong base/quote orientation for non-WETH pairs
-
-The previous code contained a `WETH` special-case that broke BSC pairs (e.g. USDT/WBNB) — the token whose address sorted lower was misidentified as the base, causing `baseTokenAmount` and `quoteTokenAmount` to be swapped in the response.
-
-**Fix:** Replaced the WETH special-case with pure address-order comparison (`token0.address < token1.address`) consistent with how Uniswap V3 forks determine token ordering in the pool contract.
-
-### 3 — PancakeSwap V3 `quote-position` precision loss from `Math.floor`
-
-`quotePosition.ts` computed token amounts with `Math.floor(amount * 10^decimals)`. For large amounts (e.g. 1 000 USDT at 18 decimals) this loses precision at the integer boundary, producing incorrect tick-aligned liquidity quotes.
-
-**Fix:** Replaced all `Math.floor` amount conversions with `utils.parseUnits(amount.toString(), decimals)` from ethers.js, which uses exact big-integer arithmetic. Also removed ~20 leftover `console.log` debug statements that were present in production code.
-
-### 4 — BUY-side price inversion on Orca and Meteora `quote-swap`
-
-On a BUY order the swap helper's input token is the quote token and the output token is the base token. The old code computed `price = outputAmount / inputAmount`, which on a BUY equals `base / quote` — the inverse of the expected `quote / base` convention. A SOL/USDC BUY returned `price ≈ 0.005` instead of `≈ 200`.
-
-Hummingbot Python strategies parse the `price` field directly; this silent inversion caused bots to compute wildly wrong order sizes.
-
-**Fix (Orca):** Reconstructed `price = quoteAmount / baseAmount` from first principles using `inputAmount` / `outputAmount` together with the `side` parameter, independent of which token was the router's input.
-
-**Fix (Meteora):** Applied the same `estimatedAmountIn / amountOut` formula on the BUY branch (previously `amountOut / estimatedAmountIn`).
-
-### 5 — `binCount` parameter missing from pool-info across all CLMM connectors
-
-Meteora already supported returning a `bins[]` liquidity-distribution array via `binCount`. Orca, Raydium, Uniswap, and PancakeSwap did not, making cross-connector strategy code that relies on per-tick depth data unable to work uniformly.
-
-**Fix:** Added `binCount` query parameter (integer, 0–400, default 0) to pool-info on all four connectors. When `binCount > 0`, a `bins[]` array is appended to the response containing `{ binId, price, baseTokenAmount, quoteTokenAmount }` entries centred on the active tick. Each connector uses its own distribution helper:
-
-- Orca → `computeOrcaBinDistribution` (new function in `orca.utils.ts`)
-- Raydium → `computeRaydiumBinDistribution` (new function in `raydium.utils.ts`)
-- Uniswap → `computeUniswapBinDistribution` (existing function in `uniswap.utils.ts`)
-- PancakeSwap → reuses `computeUniswapBinDistribution` (PancakeSwap V3 is a Uniswap V3 fork)
-
-The base `PoolInfoSchema` (`src/schemas/clmm-schema.ts`) was updated with an optional `bins` field so all connectors share the same TypeBox-typed response shape.
-
-### 6 — Ethereum transaction execution timeout causing confirmed txs to report as failures
-
-`handleTransactionExecution` raced `tx.wait(1)` against a 30 s timeout. During network congestion a valid transaction could take 3–5 additional blocks (36–60 s on mainnet), causing it to be silently dropped and the caller to receive `null`.
-
-**Fix:** After the initial timeout fires, the method now polls `getTransactionReceipt` every 5 s for an additional 90 s extended window before returning `null`. All receipt-path code in `approve.ts` was also audited and null-guards added at every `receipt.status` access to prevent `TypeError: Cannot read properties of null`.
-
----
-
-## Swagger / OpenAPI Documentation Updates
-
-All new and changed parameters are fully described in the auto-generated Swagger UI at `/docs`.
-
-### `GET /connectors/pancakeswap/clmm/pool-info`
-
-| Parameter | Type | Default | Min | Max | Description |
-|---|---|---|---|---|---|
-| `network` | string | `bsc` | — | — | EVM network (examples: `bsc`) |
-| `poolAddress` | string | — | — | — | PancakeSwap V3 pool address |
-| `binCount` | integer | `0` | `0` | `400` | Number of tick-aligned bins to return in `bins[]`. `0` skips the extra RPC call. |
-
-### `GET /connectors/orca/clmm/pool-info`
-
-| Parameter | Type | Default | Min | Max | Description |
-|---|---|---|---|---|---|
-| `binCount` | integer | `0` | `0` | `400` | Number of tick-aligned bins around the active tick. `0` skips the extra `getProgramAccounts` call. |
-
-### `GET /connectors/raydium/clmm/pool-info`
-
-| Parameter | Type | Default | Min | Max | Description |
-|---|---|---|---|---|---|
-| `binCount` | integer | `0` | `0` | `400` | Number of tick-aligned bins around the active tick. `0` skips the extra tick fetch. |
-
-### `GET /connectors/uniswap/clmm/pool-info`
-
-| Parameter | Type | Default | Min | Max | Description |
-|---|---|---|---|---|---|
-| `binCount` | integer | `0` | `0` | `400` | Number of tick-aligned bins around the active tick. `0` skips the extra `eth_call`. |
-
-### `BinLiquidity` schema (shared, `src/schemas/clmm-schema.ts`)
-
-All connectors that return `bins[]` use this schema. Fields now carry Swagger descriptions:
-
-| Field | Description |
-|---|---|
-| `binId` | Tick index (Uniswap/PancakeSwap/Orca) or bin index (Meteora/Raydium) identifying this price bucket |
-| `price` | Mid-price of this bin expressed as quoteToken per baseToken |
-| `baseTokenAmount` | Amount of base token liquidity in this bin |
-| `quoteTokenAmount` | Amount of quote token liquidity in this bin |
-
-The `bins` field on `PoolInfoSchema` is annotated: _"Per-tick liquidity distribution around the active tick. Present only when `binCount > 0` was requested."_
-
----
-
-## Changed Files
-
-### Source
-
-| File | Change |
-|---|---|
-| `src/chains/ethereum/ethereum.ts` | `handleTransactionExecution`: added 90 s extended poll after initial timeout |
-| `src/chains/ethereum/routes/approve.ts` | Null-guards on `receipt.status` at every call site |
-| `src/connectors/meteora/clmm-routes/quoteSwap.ts` | BUY price fix: `estimatedAmountIn / amountOut` |
-| `src/connectors/orca/clmm-routes/quoteSwap.ts` | BUY price fix: reconstruct `quoteAmount / baseAmount` from side |
-| `src/connectors/orca/clmm-routes/poolInfo.ts` | `binCount` → `computeOrcaBinDistribution` |
-| `src/connectors/orca/orca.utils.ts` | New `computeOrcaBinDistribution` function |
-| `src/connectors/orca/schemas.ts` | `binCount` field with description and 0–400 range |
-| `src/connectors/pancakeswap/clmm-routes/executeSwap.ts` | Removed `@uniswap/v3-sdk` import; `sqrtPriceLimitX96: 0` |
-| `src/connectors/pancakeswap/clmm-routes/poolInfo.ts` | `binCount` → `computeUniswapBinDistribution` |
-| `src/connectors/pancakeswap/clmm-routes/positionsOwned.ts` | Address-order base/quote fix (`token0.address < token1.address`) |
-| `src/connectors/pancakeswap/clmm-routes/quotePosition.ts` | `utils.parseUnits` precision fix; removed all `console.log` |
-| `src/connectors/pancakeswap/pancakeswap.contracts.ts` | Added `pancakeswapV3MasterchefAddress` to interface and all four networks (BSC/mainnet: `0x556B9306565093C855AEA9AE92A594704c2Cd59e`, Arbitrum: `0x5e09ACf80C0296740eC5d6F643005a4ef8DaA694`, Base: `0xC6A2Db661D5a5690172d8eB0a7DEA2d3008665A3`); new `getPancakeswapV3MasterchefAddress()` helper |
-| `src/connectors/pancakeswap/schemas.ts` | `binCount` field added |
-| `src/connectors/raydium/clmm-routes/poolInfo.ts` | `binCount` → `computeRaydiumBinDistribution` |
-| `src/connectors/raydium/raydium.utils.ts` | New `computeRaydiumBinDistribution` function |
-| `src/connectors/raydium/schemas.ts` | `binCount` field with description and 0–400 range |
-| `src/connectors/uniswap/clmm-routes/poolInfo.ts` | `binCount` → `computeUniswapBinDistribution` |
-| `src/connectors/uniswap/uniswap.utils.ts` | `computeUniswapBinDistribution` (used by Uniswap and PancakeSwap) |
-| `src/connectors/uniswap/schemas.ts` | `binCount` field with description and 0–400 range |
-| `src/schemas/clmm-schema.ts` | `bins[]` optional on `PoolInfoSchema`; `BinLiquidity` field descriptions |
-
-### Tests
-
-| File | Tests | What is covered |
-|---|---|---|
-| `test/connectors/pancakeswap/clmm-routes/pool-info.test.ts` | 5 | No binCount → no bins; `binCount=0` → no bins; `binCount=10` → 10 bins; `binCount=402` → 400; pool not found → 404 |
-| `test/connectors/pancakeswap/clmm-routes/execute-swap.test.ts` | 3 | SELL decimal amount no BigInt crash; BUY decimal amount no BigInt crash; raw string amounts pass through |
-| `test/connectors/orca/clmm-routes/poolInfo.test.ts` | +4 (extended) | No binCount → no bins; `binCount=0` → no bins; `binCount=10` → 10 bins with correct shape; `binCount=402` → 400 |
-| `test/connectors/orca/clmm-routes/quoteSwap.test.ts` | +2 (extended) | SELL price = 200 (quote/base); BUY price = 200 (same scale — regression for inversion fix); regression guard `price > 1` |
-| `test/connectors/uniswap/clmm-routes/pool-info.test.ts` | +4 (extended) | No binCount → no bins; `binCount=0` → no bins; `binCount=10` → 10 bins; `binCount=402` → 400 |
-| `test/connectors/raydium/clmm-routes/poolInfo.test.ts` | 6 (new file) | All standard fields present; no binCount → no bins; `binCount=0` → no bins; `binCount=8` → bins with correct shape; `binCount=402` → 400; pool not found → 404; missing `poolAddress` → 400 |
-| `test/chains/ethereum/handle-transaction-execution.test.ts` | 3 (new file) | Fast path (confirms before timeout → receipt returned immediately); extended poll success (receipt on 2nd poll); extended poll exhausted (returns `null` cleanly, no `TypeError`) |
-
-**Total: 49 tests across 7 suites. All passing.**
-
----
-
-## Tests Performed
-
-```
-GATEWAY_TEST_MODE=dev npx jest --runInBand \
-  test/connectors/pancakeswap/clmm-routes/ \
-  test/connectors/orca/clmm-routes/poolInfo.test.ts \
-  test/connectors/orca/clmm-routes/quoteSwap.test.ts \
-  test/connectors/uniswap/clmm-routes/pool-info.test.ts \
-  test/connectors/raydium/clmm-routes/poolInfo.test.ts \
-  test/chains/ethereum/handle-transaction-execution.test.ts
-```
-
-Result: **7 suites, 49 tests, 0 failures.**
-
----
-
-## QA Testing Tips
-
-### PancakeSwap `execute-swap` (BigInt fix)
-
-POST to `/connectors/pancakeswap/clmm/execute-swap` with a decimal amount (e.g. `amount: 10.5`). Previously crashed with `TypeError: Cannot mix BigInt and other types`. Should now return a transaction hash.
-
-### PancakeSwap `positions-owned` (address-order fix)
-
-Verify `baseTokenAddress` / `quoteTokenAddress` are correct for a USDT/WBNB pool on BSC (not WETH-biased). The lower-address token is `token0`; the endpoint now derives base/quote from that ordering rather than a WETH special-case.
-
-### `binCount` across connectors
-
-```
-GET /connectors/orca/clmm/pool-info?network=mainnet-beta&poolAddress=Czfq3xZZ...&binCount=20
-GET /connectors/raydium/clmm/pool-info?network=mainnet-beta&poolAddress=3ucNos4N...&binCount=20
-GET /connectors/uniswap/clmm/pool-info?network=mainnet&poolAddress=0xd0b53d92...&binCount=20
-GET /connectors/pancakeswap/clmm/pool-info?network=bsc&poolAddress=0x172fcd41...&binCount=20
-```
-
-Expected: `bins` array of length 20, each entry with `binId`, `price`, `baseTokenAmount`, `quoteTokenAmount`. Without `binCount` or with `binCount=0`, `bins` must be absent from the response.
-
-Passing `binCount=402` must return HTTP 400 (schema maximum is 400, validated before handler).
-
-### Orca / Meteora BUY price inversion
-
-```
-GET /connectors/orca/clmm/quote-swap?...&side=SELL → price ≈ 200 (SOL/USDC example)
-GET /connectors/orca/clmm/quote-swap?...&side=BUY  → price ≈ 200 (must be same order of magnitude)
-```
-
-Pre-fix, the BUY result was `≈ 0.005`. Confirm both sides return a `price` value in the same numeric range.
-
-### Ethereum extended tx polling
-
-On a congested network (or testnet with slow block times), submit an approve transaction and observe gateway logs. You should see:
-
-```
-Transaction 0x... not confirmed within 30000ms — polling for receipt up to a further 90000ms
-Transaction 0x... confirmed in block NNNN (after extended poll)
-```
-
-Previously the gateway returned `null` receipt immediately at 30 s and bots recorded the tx as failed.
-
-### Swagger UI verification
-
-Navigate to `http://localhost:15888/docs` (dev mode). Confirm:
-
-- All four `pool-info` endpoints show `binCount` with min `0`, max `400`, default `0`, and description text.
-- `BinLiquidity` schema in the Models section shows descriptions for all four fields.