summaryrefslogtreecommitdiff
path: root/api-merchant.rst
diff options
context:
space:
mode:
authorMarcello Stanisci <marcello.stanisci@inria.fr>2016-03-22 19:28:15 +0100
committerMarcello Stanisci <marcello.stanisci@inria.fr>2016-03-22 19:28:15 +0100
commit37cdbc1e2b4be69ac7d268b2db220d1c0754973b (patch)
tree14c18f57419edcf19a14433080abb283986828f6 /api-merchant.rst
parent273ef092e3747f451d2790fa26f26b8689813613 (diff)
downloaddocs-37cdbc1e2b4be69ac7d268b2db220d1c0754973b.tar.gz
docs-37cdbc1e2b4be69ac7d268b2db220d1c0754973b.tar.bz2
docs-37cdbc1e2b4be69ac7d268b2db220d1c0754973b.zip
fixing some crossreferences and describing the purchase
tiggered by visiting the fulfillment URL
Diffstat (limited to 'api-merchant.rst')
-rw-r--r--api-merchant.rst12
1 files changed, 7 insertions, 5 deletions
diff --git a/api-merchant.rst b/api-merchant.rst
index 226d1f1b..7819d680 100644
--- a/api-merchant.rst
+++ b/api-merchant.rst
@@ -55,14 +55,14 @@ that is legally non-binding:
// The actual contract
contract: Contract;
- // The hash of the contract, provided as a convenience.
- // All components that do not fully trust the
- // merchant must verify this field.
- H_contract: HashCode;
+ // The hash of the contract, encoded in base32, provided
+ // as a convenience. All components that do not fully trust
+ // the merchant must verify this field.
+ H_contract: string;
// Signature over the contract made by the merchant.
// Must confirm to the `Signature specification`_ below.
- sig: EddsaSignature;
+ sig: string;
}
The contract must have the following structure:
@@ -258,6 +258,7 @@ should be set to ``TALER_SIGNATURE_MERCHANT_CONTRACT``.
struct GNUNET_HashCode h_contract;
}
+
---------------------
The Merchant HTTP API
---------------------
@@ -265,6 +266,7 @@ The Merchant HTTP API
In the following requests, ``$``-variables refer to the variables in the
merchant's offer.
+.. _pay:
.. http:post:: $pay_url
Send the deposit permission to the merchant. Note that the URL may differ between