@render-foundation/utils 0.0.254 → 0.0.255

package/lib/cjs/burn/burnCalculations.js

@@ -0,0 +1,140 @@
+"use strict";
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.calculateBurnAmounts = exports.batchFinishedAtMedian = void 0;
+const spl_utils_1 = require("@render-foundation/spl-utils");
+const logger_1 = require("../logger");
+// Utility function copied from cron-server
+const batchFinishedAtMedian = (jobs) => {
+    const pricedAt = jobs.length % 2 == 0
+        ? new Date(Math.trunc((Date.parse(jobs[jobs.length / 2].finishedAt) +
+            Date.parse(jobs[jobs.length / 2 - 1].finishedAt)) /
+            2))
+        : new Date(Date.parse(jobs[Math.floor(jobs.length / 2)].finishedAt));
+    return pricedAt;
+};
+exports.batchFinishedAtMedian = batchFinishedAtMedian;
+/**
+ * Pure function that calculates burn amounts without side effects
+ * This is the core logic extracted from consumeIncrBuyAndBurnRenderPG
+ */
+const calculateBurnAmounts = (input, opts = {
+    perpetual: true,
+}, log = logger_1.consoleLogger) => {
+    const { jobs, userGrantSpends, burnAdjustments, params, decimals, priceAtDate, eurToUSDC, } = input;
+    // Apply grant/buy split logic to jobs
+    const processedJobs = jobs.map((j) => {
+        const { buyRenderAmt, grantRenderAmt } = j, rest = __rest(j, ["buyRenderAmt", "grantRenderAmt"]);
+        return rest;
+    }); // Deep copy to avoid mutations
+    for (const j of processedJobs) {
+        const userGrantSpend = userGrantSpends[j.userId];
+        if (userGrantSpend) {
+            if (opts.perpetual ||
+                userGrantSpend.userGrantSpend.perpetual ||
+                j.rndrUsed <= userGrantSpend.currAllot) {
+                j.grantRenderAmt = Number(j.rndrUsed);
+                log.debug(`job ${j.id} grant split: ${j.rndrUsed}`);
+                userGrantSpend.currAllot -= BigInt(j.rndrUsed);
+            }
+            else if (userGrantSpend.currAllot <= BigInt(0)) {
+                log.debug(`job ${j.id} buy split: ${j.rndrUsed}`);
+                j.buyRenderAmt = Number(j.rndrUsed);
+            }
+            else {
+                log.debug(`job ${j.id} buy + grant split: ${j.rndrUsed} grant: ${Number(userGrantSpend.currAllot)} buy: ${Number(j.rndrUsed) - Number(userGrantSpend.currAllot)}`);
+                j.grantRenderAmt = Number(userGrantSpend.currAllot);
+                j.buyRenderAmt = Number(j.rndrUsed) - Number(userGrantSpend.currAllot);
+                userGrantSpend.currAllot = BigInt(0);
+            }
+        }
+        else {
+            log.debug(`job ${j.id} no grant split: ${j.rndrUsed}`);
+            j.buyRenderAmt = Number(j.rndrUsed);
+        }
+    }
+    const totalRenderUsed = processedJobs.reduce((tot, job) => tot + Number(job.rndrUsed.toString()), 0);
+    log.debug(`jobs buy + grant split: ${JSON.stringify(processedJobs)}`);
+    // Check minimum threshold
+    if (totalRenderUsed < (0, spl_utils_1.toBN)(params.minTotalRndrThreshold, decimals).toNumber()) {
+        throw new Error(`totalRenderUsed ${totalRenderUsed / Math.pow(10, decimals)} < total threshold ${params.minTotalRndrThreshold}`);
+    }
+    const totalRenderBuyAndBurn = processedJobs.reduce((tot, job) => { var _a; return tot + Number((_a = job.buyRenderAmt) !== null && _a !== void 0 ? _a : 0); }, 0);
+    const totalRender = processedJobs.reduce((tot, job) => tot + Number(job.rndrUsed.toString()), 0);
+    log.debug(`Burn calculation inputs:`);
+    log.debug(`  totalRenderUsed: ${totalRenderUsed}`);
+    log.debug(`  totalRenderBuyAndBurn: ${totalRenderBuyAndBurn}`);
+    log.debug(`  totalRender: ${totalRender}`);
+    log.debug(`  priceAtDate: ${priceAtDate}`);
+    log.debug(`  eurToUSDC: ${eurToUSDC}`);
+    const pricedAt = (0, exports.batchFinishedAtMedian)(processedJobs.map((job) => ({
+        finishedAt: job.completedAt.toISOString(),
+        jobId: job.id,
+        rndrUsed: Number(job.rndrUsed.toString()),
+    })));
+    // Core burn calculation logic
+    const toBurn = Math.trunc((totalRender / priceAtDate / 4) * 0.95 * eurToUSDC);
+    let renderToBuyAndBurn = Math.trunc((totalRenderBuyAndBurn / totalRender) * toBurn);
+    const origRenderToBuyAndBurn = renderToBuyAndBurn;
+    log.debug(`Core burn calculation:`);
+    log.debug(`  toBurn: ${toBurn}`);
+    log.debug(`  renderToBuyAndBurn: ${renderToBuyAndBurn}`);
+    log.debug(`  origRenderToBuyAndBurn: ${origRenderToBuyAndBurn}`);
+    let burnAdjustmentId = undefined;
+    // Apply burn adjustments
+    if (burnAdjustments.length > 0) {
+        const adjustment = burnAdjustments[0];
+        burnAdjustmentId = adjustment.id;
+        const adjLeft = adjustment.downAdjToBurn - adjustment.adjusted;
+        const minBurnRndrThreshold = (0, spl_utils_1.toBN)(params.minBurnRndrThreshold, decimals).toNumber();
+        const available = renderToBuyAndBurn - minBurnRndrThreshold;
+        if (adjLeft > available) {
+            renderToBuyAndBurn = minBurnRndrThreshold;
+        }
+        else {
+            renderToBuyAndBurn -= adjLeft;
+        }
+    }
+    // Validate burn thresholds
+    const toBuyAndBurnUI = renderToBuyAndBurn / Math.pow(10, decimals);
+    if (renderToBuyAndBurn != 0) {
+        if (toBuyAndBurnUI > params.maxBurnRndrThreshold) {
+            throw new Error(`buy and burn RENDER ${toBuyAndBurnUI} too high`);
+        }
+        if (toBuyAndBurnUI < params.minBurnRndrThreshold) {
+            throw new Error(`buy and burn RENDER ${toBuyAndBurnUI} too low < ${params.minBurnRndrThreshold}`);
+        }
+    }
+    const renderToBurnFromEmissions = toBurn - origRenderToBuyAndBurn;
+    const totalToBurn = renderToBuyAndBurn + renderToBurnFromEmissions;
+    log.debug(`Final burn calculation results:`);
+    log.debug(`  renderToBuyAndBurn: ${renderToBuyAndBurn}`);
+    log.debug(`  renderToBurnFromEmissions: ${renderToBurnFromEmissions}`);
+    log.debug(`  totalToBurn: ${totalToBurn}`);
+    log.debug(`  toBurn: ${toBurn}`);
+    return {
+        totalRenderUsed,
+        totalRenderBuyAndBurn,
+        totalRender,
+        renderToBuyAndBurn,
+        renderToBurnFromEmissions,
+        totalToBurn,
+        toBurn,
+        origRenderToBuyAndBurn,
+        burnAdjustmentId,
+        pricedAt,
+        processedJobs,
+    };
+};
+exports.calculateBurnAmounts = calculateBurnAmounts;
+//# sourceMappingURL=burnCalculations.js.map

package/lib/cjs/burn/burnCalculations.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"burnCalculations.js","sourceRoot":"","sources":["../../../src/burn/burnCalculations.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,4DAAmD;AACnD,sCAAuD;AAWvD,2CAA2C;AACpC,MAAM,qBAAqB,GAAG,CACnC,IAA+D,EACzD,EAAE;IACR,MAAM,QAAQ,GACZ,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC;QAClB,CAAC,CAAC,IAAI,IAAI,CACN,IAAI,CAAC,KAAK,CACR,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC;YAC3C,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;YACjD,CAAC,CACJ,CACF;QACH,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAA;IACxE,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA;AAdY,QAAA,qBAAqB,yBAcjC;AAiCD;;;GAGG;AACI,MAAM,oBAAoB,GAAG,CAClC,KAA2B,EAC3B,OAEI;IACF,SAAS,EAAE,IAAI;CAChB,EACD,MAAoB,sBAAa,EACV,EAAE;IACzB,MAAM,EACJ,IAAI,EACJ,eAAe,EACf,eAAe,EACf,MAAM,EACN,QAAQ,EACR,WAAW,EACX,SAAS,GACV,GAAG,KAAK,CAAA;IAET,sCAAsC;IACtC,MAAM,aAAa,GAAU,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QAC1C,MAAM,EAAE,YAAY,EAAE,cAAc,KAAc,CAAC,EAAV,IAAI,UAAK,CAAC,EAA7C,kCAAyC,CAAI,CAAA;QACnD,OAAO,IAAI,CAAA;IACb,CAAC,CAAC,CAAA,CAAC,+BAA+B;IAElC,KAAK,MAAM,CAAC,IAAI,aAAa,EAAE;QAC7B,MAAM,cAAc,GAAG,eAAe,CAAC,CAAC,CAAC,MAAO,CAAC,CAAA;QACjD,IAAI,cAAc,EAAE;YAClB,IACE,IAAI,CAAC,SAAS;gBACd,cAAc,CAAC,cAAc,CAAC,SAAS;gBACvC,CAAC,CAAC,QAAQ,IAAI,cAAc,CAAC,SAAS,EACtC;gBACA,CAAC,CAAC,cAAc,GAAG,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAA;gBACrC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;gBACnD,cAAc,CAAC,SAAS,IAAI,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAA;aAC/C;iBAAM,IAAI,cAAc,CAAC,SAAS,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE;gBAChD,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;gBACjD,CAAC,CAAC,YAAY,GAAG,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAA;aACpC;iBAAM;gBACL,GAAG,CAAC,KAAK,CACP,OAAO,CAAC,CAAC,EAAE,uBAAuB,CAAC,CAAC,QAAQ,WAAW,MAAM,CAC3D,cAAc,CAAC,SAAS,CACzB,SAAS,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE,CAClE,CAAA;gBACD,CAAC,CAAC,cAAc,GAAG,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,CAAA;gBACnD,CAAC,CAAC,YAAY,GAAG,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,CAAA;gBACtE,cAAc,CAAC,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;aACrC;SACF;aAAM;YACL,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,oBAAoB,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;YACtD,CAAC,CAAC,YAAY,GAAG,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAA;SACpC;KACF;IAED,MAAM,eAAe,GAAG,aAAa,CAAC,MAAM,CAC1C,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,EACnD,CAAC,CACF,CAAA;IAED,GAAG,CAAC,KAAK,CAAC,2BAA2B,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,CAAC,CAAA;IAErE,0BAA0B;IAC1B,IACE,eAAe,GAAG,IAAA,gBAAI,EAAC,MAAM,CAAC,qBAAqB,EAAE,QAAQ,CAAC,CAAC,QAAQ,EAAE,EACzE;QACA,MAAM,IAAI,KAAK,CACb,mBACE,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,QAAQ,CACzC,sBAAsB,MAAM,CAAC,qBAAqB,EAAE,CACrD,CAAA;KACF;IAED,MAAM,qBAAqB,GAAG,aAAa,CAAC,MAAM,CAChD,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,WAAC,OAAA,GAAG,GAAG,MAAM,CAAC,MAAA,GAAG,CAAC,YAAY,mCAAI,CAAC,CAAC,CAAA,EAAA,EACjD,CAAC,CACF,CAAA;IAED,MAAM,WAAW,GAAG,aAAa,CAAC,MAAM,CACtC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,EACnD,CAAC,CACF,CAAA;IAED,GAAG,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAA;IACrC,GAAG,CAAC,KAAK,CAAC,sBAAsB,eAAe,EAAE,CAAC,CAAA;IAClD,GAAG,CAAC,KAAK,CAAC,4BAA4B,qBAAqB,EAAE,CAAC,CAAA;IAC9D,GAAG,CAAC,KAAK,CAAC,kBAAkB,WAAW,EAAE,CAAC,CAAA;IAC1C,GAAG,CAAC,KAAK,CAAC,kBAAkB,WAAW,EAAE,CAAC,CAAA;IAC1C,GAAG,CAAC,KAAK,CAAC,gBAAgB,SAAS,EAAE,CAAC,CAAA;IAEtC,MAAM,QAAQ,GAAG,IAAA,6BAAqB,EACpC,aAAa,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QAC1B,UAAU,EAAE,GAAG,CAAC,WAAW,CAAC,WAAW,EAAE;QACzC,KAAK,EAAE,GAAG,CAAC,EAAE;QACb,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;KAC1C,CAAC,CAAC,CACJ,CAAA;IAED,8BAA8B;IAC9B,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,WAAW,GAAG,WAAW,GAAG,CAAC,CAAC,GAAG,IAAI,GAAG,SAAS,CAAC,CAAA;IAE7E,IAAI,kBAAkB,GAAG,IAAI,CAAC,KAAK,CACjC,CAAC,qBAAqB,GAAG,WAAW,CAAC,GAAG,MAAM,CAC/C,CAAA;IAED,MAAM,sBAAsB,GAAG,kBAAkB,CAAA;IAEjD,GAAG,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAA;IACnC,GAAG,CAAC,KAAK,CAAC,aAAa,MAAM,EAAE,CAAC,CAAA;IAChC,GAAG,CAAC,KAAK,CAAC,yBAAyB,kBAAkB,EAAE,CAAC,CAAA;IACxD,GAAG,CAAC,KAAK,CAAC,6BAA6B,sBAAsB,EAAE,CAAC,CAAA;IAChE,IAAI,gBAAgB,GAAuB,SAAS,CAAA;IAEpD,yBAAyB;IACzB,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE;QAC9B,MAAM,UAAU,GAAG,eAAe,CAAC,CAAC,CAAC,CAAA;QACrC,gBAAgB,GAAG,UAAU,CAAC,EAAE,CAAA;QAChC,MAAM,OAAO,GAAG,UAAU,CAAC,aAAa,GAAG,UAAU,CAAC,QAAQ,CAAA;QAE9D,MAAM,oBAAoB,GAAG,IAAA,gBAAI,EAC/B,MAAM,CAAC,oBAAoB,EAC3B,QAAQ,CACT,CAAC,QAAQ,EAAE,CAAA;QACZ,MAAM,SAAS,GAAG,kBAAkB,GAAG,oBAAoB,CAAA;QAE3D,IAAI,OAAO,GAAG,SAAS,EAAE;YACvB,kBAAkB,GAAG,oBAAoB,CAAA;SAC1C;aAAM;YACL,kBAAkB,IAAI,OAAO,CAAA;SAC9B;KACF;IAED,2BAA2B;IAC3B,MAAM,cAAc,GAAG,kBAAkB,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAA;IAElE,IAAI,kBAAkB,IAAI,CAAC,EAAE;QAC3B,IAAI,cAAc,GAAG,MAAM,CAAC,oBAAoB,EAAE;YAChD,MAAM,IAAI,KAAK,CAAC,uBAAuB,cAAc,WAAW,CAAC,CAAA;SAClE;QACD,IAAI,cAAc,GAAG,MAAM,CAAC,oBAAoB,EAAE;YAChD,MAAM,IAAI,KAAK,CACb,uBAAuB,cAAc,cAAc,MAAM,CAAC,oBAAoB,EAAE,CACjF,CAAA;SACF;KACF;IAED,MAAM,yBAAyB,GAAG,MAAM,GAAG,sBAAsB,CAAA;IACjE,MAAM,WAAW,GAAG,kBAAkB,GAAG,yBAAyB,CAAA;IAElE,GAAG,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAA;IAC5C,GAAG,CAAC,KAAK,CAAC,yBAAyB,kBAAkB,EAAE,CAAC,CAAA;IACxD,GAAG,CAAC,KAAK,CAAC,gCAAgC,yBAAyB,EAAE,CAAC,CAAA;IACtE,GAAG,CAAC,KAAK,CAAC,kBAAkB,WAAW,EAAE,CAAC,CAAA;IAC1C,GAAG,CAAC,KAAK,CAAC,aAAa,MAAM,EAAE,CAAC,CAAA;IAEhC,OAAO;QACL,eAAe;QACf,qBAAqB;QACrB,WAAW;QACX,kBAAkB;QAClB,yBAAyB;QACzB,WAAW;QACX,MAAM;QACN,sBAAsB;QACtB,gBAAgB;QAChB,QAAQ;QACR,aAAa;KACd,CAAA;AACH,CAAC,CAAA;AAxKY,QAAA,oBAAoB,wBAwKhC"}

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) => [
@@ -1490,7 +1558,7 @@ const pgClient = (config) => {
             });
         },
         fetchBurns(db, f, log = logger_1.consoleLogger) {
-            var _a, _b;
+            var _a, _b, _c;
             return __awaiter(this, void 0, void 0, function* () {
                 let q = db.trx
                     .selectFrom('burn')
@@ -1538,6 +1606,7 @@ const pgClient = (config) => {
                         eurToUsdc: r.eur_to_usdc,
                         markedBurnedAt: r.marked_burned_at,
                         tags: r.tags ? r.tags.split(',') : [],
+                        fromEscrowUsdc: BigInt((_c = r.from_escrow_usdc) !== null && _c !== void 0 ? _c : 0),
                     });
                     burnIdToIdx[r.id] = burns.length - 1;
                 }
@@ -1717,8 +1786,8 @@ const pgClient = (config) => {
                     .innerJoin('sol_tx', 'sol_tx.id', 'burn.sol_tx_id')
                     .select(({ fn }) => [
                     dayExpr.as('day'),
-                    fn.sum('burn.burned').as('render_burned'),
-                    fn.sum('burn.usdc_spent').as('usdc_spent'),
+                    (0, kysely_1.sql) `SUM(CASE WHEN burn.burned > 0 THEN burn.burned WHEN COALESCE(burn.from_escrow_usdc, 0) > 0 AND burn.render_to_usdc > 0 THEN (burn.from_escrow_usdc::numeric / burn.render_to_usdc * 100)::bigint ELSE 0 END)`.as('render_burned'),
+                    (0, kysely_1.sql) `SUM(CASE WHEN burn.usdc_spent > 0 THEN burn.usdc_spent ELSE COALESCE(burn.from_escrow_usdc, 0) END)`.as('usdc_spent'),
                     fn.count('burn.id').as('burn_count'),
                 ])
                     .groupBy((0, kysely_1.sql) `date_trunc('day', sol_tx.executed_at)`)
@@ -2026,7 +2095,7 @@ const pgClient = (config) => {
                 // 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;
+                    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
                     const res = yield trx
                         .insertInto(exports.DISPERSED_SETTLEMENT_TABLE)
                         .values({
@@ -2041,10 +2110,12 @@ const pgClient = (config) => {
                         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,
+                        usage_from: (_f = p.usageFrom) !== null && _f !== void 0 ? _f : null,
+                        usage_to: (_g = p.usageTo) !== null && _g !== void 0 ? _g : 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 = ((_h = res.numInsertedOrUpdatedRows) !== null && _h !== void 0 ? _h : 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,7 +2130,7 @@ 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 (((_j = upd.numUpdatedRows) !== null && _j !== void 0 ? _j : 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();