Merge branch 'master' into age-withdraw

1 files changed, 19 insertions, 83 deletions

diff --git a/packages/taler-wallet-cli/src/index.ts b/packages/taler-wallet-cli/src/index.ts
index 9d840e5bb..36e7f7768 100644
--- a/packages/taler-wallet-cli/src/index.ts
+++ b/packages/taler-wallet-cli/src/index.ts
@@ -257,8 +257,7 @@ async function createLocalWallet(
     },
     cryptoWorkerType: walletCliArgs.wallet.cryptoWorker as any,
     config: {
-      features: {
-      },
+      features: {},
       testing: {
         devModeActive: checkEnvFlag("TALER_WALLET_DEV_MODE"),
         denomselAllowLate: checkEnvFlag(
@@ -651,9 +650,12 @@ walletCli
           });
           break;
         case TalerUriAction.Reward: {
-          const res = await wallet.client.call(WalletApiOperation.PrepareReward, {
-            talerRewardUri: uri,
-          });
+          const res = await wallet.client.call(
+            WalletApiOperation.PrepareReward,
+            {
+              talerRewardUri: uri,
+            },
+          );
           console.log("tip status", res);
           await wallet.client.call(WalletApiOperation.AcceptReward, {
             walletRewardId: res.walletRewardId,
@@ -874,95 +876,32 @@ const backupCli = walletCli.subcommand("backupArgs", "backup", {
   help: "Subcommands for backups",
 });
 
-backupCli
-  .subcommand("setDeviceId", "set-device-id")
-  .requiredArgument("deviceId", clk.STRING, {
-    help: "new device ID",
-  })
-  .action(async (args) => {
-    await withWallet(args, async (wallet) => {
-      await wallet.client.call(WalletApiOperation.SetWalletDeviceId, {
-        walletDeviceId: args.setDeviceId.deviceId,
-      });
-    });
-  });
-
-backupCli.subcommand("exportPlain", "export-plain").action(async (args) => {
+backupCli.subcommand("exportDb", "export-db").action(async (args) => {
   await withWallet(args, async (wallet) => {
-    const backup = await wallet.client.call(
-      WalletApiOperation.ExportBackupPlain,
-      {},
-    );
+    const backup = await wallet.client.call(WalletApiOperation.ExportDb, {});
     console.log(JSON.stringify(backup, undefined, 2));
   });
 });
 
-backupCli.subcommand("recoverySave", "save-recovery").action(async (args) => {
+backupCli.subcommand("storeBackup", "store-backup").action(async (args) => {
   await withWallet(args, async (wallet) => {
-    const recoveryJson = await wallet.client.call(
-      WalletApiOperation.ExportBackupRecovery,
+    const resp = await wallet.client.call(
+      WalletApiOperation.CreateStoredBackup,
       {},
     );
-    console.log(JSON.stringify(recoveryJson, undefined, 2));
+    console.log(JSON.stringify(resp, undefined, 2));
   });
 });
 
-backupCli.subcommand("run", "run").action(async (args) => {
+backupCli.subcommand("importDb", "import-db").action(async (args) => {
   await withWallet(args, async (wallet) => {
-    await wallet.client.call(WalletApiOperation.RunBackupCycle, {});
-  });
-});
-
-backupCli.subcommand("status", "status").action(async (args) => {
-  await withWallet(args, async (wallet) => {
-    const status = await wallet.client.call(
-      WalletApiOperation.GetBackupInfo,
-      {},
-    );
-    console.log(JSON.stringify(status, undefined, 2));
-  });
-});
-
-backupCli
-  .subcommand("recoveryLoad", "load-recovery")
-  .maybeOption("strategy", ["--strategy"], clk.STRING, {
-    help: "Strategy for resolving a conflict with the existing wallet key ('theirs' or 'ours')",
-  })
-  .action(async (args) => {
-    await withWallet(args, async (wallet) => {
-      const data = JSON.parse(await read(process.stdin));
-      let strategy: RecoveryMergeStrategy | undefined;
-      const stratStr = args.recoveryLoad.strategy;
-      if (stratStr) {
-        if (stratStr === "theirs") {
-          strategy = RecoveryMergeStrategy.Theirs;
-        } else if (stratStr === "ours") {
-          strategy = RecoveryMergeStrategy.Theirs;
-        } else {
-          throw Error("invalid recovery strategy");
-        }
-      }
-      await wallet.client.call(WalletApiOperation.ImportBackupRecovery, {
-        recovery: data,
-        strategy,
-      });
-    });
-  });
-
-backupCli
-  .subcommand("addProvider", "add-provider")
-  .requiredArgument("url", clk.STRING)
-  .maybeArgument("name", clk.STRING)
-  .flag("activate", ["--activate"])
-  .action(async (args) => {
-    await withWallet(args, async (wallet) => {
-      await wallet.client.call(WalletApiOperation.AddBackupProvider, {
-        backupProviderBaseUrl: args.addProvider.url,
-        activate: args.addProvider.activate,
-        name: args.addProvider.name || args.addProvider.url,
-      });
+    const dumpRaw = await read(process.stdin);
+    const dump = JSON.parse(dumpRaw);
+    await wallet.client.call(WalletApiOperation.ImportDb, {
+      dump,
     });
   });
+});
 
 const depositCli = walletCli.subcommand("depositArgs", "deposit", {
   help: "Subcommands for depositing money to payto:// accounts",
@@ -1681,6 +1620,3 @@ async function read(stream: NodeJS.ReadStream) {
 export function main() {
   walletCli.run();
 }
-function classifyTalerUri(uri: string) {
-  throw new Error("Function not implemented.");
-}