wip

Author: Mr-Leshiy

docs/src/architecture/08_concepts/catalyst_voting/cddl/tx.cddl renamed to docs/src/architecture/08_concepts/catalyst_voting/cddl/gen_vote_tx.cddl

@@ -4,23 +4,28 @@ vote_tx = [
 ]
 
 vote_tx_body = [
-    vote_type: UUID ; e.g. Public or Private vote
+    vote_type
     event,
     votes,
-    voters_data: encoded_cbor
+    voters_data,
 ]
 
+vote_type = UUID ; e.g. Public or Private vote
 event = { * event_key => any }
 event_key = int / text
 
 votes = [+ vote]
 vote = [
-    choices: encoded-cbor,
-    proof: encoded-cbor,
-    prop_id: encoded-cbor,
+    choices,
+    proof,
+    prop_id,
 ]
 choices = [+ choice]
 choice = encoded-cbor
+proof = encoded-cbor \ null
+prop_id = encoded-cbor \ null
+
+voters_data = encoded-cbor
 
 UUID = #6.37(bytes) ; UUID type
 signature = #6.98(COSE_Sign) ; COSE signature

docs/src/architecture/08_concepts/catalyst_voting/cddl/tx_cose_payload.cddl renamed to docs/src/architecture/08_concepts/catalyst_voting/cddl/gen_vote_tx_cose_payload.cddl

@@ -0,0 +1,26 @@
+choice =  #6.24(bstr(choice_data))
+proof = #6.24(bstr(proof_data)) \ null
+prop_id = #6.24(bstr(proposal)) \ null
+
+
+choice_data = public_choice / private_choice
+
+public_choice = uint
+private_choice = ciphertext
+
+ciphertext = [group_element, group_element]
+group_element = bytes .size 32
+
+proposal = UUID
+
+proof_data = zk_proof
+
+zk_proof = [[+ (announcement, ciphertext, r-response)], scalar]
+
+announcement = (group_element, group_element, group_element)
+ciphertext = (group_element, group_element)
+r-response = (scalar, scalar, scalar)
+
+scalar = bytes .size 32
+group_element = bytes .size 32
+

docs/src/architecture/08_concepts/catalyst_voting/cddl/jorm_v2/choice.cddl

@@ -24,10 +24,10 @@ Project "Catalyst" requires a structure to keep people vote's data in the secure
 ## Specification
 
 <!-- markdownlint-disable max-one-sentence-per-line code-block-style -->
-??? note "vote transaction definition: `tx.cddl`"
+??? note "vote transaction definition: `gen_vote_tx.cddl`"
 
     ```CDDL
-    {{ include_file('src/architecture/08_concepts/catalyst_voting/cddl/tx.cddl', indent=4) }}
+    {{ include_file('src/architecture/08_concepts/catalyst_voting/cddl/gen_vote_tx.cddl', indent=4) }}
     ```
 <!-- markdownlint-enable max-one-sentence-per-line code-block-style -->
 
@@ -66,7 +66,7 @@ In particular it must be a [CBOR] encoded [BLAKE2b-256] hash bytes:
 
 <!-- markdownlint-disable code-block-style -->
 ```CDDL
-{{ include_file('src/architecture/08_concepts/catalyst_voting/cddl/tx_cose_payload.cddl') }}
+{{ include_file('src/architecture/08_concepts/catalyst_voting/cddl/get_vote_tx_cose_payload.cddl') }}
 ```
 <!-- markdownlint-enable code-block-style -->
 

docs/src/architecture/08_concepts/catalyst_voting/cddl/jorm_v2/proof.cddl

@@ -124,34 +124,18 @@ defined on top the ["Generalized Vote Transaction"](./gen_vote_tx.md#specificati
 
 Following that spec we need define a format of `choice`, `proof` and `prop_id`.
 
-`jorm_v2/choice.cddl`:
-
-<!-- markdownlint-disable code-block-style -->
-```cddl
-{{ include_file('src/architecture/08_concepts/catalyst_voting/cddl/jorm_v2/choice.cddl') }}
-```
-<!-- markdownlint-enable code-block-style -->
-
-`jorm_v2/proof.cddl`:
-
-<!-- markdownlint-disable code-block-style -->
-```cddl
-{{ include_file('src/architecture/08_concepts/catalyst_voting/cddl/jorm_v2/proof.cddl') }}
-```
-<!-- markdownlint-enable code-block-style -->
-
-`jorm_v2/prop_id.cddl`:
-
-<!-- markdownlint-disable code-block-style -->
-```cddl
-{{ include_file('src/architecture/08_concepts/catalyst_voting/cddl/jorm_v2/prop_id.cddl') }}
-```
-<!-- markdownlint-enable code-block-style -->
-
 !!! note
 
     If `choice` is a public one, `proof` **must** be `null`.
 
+<!-- markdownlint-disable max-one-sentence-per-line code-block-style -->
+??? note "vote transaction v2 definition: `vote_tx_v2.cddl`"
+
+    ```CDDL
+    {{ include_file('src/architecture/08_concepts/catalyst_voting/cddl/vote_tx_v2.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).