@logswap/sdk 0.5.57 → 0.5.59

package/dist/generated.js

@@ -666,6 +666,12 @@ export const cPoolManagerAbi = [
         type: 'event',
         anonymous: false,
         inputs: [
+            {
+                name: 'poolId',
+                internalType: 'bytes32',
+                type: 'bytes32',
+                indexed: true,
+            },
             { name: 'from', internalType: 'address', type: 'address', indexed: true },
             { name: 'id', internalType: 'uint256', type: 'uint256', indexed: true },
             {
@@ -686,6 +692,12 @@ export const cPoolManagerAbi = [
                 type: 'uint256',
                 indexed: false,
             },
+            {
+                name: 'fees',
+                internalType: 'uint256',
+                type: 'uint256',
+                indexed: false,
+            },
         ],
         name: 'Burn',
     },
@@ -693,6 +705,12 @@ export const cPoolManagerAbi = [
         type: 'event',
         anonymous: false,
         inputs: [
+            {
+                name: 'poolId',
+                internalType: 'bytes32',
+                type: 'bytes32',
+                indexed: true,
+            },
             {
                 name: 'holder',
                 internalType: 'address',
@@ -809,6 +827,12 @@ export const cPoolManagerAbi = [
         type: 'event',
         anonymous: false,
         inputs: [
+            {
+                name: 'poolId',
+                internalType: 'bytes32',
+                type: 'bytes32',
+                indexed: true,
+            },
             { name: 'to', internalType: 'address', type: 'address', indexed: true },
             { name: 'id', internalType: 'uint256', type: 'uint256', indexed: true },
             {
@@ -901,6 +925,7 @@ export const cPoolManagerAbi = [
                 type: 'uint256',
                 indexed: false,
             },
+            { name: 'fee', internalType: 'uint256', type: 'uint256', indexed: false },
             { name: 'newX', internalType: 'int256', type: 'int256', indexed: false },
             { name: 'phi', internalType: 'uint256', type: 'uint256', indexed: false },
             { name: 'F', internalType: 'uint256', type: 'uint256', indexed: false },
@@ -910,6 +935,12 @@ export const cPoolManagerAbi = [
                 type: 'uint256',
                 indexed: false,
             },
+            {
+                name: 'lActive',
+                internalType: 'uint256',
+                type: 'uint256',
+                indexed: false,
+            },
         ],
         name: 'Swap',
     },
@@ -955,6 +986,12 @@ export const cPoolManagerAbi = [
         type: 'event',
         anonymous: false,
         inputs: [
+            {
+                name: 'poolId',
+                internalType: 'bytes32',
+                type: 'bytes32',
+                indexed: true,
+            },
             {
                 name: 'holder',
                 internalType: 'address',
@@ -967,7 +1004,12 @@ export const cPoolManagerAbi = [
                 type: 'uint256',
                 indexed: true,
             },
-            { name: 'toId', internalType: 'uint256', type: 'uint256', indexed: true },
+            {
+                name: 'toId',
+                internalType: 'uint256',
+                type: 'uint256',
+                indexed: false,
+            },
             {
                 name: 'oldL',
                 internalType: 'uint256',
@@ -987,6 +1029,12 @@ export const cPoolManagerAbi = [
                 type: 'int256',
                 indexed: false,
             },
+            {
+                name: 'fees',
+                internalType: 'uint256',
+                type: 'uint256',
+                indexed: false,
+            },
         ],
         name: 'Update',
     },
@@ -1730,33 +1778,6 @@ export const fPoolManagerAbi = [
         ],
         name: 'AsksSet',
     },
-    {
-        type: 'event',
-        anonymous: false,
-        inputs: [
-            {
-                name: 'poolId',
-                internalType: 'bytes32',
-                type: 'bytes32',
-                indexed: true,
-            },
-            { name: 'from', internalType: 'address', type: 'address', indexed: true },
-            { name: 'dL', internalType: 'uint256', type: 'uint256', indexed: false },
-            {
-                name: 'shares',
-                internalType: 'uint256',
-                type: 'uint256',
-                indexed: false,
-            },
-            {
-                name: 'dQuote',
-                internalType: 'uint256',
-                type: 'uint256',
-                indexed: false,
-            },
-        ],
-        name: 'Burn',
-    },
     {
         type: 'event',
         anonymous: false,
@@ -1831,22 +1852,30 @@ export const fPoolManagerAbi = [
                 type: 'bytes32',
                 indexed: true,
             },
-            { name: 'to', internalType: 'address', type: 'address', indexed: true },
+            { name: 'from', internalType: 'address', type: 'address', indexed: true },
+            { name: 'gen', internalType: 'uint256', type: 'uint256', indexed: false },
+            { name: 'dL', internalType: 'uint256', type: 'uint256', indexed: false },
             {
-                name: 'amount',
+                name: 'shares',
                 internalType: 'uint256',
                 type: 'uint256',
                 indexed: false,
             },
-            { name: 'cut', internalType: 'uint256', type: 'uint256', indexed: false },
             {
-                name: 'toOperator',
+                name: 'dQuote',
+                internalType: 'uint256',
+                type: 'uint256',
+                indexed: false,
+            },
+            { name: 'L', internalType: 'uint256', type: 'uint256', indexed: false },
+            {
+                name: 'supply',
                 internalType: 'uint256',
                 type: 'uint256',
                 indexed: false,
             },
         ],
-        name: 'Harvest',
+        name: 'FBurn',
     },
     {
         type: 'event',
@@ -1890,7 +1919,7 @@ export const fPoolManagerAbi = [
                 indexed: false,
             },
         ],
-        name: 'Initialize',
+        name: 'FInitialize',
     },
     {
         type: 'event',
@@ -1902,21 +1931,92 @@ export const fPoolManagerAbi = [
                 type: 'bytes32',
                 indexed: true,
             },
-            { name: 'gen', internalType: 'uint256', type: 'uint256', indexed: true },
+            { name: 'to', internalType: 'address', type: 'address', indexed: true },
+            { name: 'gen', internalType: 'uint256', type: 'uint256', indexed: false },
+            { name: 'dL', internalType: 'uint256', type: 'uint256', indexed: false },
             {
-                name: 'bases',
-                internalType: 'address[]',
-                type: 'address[]',
+                name: 'shares',
+                internalType: 'uint256',
+                type: 'uint256',
                 indexed: false,
             },
             {
-                name: 'weights',
-                internalType: 'uint256[]',
-                type: 'uint256[]',
+                name: 'dQuote',
+                internalType: 'uint256',
+                type: 'uint256',
+                indexed: false,
+            },
+            { name: 'L', internalType: 'uint256', type: 'uint256', indexed: false },
+            {
+                name: 'supply',
+                internalType: 'uint256',
+                type: 'uint256',
                 indexed: false,
             },
         ],
-        name: 'LegsSet',
+        name: 'FMint',
+    },
+    {
+        type: 'event',
+        anonymous: false,
+        inputs: [
+            {
+                name: 'poolId',
+                internalType: 'bytes32',
+                type: 'bytes32',
+                indexed: true,
+            },
+            {
+                name: 'sender',
+                internalType: 'address',
+                type: 'address',
+                indexed: true,
+            },
+            {
+                name: 'taker',
+                internalType: 'address',
+                type: 'address',
+                indexed: true,
+            },
+            {
+                name: 'tokenIn',
+                internalType: 'address',
+                type: 'address',
+                indexed: false,
+            },
+            {
+                name: 'tokenOut',
+                internalType: 'address',
+                type: 'address',
+                indexed: false,
+            },
+            {
+                name: 'amountIn',
+                internalType: 'uint256',
+                type: 'uint256',
+                indexed: false,
+            },
+            {
+                name: 'amountOut',
+                internalType: 'uint256',
+                type: 'uint256',
+                indexed: false,
+            },
+            { name: 'fee', internalType: 'uint256', type: 'uint256', indexed: false },
+            {
+                name: 'reserveIn',
+                internalType: 'uint256',
+                type: 'uint256',
+                indexed: false,
+            },
+            {
+                name: 'reserveOut',
+                internalType: 'uint256',
+                type: 'uint256',
+                indexed: false,
+            },
+        ],
+        name: 'FSwap',
     },
     {
         type: 'event',
@@ -1929,21 +2029,49 @@ export const fPoolManagerAbi = [
                 indexed: true,
             },
             { name: 'to', internalType: 'address', type: 'address', indexed: true },
-            { name: 'dL', internalType: 'uint256', type: 'uint256', indexed: false },
+            { name: 'gen', internalType: 'uint256', type: 'uint256', indexed: false },
             {
-                name: 'shares',
+                name: 'amount',
                 internalType: 'uint256',
                 type: 'uint256',
                 indexed: false,
             },
+            { name: 'cut', internalType: 'uint256', type: 'uint256', indexed: false },
             {
-                name: 'dQuote',
+                name: 'toOperator',
                 internalType: 'uint256',
                 type: 'uint256',
                 indexed: false,
             },
+            { name: 'Q', internalType: 'uint256', type: 'uint256', indexed: false },
         ],
-        name: 'Mint',
+        name: 'Harvest',
+    },
+    {
+        type: 'event',
+        anonymous: false,
+        inputs: [
+            {
+                name: 'poolId',
+                internalType: 'bytes32',
+                type: 'bytes32',
+                indexed: true,
+            },
+            { name: 'gen', internalType: 'uint256', type: 'uint256', indexed: true },
+            {
+                name: 'bases',
+                internalType: 'address[]',
+                type: 'address[]',
+                indexed: false,
+            },
+            {
+                name: 'weights',
+                internalType: 'uint256[]',
+                type: 'uint256[]',
+                indexed: false,
+            },
+        ],
+        name: 'LegsSet',
     },
     {
         type: 'event',
@@ -2075,6 +2203,7 @@ export const fPoolManagerAbi = [
                 type: 'uint256',
                 indexed: false,
             },
+            { name: 'dL', internalType: 'uint256', type: 'uint256', indexed: false },
         ],
         name: 'Regenerated',
     },
@@ -2139,61 +2268,6 @@ export const fPoolManagerAbi = [
         ],
         name: 'Stamped',
     },
-    {
-        type: 'event',
-        anonymous: false,
-        inputs: [
-            {
-                name: 'poolId',
-                internalType: 'bytes32',
-                type: 'bytes32',
-                indexed: true,
-            },
-            {
-                name: 'sender',
-                internalType: 'address',
-                type: 'address',
-                indexed: true,
-            },
-            {
-                name: 'tokenIn',
-                internalType: 'address',
-                type: 'address',
-                indexed: false,
-            },
-            {
-                name: 'tokenOut',
-                internalType: 'address',
-                type: 'address',
-                indexed: false,
-            },
-            {
-                name: 'amountIn',
-                internalType: 'uint256',
-                type: 'uint256',
-                indexed: false,
-            },
-            {
-                name: 'amountOut',
-                internalType: 'uint256',
-                type: 'uint256',
-                indexed: false,
-            },
-            {
-                name: 'reserveIn',
-                internalType: 'uint256',
-                type: 'uint256',
-                indexed: false,
-            },
-            {
-                name: 'reserveOut',
-                internalType: 'uint256',
-                type: 'uint256',
-                indexed: false,
-            },
-        ],
-        name: 'Swap',
-    },
     {
         type: 'event',
         anonymous: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logswap/sdk",
-  "version": "0.5.57",
+  "version": "0.5.59",
   "description": "TypeScript SDK for Logswap, the liquidity primitive introducing the logarithmic invariant — typed wrappers over the CPoolManager / FPoolManager / Router / Lens surface.",
   "license": "GPL-2.0-or-later",
   "type": "module",

package/src/client.ts

@@ -109,7 +109,7 @@ function guardChain(wallet: WalletClient, pub: PublicClient): WalletClient {
  * `phiOf`; `getPool` lost `sigma2Ema`; `Initialize` lost two fields; the cut is
  * `MINT_FEE_PROTOCOL_CUT` / `setFeeParams`.
  */
-export const EXPECTED_VERSION = 4n;
+export const EXPECTED_VERSION = 5n;
 /**
  * The F manager's own tag (5 — the key's salt, pool names, the sponsor registry;
  * 4 was the income-only harvest cut).
@@ -165,7 +165,7 @@ export const EXPECTED_VERSION = 4n;
 // is the policy at birth, `migrate` moves a pool for the registry's owner; `stamp` / `setAsks` are
 // the policy's; the desk's `setAllowed` / `isAllowed` are `setMinters` / `setTakers` / `isMinter` /
 // `isTaker`; a pad and a POL hold one base (`OneBase`).
-export const EXPECTED_F_VERSION = 18n;
+export const EXPECTED_F_VERSION = 19n;
 
 export async function assertVersion(c: LogswapClient, expected = EXPECTED_VERSION): Promise<void> {
   const { cPoolManagerAbi } = await import("./generated.js");

package/src/fees.ts

@@ -18,7 +18,12 @@ import type { DiscoveredMarket } from "./pools.js";
 const WAD = 10n ** 18n;
 const YEAR_SECONDS = 31_536_000;
 
-/** The fee one swap paid, in quote, from its `Swap` event's fields. */
+/**
+ * The fee one swap paid, in quote, from its `Swap` event's fields.
+ *
+ * @deprecated The C `Swap` event carries its `fee` since C version 5 (decisions 050); read that.
+ * This reconstruction from φ rounds where the contract does not, and is kept for older logs.
+ */
 export function swapFeeOf(e: { baseIn: boolean; amountIn: bigint; amountOut: bigint }, phi: bigint): bigint {
   return e.baseIn ? (e.amountOut * phi) / (WAD - phi) : (e.amountIn * phi) / (WAD + phi);
 }
@@ -36,14 +41,40 @@ export interface SwapFeeWindow {
   swaps: number;
 }
 
-/** The first block with timestamp ≥ `t`, by bisection over `[lo, hi]`; `hi` when none is earlier. */
+/** Probes per round of {@link blockAtOrAfter}: 15 splits the bracket 16 ways. */
+const PROBES = 15n;
+
+/**
+ * The first block with timestamp ≥ `t` in `[lo, hi]`; `hi` when none is earlier.
+ *
+ * A PARALLEL search: each round reads {@link PROBES} evenly spaced blocks at once and keeps the
+ * sixteenth of the bracket that holds the answer, so 64k blocks take 4 round trips. Bisection read
+ * one block per round trip — ~16 sequential `getBlock`s, seconds apiece against a distant node,
+ * before a fee figure could render. Interpolating on timestamps was tried and did no better: a
+ * devnet mines on demand plus a heartbeat, so its blocks are far from evenly spaced in time.
+ * Exact for monotonic timestamps; a chain restored from a snapshot can carry a genesis stamped
+ * after its later blocks, so callers bound `lo` by the block they care about (a pool's own).
+ */
 export async function blockAtOrAfter(c: LogswapClient, t: bigint, lo: bigint, hi: bigint): Promise<bigint> {
-  while (lo < hi) {
-    const mid = (lo + hi) / 2n;
-    if ((await c.public.getBlock({ blockNumber: mid })).timestamp < t) lo = mid + 1n;
-    else hi = mid;
+  if (lo >= hi) return hi;
+  const stamp = async (n: bigint) => (await c.public.getBlock({ blockNumber: n })).timestamp;
+  if ((await stamp(lo)) >= t) return lo;
+  // invariant from here: ts(lo) < t, and the answer is in (lo, hi]
+  while (hi - lo > 1n) {
+    const width = hi - lo;
+    const probes = [...new Set(Array.from({ length: Number(PROBES) }, (_, i) => lo + (width * BigInt(i + 1)) / (PROBES + 1n)))].filter(
+      (n) => n > lo && n < hi,
+    );
+    if (probes.length === 0) probes.push(lo + width / 2n);
+    const stamps = await Promise.all(probes.map(stamp));
+    const first = stamps.findIndex((ts) => ts >= t);
+    if (first === -1) lo = probes[probes.length - 1]!;
+    else {
+      hi = probes[first]!;
+      if (first > 0) lo = probes[first - 1]!;
+    }
   }
-  return lo;
+  return hi;
 }
 
 /**
@@ -83,8 +114,9 @@ export async function swapFees(
     ? []
     : await c.public.getLogs({ address: c.addresses.cPoolManager, event: ev, args: { poolId: m.poolId }, fromBlock, toBlock });
 
+  // the event carries the fee the swap charged (decisions 050), exactly — no re-derivation from φ
   let fees = 0n;
-  for (const l of logs) fees += swapFeeOf({ baseIn: l.args.baseIn!, amountIn: l.args.amountIn!, amountOut: l.args.amountOut! }, l.args.phi!);
+  for (const l of logs) fees += l.args.fee!;
 
   const to = last.timestamp;
   return { fromBlock, toBlock, from, to, seconds: to > from ? to - from : 0n, swapFees: fees, swaps: logs.length };

package/src/fpool.ts

@@ -1480,8 +1480,8 @@ export async function discoverFPools(
   c: LogswapClient,
   opts: { fromBlock?: bigint; toBlock?: bigint } = {},
 ): Promise<DiscoveredFPool[]> {
-  type Ev = Extract<(typeof fPoolManagerAbi)[number], { type: "event"; name: "Initialize" }>;
-  const ev = fPoolManagerAbi.find((x): x is Ev => x.type === "event" && x.name === "Initialize");
+  type Ev = Extract<(typeof fPoolManagerAbi)[number], { type: "event"; name: "FInitialize" }>;
+  const ev = fPoolManagerAbi.find((x): x is Ev => x.type === "event" && x.name === "FInitialize");
   if (!ev) throw new Error("logswap: F Initialize event missing from the generated ABI");
   type SeedEv = Extract<(typeof fPoolManagerAbi)[number], { type: "event"; name: "Seeded" }>;
   const seedEv = fPoolManagerAbi.find((x): x is SeedEv => x.type === "event" && x.name === "Seeded");