diff options
Diffstat (limited to 'src/exchangedb/exchange_do_purse_deposit.sql')
| -rw-r--r-- | src/exchangedb/exchange_do_purse_deposit.sql | 90 |
1 files changed, 43 insertions, 47 deletions
diff --git a/src/exchangedb/exchange_do_purse_deposit.sql b/src/exchangedb/exchange_do_purse_deposit.sql index d710e9002..49d3c919b 100644 --- a/src/exchangedb/exchange_do_purse_deposit.sql +++ b/src/exchangedb/exchange_do_purse_deposit.sql @@ -17,12 +17,10 @@ CREATE OR REPLACE FUNCTION exchange_do_purse_deposit( IN in_partner_id INT8, IN in_purse_pub BYTEA, - IN in_amount_with_fee_val INT8, - IN in_amount_with_fee_frac INT4, + IN in_amount_with_fee taler_amount, IN in_coin_pub BYTEA, IN in_coin_sig BYTEA, - IN in_amount_without_fee_val INT8, - IN in_amount_without_fee_frac INT4, + IN in_amount_without_fee taler_amount, IN in_reserve_expiration INT8, IN in_now INT8, OUT out_balance_ok BOOLEAN, @@ -35,31 +33,29 @@ DECLARE DECLARE psi INT8; -- partner's serial ID (set if merged) DECLARE - my_amount_val INT8; -- total in purse -DECLARE - my_amount_frac INT4; -- total in purse + my_amount taler_amount; -- total in purse DECLARE was_paid BOOLEAN; DECLARE my_in_reserve_quota BOOLEAN; DECLARE my_reserve_pub BYTEA; +DECLARE + rval RECORD; BEGIN -- Store the deposit request. -INSERT INTO exchange.purse_deposits +INSERT INTO purse_deposits (partner_serial_id ,purse_pub ,coin_pub - ,amount_with_fee_val - ,amount_with_fee_frac + ,amount_with_fee ,coin_sig) VALUES (in_partner_id ,in_purse_pub ,in_coin_pub - ,in_amount_with_fee_val - ,in_amount_with_fee_frac + ,in_amount_with_fee ,in_coin_sig) ON CONFLICT DO NOTHING; @@ -69,9 +65,9 @@ THEN -- if so, success, otherwise conflict! PERFORM - FROM exchange.purse_deposits - WHERE coin_pub = in_coin_pub - AND purse_pub = in_purse_pub + FROM purse_deposits + WHERE purse_pub = in_purse_pub + AND coin_pub = in_coin_pub AND coin_sig = in_coin_sig; IF NOT FOUND THEN @@ -105,24 +101,24 @@ END IF; -- Debit the coin -- Check and update balance of the coin. -UPDATE known_coins +UPDATE known_coins kc SET - remaining_frac=remaining_frac-in_amount_with_fee_frac + remaining.frac=(kc.remaining).frac-in_amount_with_fee.frac + CASE - WHEN remaining_frac < in_amount_with_fee_frac + WHEN (kc.remaining).frac < in_amount_with_fee.frac THEN 100000000 ELSE 0 END, - remaining_val=remaining_val-in_amount_with_fee_val + remaining.val=(kc.remaining).val-in_amount_with_fee.val - CASE - WHEN remaining_frac < in_amount_with_fee_frac + WHEN (kc.remaining).frac < in_amount_with_fee.frac THEN 1 ELSE 0 END WHERE coin_pub=in_coin_pub - AND ( (remaining_val > in_amount_with_fee_val) OR - ( (remaining_frac >= in_amount_with_fee_frac) AND - (remaining_val >= in_amount_with_fee_val) ) ); + AND ( ((kc.remaining).val > in_amount_with_fee.val) OR + ( ((kc.remaining).frac >= in_amount_with_fee.frac) AND + ((kc.remaining).val >= in_amount_with_fee.val) ) ); IF NOT FOUND THEN @@ -135,17 +131,17 @@ END IF; -- Credit the purse. -UPDATE purse_requests +UPDATE purse_requests pr SET - balance_frac=balance_frac+in_amount_without_fee_frac + balance.frac=(pr.balance).frac+in_amount_without_fee.frac - CASE - WHEN balance_frac+in_amount_without_fee_frac >= 100000000 + WHEN (pr.balance).frac+in_amount_without_fee.frac >= 100000000 THEN 100000000 ELSE 0 END, - balance_val=balance_val+in_amount_without_fee_val + balance.val=(pr.balance).val+in_amount_without_fee.val + CASE - WHEN balance_frac+in_amount_without_fee_frac >= 100000000 + WHEN (pr.balance).frac+in_amount_without_fee.frac >= 100000000 THEN 1 ELSE 0 END @@ -159,7 +155,7 @@ SELECT COALESCE(partner_serial_id,0) ,reserve_pub INTO psi ,my_reserve_pub - FROM exchange.purse_merges + FROM purse_merges WHERE purse_pub=in_purse_pub; IF NOT FOUND @@ -170,24 +166,26 @@ THEN END IF; SELECT - amount_with_fee_val - ,amount_with_fee_frac + amount_with_fee ,in_reserve_quota INTO - my_amount_val - ,my_amount_frac - ,my_in_reserve_quota - FROM exchange.purse_requests + rval + FROM exchange.purse_requests preq WHERE (purse_pub=in_purse_pub) - AND ( ( ( (amount_with_fee_val <= balance_val) - AND (amount_with_fee_frac <= balance_frac) ) - OR (amount_with_fee_val < balance_val) ) ); + AND ( ( ( ((preq.amount_with_fee).val <= (preq.balance).val) + AND ((preq.amount_with_fee).frac <= (preq.balance).frac) ) + OR ((preq.amount_with_fee).val < (preq.balance).val) ) ); IF NOT FOUND THEN out_late=FALSE; RETURN; END IF; +-- We use rval as workaround as we cannot select +-- directly into the amount due to Postgres limitations. +my_amount := rval.amount_with_fee; +my_in_reserve_quota := rval.in_reserve_quota; + -- Remember how this purse was finished. INSERT INTO purse_decision (purse_pub @@ -214,7 +212,7 @@ THEN SET purses_active=purses_active-1 WHERE reserve_pub IN (SELECT reserve_pub - FROM exchange.purse_merges + FROM purse_merges WHERE purse_pub=my_purse_pub LIMIT 1); END IF; @@ -231,14 +229,12 @@ ELSE -- This is a local reserve, update balance immediately. INSERT INTO reserves (reserve_pub - ,current_balance_frac - ,current_balance_val + ,current_balance ,expiration_date ,gc_date) VALUES (my_reserve_pub - ,my_amount_frac - ,my_amount_val + ,my_amount ,in_reserve_expiration ,in_reserve_expiration) ON CONFLICT DO NOTHING; @@ -248,15 +244,15 @@ ELSE -- Reserve existed, thus UPDATE instead of INSERT. UPDATE 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 |