Skip to content

Commit 8cbe99d

Browse files
authored
Merge branch 'main' into feat/rbac-registration
2 parents 3479ed4 + e3b9407 commit 8cbe99d

File tree

18 files changed

+921
-523
lines changed

18 files changed

+921
-523
lines changed

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

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
1-
gen-vote-tx<choice-t, proof-t, prop-id-t> = [
2-
tx-body<choice-t, proof-t, prop-id-t>,
1+
; All encoders/decoders of this specification must follow deterministic cbor encoding rules
2+
; https://datatracker.ietf.org/doc/html/draft-ietf-cbor-cde-06
3+
4+
gen-vote-tx<choice-t, proof-t, prop-id-t, voter-data-t> = [
5+
tx-body<choice-t, proof-t, prop-id-t, voter-data-t>,
36
signature
47
]
58

6-
tx-body<choice-t, proof-t, prop-id-t> = [
7-
vote-type
9+
tx-body<choice-t, proof-t, prop-id-t, voter-data-t> = [
10+
vote-type,
811
event,
912
votes<choice-t, proof-t, prop-id-t>,
10-
voter-data,
13+
voter-data<voter-data-t>,
1114
]
1215

1316
vote-type = UUID ; e.g. Public or Private vote
14-
event = { * event-key => any }
17+
event = { * event-key => event-value }
1518
event-key = int / text
19+
event-value = any
1620

1721
votes<choice-t, proof-t, prop-id-t> = [+ vote<choice-t, proof-t, prop-id-t>]
1822
vote<choice-t, proof-t, prop-id-t> = [
@@ -25,7 +29,7 @@ choice<choice-t> = #6.24(bytes .cbor choice-t) ; encoded-cbor
2529
proof<proof-t> = #6.24(bytes .cbor proof-t) ; encoded-cbor
2630
prop-id<prop-id-t> = #6.24(bytes .cbor prop-id-t) ; encoded-cbor
2731

28-
voter-data = encoded-cbor
32+
voter-data<voter-data-t> = #6.24(bytes .cbor voter-data-t) ; encoded-cbor
2933

3034
UUID = #6.37(bytes) ; UUID type
3135
signature = #6.98(cose.COSE_Sign) ; COSE signature
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1+
; All encoders/decoders of this specification must follow deterministic cbor encoding rules
2+
; https://datatracker.ietf.org/doc/html/draft-ietf-cbor-cde-06
3+
14
cose-payload = blake2b-256
25
blake2b-256 = #6.32782(bytes .size 32) ; Blake2b-256 hash bytes

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
vote-tx-v2 = gen-vote-tx<choice-data, proof-data, proposal>
1+
; All encoders/decoders of this specification must follow deterministic cbor encoding rules
2+
; https://datatracker.ietf.org/doc/html/draft-ietf-cbor-cde-06
3+
4+
vote-tx-v2<voter-data-t> = gen-vote-tx<choice-data, proof-data, proposal, voter-data-t>
25

36
choice-data = ciphertext
47
ciphertext = [group-element, group-element]

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
vote-tx-v2-public = gen-vote-tx<choice-data, proof-data, proposal>
1+
; All encoders/decoders of this specification must follow deterministic cbor encoding rules
2+
; https://datatracker.ietf.org/doc/html/draft-ietf-cbor-cde-06
3+
4+
vote-tx-v2-public<voter-data-t> = gen-vote-tx<choice-data, proof-data, proposal, voter-data-t>
25

36
choice-data = uint
47
proof-data = undefined

docs/src/architecture/08_concepts/immutable_ledger/cddl/block.cddl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
; All encoders/decoders of this specification must follow deterministic cbor encoding rules
2+
; https://datatracker.ietf.org/doc/html/draft-ietf-cbor-cde-06
3+
14
block = [
25
block-header,
36
block-data,

docs/src/architecture/08_concepts/immutable_ledger/cddl/genesis_to_prev_hash.cddl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
; All encoders/decoders of this specification must follow deterministic cbor encoding rules
2+
; https://datatracker.ietf.org/doc/html/draft-ietf-cbor-cde-06
3+
14
genesis-to-prev-hash = [
25
chain-id: ULID,
36
timestamp: #6.1(uint .ge 1722470400), ; Epoch-based date/time

docs/src/architecture/08_concepts/immutable_ledger/cddl/hash.cddl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
; All encoders/decoders of this specification must follow deterministic cbor encoding rules
2+
; https://datatracker.ietf.org/doc/html/draft-ietf-cbor-cde-06
3+
14
hash-bytes = (
25
#6.32781(bytes) / ; Blake3 hash
36
#6.32782(bytes) / ; Blake2b hash

0 commit comments

Comments
 (0)