Mirror/robosats
1
0
Fork 0
mirror of https://github.com/RoboSats/robosats.git synced 2024-12-14 03:16:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add hash/preimage or address/txid to trade summary report

Browse Source
This commit is contained in:
Reckless_Satoshi 2023-05-07 04:11:40 -07:00
parent 3c78299dfc
commit f2de58ca36
No known key found for this signature in database
GPG Key ID: 9C4585B561315571
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
api/logics.py
View File

@ -1708,6 +1708,8 @@ class Logics:
summary["received_sats"] = order.payout_tx.sent_satoshis summary["received_sats"] = order.payout_tx.sent_satoshis
else: else:
summary["received_sats"] = order.payout.num_satoshis summary["received_sats"] = order.payout.num_satoshis
summary["payment_hash"] = order.payout.payment_hash
summary["preimage"] = order.payout.preimage
summary["trade_fee_sats"] = round( summary["trade_fee_sats"] = round(
order.last_satoshis order.last_satoshis
- summary["received_sats"] - summary["received_sats"]
@ -1717,6 +1719,8 @@ class Logics:
if users[order_user] == user and order.is_swap: if users[order_user] == user and order.is_swap:
summary["is_swap"] = order.is_swap summary["is_swap"] = order.is_swap
summary["received_onchain_sats"] = order.payout_tx.sent_satoshis summary["received_onchain_sats"] = order.payout_tx.sent_satoshis
summary["address"] = order.payout_tx.address
summary["txid"] = order.payout_tx.txid
summary["mining_fee_sats"] = order.payout_tx.mining_fee_sats summary["mining_fee_sats"] = order.payout_tx.mining_fee_sats
summary["swap_fee_sats"] = round( summary["swap_fee_sats"] = round(
order.payout_tx.num_satoshis order.payout_tx.num_satoshis
@ -1752,19 +1756,8 @@ class Logics:
) )
if not order.is_swap: if not order.is_swap:
platform_summary["routing_budget_sats"] = order.payout.routing_budget_sats platform_summary["routing_budget_sats"] = order.payout.routing_budget_sats
# Start Deprecated after v0.3.1
platform_summary["routing_fee_sats"] = order.payout.fee
# End Deprecated after v0.3.1
platform_summary["trade_revenue_sats"] = int( platform_summary["trade_revenue_sats"] = int(
order.trade_escrow.num_satoshis order.trade_escrow.num_satoshis - order.payout.num_satoshis
- order.payout.num_satoshis
# Start Deprecated after v0.3.1 (will be `- order.payout.routing_budget_sats`)
- (
order.payout.fee
if order.payout.routing_budget_sats == 0
else order.payout.routing_budget_sats
)
# End Deprecated after v0.3.1
) )
else: else:
platform_summary["routing_fee_sats"] = 0 platform_summary["routing_fee_sats"] = 0

1
frontend/src/components/TradeBox/TradeSummary.tsx
View File

@ -24,7 +24,6 @@ import {
Schedule, Schedule,
PriceChange, PriceChange,
LockOpen, LockOpen,
Download,
AccountBalance, AccountBalance,
Route, Route,
AccountBox, AccountBox,

4
frontend/src/models/Order.model.ts
View File

@ -9,6 +9,10 @@ export interface TradeRobotSummary {
sent_sats: number; sent_sats: number;
received_fiat: number; received_fiat: number;
trade_fee_sats: number; trade_fee_sats: number;
payment_hash?: string;
preimage?: string;
address?: string;
txid?: string;
} }
export interface TradeCoordinatorSummary { export interface TradeCoordinatorSummary {