diff options
Diffstat (limited to 'src/exchangedb/exchange_do_purse_merge.sql')
| -rw-r--r-- | src/exchangedb/exchange_do_purse_merge.sql | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/src/exchangedb/exchange_do_purse_merge.sql b/src/exchangedb/exchange_do_purse_merge.sql index f02dd5dc..85bae999 100644 --- a/src/exchangedb/exchange_do_purse_merge.sql +++ b/src/exchangedb/exchange_do_purse_merge.sql @@ -29,16 +29,9 @@ CREATE OR REPLACE FUNCTION exchange_do_purse_merge( LANGUAGE plpgsql AS $$ DECLARE - my_amount_val INT8; -DECLARE - my_amount_frac INT4; -DECLARE - my_purse_fee_val INT8; -DECLARE - my_purse_fee_frac INT4; -DECLARE + my_amount taler_amount; + my_purse_fee taler_amount; my_partner_serial_id INT8; -DECLARE my_in_reserve_quota BOOLEAN; BEGIN @@ -72,10 +65,10 @@ SELECT amount_with_fee_val ,purse_fee_val ,purse_fee_frac ,in_reserve_quota - INTO my_amount_val - ,my_amount_frac - ,my_purse_fee_val - ,my_purse_fee_frac + INTO my_amount.val + ,my_amount.frac + ,my_purse_fee.val + ,my_purse_fee.frac ,my_in_reserve_quota FROM exchange.purse_requests WHERE purse_pub=in_purse_pub @@ -196,23 +189,23 @@ ELSE -- This is a local reserve, update reserve balance immediately. -- Refund the purse fee, by adding it to the purse value: - my_amount_val = my_amount_val + my_purse_fee_val; - my_amount_frac = my_amount_frac + my_purse_fee_frac; + my_amount.val = my_amount.val + my_purse_fee.val; + my_amount.frac = my_amount.frac + my_purse_fee.frac; -- normalize result - my_amount_val = my_amount_val + my_amount_frac / 100000000; - my_amount_frac = my_amount_frac % 100000000; + my_amount.val = my_amount.val + my_amount.frac / 100000000; + my_amount.frac = my_amount.frac % 100000000; UPDATE exchange.reserves SET - current_balance_frac=current_balance_frac+my_amount_frac + current_balance.frac=current_balance.frac+my_amount.frac - CASE - WHEN current_balance_frac + my_amount_frac >= 100000000 + WHEN current_balance.frac + my_amount.frac >= 100000000 THEN 100000000 ELSE 0 END, - current_balance_val=current_balance_val+my_amount_val + current_balance.val=current.balance_val+my.amount_val + CASE - WHEN current_balance_frac + my_amount_frac >= 100000000 + WHEN current_balance.frac + my_amount.frac >= 100000000 THEN 1 ELSE 0 END |