From 87750407dedde560b9d47b5afd0fd93775e9b88d Mon Sep 17 00:00:00 2001 From: Luke Parker Date: Wed, 3 Dec 2025 16:35:01 -0500 Subject: [PATCH] `cargo-deny 0.18.8`, remove `bip39` `git` dependency The former is necessary due to `cargo-deny` misinterpreting select licenses. The latter is finally possible with the recent 2.2.1 release :tada: --- .github/actions/build-dependencies/action.yml | 2 +- .github/workflows/daily-deny.yml | 2 +- .github/workflows/lint.yml | 2 +- Cargo.lock | 25 ++++++++++--------- deny.toml | 2 -- patches/parity-bip39/Cargo.toml | 2 +- patches/parity-bip39/src/lib.rs | 2 +- 7 files changed, 18 insertions(+), 19 deletions(-) diff --git a/.github/actions/build-dependencies/action.yml b/.github/actions/build-dependencies/action.yml index a6e8a2e5..695b7e4e 100644 --- a/.github/actions/build-dependencies/action.yml +++ b/.github/actions/build-dependencies/action.yml @@ -52,7 +52,7 @@ runs: - name: Install solc shell: bash run: | - cargo +1.91.1 install svm-rs --version =0.5.21 + cargo +1.91.1 install svm-rs --version =0.5.22 svm install 0.8.29 svm use 0.8.29 diff --git a/.github/workflows/daily-deny.yml b/.github/workflows/daily-deny.yml index eb1b9d45..547ea318 100644 --- a/.github/workflows/daily-deny.yml +++ b/.github/workflows/daily-deny.yml @@ -12,7 +12,7 @@ jobs: - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0 - name: Install cargo deny - run: cargo +1.91.1 install cargo-deny --version =0.18.7 + run: cargo +1.91.1 install cargo-deny --version =0.18.8 - name: Run cargo deny run: cargo deny -L error --all-features check --hide-inclusion-graph diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 51d5f4ec..9884b15f 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -46,7 +46,7 @@ jobs: - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0 - name: Install cargo deny - run: cargo +1.91.1 install cargo-deny --version =0.18.7 + run: cargo +1.91.1 install cargo-deny --version =0.18.8 - name: Run cargo deny run: cargo deny -L error --all-features check --hide-inclusion-graph diff --git a/Cargo.lock b/Cargo.lock index dced179e..8ac27c4b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1112,9 +1112,9 @@ checksum = "55248b47b0caf0546f7988906588779981c43bb1bc9d0c44087278f80cdb44ba" [[package]] name = "bech32" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d965446196e3b7decd44aa7ee49e31d630118f90ef12f97900f262eb915c951d" +checksum = "32637268377fc7b10a8c6d51de3e7fba1ce5dd371a96e342b34e6078db558e7f" [[package]] name = "bindgen" @@ -1136,8 +1136,9 @@ dependencies = [ [[package]] name = "bip39" -version = "2.2.0" -source = "git+https://github.com/rust-bitcoin/rust-bip39#f735e2559f30049f6738d1bf68c69a0b7bd7b858" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90dbd31c98227229239363921e60fcf5e558e43ec69094d46fc4996f08d1d5bc" dependencies = [ "bitcoin_hashes", "rand 0.8.5", @@ -1221,9 +1222,9 @@ dependencies = [ [[package]] name = "bitcoin_hashes" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb18c03d0db0247e147a21a6faafd5a7eb851c743db062de72018b6b7e8e4d16" +checksum = "26ec84b80c482df901772e931a9a681e26a1b9ee2302edeff23cb30328745c8b" dependencies = [ "bitcoin-io", "hex-conservative", @@ -3727,9 +3728,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52e9a2a24dc5c6821e71a7030e1e14b7b632acac55c40e9d2e082c621261bb56" +checksum = "727805d60e7938b76b826a6ef209eb70eaa1812794f9424d4a4e2d740662df5f" dependencies = [ "bytes", "futures-channel", @@ -4729,9 +4730,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.28" +version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" +checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" [[package]] name = "loom" @@ -4971,9 +4972,9 @@ dependencies = [ [[package]] name = "mio" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873" +checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc" dependencies = [ "libc", "wasi", diff --git a/deny.toml b/deny.toml index 1a772b2f..948b69f0 100644 --- a/deny.toml +++ b/deny.toml @@ -79,7 +79,6 @@ exceptions = [ { allow = ["AGPL-3.0-only"], name = "serai-coordinator-libp2p-p2p" }, { allow = ["AGPL-3.0-only"], name = "serai-coordinator" }, - { allow = ["AGPL-3.0-only"], name = "pallet-session" }, { allow = ["AGPL-3.0-only"], name = "substrate-median" }, { allow = ["AGPL-3.0-only"], name = "serai-core-pallet" }, @@ -152,6 +151,5 @@ allow-git = [ "https://github.com/rust-lang-nursery/lazy-static.rs", "https://github.com/kayabaNerve/elliptic-curves", "https://github.com/monero-oxide/monero-oxide", - "https://github.com/rust-bitcoin/rust-bip39", "https://github.com/serai-dex/patch-polkadot-sdk", ] diff --git a/patches/parity-bip39/Cargo.toml b/patches/parity-bip39/Cargo.toml index 3e444d8c..442b24b5 100644 --- a/patches/parity-bip39/Cargo.toml +++ b/patches/parity-bip39/Cargo.toml @@ -15,7 +15,7 @@ rustdoc-args = ["--cfg", "docsrs"] [workspace] [dependencies] -bip39 = { git = "https://github.com/rust-bitcoin/rust-bip39", commit = "f735e2559f30049f6738d1bf68c69a0b7bd7b858", default-features = false } +bip39 = { version = "2.2.1", default-features = false } [features] default = ["bip39/default"] diff --git a/patches/parity-bip39/src/lib.rs b/patches/parity-bip39/src/lib.rs index b9935270..470c454c 100644 --- a/patches/parity-bip39/src/lib.rs +++ b/patches/parity-bip39/src/lib.rs @@ -1,3 +1,3 @@ -#![cfg_attr(not(feature = "std"), no_std)] +#![no_std] pub use bip39::*;