diff options
Diffstat (limited to 'src/include/taler_signatures.h')
| -rw-r--r-- | src/include/taler_signatures.h | 37 |
1 files changed, 6 insertions, 31 deletions
diff --git a/src/include/taler_signatures.h b/src/include/taler_signatures.h index f55f0c2e4..7f9e090a1 100644 --- a/src/include/taler_signatures.h +++ b/src/include/taler_signatures.h @@ -317,19 +317,6 @@ struct TALER_WithdrawRequestPS struct TALER_AmountNBO amount_with_fee; /** - * Withdrawal fee charged by the exchange. This must match the Exchange's - * denomination key's withdrawal fee. If the client puts in an - * invalid withdrawal fee (too high or too low) that does not match - * the Exchange's denomination key, the withdraw operation is invalid - * and will be rejected by the exchange. The @e amount_with_fee minus - * the @e withdraw_fee is must match the value of the generated - * coin. We include this in what is being signed so that we can - * verify a exchange's accounting without needing to access the - * respective denomination key information each time. - */ - struct TALER_AmountNBO withdraw_fee; - - /** * Hash of the denomination public key for the coin that is withdrawn. */ struct GNUNET_HashCode h_denomination_pub GNUNET_PACKED; @@ -376,7 +363,7 @@ struct TALER_DepositRequestPS * deposit request in a timely fashion (so back-dating is not * prevented). */ - struct GNUNET_TIME_AbsoluteNBO timestamp; + struct GNUNET_TIME_AbsoluteNBO wallet_timestamp; /** * How much time does the merchant have to issue a refund request? @@ -442,9 +429,10 @@ struct TALER_DepositConfirmationPS struct GNUNET_HashCode h_wire GNUNET_PACKED; /** - * Time when this confirmation was generated. + * Time when this confirmation was generated / when the exchange received + * the deposit request. */ - struct GNUNET_TIME_AbsoluteNBO timestamp; + struct GNUNET_TIME_AbsoluteNBO exchange_timestamp; /** * How much time does the @e merchant have to issue a refund @@ -517,17 +505,6 @@ struct TALER_RefundRequestPS */ struct TALER_AmountNBO refund_amount; - /** - * Refund fee charged by the exchange. This must match the - * Exchange's denomination key's refund fee. If the client puts in - * an invalid refund fee (too high or too low) that does not match - * the Exchange's denomination key, the refund operation is invalid - * and will be rejected by the exchange. The @e amount_with_fee - * minus the @e refund_fee is the amount that will be credited to - * the original coin. - */ - struct TALER_AmountNBO refund_fee; - }; @@ -1153,10 +1130,8 @@ struct TALER_ProposalDataPS struct PaymentResponsePS { /** - * Set to TALER_SIGNATURE_MERCHANT_PAYMENT_OK so far. Note that - * unsuccessful payments are usually proven by some exchange's signature, - * thus it is unlikely that a merchant needs to set a purpose other than - * the above mentioned + * Set to #TALER_SIGNATURE_MERCHANT_PAYMENT_OK. Note that + * unsuccessful payments are usually proven by some exchange's signature. */ struct GNUNET_CRYPTO_EccSignaturePurpose purpose; |