@render-foundation/utils 0.0.240 → 0.0.242

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":"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"}

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

@@ -241,20 +241,29 @@ const pgClient = (config) => {
             .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)
+        // EVERY grant-ledger row retires pool capacity, in either direction:
+        //  - negative delta = an emissions burn. ALL of them count, not just ones stamped with an
+        //    otoy_grant_id. Historical grants are now backfilled to cover the Sep/Oct-2025 burns, so those
+        //    burns must net against them; counting only stamped rows would re-issue ~1.06M credits of
+        //    already-spent grant.
         //  - 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.
+        //    route). That balance reaches the split separately, so leaving it in the pool double-issues it.
+        // Hence abs() over the whole ledger.
+        // NOT abs() over the whole ledger — that would charge the Sep/Oct-2025 CSV *credits* as if they
+        // were spend, double-penalising those users (464e8e33: 376,749 burned + 79,304 credited = 456,053).
+        // A positive only retires capacity when it is tied to a pool grant (the canary route, where the
+        // grant was moved into current_user_grant_spend and reaches the split from there).
         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'),
+            eb.fn
+                .sum((0, kysely_1.sql) `case when render_spent_delta < 0 then -render_spent_delta
+                     when otoy_grant_id is not null then render_spent_delta
+                     else 0 end`)
+                .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)