From 88cf30c428b0a3306cffad6837744471ee12ffad Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 28 Aug 2026 19:46:49 +0200 Subject: [PATCH] After trying to recuparate money from cold wallet10 --- .../depositHdSnapshotRepository.ts | 31 +++++++++++++++---- backend/src/services/depositMonitorService.ts | 26 ++++++++++------ 2 files changed, 42 insertions(+), 15 deletions(-) diff --git a/backend/src/repositories/depositHdSnapshotRepository.ts b/backend/src/repositories/depositHdSnapshotRepository.ts index c937c862..35bb4c1a 100644 --- a/backend/src/repositories/depositHdSnapshotRepository.ts +++ b/backend/src/repositories/depositHdSnapshotRepository.ts @@ -65,12 +65,31 @@ export async function listPositiveSnapshots(): Promise { wt.decimals, u.first_name, u.last_name, - EXISTS ( - SELECT 1 FROM transactions t - WHERE t.type = 'deposit' - AND t.status = 'completed' - AND lower(t.to_address) = lower(s.address) - ) AS credited, + ( + COALESCE(( + SELECT SUM( + COALESCE( + NULLIF(t.metadata->>'chain_amount', '')::numeric, + CASE + WHEN wt.decimals = 18 THEN t.amount::numeric * 1000000000000 + ELSE t.amount::numeric + END + ) + ) + FROM transactions t + WHERE t.type = 'deposit' + AND t.status = 'completed' + AND lower(t.to_address) = lower(s.address) + ), 0) + - + COALESCE(( + SELECT SUM(ds.amount::numeric) + FROM deposit_sweeps ds + WHERE ds.status = 'completed' + AND lower(ds.from_address) = lower(s.address) + ), 0) + ) >= s.on_chain_amount + AS credited, EXISTS ( SELECT 1 FROM deposit_sweeps ds WHERE ds.status IN ('pending', 'gas_funding', 'broadcasting') diff --git a/backend/src/services/depositMonitorService.ts b/backend/src/services/depositMonitorService.ts index 3a5ecb81..560208af 100644 --- a/backend/src/services/depositMonitorService.ts +++ b/backend/src/services/depositMonitorService.ts @@ -326,21 +326,29 @@ export async function creditBscDepositByTxHash(txHash: string): Promise<{ if (receipt.status !== 1) return { credited: false, reason: 'transaction failed on-chain' }; const contract = bscService.resolveUsdtContract(custodyType.contract_address).toLowerCase(); - const transfer = receipt.transfers.find((t) => t.contract.toLowerCase() === contract); - if (!transfer) { + const usdtTransfers = receipt.transfers.filter((t) => t.contract.toLowerCase() === contract); + if (usdtTransfers.length === 0) { return { credited: false, reason: 'no USDT Transfer log for configured BEP20 contract' }; } - const rows = await query>( - `SELECT address, user_id FROM user_wallets - WHERE wallet_type_id = $1 AND lower(address) = lower($2)`, - [custodyType.id, transfer.to] - ); - const wallet = rows[0]; + let wallet: { address: string; user_id: string } | undefined; + let transfer = usdtTransfers[0]; + for (const t of usdtTransfers) { + const rows = await query>( + `SELECT address, user_id FROM user_wallets + WHERE wallet_type_id = $1 AND lower(address) = lower($2)`, + [custodyType.id, t.to] + ); + if (rows[0]) { + wallet = rows[0]; + transfer = t; + break; + } + } if (!wallet) { return { credited: false, - reason: `no USDT_BEP20 user_wallet for to=${transfer.to}`, + reason: `no USDT_BEP20 user_wallet for to=${usdtTransfers.map((t) => t.to).join(',')}`, }; }