Merge branch 'feat/1418-checkbox-user-input-component' of github.com:…

…input-output-hk/catalyst-voices into feat/1418-checkbox-user-input-component
input-output-hk · Jan 7, 2025 · 4ca0ede · 4ca0ede
2 parents 1a7c200 + f116b19
commit 4ca0ede
Show file tree

Hide file tree

Showing 26 changed files with 85 additions and 38 deletions.
diff --git a/Earthfile b/Earthfile
@@ -1,8 +1,8 @@
 VERSION 0.8
 
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/mdlint:v3.2.24 AS mdlint-ci
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/cspell:v3.2.24 AS cspell-ci
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/postgresql:v3.2.24 AS postgresql-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/mdlint:v3.2.27 AS mdlint-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/cspell:v3.2.27 AS cspell-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/postgresql:v3.2.27 AS postgresql-ci
 
 FROM debian:stable-slim
 

diff --git a/catalyst-gateway/.cargo/config.toml b/catalyst-gateway/.cargo/config.toml
@@ -27,11 +27,7 @@ rustflags = [
 
 [build]
 rustflags = []
-rustdocflags = [
-    "--enable-index-page",
-    "-Z",
-    "unstable-options",
-]
+rustdocflags = []
 
 [profile.dev]
 opt-level = 1

diff --git a/catalyst-gateway/Earthfile b/catalyst-gateway/Earthfile
@@ -1,6 +1,6 @@
 VERSION 0.8
 
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust:v3.2.24 AS rust-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust:v3.2.27 AS rust-ci
 
 #cspell: words rustfmt toolsets USERARCH stdcfgs
 

diff --git a/catalyst-gateway/Justfile b/catalyst-gateway/Justfile
@@ -13,7 +13,7 @@ cargo-tree:
 
 # Check Dependency licenses and CVE's
 license-check:
-    cargo deny check --exclude-dev
+    cargo deny check --exclude-dev || true
 
 # Format the rust code
 code-format:
@@ -27,7 +27,8 @@ code-lint:
 
 # Synchronize Rust Configs
 sync-cfg:
-    cd .. && earthly ./catalyst-gateway+sync-cfg
+    cd .. && \
+        earthly ./catalyst-gateway+sync-cfg 
 
 # Pre Push Checks
 pre-push: sync-cfg code-format code-lint license-check

diff --git a/catalyst-gateway/bin/src/db/event/legacy/queries/registration.rs b/catalyst-gateway/bin/src/db/event/legacy/queries/registration.rs
@@ -73,6 +73,7 @@ impl EventDB {
 impl EventDB {
     /// Get voter query
     #[allow(dead_code)]
+    #[allow(clippy::ref_option)]
     pub(crate) async fn get_voter(
         event: &Option<EventId>, voting_key: String, with_delegations: bool,
     ) -> anyhow::Result<Voter> {
@@ -156,6 +157,7 @@ impl EventDB {
 
     /// Get delegator query
     #[allow(dead_code)]
+    #[allow(clippy::ref_option)]
     pub(crate) async fn get_delegator(
         event: &Option<EventId>, stake_public_key: String,
     ) -> anyhow::Result<Delegator> {

diff --git a/catalyst-gateway/clippy.toml b/catalyst-gateway/clippy.toml
@@ -1,2 +1,3 @@
 allow-unwrap-in-tests = true
 allow-expect-in-tests = true
+allow-panic-in-tests = true
diff --git a/catalyst-gateway/deny.toml b/catalyst-gateway/deny.toml
@@ -57,6 +57,7 @@ allow-git = [
     "https://github.com/txpipe/vrf",
     "https://github.com/txpipe/kes",
     "https://github.com/txpipe/curve25519-dalek",
+    "https://github.com/input-output-hk/mithril",
 ]
 
 [licenses]

diff --git a/catalyst-gateway/event-db/Earthfile b/catalyst-gateway/event-db/Earthfile
@@ -3,8 +3,8 @@
 # the database and its associated software.
 VERSION 0.8
 
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/postgresql:v3.2.24 AS postgresql-ci
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/python:v3.2.24 AS python-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/postgresql:v3.2.27 AS postgresql-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/python:v3.2.27 AS python-ci
 
 # cspell: words
 

diff --git a/catalyst-gateway/rust-toolchain.toml b/catalyst-gateway/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.81"
+channel = "1.83"
 profile = "default"
diff --git a/catalyst-gateway/tests/Earthfile b/catalyst-gateway/tests/Earthfile
@@ -1,6 +1,5 @@
 VERSION 0.8
-
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/spectral:v3.2.24 AS spectral-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/spectral:v3.2.27 AS spectral-ci
 IMPORT .. AS gateway
 
 # cspell: words oapi

diff --git a/catalyst-gateway/tests/api_tests/Earthfile b/catalyst-gateway/tests/api_tests/Earthfile
@@ -1,6 +1,6 @@
 VERSION 0.8
 
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/python:v3.2.24 AS python-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/python:v3.2.27 AS python-ci
 
 builder:
     FROM python-ci+python-base

diff --git a/catalyst_voices/Earthfile b/catalyst_voices/Earthfile
@@ -1,7 +1,7 @@
 VERSION 0.8
 
 IMPORT ../catalyst-gateway AS catalyst-gateway
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/flutter:v3.2.24 AS flutter-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/flutter:v3.2.27 AS flutter-ci
 
 # repo-catalyst-voices - Creates artifacts of all configuration files,
 # packages and folders related to catalyst_voices frontend.

diff --git a/catalyst_voices/packages/libs/catalyst_cardano/catalyst_cardano/wallet-automation/Earthfile b/catalyst_voices/packages/libs/catalyst_cardano/catalyst_cardano/wallet-automation/Earthfile
@@ -1,6 +1,6 @@
 VERSION 0.8
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/flutter:v3.2.24 AS flutter-ci
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/playwright:v3.2.24 AS playwright-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/flutter:v3.2.27 AS flutter-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/playwright:v3.2.27 AS playwright-ci
 
 deps:
     DO playwright-ci+SETUP --workdir=/wallet-automation

diff --git a/catalyst_voices/packages/libs/catalyst_key_derivation/Earthfile b/catalyst_voices/packages/libs/catalyst_key_derivation/Earthfile
@@ -1,7 +1,7 @@
 VERSION 0.8
 
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/flutter:v3.2.24 AS flutter-ci
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/flutter_rust_bridge:v3.2.24 AS flutter_rust_bridge
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/flutter:v3.2.27 AS flutter-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/flutter_rust_bridge:v3.2.27 AS flutter_rust_bridge
 
 builder:
     FROM flutter_rust_bridge+builder

diff --git a/catalyst_voices/packages/libs/catalyst_key_derivation/rust/.cargo/config.toml b/catalyst_voices/packages/libs/catalyst_key_derivation/rust/.cargo/config.toml
@@ -27,11 +27,7 @@ rustflags = [
 
 [build]
 rustflags = []
-rustdocflags = [
-    "--enable-index-page",
-    "-Z",
-    "unstable-options",
-]
+rustdocflags = []
 
 [profile.dev]
 opt-level = 1
@@ -90,4 +86,4 @@ quiet = false           # whether cargo output is quiet
 verbose = false         # whether cargo provides verbose output
 color = "auto"          # whether cargo colorizes output use `CARGO_TERM_COLOR="off"` to disable.
 progress.when = "never" # whether cargo shows progress bar
-progress.width = 80     # width of progress bar
+progress.width = 80     # width of progress bar
diff --git a/catalyst_voices/packages/libs/catalyst_key_derivation/rust/.config/nextest.toml b/catalyst_voices/packages/libs/catalyst_key_derivation/rust/.config/nextest.toml
@@ -46,4 +46,4 @@ store-success-output = true
 #
 # Note that if a description can be extracted from the output, it is always stored in the
 # <description> element.
-store-failure-output = true
+store-failure-output = true
diff --git a/catalyst_voices/packages/libs/catalyst_key_derivation/rust/Earthfile b/catalyst_voices/packages/libs/catalyst_key_derivation/rust/Earthfile
@@ -1,6 +1,6 @@
 VERSION 0.8
 
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust:v3.2.24 AS rust-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust:v3.2.27 AS rust-ci
 IMPORT ../ AS flutter-rust-bridge
 
 # builder : Setup the builder
@@ -22,4 +22,10 @@ build:
 
     COPY flutter-rust-bridge+code-generator/frb_generated.rs ./src/frb_generated.rs
     DO rust-ci+EXECUTE \
-        --cmd="/scripts/std_build.py" \
+        --cmd="/scripts/std_build.py"
+
+# sync-cfg: Synchronize local config with CI version.
+# Must be run by the developer manually.
+sync-cfg:
+    FROM +builder
+    DO rust-ci+SYNC_STD_CFG
diff --git a/catalyst_voices/packages/libs/catalyst_key_derivation/rust/Justfile b/catalyst_voices/packages/libs/catalyst_key_derivation/rust/Justfile
@@ -0,0 +1,42 @@
+# use with https://github.com/casey/just
+#
+# Developer convenience functions
+
+# cspell: words prereqs, commitlog, rustls, nocapture
+
+default:
+    @just --list --unsorted
+
+# Show the dependency tree and all enabled feature flags of every crate.
+cargo-tree:
+    cargo tree -e features,normal,build -f "{p}[{f}]" --workspace --frozen
+
+# Check Dependency licenses and CVE's
+license-check:
+    cargo deny check --exclude-dev || true
+
+# Format the rust code
+code-format:
+    # Create a dummy file just to past the CI format check
+    # Add another blank line to satisfy the cargo fmt check
+    #printf "\n" > ./src/frb_generated.rs
+
+    #cargo +nightly fmtfix
+    #cargo +nightly fmtchk
+
+# Lint the rust code
+code-lint:
+    #cargo lintfix -r
+    #cargo lint -r
+
+# Synchronize Rust Configs
+sync-cfg:
+    cd ../../../../.. && \
+        earthly ./catalyst_voices/packages/libs/catalyst_key_derivation/rust+sync-cfg
+
+# Pre Push Checks
+pre-push: sync-cfg code-format code-lint license-check
+    # Make sure we can actually build inside Earthly which needs to happen in CI.
+    cd ../../../../.. && \
+        earthly ./catalyst_voices/packages/libs/catalyst_key_derivation/rust+check && \
+        earthly ./catalyst_voices/packages/libs/catalyst_key_derivation/rust+build
diff --git a/catalyst_voices/packages/libs/catalyst_key_derivation/rust/clippy.toml b/catalyst_voices/packages/libs/catalyst_key_derivation/rust/clippy.toml
@@ -1,2 +1,3 @@
 allow-unwrap-in-tests = true
 allow-expect-in-tests = true
+allow-panic-in-tests = true
diff --git a/catalyst_voices/packages/libs/catalyst_key_derivation/rust/deny.toml b/catalyst_voices/packages/libs/catalyst_key_derivation/rust/deny.toml
@@ -57,6 +57,7 @@ allow-git = [
     "https://github.com/txpipe/vrf",
     "https://github.com/txpipe/kes",
     "https://github.com/txpipe/curve25519-dalek",
+    "https://github.com/input-output-hk/mithril",
 ]
 
 [licenses]
@@ -120,4 +121,4 @@ license-files = [{ path = "LICENSE", hash = 0xbd0eed23 }]
 #[[licenses.clarify]]
 #crate = "rustls-webpki"
 #expression = "ISC"
-#license-files = [{ path = "LICENSE", hash = 0x001c7e6c }]
+#license-files = [{ path = "LICENSE", hash = 0x001c7e6c }]
diff --git a/catalyst_voices/packages/libs/catalyst_key_derivation/rust/rust-toolchain.toml b/catalyst_voices/packages/libs/catalyst_key_derivation/rust/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.81"
+channel = "1.83"
 profile = "default"
diff --git a/catalyst_voices/packages/libs/catalyst_key_derivation/rust/rustfmt.toml b/catalyst_voices/packages/libs/catalyst_key_derivation/rust/rustfmt.toml
@@ -65,4 +65,4 @@ condense_wildcard_suffixes = true
 hex_literal_case = "Upper"
 
 # Ignored files:
-ignore = []
+ignore = []
diff --git a/catalyst_voices/utilities/uikit_example/Earthfile b/catalyst_voices/utilities/uikit_example/Earthfile
@@ -1,7 +1,7 @@
 VERSION 0.8
 
 IMPORT ../../ AS catalyst-voices
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/flutter:v3.2.24 AS flutter-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/flutter:v3.2.27 AS flutter-ci
 
 # local-build-web - build web version of UIKit example.
 # Prefixed by "local" to make sure it's not auto triggered, the target was

diff --git a/docs/Earthfile b/docs/Earthfile
@@ -1,6 +1,6 @@
 VERSION 0.8
 
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/docs:v3.2.24 AS docs-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/docs:v3.2.27 AS docs-ci
 
 IMPORT .. AS repo
 IMPORT ../catalyst-gateway AS catalyst-gateway

diff --git a/justfile b/justfile
@@ -19,7 +19,8 @@ check-spelling:
 # Pre Push Checks - intended to be run by a git pre-push hook.
 pre-push: check-markdown check-spelling
     just catalyst-gateway/pre-push
-    just catalyst_voices/pre-push
+    # just catalyst_voices/pre-push
+    just catalyst_voices/packages/libs/catalyst_key_derivation/rust/pre-push
     earthly ./catalyst_voices+code-generator --platform=linux/amd64 --save_locally=true
 
 # Run cat-gateway natively on preprod

diff --git a/utilities/docs-preview/Earthfile b/utilities/docs-preview/Earthfile
@@ -1,6 +1,6 @@
 VERSION 0.8
 
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/docs:v3.2.24 AS docs-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/docs:v3.2.27 AS docs-ci
 
 
 # update-docs-dev-script: get the latest docs dev script from CI.