diff options
Diffstat (limited to 'src/exchange-lib/exchange_api_track_transaction.c')
| -rw-r--r-- | src/exchange-lib/exchange_api_track_transaction.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/exchange-lib/exchange_api_track_transaction.c b/src/exchange-lib/exchange_api_track_transaction.c index 7fd2efb21..c40f2174e 100644 --- a/src/exchange-lib/exchange_api_track_transaction.c +++ b/src/exchange-lib/exchange_api_track_transaction.c @@ -254,7 +254,8 @@ handle_deposit_wtid_finished (void *cls, * @param exchange the exchange to query * @param merchant_priv the merchant's private key * @param h_wire hash of merchant's wire transfer details - * @param h_contract hash of the contract + * @param h_proposal_data hash of the proposal data from the contract + * between merchant and customer * @param coin_pub public key of the coin * @param transaction_id transaction identifier * @param cb function to call with the result @@ -265,7 +266,7 @@ struct TALER_EXCHANGE_TrackTransactionHandle * TALER_EXCHANGE_track_transaction (struct TALER_EXCHANGE_Handle *exchange, const struct TALER_MerchantPrivateKeyP *merchant_priv, const struct GNUNET_HashCode *h_wire, - const struct GNUNET_HashCode *h_contract, + const struct GNUNET_HashCode *h_proposal_data, const struct TALER_CoinSpendPublicKeyP *coin_pub, uint64_t transaction_id, TALER_EXCHANGE_TrackTransactionCallback cb, @@ -286,7 +287,7 @@ TALER_EXCHANGE_track_transaction (struct TALER_EXCHANGE_Handle *exchange, } dtp.purpose.purpose = htonl (TALER_SIGNATURE_MERCHANT_TRACK_TRANSACTION); dtp.purpose.size = htonl (sizeof (dtp)); - dtp.h_contract = *h_contract; + dtp.h_proposal_data = *h_proposal_data; dtp.h_wire = *h_wire; dtp.transaction_id = GNUNET_htonll (transaction_id); GNUNET_CRYPTO_eddsa_key_get_public (&merchant_priv->eddsa_priv, @@ -297,11 +298,11 @@ TALER_EXCHANGE_track_transaction (struct TALER_EXCHANGE_Handle *exchange, GNUNET_CRYPTO_eddsa_sign (&merchant_priv->eddsa_priv, &dtp.purpose, &merchant_sig.eddsa_sig)); - deposit_wtid_obj = json_pack ("{s:o, s:o," /* H_wire, H_contract */ + deposit_wtid_obj = json_pack ("{s:o, s:o," /* H_wire, h_proposal_data */ " s:o, s:I," /* coin_pub, transaction_id */ " s:o, s:o}", /* merchant_pub, merchant_sig */ "H_wire", GNUNET_JSON_from_data_auto (h_wire), - "H_contract", GNUNET_JSON_from_data_auto (h_contract), + "h_proposal_data", GNUNET_JSON_from_data_auto (h_proposal_data), "coin_pub", GNUNET_JSON_from_data_auto (coin_pub), "transaction_id", (json_int_t) transaction_id, "merchant_pub", GNUNET_JSON_from_data_auto (&dtp.merchant), @@ -315,7 +316,7 @@ TALER_EXCHANGE_track_transaction (struct TALER_EXCHANGE_Handle *exchange, dwh->depconf.purpose.size = htonl (sizeof (struct TALER_ConfirmWirePS)); dwh->depconf.purpose.purpose = htonl (TALER_SIGNATURE_EXCHANGE_CONFIRM_WIRE); dwh->depconf.h_wire = *h_wire; - dwh->depconf.h_contract = *h_contract; + dwh->depconf.h_proposal_data = *h_proposal_data; dwh->depconf.coin_pub = *coin_pub; dwh->depconf.transaction_id = GNUNET_htonll (transaction_id); |