@logswap/sdk 0.5.71 → 0.5.73

package/src/indexer.ts

@@ -184,16 +184,16 @@ export async function indexerHealthy(url: string, signal?: AbortSignal): Promise
  */
 export async function discoverMarketsIndexed(url: string, signal?: AbortSignal): Promise<DiscoveredMarket[]> {
   type Row = {
-    poolId: Hex; base: Hex; quote: Hex; tickSpacing: string; phi: string;
+    poolId: Hex; base: Hex; quote: Hex; tickSpacing: string; swapFee: string;
     x0: string; blockNumber: string; txHash: Hex; contractAddress: Hex;
   };
-  const nodes = await gqlAll<Row>(url, "allInitializes", "poolId base quote tickSpacing phi x0 blockNumber txHash contractAddress", { signal });
+  const nodes = await gqlAll<Row>(url, "allInitializes", "poolId base quote tickSpacing swapFee x0 blockNumber txHash contractAddress", { signal });
   return nodes.map((n) => {
     const key: PoolKey = {
       base: n.base as Address,
       quote: n.quote as Address,
       tickSpacing: BigInt(n.tickSpacing),
-      phi: BigInt(n.phi),
+      swapFee: BigInt(n.swapFee), // rindexer names the column after the event's field: `swapFee` since C version 6 (logswap-be #40)
     };
     return {
       key,

package/src/keys.ts

@@ -36,9 +36,10 @@ export interface PoolKey {
    * The swap fee, WAD, fixed for the life of the market: {@link FEE_MIN} (1 bp) ≤ φ ≤ {@link FEE_MAX} (1%),
    * or `0n`, which selects `DEFAULT_FEE` (2 bp) at read time. Four fields since C version 4
    *: `kappa` and `alpha` left with the variance kernel, and `phiMin` — a floor with
-   * nothing above it — became `phi`. Every pool id changed with the shape.
+   * nothing above it — became `phi`, named `swapFee` since C version 6 (decisions 059). The name
+   * is not part of the encoding: no pool id changed with it.
    */
-  phi: bigint;
+  swapFee: bigint;
 }
 
 const POOL_KEY_ABI = [
@@ -48,7 +49,7 @@ const POOL_KEY_ABI = [
       { name: "base", type: "address" },
       { name: "quote", type: "address" },
       { name: "tickSpacing", type: "int256" },
-      { name: "phi", type: "uint256" },
+      { name: "swapFee", type: "uint256" },
     ],
   },
 ] as const;
@@ -56,7 +57,7 @@ const POOL_KEY_ABI = [
 /**
  * `poolId = keccak256(abi.encode(key))` — the primary key of the entire read model.
  *
- * Note the zero-vs-default caveat the Solidity type documents: a `phi` of `0` resolves to
+ * Note the zero-vs-default caveat the Solidity type documents: a `swapFee` of `0` resolves to
  * `DEFAULT_FEE` at READ time, so a key carrying `0n` and one carrying the resolved default are
  * DIFFERENT markets with different ids, even though they behave identically. Always address a
  * market by the key it was initialized with.
@@ -68,7 +69,7 @@ export function poolId(key: PoolKey): Hex {
         base: key.base,
         quote: key.quote,
         tickSpacing: key.tickSpacing,
-        phi: key.phi,
+        swapFee: key.swapFee,
       },
     ]),
   );

package/src/pools.ts

@@ -51,15 +51,16 @@ export async function getPool(c: LogswapClient, key: PoolKey): Promise<PoolState
 }
 
 /**
- * The market's fee: the key's `phi` with `0n` resolved to `DEFAULT_FEE`. Constant for the market's
- * life (C version 4, — `phiEff` and the variance kernel before). Reverts for a key
- * nobody initialized, which `discoverMarkets` relies on to drop a stale indexer's rows.
+ * The market's swap fee: the key's `swapFee` with `0n` resolved to `DEFAULT_FEE` — the manager's
+ * `swapFeeOf` (`phiOf` before C version 6). Constant for the market's life (C version 4 — `phiEff`
+ * and the variance kernel before). Reverts for a key nobody initialized, which `discoverMarkets`
+ * relies on to drop a stale indexer's rows. (`swapFeeOf` in `fees.ts` is the fee one swap paid.)
  */
-export async function phiOf(c: LogswapClient, key: PoolKey): Promise<bigint> {
+export async function marketSwapFee(c: LogswapClient, key: PoolKey): Promise<bigint> {
   return c.public.readContract({
     address: c.addresses.cPoolManager,
     abi: cPoolManagerAbi,
-    functionName: "phiOf",
+    functionName: "swapFeeOf",
     args: [key],
   }) as Promise<bigint>;
 }
@@ -180,7 +181,7 @@ export async function discoverMarkets(
       base: a.base!,
       quote: a.quote!,
       tickSpacing: a.tickSpacing!,
-      phi: a.phi!,
+      swapFee: a.swapFee!,
     };
     return {
       key,

package/src/positions.ts

@@ -191,8 +191,9 @@ export const MINT_FEE = 2n * 10n ** 14n;
  * the position's own legs, so a mint's total quote pull is `positionQuote(p, x) + mintFee(p, x)`.
  *
  * Mirrors the manager's exemption cases: a DORMANT mint pays nothing — floor above spot, or a
- * capped class spot has already passed (`cap <= x`). Anything earning pays `MINT_FEE · L`, half
- * accrued through `F` to the LPs already earning, half to the protocol. This is NOT the swap fee:
+ * capped class spot has already passed (`cap <= x`). Anything earning pays `MINT_FEE · L`, all of
+ * it the protocol's since C version 6 (decisions 058); with no collector it goes through `F` to the
+ * LPs already earning, and with none earning it is not charged. This is NOT the swap fee:
  * that one is charged per unit of |Δ log p| on swaps; this is a flat charge on L, once, at mint.
  *
  * One rung of imprecision: for a floor or cap exactly AT spot the contract consults its `currentK`