diff options
| author | Christian Grothoff <christian@grothoff.org> | 2016-02-19 23:00:19 +0100 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2016-02-19 23:00:19 +0100 |
| commit | d4bd9ffacce6870f72500d2f3f5f8c3cde66ede1 (patch) | |
| tree | e9224ad78ac6d3317af605d956a429eb8ea4d7c1 /api-merchant.rst | |
| parent | 0217f2b19bc2967a5d27ea42055ea3244647dfcf (diff) | |
| download | docs-d4bd9ffacce6870f72500d2f3f5f8c3cde66ede1.tar.gz docs-d4bd9ffacce6870f72500d2f3f5f8c3cde66ede1.tar.bz2 docs-d4bd9ffacce6870f72500d2f3f5f8c3cde66ede1.zip | |
adding missing entries
Diffstat (limited to 'api-merchant.rst')
| -rw-r--r-- | api-merchant.rst | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/api-merchant.rst b/api-merchant.rst index 46c9cee1..6f175552 100644 --- a/api-merchant.rst +++ b/api-merchant.rst @@ -259,6 +259,9 @@ merchant's offer. :<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` of the contract `blob <contract-blob>`. The wallet can choose whether to take this value obtained from the 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 amount total_amount: total amount being paid as per the contract (the sum of the amounts from the `coins` may be larger to cover deposit fees not covered by the merchant) + :<json amount max_fee: maximum fees merchant agreed to cover as per the contract + :<json base32 merchant_sig: signature by the merchant over the contract, must match signed data of purpose TALER_SIGNATURE_MERCHANT_CONTRACT :<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 :<json string mint: the chosen mint's base URL |