@render-foundation/utils 0.0.232 → 0.0.233

package/lib/cjs/client/dispersed.js

@@ -0,0 +1,123 @@
+"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());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.dispersedClient = exports.DispersedConflictError = void 0;
+const logger_1 = require("../logger");
+const node_fetch_1 = __importDefault(require("node-fetch"));
+/**
+ * Dispersed Token Burn API client (M2M OAuth2 client_credentials).
+ *
+ * Thin transport only: it mints/caches the bearer token and posts the two burn
+ * endpoints (claim, settle). It does NOT price RENDER, sum obligations, or do
+ * any burn math — the consumer owns that (incl. the `settled_amount == Σ
+ * obligation amounts` invariant). Amounts are passed through as decimal strings.
+ *
+ * Contract: see docs/dispersed-burn.md. Authoritative spec at
+ * `{apiBaseUrl}/openapi.json` (tag "Burn Ledger").
+ */
+// Both scopes, space-delimited, requested on every token mint.
+const SCOPES = 'burn_ledger_claims.create.all burn_ledger_settlements.create.all';
+// Re-mint a little before the token actually expires.
+const TOKEN_REFRESH_MARGIN_MS = 60000;
+/**
+ * Thrown on a 409 from settle: the claim is missing/expired/released/already
+ * settled, an obligation mismatch, an amount mismatch, or a tx_signature reused
+ * with a different payload. Nothing was written. Do NOT re-burn — reconcile.
+ */
+class DispersedConflictError extends Error {
+    constructor(body) {
+        super(`dispersed 409 conflict: ${body}`);
+        this.body = body;
+        this.status = 409;
+        this.name = 'DispersedConflictError';
+    }
+}
+exports.DispersedConflictError = DispersedConflictError;
+const dispersedClient = (cfg, fetchImpl = node_fetch_1.default) => {
+    let cached;
+    const mintToken = () => __awaiter(void 0, void 0, void 0, function* () {
+        const res = yield fetchImpl(`${cfg.authBaseUrl}/token`, {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({
+                grant_type: 'client_credentials',
+                client_id: cfg.clientId,
+                client_secret: cfg.clientSecret,
+                scope: SCOPES,
+            }),
+        });
+        if (res.status !== 200) {
+            throw new Error(`dispersed token mint failed. code: ${res.status} body: ${yield res.text()}`);
+        }
+        const json = (yield res.json());
+        cached = {
+            token: json.access_token,
+            expiresAt: Date.now() + json.expires_in * 1000,
+        };
+        return cached.token;
+    });
+    const getToken = () => __awaiter(void 0, void 0, void 0, function* () {
+        if (cached && Date.now() < cached.expiresAt - TOKEN_REFRESH_MARGIN_MS) {
+            return cached.token;
+        }
+        return mintToken();
+    });
+    // POST with bearer; one transparent re-mint+retry on 401 (a dropped daily run
+    // is expensive, so it's worth recovering from a token that died mid-flight).
+    const authedPost = (path, body) => __awaiter(void 0, void 0, void 0, function* () {
+        const doPost = (token) => fetchImpl(`${cfg.apiBaseUrl}${path}`, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+                Authorization: `Bearer ${token}`,
+            },
+            body: JSON.stringify(body),
+        });
+        let res = yield doPost(yield getToken());
+        if (res.status === 401) {
+            cached = undefined;
+            res = yield doPost(yield mintToken());
+        }
+        return res;
+    });
+    return {
+        claim({ from, to, limit }, log = logger_1.consoleLogger) {
+            return __awaiter(this, void 0, void 0, function* () {
+                const res = yield authedPost('/v1/burn-ledger-claims', Object.assign({ executor_id: cfg.executorId, from: from.toISOString(), to: to.toISOString() }, (limit !== undefined ? { limit } : {})));
+                if (res.status !== 201) {
+                    throw new Error(`dispersed claim failed. code: ${res.status} body: ${JSON.stringify(yield res.text())}`);
+                }
+                const result = (yield res.json());
+                log.info(`dispersed claim ${result.claim.uuid}: ${result.claimed_count} obligations, expires ${result.claim.claim_expires_at}`);
+                return result;
+            });
+        },
+        settle(req, log = logger_1.consoleLogger) {
+            return __awaiter(this, void 0, void 0, function* () {
+                const res = yield authedPost('/v1/burn-ledger-settlements', req);
+                if (res.status === 409) {
+                    throw new DispersedConflictError(yield res.text());
+                }
+                if (res.status !== 201 && res.status !== 200) {
+                    throw new Error(`dispersed settle failed. code: ${res.status} body: ${JSON.stringify(yield res.text())}`);
+                }
+                const result = (yield res.json());
+                log.info(`dispersed settle ${result.settlement.uuid} for tx ${req.tx_signature} (replay=${result.idempotent_replay})`);
+                return result;
+            });
+        },
+    };
+};
+exports.dispersedClient = dispersedClient;
+//# sourceMappingURL=dispersed.js.map

package/lib/cjs/client/dispersed.js.map

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

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.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;
+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;
 const kysely_1 = require("kysely");
 const logger_1 = require("../../logger");
 const pg_1 = require("pg");
@@ -54,14 +54,14 @@ exports.JOB_TABLE = 'job';
 exports.BURN_TABLE = 'burn';
 exports.BRIDGE_TRANSFER_TABLE = 'bridge_transfer';
 exports.NETWORK_REVENUE_TABLE = 'network_revenue';
-exports.JOB_BURN_ADJUSTMENT_TABLE = 'job_burn_adjustment';
-exports.TX_BURN_ADJUSTMENT_TABLE = 'tx_burn_adjustment';
+exports.BURN_CORRECTION_TABLE = 'burn_correction';
 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.GRANT_BURN_ID_TABLE = 'grant_burn_id';
 exports.GRANT_BURN_TABLE = 'grant_burn';
+exports.DISPERSED_SETTLEMENT_TABLE = 'dispersed_settlement';
 BigInt.prototype.toJSON = function () {
     return this.toString();
 };
@@ -1124,7 +1124,7 @@ const pgClient = (config) => {
                 let buyBurnId;
                 let grantBurnId;
                 if (p.buyBurn) {
-                    const { burned, usdcSpent, eurToUsdc, renderToUsdc, quoteAmt, tags, jobBurnAdjustmentId, txBurnAdjustmentId, toBurn, fromEscrowUsdc, } = p.buyBurn;
+                    const { burned, usdcSpent, eurToUsdc, renderToUsdc, quoteAmt, tags, downCorrectionId, escrowCorrectionId, 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 +1143,8 @@ const pgClient = (config) => {
                         quote_amt: quoteAmt,
                         burned: burned,
                         tags: tags.join(','),
-                        job_burn_adjustment_id: jobBurnAdjustmentId,
-                        tx_burn_adjustment_id: txBurnAdjustmentId,
+                        down_correction_id: downCorrectionId,
+                        escrow_correction_id: escrowCorrectionId,
                         to_burn: toBurn,
                         from_escrow_usdc: fromEscrowUsdc !== null && fromEscrowUsdc !== void 0 ? fromEscrowUsdc : 0,
                     };
@@ -1710,6 +1710,73 @@ const pgClient = (config) => {
                 }));
             });
         },
+        insertDispersedOutbox(p, log = logger_1.consoleLogger) {
+            var _a, _b;
+            return __awaiter(this, void 0, void 0, function* () {
+                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,
+                })
+                    .onConflict((oc) => oc.column('tx_signature').doNothing())
+                    .executeTakeFirst();
+                log.debug(`dispersed outbox tx ${p.txSignature}: ${res.numInsertedOrUpdatedRows} row(s)`);
+            });
+        },
+        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 })
+                    .where('tx_signature', '=', txSignature)
+                    .execute();
+                log.debug(`dispersed settled tx ${txSignature}`);
+            });
+        },
+        getUnsettledDispersed(log = logger_1.consoleLogger) {
+            return __awaiter(this, void 0, void 0, function* () {
+                const rows = yield db
+                    .selectFrom(exports.DISPERSED_SETTLEMENT_TABLE)
+                    .selectAll()
+                    .where('settled_at', 'is', null)
+                    .execute();
+                log.debug(`dispersed outbox: ${rows.length} unsettled`);
+                return rows.map((r) => {
+                    var _a;
+                    return ({
+                        txSignature: r.tx_signature,
+                        claimUuid: r.claim_uuid,
+                        obligationUuids: r.obligation_uuids,
+                        settledAmount: r.settled_amount,
+                        burnedAmount: r.burned_amount,
+                        executedAt: r.executed_at,
+                        eurRender: (_a = r.eur_render) !== null && _a !== void 0 ? _a : 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)
+                            : undefined,
+                    });
+                });
+            });
+        },
+        voidDispersedOutbox(txSignature, log = logger_1.consoleLogger) {
+            return __awaiter(this, void 0, void 0, function* () {
+                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)`);
+            });
+        },
         fetchJobs(db, f, log = logger_1.consoleLogger) {
             return __awaiter(this, void 0, void 0, function* () {
                 return yield fetchJobs1(db.trx, f, log);
@@ -1779,90 +1846,79 @@ const pgClient = (config) => {
                 }));
             });
         },
-        createTxBurnAdjustment(trx, p, log = logger_1.consoleLogger) {
+        createBurnCorrection(trx, p, log = logger_1.consoleLogger) {
             return __awaiter(this, void 0, void 0, function* () {
-                // Idempotent per sol_tx_id (unique) — a re-run for the same bad tx is a no-op.
+                // 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.
                 const row = yield trx.trx
-                    .insertInto(exports.TX_BURN_ADJUSTMENT_TABLE)
+                    .insertInto(exports.BURN_CORRECTION_TABLE)
                     .values({
+                    kind: p.kind,
+                    job_id: p.jobId,
                     sol_tx_id: p.solTxId,
-                    surplus_usdc: p.surplusUsdc,
+                    amount_render: p.amountRender,
+                    amount_usdc: p.amountUsdc,
                     description: p.description,
                 })
-                    .onConflict((oc) => oc.column('sol_tx_id').doNothing())
+                    .onConflict((oc) => oc.doNothing())
                     .returning('id')
                     .executeTakeFirst();
                 if (!row) {
-                    log.info(`tx_burn_adjustment for sol_tx ${p.solTxId} already exists — skipped`);
+                    log.info(`burn_correction ${p.kind} for ${p.jobId != null ? `job ${p.jobId}` : `sol_tx ${p.solTxId}`} already exists — skipped`);
                     return undefined;
                 }
-                log.info(`created tx_burn_adjustment ${row.id}: ${p.surplusUsdc} USDC over-spent (sol_tx ${p.solTxId})`);
+                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`}`);
                 return Number(row.id);
             });
         },
-        getJobBurnAdjustments(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
+                // 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.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`)
+                    .selectFrom(exports.BURN_CORRECTION_TABLE)
+                    .selectAll(exports.BURN_CORRECTION_TABLE)
+                    .leftJoin(exports.BURN_TABLE, `${exports.BURN_TABLE}.${linkCol}`, `${exports.BURN_CORRECTION_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'),
                 ])
-                    .groupBy(`${exports.TX_BURN_ADJUSTMENT_TABLE}.id`);
-                log.info(`getTxBurnAdjustments ${q.compile().sql}`);
+                    .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}`);
                 const res = yield q.execute();
                 return res
                     .map((r) => ({
                     id: Number(r.id),
                     createdAt: r.created_at,
-                    solTxId: Number(r.sol_tx_id),
-                    surplusUsdc: Number(r.surplus_usdc),
-                    consumed: Number(r.tot_from_escrow),
+                    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),
                 }))
-                    .filter((a) => a.consumed < a.surplusUsdc);
+                    .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);
+                });
             });
         },
         insertPolygonUpgrade(db, p, log = logger_1.consoleLogger) {