@1sat/wallet-server 0.0.1 → 0.0.2

package/dist/accounts/index.d.ts

@@ -1,8 +1,5 @@
-export type { Account, AccountsConfig, IdentityKey, NewPayment, Payment, PaymentQuote, } from './types';
-export { AccountsRepo } from './repo';
-export { ACCOUNTS_TABLE, PAYMENTS_TABLE, runMigrations, up, down, } from './migrations';
-export { measureUsedBytes } from './metering';
-export { BYTES_PER_GB, computeCapacity, priceForDeficit, quoteForAccount, type CapacityInput, type CapacityResult, } from './pricing';
-export { BRC0121_HEADERS, Brc0121PaymentError, internalizePayment, parseBrc0121Payment, readBrc0121Headers, validateBrc0121Payment, type Brc0121PaymentHeaders, type ParsedPayment, type ValidatePaymentInput, type ValidatePaymentResult, } from './paymentValidation';
-export { AccountsGate, type AccountsMiddlewareDeps, type BillabilityCheckInput, type BillabilityDecision, } from './middleware';
+export type { AccountStatusResponse, AccountsConfig, IdentityKey, NextPaymentDerivation, } from './types';
+export { BYTES_PER_GB, computeCapacity, quoteRefundedCharge, refundCreditSats, type CapacityInput, type CapacityResult, type RefundedQuote, type RefundedQuoteInput, } from './pricing';
+export { type AccountsMiddlewareDeps, accountsCapacityGate, ERR_INSUFFICIENT_CAPACITY, nextPaymentDerivation, } from './middleware';
+export { type PaymentRecord, PAYMENT_LABEL, blockLabel, bytesLabel, countPaymentsForPayer, latestActivePaymentForPayer, listPaymentsForPayer, payerLabel, } from './queries';
 //# sourceMappingURL=index.d.ts.map

package/dist/accounts/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/accounts/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACX,OAAO,EACP,cAAc,EACd,WAAW,EACX,UAAU,EACV,OAAO,EACP,YAAY,GACZ,MAAM,SAAS,CAAA;AAEhB,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAA;AACrC,OAAO,EACN,cAAc,EACd,cAAc,EACd,aAAa,EACb,EAAE,EACF,IAAI,GACJ,MAAM,cAAc,CAAA;AACrB,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAC7C,OAAO,EACN,YAAY,EACZ,eAAe,EACf,eAAe,EACf,eAAe,EACf,KAAK,aAAa,EAClB,KAAK,cAAc,GACnB,MAAM,WAAW,CAAA;AAClB,OAAO,EACN,eAAe,EACf,mBAAmB,EACnB,kBAAkB,EAClB,mBAAmB,EACnB,kBAAkB,EAClB,sBAAsB,EACtB,KAAK,qBAAqB,EAC1B,KAAK,aAAa,EAClB,KAAK,oBAAoB,EACzB,KAAK,qBAAqB,GAC1B,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EACN,YAAY,EACZ,KAAK,sBAAsB,EAC3B,KAAK,qBAAqB,EAC1B,KAAK,mBAAmB,GACxB,MAAM,cAAc,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/accounts/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACX,qBAAqB,EACrB,cAAc,EACd,WAAW,EACX,qBAAqB,GACrB,MAAM,SAAS,CAAA;AAEhB,OAAO,EACN,YAAY,EACZ,eAAe,EACf,mBAAmB,EACnB,gBAAgB,EAChB,KAAK,aAAa,EAClB,KAAK,cAAc,EACnB,KAAK,aAAa,EAClB,KAAK,kBAAkB,GACvB,MAAM,WAAW,CAAA;AAClB,OAAO,EACN,KAAK,sBAAsB,EAC3B,oBAAoB,EACpB,yBAAyB,EACzB,qBAAqB,GACrB,MAAM,cAAc,CAAA;AACrB,OAAO,EACN,KAAK,aAAa,EAClB,aAAa,EACb,UAAU,EACV,UAAU,EACV,qBAAqB,EACrB,2BAA2B,EAC3B,oBAAoB,EACpB,UAAU,GACV,MAAM,WAAW,CAAA"}

package/dist/accounts/index.js

@@ -1,7 +1,4 @@
-export { AccountsRepo } from './repo';
-export { ACCOUNTS_TABLE, PAYMENTS_TABLE, runMigrations, up, down, } from './migrations';
-export { measureUsedBytes } from './metering';
-export { BYTES_PER_GB, computeCapacity, priceForDeficit, quoteForAccount, } from './pricing';
-export { BRC0121_HEADERS, Brc0121PaymentError, internalizePayment, parseBrc0121Payment, readBrc0121Headers, validateBrc0121Payment, } from './paymentValidation';
-export { AccountsGate, } from './middleware';
+export { BYTES_PER_GB, computeCapacity, quoteRefundedCharge, refundCreditSats, } from './pricing';
+export { accountsCapacityGate, ERR_INSUFFICIENT_CAPACITY, nextPaymentDerivation, } from './middleware';
+export { PAYMENT_LABEL, blockLabel, bytesLabel, countPaymentsForPayer, latestActivePaymentForPayer, listPaymentsForPayer, payerLabel, } from './queries';
 //# sourceMappingURL=index.js.map

package/dist/accounts/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/accounts/index.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAA;AACrC,OAAO,EACN,cAAc,EACd,cAAc,EACd,aAAa,EACb,EAAE,EACF,IAAI,GACJ,MAAM,cAAc,CAAA;AACrB,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAC7C,OAAO,EACN,YAAY,EACZ,eAAe,EACf,eAAe,EACf,eAAe,GAGf,MAAM,WAAW,CAAA;AAClB,OAAO,EACN,eAAe,EACf,mBAAmB,EACnB,kBAAkB,EAClB,mBAAmB,EACnB,kBAAkB,EAClB,sBAAsB,GAKtB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EACN,YAAY,GAIZ,MAAM,cAAc,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/accounts/index.ts"],"names":[],"mappings":"AAOA,OAAO,EACN,YAAY,EACZ,eAAe,EACf,mBAAmB,EACnB,gBAAgB,GAKhB,MAAM,WAAW,CAAA;AAClB,OAAO,EAEN,oBAAoB,EACpB,yBAAyB,EACzB,qBAAqB,GACrB,MAAM,cAAc,CAAA;AACrB,OAAO,EAEN,aAAa,EACb,UAAU,EACV,UAAU,EACV,qBAAqB,EACrB,2BAA2B,EAC3B,oBAAoB,EACpB,UAAU,GACV,MAAM,WAAW,CAAA"}

package/dist/accounts/middleware.d.ts

@@ -1,41 +1,40 @@
-import type { WalletInterface } from '@bsv/sdk';
-import type { Knex } from 'knex';
-import type { ResolvedIdentity, WalletStorageProvider } from '../types';
-import { AccountsRepo } from './repo';
-import type { AccountsConfig, IdentityKey } from './types';
+/**
+ * Express middleware for the accounts layer.
+ *
+ * `accountsCapacityGate(deps)` — runs between auth and dispatch. For
+ * billable methods (createAction / processAction), inspects the call for a
+ * valid self-payment output. If over-capacity, lets the call through only
+ * if a valid self-payment is present. If a valid self-payment is present on
+ * a `processAction`, schedules an auto-internalize after the response so
+ * the received payment gets recorded into the server's own wallet with the
+ * accounts-ledger labels. No separate `/account/payment` endpoint — one
+ * client call is enough.
+ */
+import { type WalletInterface } from '@bsv/sdk';
+import type { NextFunction, Request, Response } from 'express';
+import type { WalletStorageProvider } from '../types';
+import type { AccountsConfig, IdentityKey, NextPaymentDerivation } from './types';
+/**
+ * Server-issued next-payment derivation for an identity. Prefix is constant;
+ * suffix is the monotonic count of payments already recorded for the
+ * identity (first payment uses "0").
+ */
+export declare function nextPaymentDerivation(identityKey: IdentityKey, wallet: WalletInterface): Promise<NextPaymentDerivation>;
 export interface AccountsMiddlewareDeps {
     config: AccountsConfig;
     walletStorage: WalletStorageProvider;
-    knex: Knex;
     wallet: WalletInterface;
     serverIdentityKey: IdentityKey;
     /** Returns the current chain tip block height. */
     currentBlock: () => Promise<number>;
 }
-export interface BillabilityCheckInput {
-    method: string;
-    identity: ResolvedIdentity;
-    request: Request;
-    id: string | number | null;
-}
-export type BillabilityDecision = {
-    type: 'allow';
-} | {
-    type: 'blocked';
-    response: Response;
-};
+/** JSON-RPC error code for "insufficient storage capacity". */
+export declare const ERR_INSUFFICIENT_CAPACITY = -32005;
 /**
- * Gate that runs before dispatch for each JSON-RPC call. Decides whether to
- * allow the call, to return a 402 challenge, or to accept a payment and then
- * allow.
+ * Express middleware. Runs between auth and dispatch. For billable methods
+ * when the caller is over capacity, short-circuits with 507 + quota info.
+ * On processAction for a valid self-payment, schedules a post-response
+ * auto-internalize so the payment is recorded in the server's wallet.
  */
-export declare class AccountsGate {
-    private readonly deps;
-    readonly repo: AccountsRepo;
-    private readonly freeKeys;
-    constructor(deps: AccountsMiddlewareDeps);
-    check(input: BillabilityCheckInput): Promise<BillabilityDecision>;
-    private resolveUserId;
-    private buildChallenge;
-}
+export declare function accountsCapacityGate(deps: AccountsMiddlewareDeps): (req: Request, res: Response, next: NextFunction) => Promise<void | Response<any, Record<string, any>>>;
 //# sourceMappingURL=middleware.d.ts.map

package/dist/accounts/middleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../src/accounts/middleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAE/C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAEhC,OAAO,KAAK,EAEX,gBAAgB,EAChB,qBAAqB,EACrB,MAAM,UAAU,CAAA;AASjB,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAA;AACrC,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAE1D,MAAM,WAAW,sBAAsB;IACtC,MAAM,EAAE,cAAc,CAAA;IACtB,aAAa,EAAE,qBAAqB,CAAA;IACpC,IAAI,EAAE,IAAI,CAAA;IACV,MAAM,EAAE,eAAe,CAAA;IACvB,iBAAiB,EAAE,WAAW,CAAA;IAC9B,kDAAkD;IAClD,YAAY,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAA;CACnC;AAED,MAAM,WAAW,qBAAqB;IACrC,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,gBAAgB,CAAA;IAC1B,OAAO,EAAE,OAAO,CAAA;IAChB,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;CAC1B;AAED,MAAM,MAAM,mBAAmB,GAC5B;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,GACjB;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,QAAQ,EAAE,QAAQ,CAAA;CAAE,CAAA;AAE1C;;;;GAIG;AACH,qBAAa,YAAY;IAIZ,OAAO,CAAC,QAAQ,CAAC,IAAI;IAHjC,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAA;IAC3B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAkB;gBAEd,IAAI,EAAE,sBAAsB;IAQnD,KAAK,CAAC,KAAK,EAAE,qBAAqB,GAAG,OAAO,CAAC,mBAAmB,CAAC;YAyEzD,aAAa;IAO3B,OAAO,CAAC,cAAc;CAmCtB"}
+{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../src/accounts/middleware.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAA0B,KAAK,eAAe,EAAS,MAAM,UAAU,CAAA;AAC9E,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAE9D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAA;AAUrD,OAAO,KAAK,EACX,cAAc,EACd,WAAW,EACX,qBAAqB,EACrB,MAAM,SAAS,CAAA;AAsEhB;;;;GAIG;AACH,wBAAsB,qBAAqB,CAC1C,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,eAAe,GACrB,OAAO,CAAC,qBAAqB,CAAC,CAMhC;AAED,MAAM,WAAW,sBAAsB;IACtC,MAAM,EAAE,cAAc,CAAA;IACtB,aAAa,EAAE,qBAAqB,CAAA;IACpC,MAAM,EAAE,eAAe,CAAA;IACvB,iBAAiB,EAAE,WAAW,CAAA;IAC9B,kDAAkD;IAClD,YAAY,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAA;CACnC;AAID,+DAA+D;AAC/D,eAAO,MAAM,yBAAyB,SAAS,CAAA;AA4M/C;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,sBAAsB,IAMlD,KAAK,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,wDAoH7D"}

package/dist/accounts/middleware.js

@@ -1,137 +1,319 @@
-import { Random, Utils } from '@bsv/sdk';
+/**
+ * Express middleware for the accounts layer.
+ *
+ * `accountsCapacityGate(deps)` — runs between auth and dispatch. For
+ * billable methods (createAction / processAction), inspects the call for a
+ * valid self-payment output. If over-capacity, lets the call through only
+ * if a valid self-payment is present. If a valid self-payment is present on
+ * a `processAction`, schedules an auto-internalize after the response so
+ * the received payment gets recorded into the server's own wallet with the
+ * accounts-ledger labels. No separate `/account/payment` endpoint — one
+ * client call is enough.
+ */
+import { P2PKH, PublicKey, Utils } from '@bsv/sdk';
 import { isBillableMethod } from '../dispatch';
-import { measureUsedBytes } from './metering';
-import { Brc0121PaymentError, internalizePayment, parseBrc0121Payment, readBrc0121Headers, } from './paymentValidation';
-import { BYTES_PER_GB, computeCapacity, priceForDeficit } from './pricing';
-import { AccountsRepo } from './repo';
+import { quoteRefundedCharge } from './pricing';
+import { PAYMENT_LABEL, blockLabel, bytesLabel, countPaymentsForPayer, latestActivePaymentForPayer, payerLabel, } from './queries';
+/** BRC-29 protocol ID for wallet payments (matches @1sat/types constant). */
+const BRC29_PROTOCOL_ID = [2, '3241645161d8'];
+/** Static derivation prefix tag (before base64 encoding). */
+const PAYMENT_DERIVATION_PREFIX_TAG = 'wallet-storage';
+/** Cap on non-change outputs allowed in a bypassed createAction, to stop
+ * clients from smuggling unrelated work into the payment tx. */
+const MAX_OUTPUTS_IN_BYPASSED_CREATE_ACTION = 2;
+function toBase64Prefix(prefix) {
+    return Utils.toBase64(Array.from(new TextEncoder().encode(prefix)));
+}
+function toBase64Suffix(index) {
+    return Utils.toBase64([
+        (index >>> 24) & 0xff,
+        (index >>> 16) & 0xff,
+        (index >>> 8) & 0xff,
+        index & 0xff,
+    ]);
+}
+/**
+ * Server-issued next-payment derivation for an identity. Prefix is constant;
+ * suffix is the monotonic count of payments already recorded for the
+ * identity (first payment uses "0").
+ */
+export async function nextPaymentDerivation(identityKey, wallet) {
+    const count = await countPaymentsForPayer(wallet, identityKey);
+    return {
+        derivationPrefix: toBase64Prefix(PAYMENT_DERIVATION_PREFIX_TAG),
+        derivationSuffix: toBase64Suffix(count),
+    };
+}
+/** JSON-RPC error code for "insufficient storage capacity". */
+export const ERR_INSUFFICIENT_CAPACITY = -32005;
 /**
- * Gate that runs before dispatch for each JSON-RPC call. Decides whether to
- * allow the call, to return a 402 challenge, or to accept a payment and then
- * allow.
+ * Derive the P2PKH locking script that the sender is expected to pay to for
+ * the given derivation suffix. Uses the server wallet's BRC-29 key
+ * derivation — trust rooted entirely in server-side state.
  */
-export class AccountsGate {
-    deps;
-    repo;
-    freeKeys;
-    constructor(deps) {
-        this.deps = deps;
-        this.repo = new AccountsRepo(deps.knex);
-        this.freeKeys = new Set([
-            deps.serverIdentityKey,
-            ...(deps.config.freeIdentityKeys ?? []),
-        ]);
+async function deriveExpectedPaymentScript(serverWallet, senderIdentityKey, expected) {
+    const { publicKey } = await serverWallet.getPublicKey({
+        protocolID: BRC29_PROTOCOL_ID,
+        keyID: `${expected.derivationPrefix} ${expected.derivationSuffix}`,
+        counterparty: senderIdentityKey,
+        forSelf: true,
+    });
+    const address = PublicKey.fromString(publicKey).toAddress();
+    return new P2PKH().lock(address).toHex();
+}
+/**
+ * Returns match info (output index + satoshis) iff this createAction
+ * describes a valid self-payment: has the `account-payment:<serverIdentity>`
+ * label, bounded outputs, one output matching the server's expected BRC-29
+ * script with satoshis ≥ minSats.
+ *
+ * Client-supplied customInstructions are never trusted — the expected script
+ * is derived purely from server state (identity keys + next suffix).
+ */
+async function matchCreateActionPayment(params, senderIdentityKey, serverIdentityKey, serverWallet, expected, minSats) {
+    const args = (params?.[1] ?? {});
+    const labels = Array.isArray(args.labels) ? args.labels : [];
+    const expectedLabel = `account-payment:${serverIdentityKey}`;
+    if (!labels.includes(expectedLabel))
+        return undefined;
+    const outputs = Array.isArray(args.outputs)
+        ? args.outputs
+        : [];
+    if (outputs.length === 0 ||
+        outputs.length > MAX_OUTPUTS_IN_BYPASSED_CREATE_ACTION) {
+        return undefined;
+    }
+    let expectedScript;
+    try {
+        expectedScript = await deriveExpectedPaymentScript(serverWallet, senderIdentityKey, expected);
+    }
+    catch {
+        return undefined;
     }
-    async check(input) {
-        if (!this.deps.config.enabled)
-            return { type: 'allow' };
-        if (!isBillableMethod(input.method))
-            return { type: 'allow' };
-        if (this.freeKeys.has(input.identity.identityKey))
-            return { type: 'allow' };
-        const userId = await this.resolveUserId(input.identity.identityKey);
-        if (userId == null) {
-            // No wallet-toolbox user yet means zero bytes stored. Allow the first
-            // billable request so the user row can be created; metering starts
-            // from the next request.
-            return { type: 'allow' };
+    for (let i = 0; i < outputs.length; i++) {
+        const output = outputs[i];
+        if (typeof output.lockingScript === 'string' &&
+            typeof output.satoshis === 'number' &&
+            output.lockingScript === expectedScript &&
+            output.satoshis >= minSats) {
+            return { outputIndex: i, satoshis: output.satoshis };
         }
-        const currentBlock = await this.deps.currentBlock();
-        const used = await measureUsedBytes(this.deps.knex, userId);
-        const paidBytes = await this.repo.sumUnexpiredBytes(input.identity.identityKey, currentBlock);
-        const capacity = computeCapacity({
-            baselineBytes: this.deps.config.baselineBytes,
-            paidBytes,
-            usedBytes: used,
+    }
+    return undefined;
+}
+/**
+ * Returns match info iff this processAction refers to an action whose
+ * stored outputs contain a valid self-payment to the server. The action
+ * must belong to the authenticated user.
+ */
+async function matchProcessActionPayment(params, senderIdentityKey, userId, serverWallet, walletStorage, expected, minSats) {
+    const args = (params?.[1] ?? {});
+    if (typeof args.reference !== 'string' || args.reference.length === 0) {
+        return undefined;
+    }
+    const storage = walletStorage;
+    let transactionId;
+    try {
+        const txs = await storage.findTransactions({
+            partial: { reference: args.reference, userId },
+            noRawTx: true,
         });
-        if (capacity.deficitBytes <= 0)
-            return { type: 'allow' };
-        const paymentHeaders = readBrc0121Headers(input.request);
-        if (!paymentHeaders) {
-            return {
-                type: 'blocked',
-                response: this.buildChallenge(input.id, capacity.deficitBytes),
-            };
+        transactionId = txs[0]?.transactionId;
+    }
+    catch {
+        return undefined;
+    }
+    if (transactionId == null)
+        return undefined;
+    let outputs;
+    try {
+        outputs = await storage.findOutputs({
+            partial: { transactionId, userId },
+        });
+    }
+    catch {
+        return undefined;
+    }
+    let expectedScriptHex;
+    try {
+        expectedScriptHex = await deriveExpectedPaymentScript(serverWallet, senderIdentityKey, expected);
+    }
+    catch {
+        return undefined;
+    }
+    for (const output of outputs) {
+        if (!output.lockingScript || output.satoshis < minSats)
+            continue;
+        const storedHex = Utils.toHex(output.lockingScript);
+        if (storedHex === expectedScriptHex) {
+            return { outputIndex: output.vout, satoshis: output.satoshis };
         }
-        // A payment is attached. Validate and credit before allowing the retry.
-        const quote = priceForDeficit(capacity.deficitBytes, this.deps.config.satsPerGb);
+    }
+    return undefined;
+}
+/**
+ * After the client's processAction has broadcast the self-payment tx, this
+ * records it in the SERVER's own wallet (internalize) with the structured
+ * labels that the accounts ledger reads. Fired from `res.on('finish')` —
+ * any failure here cannot be reported to the client, so it's logged.
+ */
+async function autoInternalizeSelfPayment(deps, ctx) {
+    const storage = deps.walletStorage;
+    // Build a fully-expanded AtomicBEEF for the broadcast tx. The persisted
+    // per-tx inputBEEF uses txidOnly references (ancestors are "known to
+    // storage"), which validateAtomicBeef rejects. getValidBeefForTxid
+    // without trustSelf recurses through each input's source to produce a
+    // BEEF with full rawTx + merkle proofs for all ancestors — the same
+    // expansion signAction performs client-side.
+    const beef = await storage.getValidBeefForTxid(ctx.txid);
+    if (!beef) {
+        throw new Error(`could not build BEEF for txid ${ctx.txid}`);
+    }
+    const atomicBeef = beef.toBinaryAtomic(ctx.txid);
+    await deps.wallet.internalizeAction({
+        tx: atomicBeef,
+        outputs: [
+            {
+                paymentRemittance: {
+                    derivationPrefix: ctx.derivationPrefix,
+                    derivationSuffix: ctx.derivationSuffix,
+                    senderIdentityKey: ctx.payerIdentity,
+                },
+                outputIndex: ctx.outputIndex,
+                protocol: 'wallet payment',
+            },
+        ],
+        labels: [
+            PAYMENT_LABEL,
+            payerLabel(ctx.payerIdentity),
+            bytesLabel(ctx.bytesCovered),
+            blockLabel(ctx.paidThroughBlock),
+        ],
+        description: 'wallet-server storage payment',
+    });
+}
+/**
+ * Express middleware. Runs between auth and dispatch. For billable methods
+ * when the caller is over capacity, short-circuits with 507 + quota info.
+ * On processAction for a valid self-payment, schedules a post-response
+ * auto-internalize so the payment is recorded in the server's wallet.
+ */
+export function accountsCapacityGate(deps) {
+    const freeKeys = new Set([
+        deps.serverIdentityKey,
+        ...(deps.config.freeIdentityKeys ?? []),
+    ]);
+    return async (req, res, next) => {
         try {
-            const parsed = parseBrc0121Payment(paymentHeaders, quote.satoshisRequired);
-            if (await this.repo.paymentExists(parsed.txid)) {
-                return {
-                    type: 'blocked',
-                    response: errorResponse(input.id, -32001, 'payment already applied'),
-                };
-            }
-            const validation = await internalizePayment({
-                wallet: this.deps.wallet,
-                senderIdentityKey: input.identity.identityKey,
-                parsed,
+            if (!deps.config.enabled)
+                return next();
+            const method = extractJsonRpcMethod(req);
+            if (method == null || !isBillableMethod(method))
+                return next();
+            const identityKey = req.auth?.identityKey;
+            if (!identityKey)
+                return next();
+            if (freeKeys.has(identityKey))
+                return next();
+            const userId = await resolveUserId(deps.walletStorage, identityKey);
+            // First billable call creates the user row — gets a free pass.
+            if (userId == null)
+                return next();
+            const storage = deps.walletStorage;
+            const currentBlock = await deps.currentBlock();
+            const [usedBytes, currentPayment] = await Promise.all([
+                storage.measureUsedBytes(userId),
+                latestActivePaymentForPayer(deps.wallet, identityKey, currentBlock),
+            ]);
+            const quote = quoteRefundedCharge({
+                usedBytes,
+                currentPayment,
+                currentBlock,
+                config: deps.config,
             });
-            await this.repo.upsertAccount(input.identity.identityKey);
-            await this.repo.recordPayment({
-                identityKey: input.identity.identityKey,
-                txid: validation.txid,
-                bytesCovered: quote.bytesCovered,
-                satsPaid: validation.satoshisReceived,
-                paidThroughBlock: currentBlock + this.deps.config.durationBlocks,
+            if (!quote)
+                return next();
+            const nextPayment = await nextPaymentDerivation(identityKey, deps.wallet);
+            const params = req.body?.params ?? [];
+            if (method === 'createAction') {
+                const match = await matchCreateActionPayment(params, identityKey, deps.serverIdentityKey, deps.wallet, nextPayment, quote.chargeSats);
+                if (match)
+                    return next();
+            }
+            else if (method === 'processAction') {
+                const match = await matchProcessActionPayment(params, identityKey, userId, deps.wallet, deps.walletStorage, nextPayment, quote.chargeSats);
+                if (match) {
+                    const processArgs = params[1];
+                    if (typeof processArgs?.txid === 'string') {
+                        const ctx = {
+                            txid: processArgs.txid,
+                            outputIndex: match.outputIndex,
+                            payerIdentity: identityKey,
+                            derivationPrefix: nextPayment.derivationPrefix,
+                            derivationSuffix: nextPayment.derivationSuffix,
+                            bytesCovered: quote.bytesCovered,
+                            paidThroughBlock: quote.paidThroughBlock,
+                        };
+                        res.on('finish', () => {
+                            if (res.statusCode !== 200)
+                                return;
+                            autoInternalizeSelfPayment(deps, ctx).catch((err) => {
+                                console.error('[accounts] auto-internalize failed for', ctx.txid, err);
+                            });
+                        });
+                    }
+                    return next();
+                }
+            }
+            const id = normalizeJsonRpcId(req.body?.id);
+            return res.status(507).json({
+                jsonrpc: '2.0',
+                error: {
+                    code: ERR_INSUFFICIENT_CAPACITY,
+                    message: 'insufficient storage capacity',
+                    data: {
+                        usedBytes,
+                        baselineBytes: deps.config.baselineBytes,
+                        paidBytes: currentPayment?.bytesCovered ?? 0,
+                        capacityBytes: deps.config.baselineBytes + (currentPayment?.bytesCovered ?? 0),
+                        deficitBytes: quote.bytesCovered,
+                        satsRequired: quote.chargeSats,
+                        fullSats: quote.fullSats,
+                        refundSats: quote.refundSats,
+                        paidThroughBlock: quote.paidThroughBlock,
+                        currentBlock,
+                        pricing: {
+                            purchaseUnitBytes: deps.config.purchaseUnitBytes,
+                            satsPerUnit: deps.config.satsPerUnit,
+                            durationBlocks: deps.config.durationBlocks,
+                        },
+                        serverIdentityKey: deps.serverIdentityKey,
+                        nextPayment,
+                    },
+                },
+                id,
             });
-            return { type: 'allow' };
         }
         catch (err) {
-            if (err instanceof Brc0121PaymentError) {
-                return {
-                    type: 'blocked',
-                    response: errorResponse(input.id, -32002, err.message),
-                };
-            }
-            throw err;
+            console.error('[accounts] capacity gate error:', err);
+            return next();
         }
-    }
-    async resolveUserId(identityKey) {
-        const result = await this.deps.walletStorage.findOrInsertUser(identityKey);
-        return result?.user?.userId;
-    }
-    buildChallenge(id, deficitBytes) {
-        const quote = priceForDeficit(deficitBytes, this.deps.config.satsPerGb);
-        const orderID = Utils.toBase64(Random(16));
-        const derivationPrefix = Utils.toBase64(Random(16));
-        const body = {
-            jsonrpc: '2.0',
-            error: {
-                code: -32000,
-                message: 'payment required',
-                data: {
-                    status: 'payment-required',
-                    satoshisRequired: quote.satoshisRequired,
-                    bytesRequested: quote.bytesCovered,
-                    gigabytesCharged: quote.gigabytesCharged,
-                    bytesPerGb: BYTES_PER_GB,
-                    derivationPrefix,
-                    orderID,
-                },
-            },
-            id,
-        };
-        return new Response(JSON.stringify(body), {
-            status: 402,
-            headers: {
-                'content-type': 'application/json',
-                'x-bsv-payment-order-id': orderID,
-                'x-bsv-payment-derivation-prefix': derivationPrefix,
-                'x-bsv-payment-satoshis-required': String(quote.satoshisRequired),
-            },
-        });
-    }
-}
-function errorResponse(id, code, message) {
-    const body = {
-        jsonrpc: '2.0',
-        error: { code, message },
-        id,
     };
-    return new Response(JSON.stringify(body), {
-        status: 402,
-        headers: { 'content-type': 'application/json' },
-    });
+}
+async function resolveUserId(storage, identityKey) {
+    const result = await storage.findOrInsertUser(identityKey);
+    return result?.user?.userId;
+}
+function extractJsonRpcMethod(req) {
+    const body = req.body;
+    if (typeof body !== 'object' || body === null)
+        return undefined;
+    const method = body.method;
+    return typeof method === 'string' ? method : undefined;
+}
+function normalizeJsonRpcId(id) {
+    if (typeof id === 'string' || typeof id === 'number')
+        return id;
+    return null;
 }
 //# sourceMappingURL=middleware.js.map

package/dist/accounts/middleware.js.map

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