aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--articles/ui/figs/contract.pdfbin0 -> 36618 bytes
-rw-r--r--articles/ui/figs/contract.pml31
-rw-r--r--articles/ui/figs/taler-pay.pdfbin27727 -> 192494 bytes
-rw-r--r--articles/ui/figs/taler-pay.pml (renamed from articles/pml/taler-pay.pml)5
-rw-r--r--articles/ui/figs/taler-withdraw.pdfbin21753 -> 125265 bytes
-rw-r--r--articles/ui/figs/taler-withdraw.pml (renamed from articles/pml/taler-withdraw.pml)11
-rw-r--r--articles/ui/figs/taler-withdraw.pngbin0 -> 54609 bytes
7 files changed, 40 insertions, 7 deletions
diff --git a/articles/ui/figs/contract.pdf b/articles/ui/figs/contract.pdf
new file mode 100644
index 000000000..e83162109
--- /dev/null
+++ b/articles/ui/figs/contract.pdf
Binary files differ
diff --git a/articles/ui/figs/contract.pml b/articles/ui/figs/contract.pml
new file mode 100644
index 000000000..74bf23dd6
--- /dev/null
+++ b/articles/ui/figs/contract.pml
@@ -0,0 +1,31 @@
+
+@startuml
+
+hide footbox
+
+box "User"
+ Participant "Wallet" as W
+ Participant "Browser" as U
+end box
+
+box "Merchant"
+ Participant "Storefront" as S
+ Participant "Backend" as B
+end box
+
+autonumber
+
+S -> B : proposed contract
+B -> S : signed contract
+
+S -> U : custom (HTTP(S))
+
+U -> W : signed contract
+W -> U : signed coins
+
+U -> S : custom (HTTP(S))
+
+S -> B : signed coins (HTTP(S))
+B -> S : confirmation (HTTP(S))
+
+@enduml
diff --git a/articles/ui/figs/taler-pay.pdf b/articles/ui/figs/taler-pay.pdf
index 590fff216..818ddc66a 100644
--- a/articles/ui/figs/taler-pay.pdf
+++ b/articles/ui/figs/taler-pay.pdf
Binary files differ
diff --git a/articles/pml/taler-pay.pml b/articles/ui/figs/taler-pay.pml
index 9efd779ae..56d5c0c3c 100644
--- a/articles/pml/taler-pay.pml
+++ b/articles/ui/figs/taler-pay.pml
@@ -1,5 +1,4 @@
@startuml
-!includeurl https://raw.githubusercontent.com/w3c/webpayments/gh-pages/PaymentFlows/skin.ipml
Actor "Payer (Shopper) Browser" as Payer
Participant "Payee (Merchant) Site" as Payee
@@ -10,7 +9,7 @@ note over Payee, Exchange: HTTP/HTTPS
title Taler (Payment)
-== Establish Payment Obligation ==
+== Establish Contract ==
opt
Payer->Payer: Select Taler payment method (skippable with auto-detection)
@@ -39,7 +38,7 @@ Payee->Payer: Confirm payment
opt
Payer->Payee: Request fulfillment (if Web article)
-Payee->Payer: Provide media product
+Payee->Payer: Provide product resource
end
@enduml
diff --git a/articles/ui/figs/taler-withdraw.pdf b/articles/ui/figs/taler-withdraw.pdf
index 1bf3ee484..8706b447c 100644
--- a/articles/ui/figs/taler-withdraw.pdf
+++ b/articles/ui/figs/taler-withdraw.pdf
Binary files differ
diff --git a/articles/pml/taler-withdraw.pml b/articles/ui/figs/taler-withdraw.pml
index fa0640660..6860bb940 100644
--- a/articles/pml/taler-withdraw.pml
+++ b/articles/ui/figs/taler-withdraw.pml
@@ -1,5 +1,4 @@
@startuml
-!includeurl https://raw.githubusercontent.com/w3c/webpayments/gh-pages/PaymentFlows/skin.ipml
Actor "Customer Browser" as Customer
Participant "Bank Site" as Bank
@@ -7,7 +6,7 @@ Participant "Taler Exchange" as Exchange
note over Customer, Bank: HTTPS
note over Customer, Exchange: HTTPS
-note over Bank, Exchange: SEPA
+note over Bank, Exchange: wire transfer
title Taler (Withdraw coins)
@@ -16,8 +15,8 @@ Bank->Customer: send account portal
Customer->Customer: initiate withdrawal (specify amount and exchange)
-Customer->Exchange: request key material and wire transfer data
-Exchange->Customer: send key material and wire transfer data
+Customer->Exchange: request coin denomination keys and wire transfer data
+Exchange->Customer: send coin denomination keys and wire transfer data
Customer->Bank: execute withdrawal
@@ -30,4 +29,8 @@ Bank->Customer: withdrawal confirmation
Bank->Exchange: execute wire transfer
+Customer->Exchange: withdraw request
+Customer->Exchange: signed blinded coins
+Customer->Customer: unblind coins
+
@enduml
diff --git a/articles/ui/figs/taler-withdraw.png b/articles/ui/figs/taler-withdraw.png
new file mode 100644
index 000000000..6e3f0f4a0
--- /dev/null
+++ b/articles/ui/figs/taler-withdraw.png
Binary files differ