update v2 tx spec

Author: Mr-Leshiy

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

@@ -15,30 +15,14 @@ Created: 2024-09-04
 
 ## Abstract
 
-This document defines a generalized view of the "Catalyst" voting transaction.
+This document defines a generalized voting transaction [CDDL] structure.
 
 ## Motivation
 
 Project "Catalyst" requires a structure to keep people vote's data in the secure and verifiable way.
 
 ## Specification
 
-Generalized vote transaction is a [Catalyst Signed Document],
-so its fully follows the structure of the [Catalyst Signed Document] specification.
-
-* [`content type`](./../signed_doc/spec.md#content-type): `application/cbor`.
-  [Catalyst Signed Document content](./../signed_doc/spec.md#signed-object-content) must be a [CBOR] encoded.
-
-  ```CDDL
-  3 => 50
-  ```
-
-* [`content encoding`](./../signed_doc/spec.md#content-encoding-optional): is missing
-
-### Content format
-
-The generalized vote transaction [content format](./../signed_doc/spec.md#signed-object-content)
-
 <!-- markdownlint-disable max-one-sentence-per-line code-block-style -->
 ??? note "vote transaction definition: `gen_vote_tx.cddl`"
 
@@ -70,5 +54,4 @@ Vote:
 
 <!-- OPTIONAL SECTIONS: see CIP-0001 > Document > Structure table -->
 
-[Catalyst Signed Document]: ./../signed_doc/spec.md
-[CBOR]: https://datatracker.ietf.org/doc/rfc8949/
+[CDDL]: https://datatracker.ietf.org/doc/html/rfc8610

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

@@ -1,16 +1,9 @@
-# V2
-
 ---
-
 Title: Catalyst V2 Voting Transaction
-
 Status: Proposed
-
 Authors:
     - Alex Pozhylenkov <[email protected]>
-
 Created: 2024-10-24
-
 ---
 
 ## Abstract
@@ -21,12 +14,12 @@ This document describes a Catalyst V2 vote transaction structure.
 
 ## Specification
 
-It is a Catalyst v2 voting transaction
-defined on top the ["Generalized Vote Transaction"](./gen_vote_tx.md#specification) structure.
+Catalyst v2 voting transaction is a [Catalyst Signed Document],
+so its fully follows the structure of the [Catalyst Signed Document] specification.
 
-Following that spec need to define a `choice`, `proof` and `prop-id`.
+#### Metadata Fields
 
-Also additional [Catalyst Signed Document protected header fields](./../signed_doc/spec.md#catalyst-signed-document-fields) are defined,
+A list of used [Catalyst Signed Document protected header fields](./../signed_doc/spec.md#signed-object-fields).
 
 ```CDDL
 "brand_id" => UUID, ; UUID v4
@@ -44,7 +37,35 @@ Also additional [Catalyst Signed Document protected header fields](./../signed_d
 * `category_id` - a unique identifier which defines a voting category as a collection of proposals,
     e.g. "Development & Infrastructure", "Products & Integrations".
 
-### Public vote
+* [`content type`](./../signed_doc/spec.md#content-type): `application/cbor`.
+  [Catalyst Signed Document content] must be a [CBOR] encoded.
+
+  ```CDDL
+  3 => 50
+  ```
+
+* [`content encoding`](./../signed_doc/spec.md#content-encoding-optional): [Catalyst Signed Document content] must be [Brotli] compressed.
+
+  ```CDDL
+  "content-type" => "br"
+  ```
+
+
+##### Public vote
+
+For the public vote [`type`](./../signed_doc/spec.md#type) value defined as follows:
+
+* [`type`](./../signed_doc/spec.md#type): `8de5586c-e998-4b95-8742-7be3c8592803` [UUID] value.
+
+  ```CDDL
+  "type" => 37(h'8DE5586CE9984B9587427BE3C8592803')
+  ```
+
+###### Content format
+
+The public vote transaction [Catalyst Signed Document content] format is based on the [Generalized Vote Transaction Structure].
+
+Following that spec need to define a `choice`, `proof` and `prop-id`.
 
 <!-- markdownlint-disable max-one-sentence-per-line code-block-style -->
 ??? note "Public vote transaction v2 definition: `vote_tx_v2_public.cddl`"
@@ -54,13 +75,21 @@ Also additional [Catalyst Signed Document protected header fields](./../signed_d
     ```
 <!-- markdownlint-enable max-one-sentence-per-line code-block-style -->
 
-For the public vote [`type`](./../signed_doc/spec.md#type) value defined as follows:
+##### Private vote
 
-```CDDL
-vote-type = #6.37(h'8DE5586CE9984B9587427BE3C8592803') ; 8de5586c-e998-4b95-8742-7be3c8592803
-```
+For the private vote [`type`](./../signed_doc/spec.md#type) value defined as follows:
+
+* [`type`](./../signed_doc/spec.md#type): `e78ee18d-f380-44c1-a852-80aa6ecb07fe` [UUID] value.
+
+  ```CDDL
+  "type" => 37(h'E78EE18DF38044C1A85280AA6ECB07FE')
+  ```
 
-### Private vote
+###### Content format
+
+The private vote transaction [Catalyst Signed Document content] format is based on the [Generalized Vote Transaction Structure].
+
+Following that spec need to define a `choice`, `proof` and `prop-id`.
 
 <!-- markdownlint-disable max-one-sentence-per-line code-block-style -->
 ??? note "Private vote transaction v2 definition: `vote_tx_v2_private.cddl`"
@@ -70,13 +99,7 @@ vote-type = #6.37(h'8DE5586CE9984B9587427BE3C8592803') ; 8de5586c-e998-4b95-8742
     ```
 <!-- markdownlint-enable max-one-sentence-per-line code-block-style -->
 
-For the private vote [`type`](./../signed_doc/spec.md#type) value defined as follows:
-
-```CDDL
-vote-type = #6.37(h'E78EE18DF38044C1A85280AA6ECB07FE') ; e78ee18d-f380-44c1-a852-80aa6ecb07fe
-```
-
-#### Vote and Proof generation
+###### Vote and Proof generation
 
 To generate a cryptographically secured `choice-data` and `zk_proof` parts you can follow this [spec](./crypto.md#vote).
 Important to note,
@@ -99,5 +122,11 @@ the following properties are used:
 
 <!-- OPTIONAL SECTIONS: see CIP-0001 > Document > Structure table -->
 
+[Catalyst Signed Document]: ./../signed_doc/spec.md
+[Catalyst Signed Document content]: ./../signed_doc/spec.md#signed-object-content
+[Generalized Vote Transaction Structure]: ./gen_vote_tx.md
 [BLAKE2b-512]: https://www.blake2.net/blake2.pdf
 [ristretto255]: https://ristretto.group
+[Brotli]: https://datatracker.ietf.org/doc/html/rfc7932
+[UUID]: https://www.rfc-editor.org/rfc/rfc9562.html
+[CBOR]: https://datatracker.ietf.org/doc/rfc8949/

docs/src/architecture/08_concepts/signed_doc/types.md

@@ -14,6 +14,8 @@
 | 3e4808cc-c86e-467b-9702-d60baa9d1fca | `37(h'3e4808ccc86e467b9702d60baa9d1fca')` | Brand Parameters Document    | [Brotli] Compressed [JSON]        | *TBD*                                                                      |
 | fd3c1735-80b1-4eea-8d63-5f436d97ea31 | `37(h'fd3c173580b14eea8d635f436d97ea31')` | Brand Parameters Template    | [Brotli] Compressed [JSON Schema] | *TBD*                                                                      |
 | 5e60e623-ad02-4a1b-a1ac-406db978ee48 | `37(h'5e60e623ad024a1ba1ac406db978ee48')` | Proposal Action Document     | *TBD*                             | *TBD*                                                                      |
+| 8de5586c-e998-4b95-8742-7be3c8592803 | `37(h'8DE5586CE9984B9587427BE3C8592803')` | Public Vote Tx V2            | [Brotli] Compressed [CBOR]        | [Public Vote Tx V2 Spec](./../catalyst_voting/v2.md#public-vote)           |
+| e78ee18d-f380-44c1-a852-80aa6ecb07fe | `37(h'E78EE18DF38044C1A85280AA6ECB07FE')` | Private Vote Tx V2           | [Brotli] Compressed [CBOR]        | [Private Vote Tx V2 Spec](./../catalyst_voting/v2.md#private-vote)         |
 
 
 [JSON Schema]: https://json-schema.org/draft-07