@render-foundation/utils 0.0.254 → 0.0.256

package/lib/cjs/client/pg/v2Client.js

@@ -35,7 +35,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.pgClient = exports.batchFinishedAtMedian = exports.foldGrantAllotment = exports.CREDIT_DECIMALS = exports.EUR_TO_CREDITS = exports.DISPERSED_BURN_CORRECTION_TABLE = exports.DISPERSED_SETTLEMENT_TABLE = exports.GRANT_BURN_TABLE = exports.GRANT_BURN_ID_TABLE = exports.OTOY_GRANT_TABLE = exports.USER_GRANT_SPEND_TABLE = exports.CURRENT_USER_GRANT_SPEND_TABLE = exports.POLYGON_UPGRADE_TABLE = exports.ENTITY_EPOCH_INFO_TABLE = exports.BURN_CORRECTION_TABLE = exports.NETWORK_REVENUE_TABLE = exports.BRIDGE_TRANSFER_TABLE = exports.BURN_TABLE = exports.JOB_TABLE = exports.JOB_ID_TABLE = exports.LIABILITY_ADJUSTMENT_BATCH_TABLE = exports.LIABILITY_ADJUSTMENT_TABLE = exports.LIABILITY_TABLE = exports.SOL_TRANSFER_TABLE = exports.ENTITY_TABLE = exports.MANUAL_BURN_TABLE = exports.EPOCH_TABLE = exports.SOL_TX_TABLE = void 0;
+exports.pgClient = exports.batchFinishedAtMedian = exports.foldGrantWindow = exports.GRANT_LOOKBACK_MS = exports.GRANT_LOOKBACK_DAYS = exports.CREDIT_DECIMALS = exports.GRANT_WINDOW_START = exports.EUR_TO_CREDITS = exports.DISPERSED_BURN_CORRECTION_TABLE = exports.DISPERSED_SETTLEMENT_TABLE = exports.GRANT_BURN_TABLE = exports.GRANT_BURN_ID_TABLE = exports.OTOY_GRANT_TABLE = exports.USER_GRANT_SPEND_TABLE = exports.CURRENT_USER_GRANT_SPEND_TABLE = exports.POLYGON_UPGRADE_TABLE = exports.ENTITY_EPOCH_INFO_TABLE = exports.BURN_CORRECTION_TABLE = exports.NETWORK_REVENUE_TABLE = exports.BRIDGE_TRANSFER_TABLE = exports.BURN_TABLE = exports.JOB_TABLE = exports.JOB_ID_TABLE = exports.LIABILITY_ADJUSTMENT_BATCH_TABLE = exports.LIABILITY_ADJUSTMENT_TABLE = exports.LIABILITY_TABLE = exports.SOL_TRANSFER_TABLE = exports.ENTITY_TABLE = exports.MANUAL_BURN_TABLE = exports.EPOCH_TABLE = exports.SOL_TX_TABLE = void 0;
 const kysely_1 = require("kysely");
 const logger_1 = require("../../logger");
 const pg_1 = require("pg");
@@ -71,36 +71,117 @@ BigInt.prototype.toJSON = function () {
 // confirmed_amount = EUR, despite the column name); 1 render credit = EUR 0.25, so credits = EUR x 4.
 // job.render_amt / user_grant_spend.render_spent_delta are credits x 1e8.
 exports.EUR_TO_CREDITS = BigInt(4);
+// Grant accounting window: otoy_grant mirrors OTOY RFG issuances from this date. Consumption against the
+// window counts EVERY job the user ran in it — buy-and-burn jobs consumed OTOY credits exactly like
+// emissions-funded ones (counting only emissions-attributed spend over-issued ~2.58M credits, 2026-08-04).
+exports.GRANT_WINDOW_START = '2025-05-01';
 exports.CREDIT_DECIMALS = BigInt(100000000); // 1e8
-/**
- * Pure core of the grant allotment: fold a user's OTOY grants against what's already been spent.
- *
- * consumed = attributedSpend (spend already stamped with an otoy_grant_id)
- *          + correctionSettled (jobs whose grant is already being settled by a burn_correction)
- *
- * The correctionSettled term is the DOUBLE-SPEND GUARD: an escrow_credit correction means we're
- * recovering that job's dollars from escrow, so its grant is already committed. Counting it here stops
- * the same grant from also funding a future emissions burn.
- *
- * fifoGrantId = the oldest grant still holding room, i.e. the one the next spend draws from.
- */
-const foldGrantAllotment = (grants, attributedSpend, correctionSettled) => {
-    const granted = grants.reduce((s, g) => s + g.amountCredits, BigInt(0));
-    const consumed = (attributedSpend > BigInt(0) ? attributedSpend : BigInt(0)) +
-        (correctionSettled > BigInt(0) ? correctionSettled : BigInt(0));
-    const avail = granted > consumed ? granted - consumed : BigInt(0);
-    let drawn = consumed;
+// A grant is consumable for this long after issuance; whatever is left after that EXPIRES (2026-08-05
+// model change). A job can only draw grants issued within the lookback window before it ran.
+exports.GRANT_LOOKBACK_DAYS = 60;
+exports.GRANT_LOOKBACK_MS = exports.GRANT_LOOKBACK_DAYS * 24 * 3600 * 1000;
+const foldGrantWindow = (events, opts = {}) => {
+    var _a, _b, _c;
+    const lookback = (_a = opts.lookbackMs) !== null && _a !== void 0 ? _a : exports.GRANT_LOOKBACK_MS;
+    const now = (_b = opts.now) !== null && _b !== void 0 ? _b : Date.now();
+    const sorted = [...events].sort((a, b) => a.t - b.t || (a.amt > b.amt ? -1 : 1)); // credits first on ties
+    const buckets = [];
+    const jobs = [];
+    const remaining = (b) => b.amount - b.reversed - b.drawnEmissions - b.drawnMisrouted;
+    let beyond = BigInt(0);
+    for (const e of sorted) {
+        if (e.src === 'grant') {
+            if (e.amt > BigInt(0)) {
+                buckets.push({
+                    grantId: e.grantId,
+                    t: e.t,
+                    amount: e.amt,
+                    reversed: BigInt(0),
+                    drawnEmissions: BigInt(0),
+                    drawnMisrouted: BigInt(0),
+                    expired: BigInt(0),
+                    left: BigInt(0),
+                });
+            }
+            else {
+                let claw = -e.amt; // clawback hits remaining capacity oldest-first; excess is dropped
+                for (const b of buckets) {
+                    if (claw <= BigInt(0))
+                        break;
+                    const take = remaining(b) < claw ? remaining(b) : claw;
+                    if (take > BigInt(0)) {
+                        b.reversed += take;
+                        claw -= take;
+                    }
+                }
+            }
+        }
+        else {
+            let need = -e.amt;
+            const total = need;
+            let emissionsLeft = (_c = e.emissions) !== null && _c !== void 0 ? _c : need; // no split provided -> count it all as emissions
+            let jobEm = BigInt(0);
+            let jobMis = BigInt(0);
+            for (const b of buckets) {
+                if (need <= BigInt(0))
+                    break;
+                if (b.t + lookback < e.t)
+                    continue; // grant expired before this job ran
+                const take = remaining(b) < need ? remaining(b) : need;
+                if (take <= BigInt(0))
+                    continue;
+                const em = emissionsLeft < take ? emissionsLeft : take;
+                b.drawnEmissions += em;
+                b.drawnMisrouted += take - em;
+                jobEm += em;
+                jobMis += take - em;
+                emissionsLeft -= em;
+                need -= take;
+            }
+            beyond += need;
+            jobs.push({
+                id: e.id,
+                t: e.t,
+                need: total,
+                drawnEmissions: jobEm,
+                drawnMisrouted: jobMis,
+                beyond: need,
+            });
+        }
+    }
+    let avail = BigInt(0);
+    let expired = BigInt(0);
+    let usedEmissions = BigInt(0);
+    let usedMisrouted = BigInt(0);
     let fifoGrantId;
-    for (const g of grants) {
-        if (drawn < g.amountCredits) {
-            fifoGrantId = g.id;
-            break;
+    for (const b of buckets) {
+        usedEmissions += b.drawnEmissions;
+        usedMisrouted += b.drawnMisrouted;
+        const rem = remaining(b);
+        if (b.t + lookback < now) {
+            b.expired = rem;
+        }
+        else {
+            b.left = rem;
+            avail += rem;
+            if (fifoGrantId === undefined && rem > BigInt(0) && b.grantId !== undefined)
+                fifoGrantId = b.grantId;
         }
-        drawn -= g.amountCredits;
+        expired += b.expired;
     }
-    return { granted, consumed, avail, fifoGrantId };
+    return {
+        avail,
+        beyondGrants: beyond,
+        jobCharged: usedEmissions + usedMisrouted,
+        usedEmissions,
+        usedMisrouted,
+        expired,
+        buckets,
+        jobs,
+        fifoGrantId,
+    };
 };
-exports.foldGrantAllotment = foldGrantAllotment;
+exports.foldGrantWindow = foldGrantWindow;
 const base_2 = require("./base");
 const moment_1 = __importDefault(require("moment"));
 pg.types.setTypeParser(1114, (str) => moment_1.default.utc(str).toDate());
@@ -228,66 +309,54 @@ const pgClient = (config) => {
     // Spendable grant per user, straight off otoy_grant (FIFO), net of what's already been spent or
     // already settled by a burn correction. See GrantAllotment for the units + the double-spend guard.
     const getGrantAllotments = (db, p, log = logger_1.consoleLogger) => __awaiter(void 0, void 0, void 0, function* () {
-        var _b, _c, _d;
+        var _b, _c;
         const out = {};
         if (!p.userIds.length)
             return out;
-        const grants = yield db
-            .selectFrom(exports.OTOY_GRANT_TABLE)
-            .select(['id', 'user_id', 'amount_credits', 'otoy_created_at'])
-            .where('user_id', 'in', p.userIds)
-            .orderBy('otoy_created_at', 'asc')
-            .orderBy('id', 'asc')
-            .execute();
-        if (!grants.length)
-            return out;
-        // Anything already booked against a pool grant, in EITHER direction:
-        //  - negative delta = spend drawn from the grant (this mechanism)
-        //  - positive delta = the grant was CREDITED into current_user_grant_spend (the one-off canary
-        //    route). That balance is already handed to the caller separately, so leaving it in the pool too
-        //    would hand out the same grant twice.
-        // Hence abs(): both directions retire pool capacity.
-        const spent = yield db
-            .selectFrom(exports.USER_GRANT_SPEND_TABLE)
-            .select((eb) => [
-            'user_id',
-            eb.fn.sum((0, kysely_1.sql) `abs(render_spent_delta)`).as('net'),
-        ])
-            .where('user_id', 'in', p.userIds)
-            .where('otoy_grant_id', 'is not', null)
-            .groupBy('user_id')
-            .execute();
-        // jobs already settled by a burn correction — their grant is spoken for (double-spend guard)
-        const corrected = yield db
-            .selectFrom(`${exports.JOB_TABLE} as j`)
-            .innerJoin(`${exports.BURN_CORRECTION_TABLE} as bc`, 'bc.job_id', 'j.id')
-            .select((eb) => ['j.user_id as user_id', eb.fn.sum('j.render_amt').as('amt')])
-            .where('j.user_id', 'in', p.userIds)
-            .groupBy('j.user_id')
-            .execute();
-        const spentBy = new Map(spent.map((r) => { var _a; return [r.user_id, BigInt((_a = r.net) !== null && _a !== void 0 ? _a : 0)]; }));
-        const corrBy = new Map(corrected.map((r) => { var _a; return [r.user_id, BigInt((_a = r.amt) !== null && _a !== void 0 ? _a : 0)]; }));
-        for (const g of grants) {
-            const u = g.user_id;
-            const cur = (_b = out[u]) !== null && _b !== void 0 ? _b : (out[u] = { userId: u, granted: BigInt(0), consumed: BigInt(0), avail: BigInt(0), grants: [] });
-            // amount_credits is numeric EUR — truncate to whole base units after the x4 conversion
-            const credits = (BigInt(Math.round(Number(g.amount_credits) * 1e8)) * exports.EUR_TO_CREDITS);
-            cur.granted += credits;
-            cur.grants.push({
-                id: Number(g.id),
-                amountCredits: credits,
-                createdAt: g.otoy_created_at ? new Date(g.otoy_created_at) : null,
+        // Raw event stream, folded in code (foldGrantWindow — per-grant buckets, 60-day consumable window,
+        // reversals clamp capacity, only jobs create beyond-grants). SQL can't express the bucketed clamp.
+        const evRes = yield (0, kysely_1.sql) `
+      select user_id::text as u, coalesce(otoy_created_at, ${exports.GRANT_WINDOW_START}::timestamp) as t,
+             (amount_credits * 4 * 1e8)::numeric::text as amt, 'grant' as src, id as gid
+        from otoy_grant where user_id = any(${p.userIds}::uuid[])
+      union all
+      select user_id::text, ${exports.GRANT_WINDOW_START}::timestamp, sum(render_spent_delta)::text, 'grant', null
+        from user_grant_spend
+       where user_id = any(${p.userIds}::uuid[]) and render_spent_delta > 0 and otoy_grant_id is null
+       group by user_id
+      union all
+      select user_id::text, created_at, (-render_spent_delta)::text, 'grant', null
+        from user_grant_spend
+       where user_id = any(${p.userIds}::uuid[]) and render_spent_delta > 0 and otoy_grant_id is not null
+      union all
+      select user_id, completed_at, (-render_amt)::text, 'job', null
+        from job
+       where user_id = any(${p.userIds}::text[]) and completed_at >= ${exports.GRANT_WINDOW_START}::timestamp
+    `.execute(db); // db is always a Kysely trx at runtime
+        const byUser = new Map();
+        for (const r of evRes.rows) {
+            const arr = (_b = byUser.get(r.u)) !== null && _b !== void 0 ? _b : [];
+            arr.push({
+                t: new Date(r.t).getTime(),
+                amt: BigInt(Math.round(Number(r.amt))),
+                src: r.src,
+                grantId: (_c = r.gid) !== null && _c !== void 0 ? _c : undefined,
             });
+            byUser.set(r.u, arr);
         }
-        for (const u of Object.keys(out)) {
-            const attributed = (_c = spentBy.get(u)) !== null && _c !== void 0 ? _c : BigInt(0); // abs() — spend drawn or grant already credited
-            const viaCorrection = (_d = corrBy.get(u)) !== null && _d !== void 0 ? _d : BigInt(0);
-            const f = (0, exports.foldGrantAllotment)(out[u].grants, attributed, viaCorrection);
-            out[u].granted = f.granted;
-            out[u].consumed = f.consumed;
-            out[u].avail = f.avail;
-            if (viaCorrection > BigInt(0)) {
-                log.info(`grant allotment ${u}: granted ${f.granted} - attributed ${attributed} - correction-settled ${viaCorrection} = ${f.avail}`);
+        for (const [u, events] of byUser) {
+            const f = (0, exports.foldGrantWindow)(events);
+            out[u] = {
+                userId: u,
+                granted: events.reduce((a, e) => (e.src === 'grant' && e.amt > BigInt(0) ? a + e.amt : a), BigInt(0)),
+                consumed: f.jobCharged,
+                avail: f.avail,
+                expired: f.expired,
+                fifoGrantId: f.fifoGrantId,
+            };
+            if (f.beyondGrants > BigInt(0)) {
+                log.info(`grant allotment ${u}: ${f.beyondGrants} beyond grants (purchase-paid at the time), ` +
+                    `${f.expired} expired past the ${exports.GRANT_LOOKBACK_DAYS}d window — avail ${f.avail}`);
             }
         }
         return out;
@@ -372,7 +441,7 @@ const pgClient = (config) => {
         const sequenceNumbers = [];
         const dbEpochIds = [];
         for (const bt of bts) {
-            let { solKey: toSolKey, seq, createdAt, amount, upgradeBracket, priorSupply, points, epochId, } = bt;
+            let { solKey: toSolKey, seq, createdAt, amount, upgradeBracket, priorSupply, points, epochId, sender, } = bt;
             let entityId;
             if (toSolKey && toSolKey != '') {
                 entityId = yield getOrInsertEntity(db, { solKey: toSolKey });
@@ -393,6 +462,7 @@ const pgClient = (config) => {
                 prior_supply: priorSupply,
                 points: points,
                 epoch_id: dbEpochId,
+                sender: sender,
             })
                 .onConflict((oc) => oc.column('sequence').doUpdateSet({
                 created_at: createdAt,
@@ -402,6 +472,7 @@ const pgClient = (config) => {
                 points: points,
                 epoch_id: dbEpochId,
                 entity_id: entityId,
+                sender: sender,
             }))
                 .returning('sequence');
             const c = q.compile();
@@ -1156,7 +1227,7 @@ const pgClient = (config) => {
             });
         },
         insertGrantSpend(db, p, log = logger_1.consoleLogger) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d;
             return __awaiter(this, void 0, void 0, function* () {
                 const existing = yield getCurrentUserGrantSpend(db.trx, { userId: p.userId }, log);
                 const diff = {
@@ -1183,16 +1254,13 @@ const pgClient = (config) => {
                             return;
                         }
                     }
-                    // FIFO-attribute this spend to the user's oldest OTOY grant that still has room. Stamping
-                    // otoy_grant_id is what makes getGrantAllotments count it as consumed — an unattributed row
-                    // would leave the grant looking unspent and let it fund a second burn.
+                    // FIFO-attribute this spend to the user's oldest LIVE OTOY grant that still has room (the fold
+                    // already applies the lookback window). Stamping otoy_grant_id is what shows the draw in the
+                    // admin drill-down — an unattributed row would leave the grant looking unspent there.
                     let otoyGrantId = p.otoyGrantId;
                     if (otoyGrantId === undefined && p.renderSpentDelta < BigInt(0)) {
                         const allots = yield getGrantAllotments(db.trx, { userIds: [p.userId] }, log);
-                        const a = allots[p.userId];
-                        if (a) {
-                            otoyGrantId = (0, exports.foldGrantAllotment)(a.grants, a.consumed, BigInt(0)).fifoGrantId;
-                        }
+                        otoyGrantId = (_c = allots[p.userId]) === null || _c === void 0 ? void 0 : _c.fifoGrantId;
                     }
                     const v = {
                         user_id: p.userId,
@@ -1218,7 +1286,7 @@ const pgClient = (config) => {
                     user_id: p.userId,
                     render_spent: p.renderSpentDelta,
                     description: p.description,
-                    perpetual: (_c = p.perpetual) !== null && _c !== void 0 ? _c : false,
+                    perpetual: (_d = p.perpetual) !== null && _d !== void 0 ? _d : false,
                 })
                     .onConflict((oc) => oc.column('user_id').doUpdateSet(diff))
                     .returning((eb) => [
@@ -1563,138 +1631,75 @@ const pgClient = (config) => {
         fetchBurnsPage(db, f, log = logger_1.consoleLogger) {
             var _a;
             return __awaiter(this, void 0, void 0, function* () {
-                const params = [];
-                const p = (v) => {
-                    params.push(v);
-                    return `$${params.length}`;
-                };
-                // Decode cursor — supports new {t,id,ea} format and legacy bare-id format.
-                let cursorEa;
-                let cursorType;
-                let cursorId;
-                if (f.cursor) {
-                    const raw = atob(f.cursor);
-                    try {
-                        const c = JSON.parse(raw);
-                        cursorEa = new Date(c.ea);
-                        cursorType = c.t;
-                        cursorId = c.id;
-                    }
-                    catch (_b) {
-                        // Legacy cursor: bare burn.id — treat as buy-burn cursor.
-                        cursorId = Number(raw);
-                        cursorType = 'buy';
-                    }
+                const lastId = f.cursor ? atob(f.cursor) : undefined;
+                let q = db.trx
+                    .selectFrom('burn')
+                    .selectAll('burn')
+                    .innerJoin('sol_tx', 'sol_tx.id', 'burn.sol_tx_id')
+                    .select(['sol_tx.executed_at', 'sol_tx.sig']);
+                if (!f.inclManual) {
+                    q = q.where('burn.usdc_spent', '>', String(0));
+                }
+                if (f.executedAfter) {
+                    q = q.where('sol_tx.executed_at', '>=', f.executedAfter);
+                }
+                if (f.executedBefore) {
+                    q = q.where('sol_tx.executed_at', '<=', f.executedBefore);
+                }
+                if (f.sig) {
+                    // Exact match, not a prefix: sol_tx.sig is unique, so this is an index hit returning at most one row.
+                    q = q.where('sol_tx.sig', '=', f.sig);
                 }
-                // Shared WHERE fragments pushed into each union leg for index use.
-                const dateFilters = [];
-                if (f.executedAfter)
-                    dateFilters.push(`st.executed_at >= ${p(f.executedAfter)}`);
-                if (f.executedBefore)
-                    dateFilters.push(`st.executed_at <= ${p(f.executedBefore)}`);
-                const sigFilter = f.sig ? `st.sig = ${p(f.sig)}` : '';
-                // Buy-burn leg
-                const buyWhere = [...dateFilters];
-                if (!f.inclManual)
-                    buyWhere.push('b.usdc_spent > 0');
-                if (sigFilter)
-                    buyWhere.push(sigFilter);
-                if (f.jobId !== undefined) {
-                    buyWhere.push(`b.id IN (SELECT burn_id FROM job WHERE id = ${p(f.jobId)})`);
-                }
-                const buyWhereClause = buyWhere.length ? `WHERE ${buyWhere.join(' AND ')}` : '';
-                const buySql = `
-        SELECT 'buy'::text AS type, b.id::bigint AS sortid, b.id AS id,
-               st.executed_at, b.priced_at, b.burned::text AS burned,
-               b.usdc_spent::text AS usdc_spent, b.quote_amt::text AS quote_amt,
-               b.tags, st.sig, b.render_to_usdc, b.eur_to_usdc,
-               coalesce(b.from_escrow_usdc, 0)::text AS from_escrow_usdc,
-               b.down_correction_id, b.escrow_correction_id,
-               b.marked_burned_at
-          FROM burn b
-         INNER JOIN sol_tx st ON st.id = b.sol_tx_id
-         ${buyWhereClause}`;
-                // Grant-burn leg
-                const grantWhere = [...dateFilters];
-                if (sigFilter)
-                    grantWhere.push(sigFilter);
                 if (f.jobId !== undefined) {
-                    grantWhere.push(`gb.id IN (SELECT grant_burn_id FROM job WHERE id = ${p(f.jobId)})`);
-                }
-                const grantWhereClause = grantWhere.length ? `WHERE ${grantWhere.join(' AND ')}` : '';
-                const grantSql = `
-        SELECT 'grant'::text AS type, gb.id::bigint AS sortid, gb.id AS id,
-               st.executed_at, null::timestamp AS priced_at, gb.burned::text AS burned,
-               '0' AS usdc_spent, '0' AS quote_amt,
-               gb.tags, st.sig, null::float8 AS render_to_usdc, null::float8 AS eur_to_usdc,
-               '0' AS from_escrow_usdc,
-               null::bigint AS down_correction_id, null::bigint AS escrow_correction_id,
-               gb.marked_burned_at
-          FROM grant_burn gb
-         INNER JOIN sol_tx st ON st.id = gb.sol_tx_id
-         ${grantWhereClause}`;
-                // Cursor filter on the outer query — row comparison for deterministic paging.
-                let cursorFilter = '';
-                if (cursorEa && cursorType && cursorId !== undefined) {
-                    cursorFilter = `WHERE (u.executed_at, u.type, u.sortid) > (${p(cursorEa)}, ${p(cursorType)}, ${p(cursorId)})`;
-                }
-                else if (cursorId !== undefined) {
-                    // Legacy cursor fallback: only buy burns, ordered by id.
-                    cursorFilter = `WHERE u.type = 'buy' AND u.sortid > ${p(cursorId)}`;
+                    // "Which burn consumed this job?" — job.burn_id is the FK, so resolve it as a subquery rather than
+                    // joining `job` into the page query, which would multiply rows by job count and break both the limit
+                    // and the cursor.
+                    q = q.where('burn.id', 'in', (eb) => eb
+                        .selectFrom('job')
+                        .select('job.burn_id')
+                        .where('job.id', '=', String(f.jobId)));
+                }
+                if (lastId) {
+                    q = q.where('burn.id', '>', lastId);
                 }
                 const limit = (_a = f.limit) !== null && _a !== void 0 ? _a : 1000;
-                const sql = `
-        SELECT u.* FROM (
-          ${buySql}
-          UNION ALL
-          ${grantSql}
-        ) u
-        ${cursorFilter}
-        ORDER BY u.executed_at ASC, u.type, u.sortid
-        LIMIT ${p(limit)}`;
-                const { rows } = yield (0, base_1.timedQuery)(pgPool, sql, params, 'fetchBurnsPage', log);
+                q = q.limit(limit).orderBy('burn.id');
+                const comp = q.compile();
+                const { rows } = yield (0, base_1.timedQuery)(pgPool, comp.sql, comp.parameters, 'fetchBurnsPage', log);
                 const burns = rows.map((r) => {
-                    var _a, _b, _c, _d, _e, _f;
+                    var _a, _b;
                     return ({
                         jobs: [],
                         id: Number(r.id),
-                        type: r.type,
-                        renderToUsdc: (_a = r.render_to_usdc) !== null && _a !== void 0 ? _a : undefined,
+                        renderToUsdc: r.render_to_usdc,
                         solTx: r.sig,
                         executedAt: r.executed_at,
-                        pricedAt: (_b = r.priced_at) !== null && _b !== void 0 ? _b : undefined,
-                        usdcSpent: BigInt((_c = r.usdc_spent) !== null && _c !== void 0 ? _c : 0),
-                        quoteAmt: BigInt((_d = r.quote_amt) !== null && _d !== void 0 ? _d : 0),
+                        pricedAt: r.priced_at,
+                        usdcSpent: BigInt((_a = r.usdc_spent) !== null && _a !== void 0 ? _a : 0),
+                        quoteAmt: BigInt((_b = r.quote_amt) !== null && _b !== void 0 ? _b : 0),
                         burned: BigInt(r.burned),
-                        eurToUsdc: (_e = r.eur_to_usdc) !== null && _e !== void 0 ? _e : undefined,
+                        eurToUsdc: r.eur_to_usdc,
                         markedBurnedAt: r.marked_burned_at,
                         tags: r.tags ? r.tags.split(',') : [],
-                        fromEscrowUsdc: BigInt((_f = r.from_escrow_usdc) !== null && _f !== void 0 ? _f : 0),
-                        downCorrectionId: r.down_correction_id ? Number(r.down_correction_id) : undefined,
-                        escrowCorrectionId: r.escrow_correction_id ? Number(r.escrow_correction_id) : undefined,
                     });
                 });
                 return {
                     burns,
+                    // Only hand back a cursor on a full page; a short page means we're done.
                     cursor: burns.length === limit
-                        ? btoa(JSON.stringify({
-                            ea: rows[burns.length - 1].executed_at,
-                            t: rows[burns.length - 1].type,
-                            id: rows[burns.length - 1].sortid,
-                        }))
+                        ? btoa(String(burns[burns.length - 1].id))
                         : undefined,
                 };
             });
         },
-        fetchBurnJobs(db, burnId, burnType = 'buy', log = logger_1.consoleLogger) {
+        fetchBurnJobs(db, burnId, log = logger_1.consoleLogger) {
             return __awaiter(this, void 0, void 0, function* () {
-                const fk = burnType === 'grant' ? 'grant_burn_id' : 'burn_id';
                 const rows = yield db.trx
                     .selectFrom('job')
                     .selectAll('job')
-                    .where(fk, '=', String(burnId))
+                    .where('burn_id', '=', String(burnId))
                     .execute();
-                log.debug(`fetchBurnJobs ${burnType} ${burnId} -> ${rows.length} jobs`);
+                log.debug(`fetchBurnJobs burn ${burnId} -> ${rows.length} jobs`);
                 return rows.map((r) => ({
                     id: Number(r.id),
                     completedAt: r.completed_at,
@@ -2017,7 +2022,23 @@ const pgClient = (config) => {
             });
         },
         insertDispersedOutbox(p, log = logger_1.consoleLogger) {
+            var _a;
             return __awaiter(this, void 0, void 0, function* () {
+                // Check if dispersed_obligation table exists BEFORE the transaction so a missing table never
+                // poisons the txn (PG aborts the entire transaction on any error, even a caught one).
+                let hasObligationTable = false;
+                if ((_a = p.obligations) === null || _a === void 0 ? void 0 : _a.length) {
+                    try {
+                        const { rows } = yield (0, base_1.timedQuery)(pgPool, `SELECT 1 FROM information_schema.tables WHERE table_name = 'dispersed_obligation' LIMIT 1`, [], 'checkObligationTable', log);
+                        hasObligationTable = rows.length > 0;
+                    }
+                    catch (_b) {
+                        hasObligationTable = false;
+                    }
+                    if (!hasObligationTable) {
+                        log.warn(`dispersed obligations: table not found (migration 44 pending); skipping for tx ${p.txSignature}`);
+                    }
+                }
                 // The outbox row is the durable, crash-safe anchor persisted BEFORE broadcast. When it carries a
                 // burn-correction draw, we increment consumed_render in the SAME transaction as the insert, bounded
                 // so it can never exceed amount_render. Row + counter are therefore atomic and inseparable: no
@@ -2025,8 +2046,8 @@ const pgClient = (config) => {
                 // (decremented again by voidDispersedOutbox). If the bounded increment can't fit (a concurrent draw
                 // took the room), the whole txn rolls back and we return {inserted:false} — the caller must NOT
                 // broadcast (no row, no counter change, no burn).
-                return yield db.transaction().execute((trx) => __awaiter(this, void 0, void 0, function* () {
-                    var _a, _b, _c, _d, _e, _f, _g;
+                const result = yield db.transaction().execute((trx) => __awaiter(this, void 0, void 0, function* () {
+                    var _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
                     const res = yield trx
                         .insertInto(exports.DISPERSED_SETTLEMENT_TABLE)
                         .values({
@@ -2036,15 +2057,17 @@ const pgClient = (config) => {
                         settled_amount: p.settledAmount,
                         burned_amount: p.burnedAmount,
                         executed_at: p.executedAt,
-                        eur_render: (_a = p.eurRender) !== null && _a !== void 0 ? _a : null,
-                        last_valid_block_height: (_b = p.lastValidBlockHeight) !== null && _b !== void 0 ? _b : null,
-                        usdc_spent: (_c = p.usdcSpent) !== null && _c !== void 0 ? _c : null,
-                        correction_id: (_d = p.correctionId) !== null && _d !== void 0 ? _d : null,
-                        correction_render: (_e = p.correctionRender) !== null && _e !== void 0 ? _e : null,
+                        eur_render: (_c = p.eurRender) !== null && _c !== void 0 ? _c : null,
+                        last_valid_block_height: (_d = p.lastValidBlockHeight) !== null && _d !== void 0 ? _d : null,
+                        usdc_spent: (_e = p.usdcSpent) !== null && _e !== void 0 ? _e : null,
+                        correction_id: (_f = p.correctionId) !== null && _f !== void 0 ? _f : null,
+                        correction_render: (_g = p.correctionRender) !== null && _g !== void 0 ? _g : null,
+                        usage_from: (_h = p.usageFrom) !== null && _h !== void 0 ? _h : null,
+                        usage_to: (_j = p.usageTo) !== null && _j !== void 0 ? _j : null,
                     })
                         .onConflict((oc) => oc.column('tx_signature').doNothing())
                         .executeTakeFirst();
-                    const inserted = ((_f = res.numInsertedOrUpdatedRows) !== null && _f !== void 0 ? _f : BigInt(0)) > BigInt(0);
+                    const inserted = ((_k = res.numInsertedOrUpdatedRows) !== null && _k !== void 0 ? _k : BigInt(0)) > BigInt(0);
                     // Only reserve when the row was actually inserted (a tx_signature conflict is a no-op → no double
                     // count) and it drew a correction.
                     if (inserted &&
@@ -2059,19 +2082,35 @@ const pgClient = (config) => {
                             .where('id', '=', String(p.correctionId))
                             .where((eb) => eb((0, kysely_1.sql) `consumed_render + ${p.correctionRender}::numeric`, '<=', eb.ref('amount_render')))
                             .executeTakeFirst();
-                        if (((_g = upd.numUpdatedRows) !== null && _g !== void 0 ? _g : BigInt(0)) === BigInt(0)) {
+                        if (((_l = upd.numUpdatedRows) !== null && _l !== void 0 ? _l : BigInt(0)) === BigInt(0)) {
                             // Would exceed amount_render (concurrent draw won the room) — roll back the whole txn.
                             log.warn(`dispersed correction ${p.correctionId}: draw ${p.correctionRender} would over-consume; rejecting outbox insert for tx ${p.txSignature}`);
                             throw new DispersedCorrectionRejected();
                         }
                     }
-                    log.debug(`dispersed outbox tx ${p.txSignature}: ${res.numInsertedOrUpdatedRows} row(s)`);
+                    if (inserted && hasObligationTable && ((_m = p.obligations) === null || _m === void 0 ? void 0 : _m.length)) {
+                        for (const o of p.obligations) {
+                            yield trx
+                                .insertInto('dispersed_obligation')
+                                .values({
+                                settlement_tx_sig: p.txSignature,
+                                uuid: o.uuid,
+                                amount_eur: o.amountEur,
+                                opened_at: o.openedAt,
+                                authorization_uuid: (_o = o.authorizationUuid) !== null && _o !== void 0 ? _o : null,
+                            })
+                                .onConflict((oc) => oc.column('uuid').doNothing())
+                                .execute();
+                        }
+                    }
+                    log.debug(`dispersed outbox tx ${p.txSignature}: ${res.numInsertedOrUpdatedRows} row(s), ${hasObligationTable ? ((_q = (_p = p.obligations) === null || _p === void 0 ? void 0 : _p.length) !== null && _q !== void 0 ? _q : 0) : 0} obligations`);
                     return { inserted };
                 })).catch((e) => {
                     if (e instanceof DispersedCorrectionRejected)
                         return { inserted: false };
                     throw e;
                 });
+                return result;
             });
         },
         getOutstandingDispersedCorrection(log = logger_1.consoleLogger) {