Skip to content

Commit 0c89327

Browse files
stevenjstevenj
committed
Merge branch 'main' into feat/voting-formats
2 parents 62cad47 + 8e1eb8f commit 0c89327

File tree

165 files changed

+8932
-5667
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

165 files changed

+8932
-5667
lines changed

‎Earthfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
VERSION 0.8
22

3-
IMPORT github.com/input-output-hk/catalyst-ci/earthly/mdlint:v3.5.12 AS mdlint-ci
4-
IMPORT github.com/input-output-hk/catalyst-ci/earthly/cspell:v3.5.12 AS cspell-ci
5-
IMPORT github.com/input-output-hk/catalyst-ci/earthly/python:v3.5.12 AS python-ci
6-
IMPORT github.com/input-output-hk/catalyst-ci:v3.5.12 AS cat-ci
3+
IMPORT github.com/input-output-hk/catalyst-ci/earthly/mdlint:v3.5.17 AS mdlint-ci
4+
IMPORT github.com/input-output-hk/catalyst-ci/earthly/cspell:v3.5.17 AS cspell-ci
5+
IMPORT github.com/input-output-hk/catalyst-ci/earthly/python:v3.5.17 AS python-ci
6+
IMPORT github.com/input-output-hk/catalyst-ci:v3.5.17 AS cat-ci
77

88
FROM debian:stable-slim
99

‎docs/Earthfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
VERSION 0.8
22

3-
IMPORT github.com/input-output-hk/catalyst-ci/earthly/docs:v3.5.12 AS docs-ci
3+
IMPORT github.com/input-output-hk/catalyst-ci/earthly/docs:v3.5.17 AS docs-ci
44

55
IMPORT .. AS repo
66

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
VERSION 0.8
22

3-
IMPORT github.com/input-output-hk/catalyst-ci/earthly/cddl:v3.5.12 AS cddl-ci
3+
IMPORT github.com/input-output-hk/catalyst-ci/earthly/cddl:v3.5.17 AS cddl-ci
44

55
check-cddl:
66
FROM cddl-ci+cddl-base

‎docs/src/architecture/08_concepts/immutable_ledger/cddl/Earthfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
VERSION 0.8
22

3-
IMPORT github.com/input-output-hk/catalyst-ci/earthly/cddl:v3.5.12 AS cddl-ci
3+
IMPORT github.com/input-output-hk/catalyst-ci/earthly/cddl:v3.5.17 AS cddl-ci
44

55
check-cddl:
66
FROM cddl-ci+cddl-base

‎docs/src/architecture/08_concepts/signed_doc/cddl/Earthfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
VERSION 0.8
22

3-
IMPORT github.com/input-output-hk/catalyst-ci/earthly/cddl:v3.5.12 AS cddl-ci
3+
IMPORT github.com/input-output-hk/catalyst-ci/earthly/cddl:v3.5.17 AS cddl-ci
44

55
check-cddl:
66
FROM cddl-ci+cddl-base

‎docs/src/architecture/08_concepts/signed_doc/cddl/collaborators.cddl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33

44
; Allowed Collaborators on the next subsequent version of a document.
5-
collaborators = [ * catalyst_id_kid ]
5+
collaborators = [ + catalyst_id_kid ]
66

77
; UTF8 Catalyst ID URI encoded as a bytes string.
88
catalyst_id_kid = bytes

‎docs/src/architecture/08_concepts/signed_doc/cddl/signed_document.cddl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ section_ref = json_pointer
117117
json_pointer = text
118118

119119
; Allowed Collaborators on the next subsequent version of a document.
120-
collaborators = [ * catalyst_id_kid ]
120+
collaborators = [ + catalyst_id_kid ]
121121

122122
; UTF8 Catalyst ID URI encoded as a bytes string.
123123
catalyst_id_kid = bytes

‎docs/src/architecture/08_concepts/signed_doc/docs/brand_parameters.md‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -186,18 +186,16 @@ The following Admin roles may sign documents of this type:
186186

187187
* Brand Admin
188188

189-
New versions of this document may be published by:
190-
191-
* author
192-
* collaborators
189+
Updates are allowed by the original author and from the 'collaborators' metadata field
190+
of the previous submitted document's version.
193191

194192
## Copyright
195193

196194
| Copyright | :copyright: 2024-2025 IOG Singapore, All Rights Reserved |
197195
| --- | --- |
198196
| License | This document is licensed under [CC-BY-4.0] |
199197
| Created | 2024-12-27 |
200-
| Modified | 2025-09-09 |
198+
| Modified | 2025-10-24 |
201199
| Authors | Alex Pozhylenkov <[email protected]> |
202200
| | Nathan Bogale <[email protected]> |
203201
| | Neil McAuliffe <[email protected]> |

‎docs/src/architecture/08_concepts/signed_doc/docs/brand_parameters_form_template.md‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,17 +123,15 @@ The following Admin roles may sign documents of this type:
123123

124124
* Brand Admin
125125

126-
New versions of this document may be published by:
127-
128-
* author
126+
Only the original author can update and sign a new version of documents.
129127

130128
## Copyright
131129

132130
| Copyright | :copyright: 2024-2025 IOG Singapore, All Rights Reserved |
133131
| --- | --- |
134132
| License | This document is licensed under [CC-BY-4.0] |
135133
| Created | 2024-12-27 |
136-
| Modified | 2025-09-09 |
134+
| Modified | 2025-10-24 |
137135
| Authors | Alex Pozhylenkov <[email protected]> |
138136
| | Nathan Bogale <[email protected]> |
139137
| | Neil McAuliffe <[email protected]> |

‎docs/src/architecture/08_concepts/signed_doc/docs/campaign_parameters.md‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -215,18 +215,16 @@ The following Admin roles may sign documents of this type:
215215

216216
* Brand Admin
217217

218-
New versions of this document may be published by:
219-
220-
* author
221-
* collaborators
218+
Updates are allowed by the original author and from the 'collaborators' metadata field
219+
of the previous submitted document's version.
222220

223221
## Copyright
224222

225223
| Copyright | :copyright: 2024-2025 IOG Singapore, All Rights Reserved |
226224
| --- | --- |
227225
| License | This document is licensed under [CC-BY-4.0] |
228226
| Created | 2024-12-27 |
229-
| Modified | 2025-09-09 |
227+
| Modified | 2025-10-24 |
230228
| Authors | Alex Pozhylenkov <[email protected]> |
231229
| | Nathan Bogale <[email protected]> |
232230
| | Neil McAuliffe <[email protected]> |

0 commit comments

Comments
 (0)