From e2021873b0aa8ec4a756a1306213d885b15f4b55 Mon Sep 17 00:00:00 2001 From: Marcello Stanisci Date: Tue, 17 May 2016 10:03:06 +0200 Subject: typo --- api-exchange.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'api-exchange.rst') diff --git a/api-exchange.rst b/api-exchange.rst index 33b77305..f78a8cb3 100644 --- a/api-exchange.rst +++ b/api-exchange.rst @@ -1026,7 +1026,7 @@ typically also view the balance.) Provide the wire transfer identifier associated with an (existing) deposit operation. - **Request:** The request body most be a `WtidRequest`_ JSON object. + **Request:** The request body must be a `WtidRequest`_ JSON object. **Response:** -- cgit v1.2.3 From 6de85db6421e3a3176c9af63420f39fd477dcbd9 Mon Sep 17 00:00:00 2001 From: Marcello Stanisci Date: Fri, 20 May 2016 10:17:05 +0200 Subject: more details on /admin/add/incoming --- api-exchange.rst | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'api-exchange.rst') diff --git a/api-exchange.rst b/api-exchange.rst index f78a8cb3..a6a913af 100644 --- a/api-exchange.rst +++ b/api-exchange.rst @@ -1261,7 +1261,10 @@ Administrative API: Bank transactions // When was the transaction executed execution_date: Timestamp; - // Wire details + // Client's wire details, so that the exchange knows from whom money comes from. + // We strees again that in order to create a reserve on any exchange, an equivalent + // amount of money must be wire transferred from the client's to the exchange's + // bank account wire: any; } -- cgit v1.2.3 From ce6b80c60bc49218f86bc52f4e83c9d13831ac10 Mon Sep 17 00:00:00 2001 From: Marcello Stanisci Date: Fri, 20 May 2016 10:19:56 +0200 Subject: typo --- api-exchange.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'api-exchange.rst') diff --git a/api-exchange.rst b/api-exchange.rst index a6a913af..b7b36765 100644 --- a/api-exchange.rst +++ b/api-exchange.rst @@ -302,7 +302,7 @@ exchange. .. note:: The client currently does not have to demonstrate knowledge of the private key of the reserve to make this request, which makes the reserve's public - key privliged information known only to the client, their bank, and the + key privileged information known only to the client, their bank, and the exchange. In future, we might wish to revisit this decision to improve security, such as by having the client EdDSA-sign an ECDHE key to be used to derive a symmetric key to encrypt the response. This would be useful if -- cgit v1.2.3 From 13b2205836d1d91e58d973648b2a47870ad7f76d Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Fri, 20 May 2016 14:29:28 +0200 Subject: clarify that wire details must be unique --- api-exchange.rst | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'api-exchange.rst') diff --git a/api-exchange.rst b/api-exchange.rst index b7b36765..28acac75 100644 --- a/api-exchange.rst +++ b/api-exchange.rst @@ -1262,9 +1262,15 @@ Administrative API: Bank transactions execution_date: Timestamp; // Client's wire details, so that the exchange knows from whom money comes from. - // We strees again that in order to create a reserve on any exchange, an equivalent + // In order to create a reserve on any exchange, an equivalent // amount of money must be wire transferred from the client's to the exchange's - // bank account + // bank account. + // The wire details given here should include some unique identifier + // for each transaction. The exchange will check that the details + // given are unique, and if the wire details are identical to previous + // wire details will treat the request as a duplicate and not actually + // do any update. This is true even if the amount or execution date + // differs. wire: any; } -- cgit v1.2.3 From e3fd0565cef4fb9c542d824e0f39d7d0bb6f5dcf Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Thu, 26 May 2016 15:23:32 +0200 Subject: change edate to wire_transfer_deadline/delay (#4521) --- api-exchange.rst | 2 +- impl-merchant.rst | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'api-exchange.rst') diff --git a/api-exchange.rst b/api-exchange.rst index 28acac75..d9dc14aa 100644 --- a/api-exchange.rst +++ b/api-exchange.rst @@ -514,7 +514,7 @@ denomination. // indicative time by which the exchange undertakes to transfer the funds to // the merchant, in case of successful payment. - edate: Timestamp; + pay_deadline: Timestamp; // 64-bit transaction id for the transaction between merchant and customer transaction_id: number; diff --git a/impl-merchant.rst b/impl-merchant.rst index 38f354a4..7ae4e3d1 100644 --- a/impl-merchant.rst +++ b/impl-merchant.rst @@ -117,9 +117,11 @@ The following API are made available by the merchant's `backend` to the merchant **Request:** The `frontend` passes the :ref:`deposit permission ` - received from the wallet, and optionally adding a field named `edate`, + received from the wallet, and optionally adding a field named `pay_deadline`, indicating a deadline by which he would expect to receive the bank transfer - for this deal. Note that the `edate` must be after the `refund_deadline`. + for this deal. Note that the `pay_deadline` must be after the `refund_deadline`. + The backend calculates the `pay_deadline` by adding the `wire_transfer_delay` + value found in the configuration to the current time. **Response:** -- cgit v1.2.3 From a42d85021d88d36a1bcea6ecb596ff392656836d Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Thu, 26 May 2016 16:39:45 +0200 Subject: fix #4533 for exchange (breaks interaction with bank for /admin/add/incoming) --- api-exchange.rst | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'api-exchange.rst') diff --git a/api-exchange.rst b/api-exchange.rst index d9dc14aa..80ad0a76 100644 --- a/api-exchange.rst +++ b/api-exchange.rst @@ -343,8 +343,11 @@ exchange. // The amount that was withdrawn or deposited. amount: Amount; - // Wiring details, only present if type is "DEPOSIT". - wire?: any; + // Sender account details, only present if type is "DEPOSIT". + sender_account_details?: any; + + // Transfer details uniquely identifying the transfer, only present if type is "DEPOSIT". + transfer_details?: any; // binary encoding of the transaction data as a `TALER_WithdrawRequestPS` // struct described in :ref:`Signatures`, only present if the `type` was @@ -1261,17 +1264,22 @@ Administrative API: Bank transactions // When was the transaction executed execution_date: Timestamp; - // Client's wire details, so that the exchange knows from whom money comes from. - // In order to create a reserve on any exchange, an equivalent - // amount of money must be wire transferred from the client's to the exchange's - // bank account. - // The wire details given here should include some unique identifier + // Sender's wire account details, so that the exchange knows from whom the + // money comes from (and can possibly refund it). The details + // given here must be in a wire format supported by the exchange. + sender_account_details: any; + + // The wire details given here should include an unique identifier // for each transaction. The exchange will check that the details // given are unique, and if the wire details are identical to previous // wire details will treat the request as a duplicate and not actually // do any update. This is true even if the amount or execution date // differs. - wire: any; + // + // Note that the exchange does not interpret these details in any + // way, other than for "being unique". They are stored for diagnostics + // and auditing. + transfer_details: any; } **Response:** -- cgit v1.2.3