lnbits-exts/satmachineclient
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Enhance transaction processing to include discount handling: update commission calculation to account for discounts, improve logging for transaction details, and adjust client distribution logic to reflect net crypto amounts after commission and discounts.

Browse source
This commit is contained in:
padreug 2025-06-18 16:33:10 +02:00
parent ac2b0f539c
commit e00eb0f88c
1 changed files with 26 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

37
transaction_processor.py
View file

@ -495,13 +495,25 @@ class LamassuTransactionProcessor:
logger.info("No Flow Mode clients found - skipping distribution") logger.info("No Flow Mode clients found - skipping distribution")
return {} return {}
# Calculate principal amount (total - commission) # Extract transaction details
fiat_amount = transaction["fiat_amount"] crypto_atoms = transaction["crypto_amount"] # Total sats with commission baked in
commission_percentage = transaction["commission_percentage"] fiat_amount = transaction["fiat_amount"] # Actual fiat dispensed (principal only)
commission_amount = int(fiat_amount * commission_percentage / 100) commission_percentage = transaction["commission_percentage"] / 100 # Convert to decimal
principal_amount = fiat_amount - commission_amount
logger.info(f"Transaction: {fiat_amount}, Commission: {commission_amount}, Principal: {principal_amount}") # Calculate commission amount in satoshis using the provided logic
if commission_percentage > 0:
commission_amount_sats = int(crypto_atoms * commission_percentage)
else:
commission_amount_sats = 0
# Calculate net crypto amount (what should be distributed to DCA clients)
net_crypto_atoms = crypto_atoms - commission_amount_sats
# Calculate exchange rate based on net amounts
exchange_rate = net_crypto_atoms / fiat_amount if fiat_amount > 0 else 0 # sats per fiat unit
logger.info(f"Transaction - Total crypto: {crypto_atoms} sats, Commission: {commission_amount_sats} sats, Net for DCA: {net_crypto_atoms} sats")
logger.info(f"Fiat dispensed: {fiat_amount}, Exchange rate: {exchange_rate} sats/fiat_unit")
# Get balance summaries for all clients to calculate proportions # Get balance summaries for all clients to calculate proportions
client_balances = {} client_balances = {}
@ -519,13 +531,16 @@ class LamassuTransactionProcessor:
# Calculate proportional distribution # Calculate proportional distribution
distributions = {} distributions = {}
exchange_rate = transaction["crypto_amount"] / transaction["fiat_amount"] # sats per fiat unit
for client_id, client_balance in client_balances.items(): for client_id, client_balance in client_balances.items():
# Calculate this client's proportion of the principal # Calculate this client's proportion of the total DCA pool
proportion = client_balance / total_confirmed_deposits proportion = client_balance / total_confirmed_deposits
client_fiat_amount = int(principal_amount * proportion)
client_sats_amount = int(client_fiat_amount * exchange_rate) # Calculate client's share of the net crypto (after commission)
client_sats_amount = int(net_crypto_atoms * proportion)
# Calculate equivalent fiat value for tracking purposes
client_fiat_amount = int(client_sats_amount / exchange_rate) if exchange_rate > 0 else 0
distributions[client_id] = { distributions[client_id] = {
"fiat_amount": client_fiat_amount, "fiat_amount": client_fiat_amount,
@ -533,7 +548,7 @@ class LamassuTransactionProcessor:
"exchange_rate": exchange_rate "exchange_rate": exchange_rate
} }
logger.info(f"Client {client_id[:8]}... gets {client_fiat_amount} fiat units = {client_sats_amount} sats") logger.info(f"Client {client_id[:8]}... gets {client_sats_amount} sats (≈{client_fiat_amount} fiat units, {proportion:.2%} share)")
return distributions return distributions