Merge branch 'main' into feat/c509-v11

Author: stevenj

.config/dictionaries/project.dic

@@ -1,8 +1,8 @@
 aarch
 abcz
 ABNF
-abnf
 addrr
+addrs
 adminer
 anypolicy
 apskhem
@@ -11,6 +11,7 @@ asyncio
 Attributes
 auditability
 backpressure
+bech
 bimap
 bindgen
 bkioshn
@@ -23,12 +24,10 @@ BROTLI
 cantopen
 cardano
 CBOR
-cbor
 cbork
 cdylib
 CEST
 CHAINCODE
-chaincode
 chainsync
 childs
 Chotivichit
@@ -58,11 +57,11 @@ dotglob
 drep
 dreps
 Earthfile
-earthfile
 encryptor
 Errno
 Eternl
 excalidraw
+extn
 fadvise
 fcntl
 fdatasync
@@ -89,6 +88,7 @@ happ
 hardano
 Hardlink
 hasher
+heaptrack
 hexdigit
 highwater
 hmod
@@ -127,7 +127,6 @@ mdlint
 mdns
 memx
 Metadatum
-metadatum
 mimalloc
 minicbor
 miniprotocol
@@ -192,7 +191,6 @@ retriggering
 rlib
 rulelist
 RULENAME
-rulename
 runable
 rustc
 rustdoc
@@ -246,13 +244,11 @@ utimensat
 UTXO
 vitss
 Vkey
-vkey
 vkeywitness
 voteplan
 voteplans
 wallclock
 WASI
-wasi
 wasip
 wasmtime
 webasm
@@ -261,6 +257,5 @@ webpki
 WORKDIR
 xprivate
 XPRV
-xprv
 xpub
 yoroi

.markdownlint.jsonc

@@ -1,7 +1,7 @@
 {
     // markdownlint JSON(C) configuration for Catalyst Standards
     // Do not individually set markdown lint rules in documents.
-    // It is permissable to disable a rule in a document if it is a false positive.
+    // It is permissible to disable a rule in a document if it is a false positive.
     // Keep the scope of the lint disable to as small as possible.
     // See: https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md
     // Default state for all rules

Earthfile

@@ -1,7 +1,7 @@
 VERSION 0.8
 
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/mdlint:v3.2.00 AS mdlint-ci
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/cspell:v3.2.00 AS cspell-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/mdlint:v3.2.03 AS mdlint-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/cspell:v3.2.03 AS cspell-ci
 
 FROM debian:stable-slim
 
@@ -15,13 +15,9 @@ markdown-check-fix:
 
     DO mdlint-ci+MDLINT_LOCALLY --src=$(echo ${PWD}) --fix=--fix
 
-# Make sure the project dictionary is properly sorted.
+# clean-spelling-list : Make sure the project dictionary is properly sorted.
 clean-spelling-list:
-    COPY .config/dictionaries/project.dic project.dic
-    RUN sort -d -f project.dic > new.dic
-    IF ! diff -q project.dic new.dic
-        SAVE ARTIFACT new.dic AS LOCAL .config/dictionaries/project.dic
-    END
+    DO cspell-ci+CLEAN
 
 # check-spelling : Check spelling in this repo inside a container.
 check-spelling:

docs/Earthfile

@@ -1,6 +1,6 @@
 VERSION 0.8
 
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/docs:v3.2.00 AS docs-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/docs:v3.2.03 AS docs-ci
 
 IMPORT .. AS repo
 

integration_tests/rust/Earthfile

@@ -1,25 +1,26 @@
 VERSION 0.8
 
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/mithril_snapshot:v3.1.8 AS mithril-snapshot-ci
 IMPORT ../../rust AS rust-workspace
 
-local-build:
-    FROM rust-workspace+builder
+# TODO: This needs reworking, because we no longer have mithril snapshots inside CI.
 
-    WORKDIR crates/cardano-chain-follower/testbed
-    RUN cargo build -p overhead_benchmark --release
+#local-build:
+#    FROM rust-workspace+builder
 
-    SAVE ARTIFACT target/release/overhead_benchmark overhead_benchmark
+#    WORKDIR crates/cardano-chain-follower/testbed
+#    RUN cargo build -p overhead_benchmark --release
 
-local-run-preprod:
-    ARG --required BENCH_NAME
+#    SAVE ARTIFACT target/release/overhead_benchmark overhead_benchmark
 
-    FROM +local-build
+#local-run-preprod:
+#    ARG --required BENCH_NAME
 
-    COPY --dir mithril-snapshot-ci+package-preprod-snapshot/snapshot/immutable mithril_snapshot 
-    COPY +build/overhead_benchmark overhead_benchmark_bin
-    RUN ./overhead_benchmark_bin --bench-name $BENCH_NAME --mithril-snapshot-path ./mithril_snapshot
+#    FROM +local-build
 
-local-save-preprod-snapshot:
-    FROM mithril-snapshot-ci+package-preprod-snapshot
-    SAVE ARTIFACT immutable AS LOCAL local_preprod_mithril_snapshot 
+    #COPY --dir mithril-snapshot-ci+package-preprod-snapshot/snapshot/immutable mithril_snapshot 
+    #COPY +build/overhead_benchmark overhead_benchmark_bin
+    #RUN ./overhead_benchmark_bin --bench-name $BENCH_NAME --mithril-snapshot-path ./mithril_snapshot
+
+#local-save-preprod-snapshot:
+    #FROM mithril-snapshot-ci+package-preprod-snapshot
+    #SAVE ARTIFACT immutable AS LOCAL local_preprod_mithril_snapshot 

integration_tests/rust/overhead_benchmark/README.md

@@ -11,7 +11,7 @@ It doesn't matter which network the snapshot is from because the benchmark will
 There are 2 modes in which the benchmark can be executed:
 
 | Benchmark name           | Description  |
----------------------------|--------------|
+|--------------------------|--------------|
 | pallas                 | When executed with `--bench-name pallas`, the benchmark reads the Mithril snapshot from origin to its tip using only the `pallas` crate mechanisms |
 | cardano‑chain‑follower | When executed with `--bench-name cardano-chain-follower` it uses the `cardano-chain-follower` crate to follow the chain from origin to the tip of the specified snapshot |
 

rust/Earthfile

@@ -1,9 +1,11 @@
 VERSION 0.8
 
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust:v3.2.01 AS rust-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust:v3.2.03 AS rust-ci
 
-# Use when debugging cat-ci locally.
-# IMPORT ../../catalyst-ci/earthly/rust AS rust-ci
+# sync-cfg: Synchronize local config with CI version.
+# Must be run by the developer manually.
+sync-cfg:
+    DO rust-ci+SYNC_STD_CFG
 
 # builder : Set up our target toolchains, and copy our files.
 builder:

rust/Justfile

@@ -11,6 +11,10 @@ default:
 cargo-tree:
     cargo tree -e features,normal,build -f "{p}[{f}]" --workspace --frozen
 
+# Synchronize STD Configs with the CI Version in use.
+sync-cfg:
+    earthly +sync-cfg
+
 # Check Dependency licenses and CVE's
 license-check:
     cargo deny check --exclude-dev
@@ -26,4 +30,7 @@ code-lint:
     cargo lint
 
 # Pre Push Checks
-pre-push: code-format code-lint license-check
+pre-push: sync-cfg code-format code-lint license-check
+    # Make sure we can actually build inside Earthly which needs to happen in CI.
+    earthly +check
+    earthly +build

rust/c509-certificate/Earthfile

@@ -1,6 +1,6 @@
 VERSION 0.8
 
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust:v3.2.00 AS rust-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust::v3.2.03 AS rust-ci
 
 IMPORT .. AS rust-local
 IMPORT ../.. AS repo

rust/cardano-chain-follower/Cargo.toml

@@ -65,6 +65,9 @@ ureq = { version = "2.10.1", features = ["native-certs"] }
 http = "1.1.0"
 hickory-resolver = { version = "0.24.1", features = ["dns-over-rustls"] }
 moka = { version = "0.12.8", features = ["sync"] }
+der-parser = "9.0.0"
+regex = "1.10.6"
+bech32 = "0.11.0"
 
 [dev-dependencies]
 hex = "0.4.3"