@render-foundation/utils 0.0.232 → 0.0.233

package/lib/esm/src/client/dispersed.js

@@ -0,0 +1,108 @@
+import { consoleLogger } from '../logger';
+import fetch from '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 = 60_000;
+/**
+ * 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.
+ */
+export class DispersedConflictError extends Error {
+    body;
+    status = 409;
+    constructor(body) {
+        super(`dispersed 409 conflict: ${body}`);
+        this.body = body;
+        this.name = 'DispersedConflictError';
+    }
+}
+export const dispersedClient = (cfg, fetchImpl = fetch) => {
+    let cached;
+    const mintToken = async () => {
+        const res = await 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: ${await res.text()}`);
+        }
+        const json = (await res.json());
+        cached = {
+            token: json.access_token,
+            expiresAt: Date.now() + json.expires_in * 1000,
+        };
+        return cached.token;
+    };
+    const getToken = async () => {
+        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 = async (path, body) => {
+        const doPost = (token) => fetchImpl(`${cfg.apiBaseUrl}${path}`, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+                Authorization: `Bearer ${token}`,
+            },
+            body: JSON.stringify(body),
+        });
+        let res = await doPost(await getToken());
+        if (res.status === 401) {
+            cached = undefined;
+            res = await doPost(await mintToken());
+        }
+        return res;
+    };
+    return {
+        async claim({ from, to, limit }, log = consoleLogger) {
+            const res = await authedPost('/v1/burn-ledger-claims', {
+                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(await res.text())}`);
+            }
+            const result = (await res.json());
+            log.info(`dispersed claim ${result.claim.uuid}: ${result.claimed_count} obligations, expires ${result.claim.claim_expires_at}`);
+            return result;
+        },
+        async settle(req, log = consoleLogger) {
+            const res = await authedPost('/v1/burn-ledger-settlements', req);
+            if (res.status === 409) {
+                throw new DispersedConflictError(await res.text());
+            }
+            if (res.status !== 201 && res.status !== 200) {
+                throw new Error(`dispersed settle failed. code: ${res.status} body: ${JSON.stringify(await res.text())}`);
+            }
+            const result = (await res.json());
+            log.info(`dispersed settle ${result.settlement.uuid} for tx ${req.tx_signature} (replay=${result.idempotent_replay})`);
+            return result;
+        },
+    };
+};
+//# sourceMappingURL=dispersed.js.map

package/lib/esm/src/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/esm/src/client/pg/v2Client.js

@@ -16,14 +16,14 @@ export const JOB_TABLE = 'job';
 export const BURN_TABLE = 'burn';
 export const BRIDGE_TRANSFER_TABLE = 'bridge_transfer';
 export const NETWORK_REVENUE_TABLE = 'network_revenue';
-export const JOB_BURN_ADJUSTMENT_TABLE = 'job_burn_adjustment';
-export const TX_BURN_ADJUSTMENT_TABLE = 'tx_burn_adjustment';
+export const BURN_CORRECTION_TABLE = 'burn_correction';
 export const ENTITY_EPOCH_INFO_TABLE = 'entity_epoch_info';
 export const POLYGON_UPGRADE_TABLE = 'polygon_upgrade';
 export const CURRENT_USER_GRANT_SPEND_TABLE = 'current_user_grant_spend';
 export const USER_GRANT_SPEND_TABLE = 'user_grant_spend';
 export const GRANT_BURN_ID_TABLE = 'grant_burn_id';
 export const GRANT_BURN_TABLE = 'grant_burn';
+export const DISPERSED_SETTLEMENT_TABLE = 'dispersed_settlement';
 BigInt.prototype.toJSON = function () {
     return this.toString();
 };
@@ -1039,7 +1039,7 @@ export 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 = await fetchJobs1(trx.trx, { ids: p.jobs.map((j) => String(j.id)) }, log);
@@ -1058,8 +1058,8 @@ export 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 ?? 0,
                 };
@@ -1597,6 +1597,61 @@ export const pgClient = (config) => {
                 log.debug(`burn id ${id} inserted ${num} of ${p.jobs.length} burn jobs`);
             });
         },
+        async insertDispersedOutbox(p, log = consoleLogger) {
+            const res = await db
+                .insertInto(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: p.eurRender ?? null,
+                last_valid_block_height: p.lastValidBlockHeight ?? null,
+            })
+                .onConflict((oc) => oc.column('tx_signature').doNothing())
+                .executeTakeFirst();
+            log.debug(`dispersed outbox tx ${p.txSignature}: ${res.numInsertedOrUpdatedRows} row(s)`);
+        },
+        async markDispersedSettled(txSignature, p, log = consoleLogger) {
+            await db
+                .updateTable(DISPERSED_SETTLEMENT_TABLE)
+                .set({ settled_at: new Date(), idempotent_replay: p.idempotentReplay })
+                .where('tx_signature', '=', txSignature)
+                .execute();
+            log.debug(`dispersed settled tx ${txSignature}`);
+        },
+        async getUnsettledDispersed(log = consoleLogger) {
+            const rows = await db
+                .selectFrom(DISPERSED_SETTLEMENT_TABLE)
+                .selectAll()
+                .where('settled_at', 'is', null)
+                .execute();
+            log.debug(`dispersed outbox: ${rows.length} unsettled`);
+            return rows.map((r) => ({
+                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: r.eur_render ?? 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,
+            }));
+        },
+        async voidDispersedOutbox(txSignature, log = consoleLogger) {
+            const res = await db
+                .deleteFrom(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)`);
+        },
         async fetchJobs(db, f, log = consoleLogger) {
             return await fetchJobs1(db.trx, f, log);
         },
@@ -1660,85 +1715,73 @@ export const pgClient = (config) => {
                     : {},
             }));
         },
-        async createTxBurnAdjustment(trx, p, log = consoleLogger) {
-            // Idempotent per sol_tx_id (unique) — a re-run for the same bad tx is a no-op.
+        async createBurnCorrection(trx, p, log = consoleLogger) {
+            // 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 = await trx.trx
-                .insertInto(TX_BURN_ADJUSTMENT_TABLE)
+                .insertInto(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);
         },
-        async getJobBurnAdjustments(trx, ps, log = consoleLogger) {
+        async getBurnCorrections(trx, ps, log = consoleLogger) {
             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(JOB_BURN_ADJUSTMENT_TABLE)
-                .selectAll(JOB_BURN_ADJUSTMENT_TABLE)
-                .innerJoin(JOB_TABLE, `${JOB_TABLE}.id`, `${JOB_BURN_ADJUSTMENT_TABLE}.job_id`)
-                .select([`${JOB_TABLE}.completed_at`, `${JOB_TABLE}.render_amt`])
-                .leftJoin(BURN_TABLE, `${BURN_TABLE}.job_burn_adjustment_id`, `${JOB_BURN_ADJUSTMENT_TABLE}.id`)
+                .selectFrom(BURN_CORRECTION_TABLE)
+                .selectAll(BURN_CORRECTION_TABLE)
+                .leftJoin(BURN_TABLE, `${BURN_TABLE}.${linkCol}`, `${BURN_CORRECTION_TABLE}.id`)
                 .select(({ fn, lit }) => [
                 fn.sum(fn.coalesce(`${BURN_TABLE}.to_burn`, lit(0))).as('tot_to_burn'),
                 fn.sum(fn.coalesce(`${BURN_TABLE}.burned`, lit(0))).as('tot_burned'),
-            ])
-                .groupBy([
-                `${JOB_BURN_ADJUSTMENT_TABLE}.id`,
-                `${JOB_TABLE}.completed_at`,
-                `${JOB_TABLE}.render_amt`,
-            ]);
-            log.info(`getJobBurnAdjustments ${q.compile().sql}`);
-            const res = await 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);
-        },
-        async getTxBurnAdjustments(trx, ps, log = consoleLogger) {
-            if (!ps.toFill)
-                return [];
-            const q = trx.trx
-                .selectFrom(TX_BURN_ADJUSTMENT_TABLE)
-                .selectAll(TX_BURN_ADJUSTMENT_TABLE)
-                .leftJoin(BURN_TABLE, `${BURN_TABLE}.tx_burn_adjustment_id`, `${TX_BURN_ADJUSTMENT_TABLE}.id`)
-                .select(({ fn, lit }) => [
                 fn
                     .sum(fn.coalesce(`${BURN_TABLE}.from_escrow_usdc`, lit(0)))
                     .as('tot_from_escrow'),
             ])
-                .groupBy(`${TX_BURN_ADJUSTMENT_TABLE}.id`);
-            log.info(`getTxBurnAdjustments ${q.compile().sql}`);
+                .where(`${BURN_CORRECTION_TABLE}.kind`, '=', ps.kind)
+                .groupBy(`${BURN_CORRECTION_TABLE}.id`)
+                .orderBy(`${BURN_CORRECTION_TABLE}.created_at`, 'asc');
+            log.info(`getBurnCorrections(${ps.kind}) ${q.compile().sql}`);
             const res = await 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) => c.kind === 'down_adjust'
+                ? c.consumed < (c.amountRender ?? 0)
+                : c.consumed < (c.amountUsdc ?? 0));
         },
         async insertPolygonUpgrade(db, p, log = consoleLogger) {
             const solTxId = await getOrInsertTx(db.trx, {