diff options
| author | Christian Grothoff <christian@grothoff.org> | 2022-05-08 11:37:37 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2022-05-08 11:37:37 +0200 |
| commit | d3a63881999aa1c6d763263346a0a5979ec6efac (patch) | |
| tree | 92f220ad08ce79d1f18366346ffabfa93cf33d75 /src/lib/exchange_api_purse_merge.c | |
| parent | 6b8e732bf8d8bfae268e7f5a9a09af9167fd0d47 (diff) | |
| download | exchange-d3a63881999aa1c6d763263346a0a5979ec6efac.tar.gz exchange-d3a63881999aa1c6d763263346a0a5979ec6efac.tar.bz2 exchange-d3a63881999aa1c6d763263346a0a5979ec6efac.zip | |
pass purse_fee to determine how purse creation is paid for
Diffstat (limited to 'src/lib/exchange_api_purse_merge.c')
| -rw-r--r-- | src/lib/exchange_api_purse_merge.c | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/src/lib/exchange_api_purse_merge.c b/src/lib/exchange_api_purse_merge.c index d30d5da26..8bfa4248f 100644 --- a/src/lib/exchange_api_purse_merge.c +++ b/src/lib/exchange_api_purse_merge.c @@ -349,14 +349,22 @@ TALER_EXCHANGE_account_merge ( purse_pub, merge_priv, &merge_sig); - TALER_wallet_account_merge_sign (merge_timestamp, - purse_pub, - purse_expiration, - h_contract_terms, - purse_value_after_fees, - min_age, - reserve_priv, - &reserve_sig); + { + struct TALER_Amount zero_purse_fee; + + TALER_amount_set_zero (purse_value_after_fees->currency, + &zero_purse_fee); + TALER_wallet_account_merge_sign (merge_timestamp, + purse_pub, + purse_expiration, + h_contract_terms, + purse_value_after_fees, + &zero_purse_fee, + min_age, + TALER_WAMF_MODE_MERGE_FULLY_PAID_PURSE, + reserve_priv, + &reserve_sig); + } merge_obj = GNUNET_JSON_PACK ( GNUNET_JSON_pack_string ("payto_uri", reserve_url), |