@cheqd/studio 3.18.0-develop.2 → 3.18.0-develop.4

package/dist/database/migrations/1791500000002-studio-migrations.js

@@ -0,0 +1,10 @@
+export class StudioMigrations1791500000002 {
+    name = 'StudioMigrations1791500000002';
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "faucetRequest" ALTER COLUMN "createdAt" SET DEFAULT now()`);
+    }
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "faucetRequest" ALTER COLUMN "createdAt" DROP DEFAULT`);
+    }
+}
+//# sourceMappingURL=1791500000002-studio-migrations.js.map

package/dist/database/migrations/1791500000002-studio-migrations.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"1791500000002-studio-migrations.js","sourceRoot":"","sources":["../../../src/database/migrations/1791500000002-studio-migrations.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,6BAA6B;IACzC,IAAI,GAAG,+BAA+B,CAAC;IAEhC,KAAK,CAAC,EAAE,CAAC,WAAwB;QACvC,MAAM,WAAW,CAAC,KAAK,CAAC,wEAAwE,CAAC,CAAC;IACnG,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,WAAwB;QACzC,MAAM,WAAW,CAAC,KAAK,CAAC,mEAAmE,CAAC,CAAC;IAC9F,CAAC;CACD"}

package/dist/database/types/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/database/types/types.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAgErC,MAAM,WAAW,gBAAgB;IAChC,KAAK,IAAI,UAAU,CAAC;CACpB;AAED,qBAAa,MAAO,YAAW,gBAAgB;IAC9C,KAAK,IAAI,UAAU;CAWnB;AAED,qBAAa,QAAS,YAAW,gBAAgB;IAChD,KAAK,IAAI,UAAU;CAuGnB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/database/types/types.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAiErC,MAAM,WAAW,gBAAgB;IAChC,KAAK,IAAI,UAAU,CAAC;CACpB;AAED,qBAAa,MAAO,YAAW,gBAAgB;IAC9C,KAAK,IAAI,UAAU;CAWnB;AAED,qBAAa,QAAS,YAAW,gBAAgB;IAChD,KAAK,IAAI,UAAU;CAyGnB"}

package/dist/database/types/types.js

@@ -56,6 +56,7 @@ import { UpdateWriteCursors1762775500000 } from '../migrations/1762775500000-Upd
 import { StudioMigrations1766408271347 } from '../migrations/1766408271347-studio-migrations.js';
 import { StudioMigrations1791500000000 } from '../migrations/1791500000000-studio-migrations.js';
 import { StudioMigrations1791500000001 } from '../migrations/1791500000001-studio-migrations.js';
+import { StudioMigrations1791500000002 } from '../migrations/1791500000002-studio-migrations.js';
 dotenv.config();
 const { EXTERNAL_DB_CONNECTION_URL, EXTERNAL_DB_CERT } = process.env;
 export class Memory {
@@ -150,6 +151,8 @@ export class Postgres {
                 StudioMigrations1791500000000,
                 // Track whether each faucet request completed, so abandoned reservations can stop counting
                 StudioMigrations1791500000001,
+                // Let the database set faucetRequest.createdAt
+                StudioMigrations1791500000002,
             ],
             entities: [
                 ...Entities,

package/dist/database/types/types.js.map

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

package/dist/helpers/faucet-quota.d.ts

@@ -19,12 +19,22 @@ export declare function maxRequestableNcheq(roomUnderCapNcheq: bigint, quotaRema
 /** Remaining quota, never negative. */
 export declare function remainingQuota(usedNcheq: bigint, limitNcheq: bigint): bigint;
 export declare function buildFaucetQuotaSummary(usedNcheq: bigint, limitNcheq: bigint, window: FaucetQuotaWindow): FaucetQuotaSummary;
+/** Rows older than this are past retention: the start of the calendar month `retentionMonths` months ago (UTC). */
+export declare function retentionCutoff(now: Date, retentionMonths: number): Date;
 /** Seconds the customer still has to wait before their next faucet request; 0 if one is allowed now. */
 export declare function secondsUntilNextRequest(lastRequestAt: Date | null, minIntervalSeconds: number, now?: Date): number;
+/** Room left under an address cap once its balance and requests still in flight are accounted for; never negative. */
+export declare function addressRoomNcheq(capNcheq: bigint, currentBalanceNcheq: bigint, inFlightNcheq: bigint): bigint;
+export interface FaucetAddressCap {
+    capNcheq: bigint;
+    currentBalanceNcheq: bigint;
+    settleSeconds: number;
+}
 export interface FaucetReserveOptions {
     limitNcheq: bigint;
     pendingTimeoutSeconds?: number;
     minIntervalSeconds?: number;
+    addressCap?: FaucetAddressCap;
 }
 export type FaucetReservation = {
     reserved: true;
@@ -41,6 +51,11 @@ export type FaucetReservation = {
     reason: 'too_frequent';
     retryAfterSeconds: number;
     window: FaucetQuotaWindow;
+} | {
+    reserved: false;
+    reason: 'address_cap_exceeded';
+    roomNcheq: bigint;
+    window: FaucetQuotaWindow;
 };
 /** Storage for quota reservations; implemented by `FaucetRequestService` and faked in tests. */
 export interface FaucetQuotaLedger {
@@ -59,6 +74,9 @@ export type FaucetCreditResult = {
     outcome: 'too_frequent';
     retryAfterSeconds: number;
     window: FaucetQuotaWindow;
+} | {
+    outcome: 'address_cap_exceeded';
+    roomNcheq: bigint;
 } | {
     outcome: 'credited';
     usedNcheq: bigint;
@@ -68,14 +86,23 @@ export type FaucetCreditResult = {
     status: number;
     error: string;
 };
+export type FaucetLogLevel = 'info' | 'warn' | 'error';
+export type FaucetLogger = (level: FaucetLogLevel, event: string, fields: Record<string, unknown>) => void;
+/**
+ * Writes one structured log line per faucet decision, e.g. `{"event":"faucet.quota_exceeded","customerId":"..."}`,
+ * so "why was this customer blocked?" and "where did this month's quota go?" can be answered from the logs.
+ * Amounts are ncheq strings. Pass another logger to creditWithinQuota to capture events in tests.
+ */
+export declare const logFaucetEvent: FaucetLogger;
 /**
  * Reserves quota, calls the faucet, and settles the reservation.
- * - Quota does not fit: the faucet is not called.
+ * - Quota, minimum interval or address cap does not allow it: the faucet is not called.
  * - Faucet answers with an error status: it definitely did not credit the account, so the quota is released.
  * - Faucet call throws (e.g. a timeout): the outcome is unknown and tokens may have been sent, so the
  *   reservation is marked unknown and keeps counting for good (over-counting is safer than refunding quota
  *   for tokens that were credited).
  * - Faucet confirms: the reservation is marked completed.
+ * Every outcome is logged through `log`.
  */
 export declare function creditWithinQuota(ledger: FaucetQuotaLedger, delegate: () => Promise<{
     status: number;
@@ -86,5 +113,6 @@ export declare function creditWithinQuota(ledger: FaucetQuotaLedger, delegate: (
     amountNcheq: bigint;
     limitNcheq: bigint;
     minIntervalSeconds?: number;
-}): Promise<FaucetCreditResult>;
+    addressCap?: FaucetAddressCap;
+}, log?: FaucetLogger): Promise<FaucetCreditResult>;
 //# sourceMappingURL=faucet-quota.d.ts.map

package/dist/helpers/faucet-quota.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"faucet-quota.d.ts","sourceRoot":"","sources":["../../src/helpers/faucet-quota.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"faucet-quota.d.ts","sourceRoot":"","sources":["../../src/helpers/faucet-quota.ts"],"names":[],"mappings":"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"}

package/dist/helpers/faucet-quota.js

@@ -36,6 +36,10 @@ export function buildFaucetQuotaSummary(usedNcheq, limitNcheq, window) {
         resetsAt: window.resetsAt.toISOString(),
     };
 }
+/** Rows older than this are past retention: the start of the calendar month `retentionMonths` months ago (UTC). */
+export function retentionCutoff(now, retentionMonths) {
+    return new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth() - retentionMonths, 1));
+}
 /** Seconds the customer still has to wait before their next faucet request; 0 if one is allowed now. */
 export function secondsUntilNextRequest(lastRequestAt, minIntervalSeconds, now = new Date()) {
     if (!lastRequestAt || minIntervalSeconds <= 0)
@@ -43,52 +47,112 @@ export function secondsUntilNextRequest(lastRequestAt, minIntervalSeconds, now =
     const remainingMs = minIntervalSeconds * 1000 - (now.getTime() - lastRequestAt.getTime());
     return remainingMs > 0 ? Math.ceil(remainingMs / 1000) : 0;
 }
-async function markUnknownBestEffort(ledger, faucetRequestId) {
+/** Room left under an address cap once its balance and requests still in flight are accounted for; never negative. */
+export function addressRoomNcheq(capNcheq, currentBalanceNcheq, inFlightNcheq) {
+    const room = capNcheq - currentBalanceNcheq - inFlightNcheq;
+    return room > 0n ? room : 0n;
+}
+async function markUnknownBestEffort(ledger, faucetRequestId, log) {
     try {
         await ledger.markUnknown(faucetRequestId);
     }
     catch (error) {
-        console.error(`Failed to mark faucet request ${faucetRequestId} as unknown:`, error);
+        log('error', 'faucet.mark_unknown_failed', {
+            reservationId: faucetRequestId,
+            error: error?.message ?? String(error),
+        });
     }
 }
+/**
+ * Writes one structured log line per faucet decision, e.g. `{"event":"faucet.quota_exceeded","customerId":"..."}`,
+ * so "why was this customer blocked?" and "where did this month's quota go?" can be answered from the logs.
+ * Amounts are ncheq strings. Pass another logger to creditWithinQuota to capture events in tests.
+ */
+export const logFaucetEvent = (level, event, fields) => {
+    console[level](JSON.stringify({ event, ...fields }));
+};
+const shorten = (text) => (text.length > 200 ? `${text.slice(0, 200)}...` : text);
 /**
  * Reserves quota, calls the faucet, and settles the reservation.
- * - Quota does not fit: the faucet is not called.
+ * - Quota, minimum interval or address cap does not allow it: the faucet is not called.
  * - Faucet answers with an error status: it definitely did not credit the account, so the quota is released.
  * - Faucet call throws (e.g. a timeout): the outcome is unknown and tokens may have been sent, so the
  *   reservation is marked unknown and keeps counting for good (over-counting is safer than refunding quota
  *   for tokens that were credited).
  * - Faucet confirms: the reservation is marked completed.
+ * Every outcome is logged through `log`.
  */
-export async function creditWithinQuota(ledger, delegate, params) {
+export async function creditWithinQuota(ledger, delegate, params, log = logFaucetEvent) {
+    const base = {
+        customerId: params.customer.customerId,
+        address: params.address,
+        amountNcheq: params.amountNcheq.toString(),
+    };
     const reservation = await ledger.reserve(params.customer, params.address, params.amountNcheq, {
         limitNcheq: params.limitNcheq,
         minIntervalSeconds: params.minIntervalSeconds,
+        addressCap: params.addressCap,
     });
     if (!reservation.reserved) {
-        return reservation.reason === 'too_frequent'
-            ? { outcome: 'too_frequent', retryAfterSeconds: reservation.retryAfterSeconds, window: reservation.window }
-            : { outcome: 'quota_exceeded', usedNcheq: reservation.usedNcheq, window: reservation.window };
+        switch (reservation.reason) {
+            case 'too_frequent':
+                log('warn', 'faucet.too_frequent', { ...base, retryAfterSeconds: reservation.retryAfterSeconds });
+                return {
+                    outcome: 'too_frequent',
+                    retryAfterSeconds: reservation.retryAfterSeconds,
+                    window: reservation.window,
+                };
+            case 'address_cap_exceeded':
+                log('warn', 'faucet.address_cap_exceeded', { ...base, roomNcheq: reservation.roomNcheq.toString() });
+                return { outcome: 'address_cap_exceeded', roomNcheq: reservation.roomNcheq };
+            default:
+                log('warn', 'faucet.quota_exceeded', {
+                    ...base,
+                    usedNcheq: reservation.usedNcheq.toString(),
+                    limitNcheq: params.limitNcheq.toString(),
+                });
+                return { outcome: 'quota_exceeded', usedNcheq: reservation.usedNcheq, window: reservation.window };
+        }
     }
+    const withReservation = { ...base, reservationId: reservation.faucetRequestId };
+    log('info', 'faucet.reserved', {
+        ...withReservation,
+        usedNcheq: reservation.usedNcheq.toString(),
+        limitNcheq: params.limitNcheq.toString(),
+    });
     let faucet;
     try {
         faucet = await delegate();
     }
     catch (error) {
-        await markUnknownBestEffort(ledger, reservation.faucetRequestId);
+        log('warn', 'faucet.unknown', {
+            ...withReservation,
+            error: shorten(error?.message ?? String(error)),
+            note: 'faucet call threw; tokens may have been sent, so the reservation keeps counting',
+        });
+        await markUnknownBestEffort(ledger, reservation.faucetRequestId, log);
         throw error;
     }
     if (faucet.status !== 200) {
         await ledger.release(reservation.faucetRequestId);
+        log('warn', 'faucet.released', {
+            ...withReservation,
+            faucetStatus: faucet.status,
+            error: shorten(faucet.error),
+        });
         return { outcome: 'faucet_failed', status: faucet.status, error: faucet.error };
     }
     try {
         await ledger.complete(reservation.faucetRequestId);
+        log('info', 'faucet.completed', withReservation);
     }
     catch (error) {
         // The tokens were sent, so do not fail the request. The reservation stays pending and keeps counting
         // until it times out.
-        console.error(`Failed to mark faucet request ${reservation.faucetRequestId} as completed:`, error);
+        log('error', 'faucet.complete_failed', {
+            ...withReservation,
+            error: shorten(error?.message ?? String(error)),
+        });
     }
     return {
         outcome: 'credited',

package/dist/helpers/faucet-quota.js.map

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

package/dist/helpers/faucet.d.ts

@@ -1,4 +1,9 @@
 import type { ICommonErrorResponse } from '../types/authentication.js';
+/**
+ * True for a lowercase cheqd bech32 account address (20 bytes, valid checksum). Other bech32 strings with the cheqd
+ * prefix, such as 32-byte contract addresses, are not ordinary accounts and are rejected.
+ */
+export declare function isValidFaucetAddress(address: string): boolean;
 /** True if the error is the faucet call timing out or being aborted, as opposed to the faucet answering. */
 export declare function isFaucetTimeout(error: unknown): boolean;
 export declare class FaucetHelper {

package/dist/helpers/faucet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"faucet.d.ts","sourceRoot":"","sources":["../../src/helpers/faucet.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAWvE,4GAA4G;AAC5G,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAGvD;AAED,qBAAa,YAAY;WAEX,cAAc,CAC1B,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EACb,MAAM,SAAgB,EACtB,SAAS,SAAwC,GAC/C,OAAO,CAAC,oBAAoB,CAAC;CA+BhC"}
+{"version":3,"file":"faucet.d.ts","sourceRoot":"","sources":["../../src/helpers/faucet.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAcvE;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAW7D;AAED,4GAA4G;AAC5G,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAGvD;AAED,qBAAa,YAAY;WAEX,cAAc,CAC1B,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EACb,MAAM,SAAgB,EACtB,SAAS,SAAwC,GAC/C,OAAO,CAAC,oBAAoB,CAAC;CA+BhC"}

package/dist/helpers/faucet.js

@@ -1,4 +1,22 @@
+import { fromBech32 } from '@cosmjs/encoding';
 import { MINIMAL_DENOM, FAUCET_URI, FAUCET_AMOUNT, FAUCET_API_KEY, FAUCET_ACCESS_CLIENT_ID, FAUCET_ACCESS_CLIENT_SECRET, FAUCET_REQUEST_TIMEOUT_SECONDS, } from '../types/constants.js';
+const FAUCET_ADDRESS_PREFIX = 'cheqd';
+const ACCOUNT_ADDRESS_BYTES = 20;
+/**
+ * True for a lowercase cheqd bech32 account address (20 bytes, valid checksum). Other bech32 strings with the cheqd
+ * prefix, such as 32-byte contract addresses, are not ordinary accounts and are rejected.
+ */
+export function isValidFaucetAddress(address) {
+    try {
+        const { prefix, data } = fromBech32(address);
+        return (prefix === FAUCET_ADDRESS_PREFIX &&
+            data.length === ACCOUNT_ADDRESS_BYTES &&
+            address === address.toLowerCase());
+    }
+    catch {
+        return false;
+    }
+}
 /** True if the error is the faucet call timing out or being aborted, as opposed to the faucet answering. */
 export function isFaucetTimeout(error) {
     const name = error?.name;

package/dist/helpers/faucet.js.map

@@ -1 +1 @@
-{"version":3,"file":"faucet.js","sourceRoot":"","sources":["../../src/helpers/faucet.ts"],"names":[],"mappings":"AACA,OAAO,EACN,aAAa,EACb,UAAU,EACV,aAAa,EACb,cAAc,EACd,uBAAuB,EACvB,2BAA2B,EAC3B,8BAA8B,GAC9B,MAAM,uBAAuB,CAAC;AAE/B,4GAA4G;AAC5G,MAAM,UAAU,eAAe,CAAC,KAAc;IAC7C,MAAM,IAAI,GAAI,KAAkC,EAAE,IAAI,CAAC;IACvD,OAAO,IAAI,KAAK,cAAc,IAAI,IAAI,KAAK,YAAY,CAAC;AACzD,CAAC;AAED,MAAM,OAAO,YAAY;IACxB,MAAM;IACN,MAAM,CAAC,KAAK,CAAC,cAAc,CAC1B,OAAe,EACf,SAAiB,EACjB,QAAgB,EAChB,KAAa,EACb,MAAM,GAAG,aAAa,EACtB,SAAS,GAAG,8BAA8B,GAAG,IAAI;QAEjD,MAAM,SAAS,GAAG,UAAU,CAAC;QAC7B,MAAM,UAAU,GAAG;YAClB,KAAK,EAAE,aAAa;YACpB,OAAO,EAAE,OAAO;YAChB,KAAK,EAAE,KAAK;YACZ,UAAU,EAAE,SAAS;YACrB,SAAS,EAAE,QAAQ;YACnB,OAAO,EAAE,4BAA4B;YACrC,MAAM;YACN,eAAe,EAAE,KAAK;SACtB,CAAC;QACF,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,SAAS,EAAE;YACvC,OAAO,EAAE;gBACR,cAAc,EAAE,kBAAkB;gBAClC,WAAW,EAAE,cAAc;gBAC3B,qBAAqB,EAAE,uBAAuB;gBAC9C,yBAAyB,EAAE,2BAA2B;aACtD;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC;YAChC,MAAM,EAAE,MAAM;YACd,qGAAqG;YACrG,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC;SACtC,CAAC,CAAC;QACH,OAAO;YACN,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,KAAK,EAAE,MAAM,QAAQ,CAAC,IAAI,EAAE;YAC5B,IAAI,EAAE,EAAE;SACR,CAAC;IACH,CAAC;CAED"}
+{"version":3,"file":"faucet.js","sourceRoot":"","sources":["../../src/helpers/faucet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EACN,aAAa,EACb,UAAU,EACV,aAAa,EACb,cAAc,EACd,uBAAuB,EACvB,2BAA2B,EAC3B,8BAA8B,GAC9B,MAAM,uBAAuB,CAAC;AAE/B,MAAM,qBAAqB,GAAG,OAAO,CAAC;AACtC,MAAM,qBAAqB,GAAG,EAAE,CAAC;AAEjC;;;GAGG;AACH,MAAM,UAAU,oBAAoB,CAAC,OAAe;IACnD,IAAI,CAAC;QACJ,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;QAC7C,OAAO,CACN,MAAM,KAAK,qBAAqB;YAChC,IAAI,CAAC,MAAM,KAAK,qBAAqB;YACrC,OAAO,KAAK,OAAO,CAAC,WAAW,EAAE,CACjC,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,KAAK,CAAC;IACd,CAAC;AACF,CAAC;AAED,4GAA4G;AAC5G,MAAM,UAAU,eAAe,CAAC,KAAc;IAC7C,MAAM,IAAI,GAAI,KAAkC,EAAE,IAAI,CAAC;IACvD,OAAO,IAAI,KAAK,cAAc,IAAI,IAAI,KAAK,YAAY,CAAC;AACzD,CAAC;AAED,MAAM,OAAO,YAAY;IACxB,MAAM;IACN,MAAM,CAAC,KAAK,CAAC,cAAc,CAC1B,OAAe,EACf,SAAiB,EACjB,QAAgB,EAChB,KAAa,EACb,MAAM,GAAG,aAAa,EACtB,SAAS,GAAG,8BAA8B,GAAG,IAAI;QAEjD,MAAM,SAAS,GAAG,UAAU,CAAC;QAC7B,MAAM,UAAU,GAAG;YAClB,KAAK,EAAE,aAAa;YACpB,OAAO,EAAE,OAAO;YAChB,KAAK,EAAE,KAAK;YACZ,UAAU,EAAE,SAAS;YACrB,SAAS,EAAE,QAAQ;YACnB,OAAO,EAAE,4BAA4B;YACrC,MAAM;YACN,eAAe,EAAE,KAAK;SACtB,CAAC;QACF,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,SAAS,EAAE;YACvC,OAAO,EAAE;gBACR,cAAc,EAAE,kBAAkB;gBAClC,WAAW,EAAE,cAAc;gBAC3B,qBAAqB,EAAE,uBAAuB;gBAC9C,yBAAyB,EAAE,2BAA2B;aACtD;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC;YAChC,MAAM,EAAE,MAAM;YACd,qGAAqG;YACrG,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC;SACtC,CAAC,CAAC;QACH,OAAO;YACN,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,KAAK,EAAE,MAAM,QAAQ,CAAC,IAAI,EAAE;YAC5B,IAAI,EAAE,EAAE;SACR,CAAC;IACH,CAAC;CAED"}

package/dist/services/api/faucet-request.d.ts

@@ -1,11 +1,19 @@
 import type { Repository } from 'typeorm';
 import type { CustomerEntity } from '../../database/entities/customer.entity.js';
 import { FaucetRequestEntity } from '../../database/entities/faucet-request.entity.js';
-import { type FaucetQuotaLedger, type FaucetReservation, type FaucetReserveOptions } from '../../helpers/faucet-quota.js';
+import { type FaucetQuotaLedger, type FaucetQuotaWindow, type FaucetReservation, type FaucetReserveOptions } from '../../helpers/faucet-quota.js';
 export declare class FaucetRequestService implements FaucetQuotaLedger {
     faucetRequestRepository: Repository<FaucetRequestEntity>;
+    private lastRetentionCleanupAt;
     static instance: FaucetRequestService;
     constructor(repository?: Repository<FaucetRequestEntity>);
+    /**
+     * The database's clock. `createdAt` is set by the database, so every comparison (month window, minimum interval,
+     * pending timeout, settle window, retention) must use its clock too, not the application's: instances with
+     * slightly different clocks would otherwise disagree about how old a row is. `clock_timestamp()` rather than
+     * `now()`, because inside a transaction `now()` stays at the start of the transaction, before any wait for the lock.
+     */
+    private static databaseNow;
     private static pendingCutoff;
     /**
      * Total ncheq requested by the customer since `since`, using the given manager (and so its transaction).
@@ -13,6 +21,8 @@ export declare class FaucetRequestService implements FaucetQuotaLedger {
      * `pendingCutoff`, after which it is treated as abandoned.
      */
     private static sumRequestedNcheq;
+    /** Total ncheq requested for one address since `since`, excluding abandoned reservations. */
+    private static sumRecentForAddress;
     /** When the customer last made a faucet request, or null if never. */
     private static lastRequestAt;
     /**
@@ -20,6 +30,11 @@ export declare class FaucetRequestService implements FaucetQuotaLedger {
      * before any expensive work; `reserve` repeats the check under the lock so concurrent requests cannot slip through.
      */
     getSecondsUntilNextAllowed(customer: CustomerEntity, minIntervalSeconds: number, now?: Date): Promise<number>;
+    /** What the customer has requested in the current quota window, and the window itself (both on the database clock). */
+    getQuotaStatus(customer: CustomerEntity, now?: Date, pendingTimeoutSeconds?: number): Promise<{
+        usedNcheq: bigint;
+        window: FaucetQuotaWindow;
+    }>;
     /** Total ncheq requested by the customer in the current quota window. */
     getUsedNcheq(customer: CustomerEntity, now?: Date, pendingTimeoutSeconds?: number): Promise<bigint>;
     /**
@@ -28,7 +43,14 @@ export declare class FaucetRequestService implements FaucetQuotaLedger {
      * Afterwards call `complete` when the faucet confirms, `release` if it definitely failed, or `markUnknown`
      * if the call threw.
      */
-    reserve(customer: CustomerEntity, address: string, amountNcheq: bigint, { limitNcheq, minIntervalSeconds, pendingTimeoutSeconds, }: FaucetReserveOptions, now?: Date): Promise<FaucetReservation>;
+    reserve(customer: CustomerEntity, address: string, amountNcheq: bigint, { limitNcheq, minIntervalSeconds, pendingTimeoutSeconds, addressCap, }: FaucetReserveOptions, nowOverride?: Date): Promise<FaucetReservation>;
+    /** Deletes faucet request rows older than the retention period. Returns how many were deleted. */
+    runRetentionCleanup(now?: Date, retentionMonths?: number): Promise<number>;
+    /**
+     * Runs the retention cleanup in the background, at most once an hour per process. Called from normal requests
+     * because Studio has no scheduler; it never delays or fails the request that triggered it.
+     */
+    private maybeRunRetentionCleanup;
     /** Releases a reservation, e.g. when the upstream faucet reported that it did not credit the account. */
     release(faucetRequestId: string): Promise<void>;
     /** The faucet confirmed the credit. Also applies to a reservation that was already marked abandoned. */

package/dist/services/api/faucet-request.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"faucet-request.d.ts","sourceRoot":"","sources":["../../../src/services/api/faucet-request.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAiB,UAAU,EAAE,MAAM,SAAS,CAAC;AACzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAC;AACjF,OAAO,EAAE,mBAAmB,EAAE,MAAM,kDAAkD,CAAC;AAGvF,OAAO,EAIN,KAAK,iBAAiB,EACtB,KAAK,iBAAiB,EACtB,KAAK,oBAAoB,EACzB,MAAM,+BAA+B,CAAC;AAEvC,qBAAa,oBAAqB,YAAW,iBAAiB;IACtD,uBAAuB,EAAE,UAAU,CAAC,mBAAmB,CAAC,CAAC;IAEhE,OAAc,QAAQ,uBAA8B;gBAExC,UAAU,CAAC,EAAE,UAAU,CAAC,mBAAmB,CAAC;IAKxD,OAAO,CAAC,MAAM,CAAC,aAAa;IAI5B;;;;OAIG;mBACkB,iBAAiB;IAmBtC,sEAAsE;mBACjD,aAAa;IAUlC;;;OAGG;IACU,0BAA0B,CACtC,QAAQ,EAAE,cAAc,EACxB,kBAAkB,EAAE,MAAM,EAC1B,GAAG,GAAE,IAAiB,GACpB,OAAO,CAAC,MAAM,CAAC;IASlB,yEAAyE;IAC5D,YAAY,CACxB,QAAQ,EAAE,cAAc,EACxB,GAAG,GAAE,IAAiB,EACtB,qBAAqB,GAAE,MAAuC,GAC5D,OAAO,CAAC,MAAM,CAAC;IAUlB;;;;;OAKG;IACU,OAAO,CACnB,QAAQ,EAAE,cAAc,EACxB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,EACC,UAAU,EACV,kBAAsB,EACtB,qBAAsD,GACtD,EAAE,oBAAoB,EACvB,GAAG,GAAE,IAAiB,GACpB,OAAO,CAAC,iBAAiB,CAAC;IA8C7B,yGAAyG;IAC5F,OAAO,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5D,wGAAwG;IAC3F,QAAQ,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAO7D,uGAAuG;IAC1F,WAAW,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAGhE"}
+{"version":3,"file":"faucet-request.d.ts","sourceRoot":"","sources":["../../../src/services/api/faucet-request.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAiB,UAAU,EAAE,MAAM,SAAS,CAAC;AACzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAC;AACjF,OAAO,EAAE,mBAAmB,EAAE,MAAM,kDAAkD,CAAC;AAGvF,OAAO,EAON,KAAK,iBAAiB,EACtB,KAAK,iBAAiB,EACtB,KAAK,iBAAiB,EACtB,KAAK,oBAAoB,EACzB,MAAM,+BAA+B,CAAC;AAKvC,qBAAa,oBAAqB,YAAW,iBAAiB;IACtD,uBAAuB,EAAE,UAAU,CAAC,mBAAmB,CAAC,CAAC;IAChE,OAAO,CAAC,sBAAsB,CAAK;IAEnC,OAAc,QAAQ,uBAA8B;gBAExC,UAAU,CAAC,EAAE,UAAU,CAAC,mBAAmB,CAAC;IAKxD;;;;;OAKG;mBACkB,WAAW;IAMhC,OAAO,CAAC,MAAM,CAAC,aAAa;IAI5B;;;;OAIG;mBACkB,iBAAiB;IAmBtC,6FAA6F;mBACxE,mBAAmB;IAiBxC,sEAAsE;mBACjD,aAAa;IAUlC;;;OAGG;IACU,0BAA0B,CACtC,QAAQ,EAAE,cAAc,EACxB,kBAAkB,EAAE,MAAM,EAC1B,GAAG,CAAC,EAAE,IAAI,GACR,OAAO,CAAC,MAAM,CAAC;IAWlB,uHAAuH;IAC1G,cAAc,CAC1B,QAAQ,EAAE,cAAc,EACxB,GAAG,CAAC,EAAE,IAAI,EACV,qBAAqB,GAAE,MAAuC,GAC5D,OAAO,CAAC;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,iBAAiB,CAAA;KAAE,CAAC;IAa5D,yEAAyE;IAC5D,YAAY,CACxB,QAAQ,EAAE,cAAc,EACxB,GAAG,CAAC,EAAE,IAAI,EACV,qBAAqB,GAAE,MAAuC,GAC5D,OAAO,CAAC,MAAM,CAAC;IAIlB;;;;;OAKG;IACU,OAAO,CACnB,QAAQ,EAAE,cAAc,EACxB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,EACC,UAAU,EACV,kBAAsB,EACtB,qBAAsD,EACtD,UAAU,GACV,EAAE,oBAAoB,EACvB,WAAW,CAAC,EAAE,IAAI,GAChB,OAAO,CAAC,iBAAiB,CAAC;IAyE7B,kGAAkG;IACrF,mBAAmB,CAC/B,GAAG,CAAC,EAAE,IAAI,EACV,eAAe,GAAE,MAAwC,GACvD,OAAO,CAAC,MAAM,CAAC;IAYlB;;;OAGG;IACH,OAAO,CAAC,wBAAwB;IAiBhC,yGAAyG;IAC5F,OAAO,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5D,wGAAwG;IAC3F,QAAQ,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAO7D,uGAAuG;IAC1F,WAAW,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAGhE"}

package/dist/services/api/faucet-request.js

@@ -1,14 +1,29 @@
 import { FaucetRequestEntity } from '../../database/entities/faucet-request.entity.js';
 import { Connection } from '../../database/connection/connection.js';
-import { FAUCET_PENDING_TIMEOUT_SECONDS } from '../../types/constants.js';
-import { fitsInQuota, getFaucetQuotaWindow, secondsUntilNextRequest, } from '../../helpers/faucet-quota.js';
+import { FAUCET_PENDING_TIMEOUT_SECONDS, FAUCET_REQUEST_RETENTION_MONTHS } from '../../types/constants.js';
+import { addressRoomNcheq, fitsInQuota, getFaucetQuotaWindow, logFaucetEvent, retentionCutoff, secondsUntilNextRequest, } from '../../helpers/faucet-quota.js';
+// Retention cleanup runs inside normal requests (Studio has no scheduler), at most this often per process
+const RETENTION_CLEANUP_INTERVAL_MS = 60 * 60 * 1000;
 export class FaucetRequestService {
     faucetRequestRepository;
+    lastRetentionCleanupAt = 0;
     static instance = new FaucetRequestService();
     constructor(repository) {
         this.faucetRequestRepository =
             repository ?? Connection.instance.dbConnection.getRepository(FaucetRequestEntity);
     }
+    /**
+     * The database's clock. `createdAt` is set by the database, so every comparison (month window, minimum interval,
+     * pending timeout, settle window, retention) must use its clock too, not the application's: instances with
+     * slightly different clocks would otherwise disagree about how old a row is. `clock_timestamp()` rather than
+     * `now()`, because inside a transaction `now()` stays at the start of the transaction, before any wait for the lock.
+     */
+    static async databaseNow(manager) {
+        if (manager.connection.options.type !== 'postgres')
+            return new Date();
+        const [row] = await manager.query('SELECT clock_timestamp() AS now');
+        return new Date(row.now);
+    }
     static pendingCutoff(now, pendingTimeoutSeconds) {
         return new Date(now.getTime() - pendingTimeoutSeconds * 1000);
     }
@@ -27,6 +42,18 @@ export class FaucetRequestService {
             .getRawOne();
         return BigInt(row?.total ?? '0');
     }
+    /** Total ncheq requested for one address since `since`, excluding abandoned reservations. */
+    static async sumRecentForAddress(manager, customerId, address, since) {
+        const row = await manager
+            .createQueryBuilder(FaucetRequestEntity, 'request')
+            .select('COALESCE(SUM(request.amountNcheq), 0)', 'total')
+            .where('request.customerId = :customerId', { customerId })
+            .andWhere('request.address = :address', { address })
+            .andWhere('request.createdAt >= :since', { since })
+            .andWhere(`request.status <> 'abandoned'`)
+            .getRawOne();
+        return BigInt(row?.total ?? '0');
+    }
     /** When the customer last made a faucet request, or null if never. */
     static async lastRequestAt(manager, customerId) {
         const row = await manager
@@ -41,16 +68,24 @@ export class FaucetRequestService {
      * Seconds the customer must still wait before their next request (0 if allowed). This is a cheap read taken
      * before any expensive work; `reserve` repeats the check under the lock so concurrent requests cannot slip through.
      */
-    async getSecondsUntilNextAllowed(customer, minIntervalSeconds, now = new Date()) {
+    async getSecondsUntilNextAllowed(customer, minIntervalSeconds, now) {
         if (minIntervalSeconds <= 0)
             return 0;
-        const last = await FaucetRequestService.lastRequestAt(this.faucetRequestRepository.manager, customer.customerId);
-        return secondsUntilNextRequest(last, minIntervalSeconds, now);
+        const manager = this.faucetRequestRepository.manager;
+        const last = await FaucetRequestService.lastRequestAt(manager, customer.customerId);
+        return secondsUntilNextRequest(last, minIntervalSeconds, now ?? (await FaucetRequestService.databaseNow(manager)));
+    }
+    /** What the customer has requested in the current quota window, and the window itself (both on the database clock). */
+    async getQuotaStatus(customer, now, pendingTimeoutSeconds = FAUCET_PENDING_TIMEOUT_SECONDS) {
+        const manager = this.faucetRequestRepository.manager;
+        const at = now ?? (await FaucetRequestService.databaseNow(manager));
+        const window = getFaucetQuotaWindow(at);
+        const usedNcheq = await FaucetRequestService.sumRequestedNcheq(manager, customer.customerId, window.start, FaucetRequestService.pendingCutoff(at, pendingTimeoutSeconds));
+        return { usedNcheq, window };
     }
     /** Total ncheq requested by the customer in the current quota window. */
-    async getUsedNcheq(customer, now = new Date(), pendingTimeoutSeconds = FAUCET_PENDING_TIMEOUT_SECONDS) {
-        const { start } = getFaucetQuotaWindow(now);
-        return FaucetRequestService.sumRequestedNcheq(this.faucetRequestRepository.manager, customer.customerId, start, FaucetRequestService.pendingCutoff(now, pendingTimeoutSeconds));
+    async getUsedNcheq(customer, now, pendingTimeoutSeconds = FAUCET_PENDING_TIMEOUT_SECONDS) {
+        return (await this.getQuotaStatus(customer, now, pendingTimeoutSeconds)).usedNcheq;
     }
     /**
      * Atomically checks the customer's monthly quota and, if the amount fits, records it as pending.
@@ -58,14 +93,16 @@ export class FaucetRequestService {
      * Afterwards call `complete` when the faucet confirms, `release` if it definitely failed, or `markUnknown`
      * if the call threw.
      */
-    async reserve(customer, address, amountNcheq, { limitNcheq, minIntervalSeconds = 0, pendingTimeoutSeconds = FAUCET_PENDING_TIMEOUT_SECONDS, }, now = new Date()) {
-        const window = getFaucetQuotaWindow(now);
-        return this.faucetRequestRepository.manager.transaction(async (manager) => {
+    async reserve(customer, address, amountNcheq, { limitNcheq, minIntervalSeconds = 0, pendingTimeoutSeconds = FAUCET_PENDING_TIMEOUT_SECONDS, addressCap, }, nowOverride) {
+        const reservation = await this.faucetRequestRepository.manager.transaction(async (manager) => {
             if (manager.connection.options.type === 'postgres') {
                 await manager.query('SELECT pg_advisory_xact_lock(hashtext($1))', [
                     `faucet-quota:${customer.customerId}`,
                 ]);
             }
+            // Taken after the lock, so it is current even if this request had to wait for another one
+            const now = nowOverride ?? (await FaucetRequestService.databaseNow(manager));
+            const window = getFaucetQuotaWindow(now);
             if (minIntervalSeconds > 0) {
                 const retryAfterSeconds = secondsUntilNextRequest(await FaucetRequestService.lastRequestAt(manager, customer.customerId), minIntervalSeconds, now);
                 if (retryAfterSeconds > 0) {
@@ -74,7 +111,7 @@ export class FaucetRequestService {
             }
             // Reservations that were never confirmed stop counting; mark them so the history shows why
             const pendingCutoff = FaucetRequestService.pendingCutoff(now, pendingTimeoutSeconds);
-            await manager
+            const swept = await manager
                 .createQueryBuilder()
                 .update(FaucetRequestEntity)
                 .set({ status: 'abandoned' })
@@ -82,13 +119,65 @@ export class FaucetRequestService {
                 .andWhere(`status = 'pending'`)
                 .andWhere('createdAt < :pendingCutoff', { pendingCutoff })
                 .execute();
+            if (swept.affected) {
+                logFaucetEvent('warn', 'faucet.reservations_abandoned', {
+                    customerId: customer.customerId,
+                    count: swept.affected,
+                    pendingTimeoutSeconds,
+                });
+            }
             const usedNcheq = await FaucetRequestService.sumRequestedNcheq(manager, customer.customerId, window.start, pendingCutoff);
             if (!fitsInQuota(usedNcheq, amountNcheq, limitNcheq)) {
                 return { reserved: false, reason: 'quota_exceeded', usedNcheq, window };
             }
+            // The balance the caller read may not include transfers still on their way, so subtract recent requests
+            // for this address. Done under the lock, this stops simultaneous requests each getting the full room.
+            if (addressCap) {
+                const inFlightNcheq = await FaucetRequestService.sumRecentForAddress(manager, customer.customerId, address, new Date(now.getTime() - addressCap.settleSeconds * 1000));
+                const roomNcheq = addressRoomNcheq(addressCap.capNcheq, addressCap.currentBalanceNcheq, inFlightNcheq);
+                if (amountNcheq > roomNcheq) {
+                    return { reserved: false, reason: 'address_cap_exceeded', roomNcheq, window };
+                }
+            }
             const entity = await manager.save(new FaucetRequestEntity(customer, address, amountNcheq));
             return { reserved: true, faucetRequestId: entity.faucetRequestId, usedNcheq, window };
         });
+        this.maybeRunRetentionCleanup();
+        return reservation;
+    }
+    /** Deletes faucet request rows older than the retention period. Returns how many were deleted. */
+    async runRetentionCleanup(now, retentionMonths = FAUCET_REQUEST_RETENTION_MONTHS) {
+        if (retentionMonths <= 0)
+            return 0;
+        now ??= await FaucetRequestService.databaseNow(this.faucetRequestRepository.manager);
+        const result = await this.faucetRequestRepository
+            .createQueryBuilder()
+            .delete()
+            .from(FaucetRequestEntity)
+            .where('createdAt < :cutoff', { cutoff: retentionCutoff(now, retentionMonths) })
+            .execute();
+        return result.affected ?? 0;
+    }
+    /**
+     * Runs the retention cleanup in the background, at most once an hour per process. Called from normal requests
+     * because Studio has no scheduler; it never delays or fails the request that triggered it.
+     */
+    maybeRunRetentionCleanup() {
+        if (FAUCET_REQUEST_RETENTION_MONTHS <= 0)
+            return;
+        // This only throttles how often this process runs the cleanup, so the process clock is the right one here
+        const processNow = Date.now();
+        if (processNow - this.lastRetentionCleanupAt < RETENTION_CLEANUP_INTERVAL_MS)
+            return;
+        this.lastRetentionCleanupAt = processNow;
+        this.runRetentionCleanup()
+            .then((deleted) => {
+            if (deleted > 0)
+                logFaucetEvent('info', 'faucet.retention_deleted', { deleted });
+        })
+            .catch((error) => logFaucetEvent('error', 'faucet.retention_failed', {
+            error: error?.message ?? String(error),
+        }));
     }
     /** Releases a reservation, e.g. when the upstream faucet reported that it did not credit the account. */
     async release(faucetRequestId) {
@@ -96,7 +185,7 @@ export class FaucetRequestService {
     }
     /** The faucet confirmed the credit. Also applies to a reservation that was already marked abandoned. */
     async complete(faucetRequestId) {
-        await this.faucetRequestRepository.update({ faucetRequestId }, { status: 'completed', completedAt: new Date() });
+        await this.faucetRequestRepository.update({ faucetRequestId }, { status: 'completed', completedAt: () => 'now()' });
     }
     /** The faucet call threw, so tokens may have been sent: keep counting this reservation permanently. */
     async markUnknown(faucetRequestId) {