Skip to content
Merged
Show file tree
Hide file tree
Changes from 46 commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
b5dcecf
fix(docs): Updated TODO place holder text with context
neil-iohk Apr 15, 2025
b69bf5e
fix(docs): Render docs with better placeholder
stevenj Apr 16, 2025
83f4486
docs(docs): Add more detail to proposal document specification
stevenj Apr 16, 2025
cb1d4b6
Merge branch 'main' into feat/add-more-doc-definitions
stevenj Apr 16, 2025
7cb2039
docs(docs): Add details to the Proposal Comment document
stevenj Apr 16, 2025
976cb62
docs(docs): Add more proposal submission actions specifications
stevenj Apr 16, 2025
d8d3e4b
docs(docs): random cleanups
stevenj Apr 16, 2025
e3efce8
docs(docs): fix markdown lint issues
stevenj Apr 16, 2025
e84e991
docs(docs): Use a CID for the document hash
stevenj Apr 16, 2025
7e5a545
docs(docs): Add document revocations to proposals and comments
stevenj Apr 16, 2025
4e4d1fa
docs(docs): turn hash into a map for better future proofing
stevenj Apr 16, 2025
c348c39
docs(docs): Use defined cbor tag and binary format for IPLD Content I…
stevenj Apr 17, 2025
9ca6df0
docs(docs): Removed obsolete cddl definition
stevenj Apr 17, 2025
b69144d
docs(docs): WIP cleanup and validaetg cddl defintions
stevenj Apr 17, 2025
b6ac004
docs(docs): Prep work to make it easier to generate CDDL files from s…
stevenj Apr 19, 2025
472e481
docs(docs): WIP cleanup of CDDL generation
stevenj Apr 20, 2025
b5ce707
docs(docs): Remove empty protected headers, as they can't be empty
stevenj Apr 20, 2025
f0adee6
feat(docs): Use latest draft cat-ci which supports relative file incl…
stevenj Apr 24, 2025
f19a2bb
fix(docs): cddl generation improvements
stevenj Apr 24, 2025
60945bc
fix(docs): misc bug fixes
stevenj Apr 24, 2025
ce004e0
Merge branch 'main' into feat/improve-cddl-definitions
stevenj Apr 25, 2025
3966784
feat(Python): Make sure all python in the repo is properly formatted …
stevenj Apr 25, 2025
1c9d852
Merge branch 'feat/improve-cddl-definitions' of github.com:input-outp…
stevenj Apr 25, 2025
11c7950
fix(docs): spelling
stevenj Apr 25, 2025
aa25114
docs(docs): Properly generalize document, signature and metadata headers
stevenj Apr 25, 2025
16a85ea
feat(docs): Make types.md generate under the new framework
stevenj Apr 25, 2025
4d2f51e
feat(docs): Improve metadata docs, and generate individual cddl files…
stevenj Apr 26, 2025
16f26f2
fix(docs): lint issue
stevenj Apr 26, 2025
b776ae0
fix(docs): cleanup spec deserialization to make accessing data easier…
stevenj Apr 29, 2025
f22f814
fix(docs): Make individual pages with the new spec generation framework
stevenj Apr 29, 2025
f0da499
fix: remove now unused files
stevenj Apr 29, 2025
bd63fa1
docs(docs): Add all the new docs generation stuff
stevenj May 1, 2025
26dcbe9
docs(docs): Fix lint issues
stevenj May 1, 2025
5e83744
Merge branch 'main' into feat/improve-cddl-definitions
stevenj May 1, 2025
e933cf6
fix(docs): one sentence mper link markdown fix
stevenj May 1, 2025
5d48787
Merge branch 'feat/improve-cddl-definitions' of github.com:input-outp…
stevenj May 1, 2025
abbf707
fix(docs): spell checking for dummys
stevenj May 1, 2025
88a2687
fix(docs): remove dev file
stevenj May 1, 2025
d46f8f9
fix(docs): Fix spec generation validation
stevenj May 1, 2025
534fc4b
fix(docs): Use latest cat-ci version
stevenj May 2, 2025
981680b
Merge branch 'main' into feat/improve-cddl-definitions
stevenj May 2, 2025
d1e0962
Merge branch 'main' into feat/improve-cddl-definitions
stevenj May 2, 2025
34b8e86
fix(docs): remove duplicated status on spec generation/validation
stevenj May 2, 2025
f4b2dc2
fix(docs): rename iana_media_types to just media_type
stevenj May 2, 2025
99951a6
Merge branch 'feat/improve-cddl-definitions' of github.com:input-outp…
stevenj May 2, 2025
be54ab7
feat(docs): Also support CoAP encoded media types.
stevenj May 2, 2025
96e9580
fix(docs): Properly constrain CoAP types to the known media types.
stevenj May 2, 2025
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions .config/dictionaries/project.dic
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,15 @@ blosc
bmac
bootstrapper
BROTLI
Cabe
cantopen
cardano
carryforward
CBOR
cbork
cddlc
cdylib
CELLBORDER
CEST
chacha
CHAINCODE
Expand Down Expand Up @@ -60,10 +62,13 @@ dbsync
dcbor
decompressor
delegators
direnv
displaydoc
dleq
dlog
dockerhub
docstrings
doctests
Dominik
dotenv
dotenvy
Expand All @@ -76,6 +81,7 @@ encryptor
Errno
Eternl
excalidraw
explicitely
extn
fadvise
fcntl
Expand All @@ -90,6 +96,7 @@ fmmap
fmtchk
fmtfix
fontawesome
fontname
fromfiledate
fsgr
fstat
Expand All @@ -102,10 +109,12 @@ getres
giantstep
gmtime
gossipsub
graphviz
happ
hardano
Hardlink
hasher
headlabel
heaptrack
hexdigit
highwater
Expand All @@ -120,13 +129,16 @@ ioerr
iohk
ipfs
ipld
ipynb
isort
jetbrains
jorm
jormungandr
Jörmungandr
jsonschema
Justfile
kiduri
labelloc
lcov
Leay
Leshiy
Expand Down Expand Up @@ -168,6 +180,7 @@ MPMC
msvc
Multiaddr
multiera
mypy
nanos
netkey
nextest
Expand All @@ -185,6 +198,7 @@ outlen
Outparam
outpubkey
parameterises
penwidth
permissioned
permissionless
pg_isready
Expand All @@ -205,9 +219,17 @@ pubkey
publickey
pubspec
pwrite
pycodestyle
pydantic
pydot
pyenv
Pyflakes
pypackages
pytest
pytype
qpsg
quic
rankdir
rapidoc
readlinkat
redoc
Expand Down Expand Up @@ -251,6 +273,7 @@ subsec
symlinkat
syscall
tacho
taillabel
testcase
testcov
testdocs
Expand All @@ -267,6 +290,7 @@ tofiledate
toobig
toolsets
Traceback
tstr
txmonitor
txns
typenum
Expand All @@ -282,6 +306,7 @@ utimensat
UTXO
uuidv4
uuidv7
venv
vitss
Vkey
vkeywitness
Expand Down
22 changes: 18 additions & 4 deletions Earthfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
VERSION 0.8

IMPORT github.com/input-output-hk/catalyst-ci/earthly/mdlint:v3.4.0 AS mdlint-ci
IMPORT github.com/input-output-hk/catalyst-ci/earthly/cspell:v3.4.0 AS cspell-ci

IMPORT github.com/input-output-hk/catalyst-ci/earthly/mdlint:v3.4.1 AS mdlint-ci
IMPORT github.com/input-output-hk/catalyst-ci/earthly/cspell:v3.4.1 AS cspell-ci
IMPORT github.com/input-output-hk/catalyst-ci/earthly/python:v3.4.1 AS python-ci
IMPORT github.com/input-output-hk/catalyst-ci:v3.4.1 AS cat-ci

FROM debian:stable-slim

Expand Down Expand Up @@ -42,9 +43,22 @@ repo-docs:
COPY --dir *.md LICENSE-APACHE LICENSE-MIT .

SAVE ARTIFACT /repo repo

# We lint python globally in repos, so that all scripts and programs
# are linted equally.
# Its also fast.
check-python:
DO python-ci+LINT_PYTHON

# Sync standard configs.
sync-config:
FROM scratch
COPY --dir cat-ci+repo-config/repo .

SAVE ARTIFACT /repo/ruff.toml AS LOCAL ruff.toml

# copy-specs : Copy the specs source folder.
copy-specs:
FROM scratch
COPY --dir specs ./specs
SAVE ARTIFACT /specs specs
SAVE ARTIFACT /specs specs
3 changes: 2 additions & 1 deletion Justfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ format-python-code:
ruff format .

# Fix and Check Markdown files
lint-python:
lint-python: format-python-code
ruff check --fix .
ruff check .

# generates specifications data
Expand Down
3 changes: 1 addition & 2 deletions docs/Earthfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
VERSION 0.8

IMPORT github.com/input-output-hk/catalyst-ci/earthly/docs:v3.4.0 AS docs-ci

IMPORT github.com/input-output-hk/catalyst-ci/earthly/docs:v3.4.1 AS docs-ci

IMPORT .. AS repo

Expand Down
4 changes: 2 additions & 2 deletions docs/src/appendix/important/license.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ icon: material/license
??? note "Apache 2 License"

```text
{{ include_file('includes/repo/LICENSE-APACHE', 0, -1, 8) }}
{{ include_file('includes/repo/LICENSE-APACHE', indent=8) }}
```

??? note "MIT License"

```text
{{ include_file('includes/repo/LICENSE-MIT', 0, -1, 8) }}
{{ include_file('includes/repo/LICENSE-MIT', indent=8) }}
```
2 changes: 1 addition & 1 deletion docs/src/appendix/tags.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ icon: fontawesome/solid/tags

# Tag Index

[TAGS]
<!-- material/tags -->
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
VERSION 0.8

IMPORT github.com/input-output-hk/catalyst-ci/earthly/cddl:v3.4.0 AS cddl-ci
IMPORT github.com/input-output-hk/catalyst-ci/earthly/cddl:v3.4.1 AS cddl-ci

check-cddl:
FROM cddl-ci+cddl-base
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Project "Catalyst" requires a structure to keep people vote's data in the secure
??? note "vote transaction definition: `gen_vote_tx.cddl`"

```CDDL
{{ include_file('src/architecture/08_concepts/catalyst_voting/cddl/gen_vote_tx.cddl', indent=4) }}
{{ include_file('./cddl/gen_vote_tx.cddl', indent=4) }}
```
<!-- markdownlint-enable max-one-sentence-per-line code-block-style -->

Expand Down
2 changes: 1 addition & 1 deletion docs/src/architecture/08_concepts/catalyst_voting/v1.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ An original Jörmungandr blockchain's `VoteCast` transaction structure.
??? note "V1 transaction definition: `jorm.abnf`"

```abnf
{{ include_file('src/architecture/08_concepts/catalyst_voting/abnf/jorm.abnf', indent=4) }}
{{ include_file('./abnf/jorm.abnf', indent=4) }}
```
<!-- markdownlint-enable max-one-sentence-per-line code-block-style -->

Expand Down
4 changes: 2 additions & 2 deletions docs/src/architecture/08_concepts/catalyst_voting/v2.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ Following that spec need to define a `choice`, `proof` and `prop-id`.
??? 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) }}
{{ include_file('./cddl/vote_tx_v2_public.cddl', indent=4) }}
```
<!-- markdownlint-enable max-one-sentence-per-line code-block-style -->

Expand All @@ -84,7 +84,7 @@ Following that spec need to define a `choice`, `proof` and `prop-id`.
??? 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) }}
{{ include_file('./cddl/vote_tx_v2_private.cddl', indent=4) }}
```
<!-- markdownlint-enable max-one-sentence-per-line code-block-style -->

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
VERSION 0.8

IMPORT github.com/input-output-hk/catalyst-ci/earthly/cddl:v3.4.0 AS cddl-ci
IMPORT github.com/input-output-hk/catalyst-ci/earthly/cddl:v3.4.1 AS cddl-ci

check-cddl:
FROM cddl-ci+cddl-base
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ so its fully follows the structure of the [Catalyst Signed Document] specificati
??? note "Block CDDL definition: `block.cddl`"

```CDDL
{{ include_file('src/architecture/08_concepts/immutable_ledger/cddl/block.cddl', indent=4) }}
{{ include_file('./cddl/block.cddl', indent=4) }}
```
<!-- markdownlint-enable max-one-sentence-per-line code-block-style -->

Expand Down
4 changes: 2 additions & 2 deletions docs/src/architecture/08_concepts/signed_doc/cddl/Earthfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
VERSION 0.8

IMPORT github.com/input-output-hk/catalyst-ci/earthly/cddl:v3.4.0 AS cddl-ci
IMPORT github.com/input-output-hk/catalyst-ci/earthly/cddl:v3.4.1 AS cddl-ci

check-cddl:
todo-check-cddl:
FROM cddl-ci+cddl-base

WORKDIR /cddl
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
; collaborators


; Allowed Collaborators on the next subsequent version of a document.
collaborators = [ * catalyst_id_kid ]

; UTF8 Catalyst ID URI encoded as a bytes string.
catalyst_id_kid = bytes
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
; Unique Document Identifier


; Document ID
document_id = uuid_v7

; UUIDv7
uuid_v7 = #6.37(bytes .size 16)
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
; document_ref


; Reference to another Signed Document
document_ref = [ 1* [
document_id,
document_ver,
document_locator
] ]

; Document ID
document_id = uuid_v7

; UUIDv7
uuid_v7 = #6.37(bytes .size 16)

; Document Version
document_ver = uuid_v7

; Where a document can be located, must be a unique identifier.
document_locator = {
"cid" => cid
}

; IPLD content identifier
; TODO: add size limits if possible
cid = #6.42(bytes)
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
; Unique Document Type Identifier


; Document Type
document_type = [ 1* uuid_v4 ]

; UUIDv4
uuid_v4 = #6.37(bytes .size 16)
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
; Unique Chronological Document Version Identifier


; Document Version
document_ver = uuid_v7

; UUIDv7
uuid_v7 = #6.37(bytes .size 16)
11 changes: 11 additions & 0 deletions docs/src/architecture/08_concepts/signed_doc/cddl/revocations.cddl
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
; revocations


; List of revoked versions of this document.
revocations = [ * document_ver ] / true

; Document Version
document_ver = uuid_v7

; UUIDv7
uuid_v7 = #6.37(bytes .size 16)
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
; section_ref


; Reference to a section in a referenced document.
section_ref = json_pointer

; RFC6901 Standard JSON Pointer
json_pointer = text
Loading
Loading