commit 1071b54fb78b3e28b0c3c2c8da0ad55a8db31ec2
parent 51c14de8864809a0194e0edd56c965299bcc04ae
Author: Jeff Burdges <burdges@gnunet.org>
Date: Fri, 30 Oct 2015 11:10:27 +0100
Merge branch 'master' of git.taler.net:/var/git/api
Diffstat:
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/api-merchant.rst b/api-merchant.rst
@@ -134,12 +134,14 @@ successful response to the following two calls:
:>json int transaction_id: a 53-bit number chosen by the merchant to uniquely identify the contract.
:>json array products: a collection of `product` objects (described below), for each different item purchased within this transaction.
:>json `date` timestamp: this contract's generation time
- :>json `date` refund: the maximum time until which the merchant can refund the wallet in case of a problem, or some request
+ :>json `date` refund_deadline: the maximum time until which the merchant can refund the wallet in case of a problem, or some request
:>json `date` expiry: the maximum time until which the wallet can agree on this contract
:>json base32 merchant_pub: merchant's EdDSA key used to sign this contract; this information is typically added by the `backend`
:>json object merchant: the set of values describing this `merchant`, defined below
:>json base32 H_wire: the hash of the merchant's :ref:`wire details <wireformats>`; this information is typically added by the `backend`
+ :>json base32 H_contract: encoding of the `h_contract` field of contract :ref:`blob <contract-blob>`. Tough the wallet gets all required information to regenerate this hash code locally, the merchant sends it anyway to avoid subtle encoding errors, or to allow the wallet to double check its locally generated copy
:>json array auditors: a JSON array of `auditor` objects. To finalize the payment, the wallet should agree on a mint audited by one of these auditos.
+ :>json string pay_url: the URL where the merchant will receive the deposit permission (i.e. the payment)
:>json array mints: a JSON array of `mint` objects. The wallet is encouraged to agree on some of those mints, in case it can't agree on any auditor trusted by this merchant.
:>json object locations: maps labels for locations to detailed geographical location data (details for the format of locations are specified below). The label strings must not contain a colon (`:`). These locations can then be references by their respective labels throughout the contract.
@@ -197,10 +199,10 @@ should be set to `TALER_SIGNATURE_MERCHANT_CONTRACT`.
.. sourcecode:: c
- struct Contract
+ struct MERCHANT_Contract
{
struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
- struct GNUNET_HashCode h_contract_details;
+ struct GNUNET_HashCode h_contract;
}
---------------
@@ -321,7 +323,7 @@ when the button is clicked:
.. sourcecode:: javascript
function deliver_contract_to_wallet(jsonContract){
- var cevent = new CustomEvent('taler-contract', { detail: jsonContract, target: '/taler/pay' });
+ var cevent = new CustomEvent('taler-contract', { detail: jsonContract });
document.body.dispatchEvent(cevent);
};
@@ -382,7 +384,7 @@ cookies to identify the shopping session.
:resheader Content-Type: application/json
:>json base32 contract: a :ref:`JSON contract <contract>` for this deal.
:>json base32 sig: the signature of the binary described in :ref:`blob <contract-blob>`.
- :>json base32 h_contract: the base32 encoding of the field `h_contract_details` of the contract's :ref:`blob <contract-blob>`
+ :>json base32 h_contract: the base32 encoding of the field `h_contract` of the contract's :ref:`blob <contract-blob>`
**Failure Response**
@@ -399,7 +401,7 @@ cookies to identify the shopping session.
:reqheader Content-Type: application/json
:<json base32 H_wire: the hashed :ref:`wire details <wireformats>` of this merchant. The wallet takes this value as-is from the contract
- :<json base32 H_contract: the base32 encoding of the field `h_contract_details` of `contract`_. The wallet can choose whether to take this value from the gotten contract (field `h_contract`), or regenerating one starting from the values it gets within the contract
+ :<json base32 H_contract: the base32 encoding of the field `h_contract` of the contract `blob <contract-blob>`. The wallet can choose whether to take this value from the gotten contract (field `h_contract`), or regenerating one starting from the values it gets within the contract
:<json int transaction_id: a 53-bit number corresponding to the contract being agreed on
:<json date timestamp: a timestamp of this deposit permission. It equals just the contract's timestamp
:<json date refund_deadline: same value held in the contract's `refund` field
