@render-foundation/utils 0.0.200 → 0.0.230

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

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 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) {
@@ -35,7 +45,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_ADJUSTMENT_TABLE = exports.NETWORK_REVENUE_TABLE = exports.BRIDGE_TRANSFER_TABLE = exports.BURN_TABLE = exports.JOB_TABLE = exports.JOB_ID_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.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_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");
@@ -52,14 +62,14 @@ exports.JOB_TABLE = 'job';
 exports.BURN_TABLE = 'burn';
 exports.BRIDGE_TRANSFER_TABLE = 'bridge_transfer';
 exports.NETWORK_REVENUE_TABLE = 'network_revenue';
-exports.BURN_ADJUSTMENT_TABLE = 'burn_adjustment';
+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';
 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();
 };
@@ -93,7 +103,7 @@ const pgClient = (config) => {
     const db = new kysely_1.Kysely({
         dialect,
     });
-    const getOrInsertEntity = (db, p, log = logger_1.consoleLogger) => __awaiter(void 0, void 0, void 0, function* () {
+    const getOrInsertEntity = (db_1, p_1, ...args_1) => __awaiter(void 0, [db_1, p_1, ...args_1], void 0, function* (db, p, log = logger_1.consoleLogger) {
         const res = (yield db
             .selectFrom(exports.ENTITY_TABLE)
             .select('id')
@@ -114,7 +124,7 @@ const pgClient = (config) => {
         log.debug(`inserted entity ${id}`);
         return id;
     });
-    const getOrInsertTx = (db, p, log = logger_1.consoleLogger) => __awaiter(void 0, void 0, void 0, function* () {
+    const getOrInsertTx = (db_1, p_1, ...args_1) => __awaiter(void 0, [db_1, p_1, ...args_1], void 0, function* (db, p, log = logger_1.consoleLogger) {
         const res = yield db
             .selectFrom(exports.SOL_TX_TABLE)
             .select('id')
@@ -136,7 +146,7 @@ const pgClient = (config) => {
         log.debug(`inserted tx ${id}`);
         return id;
     });
-    const getOrInsertEpoch = (db, p, log = logger_1.consoleLogger) => __awaiter(void 0, void 0, void 0, function* () {
+    const getOrInsertEpoch = (db_1, p_1, ...args_1) => __awaiter(void 0, [db_1, p_1, ...args_1], void 0, function* (db, p, log = logger_1.consoleLogger) {
         const res = yield db
             .selectFrom(exports.EPOCH_TABLE)
             .select('id')
@@ -164,7 +174,7 @@ const pgClient = (config) => {
         log.debug(`inserted epoch ${id}`);
         return id;
     });
-    const getCurrentUserGrantSpend = (db, p, log = logger_1.consoleLogger) => __awaiter(void 0, void 0, void 0, function* () {
+    const getCurrentUserGrantSpend = (db_1, p_1, ...args_1) => __awaiter(void 0, [db_1, p_1, ...args_1], void 0, function* (db, p, log = logger_1.consoleLogger) {
         var _a;
         const res = yield db
             .selectFrom(exports.CURRENT_USER_GRANT_SPEND_TABLE)
@@ -194,7 +204,7 @@ const pgClient = (config) => {
             .executeTakeFirst());
         log.info(`set ${res.numUpdatedRows} rows. channel: ${p.channel}, ui: ${p.uiEpochId} -> totalRndr ${totalRndr} `);
     });
-    const fetchJobs1 = (db, f, log = logger_1.consoleLogger) => __awaiter(void 0, void 0, void 0, function* () {
+    const fetchJobs1 = (db_1, f_1, ...args_1) => __awaiter(void 0, [db_1, f_1, ...args_1], void 0, function* (db, f, log = logger_1.consoleLogger) {
         let q = db.selectFrom('job').selectAll();
         //.where('job.burn_id', 'is not', null)
         if (f.completedAtAfter) {
@@ -224,7 +234,7 @@ const pgClient = (config) => {
             insertedAt: r.inserted_at,
         }));
     });
-    const fetchJobs2 = (db, f, log = logger_1.consoleLogger) => __awaiter(void 0, void 0, void 0, function* () {
+    const fetchJobs2 = (db_1, f_1, ...args_1) => __awaiter(void 0, [db_1, f_1, ...args_1], void 0, function* (db, f, log = logger_1.consoleLogger) {
         let q = db.selectFrom('job').selectAll();
         //.where('job.burn_id', 'is not', null)
         if (f.completedAtAfter) {
@@ -258,7 +268,7 @@ const pgClient = (config) => {
             });
         });
     });
-    const createBridgeTransfers = (db, bts, log = logger_1.consoleLogger) => __awaiter(void 0, void 0, void 0, function* () {
+    const createBridgeTransfers = (db_1, bts_1, ...args_1) => __awaiter(void 0, [db_1, bts_1, ...args_1], void 0, function* (db, bts, log = logger_1.consoleLogger) {
         const sequenceNumbers = [];
         const dbEpochIds = [];
         for (const bt of bts) {
@@ -302,7 +312,7 @@ const pgClient = (config) => {
         }
         return { sequenceNumbers: sequenceNumbers };
     });
-    const createPayments = (db, ps, log = logger_1.consoleLogger) => __awaiter(void 0, void 0, void 0, function* () {
+    const createPayments = (db_1, ps_1, ...args_1) => __awaiter(void 0, [db_1, ps_1, ...args_1], void 0, function* (db, ps, log = logger_1.consoleLogger) {
         const ids = [];
         const epochDbIds = [];
         for (const p of ps) {
@@ -356,7 +366,11 @@ const pgClient = (config) => {
                     sig: solTx,
                     executedAt,
                 }, log);
-                const { id } = yield db
+                // sol_transfer1 already has UNIQUE(sol_tx_id, from_entity_id,
+                // to_entity_id, symbol). Without ON CONFLICT a retry of the record step
+                // throws a unique violation and wedges the BullMQ job; make it an
+                // idempotent no-op and re-fetch the existing id instead.
+                let transferRow = yield db
                     .insertInto(exports.SOL_TRANSFER_TABLE)
                     .values({
                     id: dbId,
@@ -367,9 +381,23 @@ const pgClient = (config) => {
                     symbol,
                     amount_payed: amountPayed,
                 })
+                    .onConflict((oc) => oc
+                    .columns(['sol_tx_id', 'from_entity_id', 'to_entity_id', 'symbol'])
+                    .doNothing())
                     .returning((eb) => ['id as id'])
-                    .executeTakeFirstOrThrow();
-                transferId = BigInt(id);
+                    .executeTakeFirst();
+                if (!transferRow) {
+                    log.warn(`sol_transfer for sol_tx_id ${solTxId} ${fromEntityId}->${toEntityId} ${symbol} already exists; reusing existing id (idempotent retry)`);
+                    transferRow = yield db
+                        .selectFrom(exports.SOL_TRANSFER_TABLE)
+                        .select((eb) => ['id as id'])
+                        .where('sol_tx_id', '=', solTxId)
+                        .where('from_entity_id', '=', fromEntityId)
+                        .where('to_entity_id', '=', toEntityId)
+                        .where('symbol', '=', symbol)
+                        .executeTakeFirstOrThrow();
+                }
+                transferId = BigInt(transferRow.id);
             }
             ids.push({ transferId, liabilityId });
         }
@@ -381,18 +409,18 @@ const pgClient = (config) => {
             rollback: () => { },
             trx: db,
         },
-        startTransaction(log = logger_1.consoleLogger) {
-            return __awaiter(this, void 0, void 0, function* () {
+        startTransaction() {
+            return __awaiter(this, arguments, void 0, function* (log = logger_1.consoleLogger) {
                 return (0, base_2.begin)(db, log);
             });
         },
-        createPayments(db, ps, log = logger_1.consoleLogger) {
-            return __awaiter(this, void 0, void 0, function* () {
+        createPayments(db_1, ps_1) {
+            return __awaiter(this, arguments, void 0, function* (db, ps, log = logger_1.consoleLogger) {
                 return createPayments(db.trx, ps, log);
             });
         },
-        fetchTransfers(db, f, log = logger_1.consoleLogger) {
-            return __awaiter(this, void 0, void 0, function* () {
+        fetchTransfers(db_1, f_1) {
+            return __awaiter(this, arguments, void 0, function* (db, f, log = logger_1.consoleLogger) {
                 let lastId = undefined;
                 if (f.cursor) {
                     lastId = atob(f.cursor);
@@ -448,8 +476,8 @@ const pgClient = (config) => {
                 };
             });
         },
-        fetchEpochs(db, f, log = logger_1.consoleLogger) {
-            return __awaiter(this, void 0, void 0, function* () {
+        fetchEpochs(db_1, f_1) {
+            return __awaiter(this, arguments, void 0, function* (db, f, log = logger_1.consoleLogger) {
                 let q = db.trx.selectFrom(exports.EPOCH_TABLE).selectAll();
                 if (f.channels) {
                     q = q.where('channel', 'in', f.channels);
@@ -472,9 +500,9 @@ const pgClient = (config) => {
                 }));
             });
         },
-        fetchLiabilities(db, f, log = logger_1.consoleLogger) {
-            var _a;
-            return __awaiter(this, void 0, void 0, function* () {
+        fetchLiabilities(db_1, f_1) {
+            return __awaiter(this, arguments, void 0, function* (db, f, log = logger_1.consoleLogger) {
+                var _a;
                 let offset = 0;
                 let orderBy = (_a = f.orderBy) !== null && _a !== void 0 ? _a : 'epoch.ui,liability.id';
                 if (f.cursor) {
@@ -541,8 +569,8 @@ const pgClient = (config) => {
                 };
             });
         },
-        getLiabilitiesAndTransfers(f, log = logger_1.consoleLogger) {
-            return __awaiter(this, void 0, void 0, function* () {
+        getLiabilitiesAndTransfers(f_1) {
+            return __awaiter(this, arguments, void 0, function* (f, log = logger_1.consoleLogger) {
                 let lq = db
                     .selectFrom(exports.LIABILITY_TABLE)
                     .selectAll()
@@ -603,9 +631,9 @@ const pgClient = (config) => {
                 return { transfers, liabilities, epochs: Object.values(epochs) };
             });
         },
-        getOutstanding(f, log = logger_1.consoleLogger) {
-            var _a, _b, _c, _d, _e;
-            return __awaiter(this, void 0, void 0, function* () {
+        getOutstanding(f_1) {
+            return __awaiter(this, arguments, void 0, function* (f, log = logger_1.consoleLogger) {
+                var _a, _b, _c, _d, _e;
                 log.info(`getting outstanding balances for ${(_a = f.channels) !== null && _a !== void 0 ? _a : '(no channels specified)'} epoch: ${(_b = f.startEpochId.id) !== null && _b !== void 0 ? _b : '(no epoch specified)'}`);
                 let epochUi;
                 let epochEndTime;
@@ -714,9 +742,9 @@ const pgClient = (config) => {
                 return out;
             });
         },
-        fetchNodeOperatorEpoch(epochId, log = logger_1.consoleLogger) {
-            var _a;
-            return __awaiter(this, void 0, void 0, function* () {
+        fetchNodeOperatorEpoch(epochId_1) {
+            return __awaiter(this, arguments, void 0, function* (epochId, log = logger_1.consoleLogger) {
+                var _a;
                 const q = db
                     .selectFrom(exports.JOB_ID_TABLE)
                     .innerJoin(exports.EPOCH_TABLE, 'epoch.id', 'job_id.epoch_id')
@@ -766,14 +794,14 @@ const pgClient = (config) => {
                 };
             });
         },
-        insertEpoch(db, epoch, log = logger_1.consoleLogger) {
-            return __awaiter(this, void 0, void 0, function* () {
+        insertEpoch(db_1, epoch_1) {
+            return __awaiter(this, arguments, void 0, function* (db, epoch, log = logger_1.consoleLogger) {
                 yield getOrInsertEpoch(db.trx, Object.assign(Object.assign({}, epoch), { uiEpochId: epoch.ui }), log);
             });
         },
-        getEpoch(f, log = logger_1.consoleLogger) {
-            var _a;
-            return __awaiter(this, void 0, void 0, function* () {
+        getEpoch(f_1) {
+            return __awaiter(this, arguments, void 0, function* (f, log = logger_1.consoleLogger) {
+                var _a;
                 const now = new Date(Date.now());
                 try {
                     let q = db
@@ -811,9 +839,9 @@ const pgClient = (config) => {
                 }
             });
         },
-        getLatestNodeOperatorEpoch(f, log = logger_1.consoleLogger) {
-            var _a;
-            return __awaiter(this, void 0, void 0, function* () {
+        getLatestNodeOperatorEpoch(f_1) {
+            return __awaiter(this, arguments, void 0, function* (f, log = logger_1.consoleLogger) {
+                var _a;
                 const now = new Date(Date.now());
                 try {
                     let q = db
@@ -853,8 +881,8 @@ const pgClient = (config) => {
                 }
             });
         },
-        saveNodeOperatorEpoch(epochId, liabilities, jobIds, totalRndr, log = logger_1.consoleLogger) {
-            return __awaiter(this, void 0, void 0, function* () {
+        saveNodeOperatorEpoch(epochId_1, liabilities_1, jobIds_1, totalRndr_1) {
+            return __awaiter(this, arguments, void 0, function* (epochId, liabilities, jobIds, totalRndr, log = logger_1.consoleLogger) {
                 yield db
                     .transaction()
                     .setIsolationLevel('repeatable read')
@@ -890,8 +918,8 @@ const pgClient = (config) => {
                 return;
             });
         },
-        produceBurnedJobs(jobs, log = logger_1.consoleLogger) {
-            return __awaiter(this, void 0, void 0, function* () {
+        produceBurnedJobs(jobs_1) {
+            return __awaiter(this, arguments, void 0, function* (jobs, log = logger_1.consoleLogger) {
                 yield db.transaction().execute((trx) => __awaiter(this, void 0, void 0, function* () {
                     var _a;
                     let num = BigInt(0);
@@ -914,9 +942,9 @@ const pgClient = (config) => {
                 }));
             });
         },
-        markJobsBurntWithGrant(db, p, log = logger_1.consoleLogger) {
-            var _a;
-            return __awaiter(this, void 0, void 0, function* () {
+        markJobsBurntWithGrant(db_1, p_1) {
+            return __awaiter(this, arguments, void 0, function* (db, p, log = logger_1.consoleLogger) {
+                var _a;
                 const solTxId = yield getOrInsertTx(db.trx, { sig: p.tx.sig, executedAt: p.tx.executedAt }, log);
                 const { id } = yield db.trx
                     .insertInto(exports.GRANT_BURN_TABLE)
@@ -947,9 +975,9 @@ const pgClient = (config) => {
                 return;
             });
         },
-        insertGrantSpend(db, p, log = logger_1.consoleLogger) {
-            var _a, _b, _c;
-            return __awaiter(this, void 0, void 0, function* () {
+        insertGrantSpend(db_1, p_1) {
+            return __awaiter(this, arguments, void 0, function* (db, p, log = logger_1.consoleLogger) {
+                var _a, _b, _c;
                 const existing = yield getCurrentUserGrantSpend(db.trx, { userId: p.userId }, log);
                 const diff = {
                     render_spent: ((_a = existing === null || existing === void 0 ? void 0 : existing.renderSpent) !== null && _a !== void 0 ? _a : BigInt(0)) + p.renderSpentDelta,
@@ -1014,9 +1042,9 @@ const pgClient = (config) => {
                 }
             });
         },
-        markJobsBurnt(trx, p, log = logger_1.consoleLogger) {
-            var _a, _b;
-            return __awaiter(this, void 0, void 0, function* () {
+        markJobsBurnt(trx_1, p_1) {
+            return __awaiter(this, arguments, void 0, function* (trx, p, log = logger_1.consoleLogger) {
+                var _a, _b;
                 if (!p.buyBurn && !p.grantBurn) {
                     throw new Error('no buyBurn or grantBurn');
                 }
@@ -1024,7 +1052,7 @@ const pgClient = (config) => {
                 let buyBurnId;
                 let grantBurnId;
                 if (p.buyBurn) {
-                    const { burned, usdcSpent, eurToUsdc, renderToUsdc, quoteAmt, tags, burnAdjustmentId, toBurn, } = p.buyBurn;
+                    const { burned, usdcSpent, eurToUsdc, renderToUsdc, quoteAmt, tags, jobBurnAdjustmentId, txBurnAdjustmentId, toBurn, fromEscrowCredit, } = p.buyBurn;
                     let pricedAt = p.buyBurn.pricedAt;
                     if (!pricedAt) {
                         const jobs = yield fetchJobs1(trx.trx, { ids: p.jobs.map((j) => String(j.id)) }, log);
@@ -1043,17 +1071,30 @@ const pgClient = (config) => {
                         quote_amt: quoteAmt,
                         burned: burned,
                         tags: tags.join(','),
-                        burn_adjustment_id: burnAdjustmentId,
+                        job_burn_adjustment_id: jobBurnAdjustmentId,
+                        tx_burn_adjustment_id: txBurnAdjustmentId,
                         to_burn: toBurn,
+                        from_escrow_credit: fromEscrowCredit !== null && fromEscrowCredit !== void 0 ? fromEscrowCredit : 0,
                     };
                     log.debug(`inserting burn ${JSON.stringify(v)}`);
-                    const { id } = yield trx.trx
+                    // Idempotent on sol_tx_id (uniq_burn_sol_tx_id, migration 27): a retry of
+                    // the record step for the same on-chain burn is a safe no-op. On conflict
+                    // executeTakeFirst() returns undefined, so re-fetch the existing id.
+                    let burnRow = yield trx.trx
                         .insertInto(exports.BURN_TABLE)
                         .values(v)
-                        //.onConflict((oc) => oc.column('sol_tx').doNothing())
+                        .onConflict((oc) => oc.column('sol_tx_id').doNothing())
                         .returning((eb) => ['id as id'])
-                        .executeTakeFirstOrThrow();
-                    buyBurnId = Number(id);
+                        .executeTakeFirst();
+                    if (!burnRow) {
+                        log.warn(`burn for sol_tx_id ${solTxId} already exists; reusing existing id (idempotent retry)`);
+                        burnRow = yield trx.trx
+                            .selectFrom(exports.BURN_TABLE)
+                            .select((eb) => ['id as id'])
+                            .where('sol_tx_id', '=', solTxId)
+                            .executeTakeFirstOrThrow();
+                    }
+                    buyBurnId = Number(burnRow.id);
                 }
                 if (p.grantBurn) {
                     const { burned, tags } = p.grantBurn;
@@ -1063,12 +1104,22 @@ const pgClient = (config) => {
                         tags: tags === null || tags === void 0 ? void 0 : tags.join(','),
                     };
                     log.debug(`inserting grant burn ${JSON.stringify(v)}`);
-                    const { id } = yield trx.trx
+                    // Idempotent on sol_tx_id (uniq_grant_burn_sol_tx_id, migration 27).
+                    let grantBurnRow = yield trx.trx
                         .insertInto(exports.GRANT_BURN_TABLE)
                         .values(v)
+                        .onConflict((oc) => oc.column('sol_tx_id').doNothing())
                         .returning((eb) => ['id as id'])
-                        .executeTakeFirstOrThrow();
-                    grantBurnId = Number(id);
+                        .executeTakeFirst();
+                    if (!grantBurnRow) {
+                        log.warn(`grant_burn for sol_tx_id ${solTxId} already exists; reusing existing id (idempotent retry)`);
+                        grantBurnRow = yield trx.trx
+                            .selectFrom(exports.GRANT_BURN_TABLE)
+                            .select((eb) => ['id as id'])
+                            .where('sol_tx_id', '=', solTxId)
+                            .executeTakeFirstOrThrow();
+                    }
+                    grantBurnId = Number(grantBurnRow.id);
                 }
                 const burnId = buyBurnId;
                 const grantId = grantBurnId !== null && grantBurnId !== void 0 ? grantBurnId : buyBurnId;
@@ -1094,8 +1145,8 @@ const pgClient = (config) => {
                 return { grantBurnId, buyBurnId };
             });
         },
-        markJobsBurned(trx, p, log = logger_1.consoleLogger) {
-            return __awaiter(this, void 0, void 0, function* () {
+        markJobsBurned(trx_1, p_1) {
+            return __awaiter(this, arguments, void 0, function* (trx, p, log = logger_1.consoleLogger) {
                 let { markedAt, solTx } = p;
                 let res = yield trx.trx
                     .updateTable(exports.BURN_TABLE)
@@ -1119,8 +1170,8 @@ const pgClient = (config) => {
                 }
             });
         },
-        consumeAndLockBurnJobs(limit, lowerRndrThreshold, upperRndrThreshold, log = logger_1.consoleLogger) {
-            return __awaiter(this, void 0, void 0, function* () {
+        consumeAndLockBurnJobs(limit_1, lowerRndrThreshold_1, upperRndrThreshold_1) {
+            return __awaiter(this, arguments, void 0, function* (limit, lowerRndrThreshold, upperRndrThreshold, log = logger_1.consoleLogger) {
                 const trx = yield (0, base_2.begin)(db, log);
                 const q = trx.trx
                     .selectFrom(trx.trx
@@ -1227,9 +1278,9 @@ const pgClient = (config) => {
                 };
             });
         },
-        incrBuyBurnMetrics(log = logger_1.consoleLogger) {
-            var _a;
-            return __awaiter(this, void 0, void 0, function* () {
+        incrBuyBurnMetrics() {
+            return __awaiter(this, arguments, void 0, function* (log = logger_1.consoleLogger) {
+                var _a;
                 const res = yield db
                     .selectFrom(exports.JOB_TABLE)
                     .select('inserted_at')
@@ -1246,9 +1297,9 @@ const pgClient = (config) => {
                 };
             });
         },
-        fetchBurns(db, f, log = logger_1.consoleLogger) {
-            var _a, _b;
-            return __awaiter(this, void 0, void 0, function* () {
+        fetchBurns(db_1, f_1) {
+            return __awaiter(this, arguments, void 0, function* (db, f, log = logger_1.consoleLogger) {
+                var _a, _b;
                 let q = db.trx
                     .selectFrom('burn')
                     .selectAll('burn')
@@ -1317,9 +1368,9 @@ const pgClient = (config) => {
                 return burns;
             });
         },
-        fetchBurnsAndGrants(db, f, log = logger_1.consoleLogger) {
-            var _a, _b;
-            return __awaiter(this, void 0, void 0, function* () {
+        fetchBurnsAndGrants(db_1, f_1) {
+            return __awaiter(this, arguments, void 0, function* (db, f, log = logger_1.consoleLogger) {
+                var _a, _b;
                 // Build a unified query to get all transactions with both buy burns and grant burns
                 let baseQuery = db.trx
                     .selectFrom('sol_tx')
@@ -1457,13 +1508,13 @@ const pgClient = (config) => {
                 return groupedBurns;
             });
         },
-        createBridgeTransfers(db, bts, log = logger_1.consoleLogger) {
-            return __awaiter(this, void 0, void 0, function* () {
+        createBridgeTransfers(db_1, bts_1) {
+            return __awaiter(this, arguments, void 0, function* (db, bts, log = logger_1.consoleLogger) {
                 return createBridgeTransfers(db.trx, bts, log);
             });
         },
-        getBridgeTransfers({ solKey, page, }, log = logger_1.consoleLogger) {
-            return __awaiter(this, void 0, void 0, function* () {
+        getBridgeTransfers(_a) {
+            return __awaiter(this, arguments, void 0, function* ({ solKey, page, }, log = logger_1.consoleLogger) {
                 let q = db
                     .selectFrom(exports.BRIDGE_TRANSFER_TABLE)
                     .innerJoin(exports.EPOCH_TABLE, 'epoch.id', 'bridge_transfer.epoch_id')
@@ -1540,8 +1591,8 @@ const pgClient = (config) => {
             });
         },
         getTotalBurned(db) {
-            var _a, _b;
             return __awaiter(this, void 0, void 0, function* () {
+                var _a, _b;
                 const total = yield db.trx
                     .selectFrom('burn')
                     .select(({ fn }) => fn.sum('burned').as('total_burned'))
@@ -1549,8 +1600,8 @@ const pgClient = (config) => {
                 return BigInt((_b = (_a = total[0]) === null || _a === void 0 ? void 0 : _a.total_burned) !== null && _b !== void 0 ? _b : 0);
             });
         },
-        insertBurn(p, log = logger_1.consoleLogger) {
-            return __awaiter(this, void 0, void 0, function* () {
+        insertBurn(p_1) {
+            return __awaiter(this, arguments, void 0, function* (p, log = logger_1.consoleLogger) {
                 yield db.transaction().execute((trx) => __awaiter(this, void 0, void 0, function* () {
                     var _a;
                     const solTxId = yield getOrInsertTx(trx, { sig: p.solTx, executedAt: p.executedAt }, log);
@@ -1587,69 +1638,18 @@ const pgClient = (config) => {
                 }));
             });
         },
-        insertDispersedOutbox(p, log = logger_1.consoleLogger) {
-            var _a;
-            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,
-                })
-                    .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,
-                    });
-                });
-            });
-        },
-        fetchJobs(db, f, log = logger_1.consoleLogger) {
-            return __awaiter(this, void 0, void 0, function* () {
+        fetchJobs(db_1, f_1) {
+            return __awaiter(this, arguments, void 0, function* (db, f, log = logger_1.consoleLogger) {
                 return yield fetchJobs1(db.trx, f, log);
             });
         },
-        fetchJobsWithGrantValues(db, f, log = logger_1.consoleLogger) {
-            return __awaiter(this, void 0, void 0, function* () {
+        fetchJobsWithGrantValues(db_1, f_1) {
+            return __awaiter(this, arguments, void 0, function* (db, f, log = logger_1.consoleLogger) {
                 return yield fetchJobs2(db.trx, f, log);
             });
         },
-        fetchLiabilityEpochs(db, log = logger_1.consoleLogger) {
-            return __awaiter(this, void 0, void 0, function* () {
+        fetchLiabilityEpochs(db_1) {
+            return __awaiter(this, arguments, void 0, function* (db, log = logger_1.consoleLogger) {
                 const q = db.trx
                     .selectFrom(exports.LIABILITY_TABLE)
                     .select(({ fn }) => [
@@ -1707,50 +1707,94 @@ const pgClient = (config) => {
                 }));
             });
         },
-        getBurnAdjustments(trx, ps, log = logger_1.consoleLogger) {
-            return __awaiter(this, void 0, void 0, function* () {
-                if (ps.toFill) {
-                    const q = trx.trx
-                        .selectFrom(exports.BURN_ADJUSTMENT_TABLE)
-                        .selectAll(exports.BURN_ADJUSTMENT_TABLE)
-                        .innerJoin(exports.JOB_TABLE, `${exports.JOB_TABLE}.id`, `${exports.BURN_ADJUSTMENT_TABLE}.job_id`)
-                        .select([`${exports.JOB_TABLE}.completed_at`, `${exports.JOB_TABLE}.render_amt`])
-                        .leftJoin(exports.BURN_TABLE, `${exports.BURN_TABLE}.burn_adjustment_id`, `${exports.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.BURN_ADJUSTMENT_TABLE}.id`,
-                        `${exports.JOB_TABLE}.completed_at`,
-                        `${exports.JOB_TABLE}.render_amt`,
-                    ])
-                        .havingRef((0, kysely_1.sql) `SUM(COALESCE("burn"."to_burn", 0)) - SUM(COALESCE("burn"."burned", 0))`, '<', `${exports.BURN_ADJUSTMENT_TABLE}.down_adj_to_burn`);
-                    log.info(`getBurnAdjustments ${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),
-                        },
-                    }));
+        createTxBurnAdjustment(trx_1, p_1) {
+            return __awaiter(this, arguments, void 0, function* (trx, p, log = logger_1.consoleLogger) {
+                // 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.TX_BURN_ADJUSTMENT_TABLE)
+                    .values({
+                    sol_tx_id: p.solTxId,
+                    surplus_render: p.surplusRender,
+                    description: p.description,
+                })
+                    .onConflict((oc) => oc.column('sol_tx_id').doNothing())
+                    .returning('id')
+                    .executeTakeFirst();
+                if (!row) {
+                    log.info(`tx_burn_adjustment for sol_tx ${p.solTxId} already exists — skipped`);
+                    return undefined;
                 }
-                return [];
+                log.info(`created tx_burn_adjustment ${row.id}: ${p.surplusRender} RENDER surplus (sol_tx ${p.solTxId})`);
+                return Number(row.id);
             });
         },
-        insertPolygonUpgrade(db, p, log = logger_1.consoleLogger) {
-            return __awaiter(this, void 0, void 0, function* () {
+        getJobBurnAdjustments(trx_1, ps_1) {
+            return __awaiter(this, arguments, void 0, function* (trx, ps, log = logger_1.consoleLogger) {
+                if (!ps.toFill)
+                    return [];
+                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`)
+                    .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_1, ps_1) {
+            return __awaiter(this, arguments, void 0, function* (trx, ps, log = logger_1.consoleLogger) {
+                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_credit`, lit(0)))
+                        .as('tot_from_escrow'),
+                ])
+                    .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,
+                    solTxId: Number(r.sol_tx_id),
+                    surplusRender: Number(r.surplus_render),
+                    consumed: Number(r.tot_from_escrow),
+                }))
+                    .filter((a) => a.consumed < a.surplusRender);
+            });
+        },
+        insertPolygonUpgrade(db_1, p_1) {
+            return __awaiter(this, arguments, void 0, function* (db, p, log = logger_1.consoleLogger) {
                 const solTxId = yield getOrInsertTx(db.trx, {
                     sig: p.solTx.sig,
                     executedAt: p.solTx.executedAt,
@@ -1768,8 +1812,8 @@ const pgClient = (config) => {
                 return;
             });
         },
-        fetchPolygonUpgrades(db, f, log = logger_1.consoleLogger) {
-            return __awaiter(this, void 0, void 0, function* () {
+        fetchPolygonUpgrades(db_1, f_1) {
+            return __awaiter(this, arguments, void 0, function* (db, f, log = logger_1.consoleLogger) {
                 let query = db.trx
                     .selectFrom('polygon_upgrade')
                     .selectAll('polygon_upgrade')
@@ -1795,13 +1839,13 @@ const pgClient = (config) => {
                 }));
             });
         },
-        getCurrentUserGrantSpend(db, f, log = logger_1.consoleLogger) {
-            return __awaiter(this, void 0, void 0, function* () {
+        getCurrentUserGrantSpend(db_1, f_1) {
+            return __awaiter(this, arguments, void 0, function* (db, f, log = logger_1.consoleLogger) {
                 return yield getCurrentUserGrantSpend(db.trx, f, log);
             });
         },
-        deleteAll(log = logger_1.consoleLogger) {
-            return __awaiter(this, void 0, void 0, function* () {
+        deleteAll() {
+            return __awaiter(this, arguments, void 0, function* (log = logger_1.consoleLogger) {
                 if (config.database.includes('render')) {
                     throw new Error('cannot nuke from deployed database. call from tests only');
                 }
@@ -1847,8 +1891,8 @@ const pgClient = (config) => {
                 }
             });
         },
-        checkPaymentsForDate(targetDate, channel = 'both', log = logger_1.consoleLogger) {
-            return __awaiter(this, void 0, void 0, function* () {
+        checkPaymentsForDate(targetDate_1) {
+            return __awaiter(this, arguments, void 0, function* (targetDate, channel = 'both', log = logger_1.consoleLogger) {
                 const startOfDay = new Date(targetDate);
                 startOfDay.setHours(0, 0, 0, 0);
                 const endOfDay = new Date(targetDate);
@@ -1899,8 +1943,8 @@ const pgClient = (config) => {
                 }
             });
         },
-        checkEpochProcessed(epochId, channel, log = logger_1.consoleLogger) {
-            return __awaiter(this, void 0, void 0, function* () {
+        checkEpochProcessed(epochId_1, channel_1) {
+            return __awaiter(this, arguments, void 0, function* (epochId, channel, log = logger_1.consoleLogger) {
                 try {
                     const result = yield db
                         .selectFrom('epoch')
@@ -1920,8 +1964,8 @@ const pgClient = (config) => {
                 }
             });
         },
-        checkRecentPaymentActivity(lookbackHours = 2, channel = 'both', log = logger_1.consoleLogger) {
-            return __awaiter(this, void 0, void 0, function* () {
+        checkRecentPaymentActivity() {
+            return __awaiter(this, arguments, void 0, function* (lookbackHours = 2, channel = 'both', log = logger_1.consoleLogger) {
                 const lookbackTime = new Date(Date.now() - lookbackHours * 60 * 60 * 1000);
                 const now = new Date();
                 try {