@nradko/metric-omm-sdk-v1 0.2.0 → 0.3.0

package/src/extensions/admin/oracleStopLoss.ts

@@ -0,0 +1,141 @@
+import type { Address, Hex } from "viem";
+import { encodeFunctionData } from "viem";
+import { OracleValueStopLossExtensionAbi } from "../../abis/OracleValueStopLossExtension.js";
+
+export function encodeProposeOracleStopLossTimelockCalldata(params: {
+  extension: Address;
+  pool: Address;
+  newTimelock: number;
+}): Hex {
+  return encodeFunctionData({
+    abi: OracleValueStopLossExtensionAbi,
+    functionName: "proposeOracleStopLossTimelock",
+    args: [params.pool, params.newTimelock],
+  });
+}
+
+export function encodeExecuteOracleStopLossTimelockCalldata(params: {
+  extension: Address;
+  pool: Address;
+}): Hex {
+  return encodeFunctionData({
+    abi: OracleValueStopLossExtensionAbi,
+    functionName: "executeOracleStopLossTimelock",
+    args: [params.pool],
+  });
+}
+
+export function encodeCancelOracleStopLossTimelockCalldata(params: {
+  extension: Address;
+  pool: Address;
+}): Hex {
+  return encodeFunctionData({
+    abi: OracleValueStopLossExtensionAbi,
+    functionName: "cancelOracleStopLossTimelock",
+    args: [params.pool],
+  });
+}
+
+export function encodeProposeOracleStopLossDrawdownCalldata(params: {
+  extension: Address;
+  pool: Address;
+  newMaxDrawdownE6: bigint;
+}): Hex {
+  return encodeFunctionData({
+    abi: OracleValueStopLossExtensionAbi,
+    functionName: "proposeOracleStopLossDrawdown",
+    args: [params.pool, params.newMaxDrawdownE6],
+  });
+}
+
+export function encodeExecuteOracleStopLossDrawdownCalldata(params: {
+  extension: Address;
+  pool: Address;
+}): Hex {
+  return encodeFunctionData({
+    abi: OracleValueStopLossExtensionAbi,
+    functionName: "executeOracleStopLossDrawdown",
+    args: [params.pool],
+  });
+}
+
+export function encodeCancelOracleStopLossDrawdownCalldata(params: {
+  extension: Address;
+  pool: Address;
+}): Hex {
+  return encodeFunctionData({
+    abi: OracleValueStopLossExtensionAbi,
+    functionName: "cancelOracleStopLossDrawdown",
+    args: [params.pool],
+  });
+}
+
+export function encodeProposeOracleStopLossDecayCalldata(params: {
+  extension: Address;
+  pool: Address;
+  newDecayPerSecondE8: bigint;
+}): Hex {
+  return encodeFunctionData({
+    abi: OracleValueStopLossExtensionAbi,
+    functionName: "proposeOracleStopLossDecay",
+    args: [params.pool, params.newDecayPerSecondE8],
+  });
+}
+
+export function encodeExecuteOracleStopLossDecayCalldata(params: {
+  extension: Address;
+  pool: Address;
+}): Hex {
+  return encodeFunctionData({
+    abi: OracleValueStopLossExtensionAbi,
+    functionName: "executeOracleStopLossDecay",
+    args: [params.pool],
+  });
+}
+
+export function encodeCancelOracleStopLossDecayCalldata(params: {
+  extension: Address;
+  pool: Address;
+}): Hex {
+  return encodeFunctionData({
+    abi: OracleValueStopLossExtensionAbi,
+    functionName: "cancelOracleStopLossDecay",
+    args: [params.pool],
+  });
+}
+
+export function encodeProposeOracleStopLossHighWatermarksCalldata(params: {
+  extension: Address;
+  pool: Address;
+  binIdx: number;
+  newHwmToken0: bigint;
+  newHwmToken1: bigint;
+}): Hex {
+  return encodeFunctionData({
+    abi: OracleValueStopLossExtensionAbi,
+    functionName: "proposeOracleStopLossHighWatermarks",
+    args: [params.pool, params.binIdx, params.newHwmToken0, params.newHwmToken1],
+  });
+}
+
+export function encodeExecuteOracleStopLossHighWatermarksCalldata(params: {
+  extension: Address;
+  pool: Address;
+}): Hex {
+  return encodeFunctionData({
+    abi: OracleValueStopLossExtensionAbi,
+    functionName: "executeOracleStopLossHighWatermarks",
+    args: [params.pool],
+  });
+}
+
+export function encodeCancelOracleStopLossHighWatermarksCalldata(params: {
+  extension: Address;
+  pool: Address;
+}): Hex {
+  return encodeFunctionData({
+    abi: OracleValueStopLossExtensionAbi,
+    functionName: "cancelOracleStopLossHighWatermarks",
+    args: [params.pool],
+  });
+}

package/src/extensions/admin/priceVelocityGuard.ts

@@ -0,0 +1,27 @@
+import type { Address, Hex } from "viem";
+import { encodeFunctionData } from "viem";
+import { PriceVelocityGuardExtensionAbi } from "../../abis/PriceVelocityGuardExtension.js";
+
+export function encodeSetMaxChangePerBlockCalldata(params: {
+  extension: Address;
+  pool: Address;
+  maxChangePerBlockE18: bigint;
+}): Hex {
+  return encodeFunctionData({
+    abi: PriceVelocityGuardExtensionAbi,
+    functionName: "setMaxChangePerBlock",
+    args: [params.pool, params.maxChangePerBlockE18],
+  });
+}
+
+export function encodeSetLastMidPriceCalldata(params: {
+  extension: Address;
+  pool: Address;
+  lastMidPriceX64: bigint;
+}): Hex {
+  return encodeFunctionData({
+    abi: PriceVelocityGuardExtensionAbi,
+    functionName: "setLastMidPrice",
+    args: [params.pool, params.lastMidPriceX64],
+  });
+}

package/src/extensions/admin/swapAllowlist.ts

@@ -0,0 +1,16 @@
+import type { Address, Hex } from "viem";
+import { encodeFunctionData } from "viem";
+import { SwapAllowlistExtensionAbi } from "../../abis/SwapAllowlistExtension.js";
+
+export function encodeSetAllowedToSwapCalldata(params: {
+  extension: Address;
+  pool: Address;
+  swapper: Address;
+  allowed: boolean;
+}): Hex {
+  return encodeFunctionData({
+    abi: SwapAllowlistExtensionAbi,
+    functionName: "setAllowedToSwap",
+    args: [params.pool, params.swapper, params.allowed],
+  });
+}

package/src/extensions/index.ts

@@ -0,0 +1,31 @@
+export {
+  EMPTY_EXTENSION_DATA,
+  EMPTY_EXTENSION_ORDERS,
+  type ExtensionOrders,
+  type PoolExtensions,
+} from "./types.js";
+
+export { encodeExtensionOrder, buildExtensionOrders, type ExtensionOrderAction } from "./orders.js";
+
+export { EMPTY_EXTENSION_INIT_DATA, encodeOracleStopLossInitData } from "./init/index.js";
+
+export { encodeSetAllowedToDepositCalldata } from "./admin/depositAllowlist.js";
+export { encodeSetAllowedToSwapCalldata } from "./admin/swapAllowlist.js";
+export {
+  encodeSetMaxChangePerBlockCalldata,
+  encodeSetLastMidPriceCalldata,
+} from "./admin/priceVelocityGuard.js";
+export {
+  encodeProposeOracleStopLossTimelockCalldata,
+  encodeExecuteOracleStopLossTimelockCalldata,
+  encodeCancelOracleStopLossTimelockCalldata,
+  encodeProposeOracleStopLossDrawdownCalldata,
+  encodeExecuteOracleStopLossDrawdownCalldata,
+  encodeCancelOracleStopLossDrawdownCalldata,
+  encodeProposeOracleStopLossDecayCalldata,
+  encodeExecuteOracleStopLossDecayCalldata,
+  encodeCancelOracleStopLossDecayCalldata,
+  encodeProposeOracleStopLossHighWatermarksCalldata,
+  encodeExecuteOracleStopLossHighWatermarksCalldata,
+  encodeCancelOracleStopLossHighWatermarksCalldata,
+} from "./admin/oracleStopLoss.js";

package/src/extensions/init/index.ts

@@ -0,0 +1,21 @@
+import type { Hex } from "viem";
+import { encodeAbiParameters } from "viem";
+import { EMPTY_EXTENSION_DATA } from "../types.js";
+
+/** Default init payload for extensions whose `initialize` is a no-op. */
+export const EMPTY_EXTENSION_INIT_DATA = EMPTY_EXTENSION_DATA;
+
+/**
+ * Init data for `OracleValueStopLossExtension.initialize`.
+ * `abi.encode(uint32 drawdownE6, uint32 decayPerSecondE8, uint32 timelockSeconds)`.
+ */
+export function encodeOracleStopLossInitData(params: {
+  drawdownE6: number;
+  decayPerSecondE8: number;
+  timelockSeconds: number;
+}): Hex {
+  return encodeAbiParameters(
+    [{ type: "uint32" }, { type: "uint32" }, { type: "uint32" }],
+    [params.drawdownE6, params.decayPerSecondE8, params.timelockSeconds],
+  );
+}

package/src/extensions/orders.ts

@@ -0,0 +1,33 @@
+import type { ExtensionOrders } from "./types.js";
+import { EMPTY_EXTENSION_ORDERS } from "./types.js";
+
+/** Pack up to seven 3-bit extension indices (0 = end of sequence). */
+export function encodeExtensionOrder(slots: readonly number[]): bigint {
+  if (slots.length > 7) {
+    throw new Error("encodeExtensionOrder accepts at most 7 slots");
+  }
+
+  let order = 0n;
+  for (let i = 0; i < slots.length; i++) {
+    const slot = slots[i];
+    if (!Number.isInteger(slot) || slot < 0 || slot > 7) {
+      throw new Error(`encodeExtensionOrder slot ${i} must be an integer in [0, 7]`);
+    }
+    order |= BigInt(slot) << BigInt(i * 3);
+  }
+  return order;
+}
+
+export type ExtensionOrderAction = keyof ExtensionOrders;
+
+/** Build extension orders from per-action slot arrays. Omitted actions default to zero. */
+export function buildExtensionOrders(
+  partial: Partial<Record<ExtensionOrderAction, readonly number[]>>,
+): ExtensionOrders {
+  return {
+    ...EMPTY_EXTENSION_ORDERS,
+    ...Object.fromEntries(
+      Object.entries(partial).map(([action, slots]) => [action, encodeExtensionOrder(slots ?? [])]),
+    ),
+  } as ExtensionOrders;
+}

package/src/extensions/types.ts

@@ -0,0 +1,33 @@
+import type { Address, Hex } from "viem";
+
+/** Invocation order for a single extension action (packed 3-bit slots). */
+export interface ExtensionOrders {
+  beforeAddLiquidity: bigint;
+  afterAddLiquidity: bigint;
+  beforeRemoveLiquidity: bigint;
+  afterRemoveLiquidity: bigint;
+  beforeSwap: bigint;
+  afterSwap: bigint;
+}
+
+/** Up to seven extension addresses configured on a pool (index 1–7). */
+export interface PoolExtensions {
+  extension1: Address;
+  extension2: Address;
+  extension3: Address;
+  extension4: Address;
+  extension5: Address;
+  extension6: Address;
+  extension7: Address;
+}
+
+export const EMPTY_EXTENSION_DATA = "0x" as Hex;
+
+export const EMPTY_EXTENSION_ORDERS: ExtensionOrders = {
+  beforeAddLiquidity: 0n,
+  afterAddLiquidity: 0n,
+  beforeRemoveLiquidity: 0n,
+  afterRemoveLiquidity: 0n,
+  beforeSwap: 0n,
+  afterSwap: 0n,
+};

package/src/index.ts

@@ -49,6 +49,10 @@ export {
   MetricOmmPoolSwapperAbi,
   MetricOmmPoolLiquidityAdderAbi,
   MetricOmmPoolFactoryAbi,
+  DepositAllowlistExtensionAbi,
+  SwapAllowlistExtensionAbi,
+  PriceVelocityGuardExtensionAbi,
+  OracleValueStopLossExtensionAbi,
 } from "./abis/index.js";
 
 // ============ Utils ============
@@ -71,6 +75,7 @@ export {
   preparePoolBinData,
   type CreatePoolFactoryParams,
   type CreatePoolParams,
+  type ExtensionOrders,
   getPoolImmutables,
   getPoolFeeConfig,
   getPoolState,
@@ -157,3 +162,31 @@ export {
   type CollectedFactoryFeeTx,
   type CollectFactoryFeesResult,
 } from "./factory/index.js";
+
+// ============ Extension Functions ============
+export {
+  EMPTY_EXTENSION_DATA,
+  EMPTY_EXTENSION_ORDERS,
+  EMPTY_EXTENSION_INIT_DATA,
+  encodeExtensionOrder,
+  buildExtensionOrders,
+  encodeOracleStopLossInitData,
+  encodeSetAllowedToDepositCalldata,
+  encodeSetAllowedToSwapCalldata,
+  encodeSetMaxChangePerBlockCalldata,
+  encodeSetLastMidPriceCalldata,
+  encodeProposeOracleStopLossTimelockCalldata,
+  encodeExecuteOracleStopLossTimelockCalldata,
+  encodeCancelOracleStopLossTimelockCalldata,
+  encodeProposeOracleStopLossDrawdownCalldata,
+  encodeExecuteOracleStopLossDrawdownCalldata,
+  encodeCancelOracleStopLossDrawdownCalldata,
+  encodeProposeOracleStopLossDecayCalldata,
+  encodeExecuteOracleStopLossDecayCalldata,
+  encodeCancelOracleStopLossDecayCalldata,
+  encodeProposeOracleStopLossHighWatermarksCalldata,
+  encodeExecuteOracleStopLossHighWatermarksCalldata,
+  encodeCancelOracleStopLossHighWatermarksCalldata,
+  type PoolExtensions,
+  type ExtensionOrderAction,
+} from "./extensions/index.js";

package/src/pool/create.ts

@@ -3,11 +3,12 @@
  */
 
 import type { Address, PublicClient, WalletClient, Hex } from "viem";
-import { encodeFunctionData, zeroAddress } from "viem";
+import { encodeFunctionData } from "viem";
 import { POOL_FACTORY_ABI } from "../constants.js";
 import { createUniformBins } from "../utils/binData.js";
+import { EMPTY_EXTENSION_ORDERS, type ExtensionOrders } from "../extensions/types.js";
 
-// ============ Types ============
+export type { ExtensionOrders };
 
 /**
  * Parameters for creating a new pool via the v1 factory.
@@ -17,10 +18,12 @@ export interface CreatePoolFactoryParams {
   token1: Address;
   priceProvider: Address;
   admin: Address;
-  /** Defaults to zero address (no hooks). */
-  hooks?: Address;
-  /** Defaults to 0. */
-  hooksPermissions?: number;
+  /** Defaults to empty (no extensions). */
+  extensions?: Address[];
+  /** Defaults to all-zero orders (no extension calls). */
+  extensionOrders?: ExtensionOrders;
+  /** Defaults to empty; length must match `extensions` when extensions are set. */
+  extensionInitData?: Hex[];
   /** Defaults to 0. */
   priceProviderTimelock?: bigint;
   nonNegativeBins: bigint[];
@@ -69,8 +72,9 @@ export function prepareFactoryCreatePoolParams(params: CreatePoolFactoryParams)
     token0: params.token0,
     token1: params.token1,
     priceProvider: params.priceProvider,
-    hooks: params.hooks ?? zeroAddress,
-    hooksPermissions: params.hooksPermissions ?? 0,
+    extensions: params.extensions ?? [],
+    extensionOrders: params.extensionOrders ?? EMPTY_EXTENSION_ORDERS,
+    extensionInitData: params.extensionInitData ?? [],
     priceProviderTimelock: params.priceProviderTimelock ?? 0n,
     admin: params.admin,
     initialAmount0PerShareE18: params.initialScaledToken0PerShareE18,

package/src/pool/index.ts

@@ -10,6 +10,7 @@ export {
   preparePoolBinData,
   type CreatePoolFactoryParams,
   type CreatePoolParams,
+  type ExtensionOrders,
 } from "./create.js";
 
 // Pool read functions

package/src/pool/liquidity.ts

@@ -6,6 +6,7 @@
 import type { Address, PublicClient, Hex } from "viem";
 import { encodeFunctionData } from "viem";
 import { MAX_UINT104, MAX_INT104, MAX_INT128, LIQUIDITY_ADDER_ABI } from "../constants.js";
+import { EMPTY_EXTENSION_DATA } from "../extensions/types.js";
 import { MetricOmmPoolAbi } from "../abis/MetricOmmPool.js";
 import type { LiquidityDelta, LiquidityBinValueInput, PoolLiquidityDelta } from "../types.js";
 import { getPoolImmutables } from "./read.js";
@@ -28,7 +29,16 @@ export { convertToken0ToToken1, convertToken1ToToken0 };
 export const getPositionShares = getPositionBinSharesRange;
 export const getPositionSharesForBins = getPositionBinSharesForBins;
 
-const EMPTY_HOOK_DATA = "0x" as Hex;
+function getLiquidityAdderFunction(name: string, inputCount: number) {
+  const item = (LIQUIDITY_ADDER_ABI as readonly any[]).find(
+    (entry) =>
+      entry?.type === "function" && entry?.name === name && entry?.inputs?.length === inputCount,
+  );
+  if (!item) {
+    throw new Error(`LiquidityAdder ABI missing ${name} overload (${inputCount} inputs)`);
+  }
+  return item;
+}
 
 export interface RemoveLiquidityParams {
   percentageToRemove: number;
@@ -711,10 +721,10 @@ export function encodeAddLiquidityExactSharesSelfCalldata(params: {
   deltas: PoolLiquidityDelta;
   maxAmountToken0: bigint;
   maxAmountToken1: bigint;
-  hookData?: Hex;
+  extensionData?: Hex;
 }): Hex {
   return encodeFunctionData({
-    abi: LIQUIDITY_ADDER_ABI,
+    abi: [getLiquidityAdderFunction("addLiquidityExactShares", 6)],
     functionName: "addLiquidityExactShares",
     args: [
       params.pool,
@@ -722,7 +732,7 @@ export function encodeAddLiquidityExactSharesSelfCalldata(params: {
       { binIdxs: [...params.deltas.binIdxs], shares: [...params.deltas.shares] },
       params.maxAmountToken0,
       params.maxAmountToken1,
-      params.hookData ?? EMPTY_HOOK_DATA,
+      params.extensionData ?? EMPTY_EXTENSION_DATA,
     ],
   });
 }
@@ -734,10 +744,10 @@ export function encodeAddLiquidityExactSharesWithOwnerCalldata(params: {
   deltas: PoolLiquidityDelta;
   maxAmountToken0: bigint;
   maxAmountToken1: bigint;
-  hookData?: Hex;
+  extensionData?: Hex;
 }): Hex {
   return encodeFunctionData({
-    abi: LIQUIDITY_ADDER_ABI,
+    abi: [getLiquidityAdderFunction("addLiquidityExactShares", 7)],
     functionName: "addLiquidityExactShares",
     args: [
       params.pool,
@@ -746,7 +756,7 @@ export function encodeAddLiquidityExactSharesWithOwnerCalldata(params: {
       { binIdxs: [...params.deltas.binIdxs], shares: [...params.deltas.shares] },
       params.maxAmountToken0,
       params.maxAmountToken1,
-      params.hookData ?? EMPTY_HOOK_DATA,
+      params.extensionData ?? EMPTY_EXTENSION_DATA,
     ],
   });
 }
@@ -757,10 +767,14 @@ export function encodeAddLiquidityWeightedSelfCalldata(params: {
   weightDeltas: PoolLiquidityDelta;
   maxAmountToken0: bigint;
   maxAmountToken1: bigint;
-  hookData?: Hex;
+  minimalCurBin?: number;
+  minimalPosition?: bigint;
+  maximalCurBin?: number;
+  maximalPosition?: bigint;
+  extensionData?: Hex;
 }): Hex {
   return encodeFunctionData({
-    abi: LIQUIDITY_ADDER_ABI,
+    abi: [getLiquidityAdderFunction("addLiquidityWeighted", 10)],
     functionName: "addLiquidityWeighted",
     args: [
       params.pool,
@@ -768,7 +782,11 @@ export function encodeAddLiquidityWeightedSelfCalldata(params: {
       { binIdxs: [...params.weightDeltas.binIdxs], shares: [...params.weightDeltas.shares] },
       params.maxAmountToken0,
       params.maxAmountToken1,
-      params.hookData ?? EMPTY_HOOK_DATA,
+      params.minimalCurBin ?? -128,
+      params.minimalPosition ?? 0n,
+      params.maximalCurBin ?? 127,
+      params.maximalPosition ?? MAX_UINT104,
+      params.extensionData ?? EMPTY_EXTENSION_DATA,
     ],
   });
 }
@@ -780,10 +798,14 @@ export function encodeAddLiquidityWeightedWithOwnerCalldata(params: {
   weightDeltas: PoolLiquidityDelta;
   maxAmountToken0: bigint;
   maxAmountToken1: bigint;
-  hookData?: Hex;
+  minimalCurBin?: number;
+  minimalPosition?: bigint;
+  maximalCurBin?: number;
+  maximalPosition?: bigint;
+  extensionData?: Hex;
 }): Hex {
   return encodeFunctionData({
-    abi: LIQUIDITY_ADDER_ABI,
+    abi: [getLiquidityAdderFunction("addLiquidityWeighted", 11)],
     functionName: "addLiquidityWeighted",
     args: [
       params.pool,
@@ -792,7 +814,11 @@ export function encodeAddLiquidityWeightedWithOwnerCalldata(params: {
       { binIdxs: [...params.weightDeltas.binIdxs], shares: [...params.weightDeltas.shares] },
       params.maxAmountToken0,
       params.maxAmountToken1,
-      params.hookData ?? EMPTY_HOOK_DATA,
+      params.minimalCurBin ?? -128,
+      params.minimalPosition ?? 0n,
+      params.maximalCurBin ?? 127,
+      params.maximalPosition ?? MAX_UINT104,
+      params.extensionData ?? EMPTY_EXTENSION_DATA,
     ],
   });
 }
@@ -801,7 +827,7 @@ export function encodeRemoveLiquidityCalldata(params: {
   owner: Address;
   salt: bigint;
   deltas: PoolLiquidityDelta;
-  hookData?: Hex;
+  extensionData?: Hex;
 }): Hex {
   return encodeFunctionData({
     abi: MetricOmmPoolAbi,
@@ -810,7 +836,7 @@ export function encodeRemoveLiquidityCalldata(params: {
       params.owner,
       params.salt,
       { binIdxs: [...params.deltas.binIdxs], shares: [...params.deltas.shares] },
-      params.hookData ?? EMPTY_HOOK_DATA,
+      params.extensionData ?? EMPTY_EXTENSION_DATA,
     ],
   });
 }

package/src/pool/read.ts

@@ -28,10 +28,21 @@ export async function getPoolImmutables(
     initialScaledToken1PerShareE18: bigint;
     minimalMintableLiquidity: bigint;
     immutablePriceProvider: Address;
-    hooks: Address;
-    hooksPermissions: number;
     lowestBin: bigint;
     highestBin: bigint;
+    extension1: Address;
+    extension2: Address;
+    extension3: Address;
+    extension4: Address;
+    extension5: Address;
+    extension6: Address;
+    extension7: Address;
+    beforeAddLiquidityOrder: bigint;
+    afterAddLiquidityOrder: bigint;
+    beforeRemoveLiquidityOrder: bigint;
+    afterRemoveLiquidityOrder: bigint;
+    beforeSwapOrder: bigint;
+    afterSwapOrder: bigint;
   };
 
   return {
@@ -44,10 +55,23 @@ export async function getPoolImmutables(
     initialScaledToken1PerShareE18: imm.initialScaledToken1PerShareE18,
     minimalMintableLiquidity: imm.minimalMintableLiquidity,
     immutablePriceProvider: imm.immutablePriceProvider,
-    hooks: imm.hooks,
-    hooksPermissions: imm.hooksPermissions,
-    maxDriftE8: 0n,
-    maxDriftDecayPerSecondE8: 0n,
+    extensions: {
+      extension1: imm.extension1,
+      extension2: imm.extension2,
+      extension3: imm.extension3,
+      extension4: imm.extension4,
+      extension5: imm.extension5,
+      extension6: imm.extension6,
+      extension7: imm.extension7,
+    },
+    extensionOrders: {
+      beforeAddLiquidity: imm.beforeAddLiquidityOrder,
+      afterAddLiquidity: imm.afterAddLiquidityOrder,
+      beforeRemoveLiquidity: imm.beforeRemoveLiquidityOrder,
+      afterRemoveLiquidity: imm.afterRemoveLiquidityOrder,
+      beforeSwap: imm.beforeSwapOrder,
+      afterSwap: imm.afterSwapOrder,
+    },
     lowestBin: Number(imm.lowestBin),
     highestBin: Number(imm.highestBin),
   };
@@ -109,9 +133,6 @@ export async function getPoolState(
   };
 }
 
-/**
- * Read bin state (scaled balances) via MetricOmmPoolDataProvider.
- */
 export async function getBinState(
   publicClient: PublicClient,
   dataProviderAddress: Address,
@@ -122,7 +143,7 @@ export async function getBinState(
     address: dataProviderAddress,
     abi: DATA_PROVIDER_ABI,
     functionName: "binState",
-    args: [poolAddress, binIdx],
+    args: [poolAddress, BigInt(binIdx)],
   })) as readonly [bigint, bigint, number, number, number];
 
   return {
@@ -134,9 +155,6 @@ export async function getBinState(
   };
 }
 
-/**
- * Get user position shares in a specific bin (DataProvider).
- */
 export async function getPositionBinShares(
   publicClient: PublicClient,
   dataProviderAddress: Address,
@@ -145,10 +163,10 @@ export async function getPositionBinShares(
   salt: bigint,
   binIdx: number,
 ): Promise<bigint> {
-  return (await publicClient.readContract({
+  return publicClient.readContract({
     address: dataProviderAddress,
     abi: DATA_PROVIDER_ABI,
     functionName: "positionBinShares",
-    args: [poolAddress, owner, salt, binIdx],
-  })) as bigint;
+    args: [poolAddress, owner, salt, BigInt(binIdx)],
+  }) as Promise<bigint>;
 }