summaryrefslogtreecommitdiff
path: root/api-merchant.rst
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2016-06-11 20:25:57 +0200
committerChristian Grothoff <christian@grothoff.org>2016-06-11 20:25:57 +0200
commit1ba2b5431d3eec672fd2f087c81d3a7e2c8f1821 (patch)
tree4656b58f3b290a2ae76a95a4507c457cafc8e606 /api-merchant.rst
parentc18d4b3cc3049e001d2e1e98e275b70805ab7b4a (diff)
downloaddocs-1ba2b5431d3eec672fd2f087c81d3a7e2c8f1821.tar.gz
docs-1ba2b5431d3eec672fd2f087c81d3a7e2c8f1821.tar.bz2
docs-1ba2b5431d3eec672fd2f087c81d3a7e2c8f1821.zip
return time of wire transfer in /trace/transaction
Diffstat (limited to 'api-merchant.rst')
-rw-r--r--api-merchant.rst13
1 files changed, 8 insertions, 5 deletions
diff --git a/api-merchant.rst b/api-merchant.rst
index 9992ae86..71f9a302 100644
--- a/api-merchant.rst
+++ b/api-merchant.rst
@@ -254,6 +254,9 @@ The following API are made available by the merchant's `backend` to the merchant
// 32-byte wire transfer identifier
wtid: Base32;
+ // execution time of the wire transfer
+ execution_time: Timestamp;
+
// Array of data about coins
coins: CoinWireTransfer[];
}
@@ -341,13 +344,13 @@ The `contract` must have the following structure:
products: Product[];
// Time when this contract was generated
- timestamp: number;
+ timestamp: Timestamp;
// After this deadline has passed, no refunds will be accepted.
- refund_deadline: number;
+ refund_deadline: Timestamp;
// After this deadline, the merchant won't accept payments for the contact
- expiry: number;
+ expiry: Timestamp;
// Merchant's public key used to sign this contract; this information is typically added by the backend
// Note that this can be an ephemeral key.
@@ -393,8 +396,8 @@ The `contract` must have the following structure:
// a list of objects indicating a `taxname` and its amount. Again, italics denotes the object field's name.
taxes?: any[];
- // human-readable date indicating when this product should be delivered
- delivery_date: string;
+ // time indicating when this product should be delivered
+ delivery_date: Timestamp;
// where to deliver this product. This may be an URI for online delivery
// (i.e. `http://example.com/download` or `mailto:customer@example.com`),