@logswap/sdk 0.5.57 → 0.5.59

package/dist/client.d.ts

@@ -71,7 +71,7 @@ export declare function createLogswapClient(args: {
  * `phiOf`; `getPool` lost `sigma2Ema`; `Initialize` lost two fields; the cut is
  * `MINT_FEE_PROTOCOL_CUT` / `setFeeParams`.
  */
-export declare const EXPECTED_VERSION = 4n;
+export declare 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).
@@ -83,7 +83,7 @@ export declare const EXPECTED_VERSION = 4n;
  * passes it; when one lands, raise this constant in the same change, which is the discipline
  * `EXPECTED_VERSION` enforces mechanically and this one asks for.
  */
-export declare const EXPECTED_F_VERSION = 18n;
+export declare const EXPECTED_F_VERSION = 19n;
 export declare function assertVersion(c: LogswapClient, expected?: bigint): Promise<void>;
 /**
  * The versions say the managers are the right code; this says the rest of the addresses belong

package/dist/client.js

@@ -65,7 +65,7 @@ function guardChain(wallet, pub) {
  * `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).
@@ -121,7 +121,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, expected = EXPECTED_VERSION) {
     const { cPoolManagerAbi } = await import("./generated.js");
     const got = await c.public.readContract({

package/dist/fees.d.ts

@@ -12,7 +12,12 @@
  */
 import type { LogswapClient } from "./client.js";
 import type { DiscoveredMarket } from "./pools.js";
-/** 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 declare function swapFeeOf(e: {
     baseIn: boolean;
     amountIn: bigint;
@@ -30,7 +35,17 @@ export interface SwapFeeWindow {
     swapFees: bigint;
     swaps: number;
 }
-/** The first block with timestamp ≥ `t`, by bisection over `[lo, hi]`; `hi` when none is earlier. */
+/**
+ * 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 declare function blockAtOrAfter(c: LogswapClient, t: bigint, lo: bigint, hi: bigint): Promise<bigint>;
 /**
  * Sum the swap fees of market `m` over a window: from `since` (unix seconds) or `fromBlock`, to

package/dist/fees.js

@@ -13,20 +13,51 @@
 import { cPoolManagerAbi } from "./generated.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, phi) {
     return e.baseIn ? (e.amountOut * phi) / (WAD - phi) : (e.amountIn * phi) / (WAD + phi);
 }
-/** 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, t, lo, hi) {
-    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) => (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;
 }
 /**
  * Sum the swap fees of market `m` over a window: from `since` (unix seconds) or `fromBlock`, to
@@ -59,9 +90,10 @@ export async function swapFees(c, m, opts = {}) {
     const logs = fromBlock > toBlock
         ? []
         : 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);
+        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/dist/fpool.js

@@ -1047,7 +1047,7 @@ export async function fPoolTransferShares(c, a) {
  * exists for exactly this call.
  */
 export async function discoverFPools(c, opts = {}) {
-    const ev = fPoolManagerAbi.find((x) => x.type === "event" && x.name === "Initialize");
+    const ev = fPoolManagerAbi.find((x) => x.type === "event" && x.name === "FInitialize");
     if (!ev)
         throw new Error("logswap: F Initialize event missing from the generated ABI");
     const seedEv = fPoolManagerAbi.find((x) => x.type === "event" && x.name === "Seeded");

package/dist/generated.d.ts

@@ -1168,6 +1168,11 @@ export declare const cPoolManagerAbi: readonly [{
     readonly type: "event";
     readonly anonymous: false;
     readonly inputs: readonly [{
+        readonly name: "poolId";
+        readonly internalType: "bytes32";
+        readonly type: "bytes32";
+        readonly indexed: true;
+    }, {
         readonly name: "from";
         readonly internalType: "address";
         readonly type: "address";
@@ -1192,12 +1197,22 @@ export declare const cPoolManagerAbi: readonly [{
         readonly internalType: "uint256";
         readonly type: "uint256";
         readonly indexed: false;
+    }, {
+        readonly name: "fees";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+        readonly indexed: false;
     }];
     readonly name: "Burn";
 }, {
     readonly type: "event";
     readonly anonymous: false;
     readonly inputs: readonly [{
+        readonly name: "poolId";
+        readonly internalType: "bytes32";
+        readonly type: "bytes32";
+        readonly indexed: true;
+    }, {
         readonly name: "holder";
         readonly internalType: "address";
         readonly type: "address";
@@ -1323,6 +1338,11 @@ export declare const cPoolManagerAbi: readonly [{
     readonly type: "event";
     readonly anonymous: false;
     readonly inputs: readonly [{
+        readonly name: "poolId";
+        readonly internalType: "bytes32";
+        readonly type: "bytes32";
+        readonly indexed: true;
+    }, {
         readonly name: "to";
         readonly internalType: "address";
         readonly type: "address";
@@ -1417,6 +1437,11 @@ export declare const cPoolManagerAbi: readonly [{
         readonly internalType: "uint256";
         readonly type: "uint256";
         readonly indexed: false;
+    }, {
+        readonly name: "fee";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+        readonly indexed: false;
     }, {
         readonly name: "newX";
         readonly internalType: "int256";
@@ -1437,6 +1462,11 @@ export declare const cPoolManagerAbi: readonly [{
         readonly internalType: "uint256";
         readonly type: "uint256";
         readonly indexed: false;
+    }, {
+        readonly name: "lActive";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+        readonly indexed: false;
     }];
     readonly name: "Swap";
 }, {
@@ -1498,6 +1528,11 @@ export declare const cPoolManagerAbi: readonly [{
     readonly type: "event";
     readonly anonymous: false;
     readonly inputs: readonly [{
+        readonly name: "poolId";
+        readonly internalType: "bytes32";
+        readonly type: "bytes32";
+        readonly indexed: true;
+    }, {
         readonly name: "holder";
         readonly internalType: "address";
         readonly type: "address";
@@ -1511,7 +1546,7 @@ export declare const cPoolManagerAbi: readonly [{
         readonly name: "toId";
         readonly internalType: "uint256";
         readonly type: "uint256";
-        readonly indexed: true;
+        readonly indexed: false;
     }, {
         readonly name: "oldL";
         readonly internalType: "uint256";
@@ -1532,6 +1567,11 @@ export declare const cPoolManagerAbi: readonly [{
         readonly internalType: "int256";
         readonly type: "int256";
         readonly indexed: false;
+    }, {
+        readonly name: "fees";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+        readonly indexed: false;
     }];
     readonly name: "Update";
 }, {
@@ -2924,36 +2964,6 @@ export declare const fPoolManagerAbi: readonly [{
         readonly indexed: false;
     }];
     readonly name: "AsksSet";
-}, {
-    readonly type: "event";
-    readonly anonymous: false;
-    readonly inputs: readonly [{
-        readonly name: "poolId";
-        readonly internalType: "bytes32";
-        readonly type: "bytes32";
-        readonly indexed: true;
-    }, {
-        readonly name: "from";
-        readonly internalType: "address";
-        readonly type: "address";
-        readonly indexed: true;
-    }, {
-        readonly name: "dL";
-        readonly internalType: "uint256";
-        readonly type: "uint256";
-        readonly indexed: false;
-    }, {
-        readonly name: "shares";
-        readonly internalType: "uint256";
-        readonly type: "uint256";
-        readonly indexed: false;
-    }, {
-        readonly name: "dQuote";
-        readonly internalType: "uint256";
-        readonly type: "uint256";
-        readonly indexed: false;
-    }];
-    readonly name: "Burn";
 }, {
     readonly type: "event";
     readonly anonymous: false;
@@ -3018,27 +3028,42 @@ export declare const fPoolManagerAbi: readonly [{
         readonly type: "bytes32";
         readonly indexed: true;
     }, {
-        readonly name: "to";
+        readonly name: "from";
         readonly internalType: "address";
         readonly type: "address";
         readonly indexed: true;
     }, {
-        readonly name: "amount";
+        readonly name: "gen";
         readonly internalType: "uint256";
         readonly type: "uint256";
         readonly indexed: false;
     }, {
-        readonly name: "cut";
+        readonly name: "dL";
         readonly internalType: "uint256";
         readonly type: "uint256";
         readonly indexed: false;
     }, {
-        readonly name: "toOperator";
+        readonly name: "shares";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+        readonly indexed: false;
+    }, {
+        readonly name: "dQuote";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+        readonly indexed: false;
+    }, {
+        readonly name: "L";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+        readonly indexed: false;
+    }, {
+        readonly name: "supply";
         readonly internalType: "uint256";
         readonly type: "uint256";
         readonly indexed: false;
     }];
-    readonly name: "Harvest";
+    readonly name: "FBurn";
 }, {
     readonly type: "event";
     readonly anonymous: false;
@@ -3078,7 +3103,7 @@ export declare const fPoolManagerAbi: readonly [{
         readonly type: "address";
         readonly indexed: false;
     }];
-    readonly name: "Initialize";
+    readonly name: "FInitialize";
 }, {
     readonly type: "event";
     readonly anonymous: false;
@@ -3087,23 +3112,98 @@ export declare const fPoolManagerAbi: readonly [{
         readonly internalType: "bytes32";
         readonly type: "bytes32";
         readonly indexed: true;
+    }, {
+        readonly name: "to";
+        readonly internalType: "address";
+        readonly type: "address";
+        readonly indexed: true;
     }, {
         readonly name: "gen";
         readonly internalType: "uint256";
         readonly type: "uint256";
+        readonly indexed: false;
+    }, {
+        readonly name: "dL";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+        readonly indexed: false;
+    }, {
+        readonly name: "shares";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+        readonly indexed: false;
+    }, {
+        readonly name: "dQuote";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+        readonly indexed: false;
+    }, {
+        readonly name: "L";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+        readonly indexed: false;
+    }, {
+        readonly name: "supply";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+        readonly indexed: false;
+    }];
+    readonly name: "FMint";
+}, {
+    readonly type: "event";
+    readonly anonymous: false;
+    readonly inputs: readonly [{
+        readonly name: "poolId";
+        readonly internalType: "bytes32";
+        readonly type: "bytes32";
         readonly indexed: true;
     }, {
-        readonly name: "bases";
-        readonly internalType: "address[]";
-        readonly type: "address[]";
+        readonly name: "sender";
+        readonly internalType: "address";
+        readonly type: "address";
+        readonly indexed: true;
+    }, {
+        readonly name: "taker";
+        readonly internalType: "address";
+        readonly type: "address";
+        readonly indexed: true;
+    }, {
+        readonly name: "tokenIn";
+        readonly internalType: "address";
+        readonly type: "address";
         readonly indexed: false;
     }, {
-        readonly name: "weights";
-        readonly internalType: "uint256[]";
-        readonly type: "uint256[]";
+        readonly name: "tokenOut";
+        readonly internalType: "address";
+        readonly type: "address";
+        readonly indexed: false;
+    }, {
+        readonly name: "amountIn";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+        readonly indexed: false;
+    }, {
+        readonly name: "amountOut";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+        readonly indexed: false;
+    }, {
+        readonly name: "fee";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+        readonly indexed: false;
+    }, {
+        readonly name: "reserveIn";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+        readonly indexed: false;
+    }, {
+        readonly name: "reserveOut";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
         readonly indexed: false;
     }];
-    readonly name: "LegsSet";
+    readonly name: "FSwap";
 }, {
     readonly type: "event";
     readonly anonymous: false;
@@ -3118,22 +3218,57 @@ export declare const fPoolManagerAbi: readonly [{
         readonly type: "address";
         readonly indexed: true;
     }, {
-        readonly name: "dL";
+        readonly name: "gen";
         readonly internalType: "uint256";
         readonly type: "uint256";
         readonly indexed: false;
     }, {
-        readonly name: "shares";
+        readonly name: "amount";
         readonly internalType: "uint256";
         readonly type: "uint256";
         readonly indexed: false;
     }, {
-        readonly name: "dQuote";
+        readonly name: "cut";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+        readonly indexed: false;
+    }, {
+        readonly name: "toOperator";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+        readonly indexed: false;
+    }, {
+        readonly name: "Q";
         readonly internalType: "uint256";
         readonly type: "uint256";
         readonly indexed: false;
     }];
-    readonly name: "Mint";
+    readonly name: "Harvest";
+}, {
+    readonly type: "event";
+    readonly anonymous: false;
+    readonly inputs: readonly [{
+        readonly name: "poolId";
+        readonly internalType: "bytes32";
+        readonly type: "bytes32";
+        readonly indexed: true;
+    }, {
+        readonly name: "gen";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+        readonly indexed: true;
+    }, {
+        readonly name: "bases";
+        readonly internalType: "address[]";
+        readonly type: "address[]";
+        readonly indexed: false;
+    }, {
+        readonly name: "weights";
+        readonly internalType: "uint256[]";
+        readonly type: "uint256[]";
+        readonly indexed: false;
+    }];
+    readonly name: "LegsSet";
 }, {
     readonly type: "event";
     readonly anonymous: false;
@@ -3272,6 +3407,11 @@ export declare const fPoolManagerAbi: readonly [{
         readonly internalType: "uint256";
         readonly type: "uint256";
         readonly indexed: false;
+    }, {
+        readonly name: "dL";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+        readonly indexed: false;
     }];
     readonly name: "Regenerated";
 }, {
@@ -3339,51 +3479,6 @@ export declare const fPoolManagerAbi: readonly [{
         readonly indexed: true;
     }];
     readonly name: "Stamped";
-}, {
-    readonly type: "event";
-    readonly anonymous: false;
-    readonly inputs: readonly [{
-        readonly name: "poolId";
-        readonly internalType: "bytes32";
-        readonly type: "bytes32";
-        readonly indexed: true;
-    }, {
-        readonly name: "sender";
-        readonly internalType: "address";
-        readonly type: "address";
-        readonly indexed: true;
-    }, {
-        readonly name: "tokenIn";
-        readonly internalType: "address";
-        readonly type: "address";
-        readonly indexed: false;
-    }, {
-        readonly name: "tokenOut";
-        readonly internalType: "address";
-        readonly type: "address";
-        readonly indexed: false;
-    }, {
-        readonly name: "amountIn";
-        readonly internalType: "uint256";
-        readonly type: "uint256";
-        readonly indexed: false;
-    }, {
-        readonly name: "amountOut";
-        readonly internalType: "uint256";
-        readonly type: "uint256";
-        readonly indexed: false;
-    }, {
-        readonly name: "reserveIn";
-        readonly internalType: "uint256";
-        readonly type: "uint256";
-        readonly indexed: false;
-    }, {
-        readonly name: "reserveOut";
-        readonly internalType: "uint256";
-        readonly type: "uint256";
-        readonly indexed: false;
-    }];
-    readonly name: "Swap";
 }, {
     readonly type: "event";
     readonly anonymous: false;