@render-foundation/utils 0.0.236 → 0.0.238

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

@@ -15,23 +15,13 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -45,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.DISPERSED_SETTLEMENT_TABLE = exports.GRANT_BURN_TABLE = exports.GRANT_BURN_ID_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.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;
 const kysely_1 = require("kysely");
 const logger_1 = require("../../logger");
 const pg_1 = require("pg");
@@ -69,12 +59,48 @@ exports.ENTITY_EPOCH_INFO_TABLE = 'entity_epoch_info';
 exports.POLYGON_UPGRADE_TABLE = 'polygon_upgrade';
 exports.CURRENT_USER_GRANT_SPEND_TABLE = 'current_user_grant_spend';
 exports.USER_GRANT_SPEND_TABLE = 'user_grant_spend';
+exports.OTOY_GRANT_TABLE = 'otoy_grant';
 exports.GRANT_BURN_ID_TABLE = 'grant_burn_id';
 exports.GRANT_BURN_TABLE = 'grant_burn';
 exports.DISPERSED_SETTLEMENT_TABLE = 'dispersed_settlement';
+exports.DISPERSED_BURN_CORRECTION_TABLE = 'dispersed_burn_correction';
 BigInt.prototype.toJSON = function () {
     return this.toString();
 };
+// EUR -> render credits. OTOY issues grants in EUR (otoy_grant.amount_credits holds the raw OTOY
+// 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);
+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;
+    let fifoGrantId;
+    for (const g of grants) {
+        if (drawn < g.amountCredits) {
+            fifoGrantId = g.id;
+            break;
+        }
+        drawn -= g.amountCredits;
+    }
+    return { granted, consumed, avail, fifoGrantId };
+};
+exports.foldGrantAllotment = foldGrantAllotment;
 const base_2 = require("./base");
 const moment_1 = __importDefault(require("moment"));
 pg.types.setTypeParser(1114, (str) => moment_1.default.utc(str).toDate());
@@ -92,6 +118,11 @@ const batchFinishedAtMedian = (jobs) => {
     return pricedAt;
 };
 exports.batchFinishedAtMedian = batchFinishedAtMedian;
+// Thrown+caught inside insertDispersedOutbox to roll back the txn when a correction draw would push
+// consumed_render past amount_render (a concurrent draw won the room). Not exported — the caller sees
+// { inserted: false } instead.
+class DispersedCorrectionRejected extends Error {
+}
 const pgClient = (config) => {
     // Single pg pool that we can also use for ad-hoc performance tests outside Kysely
     const pgPool = new pg_1.Pool(config);
@@ -105,7 +136,7 @@ const pgClient = (config) => {
     const db = new kysely_1.Kysely({
         dialect,
     });
-    const getOrInsertEntity = (db_1, p_1, ...args_1) => __awaiter(void 0, [db_1, p_1, ...args_1], void 0, function* (db, p, log = logger_1.consoleLogger) {
+    const getOrInsertEntity = (db, p, log = logger_1.consoleLogger) => __awaiter(void 0, void 0, void 0, function* () {
         const res = (yield db
             .selectFrom(exports.ENTITY_TABLE)
             .select('id')
@@ -126,7 +157,7 @@ const pgClient = (config) => {
         log.debug(`inserted entity ${id}`);
         return id;
     });
-    const getOrInsertTx = (db_1, p_1, ...args_1) => __awaiter(void 0, [db_1, p_1, ...args_1], void 0, function* (db, p, log = logger_1.consoleLogger) {
+    const getOrInsertTx = (db, p, log = logger_1.consoleLogger) => __awaiter(void 0, void 0, void 0, function* () {
         const res = yield db
             .selectFrom(exports.SOL_TX_TABLE)
             .select('id')
@@ -148,7 +179,7 @@ const pgClient = (config) => {
         log.debug(`inserted tx ${id}`);
         return id;
     });
-    const getOrInsertEpoch = (db_1, p_1, ...args_1) => __awaiter(void 0, [db_1, p_1, ...args_1], void 0, function* (db, p, log = logger_1.consoleLogger) {
+    const getOrInsertEpoch = (db, p, log = logger_1.consoleLogger) => __awaiter(void 0, void 0, void 0, function* () {
         const res = yield db
             .selectFrom(exports.EPOCH_TABLE)
             .select('id')
@@ -176,7 +207,7 @@ const pgClient = (config) => {
         log.debug(`inserted epoch ${id}`);
         return id;
     });
-    const getCurrentUserGrantSpend = (db_1, p_1, ...args_1) => __awaiter(void 0, [db_1, p_1, ...args_1], void 0, function* (db, p, log = logger_1.consoleLogger) {
+    const getCurrentUserGrantSpend = (db, p, log = logger_1.consoleLogger) => __awaiter(void 0, void 0, void 0, function* () {
         var _a;
         const res = yield db
             .selectFrom(exports.CURRENT_USER_GRANT_SPEND_TABLE)
@@ -194,6 +225,73 @@ const pgClient = (config) => {
             }
             : undefined;
     });
+    // 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;
+        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,
+            });
+        }
+        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}`);
+            }
+        }
+        return out;
+    });
     const updateTotalRndr = (db, p, totalRndr, savedAt, log) => __awaiter(void 0, void 0, void 0, function* () {
         const res = (yield db
             .updateTable(exports.EPOCH_TABLE)
@@ -206,7 +304,7 @@ const pgClient = (config) => {
             .executeTakeFirst());
         log.info(`set ${res.numUpdatedRows} rows. channel: ${p.channel}, ui: ${p.uiEpochId} -> totalRndr ${totalRndr} `);
     });
-    const fetchJobs1 = (db_1, f_1, ...args_1) => __awaiter(void 0, [db_1, f_1, ...args_1], void 0, function* (db, f, log = logger_1.consoleLogger) {
+    const fetchJobs1 = (db, f, log = logger_1.consoleLogger) => __awaiter(void 0, void 0, void 0, function* () {
         let q = db.selectFrom('job').selectAll();
         //.where('job.burn_id', 'is not', null)
         if (f.completedAtAfter) {
@@ -236,7 +334,7 @@ const pgClient = (config) => {
             insertedAt: r.inserted_at,
         }));
     });
-    const fetchJobs2 = (db_1, f_1, ...args_1) => __awaiter(void 0, [db_1, f_1, ...args_1], void 0, function* (db, f, log = logger_1.consoleLogger) {
+    const fetchJobs2 = (db, f, log = logger_1.consoleLogger) => __awaiter(void 0, void 0, void 0, function* () {
         let q = db.selectFrom('job').selectAll();
         //.where('job.burn_id', 'is not', null)
         if (f.completedAtAfter) {
@@ -270,7 +368,7 @@ const pgClient = (config) => {
             });
         });
     });
-    const createBridgeTransfers = (db_1, bts_1, ...args_1) => __awaiter(void 0, [db_1, bts_1, ...args_1], void 0, function* (db, bts, log = logger_1.consoleLogger) {
+    const createBridgeTransfers = (db, bts, log = logger_1.consoleLogger) => __awaiter(void 0, void 0, void 0, function* () {
         const sequenceNumbers = [];
         const dbEpochIds = [];
         for (const bt of bts) {
@@ -314,7 +412,7 @@ const pgClient = (config) => {
         }
         return { sequenceNumbers: sequenceNumbers };
     });
-    const createPayments = (db_1, ps_1, ...args_1) => __awaiter(void 0, [db_1, ps_1, ...args_1], void 0, function* (db, ps, log = logger_1.consoleLogger) {
+    const createPayments = (db, ps, log = logger_1.consoleLogger) => __awaiter(void 0, void 0, void 0, function* () {
         const ids = [];
         const epochDbIds = [];
         for (const p of ps) {
@@ -411,18 +509,18 @@ const pgClient = (config) => {
             rollback: () => { },
             trx: db,
         },
-        startTransaction() {
-            return __awaiter(this, arguments, void 0, function* (log = logger_1.consoleLogger) {
+        startTransaction(log = logger_1.consoleLogger) {
+            return __awaiter(this, void 0, void 0, function* () {
                 return (0, base_2.begin)(db, log);
             });
         },
-        createPayments(db_1, ps_1) {
-            return __awaiter(this, arguments, void 0, function* (db, ps, log = logger_1.consoleLogger) {
+        createPayments(db, ps, log = logger_1.consoleLogger) {
+            return __awaiter(this, void 0, void 0, function* () {
                 return createPayments(db.trx, ps, log);
             });
         },
-        fetchTransfers(db_1, f_1) {
-            return __awaiter(this, arguments, void 0, function* (db, f, log = logger_1.consoleLogger) {
+        fetchTransfers(db, f, log = logger_1.consoleLogger) {
+            return __awaiter(this, void 0, void 0, function* () {
                 let lastId = undefined;
                 if (f.cursor) {
                     lastId = atob(f.cursor);
@@ -478,8 +576,8 @@ const pgClient = (config) => {
                 };
             });
         },
-        fetchEpochs(db_1, f_1) {
-            return __awaiter(this, arguments, void 0, function* (db, f, log = logger_1.consoleLogger) {
+        fetchEpochs(db, f, log = logger_1.consoleLogger) {
+            return __awaiter(this, void 0, void 0, function* () {
                 let q = db.trx.selectFrom(exports.EPOCH_TABLE).selectAll();
                 if (f.channels) {
                     q = q.where('channel', 'in', f.channels);
@@ -502,9 +600,9 @@ const pgClient = (config) => {
                 }));
             });
         },
-        fetchLiabilities(db_1, f_1) {
-            return __awaiter(this, arguments, void 0, function* (db, f, log = logger_1.consoleLogger) {
-                var _a;
+        fetchLiabilities(db, f, log = logger_1.consoleLogger) {
+            var _a;
+            return __awaiter(this, void 0, void 0, function* () {
                 let offset = 0;
                 let orderBy = (_a = f.orderBy) !== null && _a !== void 0 ? _a : 'epoch.ui,liability.id';
                 if (f.cursor) {
@@ -571,8 +669,8 @@ const pgClient = (config) => {
                 };
             });
         },
-        getLiabilitiesAndTransfers(f_1) {
-            return __awaiter(this, arguments, void 0, function* (f, log = logger_1.consoleLogger) {
+        getLiabilitiesAndTransfers(f, log = logger_1.consoleLogger) {
+            return __awaiter(this, void 0, void 0, function* () {
                 let lq = db
                     .selectFrom(exports.LIABILITY_TABLE)
                     .selectAll()
@@ -633,9 +731,9 @@ const pgClient = (config) => {
                 return { transfers, liabilities, epochs: Object.values(epochs) };
             });
         },
-        getOutstanding(f_1) {
-            return __awaiter(this, arguments, void 0, function* (f, log = logger_1.consoleLogger) {
-                var _a, _b, _c, _d, _e;
+        getOutstanding(f, log = logger_1.consoleLogger) {
+            var _a, _b, _c, _d, _e;
+            return __awaiter(this, void 0, void 0, function* () {
                 log.info(`getting outstanding balances for ${(_a = f.channels) !== null && _a !== void 0 ? _a : '(no channels specified)'} epoch: ${(_b = f.startEpochId.id) !== null && _b !== void 0 ? _b : '(no epoch specified)'}`);
                 let epochUi;
                 let epochEndTime;
@@ -771,8 +869,8 @@ const pgClient = (config) => {
                 return out;
             });
         },
-        addLiabilityAdjustments(batch_1, rows_1) {
-            return __awaiter(this, arguments, void 0, function* (batch, rows, log = logger_1.consoleLogger) {
+        addLiabilityAdjustments(batch, rows, log = logger_1.consoleLogger) {
+            return __awaiter(this, void 0, void 0, function* () {
                 return yield db.transaction().execute((trx) => __awaiter(this, void 0, void 0, function* () {
                     var _a;
                     // Upsert the batch by its label (idempotent re-runs; label is the run identity).
@@ -824,9 +922,9 @@ const pgClient = (config) => {
                 }));
             });
         },
-        fetchNodeOperatorEpoch(epochId_1) {
-            return __awaiter(this, arguments, void 0, function* (epochId, log = logger_1.consoleLogger) {
-                var _a;
+        fetchNodeOperatorEpoch(epochId, log = logger_1.consoleLogger) {
+            var _a;
+            return __awaiter(this, void 0, void 0, function* () {
                 const q = db
                     .selectFrom(exports.JOB_ID_TABLE)
                     .innerJoin(exports.EPOCH_TABLE, 'epoch.id', 'job_id.epoch_id')
@@ -876,14 +974,14 @@ const pgClient = (config) => {
                 };
             });
         },
-        insertEpoch(db_1, epoch_1) {
-            return __awaiter(this, arguments, void 0, function* (db, epoch, log = logger_1.consoleLogger) {
+        insertEpoch(db, epoch, log = logger_1.consoleLogger) {
+            return __awaiter(this, void 0, void 0, function* () {
                 yield getOrInsertEpoch(db.trx, Object.assign(Object.assign({}, epoch), { uiEpochId: epoch.ui }), log);
             });
         },
-        getEpoch(f_1) {
-            return __awaiter(this, arguments, void 0, function* (f, log = logger_1.consoleLogger) {
-                var _a;
+        getEpoch(f, log = logger_1.consoleLogger) {
+            var _a;
+            return __awaiter(this, void 0, void 0, function* () {
                 const now = new Date(Date.now());
                 try {
                     let q = db
@@ -921,9 +1019,9 @@ const pgClient = (config) => {
                 }
             });
         },
-        getLatestNodeOperatorEpoch(f_1) {
-            return __awaiter(this, arguments, void 0, function* (f, log = logger_1.consoleLogger) {
-                var _a;
+        getLatestNodeOperatorEpoch(f, log = logger_1.consoleLogger) {
+            var _a;
+            return __awaiter(this, void 0, void 0, function* () {
                 const now = new Date(Date.now());
                 try {
                     let q = db
@@ -963,8 +1061,8 @@ const pgClient = (config) => {
                 }
             });
         },
-        saveNodeOperatorEpoch(epochId_1, liabilities_1, jobIds_1, totalRndr_1) {
-            return __awaiter(this, arguments, void 0, function* (epochId, liabilities, jobIds, totalRndr, log = logger_1.consoleLogger) {
+        saveNodeOperatorEpoch(epochId, liabilities, jobIds, totalRndr, log = logger_1.consoleLogger) {
+            return __awaiter(this, void 0, void 0, function* () {
                 yield db
                     .transaction()
                     .setIsolationLevel('repeatable read')
@@ -1000,8 +1098,8 @@ const pgClient = (config) => {
                 return;
             });
         },
-        produceBurnedJobs(jobs_1) {
-            return __awaiter(this, arguments, void 0, function* (jobs, log = logger_1.consoleLogger) {
+        produceBurnedJobs(jobs, log = logger_1.consoleLogger) {
+            return __awaiter(this, void 0, void 0, function* () {
                 yield db.transaction().execute((trx) => __awaiter(this, void 0, void 0, function* () {
                     var _a;
                     let num = BigInt(0);
@@ -1024,9 +1122,9 @@ const pgClient = (config) => {
                 }));
             });
         },
-        markJobsBurntWithGrant(db_1, p_1) {
-            return __awaiter(this, arguments, void 0, function* (db, p, log = logger_1.consoleLogger) {
-                var _a;
+        markJobsBurntWithGrant(db, p, log = logger_1.consoleLogger) {
+            var _a;
+            return __awaiter(this, void 0, void 0, function* () {
                 const solTxId = yield getOrInsertTx(db.trx, { sig: p.tx.sig, executedAt: p.tx.executedAt }, log);
                 const { id } = yield db.trx
                     .insertInto(exports.GRANT_BURN_TABLE)
@@ -1057,9 +1155,9 @@ const pgClient = (config) => {
                 return;
             });
         },
-        insertGrantSpend(db_1, p_1) {
-            return __awaiter(this, arguments, void 0, function* (db, p, log = logger_1.consoleLogger) {
-                var _a, _b, _c;
+        insertGrantSpend(db, p, log = logger_1.consoleLogger) {
+            var _a, _b, _c;
+            return __awaiter(this, void 0, void 0, function* () {
                 const existing = yield getCurrentUserGrantSpend(db.trx, { userId: p.userId }, log);
                 const diff = {
                     render_spent: ((_a = existing === null || existing === void 0 ? void 0 : existing.renderSpent) !== null && _a !== void 0 ? _a : BigInt(0)) + p.renderSpentDelta,
@@ -1085,11 +1183,23 @@ 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.
+                    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;
+                        }
+                    }
                     const v = {
                         user_id: p.userId,
                         render_spent_delta: p.renderSpentDelta,
                         grant_burn_id: p.grantBurnId,
                         job_id: p.jobId,
+                        otoy_grant_id: otoyGrantId,
                     };
                     const res = yield db.trx
                         .insertInto(exports.USER_GRANT_SPEND_TABLE)
@@ -1124,9 +1234,9 @@ const pgClient = (config) => {
                 }
             });
         },
-        markJobsBurnt(trx_1, p_1) {
-            return __awaiter(this, arguments, void 0, function* (trx, p, log = logger_1.consoleLogger) {
-                var _a, _b;
+        markJobsBurnt(trx, p, log = logger_1.consoleLogger) {
+            var _a, _b;
+            return __awaiter(this, void 0, void 0, function* () {
                 if (!p.buyBurn && !p.grantBurn) {
                     throw new Error('no buyBurn or grantBurn');
                 }
@@ -1227,8 +1337,8 @@ const pgClient = (config) => {
                 return { grantBurnId, buyBurnId };
             });
         },
-        markJobsBurned(trx_1, p_1) {
-            return __awaiter(this, arguments, void 0, function* (trx, p, log = logger_1.consoleLogger) {
+        markJobsBurned(trx, p, log = logger_1.consoleLogger) {
+            return __awaiter(this, void 0, void 0, function* () {
                 let { markedAt, solTx } = p;
                 let res = yield trx.trx
                     .updateTable(exports.BURN_TABLE)
@@ -1252,8 +1362,8 @@ const pgClient = (config) => {
                 }
             });
         },
-        consumeAndLockBurnJobs(limit_1, lowerRndrThreshold_1, upperRndrThreshold_1) {
-            return __awaiter(this, arguments, void 0, function* (limit, lowerRndrThreshold, upperRndrThreshold, log = logger_1.consoleLogger) {
+        consumeAndLockBurnJobs(limit, lowerRndrThreshold, upperRndrThreshold, log = logger_1.consoleLogger) {
+            return __awaiter(this, void 0, void 0, function* () {
                 const trx = yield (0, base_2.begin)(db, log);
                 const q = trx.trx
                     .selectFrom(trx.trx
@@ -1360,9 +1470,9 @@ const pgClient = (config) => {
                 };
             });
         },
-        incrBuyBurnMetrics() {
-            return __awaiter(this, arguments, void 0, function* (log = logger_1.consoleLogger) {
-                var _a;
+        incrBuyBurnMetrics(log = logger_1.consoleLogger) {
+            var _a;
+            return __awaiter(this, void 0, void 0, function* () {
                 const res = yield db
                     .selectFrom(exports.JOB_TABLE)
                     .select('inserted_at')
@@ -1379,9 +1489,9 @@ const pgClient = (config) => {
                 };
             });
         },
-        fetchBurns(db_1, f_1) {
-            return __awaiter(this, arguments, void 0, function* (db, f, log = logger_1.consoleLogger) {
-                var _a, _b;
+        fetchBurns(db, f, log = logger_1.consoleLogger) {
+            var _a, _b;
+            return __awaiter(this, void 0, void 0, function* () {
                 let q = db.trx
                     .selectFrom('burn')
                     .selectAll('burn')
@@ -1450,9 +1560,9 @@ const pgClient = (config) => {
                 return burns;
             });
         },
-        fetchBurnsAndGrants(db_1, f_1) {
-            return __awaiter(this, arguments, void 0, function* (db, f, log = logger_1.consoleLogger) {
-                var _a, _b;
+        fetchBurnsAndGrants(db, f, log = logger_1.consoleLogger) {
+            var _a, _b;
+            return __awaiter(this, void 0, void 0, function* () {
                 // Build a unified query to get all transactions with both buy burns and grant burns
                 let baseQuery = db.trx
                     .selectFrom('sol_tx')
@@ -1590,13 +1700,13 @@ const pgClient = (config) => {
                 return groupedBurns;
             });
         },
-        createBridgeTransfers(db_1, bts_1) {
-            return __awaiter(this, arguments, void 0, function* (db, bts, log = logger_1.consoleLogger) {
+        createBridgeTransfers(db, bts, log = logger_1.consoleLogger) {
+            return __awaiter(this, void 0, void 0, function* () {
                 return createBridgeTransfers(db.trx, bts, log);
             });
         },
-        getBridgeTransfers(_a) {
-            return __awaiter(this, arguments, void 0, function* ({ solKey, page, }, log = logger_1.consoleLogger) {
+        getBridgeTransfers({ solKey, page, }, log = logger_1.consoleLogger) {
+            return __awaiter(this, void 0, void 0, function* () {
                 let q = db
                     .selectFrom(exports.BRIDGE_TRANSFER_TABLE)
                     .innerJoin(exports.EPOCH_TABLE, 'epoch.id', 'bridge_transfer.epoch_id')
@@ -1673,8 +1783,8 @@ const pgClient = (config) => {
             });
         },
         getTotalBurned(db) {
+            var _a, _b;
             return __awaiter(this, void 0, void 0, function* () {
-                var _a, _b;
                 const total = yield db.trx
                     .selectFrom('burn')
                     .select(({ fn }) => fn.sum('burned').as('total_burned'))
@@ -1682,8 +1792,8 @@ const pgClient = (config) => {
                 return BigInt((_b = (_a = total[0]) === null || _a === void 0 ? void 0 : _a.total_burned) !== null && _b !== void 0 ? _b : 0);
             });
         },
-        insertBurn(p_1) {
-            return __awaiter(this, arguments, void 0, function* (p, log = logger_1.consoleLogger) {
+        insertBurn(p, log = logger_1.consoleLogger) {
+            return __awaiter(this, void 0, void 0, function* () {
                 yield db.transaction().execute((trx) => __awaiter(this, void 0, void 0, function* () {
                     var _a;
                     const solTxId = yield getOrInsertTx(trx, { sig: p.solTx, executedAt: p.executedAt }, log);
@@ -1720,29 +1830,86 @@ const pgClient = (config) => {
                 }));
             });
         },
-        insertDispersedOutbox(p_1) {
-            return __awaiter(this, arguments, void 0, function* (p, log = logger_1.consoleLogger) {
-                var _a, _b, _c;
-                const res = yield db
-                    .insertInto(exports.DISPERSED_SETTLEMENT_TABLE)
-                    .values({
-                    tx_signature: p.txSignature,
-                    claim_uuid: p.claimUuid,
-                    obligation_uuids: p.obligationUuids,
-                    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,
-                })
-                    .onConflict((oc) => oc.column('tx_signature').doNothing())
+        insertDispersedOutbox(p, log = logger_1.consoleLogger) {
+            return __awaiter(this, void 0, void 0, function* () {
+                // 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
+                // reserve/insert gap to orphan on process death, and the counter reflects exactly the durable rows
+                // (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 res = yield trx
+                        .insertInto(exports.DISPERSED_SETTLEMENT_TABLE)
+                        .values({
+                        tx_signature: p.txSignature,
+                        claim_uuid: p.claimUuid,
+                        obligation_uuids: p.obligationUuids,
+                        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,
+                    })
+                        .onConflict((oc) => oc.column('tx_signature').doNothing())
+                        .executeTakeFirst();
+                    const inserted = ((_f = res.numInsertedOrUpdatedRows) !== null && _f !== void 0 ? _f : 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 &&
+                        p.correctionId != null &&
+                        p.correctionRender != null &&
+                        Number(p.correctionRender) > 0) {
+                        const upd = yield trx
+                            .updateTable(exports.DISPERSED_BURN_CORRECTION_TABLE)
+                            .set({
+                            consumed_render: (0, kysely_1.sql) `consumed_render + ${p.correctionRender}::numeric`,
+                        })
+                            .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)) {
+                            // 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)`);
+                    return { inserted };
+                })).catch((e) => {
+                    if (e instanceof DispersedCorrectionRejected)
+                        return { inserted: false };
+                    throw e;
+                });
+            });
+        },
+        getOutstandingDispersedCorrection(log = logger_1.consoleLogger) {
+            return __awaiter(this, void 0, void 0, function* () {
+                // consumed_render is the atomic source of truth; outstanding = amount_render - consumed_render.
+                const c = yield db
+                    .selectFrom(exports.DISPERSED_BURN_CORRECTION_TABLE)
+                    .select(['id', 'amount_render', 'consumed_render'])
+                    .where((eb) => eb('consumed_render', '<', eb.ref('amount_render')))
+                    .orderBy('id', 'asc')
+                    .limit(1)
                     .executeTakeFirst();
-                log.debug(`dispersed outbox tx ${p.txSignature}: ${res.numInsertedOrUpdatedRows} row(s)`);
+                if (!c)
+                    return null;
+                log.debug(`dispersed correction ${c.id}: outstanding ${Number(c.amount_render) - Number(c.consumed_render)} RENDER`);
+                return {
+                    id: Number(c.id),
+                    amountRender: c.amount_render,
+                    consumed: c.consumed_render,
+                };
             });
         },
-        markDispersedSettled(txSignature_1, p_1) {
-            return __awaiter(this, arguments, void 0, function* (txSignature, p, log = logger_1.consoleLogger) {
+        markDispersedSettled(txSignature, p, log = logger_1.consoleLogger) {
+            return __awaiter(this, void 0, void 0, function* () {
                 yield db
                     .updateTable(exports.DISPERSED_SETTLEMENT_TABLE)
                     .set({ settled_at: new Date(), idempotent_replay: p.idempotentReplay })
@@ -1751,8 +1918,8 @@ const pgClient = (config) => {
                 log.debug(`dispersed settled tx ${txSignature}`);
             });
         },
-        getUnsettledDispersed() {
-            return __awaiter(this, arguments, void 0, function* (log = logger_1.consoleLogger) {
+        getUnsettledDispersed(log = logger_1.consoleLogger) {
+            return __awaiter(this, void 0, void 0, function* () {
                 const rows = yield db
                     .selectFrom(exports.DISPERSED_SETTLEMENT_TABLE)
                     .selectAll()
@@ -1778,20 +1945,44 @@ const pgClient = (config) => {
                 });
             });
         },
-        voidDispersedOutbox(txSignature_1) {
-            return __awaiter(this, arguments, void 0, function* (txSignature, log = logger_1.consoleLogger) {
-                const res = yield db
-                    .deleteFrom(exports.DISPERSED_SETTLEMENT_TABLE)
-                    .where('tx_signature', '=', txSignature)
-                    // Never delete a row we already settled — void only applies to pending (un-landed) rows.
-                    .where('settled_at', 'is', null)
-                    .executeTakeFirst();
-                log.debug(`dispersed outbox void tx ${txSignature}: ${res.numDeletedRows} row(s)`);
+        voidDispersedOutbox(txSignature, log = logger_1.consoleLogger) {
+            return __awaiter(this, void 0, void 0, function* () {
+                // Void = the burn provably never landed. If the row drew a correction, give that draw back
+                // (decrement consumed_render) in the SAME txn as the delete, so the correction only counts draws
+                // whose burns actually landed. This is how a released reservation is reconciled from chain state.
+                yield db.transaction().execute((trx) => __awaiter(this, void 0, void 0, function* () {
+                    var _a;
+                    const row = yield trx
+                        .selectFrom(exports.DISPERSED_SETTLEMENT_TABLE)
+                        .select(['correction_id', 'correction_render'])
+                        .where('tx_signature', '=', txSignature)
+                        .where('settled_at', 'is', null)
+                        .executeTakeFirst();
+                    const res = yield trx
+                        .deleteFrom(exports.DISPERSED_SETTLEMENT_TABLE)
+                        .where('tx_signature', '=', txSignature)
+                        // Never delete a row we already settled — void only applies to pending (un-landed) rows.
+                        .where('settled_at', 'is', null)
+                        .executeTakeFirst();
+                    if (((_a = res.numDeletedRows) !== null && _a !== void 0 ? _a : BigInt(0)) > BigInt(0) &&
+                        (row === null || row === void 0 ? void 0 : row.correction_id) != null &&
+                        row.correction_render != null) {
+                        yield trx
+                            .updateTable(exports.DISPERSED_BURN_CORRECTION_TABLE)
+                            .set({
+                            consumed_render: (0, kysely_1.sql) `GREATEST(0, consumed_render - ${row.correction_render}::numeric)`,
+                        })
+                            .where('id', '=', row.correction_id)
+                            .execute();
+                        log.debug(`dispersed void tx ${txSignature}: released ${row.correction_render} RENDER to correction ${row.correction_id}`);
+                    }
+                    log.debug(`dispersed outbox void tx ${txSignature}: ${res.numDeletedRows} row(s)`);
+                }));
             });
         },
-        fetchDispersedSettlements(f_1) {
-            return __awaiter(this, arguments, void 0, function* (f, _log = logger_1.consoleLogger) {
-                var _a;
+        fetchDispersedSettlements(f, _log = logger_1.consoleLogger) {
+            var _a;
+            return __awaiter(this, void 0, void 0, function* () {
                 let q = db
                     .selectFrom(exports.DISPERSED_SETTLEMENT_TABLE)
                     // Settled burns only — pending (un-landed) outbox rows aren't real, completed burns.
@@ -1831,8 +2022,8 @@ const pgClient = (config) => {
                 });
             });
         },
-        fetchDispersedMonthlyStats(f_1) {
-            return __awaiter(this, arguments, void 0, function* (f, _log = logger_1.consoleLogger) {
+        fetchDispersedMonthlyStats(f, _log = logger_1.consoleLogger) {
+            return __awaiter(this, void 0, void 0, function* () {
                 let q = db
                     .selectFrom(exports.DISPERSED_SETTLEMENT_TABLE)
                     .where('settled_at', 'is not', null);
@@ -1862,18 +2053,18 @@ const pgClient = (config) => {
                 }));
             });
         },
-        fetchJobs(db_1, f_1) {
-            return __awaiter(this, arguments, void 0, function* (db, f, log = logger_1.consoleLogger) {
+        fetchJobs(db, f, log = logger_1.consoleLogger) {
+            return __awaiter(this, void 0, void 0, function* () {
                 return yield fetchJobs1(db.trx, f, log);
             });
         },
-        fetchJobsWithGrantValues(db_1, f_1) {
-            return __awaiter(this, arguments, void 0, function* (db, f, log = logger_1.consoleLogger) {
+        fetchJobsWithGrantValues(db, f, log = logger_1.consoleLogger) {
+            return __awaiter(this, void 0, void 0, function* () {
                 return yield fetchJobs2(db.trx, f, log);
             });
         },
-        fetchLiabilityEpochs(db_1) {
-            return __awaiter(this, arguments, void 0, function* (db, log = logger_1.consoleLogger) {
+        fetchLiabilityEpochs(db, log = logger_1.consoleLogger) {
+            return __awaiter(this, void 0, void 0, function* () {
                 const q = db.trx
                     .selectFrom(exports.LIABILITY_TABLE)
                     .select(({ fn }) => [
@@ -1931,8 +2122,8 @@ const pgClient = (config) => {
                 }));
             });
         },
-        createBurnCorrection(trx_1, p_1) {
-            return __awaiter(this, arguments, void 0, function* (trx, p, log = logger_1.consoleLogger) {
+        createBurnCorrection(trx, p, log = logger_1.consoleLogger) {
+            return __awaiter(this, void 0, void 0, function* () {
                 // Anchor + unit invariants are also DB CHECKs; validate here for a clearer error.
                 if ((p.jobId == null) === (p.solTxId == null))
                     throw new Error('burn_correction needs exactly one anchor (jobId XOR solTxId)');
@@ -1962,8 +2153,8 @@ const pgClient = (config) => {
                 return Number(row.id);
             });
         },
-        getBurnCorrections(trx_1, ps_1) {
-            return __awaiter(this, arguments, void 0, function* (trx, ps, log = logger_1.consoleLogger) {
+        getBurnCorrections(trx, ps, log = logger_1.consoleLogger) {
+            return __awaiter(this, void 0, void 0, function* () {
                 if (!ps.toFill)
                     return [];
                 // fill column depends on kind: down_adjust consumes (to_burn - burned); escrow_credit consumes
@@ -2006,8 +2197,8 @@ const pgClient = (config) => {
                 });
             });
         },
-        insertPolygonUpgrade(db_1, p_1) {
-            return __awaiter(this, arguments, void 0, function* (db, p, log = logger_1.consoleLogger) {
+        insertPolygonUpgrade(db, p, log = logger_1.consoleLogger) {
+            return __awaiter(this, void 0, void 0, function* () {
                 const solTxId = yield getOrInsertTx(db.trx, {
                     sig: p.solTx.sig,
                     executedAt: p.solTx.executedAt,
@@ -2025,8 +2216,8 @@ const pgClient = (config) => {
                 return;
             });
         },
-        fetchPolygonUpgrades(db_1, f_1) {
-            return __awaiter(this, arguments, void 0, function* (db, f, log = logger_1.consoleLogger) {
+        fetchPolygonUpgrades(db, f, log = logger_1.consoleLogger) {
+            return __awaiter(this, void 0, void 0, function* () {
                 let query = db.trx
                     .selectFrom('polygon_upgrade')
                     .selectAll('polygon_upgrade')
@@ -2052,13 +2243,18 @@ const pgClient = (config) => {
                 }));
             });
         },
-        getCurrentUserGrantSpend(db_1, f_1) {
-            return __awaiter(this, arguments, void 0, function* (db, f, log = logger_1.consoleLogger) {
+        getCurrentUserGrantSpend(db, f, log = logger_1.consoleLogger) {
+            return __awaiter(this, void 0, void 0, function* () {
                 return yield getCurrentUserGrantSpend(db.trx, f, log);
             });
         },
-        deleteAll() {
-            return __awaiter(this, arguments, void 0, function* (log = logger_1.consoleLogger) {
+        getGrantAllotments(db, f, log = logger_1.consoleLogger) {
+            return __awaiter(this, void 0, void 0, function* () {
+                return yield getGrantAllotments(db.trx, f, log);
+            });
+        },
+        deleteAll(log = logger_1.consoleLogger) {
+            return __awaiter(this, void 0, void 0, function* () {
                 if (config.database.includes('render')) {
                     throw new Error('cannot nuke from deployed database. call from tests only');
                 }
@@ -2104,8 +2300,8 @@ const pgClient = (config) => {
                 }
             });
         },
-        checkPaymentsForDate(targetDate_1) {
-            return __awaiter(this, arguments, void 0, function* (targetDate, channel = 'both', log = logger_1.consoleLogger) {
+        checkPaymentsForDate(targetDate, channel = 'both', log = logger_1.consoleLogger) {
+            return __awaiter(this, void 0, void 0, function* () {
                 const startOfDay = new Date(targetDate);
                 startOfDay.setHours(0, 0, 0, 0);
                 const endOfDay = new Date(targetDate);
@@ -2156,8 +2352,8 @@ const pgClient = (config) => {
                 }
             });
         },
-        checkEpochProcessed(epochId_1, channel_1) {
-            return __awaiter(this, arguments, void 0, function* (epochId, channel, log = logger_1.consoleLogger) {
+        checkEpochProcessed(epochId, channel, log = logger_1.consoleLogger) {
+            return __awaiter(this, void 0, void 0, function* () {
                 try {
                     const result = yield db
                         .selectFrom('epoch')
@@ -2177,8 +2373,8 @@ const pgClient = (config) => {
                 }
             });
         },
-        checkRecentPaymentActivity() {
-            return __awaiter(this, arguments, void 0, function* (lookbackHours = 2, channel = 'both', log = logger_1.consoleLogger) {
+        checkRecentPaymentActivity(lookbackHours = 2, channel = 'both', log = logger_1.consoleLogger) {
+            return __awaiter(this, void 0, void 0, function* () {
                 const lookbackTime = new Date(Date.now() - lookbackHours * 60 * 60 * 1000);
                 const now = new Date();
                 try {