@nradko/metric-omm-sdk-v1 0.4.3 → 0.4.4

package/src/abis/MetricOmmPoolLiquidityAdder.ts

@@ -1,9 +1,26 @@
 export const MetricOmmPoolLiquidityAdderAbi = [
   {
-    inputs: [],
+    inputs: [
+      {
+        internalType: "address",
+        name: "weth",
+        type: "address",
+      },
+    ],
     stateMutability: "nonpayable",
     type: "constructor",
   },
+  {
+    inputs: [
+      {
+        internalType: "address",
+        name: "target",
+        type: "address",
+      },
+    ],
+    name: "AddressEmptyCode",
+    type: "error",
+  },
   {
     inputs: [],
     name: "CallbackContextNotActive",
@@ -45,11 +62,58 @@ export const MetricOmmPoolLiquidityAdderAbi = [
     name: "CursorOutOfBounds",
     type: "error",
   },
+  {
+    inputs: [],
+    name: "ETHTransferFailed",
+    type: "error",
+  },
   {
     inputs: [],
     name: "EmptyLiquidityDelta",
     type: "error",
   },
+  {
+    inputs: [],
+    name: "FailedCall",
+    type: "error",
+  },
+  {
+    inputs: [
+      {
+        internalType: "address",
+        name: "token",
+        type: "address",
+      },
+      {
+        internalType: "uint256",
+        name: "required",
+        type: "uint256",
+      },
+      {
+        internalType: "uint256",
+        name: "available",
+        type: "uint256",
+      },
+    ],
+    name: "InsufficientToken",
+    type: "error",
+  },
+  {
+    inputs: [
+      {
+        internalType: "uint256",
+        name: "required",
+        type: "uint256",
+      },
+      {
+        internalType: "uint256",
+        name: "available",
+        type: "uint256",
+      },
+    ],
+    name: "InsufficientWETH",
+    type: "error",
+  },
   {
     inputs: [
       {
@@ -76,6 +140,11 @@ export const MetricOmmPoolLiquidityAdderAbi = [
     name: "InvalidPositionOwner",
     type: "error",
   },
+  {
+    inputs: [],
+    name: "InvalidWETH",
+    type: "error",
+  },
   {
     inputs: [],
     name: "LiquidityDeltaLengthMismatch",
@@ -123,6 +192,11 @@ export const MetricOmmPoolLiquidityAdderAbi = [
     name: "MaxAmountExceeded",
     type: "error",
   },
+  {
+    inputs: [],
+    name: "NotWETH",
+    type: "error",
+  },
   {
     inputs: [],
     name: "PayContextAlreadyActive",
@@ -228,7 +302,7 @@ export const MetricOmmPoolLiquidityAdderAbi = [
         type: "uint256",
       },
     ],
-    stateMutability: "nonpayable",
+    stateMutability: "payable",
     type: "function",
   },
   {
@@ -289,7 +363,7 @@ export const MetricOmmPoolLiquidityAdderAbi = [
         type: "uint256",
       },
     ],
-    stateMutability: "nonpayable",
+    stateMutability: "payable",
     type: "function",
   },
   {
@@ -370,7 +444,7 @@ export const MetricOmmPoolLiquidityAdderAbi = [
         type: "uint256",
       },
     ],
-    stateMutability: "nonpayable",
+    stateMutability: "payable",
     type: "function",
   },
   {
@@ -456,7 +530,7 @@ export const MetricOmmPoolLiquidityAdderAbi = [
         type: "uint256",
       },
     ],
-    stateMutability: "nonpayable",
+    stateMutability: "payable",
     type: "function",
   },
   {
@@ -482,4 +556,75 @@ export const MetricOmmPoolLiquidityAdderAbi = [
     stateMutability: "nonpayable",
     type: "function",
   },
+  {
+    inputs: [
+      {
+        internalType: "bytes[]",
+        name: "data",
+        type: "bytes[]",
+      },
+    ],
+    name: "multicall",
+    outputs: [
+      {
+        internalType: "bytes[]",
+        name: "results",
+        type: "bytes[]",
+      },
+    ],
+    stateMutability: "payable",
+    type: "function",
+  },
+  {
+    inputs: [],
+    name: "refundETH",
+    outputs: [],
+    stateMutability: "payable",
+    type: "function",
+  },
+  {
+    inputs: [
+      {
+        internalType: "address",
+        name: "token",
+        type: "address",
+      },
+      {
+        internalType: "uint256",
+        name: "amountMinimum",
+        type: "uint256",
+      },
+      {
+        internalType: "address",
+        name: "recipient",
+        type: "address",
+      },
+    ],
+    name: "sweepToken",
+    outputs: [],
+    stateMutability: "payable",
+    type: "function",
+  },
+  {
+    inputs: [
+      {
+        internalType: "uint256",
+        name: "amountMinimum",
+        type: "uint256",
+      },
+      {
+        internalType: "address",
+        name: "recipient",
+        type: "address",
+      },
+    ],
+    name: "unwrapWETH9",
+    outputs: [],
+    stateMutability: "payable",
+    type: "function",
+  },
+  {
+    stateMutability: "payable",
+    type: "receive",
+  },
 ] as const;

package/src/abis/MetricOmmSimpleRouter.ts

@@ -238,22 +238,6 @@ export const MetricOmmSimpleRouterAbi = [
     name: "InvalidPriceLimitForDirection",
     type: "error",
   },
-  {
-    inputs: [
-      {
-        internalType: "bool",
-        name: "zeroForOne",
-        type: "bool",
-      },
-      {
-        internalType: "uint128",
-        name: "priceLimitX64",
-        type: "uint128",
-      },
-    ],
-    name: "InvalidPriceLimitForDirection",
-    type: "error",
-  },
   {
     inputs: [],
     name: "InvalidSwapDeltas",

package/src/abis/MetricOmmSwapQuoter.ts

@@ -89,22 +89,6 @@ export const MetricOmmSwapQuoterAbi = [
     name: "InvalidPriceLimitForDirection",
     type: "error",
   },
-  {
-    inputs: [
-      {
-        internalType: "bool",
-        name: "zeroForOne",
-        type: "bool",
-      },
-      {
-        internalType: "uint128",
-        name: "priceLimitX64",
-        type: "uint128",
-      },
-    ],
-    name: "InvalidPriceLimitForDirection",
-    type: "error",
-  },
   {
     inputs: [],
     name: "InvalidSwapDeltas",

package/src/abis/SwapAllowlistExtension.ts

@@ -73,6 +73,25 @@ export const SwapAllowlistExtensionAbi = [
     name: "OnlyPoolAdmin",
     type: "error",
   },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: "address",
+        name: "pool",
+        type: "address",
+      },
+      {
+        indexed: false,
+        internalType: "bool",
+        name: "allowed",
+        type: "bool",
+      },
+    ],
+    name: "AllowAllSwappersSet",
+    type: "event",
+  },
   {
     anonymous: false,
     inputs: [
@@ -312,6 +331,25 @@ export const SwapAllowlistExtensionAbi = [
     stateMutability: "nonpayable",
     type: "function",
   },
+  {
+    inputs: [
+      {
+        internalType: "address",
+        name: "pool",
+        type: "address",
+      },
+    ],
+    name: "allowAllSwappers",
+    outputs: [
+      {
+        internalType: "bool",
+        name: "",
+        type: "bool",
+      },
+    ],
+    stateMutability: "view",
+    type: "function",
+  },
   {
     inputs: [
       {
@@ -545,6 +583,24 @@ export const SwapAllowlistExtensionAbi = [
     stateMutability: "view",
     type: "function",
   },
+  {
+    inputs: [
+      {
+        internalType: "address",
+        name: "pool_",
+        type: "address",
+      },
+      {
+        internalType: "bool",
+        name: "allowed",
+        type: "bool",
+      },
+    ],
+    name: "setAllowAllSwappers",
+    outputs: [],
+    stateMutability: "nonpayable",
+    type: "function",
+  },
   {
     inputs: [
       {

package/src/abis/index.ts

@@ -4,13 +4,13 @@
 
 export { MetricOmmPoolAbi } from "./MetricOmmPool.js";
 export { MetricOmmPoolDataProviderAbi } from "./MetricOmmPoolDataProvider.js";
-export { MetricOmmSwapQuoterAbi } from "./MetricOmmSwapQuoter.js";
 export { MetricOmmSimpleRouterAbi } from "./MetricOmmSimpleRouter.js";
+export { MetricOmmSwapQuoterAbi } from "./MetricOmmSwapQuoter.js";
 export { MetricOmmPoolLiquidityAdderAbi } from "./MetricOmmPoolLiquidityAdder.js";
 export { MetricOmmPoolFactoryAbi } from "./MetricOmmPoolFactory.js";
 export { DepositAllowlistExtensionAbi } from "./DepositAllowlistExtension.js";
 export { SwapAllowlistExtensionAbi } from "./SwapAllowlistExtension.js";
-export { PriceVelocityGuardExtensionAbi } from "./PriceVelocityGuardExtension.js";
 export { OracleValueStopLossExtensionAbi } from "./OracleValueStopLossExtension.js";
+export { PriceVelocityGuardExtensionAbi } from "./PriceVelocityGuardExtension.js";
 export { PriceProviderAbi } from "./PriceProvider.js";
 export { OracleProviderAbi } from "./OracleProvider.js";

package/src/addresses.ts

@@ -38,7 +38,7 @@ export interface ChainAddresses {
   liquidityAdder: Address;
   /** MetricOmmPoolDataProvider (pool reads, swap depth, revert quotes). */
   dataProvider: Address;
-  /** MetricOmmSimpleRouter (single- and multi-hop ERC-20 swaps). */
+  /** MetricOmmSimpleRouter (single- and multi-hop swaps). */
   simpleRouter: Address;
   /** MetricOmmSwapQuoter (live pool quotes via revert callback). */
   quoter: Address;
@@ -58,21 +58,21 @@ export interface ChainAddresses {
 
 /** Shared protocol deployment (Ethereum + Base). */
 const PROTOCOL_ADDRESSES = {
-  factory: "0x567C7205107257650dC73a73d87b879a45F5b6F6",
-  poolDeployer: "0xBe34D0cEb6CF1acbf55dEf35E4dC3e17BDfb6AE4",
-  liquidityAdder: "0xA49acb20f33e4FB340f41d949fd7E4c48A242579",
-  dataProvider: "0x803Cb583c1FbE97e9cA7899bE77cC110A78B8737",
-  simpleRouter: "0x146D72ad62957F62ABCC14985aBFCC32a785F996",
-  quoter: "0x8A45A0239DE0C8f438392f2E5AFcbee316E64965",
+  factory: "0xf98aD80FE666B9a23075CdF64aF5971802844Fd8",
+  poolDeployer: "0xf93e1ea4516E99A4Ee81D4979C8D3C8Ab636e397",
+  liquidityAdder: "0xdd615506d83e2d94f30aaf17e846330164ab599e",
+  dataProvider: "0x7dc8eD16661A5003D9708B55f768484f9E963AdB",
+  simpleRouter: "0xa4d4be6a6b6d9f6532cacfe61fc666ef2f9997ed",
+  quoter: "0xfa13b57b570B43c8b9A61ba8D2C1781aB064f617",
   extensions: {
-    depositAllowlistExtension: "0xEd246C7B6963E20aa4fCa4912Af8E2Bff6Ca5f4D",
-    swapAllowlistExtension: "0x54BF5ba3c5C6C513722a54771b2F2A609e2e3A75",
-    oracleValueStopLossExtension: "0x6063a740034E85d34cC55Bc7069BC7b7cdE888bf",
-    priceVelocityGuardExtension: "0xda4c0860d9fa8d254e425d485BD9C09BD2b051F7",
+    depositAllowlistExtension: "0xC93BdA96021650DBfCEab6470c5329a0F391C160",
+    swapAllowlistExtension: "0x50c58A0bf9711Ae091c3aF5C3eab49544062662e",
+    oracleValueStopLossExtension: "0x34822E3D4265a8E42284Ce9807A1a804b7552838",
+    priceVelocityGuardExtension: "0x07A5c4821cd84a9A6162a6b1f756aA458B7616E3",
   },
 } as const satisfies Omit<ChainAddresses, "wrappedNative">;
 
-/** Extensions-era deployment — Ethereum mainnet and Base (Jun 2026). */
+/** Periphery deployment — Ethereum mainnet and Base (CREATE2, same protocol addresses). */
 export const ADDRESSES: Record<DeployedChainId, ChainAddresses> = {
   [ChainId.ETHEREUM]: {
     ...PROTOCOL_ADDRESSES,

package/src/index.ts

@@ -130,6 +130,25 @@ export {
   type BinRemovalSpec,
 } from "./pool/liquidity.js";
 
+export {
+  prepareAddLiquidityExactSharesSelfSupportingNativePaymentCalldata,
+  prepareAddLiquidityExactSharesWithOwnerSupportingNativePaymentCalldata,
+  prepareAddLiquidityWeightedSelfSupportingNativePaymentCalldata,
+  prepareAddLiquidityWeightedWithOwnerSupportingNativePaymentCalldata,
+  UNCONSTRAINED_LIQUIDITY_CURSOR_BOUNDS,
+  type LiquidityCursorBounds,
+  prepareLiquidityCursorBounds,
+  computeLiquidityCursorBounds,
+  cursorMovementToPositionDelta,
+} from "./pool/index.js";
+
+// ============ PeripheryPayments ============
+export {
+  encodeMulticallCalldata,
+  encodeRefundETHCalldata,
+  encodeUnwrapWETH9Calldata,
+} from "./peripheryPayments/index.js";
+
 // ============ Quoter Functions ============
 export {
   quoteLiveExactInSingle,
@@ -168,9 +187,6 @@ export {
   prepareExactOutputSingleCalldata,
   prepareExactInputCalldata,
   prepareExactOutputCalldata,
-  encodeMulticallCalldata,
-  encodeRefundETHCalldata,
-  encodeUnwrapWETH9Calldata,
   prepareExactInputSingleAndUnwrapCalldata,
   prepareExactInputAndUnwrapCalldata,
   prepareExactInputSingleSupportingNativePaymentCalldata,

package/src/peripheryPayments/index.ts

@@ -0,0 +1,5 @@
+export {
+  encodeMulticallCalldata,
+  encodeRefundETHCalldata,
+  encodeUnwrapWETH9Calldata,
+} from "./simpleRouter.js";

package/src/{router/utils.ts → peripheryPayments/simpleRouter.ts}

@@ -1,4 +1,4 @@
-/** SimpleRouter multicall and PeripheryPayments calldata encoders. */
+/** MetricOmmSimpleRouter multicall and PeripheryPayments calldata encoders. */
 
 import type { Address, Hex } from "viem";
 import { encodeFunctionData } from "viem";

package/src/pool/cursorBounds.ts

@@ -0,0 +1,112 @@
+/**
+ * Helpers for weighted-add LiquidityAdder cursor bounds.
+ *
+ * Cursor position is measured in linear units: each bin spans MAX_UINT104 + 1
+ * positions (0 … MAX_UINT104). Movement can cross bin boundaries; distance is
+ * summed across bins.
+ */
+
+import type { Address, PublicClient } from "viem";
+import { MAX_UINT104 } from "../constants.js";
+import { getSlot0 } from "../dataProvider/read.js";
+import { getAddressesOrThrow } from "../addresses.js";
+import { UNCONSTRAINED_LIQUIDITY_CURSOR_BOUNDS, type LiquidityCursorBounds } from "./liquidity.js";
+
+const POSITIONS_PER_BIN = MAX_UINT104 + 1n;
+const CURSOR_MOVEMENT_SCALE = 1_000_000_000n;
+
+function floorDiv(a: bigint, b: bigint): bigint {
+  const q = a / b;
+  const r = a % b;
+  if (r !== 0n && a < 0n) return q - 1n;
+  return q;
+}
+
+function floorMod(a: bigint, b: bigint): bigint {
+  return a - floorDiv(a, b) * b;
+}
+
+function cursorToLinear(curBinIdx: number, curPosInBin: bigint): bigint {
+  return BigInt(curBinIdx) * POSITIONS_PER_BIN + curPosInBin;
+}
+
+function linearToCursor(linear: bigint): { curBinIdx: number; curPosInBin: bigint } {
+  return {
+    curBinIdx: Number(floorDiv(linear, POSITIONS_PER_BIN)),
+    curPosInBin: floorMod(linear, POSITIONS_PER_BIN),
+  };
+}
+
+/** Convert a movement factor to position units (1.0 = MAX_UINT104 positions). */
+export function cursorMovementToPositionDelta(maximalCursorMovement: number): bigint {
+  if (!Number.isFinite(maximalCursorMovement) || maximalCursorMovement < 0) {
+    throw new Error("maximalCursorMovement must be a non-negative finite number");
+  }
+  const scaledMovement = BigInt(Math.round(maximalCursorMovement * Number(CURSOR_MOVEMENT_SCALE)));
+  return (scaledMovement * MAX_UINT104) / CURSOR_MOVEMENT_SCALE;
+}
+
+/**
+ * Build LiquidityCursorBounds around a cursor by allowing up to
+ * `maximalCursorMovement * MAX_UINT104` positions of movement left or right.
+ */
+export function computeLiquidityCursorBounds(
+  curBinIdx: number,
+  curPosInBin: bigint,
+  maximalCursorMovement: number,
+): LiquidityCursorBounds {
+  const delta = cursorMovementToPositionDelta(maximalCursorMovement);
+  const currentLinear = cursorToLinear(curBinIdx, curPosInBin);
+
+  const protocolMinLinear = cursorToLinear(
+    UNCONSTRAINED_LIQUIDITY_CURSOR_BOUNDS.minimalCurBin,
+    UNCONSTRAINED_LIQUIDITY_CURSOR_BOUNDS.minimalPosition,
+  );
+  const protocolMaxLinear = cursorToLinear(
+    UNCONSTRAINED_LIQUIDITY_CURSOR_BOUNDS.maximalCurBin,
+    UNCONSTRAINED_LIQUIDITY_CURSOR_BOUNDS.maximalPosition,
+  );
+
+  const clampedMinLinear =
+    currentLinear - delta < protocolMinLinear ? protocolMinLinear : currentLinear - delta;
+  const clampedMaxLinear =
+    currentLinear + delta > protocolMaxLinear ? protocolMaxLinear : currentLinear + delta;
+
+  const minimal = linearToCursor(clampedMinLinear);
+  const maximal = linearToCursor(clampedMaxLinear);
+
+  return {
+    minimalCurBin: minimal.curBinIdx,
+    minimalPosition: minimal.curPosInBin,
+    maximalCurBin: maximal.curBinIdx,
+    maximalPosition: maximal.curPosInBin,
+  };
+}
+
+/**
+ * Read the pool cursor and return LiquidityCursorBounds for weighted add encoders.
+ *
+ * @param maximalCursorMovement - 1.0 allows up to MAX_UINT104 positions of movement
+ *   left or right from the current cursor (summing across bin boundaries).
+ */
+export async function prepareLiquidityCursorBounds(params: {
+  publicClient: PublicClient;
+  pool: Address;
+  maximalCursorMovement: number;
+  dataProviderAddress?: Address;
+}): Promise<LiquidityCursorBounds> {
+  const chainId = params.publicClient.chain?.id;
+  if (chainId === undefined) {
+    throw new Error("publicClient.chain.id is required to resolve dataProvider address");
+  }
+
+  const dataProviderAddress =
+    params.dataProviderAddress ?? getAddressesOrThrow(chainId).dataProvider;
+  const slot0 = await getSlot0(params.publicClient, dataProviderAddress, params.pool);
+
+  return computeLiquidityCursorBounds(
+    slot0.curBinIdx,
+    slot0.curPosInBin,
+    params.maximalCursorMovement,
+  );
+}

package/src/pool/index.ts

@@ -39,6 +39,8 @@ export {
   encodeAddLiquidityWeightedSelfCalldata,
   encodeAddLiquidityWeightedWithOwnerCalldata,
   encodeRemoveLiquidityCalldata,
+  UNCONSTRAINED_LIQUIDITY_CURSOR_BOUNDS,
+  type LiquidityCursorBounds,
   getPositionShares,
   getPositionSharesForBins,
   NO_SLIPPAGE_LIMIT,
@@ -52,3 +54,16 @@ export {
   type RemoveLiquidityParams,
   type BinRemovalSpec,
 } from "./liquidity.js";
+
+export {
+  prepareAddLiquidityExactSharesSelfSupportingNativePaymentCalldata,
+  prepareAddLiquidityExactSharesWithOwnerSupportingNativePaymentCalldata,
+  prepareAddLiquidityWeightedSelfSupportingNativePaymentCalldata,
+  prepareAddLiquidityWeightedWithOwnerSupportingNativePaymentCalldata,
+} from "./nativeLiquidity.js";
+
+export {
+  prepareLiquidityCursorBounds,
+  computeLiquidityCursorBounds,
+  cursorMovementToPositionDelta,
+} from "./cursorBounds.js";