From cb3b057517662f1a7611005c3de0adbd1f452ee2 Mon Sep 17 00:00:00 2001 From: Elden Park Date: Mon, 6 Apr 2026 11:58:47 -0700 Subject: [PATCH 1/5] github: add version-alignment job Adds a version-alignment CI job that validates uniffi and Rust toolchain channel versions against org-level CI variables (UNIFFI_VERSION, RUST_TOOLCHAIN_CHANNEL). Reuses the composite action defined in worldcoin/bedrock rather than duplicating the logic here. --- .github/workflows/ci.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 439dbc73..2aa38078 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,6 +14,21 @@ env: CARGO_TERM_COLOR: always jobs: + version-alignment: + name: Version Alignment + runs-on: ubuntu-latest + permissions: + contents: read + + steps: + - name: Checkout code + uses: actions/checkout@v6 + + - uses: worldcoin/bedrock/.github/actions/version-alignment@main + with: + uniffi_version: ${{ vars.UNIFFI_VERSION }} + rust_toolchain_channel: ${{ vars.RUST_TOOLCHAIN_CHANNEL }} + lint: name: Format, Clippy & Build runs-on: ubuntu-latest From dff1d589ccf1238d5584280cbf6b138ce63eac9a Mon Sep 17 00:00:00 2001 From: Elden Park Date: Mon, 6 Apr 2026 12:01:00 -0700 Subject: [PATCH 2/5] Bump "rust-toolchain-channel" to 1.94.1 --- Cargo.lock | 4 ++-- rust-toolchain.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c3a0dabf..ad410d78 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6165,7 +6165,7 @@ dependencies = [ "dirs", "eyre", "hex", - "rand 0.9.2", + "rand 0.8.5", "reqwest", "serde", "serde_json", @@ -6196,7 +6196,7 @@ dependencies = [ "hkdf", "log", "mockito", - "rand 0.9.2", + "rand 0.8.5", "regex", "reqwest", "ruint", diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 33aaf0b6..bb32dc7a 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,5 +1,5 @@ [toolchain] -channel = "1.92.0" +channel = "1.94.1" profile = "default" components = ["rustfmt", "clippy", "rust-analyzer"] targets = [ From 4e59bceeee1e7d18527cce71005bfa63b7ef1921 Mon Sep 17 00:00:00 2001 From: Elden Park Date: Mon, 6 Apr 2026 13:15:33 -0700 Subject: [PATCH 3/5] Update uniffi to 0.31.0 --- Cargo.toml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 57e1b1b5..8f1e222b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,11 @@ [workspace] -members = ["uniffi-bindgen", "walletkit-core", "walletkit", "walletkit-db", "walletkit-cli"] +members = [ + "uniffi-bindgen", + "walletkit-core", + "walletkit", + "walletkit-db", + "walletkit-cli", +] resolver = "2" [workspace.package] @@ -21,7 +27,7 @@ alloy-core = { version = "1", default-features = false, features = [ "sol-types", ] } alloy-primitives = { version = "1", default-features = false } -uniffi = { version = "0.31", features = ["tokio"] } +uniffi = { version = "0.31.0", features = ["tokio"] } world-id-core = { version = "0.8", default-features = false } # internal From aed35f9ddeb59900513ef5c8cfe086749ab8bd45 Mon Sep 17 00:00:00 2001 From: Elden Park Date: Wed, 8 Apr 2026 16:48:41 -0700 Subject: [PATCH 4/5] Pin version-alignment action to immutable commit SHA Avoids relying on a mutable branch ref (main) for the upstream bedrock composite action, preventing unexpected CI behavior changes from upstream. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2aa38078..4da22815 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: - name: Checkout code uses: actions/checkout@v6 - - uses: worldcoin/bedrock/.github/actions/version-alignment@main + - uses: worldcoin/bedrock/.github/actions/version-alignment@1453568cd2cd287076629b92fd57b3d428551e60 with: uniffi_version: ${{ vars.UNIFFI_VERSION }} rust_toolchain_channel: ${{ vars.RUST_TOOLCHAIN_CHANNEL }} From 8ce4b399baaa13543f1cb9b8a6ebb5bafade55b5 Mon Sep 17 00:00:00 2001 From: Elden Park Date: Thu, 9 Apr 2026 09:58:04 -0700 Subject: [PATCH 5/5] Set it reference the action at the main branch --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4da22815..2aa38078 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: - name: Checkout code uses: actions/checkout@v6 - - uses: worldcoin/bedrock/.github/actions/version-alignment@1453568cd2cd287076629b92fd57b3d428551e60 + - uses: worldcoin/bedrock/.github/actions/version-alignment@main with: uniffi_version: ${{ vars.UNIFFI_VERSION }} rust_toolchain_channel: ${{ vars.RUST_TOOLCHAIN_CHANNEL }}