@render-foundation/utils 0.0.233 → 0.0.234-beta.1

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.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.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.TX_BURN_ADJUSTMENT_TABLE = exports.JOB_BURN_ADJUSTMENT_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");
@@ -54,7 +54,8 @@ exports.JOB_TABLE = 'job';
 exports.BURN_TABLE = 'burn';
 exports.BRIDGE_TRANSFER_TABLE = 'bridge_transfer';
 exports.NETWORK_REVENUE_TABLE = 'network_revenue';
-exports.BURN_CORRECTION_TABLE = 'burn_correction';
+exports.JOB_BURN_ADJUSTMENT_TABLE = 'job_burn_adjustment';
+exports.TX_BURN_ADJUSTMENT_TABLE = 'tx_burn_adjustment';
 exports.ENTITY_EPOCH_INFO_TABLE = 'entity_epoch_info';
 exports.POLYGON_UPGRADE_TABLE = 'polygon_upgrade';
 exports.CURRENT_USER_GRANT_SPEND_TABLE = 'current_user_grant_spend';
@@ -1124,7 +1125,7 @@ const pgClient = (config) => {
                 let buyBurnId;
                 let grantBurnId;
                 if (p.buyBurn) {
-                    const { burned, usdcSpent, eurToUsdc, renderToUsdc, quoteAmt, tags, downCorrectionId, escrowCorrectionId, toBurn, fromEscrowUsdc, } = p.buyBurn;
+                    const { burned, usdcSpent, eurToUsdc, renderToUsdc, quoteAmt, tags, jobBurnAdjustmentId, txBurnAdjustmentId, toBurn, fromEscrowUsdc, } = p.buyBurn;
                     let pricedAt = p.buyBurn.pricedAt;
                     if (!pricedAt) {
                         const jobs = yield fetchJobs1(trx.trx, { ids: p.jobs.map((j) => String(j.id)) }, log);
@@ -1143,8 +1144,8 @@ const pgClient = (config) => {
                         quote_amt: quoteAmt,
                         burned: burned,
                         tags: tags.join(','),
-                        down_correction_id: downCorrectionId,
-                        escrow_correction_id: escrowCorrectionId,
+                        job_burn_adjustment_id: jobBurnAdjustmentId,
+                        tx_burn_adjustment_id: txBurnAdjustmentId,
                         to_burn: toBurn,
                         from_escrow_usdc: fromEscrowUsdc !== null && fromEscrowUsdc !== void 0 ? fromEscrowUsdc : 0,
                     };
@@ -1711,7 +1712,7 @@ const pgClient = (config) => {
             });
         },
         insertDispersedOutbox(p, log = logger_1.consoleLogger) {
-            var _a, _b;
+            var _a, _b, _c;
             return __awaiter(this, void 0, void 0, function* () {
                 const res = yield db
                     .insertInto(exports.DISPERSED_SETTLEMENT_TABLE)
@@ -1724,6 +1725,7 @@ const pgClient = (config) => {
                     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())
                     .executeTakeFirst();
@@ -1749,7 +1751,7 @@ const pgClient = (config) => {
                     .execute();
                 log.debug(`dispersed outbox: ${rows.length} unsettled`);
                 return rows.map((r) => {
-                    var _a;
+                    var _a, _b;
                     return ({
                         txSignature: r.tx_signature,
                         claimUuid: r.claim_uuid,
@@ -1758,6 +1760,7 @@ const pgClient = (config) => {
                         burnedAmount: r.burned_amount,
                         executedAt: r.executed_at,
                         eurRender: (_a = r.eur_render) !== null && _a !== void 0 ? _a : undefined,
+                        usdcSpent: (_b = r.usdc_spent) !== null && _b !== void 0 ? _b : undefined,
                         // int8 comes back as a string from pg; block heights are well within JS safe-integer range.
                         lastValidBlockHeight: r.last_valid_block_height != null
                             ? Number(r.last_valid_block_height)
@@ -1777,6 +1780,79 @@ const pgClient = (config) => {
                 log.debug(`dispersed outbox void tx ${txSignature}: ${res.numDeletedRows} row(s)`);
             });
         },
+        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.
+                    .where('settled_at', 'is not', null);
+                if (f.settledAfter)
+                    q = q.where('settled_at', '>=', f.settledAfter);
+                if (f.settledBefore)
+                    q = q.where('settled_at', '<', f.settledBefore);
+                const rows = yield q
+                    .select([
+                    'tx_signature',
+                    'claim_uuid',
+                    'obligation_uuids',
+                    'settled_amount',
+                    'burned_amount',
+                    'usdc_spent',
+                    'eur_render',
+                    'executed_at',
+                    'settled_at',
+                ])
+                    .orderBy('settled_at', 'desc')
+                    .limit((_a = f.limit) !== null && _a !== void 0 ? _a : 500)
+                    .execute();
+                return rows.map((r) => {
+                    var _a, _b;
+                    return ({
+                        txSignature: r.tx_signature,
+                        claimUuid: r.claim_uuid,
+                        obligationUuids: r.obligation_uuids,
+                        settledAmount: r.settled_amount,
+                        burnedAmount: r.burned_amount,
+                        usdcSpent: (_a = r.usdc_spent) !== null && _a !== void 0 ? _a : null,
+                        eurRender: (_b = r.eur_render) !== null && _b !== void 0 ? _b : null,
+                        executedAt: r.executed_at,
+                        settledAt: r.settled_at,
+                    });
+                });
+            });
+        },
+        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);
+                if (f.settledAfter)
+                    q = q.where('settled_at', '>=', f.settledAfter);
+                if (f.settledBefore)
+                    q = q.where('settled_at', '<', f.settledBefore);
+                const rows = yield q
+                    .select([
+                    // Bucket by UTC calendar month of settlement.
+                    (0, kysely_1.sql) `date_trunc('month', settled_at at time zone 'UTC')`.as('month'),
+                    (0, kysely_1.sql) `coalesce(sum(settled_amount), 0)::text`.as('settled_eur'),
+                    // usdc_spent is NULL for pre-migration-39 burns; sum() skips NULLs so they simply don't count.
+                    (0, kysely_1.sql) `coalesce(sum(usdc_spent), 0)::text`.as('usdc_spent'),
+                    (0, kysely_1.sql) `coalesce(sum(burned_amount), 0)::text`.as('render_burned'),
+                    (0, kysely_1.sql) `count(*)::text`.as('burn_count'),
+                ])
+                    .groupBy('month')
+                    .orderBy('month', 'asc')
+                    .execute();
+                return rows.map((r) => ({
+                    month: r.month,
+                    settledEur: r.settled_eur,
+                    usdcSpent: r.usdc_spent,
+                    renderBurned: r.render_burned,
+                    burnCount: Number(r.burn_count),
+                }));
+            });
+        },
         fetchJobs(db, f, log = logger_1.consoleLogger) {
             return __awaiter(this, void 0, void 0, function* () {
                 return yield fetchJobs1(db.trx, f, log);
@@ -1846,79 +1922,90 @@ const pgClient = (config) => {
                 }));
             });
         },
-        createBurnCorrection(trx, p, log = logger_1.consoleLogger) {
+        createTxBurnAdjustment(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)');
-                if (p.kind === 'down_adjust' && p.amountRender == null)
-                    throw new Error('down_adjust needs amountRender');
-                if (p.kind === 'escrow_credit' && p.amountUsdc == null)
-                    throw new Error('escrow_credit needs amountUsdc');
-                // Idempotent per (anchor, kind) — a re-run for the same bad job/tx is a no-op.
+                // Idempotent per sol_tx_id (unique) — a re-run for the same bad tx is a no-op.
                 const row = yield trx.trx
-                    .insertInto(exports.BURN_CORRECTION_TABLE)
+                    .insertInto(exports.TX_BURN_ADJUSTMENT_TABLE)
                     .values({
-                    kind: p.kind,
-                    job_id: p.jobId,
                     sol_tx_id: p.solTxId,
-                    amount_render: p.amountRender,
-                    amount_usdc: p.amountUsdc,
+                    surplus_usdc: p.surplusUsdc,
                     description: p.description,
                 })
-                    .onConflict((oc) => oc.doNothing())
+                    .onConflict((oc) => oc.column('sol_tx_id').doNothing())
                     .returning('id')
                     .executeTakeFirst();
                 if (!row) {
-                    log.info(`burn_correction ${p.kind} for ${p.jobId != null ? `job ${p.jobId}` : `sol_tx ${p.solTxId}`} already exists — skipped`);
+                    log.info(`tx_burn_adjustment for sol_tx ${p.solTxId} already exists — skipped`);
                     return undefined;
                 }
-                log.info(`created burn_correction ${row.id} (${p.kind}, ${p.jobId != null ? `job ${p.jobId}` : `sol_tx ${p.solTxId}`}): ${p.kind === 'down_adjust' ? `${p.amountRender} RENDER` : `${p.amountUsdc} USDC`}`);
+                log.info(`created tx_burn_adjustment ${row.id}: ${p.surplusUsdc} USDC over-spent (sol_tx ${p.solTxId})`);
                 return Number(row.id);
             });
         },
-        getBurnCorrections(trx, ps, log = logger_1.consoleLogger) {
+        getJobBurnAdjustments(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
-                // from_escrow_usdc. Each links via its own burn FK so one burn can carry one of each.
-                const linkCol = ps.kind === 'down_adjust' ? 'down_correction_id' : 'escrow_correction_id';
                 const q = trx.trx
-                    .selectFrom(exports.BURN_CORRECTION_TABLE)
-                    .selectAll(exports.BURN_CORRECTION_TABLE)
-                    .leftJoin(exports.BURN_TABLE, `${exports.BURN_TABLE}.${linkCol}`, `${exports.BURN_CORRECTION_TABLE}.id`)
+                    .selectFrom(exports.JOB_BURN_ADJUSTMENT_TABLE)
+                    .selectAll(exports.JOB_BURN_ADJUSTMENT_TABLE)
+                    .innerJoin(exports.JOB_TABLE, `${exports.JOB_TABLE}.id`, `${exports.JOB_BURN_ADJUSTMENT_TABLE}.job_id`)
+                    .select([`${exports.JOB_TABLE}.completed_at`, `${exports.JOB_TABLE}.render_amt`])
+                    .leftJoin(exports.BURN_TABLE, `${exports.BURN_TABLE}.job_burn_adjustment_id`, `${exports.JOB_BURN_ADJUSTMENT_TABLE}.id`)
                     .select(({ fn, lit }) => [
                     fn.sum(fn.coalesce(`${exports.BURN_TABLE}.to_burn`, lit(0))).as('tot_to_burn'),
                     fn.sum(fn.coalesce(`${exports.BURN_TABLE}.burned`, lit(0))).as('tot_burned'),
+                ])
+                    .groupBy([
+                    `${exports.JOB_BURN_ADJUSTMENT_TABLE}.id`,
+                    `${exports.JOB_TABLE}.completed_at`,
+                    `${exports.JOB_TABLE}.render_amt`,
+                ]);
+                log.info(`getJobBurnAdjustments ${q.compile().sql}`);
+                const res = yield q.execute();
+                return res
+                    .map((r) => ({
+                    id: Number(r.id),
+                    createdAt: r.created_at,
+                    jobId: Number(r.job_id),
+                    downAdjRndrUsed: Number(r.down_adj_rndr_used),
+                    downAdjToBurn: Number(r.down_adj_to_burn),
+                    adjusted: Number(r.tot_to_burn) - Number(r.tot_burned),
+                    job: {
+                        id: Number(r.job_id),
+                        completedAt: r.completed_at,
+                        rndrUsed: BigInt(r.render_amt),
+                    },
+                }))
+                    .filter((a) => a.adjusted < a.downAdjToBurn);
+            });
+        },
+        getTxBurnAdjustments(trx, ps, log = logger_1.consoleLogger) {
+            return __awaiter(this, void 0, void 0, function* () {
+                if (!ps.toFill)
+                    return [];
+                const q = trx.trx
+                    .selectFrom(exports.TX_BURN_ADJUSTMENT_TABLE)
+                    .selectAll(exports.TX_BURN_ADJUSTMENT_TABLE)
+                    .leftJoin(exports.BURN_TABLE, `${exports.BURN_TABLE}.tx_burn_adjustment_id`, `${exports.TX_BURN_ADJUSTMENT_TABLE}.id`)
+                    .select(({ fn, lit }) => [
                     fn
                         .sum(fn.coalesce(`${exports.BURN_TABLE}.from_escrow_usdc`, lit(0)))
                         .as('tot_from_escrow'),
                 ])
-                    .where(`${exports.BURN_CORRECTION_TABLE}.kind`, '=', ps.kind)
-                    .groupBy(`${exports.BURN_CORRECTION_TABLE}.id`)
-                    .orderBy(`${exports.BURN_CORRECTION_TABLE}.created_at`, 'asc');
-                log.info(`getBurnCorrections(${ps.kind}) ${q.compile().sql}`);
+                    .groupBy(`${exports.TX_BURN_ADJUSTMENT_TABLE}.id`);
+                log.info(`getTxBurnAdjustments ${q.compile().sql}`);
                 const res = yield q.execute();
                 return res
                     .map((r) => ({
                     id: Number(r.id),
                     createdAt: r.created_at,
-                    jobId: r.job_id != null ? Number(r.job_id) : undefined,
-                    solTxId: r.sol_tx_id != null ? Number(r.sol_tx_id) : undefined,
-                    kind: r.kind,
-                    amountRender: r.amount_render != null ? Number(r.amount_render) : undefined,
-                    amountUsdc: r.amount_usdc != null ? Number(r.amount_usdc) : undefined,
-                    consumed: ps.kind === 'down_adjust'
-                        ? Number(r.tot_to_burn) - Number(r.tot_burned)
-                        : Number(r.tot_from_escrow),
+                    solTxId: Number(r.sol_tx_id),
+                    surplusUsdc: Number(r.surplus_usdc),
+                    consumed: Number(r.tot_from_escrow),
                 }))
-                    .filter((c) => {
-                    var _a, _b;
-                    return c.kind === 'down_adjust'
-                        ? c.consumed < ((_a = c.amountRender) !== null && _a !== void 0 ? _a : 0)
-                        : c.consumed < ((_b = c.amountUsdc) !== null && _b !== void 0 ? _b : 0);
-                });
+                    .filter((a) => a.consumed < a.surplusUsdc);
             });
         },
         insertPolygonUpgrade(db, p, log = logger_1.consoleLogger) {