From 9b471718e3456acc9e993237bb968622f6f9dea2 Mon Sep 17 00:00:00 2001 From: Jeff Burdges Date: Sat, 1 Oct 2016 10:56:55 -0400 Subject: [PATCH 01/14] Minor tweaks to ui paper --- articles/ui/ui.bib | 6 +++--- articles/ui/ui.tex | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/articles/ui/ui.bib b/articles/ui/ui.bib index 05e00a44e..793cd721d 100644 --- a/articles/ui/ui.bib +++ b/articles/ui/ui.bib @@ -1,9 +1,9 @@ -@Misc{pigs, - author = {W3c}, +@Misc{w3cpig, + author = {W3C}, title = {Web Payments Payment Flows}, - howpublished = {\url{https://github.com/w3c/webpayments/tree/gh-pages/PaymentFlows}}, + howpublished = {\url{https://github.com/w3c/webpayments-flows/tree/gh-pages/TargetFlows}}, month = {February}, year = {2016}, } diff --git a/articles/ui/ui.tex b/articles/ui/ui.tex index 6a4dab10e..adf1a025f 100644 --- a/articles/ui/ui.tex +++ b/articles/ui/ui.tex @@ -174,7 +174,7 @@ protocols.\footnote{Details of the protocol are documented at \url{https://api.taler.net/}} The basic cryptography behind blind-signature based payment systems has been known for over 25 years~\cite{chaum1990untraceable}. However, it was not until 2015 that the W3C -started the payments working group~\cite{pigs} to explore requirements +started the payments working group~\cite{w3cpig} to explore requirements for deploying payment systems that are more secure and easy to use for the Web. Our work describes how a modern payment system using blind signatures could practically be integrated with the modern Web to @@ -263,7 +263,7 @@ issued by the customer's bank. \begin{center} \includegraphics[width=0.95\textwidth]{figs/cc3ds.pdf} \end{center} -\caption{Card payment processing with 3-D Secure (3DS). (From: W3C Web Payments IG.)} +\caption{Card payment processing with 3-D Secure (3DS). (From: W3C Web Payments WG \cite{w3cpig})} \label{fig:cc3ds} \end{figure*} %KG: I hope they can print this larger, because this is WAY too small to be of any use. @@ -291,7 +291,7 @@ of this, the data entry is often performed on a Web site that is operated by a third-party payment processor and {\em not} the merchant or the customer's bank. Figure~\ref{fig:cc3ds} shows a typical card-based payment process on the Web using the UML style of the W3C payment interest -group~\cite{pigs}. Most of the details are not relevant to this +group~\cite{w3cpig}. Most of the details are not relevant to this paper, but the diagram nicely illustrates the complexity of the common 3-D secure process. %KG: Define 3DS the FIRST time you use it. @@ -355,7 +355,7 @@ online shopping~\cite[p. 50]{ibi2014}. \begin{figure*}[b!] \includegraphics[width=\textwidth]{figs/bitcoin.pdf} -\caption{Bitcoin payment processing. (From: W3C Web Payments IG.)} +\caption{Bitcoin payment processing. (From: W3C Web Payments WG \cite{w3cpig})} \label{fig:bitcoin} \end{figure*} @@ -1549,7 +1549,7 @@ at \url{https://demo.taler.net/}. This work benefits from the financial support of the Brittany Region (ARED 9178) and a grant from the Renewable Freedom Foundation. We thank Bruno Haible for his financial support enabling us to -participate with the W3c payment working group. We thank the W3C +participate with the W3C payment working group. We thank the W3C payment working group for insightful discussions about Web payments. We thank Krista Grothoff and Neal Walfield for comments on an earlier draft of the paper. We thank Gabor Toth for his help with the From d2e0386638c9904906f0de6830e83f7b854c6f40 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Sun, 2 Oct 2016 23:42:10 +0200 Subject: [PATCH 02/14] respond to taler-payment-succeeded --- content_scripts/notify.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/content_scripts/notify.ts b/content_scripts/notify.ts index ed704aaf0..e4adaa3db 100644 --- a/content_scripts/notify.ts +++ b/content_scripts/notify.ts @@ -283,6 +283,10 @@ namespace TalerNotify { }) }); + addHandler("taler-payment-succeeded", (msg: any, sendResponse: any) => { + sendResponse(); + }); + addHandler("taler-get-payment", (msg: any, sendResponse: any) => { const walletMsg = { type: "execute-payment", @@ -319,4 +323,4 @@ namespace TalerNotify { }); }); } -} \ No newline at end of file +} From 26f9b48e09d64ba32c9d246a71050136901c3146 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Sun, 2 Oct 2016 23:43:29 +0200 Subject: [PATCH 03/14] update pre-release version --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index b33a91a12..ce36daf49 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "description": "Privacy preserving and transparent payments", "manifest_version": 2, "name": "GNU Taler Wallet (git)", - "version": "0.6.8", - "version_name": "0.0.1-pre4", + "version": "0.6.9", + "version_name": "0.0.1-pre5", "applications": { "gecko": { From de482c5845610daca30767e8332acc5a585a2aaf Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Mon, 3 Oct 2016 05:46:25 +0200 Subject: [PATCH 04/14] update npm dependencies --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 9ff26935a..4cc6c9a7c 100644 --- a/package.json +++ b/package.json @@ -21,11 +21,11 @@ "gulp-concat": "^2.6.0", "gulp-debug": "^2.1.2", "gulp-gzip": "^1.2.0", - "gulp-json-transform": "^0.3.0", + "gulp-json-transform": "^0.4.2", "gulp-rename": "^1.2.2", "gulp-stream": "0.0.2", "gulp-tar": "^1.8.0", - "gulp-typescript": "^2.10.0", + "gulp-typescript": "^3.0.2", "gulp-zip": "^3.1.0", "istanbul-lib-instrument": "^1.0.0-alpha.6", "jed": "^1.1.0", @@ -34,8 +34,8 @@ "po2json": "git+https://github.com/mikeedwards/po2json", "systemjs": "^0.19.14", "through2": "^2.0.1", - "typescript": "^2.0.2", + "typescript": "^2.0.3", "typhonjs-istanbul-instrument-jspm": "^0.1.0", - "vinyl": "^1.1.1" + "vinyl": "^2.0.0" } } From 4156e50b7a8d6955c23698c4b20fcabc41c06228 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Mon, 3 Oct 2016 16:30:35 +0200 Subject: [PATCH 05/14] make help local --- .gitmodules | 4 ---- pages/confirm-contract.html | 9 +-------- pages/help | 1 - pages/help/empty-wallet.html | 29 +++++++++++++++++++++++++++++ style/wallet.css | 11 ++++++----- 5 files changed, 36 insertions(+), 18 deletions(-) delete mode 160000 pages/help create mode 100644 pages/help/empty-wallet.html diff --git a/.gitmodules b/.gitmodules index 50f41d7fb..f2656da2f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,7 +2,3 @@ path = web-common url = git://taler.net/web-common branch = master -[submodule "pages/help"] - path = pages/help - url = git://taler.net/help - branch = master diff --git a/pages/confirm-contract.html b/pages/confirm-contract.html index c2d75ef5a..720bd3334 100644 --- a/pages/confirm-contract.html +++ b/pages/confirm-contract.html @@ -5,6 +5,7 @@ Taler Wallet: Confirm Reserve Creation + @@ -16,14 +17,6 @@