commit 19e2c2430d971ecc3e3d673a4273e9d1048e6000
parent a8e2d108e4295abcb0dc79e1b4f774cc04f8c93d
Author: Florian Dold <florian.dold@gmail.com>
Date: Sat, 14 May 2016 02:15:32 +0200
diagrams
Diffstat:
9 files changed, 111 insertions(+), 78 deletions(-)
diff --git a/articles/pml/taler-pay.pml b/articles/pml/taler-pay.pml
@@ -1,45 +0,0 @@
-@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
-Participant "Taler Exchange" as Exchange
-
-note over Payer, Payee: Tor/HTTPS
-note over Payee, Exchange: HTTP/HTTPS
-
-title Taler (Payment)
-
-== Establish Payment Obligation ==
-
-opt
-Payer->Payer: Select Taler payment method (skippable with auto-detection)
-end
-
-Payer->Payee: Choose goods
-
-Payee->Payer: Send signed digital contract proposal
-
-== Execute Payment ==
-
-opt
-Payer->Payer: Affirm contract
-end
-
-Payer->Payee: Send payment
-
-Payee->Exchange: Forward payment
-
-Exchange->Payee: Confirm payment
-
-== Fulfilment ==
-
-Payee->Payer: Confirm payment
-
-opt
-Payer->Payee: Request fulfillment (if Web article)
-
-Payee->Payer: Provide media product
-end
-
-@enduml
diff --git a/articles/pml/taler-withdraw.pml b/articles/pml/taler-withdraw.pml
@@ -1,33 +0,0 @@
-@startuml
-!includeurl https://raw.githubusercontent.com/w3c/webpayments/gh-pages/PaymentFlows/skin.ipml
-
-Actor "Customer Browser" as Customer
-Participant "Bank Site" as Bank
-Participant "Taler Exchange" as Exchange
-
-note over Customer, Bank: HTTPS
-note over Customer, Exchange: HTTPS
-note over Bank, Exchange: SEPA
-
-title Taler (Withdraw coins)
-
-Customer->Bank: user authentication
-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->Bank: execute withdrawal
-
-opt
-Bank->Customer: request transaction authorization
-Customer->Bank: transaction authorization
-end
-
-Bank->Customer: withdrawal confirmation
-Bank->Exchange: execute wire transfer
-
-
-@enduml
diff --git a/articles/ui/figs/contract.pdf b/articles/ui/figs/contract.pdf
Binary files differ.
diff --git a/articles/ui/figs/contract.pml 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
Binary files differ.
diff --git a/articles/ui/figs/taler-pay.pml b/articles/ui/figs/taler-pay.pml
@@ -0,0 +1,44 @@
+@startuml
+
+Actor "Payer (Shopper) Browser" as Payer
+Participant "Payee (Merchant) Site" as Payee
+Participant "Taler Exchange" as Exchange
+
+note over Payer, Payee: Tor/HTTPS
+note over Payee, Exchange: HTTP/HTTPS
+
+title Taler (Payment)
+
+== Establish Contract ==
+
+opt
+Payer->Payer: Select Taler payment method (skippable with auto-detection)
+end
+
+Payer->Payee: Choose goods
+
+Payee->Payer: Send signed digital contract proposal
+
+== Execute Payment ==
+
+opt
+Payer->Payer: Affirm contract
+end
+
+Payer->Payee: Send payment
+
+Payee->Exchange: Forward payment
+
+Exchange->Payee: Confirm payment
+
+== Fulfilment ==
+
+Payee->Payer: Confirm payment
+
+opt
+Payer->Payee: Request fulfillment (if Web article)
+
+Payee->Payer: Provide product resource
+end
+
+@enduml
diff --git a/articles/ui/figs/taler-withdraw.pdf b/articles/ui/figs/taler-withdraw.pdf
Binary files differ.
diff --git a/articles/ui/figs/taler-withdraw.pml b/articles/ui/figs/taler-withdraw.pml
@@ -0,0 +1,36 @@
+@startuml
+
+Actor "Customer Browser" as Customer
+Participant "Bank Site" as Bank
+Participant "Taler Exchange" as Exchange
+
+note over Customer, Bank: HTTPS
+note over Customer, Exchange: HTTPS
+note over Bank, Exchange: wire transfer
+
+title Taler (Withdraw coins)
+
+Customer->Bank: user authentication
+Bank->Customer: send account portal
+
+Customer->Customer: initiate withdrawal (specify amount and exchange)
+
+Customer->Exchange: request coin denomination keys and wire transfer data
+Exchange->Customer: send coin denomination keys and wire transfer data
+
+Customer->Bank: execute withdrawal
+
+opt
+Bank->Customer: request transaction authorization
+Customer->Bank: transaction authorization
+end
+
+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
Binary files differ.
