@openora/core 0.4.1-canary.76 → 0.4.1-canary.77

package/dist/wallet/service/wallet.service.d.ts

@@ -1,6 +1,6 @@
-import { type EventBus, DrizzleService } from '@openora/core/server';
+import { type EventBus, type DrizzleDb, DrizzleService } from '@openora/core/server';
 import { type PaymentAdapter, type PaymentWebhookEvent, type AdminUserDirectory, type PlatformConfig, type RateLimiterAdapter, type RateLimitKey, type WalletRail, type PlayerTags, type AuditWritePort, type TagEvaluationCommands, type TagKey, type User, type IdentityReader, type ClientMeta, type PaginationOptions } from '@openora/core/contracts';
-import { type WalletTransaction } from '../schema/index.js';
+import { type Wallet, type WalletTransaction } from '../schema/index.js';
 import type { TransactionResult, WithdrawalQueueFilter, AutoWithdrawalRule, WalletAutoWithdrawalConfig, WalletTransactionSortBy } from '../contract/index.js';
 export declare const WalletNotFoundError: new (id: string) => Error;
 export declare const WithdrawalNotFoundError: new (id: string) => Error;
@@ -12,7 +12,273 @@ export declare const IdempotencyKeyReuseError: new () => Error;
 export declare const DepositAddressUnsupportedError: new () => Error;
 export declare const DestinationAddressRequiredError: new () => Error;
 export declare const CurrencyMismatchError: new (requested: unknown, walletCurrency: unknown) => Error;
+export declare const AmbiguousDepositAddressError: new (address: unknown, network: unknown) => Error;
 export declare function railFor(currency: string, cryptoCurrencies?: readonly string[]): WalletRail;
+export declare function creditWalletBalance(txn: DrizzleDb, walletId: Wallet['id'], currency: string, amount: string): Omit<import("drizzle-orm/pg-core").PgInsertBase<import("drizzle-orm/pg-core").PgTableWithColumns<{
+    name: "wallet_balance";
+    schema: undefined;
+    columns: {
+        id: import("drizzle-orm/pg-core").PgColumn<{
+            name: "id";
+            tableName: "wallet_balance";
+            dataType: "string";
+            columnType: "PgUUID";
+            data: string;
+            driverParam: string;
+            notNull: true;
+            hasDefault: true;
+            isPrimaryKey: true;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
+        walletId: import("drizzle-orm/pg-core").PgColumn<{
+            name: "walletId";
+            tableName: "wallet_balance";
+            dataType: "string";
+            columnType: "PgUUID";
+            data: string;
+            driverParam: string;
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
+        currency: import("drizzle-orm/pg-core").PgColumn<{
+            name: "currency";
+            tableName: "wallet_balance";
+            dataType: "string";
+            columnType: "PgText";
+            data: string;
+            driverParam: string;
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
+        amount: import("drizzle-orm/pg-core").PgColumn<{
+            name: "amount";
+            tableName: "wallet_balance";
+            dataType: "string";
+            columnType: "PgNumeric";
+            data: string;
+            driverParam: string;
+            notNull: true;
+            hasDefault: true;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
+        createdAt: import("drizzle-orm/pg-core").PgColumn<{
+            name: "createdAt";
+            tableName: "wallet_balance";
+            dataType: "date";
+            columnType: "PgTimestamp";
+            data: Date;
+            driverParam: string;
+            notNull: true;
+            hasDefault: true;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
+        updatedAt: import("drizzle-orm/pg-core").PgColumn<{
+            name: "updatedAt";
+            tableName: "wallet_balance";
+            dataType: "date";
+            columnType: "PgTimestamp";
+            data: Date;
+            driverParam: string;
+            notNull: true;
+            hasDefault: true;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
+    };
+    dialect: "pg";
+}>, import("drizzle-orm/node-postgres").NodePgQueryResultHKT, {
+    amount: import("drizzle-orm/pg-core").PgColumn<{
+        name: "amount";
+        tableName: "wallet_balance";
+        dataType: "string";
+        columnType: "PgNumeric";
+        data: string;
+        driverParam: string;
+        notNull: true;
+        hasDefault: true;
+        isPrimaryKey: false;
+        isAutoincrement: false;
+        hasRuntimeDefault: false;
+        enumValues: undefined;
+        baseColumn: never;
+        identity: undefined;
+        generated: undefined;
+    }, {}, {}>;
+}, {
+    amount: string;
+}, false, "onConflictDoNothing" | "onConflictDoUpdate" | "returning">, "onConflictDoNothing" | "onConflictDoUpdate" | "returning">;
+export declare function debitWalletBalance(txn: DrizzleDb, walletId: Wallet['id'], currency: string, amount: string): Omit<import("drizzle-orm/pg-core").PgUpdateBase<import("drizzle-orm/pg-core").PgTableWithColumns<{
+    name: "wallet_balance";
+    schema: undefined;
+    columns: {
+        id: import("drizzle-orm/pg-core").PgColumn<{
+            name: "id";
+            tableName: "wallet_balance";
+            dataType: "string";
+            columnType: "PgUUID";
+            data: string;
+            driverParam: string;
+            notNull: true;
+            hasDefault: true;
+            isPrimaryKey: true;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
+        walletId: import("drizzle-orm/pg-core").PgColumn<{
+            name: "walletId";
+            tableName: "wallet_balance";
+            dataType: "string";
+            columnType: "PgUUID";
+            data: string;
+            driverParam: string;
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
+        currency: import("drizzle-orm/pg-core").PgColumn<{
+            name: "currency";
+            tableName: "wallet_balance";
+            dataType: "string";
+            columnType: "PgText";
+            data: string;
+            driverParam: string;
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
+        amount: import("drizzle-orm/pg-core").PgColumn<{
+            name: "amount";
+            tableName: "wallet_balance";
+            dataType: "string";
+            columnType: "PgNumeric";
+            data: string;
+            driverParam: string;
+            notNull: true;
+            hasDefault: true;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
+        createdAt: import("drizzle-orm/pg-core").PgColumn<{
+            name: "createdAt";
+            tableName: "wallet_balance";
+            dataType: "date";
+            columnType: "PgTimestamp";
+            data: Date;
+            driverParam: string;
+            notNull: true;
+            hasDefault: true;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
+        updatedAt: import("drizzle-orm/pg-core").PgColumn<{
+            name: "updatedAt";
+            tableName: "wallet_balance";
+            dataType: "date";
+            columnType: "PgTimestamp";
+            data: Date;
+            driverParam: string;
+            notNull: true;
+            hasDefault: true;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
+    };
+    dialect: "pg";
+}>, import("drizzle-orm/node-postgres").NodePgQueryResultHKT, undefined, {
+    amount: import("drizzle-orm/pg-core").PgColumn<{
+        name: "amount";
+        tableName: "wallet_balance";
+        dataType: "string";
+        columnType: "PgNumeric";
+        data: string;
+        driverParam: string;
+        notNull: true;
+        hasDefault: true;
+        isPrimaryKey: false;
+        isAutoincrement: false;
+        hasRuntimeDefault: false;
+        enumValues: undefined;
+        baseColumn: never;
+        identity: undefined;
+        generated: undefined;
+    }, {}, {}>;
+}, {
+    amount: string;
+}, Record<"wallet_balance", "not-null">, [], false, "returning" | "where" | "leftJoin" | "rightJoin" | "innerJoin" | "fullJoin">, "returning" | "where" | "leftJoin" | "rightJoin" | "innerJoin" | "fullJoin">;
+export declare function readWalletBalance(txn: DrizzleDb, walletId: Wallet['id'], currency: string): Promise<string>;
+type DepositAddressResult = {
+    address: string;
+    currency: string;
+    network?: string;
+    tag?: string;
+};
 export type WalletServiceDeps = {
     drizzle: DrizzleService;
     events: EventBus;
@@ -52,6 +318,16 @@ export declare class WalletService {
         balance: string;
         currency: string;
     }>;
+    getBalances(userId: User['id']): Promise<{
+        activeCurrency: string;
+        balances: {
+            currency: string;
+            balance: string;
+        }[];
+    }>;
+    setActiveCurrency(userId: User['id'], currency: string): Promise<{
+        activeCurrency: string;
+    }>;
     /**
      * `idempotencyKey` (when supplied) makes a retried deposit a no-op: a replay
      * returns the original committed result WITHOUT calling the PSP again or
@@ -160,10 +436,7 @@ export declare class WalletService {
         page: number;
         limit: number;
     }>;
-    getOrCreateDepositAddress(userId: User['id'], currency: string): Promise<{
-        address: string;
-        currency: string;
-    }>;
+    getOrCreateDepositAddress(userId: User['id'], currency: string, network?: string): Promise<DepositAddressResult>;
     creditDepositByAddress(event: Extract<PaymentWebhookEvent, {
         kind: 'deposit';
     }>): Promise<void>;
@@ -172,4 +445,5 @@ export declare class WalletService {
     private findDepositAddress;
     private findDepositAddressByAddress;
 }
+export {};
 //# sourceMappingURL=wallet.service.d.ts.map

package/dist/wallet/service/wallet.service.d.ts.map

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

package/dist/wallet/service/wallet.service.js

@@ -1,8 +1,8 @@
 import { makeNotFoundError, makeConflictError, createDomainError, findOneOrThrow, pageToOffset, withAdvisoryXactLock, assertRateLimit, createLogger, moneyToNumber, moneyEquals, } from '@openora/core/server';
 import { normalizeKycStatus, } from '@openora/core/contracts';
-import { eq, asc, desc, sql, and, gte, lte, count, inArray } from 'drizzle-orm';
+import { eq, asc, desc, sql, and, gte, lte, count, inArray, isNull, or } from 'drizzle-orm';
 import { createHash } from 'node:crypto';
-import { wallet, walletTransaction, autoWithdrawalRule, walletAutoWithdrawalConfig, walletDepositAddress, } from '../schema/index.js';
+import { wallet, walletBalance, walletTransaction, autoWithdrawalRule, walletAutoWithdrawalConfig, walletDepositAddress, } from '../schema/index.js';
 const logger = createLogger('wallet');
 export const WalletNotFoundError = makeNotFoundError('Wallet');
 export const WithdrawalNotFoundError = makeNotFoundError('Withdrawal');
@@ -15,10 +15,14 @@ export const DepositAddressUnsupportedError = makeConflictError('DepositAddressU
 export const DestinationAddressRequiredError = makeConflictError('DestinationAddressRequiredError', 'A destination address is required for a crypto-rail withdrawal');
 const KYC_PASS_STATUSES = new Set(['approved', 'manually_overridden']);
 export const CurrencyMismatchError = createDomainError('CurrencyMismatchError', (requested, walletCurrency) => `Currency mismatch: requested ${requested}, wallet holds ${walletCurrency}`);
+export const AmbiguousDepositAddressError = createDomainError('AmbiguousDepositAddressError', (address, network) => `Deposit address ${address} on ${network ?? 'an unknown network'} is issued to more than one user`);
 // Crypto currencies settle on the crypto rail (Fireblocks); everything else on the
 // fiat rail (a PSP). The concrete provider is recorded per transaction, not here.
 // Overridable per-operator via `platformConfig.wallet.cryptoCurrencies` - see `railFor`.
 const DEFAULT_CRYPTO_CURRENCIES = new Set(['BTC', 'ETH', 'USDT', 'USDC']);
+// Mirrors the `wallet.currency` column default: what a player without a wallet row
+// reads as their active currency before one is created on first deposit.
+const DEFAULT_WALLET_CURRENCY = 'USD';
 // Per-user throttle on money mutations - guards a runaway/misbehaving client, not
 // fraud (idempotency + the ledger guard cover correctness). An overlay rebinds
 // RATE_LIMITER to change the backend, not this policy.
@@ -29,6 +33,37 @@ export function railFor(currency, cryptoCurrencies) {
         : DEFAULT_CRYPTO_CURRENCIES;
     return set.has(currency.toUpperCase()) ? 'crypto' : 'fiat';
 }
+// Currency checks elsewhere are case-insensitive, so `usd` reaches here for a `USD`
+// wallet. Every read and write of wallet_balance funnels through these three helpers,
+// so normalizing the key here is enough to keep one row per wallet+currency.
+const balanceKey = (currency) => currency.toUpperCase();
+export function creditWalletBalance(txn, walletId, currency, amount) {
+    return txn
+        .insert(walletBalance)
+        .values({ walletId, currency: balanceKey(currency), amount })
+        .onConflictDoUpdate({
+        target: [walletBalance.walletId, walletBalance.currency],
+        set: {
+            amount: sql `${walletBalance.amount} + ${amount}::numeric`,
+            updatedAt: new Date(),
+        },
+    })
+        .returning({ amount: walletBalance.amount });
+}
+export function debitWalletBalance(txn, walletId, currency, amount) {
+    return txn
+        .update(walletBalance)
+        .set({ amount: sql `${walletBalance.amount} - ${amount}::numeric` })
+        .where(and(eq(walletBalance.walletId, walletId), eq(walletBalance.currency, balanceKey(currency)), gte(walletBalance.amount, amount)))
+        .returning({ amount: walletBalance.amount });
+}
+export async function readWalletBalance(txn, walletId, currency) {
+    const [row] = await txn
+        .select({ amount: walletBalance.amount })
+        .from(walletBalance)
+        .where(and(eq(walletBalance.walletId, walletId), eq(walletBalance.currency, balanceKey(currency))));
+    return row?.amount ?? '0';
+}
 // Namespace the key per operation so the same raw key on a deposit then a withdraw can't
 // collide on the (walletId, idempotencyKey) unique index. The column is a uuid, so a string
 // prefix won't parse - hash namespace + key into a stable pseudo-uuid instead.
@@ -54,6 +89,14 @@ const HIGH_FREQUENCY_MIN_COUNT = 3;
 const DAILY_CAP_WINDOW_MS = 24 * 60 * 60 * 1000;
 // Also the marker the cumulative-cap query reads back to identify auto-approved payouts - keep write and read in lockstep.
 const AUTO_APPROVED_REASON = 'auto-approved';
+function toDepositAddressResult(row) {
+    return {
+        address: row.address,
+        currency: row.currency,
+        ...(row.network === null ? {} : { network: row.network }),
+        ...(row.tag === null ? {} : { tag: row.tag }),
+    };
+}
 function toAutoWithdrawalRuleDto(row) {
     return {
         id: row.id,
@@ -132,13 +175,40 @@ export class WalletService {
     async getBalance(userId) {
         const [record] = await this.drizzle.db.select().from(wallet).where(eq(wallet.userId, userId));
         if (!record) {
-            return { balance: '0', currency: 'USD' };
+            return { balance: '0', currency: DEFAULT_WALLET_CURRENCY };
         }
         return {
-            balance: record.balance,
+            balance: await readWalletBalance(this.drizzle.db, record.id, record.currency),
             currency: record.currency,
         };
     }
+    async getBalances(userId) {
+        const [record] = await this.drizzle.db.select().from(wallet).where(eq(wallet.userId, userId));
+        if (!record) {
+            return { activeCurrency: DEFAULT_WALLET_CURRENCY, balances: [] };
+        }
+        const rows = await this.drizzle.db
+            .select({ currency: walletBalance.currency, balance: walletBalance.amount })
+            .from(walletBalance)
+            .where(eq(walletBalance.walletId, record.id))
+            .orderBy(walletBalance.currency);
+        return { activeCurrency: record.currency, balances: rows };
+    }
+    // TODO: validate `currency` against a canonical supported-currency list once one
+    // exists - `platformConfig.wallet.cryptoCurrencies` classifies rails, it is not an
+    // allowlist, so today any non-empty string is accepted and persisted.
+    async setActiveCurrency(userId, currency) {
+        const updated = await this.drizzle.db
+            .update(wallet)
+            .set({ currency })
+            .where(eq(wallet.userId, userId))
+            .returning({ currency: wallet.currency });
+        const record = updated[0];
+        if (!record) {
+            throw new WalletNotFoundError(userId);
+        }
+        return { activeCurrency: record.currency };
+    }
     /**
      * `idempotencyKey` (when supplied) makes a retried deposit a no-op: a replay
      * returns the original committed result WITHOUT calling the PSP again or
@@ -169,12 +239,6 @@ export class WalletService {
                 .from(wallet)
                 .where(eq(wallet.userId, userId));
         }
-        // Single-currency wallet: reject a mismatch BEFORE the PSP call so a wrong-currency
-        // request never charges the vendor. A brand-new wallet has no currency to mismatch
-        // against yet - it adopts this deposit's currency on insert below.
-        if (preResolvedWallet && currency.toUpperCase() !== preResolvedWallet.currency.toUpperCase()) {
-            throw new CurrencyMismatchError(currency, preResolvedWallet.currency);
-        }
         const psp = await this.payment.processDeposit(amount, currency, { userId, provider });
         const { transactionId, replayed } = await this.drizzle.db.transaction(async (txn) => {
             let walletRecord = preResolvedWallet;
@@ -182,11 +246,7 @@ export class WalletService {
                 [walletRecord] = await txn.select().from(wallet).where(eq(wallet.userId, userId));
             }
             if (!walletRecord) {
-                walletRecord = findOneOrThrow(await txn.insert(wallet).values({ userId, balance: '0', currency }).returning(), new WalletNotFoundError(userId));
-            }
-            // Single-currency wallet: reject a mismatch rather than coerce it onto the wrong rail.
-            if (currency.toUpperCase() !== walletRecord.currency.toUpperCase()) {
-                throw new CurrencyMismatchError(currency, walletRecord.currency);
+                walletRecord = findOneOrThrow(await txn.insert(wallet).values({ userId, currency }).returning(), new WalletNotFoundError(userId));
             }
             const { row, replayed } = await this.insertIdempotentTransaction(txn, {
                 namespace: DEPOSIT_IDEMPOTENCY_NAMESPACE,
@@ -206,10 +266,7 @@ export class WalletService {
                 },
             });
             if (!replayed) {
-                await txn
-                    .update(wallet)
-                    .set({ balance: sql `${wallet.balance} + ${amount}::numeric` })
-                    .where(eq(wallet.id, walletRecord.id));
+                await creditWalletBalance(txn, walletRecord.id, currency, amount);
             }
             return { transactionId: row.id, replayed };
         });
@@ -297,10 +354,6 @@ export class WalletService {
         const { transactionId, status, replayed, walletId, rail } = await this.drizzle.db.transaction(async (txn) => {
             // FOR UPDATE serializes concurrent withdrawals against a double-debit TOCTOU under READ COMMITTED.
             const current = findOneOrThrow(await txn.select().from(wallet).where(eq(wallet.userId, userId)).for('update'), new WalletNotFoundError(userId));
-            // Single-currency wallet: reject a mismatch rather than coerce it onto the wrong rail.
-            if (currency.toUpperCase() !== current.currency.toUpperCase()) {
-                throw new CurrencyMismatchError(currency, current.currency);
-            }
             // Replay of an already-committed key: return the original untouched. The new-key race is caught by the insert below.
             if (idempotencyKey) {
                 const existing = await this.findByIdempotencyKey(txn, current.id, namespacedIdempotencyKey(WITHDRAW_IDEMPOTENCY_NAMESPACE, idempotencyKey));
@@ -341,13 +394,9 @@ export class WalletService {
                 };
             }
             // Guarded conditional debit: the WHERE makes balance>=amount atomic with the write; 0 rows back rolls back the whole tx.
-            const debited = await txn
-                .update(wallet)
-                .set({ balance: sql `${wallet.balance} - ${amount}::numeric` })
-                .where(and(eq(wallet.id, current.id), gte(wallet.balance, amount)))
-                .returning({ id: wallet.id });
+            const debited = await debitWalletBalance(txn, current.id, currency, amount);
             if (debited.length !== 1) {
-                throw new InsufficientBalanceError(current.balance, amount);
+                throw new InsufficientBalanceError(await readWalletBalance(txn, current.id, currency), amount);
             }
             if (this.tagEvaluationCommands) {
                 await this.tagEvaluationCommands.evaluateWithdrawalRequested(txn, { userId, amount });
@@ -580,10 +629,7 @@ export class WalletService {
             if (updated.length === 0) {
                 return false;
             }
-            await txn
-                .update(wallet)
-                .set({ balance: sql `${wallet.balance} + ${amount}::numeric` })
-                .where(eq(wallet.id, tx.walletId));
+            await creditWalletBalance(txn, tx.walletId, tx.currency, amount);
             return true;
         });
         if (transitioned && adminId) {
@@ -939,10 +985,7 @@ export class WalletService {
                 .set({ status: 'rejected', reviewedBy: adminId, reviewedAt, reviewReason: reason })
                 .where(eq(walletTransaction.id, withdrawalId))
                 .returning(), new WithdrawalNotFoundError(withdrawalId));
-            await txn
-                .update(wallet)
-                .set({ balance: sql `${wallet.balance} + ${updated.amount}::numeric` })
-                .where(eq(wallet.id, updated.walletId));
+            await creditWalletBalance(txn, updated.walletId, updated.currency, updated.amount);
             return updated;
         });
         const userId = await this.userIdForWallet(tx.walletId);
@@ -1000,41 +1043,44 @@ export class WalletService {
             limit,
         };
     }
-    async getOrCreateDepositAddress(userId, currency) {
-        const existing = await this.findDepositAddress(userId, currency);
+    async getOrCreateDepositAddress(userId, currency, network) {
+        const existing = await this.findDepositAddress(userId, currency, network);
         if (existing) {
-            return { address: existing.address, currency: existing.currency };
+            return toDepositAddressResult(existing);
         }
         if (!this.payment.issueDepositAddress) {
             throw new DepositAddressUnsupportedError();
         }
-        const issued = await this.payment.issueDepositAddress(userId, currency);
+        const issued = await this.payment.issueDepositAddress(userId, currency, network);
         const [row] = await this.drizzle.db
             .insert(walletDepositAddress)
             .values({
             userId,
             currency,
+            network: network ?? null,
             address: issued.address,
+            tag: issued.tag ?? null,
             providerName: providerNameFor(this.resolveRail(currency)),
         })
             .onConflictDoNothing()
             .returning();
         if (row) {
-            return { address: row.address, currency: row.currency };
+            return toDepositAddressResult(row);
         }
-        const winner = await this.findDepositAddress(userId, currency);
+        const winner = await this.findDepositAddress(userId, currency, network);
         if (!winner) {
-            throw new Error(`wallet deposit address: idempotency conflict but no row found (userId=${userId}, currency=${currency})`);
+            throw new Error(`wallet deposit address: idempotency conflict but no row found (userId=${userId}, currency=${currency}, network=${network ?? 'none'})`);
         }
-        return { address: winner.address, currency: winner.currency };
+        return toDepositAddressResult(winner);
     }
     async creditDepositByAddress(event) {
-        const depositAddress = await this.findDepositAddressByAddress(event.address);
+        const depositAddress = await this.findDepositAddressByAddress(event);
         if (!depositAddress) {
-            logger.warn({ address: event.address }, 'payment webhook: no wallet_deposit_address for inbound deposit');
+            logger.warn({ address: event.address, network: event.network, tag: event.tag }, 'payment webhook: no wallet_deposit_address for inbound deposit');
             return;
         }
-        if (event.currency.toUpperCase() !== depositAddress.currency.toUpperCase()) {
+        if (event.network === undefined &&
+            event.currency.toUpperCase() !== depositAddress.currency.toUpperCase()) {
             throw new CurrencyMismatchError(event.currency, depositAddress.currency);
         }
         const { transactionId, replayed } = await this.drizzle.db.transaction(async (txn) => {
@@ -1045,12 +1091,9 @@ export class WalletService {
             if (!walletRecord) {
                 walletRecord = findOneOrThrow(await txn
                     .insert(wallet)
-                    .values({ userId: depositAddress.userId, balance: '0', currency: event.currency })
+                    .values({ userId: depositAddress.userId, currency: event.currency })
                     .returning(), new WalletNotFoundError(depositAddress.userId));
             }
-            else if (walletRecord.currency.toUpperCase() !== event.currency.toUpperCase()) {
-                throw new CurrencyMismatchError(event.currency, walletRecord.currency);
-            }
             const [inserted] = await txn
                 .insert(walletTransaction)
                 .values({
@@ -1068,10 +1111,7 @@ export class WalletService {
                 .onConflictDoNothing()
                 .returning();
             if (inserted) {
-                await txn
-                    .update(wallet)
-                    .set({ balance: sql `${wallet.balance} + ${event.amount}::numeric` })
-                    .where(eq(wallet.id, walletRecord.id));
+                await creditWalletBalance(txn, walletRecord.id, event.currency, event.amount);
                 return { transactionId: inserted.id, replayed: false };
             }
             const [winner] = await txn
@@ -1107,19 +1147,27 @@ export class WalletService {
             .where(and(eq(walletTransaction.walletId, walletId), eq(walletTransaction.idempotencyKey, idempotencyKey)));
         return existing;
     }
-    async findDepositAddress(userId, currency) {
+    async findDepositAddress(userId, currency, network) {
         const [row] = await this.drizzle.db
             .select()
             .from(walletDepositAddress)
-            .where(and(eq(walletDepositAddress.userId, userId), eq(walletDepositAddress.currency, currency)));
+            .where(and(eq(walletDepositAddress.userId, userId), eq(walletDepositAddress.currency, currency), network === undefined
+            ? isNull(walletDepositAddress.network)
+            : eq(walletDepositAddress.network, network)));
         return row;
     }
-    async findDepositAddressByAddress(address) {
-        const [row] = await this.drizzle.db
+    async findDepositAddressByAddress({ address, network, tag, }) {
+        const rows = await this.drizzle.db
             .select()
             .from(walletDepositAddress)
-            .where(eq(walletDepositAddress.address, address));
-        return row;
+            .where(and(eq(walletDepositAddress.address, address), tag === undefined ? isNull(walletDepositAddress.tag) : eq(walletDepositAddress.tag, tag), network === undefined
+            ? undefined
+            : or(eq(walletDepositAddress.network, network), isNull(walletDepositAddress.network))));
+        const owners = new Set(rows.map((row) => row.userId));
+        if (owners.size > 1) {
+            throw new AmbiguousDepositAddressError(address, network);
+        }
+        return rows.find((row) => row.network === network) ?? rows[0];
     }
 }
 //# sourceMappingURL=wallet.service.js.map