commit 5d9997c05dfe492c30eb159c2e27d9a50f109492
parent e9d64452bd321c084132a214511009b4a77fc9f1
Author: Marcello Stanisci <marcello.stanisci@inria.fr>
Date: Tue, 4 Oct 2016 21:38:50 +0200
TransactionHistory
Diffstat:
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/api-common.rst b/api-common.rst
@@ -122,7 +122,12 @@ but also decodes to "V" to make OCR easy. We will still simply use the JSON
type "base32" and the term "Crockford Base32" in the text to refer to the
resulting encoding.
+.. _tsref-type-HashCode:
+Hash codes
+^^^^^^^^^^
+Hashcodes are strings representing base32 encoding of the respective hashed
+data. See `base32`_.
Large numbers
^^^^^^^^^^^^^
diff --git a/api-merchant.rst b/api-merchant.rst
@@ -295,8 +295,7 @@ The following API are made available by the merchant's `backend` to the merchant
:query date: only transactions *jounger* than this parameter will be returned. It's a timestamp, given in seconds.
**Response**
- :status 200 OK:
- The response is a JSON `array` of `TransactionHistory`_
+ :status 200 OK: The response is a JSON `array` of `TransactionHistory`_.
.. _tsref-type-TransactionHistory:
.. _TransactionHistory:
@@ -307,9 +306,16 @@ The following API are made available by the merchant's `backend` to the merchant
transaction_id: number;
// Hashcode of the relevant contract
- TBD FIXME
-
+ h_contract: HashCode;
+ // Exchange's base URL
+ exchange: string;
+
+ // Transaction's timestamp
+ timestamp: Timestamp;
+
+ // Price payed for this transaction
+ total_amount: Amount;
}
---------
