1 files changed, 34 insertions, 10 deletions

diff --git a/packages/taler-wallet-core/src/wallet.ts b/packages/taler-wallet-core/src/wallet.ts
index b7ba1a386..4b979c861 100644
--- a/packages/taler-wallet-core/src/wallet.ts
+++ b/packages/taler-wallet-core/src/wallet.ts
@@ -30,7 +30,7 @@ import {
   codecForAcceptExchangeTosRequest,
   codecForAcceptManualWithdrawalRequet,
   codecForAcceptPeerPullPaymentRequest,
-  codecForAcceptPeerPushPaymentRequest,
+  codecForAcceptPeerPushPaymentRequest as codecForConfirmPeerPushPaymentRequest,
   codecForAcceptTipRequest,
   codecForAddExchangeRequest,
   codecForAddKnownBankAccounts,
@@ -39,7 +39,7 @@ import {
   codecForApplyRefundFromPurchaseIdRequest,
   codecForApplyRefundRequest,
   codecForCheckPeerPullPaymentRequest,
-  codecForCheckPeerPushPaymentRequest,
+  codecForPreparePeerPushCreditRequest,
   codecForConfirmPayRequest,
   codecForCreateDepositGroupRequest,
   codecForDeleteTransactionRequest,
@@ -61,7 +61,7 @@ import {
   codecForPreparePayRequest,
   codecForPreparePayTemplateRequest,
   codecForPreparePeerPullPaymentRequest,
-  codecForPreparePeerPushPaymentRequest,
+  codecForCheckPeerPushDebitRequest,
   codecForPrepareRefundRequest,
   codecForPrepareTipRequest,
   codecForRetryTransactionRequest,
@@ -196,13 +196,13 @@ import {
 } from "./operations/pay-merchant.js";
 import {
   acceptIncomingPeerPullPayment,
-  acceptPeerPushPayment,
+  confirmPeerPushPayment,
   preparePeerPullCredit,
   preparePeerPushCredit,
   initiatePeerPullPayment,
   initiatePeerPushPayment,
   checkPeerPullPaymentInitiation,
-  preparePeerPushPayment,
+  checkPeerPushDebit,
   processPeerPullCredit,
   processPeerPushInitiation,
   processPeerPullDebit,
@@ -1428,21 +1428,25 @@ async function dispatchRequestInternal<Op extends WalletApiOperation>(
       await importDb(ws.db.idbHandle(), req.dump);
       return [];
     }
+    case WalletApiOperation.CheckPeerPushDebit: {
+      const req = codecForCheckPeerPushDebitRequest().decode(payload);
+      return await checkPeerPushDebit(ws, req);
+    }
     case WalletApiOperation.PreparePeerPushCredit: {
-      const req = codecForPreparePeerPushPaymentRequest().decode(payload);
-      return await preparePeerPushPayment(ws, req);
+      const req = codecForPreparePeerPushCreditRequest().decode(payload);
+      return await preparePeerPushCredit(ws, req);
     }
     case WalletApiOperation.InitiatePeerPushDebit: {
       const req = codecForInitiatePeerPushPaymentRequest().decode(payload);
       return await initiatePeerPushPayment(ws, req);
     }
     case WalletApiOperation.PreparePeerPushCredit: {
-      const req = codecForCheckPeerPushPaymentRequest().decode(payload);
+      const req = codecForPreparePeerPushCreditRequest().decode(payload);
       return await preparePeerPushCredit(ws, req);
     }
     case WalletApiOperation.ConfirmPeerPushCredit: {
-      const req = codecForAcceptPeerPushPaymentRequest().decode(payload);
-      return await acceptPeerPushPayment(ws, req);
+      const req = codecForConfirmPeerPushPaymentRequest().decode(payload);
+      return await confirmPeerPushPayment(ws, req);
     }
     case WalletApiOperation.CheckPeerPullCredit: {
       const req = codecForPreparePeerPullPaymentRequest().decode(payload);
@@ -1497,6 +1501,24 @@ export function getVersion(ws: InternalWalletState): WalletCoreVersion {
   return version;
 }
 
+function translateLegacyOperationNames(operation: string): string {
+  switch (operation) {
+    case "initiatePeerPullPayment":
+      return WalletApiOperation.InitiatePeerPullCredit.toString();
+    case "initiatePeerPushPayment":
+      return WalletApiOperation.InitiatePeerPushDebit.toString();
+    case "checkPeerPullPayment":
+      return WalletApiOperation.PreparePeerPullDebit.toString();
+    case "acceptPeerPullPayment":
+      return WalletApiOperation.ConfirmPeerPullDebit.toString();
+    case "checkPeerPushPayment":
+      return WalletApiOperation.PreparePeerPushCredit.toString();
+    case "acceptPeerPushPayment":
+      return WalletApiOperation.ConfirmPeerPushCredit.toString();
+  }
+  return operation;
+}
+
 /**
  * Handle a request to the wallet-core API.
  */
@@ -1506,6 +1528,8 @@ export async function handleCoreApiRequest(
   id: string,
   payload: unknown,
 ): Promise<CoreApiResponse> {
+  operation = translateLegacyOperationNames(operation);
+
   try {
     const result = await dispatchRequestInternal(ws, operation as any, payload);
     return {