@render-foundation/utils 0.0.192 → 0.0.193

package/lib/cjs/burn/burnAnalysis.js

@@ -0,0 +1,101 @@
+"use strict";
+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) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.compareBurnAmounts = exports.analyzeBurnJobs = void 0;
+const burnCalculations_1 = require("./burnCalculations");
+const logger_1 = require("../logger");
+/**
+ * Analyzes a set of jobs and calculates what should have been burned
+ * This function can be used for both live processing and backfill analysis
+ */
+const analyzeBurnJobs = (ctx, input, opts = {
+    perpetual: true,
+}, log = logger_1.consoleLogger) => __awaiter(void 0, void 0, void 0, function* () {
+    const { jobs, params, decimals, pricedAt } = input;
+    // Get user grant spends
+    const userIds = jobs.reduce((acc, job) => {
+        if (job.userId) {
+            acc.add(job.userId);
+        }
+        return acc;
+    }, new Set());
+    // For analysis, we use the underlying db object directly
+    const userGrantSpends = (yield Promise.all(Array.from(userIds).map((userId) => __awaiter(void 0, void 0, void 0, function* () {
+        // Note: For backfill, we might need historical grant spend data
+        // This is a limitation we'll need to address
+        const currSpend = yield ctx.pgV2.getCurrentUserGrantSpend(ctx.pgV2.db, // Use the underlying db object
+        { userId }, log);
+        return { userId, currSpend };
+    })))).reduce((acc, us) => {
+        if (us.currSpend) {
+            acc[us.userId] = {
+                userGrantSpend: us.currSpend,
+                currAllot: us.currSpend.renderSpent,
+            };
+        }
+        return acc;
+    }, {});
+    // Get burn adjustments (for backfill, we might need historical data)
+    const burnAdjustments = yield ctx.pgV2.getBurnAdjustments(ctx.pgV2.db, // Use the underlying db object
+    { toFill: true }, log);
+    // Determine pricing date
+    const effectivePricedAt = pricedAt ||
+        (0, burnCalculations_1.calculateBurnAmounts)({
+            jobs,
+            userGrantSpends,
+            burnAdjustments,
+            params,
+            decimals,
+            priceAtDate: 1,
+            eurToUSDC: 1, // Dummy value for date calculation
+        }, opts, log).pricedAt;
+    // Get historical prices
+    const price = yield ctx.priceClient.getRenderPriceAtDate({
+        ts: effectivePricedAt,
+    });
+    const eurToUSDC = yield ctx.priceClient.eurToUSDC(effectivePricedAt);
+    // Calculate burn amounts
+    const result = (0, burnCalculations_1.calculateBurnAmounts)({
+        jobs,
+        userGrantSpends,
+        burnAdjustments,
+        params,
+        decimals,
+        priceAtDate: price,
+        eurToUSDC,
+    }, opts, log);
+    return Object.assign(Object.assign({}, result), { price,
+        eurToUSDC });
+});
+exports.analyzeBurnJobs = analyzeBurnJobs;
+const compareBurnAmounts = (expected, actual) => {
+    const discrepancyTotalToBurn = actual.totalToBurn - expected.totalToBurn;
+    // Only return discrepancy if absolute total discrepancy is significant (> 10^8)
+    if (Math.abs(discrepancyTotalToBurn) <= Math.pow(10, 8)) {
+        return null;
+    }
+    return {
+        expectedRenderToBuyAndBurn: expected.renderToBuyAndBurn,
+        actualRenderToBuyAndBurn: actual.renderToBuyAndBurn,
+        expectedRenderToBurnFromEmissions: expected.renderToBurnFromEmissions,
+        actualRenderToBurnFromEmissions: actual.renderToBurnFromEmissions,
+        expectedTotalToBurn: expected.totalToBurn,
+        actualTotalToBurn: actual.totalToBurn,
+        discrepancyRenderToBuyAndBurn: actual.renderToBuyAndBurn - expected.renderToBuyAndBurn,
+        discrepancyRenderToBurnFromEmissions: actual.renderToBurnFromEmissions - expected.renderToBurnFromEmissions,
+        discrepancyTotalToBurn,
+        jobs: actual.jobs,
+        burnDate: actual.burnDate,
+        txSig: actual.txSig,
+    };
+};
+exports.compareBurnAmounts = compareBurnAmounts;
+//# sourceMappingURL=burnAnalysis.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"burnAnalysis.js","sourceRoot":"","sources":["../../../src/burn/burnAnalysis.ts"],"names":[],"mappings":"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"}

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

@@ -1031,16 +1031,18 @@ const pgClient = (config) => {
                         .executeTakeFirstOrThrow();
                     grantBurnId = Number(id);
                 }
+                const burnId = buyBurnId !== null && buyBurnId !== void 0 ? buyBurnId : grantBurnId;
+                const grantId = grantBurnId !== null && grantBurnId !== void 0 ? grantBurnId : buyBurnId;
                 for (const job of p.jobs) {
                     const res = yield trx.trx
                         .updateTable(exports.JOB_TABLE)
                         .where('id', '=', String(job.id))
-                        .set('burn_id', job.buyRenderAmt != undefined ? buyBurnId : null)
-                        .set('grant_burn_id', job.grantRenderAmt != undefined ? grantBurnId : null)
+                        .set('burn_id', burnId)
+                        .set('grant_burn_id', grantId)
                         .set('buy_render_amt', (_a = job.buyRenderAmt) !== null && _a !== void 0 ? _a : 0)
                         .set('grant_render_amt', (_b = job.grantRenderAmt) !== null && _b !== void 0 ? _b : 0)
                         .executeTakeFirstOrThrow();
-                    log.debug(`set grant_burn_id ${grantBurnId} burn_id ${buyBurnId} buy_render_amt ${job.buyRenderAmt} grant_render_amt ${job.grantRenderAmt} on ${res.numUpdatedRows} jobs id ${job.id}`);
+                    log.debug(`set burn_id ${burnId} grant_burn_id ${grantId} buy_render_amt ${job.buyRenderAmt} grant_render_amt ${job.grantRenderAmt} on ${res.numUpdatedRows} jobs id ${job.id}`);
                 }
                 return { grantBurnId, buyBurnId };
             });
@@ -1186,6 +1188,7 @@ const pgClient = (config) => {
                     .select('inserted_at')
                     .orderBy('completed_at asc')
                     .where('burn_id', 'is', null)
+                    .where('grant_burn_id', 'is', null)
                     .execute();
                 if (res.length == 0) {
                     return { outstandingJobs: 0 };
@@ -1267,6 +1270,146 @@ const pgClient = (config) => {
                 return burns;
             });
         },
+        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')
+                    .select(['sol_tx.sig', 'sol_tx.executed_at'])
+                    .leftJoin('burn', 'burn.sol_tx_id', 'sol_tx.id')
+                    .leftJoin('grant_burn', 'grant_burn.sol_tx_id', 'sol_tx.id')
+                    .select([
+                    'burn.id as buy_burn_id',
+                    'burn.burned as buy_burned',
+                    'burn.priced_at',
+                    'burn.render_to_usdc',
+                    'burn.usdc_spent',
+                    'burn.quote_amt',
+                    'burn.eur_to_usdc',
+                    'burn.marked_burned_at as buy_marked_burned_at',
+                    'burn.tags as buy_tags',
+                    'grant_burn.id as grant_burn_id',
+                    'grant_burn.burned as grant_burned',
+                    'grant_burn.marked_burned_at as grant_marked_burned_at',
+                    'grant_burn.tags as grant_tags',
+                ])
+                    .where((eb) => eb.or([
+                    eb('burn.id', 'is not', null),
+                    eb('grant_burn.id', 'is not', null),
+                ]));
+                // Apply date filters
+                if (f.executedAfter) {
+                    baseQuery = baseQuery.where('sol_tx.executed_at', '>=', f.executedAfter);
+                }
+                if (f.executedBefore) {
+                    baseQuery = baseQuery.where('sol_tx.executed_at', '<=', f.executedBefore);
+                }
+                if (f.pricedAtBefore) {
+                    baseQuery = baseQuery.where('burn.priced_at', '<=', f.pricedAtBefore);
+                }
+                if (f.pricedAtAfter) {
+                    baseQuery = baseQuery.where('burn.priced_at', '>=', f.pricedAtAfter);
+                }
+                // Apply ordering
+                if (f.orderBy == 'pricedAt') {
+                    baseQuery = baseQuery.orderBy(['burn.priced_at']);
+                }
+                else if (f.orderBy == 'executedAt') {
+                    baseQuery = baseQuery.orderBy(['sol_tx.executed_at']);
+                }
+                log.info(`fetchBurnsAndGrants query ${baseQuery.compile().sql}`);
+                const comp = baseQuery.compile();
+                const { rows } = yield (0, base_1.timedQuery)(pgPool, comp.sql, comp.parameters, 'fetchBurnsAndGrants', log);
+                log.info(`fetchBurnsAndGrants found ${rows.length} burn transactions`);
+                // Group by transaction signature
+                const groupedBurns = {};
+                for (const r of rows) {
+                    const txSig = r.sig;
+                    if (!groupedBurns[txSig]) {
+                        groupedBurns[txSig] = {
+                            solTx: txSig,
+                            executedAt: r.executed_at,
+                            allJobs: [],
+                        };
+                    }
+                    // Add buy burn if exists
+                    if (r.buy_burn_id) {
+                        groupedBurns[txSig].buyBurn = {
+                            jobs: [],
+                            id: Number(r.buy_burn_id),
+                            renderToUsdc: r.render_to_usdc,
+                            solTx: txSig,
+                            executedAt: r.executed_at,
+                            pricedAt: r.priced_at,
+                            usdcSpent: BigInt((_a = r.usdc_spent) !== null && _a !== void 0 ? _a : 0),
+                            quoteAmt: BigInt((_b = r.quote_amt) !== null && _b !== void 0 ? _b : 0),
+                            burned: BigInt(r.buy_burned),
+                            eurToUsdc: r.eur_to_usdc,
+                            markedBurnedAt: r.buy_marked_burned_at,
+                            tags: r.buy_tags ? r.buy_tags.split(',') : [],
+                        };
+                    }
+                    // Add grant burn if exists
+                    if (r.grant_burn_id) {
+                        groupedBurns[txSig].grantBurn = {
+                            id: Number(r.grant_burn_id),
+                            burned: BigInt(r.grant_burned),
+                            markedBurnedAt: r.grant_marked_burned_at,
+                            tags: r.grant_tags ? r.grant_tags.split(',') : [],
+                        };
+                    }
+                }
+                // Fetch jobs if requested
+                if (f.inclJobs) {
+                    const allTxSigs = Object.keys(groupedBurns);
+                    if (allTxSigs.length > 0) {
+                        // Get all jobs for these transactions
+                        const q = db.trx
+                            .selectFrom('job')
+                            .selectAll('job')
+                            .leftJoin('burn', 'burn.id', 'job.burn_id')
+                            .leftJoin('sol_tx as buy_tx', 'buy_tx.id', 'burn.sol_tx_id')
+                            .select(['buy_tx.sig as buy_tx_sig'])
+                            .leftJoin('grant_burn', 'grant_burn.id', 'job.grant_burn_id')
+                            .leftJoin('sol_tx as grant_tx', 'grant_tx.id', 'grant_burn.sol_tx_id')
+                            .select(['grant_tx.sig as grant_tx_sig'])
+                            .where((eb) => eb.or([
+                            eb('buy_tx.sig', 'in', allTxSigs),
+                            eb('grant_tx.sig', 'in', allTxSigs),
+                        ]));
+                        log.info(`fetchJobs q ${q.compile().sql}`);
+                        const jobRows = yield q.execute();
+                        log.info(`fetchJobs found ${jobRows.length} jobs`);
+                        // Add jobs to the appropriate transactions
+                        for (const r of jobRows) {
+                            const txSig = r.buy_tx_sig || r.grant_tx_sig;
+                            if (txSig && groupedBurns[txSig]) {
+                                const job = {
+                                    id: Number(r.id),
+                                    completedAt: r.completed_at,
+                                    rndrUsed: BigInt(r.render_amt),
+                                    obhUsed: r.obh_used ? Number(r.obh_used) : undefined,
+                                    userId: r.user_id,
+                                    buyRenderAmt: r.buy_render_amt
+                                        ? Number(r.buy_render_amt)
+                                        : undefined,
+                                    grantRenderAmt: r.grant_render_amt
+                                        ? Number(r.grant_render_amt)
+                                        : undefined,
+                                };
+                                groupedBurns[txSig].allJobs.push(job);
+                                // Also add to specific burn type
+                                if (r.buy_tx_sig && groupedBurns[txSig].buyBurn) {
+                                    groupedBurns[txSig].buyBurn.jobs.push(job);
+                                }
+                            }
+                        }
+                    }
+                }
+                return groupedBurns;
+            });
+        },
         createBridgeTransfers(db, bts, log = logger_1.consoleLogger) {
             return __awaiter(this, void 0, void 0, function* () {
                 return createBridgeTransfers(db.trx, bts, log);