[taler-donau] branch master updated: [doc] diagrams 2&3

[gnunet]

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

pius-loosli pushed a commit to branch master
in repository donau.

The following commit(s) were added to refs/heads/master by this push:
     new dea13e9  [doc] diagrams 2&3
dea13e9 is described below

commit dea13e91d211f1f74aa2720d90e0c10c1e77713f
Author: Pius Loosli <pius.loosli@students.bfh.ch>
AuthorDate: Fri Jan 19 18:10:11 2024 +0100

    [doc] diagrams 2&3
---
 doc/flows/diagrams/02-donate-light.plantuml       |   4 ++--
 doc/flows/diagrams/02-donate-light.png            | Bin 24177 -> 28244 bytes
 doc/flows/diagrams/02-donate.plantuml             |  27 +++++++++++-----------
 doc/flows/diagrams/02-donate.png                  | Bin 18291 -> 23924 bytes
 doc/flows/diagrams/03-donation-statement.plantuml |  26 +++++++++++++++++++++
 doc/flows/diagrams/03-donation-statement.png      | Bin 0 -> 25754 bytes
 doc/flows/main.tex                                |  11 ++++++---
 7 files changed, 50 insertions(+), 18 deletions(-)

diff --git a/doc/flows/diagrams/02-donate-light.plantuml 
b/doc/flows/diagrams/02-donate-light.plantuml
index 5dfb4a8..a7d0718 100644
--- a/doc/flows/diagrams/02-donate-light.plantuml
+++ b/doc/flows/diagrams/02-donate-light.plantuml
@@ -11,8 +11,8 @@ card Donor as donor
 card Charity as charity
 card Donau as donau
 
-donor "<latex>$\text{1. donation money,}$\\$\text{\bigl[ \bigr] blinded(donor 
id+nonce)}$</latex>" -> charity
-charity "<latex>$\text{   2.}$\\$\text{   \bigl[ \bigr] blinded(donor id + 
nonce)}$</latex>" --> donau
+donor "<latex>$\text{1. donation money,}$\\$\text{\bigl[ \bigr] 
\langle}\text{blinded(donor id + nonce),} K_x^{pub} \rangle$</latex>" -> charity
+charity "<latex>$\text{    2.}$\\$\text{    \bigl[ \bigr] 
\langle}\text{blinded(donor id + nonce),} K_x^{pub} \rangle$\\$\text{    
charity signature}$</latex>" --> donau
 
 donau --> charity : <latex>$\text{3. \bigl[ \bigr] blind signatures^*}$</latex>
 charity --> donor : <latex>$\text{4. \bigl[ \bigr] blind signatures^*}$</latex>
diff --git a/doc/flows/diagrams/02-donate-light.png 
b/doc/flows/diagrams/02-donate-light.png
index 3b62f85..6e2d373 100644
Binary files a/doc/flows/diagrams/02-donate-light.png and 
b/doc/flows/diagrams/02-donate-light.png differ
diff --git a/doc/flows/diagrams/02-donate.plantuml 
b/doc/flows/diagrams/02-donate.plantuml
index 6e5489e..c7b7f61 100644
--- a/doc/flows/diagrams/02-donate.plantuml
+++ b/doc/flows/diagrams/02-donate.plantuml
@@ -1,25 +1,26 @@
 @startuml
-left to right direction
+'left to right direction
 
 ' scale elements so that latex becomes proportionally smaller
-skinparam CardFontSize 20
+skinparam CardFontSize 25
 skinparam ArrowThickness 2
-
-note as leg
-<latex>$\overline{b} = blinded ...$</latex>
-<latex>$\mu = \langle \overline{b}, H(K^{pub}_x) \rangle$</latex>
-<latex>$\overline{\beta} = \text{blind signature}$</latex>
-end note
+' rectangular shaped arrow lines
+skinparam linetype ortho
 
 card Donor as donor
 card Charity as charity
 card Donau as donau
 
-donor --> charity : <latex>$\text{donation money} + \vec{\mu}$</latex>
-charity --> donau : <latex>$\vec{\mu}_s$</latex>
-
-donau --> charity : <latex>$\overline{\beta}_1,..., \overline{\beta}_n$</latex>
-charity --> donor : <latex>$\overline{\beta}_1,..., \overline{\beta}_n$</latex>
+donor "<latex>$\text{  1. }\vec\mu,$\\$\text{  donation money}$</latex>" -> 
charity
+charity "<latex>$\text{2. }\sigma_c\text{        }$$</latex>" -> donau
 
+donau --> charity : <latex>$\text{3. }\overline\beta_1, ..., 
\overline\beta_n$</latex>
+charity --> donor : <latex>$\text{4. }\overline\beta_1, ..., 
\overline\beta_n$</latex>
 
+note as leg #white
+<latex>$\overline{u} = \text{blinded unique donor identifiers}$</latex>
+<latex>$\mu = \langle \overline{u}, H(K^{pub}_x) \rangle$</latex>
+<latex>$\sigma_c = \text{sign(\vec{\mu}, C^{priv})}$</latex>
+<latex>$\overline{\beta} = \text{blind signature}$</latex>
+end note
 @enduml
diff --git a/doc/flows/diagrams/02-donate.png b/doc/flows/diagrams/02-donate.png
index f44020d..c88b60d 100644
Binary files a/doc/flows/diagrams/02-donate.png and 
b/doc/flows/diagrams/02-donate.png differ
diff --git a/doc/flows/diagrams/03-donation-statement.plantuml 
b/doc/flows/diagrams/03-donation-statement.plantuml
new file mode 100644
index 0000000..bde8ae5
--- /dev/null
+++ b/doc/flows/diagrams/03-donation-statement.plantuml
@@ -0,0 +1,26 @@
+@startuml
+'left to right direction
+
+' scale elements so that latex becomes proportionally smaller
+skinparam CardFontSize 25
+skinparam ArrowThickness 2
+' rectangular shaped arrow lines
+skinparam linetype ortho
+
+card "Validator(Tax office)" as validator
+card Donor as donor
+card Donau as donau
+
+donor "<latex>$\text{    1. }\vec{r}\text{, year}$</latex>" -> donau
+donau --> donor : <latex>$\text{2. }\sigma_s$</latex>
+donor -> validator : <latex>$\text{3. }QR$</latex>
+
+note as leg #white
+<latex>r = \text{donation receipt}</latex>
+<latex>$s = \text{random salt}$</latex>
+<latex>$i := H(\texttt{taxid}, s)$</latex>
+<latex>\sigma_s = sign(\langle i, \texttt{amount}_{Total}, \texttt{year}) 
\rangle, D^{priv})</latex>
+<latex>\texttt{QR} = \langle \texttt{taxid}, \texttt{salt}, \texttt{year}, 
\texttt{amount}, \text{$\sigma_s$} \rangle</latex>
+end note
+
+@enduml
diff --git a/doc/flows/diagrams/03-donation-statement.png 
b/doc/flows/diagrams/03-donation-statement.png
new file mode 100644
index 0000000..3497e64
Binary files /dev/null and b/doc/flows/diagrams/03-donation-statement.png differ
diff --git a/doc/flows/main.tex b/doc/flows/main.tex
index f273284..20a2c18 100644
--- a/doc/flows/main.tex
+++ b/doc/flows/main.tex
@@ -6,7 +6,7 @@
 \usepackage{parskip}
 \usepackage{graphicx}
 
-\graphicspath{ {./images/} }
+\graphicspath{ {./diagrams/} }
 
 % Margins
 \usepackage[top=3cm, left=3cm, right=3cm, bottom=3cm]{geometry}
@@ -28,7 +28,12 @@
 \input{definitions.tex}
 
 \section{Overview}
-\includegraphics[width=\textwidth]{overview}
+\subsection{Donation: spend and get donation receipt}
+\includegraphics[width=10cm]{02-donate}
+
+\subsection{Get donation statement for taxes after tax period}
+\includegraphics[width=10cm]{03-donation-statement}
+
 
 %\input{diagrams.tex}
 
@@ -45,7 +50,7 @@
 
 \subsubsection{Charity setup (Charity side and Donau side)}
 \begin{enumerate}
-  \item The \textbf{charity} generates the key pair $(C^{pub}, C^{priv})$ and 
downloads the \emph{donation unit public keys} from the donau.
+  \item The \textbf{charity} generates the key pair $(C^{pub}, C^{priv})$ and 
downloads the \emph{donation unit public keys} from the donau.\text
   
   \item The \textbf{charity} transmits $C^{pub}$ and the desired yearly 
donation limit to the party responsible for Donau administration using a 
\textbf{secure channel}.
   

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