document API changes as part of #7810

4 files changed, 30 insertions, 27 deletions

diff --git a/core/api-challenger.rst b/core/api-challenger.rst
index 60e2ad62..146cdda0 100644
--- a/core/api-challenger.rst
+++ b/core/api-challenger.rst
@@ -107,11 +107,10 @@ Setup
 
   .. ts:def:: ChallengeSetupResponse
 
-  interface ChallengeSetupResponse {
-    // Nonce to use when constructing ``/login``
-    // endpoint.
-    nonce: string;
-  }
+    interface ChallengeSetupResponse {
+      // Nonce to use when constructing ``/login`` endpoint.
+      nonce: string;
+    }
 
 
 .. _challenger-login:
@@ -239,17 +238,17 @@ Auth
 
   .. ts:def:: ChallengerAuthResponse
 
-  interface ChallengerAuthResponse {
-    // Token used to authenticate access in ``/info``.
-    access_token: string;
+    interface ChallengerAuthResponse {
+      // Token used to authenticate access in ``/info``.
+      access_token: string;
 
-    // Type of the access token.
-    token_type: "Bearer";
+      // Type of the access token.
+      token_type: "Bearer";
 
-    // Amount of time that an access token is valid (in seconds).
-    expires_in: Number;
+      // Amount of time that an access token is valid (in seconds).
+      expires_in: Number;
 
-  }
+    }
 
 
 .. _challenger-info:
@@ -278,15 +277,15 @@ Info
 
   .. ts:def:: ChallengerInfoResponse
 
-  interface ChallengerInfoResponse {
-    // Address that was validated.
-    address: string;
+    interface ChallengerInfoResponse {
+      // Address that was validated.
+      address: string;
 
-    // Type of the address.
-    address_type: string;
+      // Type of the address.
+      address_type: string;
 
-    // How long do we consider the address to be
-    // valid for this user.
-    expires: Timestamp;
+      // How long do we consider the address to be
+      // valid for this user.
+      expires: Timestamp;
 
-  }
+    }
diff --git a/core/api-common.rst b/core/api-common.rst
index 02cf5a1e..13c29821 100644
--- a/core/api-common.rst
+++ b/core/api-common.rst
@@ -1686,6 +1686,9 @@ within the
       struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
       struct GNUNET_TIME_AbsoluteNBO start_date;
       struct TALER_PaytoHash h_wire;
+      struct GNUNET_HashCode h_conversion_url;
+      struct GNUNET_HashCode h_credit_restrictions;
+      struct GNUNET_HashCode h_debit_restrictions;
     };
 
 .. _TALER_MasterDelWirePS:
diff --git a/core/api-exchange.rst b/core/api-exchange.rst
index 11a53b16..8d1701d4 100644
--- a/core/api-exchange.rst
+++ b/core/api-exchange.rst
@@ -532,7 +532,7 @@ possibly by using HTTPS.
 
       // Object mapping names of wire methods (i.e. "iban" or "x-taler-bank")
       // to wire fees.
-      fees: { method : AggregateTransferFee };
+      fees: { method : AggregateTransferFee[] };
 
       // List of exchanges that this exchange is partnering
       // with to enable wallet-to-wallet transfers.
diff --git a/core/api-merchant.rst b/core/api-merchant.rst
index 7033612f..65998b15 100644
--- a/core/api-merchant.rst
+++ b/core/api-merchant.rst
@@ -2746,8 +2746,8 @@ funds to the exchange.
       // Public key identifying the reserve.
       reserve_pub: EddsaPublicKey;
 
-      // Wire account of the exchange where to transfer the funds.
-      payto_uri: string;
+      // Wire accounts of the exchange where to transfer the funds.
+      accounts: WireAccount[];
     }
 
 .. http:get:: [/instances/$INSTANCE]/private/reserves
@@ -2861,9 +2861,10 @@ Query funds remaining
       // Is this reserve active (false if it was deleted but not purged)?
       active: boolean;
 
-      // URI to use to fill the reserve, can be NULL
+      // Array of wire accounts of the exchange that could
+      // be used to fill the reserve, can be NULL
       // if the reserve is inactive or was already filled
-      payto_uri: string;
+      accounts?: WireAccount[];
 
       // URL of the exchange hosting the reserve,
       // NULL if the reserve is inactive