gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[taler-wallet-core] branch master updated (dcc1bcee -> ef1aab52)


From: gnunet
Subject: [taler-wallet-core] branch master updated (dcc1bcee -> ef1aab52)
Date: Wed, 07 Sep 2022 15:55:58 +0200

This is an automated email from the git hooks/post-receive script.

dold pushed a change to branch master
in repository wallet-core.

    from dcc1bcee also accept payment in test
     new 3ce5eb4b allow age-restricted withdrawal from the CLI
     new 6222f831 build extension with sourcemaps per default
     new ef1aab52 common manifest, bump version

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 build-system/Makefile                              |  2 +-
 packages/taler-wallet-cli/src/index.ts             | 41 ++++++++++++++++++++++
 .../taler-wallet-webextension/manifest-common.json | 18 ++++++++++
 .../taler-wallet-webextension/manifest-v2.json     | 18 +---------
 .../taler-wallet-webextension/manifest-v3.json     |  5 ---
 packages/taler-wallet-webextension/pack.sh         |  8 ++---
 6 files changed, 64 insertions(+), 28 deletions(-)
 create mode 100644 packages/taler-wallet-webextension/manifest-common.json

diff --git a/build-system/Makefile b/build-system/Makefile
index 65e0e923..4ccd9ba5 100644
--- a/build-system/Makefile
+++ b/build-system/Makefile
@@ -75,7 +75,7 @@ anastasis-webui-dev:
 webextension:
        pnpm install --frozen-lockfile --filter 
@gnu-taler/taler-wallet-webextension...
        pnpm run --filter @gnu-taler/taler-wallet-webextension... compile
-       cd ./packages/taler-wallet-webextension/ && ./pack.sh prod
+       cd ./packages/taler-wallet-webextension/ && ./pack.sh dev
 
 .PHONY: webextension-dev
 webextension-dev:
diff --git a/packages/taler-wallet-cli/src/index.ts 
b/packages/taler-wallet-cli/src/index.ts
index 2a594bd6..2ed37142 100644
--- a/packages/taler-wallet-cli/src/index.ts
+++ b/packages/taler-wallet-cli/src/index.ts
@@ -49,6 +49,7 @@ import {
   AgeRestriction,
   getRandomBytes,
   encodeCrock,
+  j2s,
 } from "@gnu-taler/taler-util";
 import {
   NodeHttpLib,
@@ -381,6 +382,46 @@ walletCli
     });
   });
 
+walletCli
+  .subcommand("withdraw", "withdraw", {
+    help: "Withdraw with a taler://withdraw/ URI",
+  })
+  .requiredArgument("uri", clk.STRING)
+  .maybeOption("restrictAge", ["--restrict-age"], clk.STRING)
+  .action(async (args) => {
+    const uri = args.withdraw.uri;
+    const restrictAge =
+      args.withdraw.restrictAge == null
+        ? undefined
+        : Number.parseInt(args.withdraw.restrictAge);
+    console.log(`age restriction requested (${restrictAge})`);
+    await withWallet(args, async (wallet) => {
+      const withdrawInfo = await wallet.client.call(
+        WalletApiOperation.GetWithdrawalDetailsForUri,
+        {
+          talerWithdrawUri: uri,
+          restrictAge,
+        },
+      );
+      console.log("withdrawInfo", withdrawInfo);
+      const selectedExchange = withdrawInfo.defaultExchangeBaseUrl;
+      if (!selectedExchange) {
+        console.error("no suggested exchange!");
+        process.exit(1);
+        return;
+      }
+      const res = await wallet.client.call(
+        WalletApiOperation.AcceptBankIntegratedWithdrawal,
+        {
+          exchangeBaseUrl: selectedExchange,
+          talerWithdrawUri: uri,
+          restrictAge,
+        },
+      );
+      console.log(j2s(res));
+    });
+  });
+
 walletCli
   .subcommand("handleUri", "handle-uri", {
     help: "Handle a taler:// URI.",
diff --git a/packages/taler-wallet-webextension/manifest-common.json 
b/packages/taler-wallet-webextension/manifest-common.json
new file mode 100644
index 00000000..c2c1f243
--- /dev/null
+++ b/packages/taler-wallet-webextension/manifest-common.json
@@ -0,0 +1,18 @@
+{
+  "name": "GNU Taler Wallet (git)",
+  "description": "Privacy preserving and transparent payments",
+  "author": "GNU Taler Developers",
+  "version": "0.9.0.18",
+  "version_name": "0.9.0-dev.18",
+  "icons": {
+    "16": "static/img/taler-logo-16.png",
+    "19": "static/img/taler-logo-19.png",
+    "32": "static/img/taler-logo-32.png",
+    "38": "static/img/taler-logo-38.png",
+    "48": "static/img/taler-logo-48.png",
+    "64": "static/img/taler-logo-64.png",
+    "128": "static/img/taler-logo-128.png",
+    "256": "static/img/taler-logo-256.png",
+    "512": "static/img/taler-logo-512.png"
+  }
+}
diff --git a/packages/taler-wallet-webextension/manifest-v2.json 
b/packages/taler-wallet-webextension/manifest-v2.json
index 365ec14f..e2dd6762 100644
--- a/packages/taler-wallet-webextension/manifest-v2.json
+++ b/packages/taler-wallet-webextension/manifest-v2.json
@@ -1,10 +1,5 @@
 {
   "manifest_version": 2,
-  "name": "GNU Taler Wallet (git)",
-  "description": "Privacy preserving and transparent payments",
-  "author": "GNU Taler Developers",
-  "version": "0.9.0.17",
-  "version_name": "0.9.0-dev.17",
   "minimum_chrome_version": "51",
   "minimum_opera_version": "36",
   "browser_specific_settings": {
@@ -13,17 +8,6 @@
       "strict_min_version": "57.0"
     }
   },
-  "icons": {
-    "16": "static/img/taler-logo-16.png",
-    "19": "static/img/taler-logo-19.png",
-    "32": "static/img/taler-logo-32.png",
-    "38": "static/img/taler-logo-38.png",
-    "48": "static/img/taler-logo-48.png",
-    "64": "static/img/taler-logo-64.png",
-    "128": "static/img/taler-logo-128.png",
-    "256": "static/img/taler-logo-256.png",
-    "512": "static/img/taler-logo-512.png"
-  },
   "commands": {
     "_execute_browser_action": {
       "suggested_key": {
@@ -61,4 +45,4 @@
     "page": "static/background.html",
     "persistent": true
   }
-}
\ No newline at end of file
+}
diff --git a/packages/taler-wallet-webextension/manifest-v3.json 
b/packages/taler-wallet-webextension/manifest-v3.json
index ca0237ba..3ddaec51 100644
--- a/packages/taler-wallet-webextension/manifest-v3.json
+++ b/packages/taler-wallet-webextension/manifest-v3.json
@@ -1,10 +1,5 @@
 {
   "manifest_version": 3,
-  "name": "GNU Taler Wallet (git)",
-  "description": "Privacy preserving and transparent payments",
-  "author": "GNU Taler Developers",
-  "version": "0.9.0.17",
-  "version_name": "0.9.0-dev.17",
   "minimum_chrome_version": "88",
   "icons": {
     "16": "static/img/taler-logo-16.png",
diff --git a/packages/taler-wallet-webextension/pack.sh 
b/packages/taler-wallet-webextension/pack.sh
index 1555e51a..ca05f36d 100755
--- a/packages/taler-wallet-webextension/pack.sh
+++ b/packages/taler-wallet-webextension/pack.sh
@@ -11,12 +11,12 @@ fi
 
 [[ "$ENV" == "prod" || "$ENV" == "dev" ]] || { echo "first argument must be 
prod or dev"; exit 1; }
 
-vers_manifest=$(jq -r '.version' manifest-v2.json)
+vers_manifest=$(jq -r '.version' manifest-common.json)
 
 zipfile="taler-wallet-webextension-${vers_manifest}.zip"
 
 TEMP_DIR=$(mktemp -d)
-jq '. | .name = "GNU Taler Wallet" ' manifest-v2.json > $TEMP_DIR/manifest.json
+jq -s 'add | .name = "GNU Taler Wallet" ' manifest-common.json 
manifest-v2.json > $TEMP_DIR/manifest.json
 cp -r dist static $TEMP_DIR
 
 find $TEMP_DIR/dist \( -name "test.*" -o -name "*.test.*" -o -name "stories.*" 
-o -name "*.dev.*" \) -delete
@@ -35,12 +35,10 @@ mkdir -p extension/v2/unpacked
 echo "Packed webextension: extension/v2/$zipfile"
 cp -rf src extension/v2/unpacked
 
-vers_manifest=$(jq -r '.version' manifest-v3.json)
-
 zipfile="taler-wallet-webextension-${vers_manifest}.zip"
 
 TEMP_DIR=$(mktemp -d)
-jq '. | .name = "GNU Taler Wallet" ' manifest-v3.json > $TEMP_DIR/manifest.json
+jq -s 'add | .name = "GNU Taler Wallet" ' manifest-common.json 
manifest-v3.json > $TEMP_DIR/manifest.json
 cp -r dist static service_worker.js $TEMP_DIR
 
 find $TEMP_DIR/dist \( -name "test.*" -o -name "*.test.*" -o -name "stories.*" 
-o -name "*.dev.*" \) -delete

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]