wip

Author: Mr-Leshiy

docs/src/architecture/08_concepts/catalyst_voting/cddl/Earthfile

@@ -7,8 +7,13 @@ check-cddl:
 
     WORKDIR /cddl
 
-    COPY ./gen_vote_tx.cddl ./vote_tx_v2.cddl ./gen_vote_tx_cose_payload.cddl .
+    COPY ./gen_vote_tx.cddl \
+         ./vote_tx_v2_public.cddl \
+         ./vote_tx_v2_private.cddl \
+         ./gen_vote_tx_cose_payload.cddl \
+        .
 
     RUN cddlc -2 gen_vote_tx_cose_payload.cddl
     RUN cddlc -2 gen_vote_tx.cddl
-    RUN cddlc -2 vote_tx_v2.cddl
+    RUN cddlc -2 vote_tx_v2_public.cddl
+    RUN cddlc -2 vote_tx_v2_private.cddl

docs/src/architecture/08_concepts/catalyst_voting/cddl/vote_tx_v2_private.cddl

@@ -1,12 +1,7 @@
 vote-tx-v2 = gen-vote-tx<choice-data, proof-data, proposal>
 
-choice-data = public-choice / private-choice
-
-public-choice = uint
-private-choice = ciphertext
-
+choice-data = ciphertext
 ciphertext = [group-element, group-element]
-group-element = bytes .size 32
 
 proposal = UUID
 

docs/src/architecture/08_concepts/catalyst_voting/cddl/vote_tx_v2_public.cddl

@@ -1,24 +1,8 @@
-vote-tx-v2 = gen-vote-tx<choice-data, proof-data, proposal>
-
-choice-data = public-choice / private-choice
-
-public-choice = uint
-private-choice = ciphertext
-
-ciphertext = [group-element, group-element]
-group-element = bytes .size 32
+vote-tx-v2-public = gen-vote-tx<choice-data, proof-data, proposal>
 
+choice-data = uint
+proof-data = undefined
 proposal = UUID
 
-proof-data = zk-proof
-
-zk-proof = [[+ (announcement, ~ciphertext, r-response)], scalar]
-
-announcement = (group-element, group-element, group-element)
-r-response = (scalar, scalar, scalar)
-
-scalar = bytes .size 32
-group-element = bytes .size 32
-
 ;# include gen_vote_tx
 

docs/src/architecture/08_concepts/catalyst_voting/v2.md

@@ -26,22 +26,27 @@ defined on top the ["Generalized Vote Transaction"](./gen_vote_tx.md#specificati
 
 Following that spec need to define a format of `choice`, `proof` and `prop_id`.
 
-<!-- markdownlint-disable max-one-sentence-per-line -->
-!!! note
-
-    - If `choice` is *public* one, `proof` **must** be `null`.
-    - If `choice` is *private* one, `proof` **must** be **not** `null`.
-<!-- markdownlint-disable max-one-sentence-per-line -->
+### Public vote
 
 <!-- markdownlint-disable max-one-sentence-per-line code-block-style -->
-??? note "vote transaction v2 definition: `vote_tx_v2_public.cddl`"
+??? note "Public vote transaction v2 definition: `vote_tx_v2_public.cddl`"
 
     ```CDDL
     {{ include_file('src/architecture/08_concepts/catalyst_voting/cddl/vote_tx_v2_public.cddl', indent=4) }}
     ```
 <!-- markdownlint-enable max-one-sentence-per-line code-block-style -->
 
-### Vote generation
+### Private vote
+
+<!-- markdownlint-disable max-one-sentence-per-line code-block-style -->
+??? note "Private vote transaction v2 definition: `vote_tx_v2_private.cddl`"
+
+    ```CDDL
+    {{ include_file('src/architecture/08_concepts/catalyst_voting/cddl/vote_tx_v2_private.cddl', indent=4) }}
+    ```
+<!-- markdownlint-enable max-one-sentence-per-line code-block-style -->
+
+#### Vote generation
 
 To generate a cryptographically secured `private_choice` and `zk_proof` parts you can follow this [spec](./crypto.md#vote).
 Important to note,