Merge branch 'master' into feature/tokensfeature/tokens

1 files changed, 28 insertions, 0 deletions

diff --git a/packages/taler-wallet-core/src/wallet-api-types.ts b/packages/taler-wallet-core/src/wallet-api-types.ts
index ed882708c..1bcab801c 100644
--- a/packages/taler-wallet-core/src/wallet-api-types.ts
+++ b/packages/taler-wallet-core/src/wallet-api-types.ts
@@ -40,6 +40,8 @@ import {
   BalancesResponse,
   CanonicalizeBaseUrlRequest,
   CanonicalizeBaseUrlResponse,
+  CheckPayTemplateReponse,
+  CheckPayTemplateRequest,
   CheckPeerPullCreditRequest,
   CheckPeerPullCreditResponse,
   CheckPeerPushDebitRequest,
@@ -79,6 +81,7 @@ import {
   GetPlanForOperationResponse,
   GetWithdrawalDetailsForAmountRequest,
   GetWithdrawalDetailsForUriRequest,
+  HintNetworkAvailabilityRequest,
   ImportDbRequest,
   InitRequest,
   InitResponse,
@@ -120,6 +123,7 @@ import {
   StartRefundQueryForUriResponse,
   StartRefundQueryRequest,
   StoredBackupList,
+  TalerMerchantApi,
   TestPayArgs,
   TestPayResult,
   TestingGetDenomStatsRequest,
@@ -164,6 +168,7 @@ export enum WalletApiOperation {
   WithdrawTestBalance = "withdrawTestBalance",
   PreparePayForUri = "preparePayForUri",
   SharePayment = "sharePayment",
+  CheckPayForTemplate = "checkPayForTemplate",
   PreparePayForTemplate = "preparePayForTemplate",
   GetContractTermsDetails = "getContractTermsDetails",
   RunIntegrationTest = "runIntegrationTest",
@@ -260,6 +265,7 @@ export enum WalletApiOperation {
   RemoveGlobalCurrencyAuditor = "removeGlobalCurrencyAuditor",
   ListAssociatedRefreshes = "listAssociatedRefreshes",
   Shutdown = "shutdown",
+  HintNetworkAvailability = "hintNetworkAvailability",
   CanonicalizeBaseUrl = "canonicalizeBaseUrl",
   TestingWaitTransactionsFinal = "testingWaitTransactionsFinal",
   TestingWaitRefreshesFinal = "testingWaitRefreshesFinal",
@@ -270,6 +276,7 @@ export enum WalletApiOperation {
   TestingListTaskForTransaction = "testingListTasksForTransaction",
   TestingGetDenomStats = "testingGetDenomStats",
   TestingPing = "testingPing",
+  TestingGetReserveHistory = "testingGetReserveHistory",
 }
 
 // group: Initialization
@@ -310,6 +317,12 @@ export type GetVersionOp = {
   response: WalletCoreVersion;
 };
 
+export type HintNetworkAvailabilityOp = {
+  op: WalletApiOperation.HintNetworkAvailability;
+  request: HintNetworkAvailabilityRequest;
+  response: EmptyObject;
+};
+
 // group: Basic Wallet Information
 
 /**
@@ -538,6 +551,12 @@ export type SharePaymentOp = {
   response: SharePaymentResult;
 };
 
+export type CheckPayForTemplateOp = {
+  op: WalletApiOperation.CheckPayForTemplate;
+  request: CheckPayTemplateRequest;
+  response: CheckPayTemplateReponse;
+};
+
 /**
  * Prepare to make a payment based on a taler://pay-template/ URI.
  */
@@ -1187,6 +1206,12 @@ export type TestingPingOp = {
   response: EmptyObject;
 };
 
+export type TestingGetReserveHistoryOp = {
+  op: WalletApiOperation.TestingGetReserveHistory;
+  request: EmptyObject;
+  response: any;
+};
+
 /**
  * Get stats about an exchange denomination.
  */
@@ -1222,6 +1247,7 @@ export type WalletOperations = {
   [WalletApiOperation.GetVersion]: GetVersionOp;
   [WalletApiOperation.PreparePayForUri]: PreparePayForUriOp;
   [WalletApiOperation.SharePayment]: SharePaymentOp;
+  [WalletApiOperation.CheckPayForTemplate]: CheckPayForTemplateOp;
   [WalletApiOperation.PreparePayForTemplate]: PreparePayForTemplateOp;
   [WalletApiOperation.GetContractTermsDetails]: GetContractTermsDetailsOp;
   [WalletApiOperation.WithdrawTestkudos]: WithdrawTestkudosOp;
@@ -1329,6 +1355,8 @@ export type WalletOperations = {
   [WalletApiOperation.PrepareBankIntegratedWithdrawal]: PrepareBankIntegratedWithdrawalOp;
   [WalletApiOperation.ConfirmWithdrawal]: ConfirmWithdrawalOp;
   [WalletApiOperation.CanonicalizeBaseUrl]: CanonicalizeBaseUrlOp;
+  [WalletApiOperation.TestingGetReserveHistory]: TestingGetReserveHistoryOp;
+  [WalletApiOperation.HintNetworkAvailability]: HintNetworkAvailabilityOp;
 };
 
 export type WalletCoreRequestType<