From 270592f3cb6644d57e6a65267e50a1b0e4cb93c2 Mon Sep 17 00:00:00 2001 From: Luke Parker Date: Mon, 27 Nov 2023 19:43:08 -0500 Subject: [PATCH] Add empty crates to clean up the Cargo.lock Also removes a now unused RUSTSEC allow in deny. --- Cargo.toml | 13 +++++++++---- deny.toml | 1 - .../tree-cleanup/bandersnatch_vrfs/Cargo.toml | 17 +++++++++++++++++ .../tree-cleanup/bandersnatch_vrfs/src/lib.rs | 0 substrate/tree-cleanup/w3f-bls/Cargo.toml | 17 +++++++++++++++++ substrate/tree-cleanup/w3f-bls/src/lib.rs | 0 6 files changed, 43 insertions(+), 5 deletions(-) create mode 100644 substrate/tree-cleanup/bandersnatch_vrfs/Cargo.toml create mode 100644 substrate/tree-cleanup/bandersnatch_vrfs/src/lib.rs create mode 100644 substrate/tree-cleanup/w3f-bls/Cargo.toml create mode 100644 substrate/tree-cleanup/w3f-bls/src/lib.rs diff --git a/Cargo.toml b/Cargo.toml index 36ac72210..029f105df 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -36,6 +36,9 @@ members = [ "coordinator/tributary", "coordinator", + "substrate/tree-cleanup/bandersnatch_vrfs", + "substrate/tree-cleanup/w3f-bls", + "substrate/primitives", "substrate/coins/primitives", @@ -94,7 +97,9 @@ lazy_static = { git = "https://github.com/rust-lang-nursery/lazy-static.rs", rev sp-core-hashing = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" } sp-std = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" } -# The external arkworks-substrate repo refers back to the paritytech -# polkadot-sdk repo, hence patching it to point to serai-dex's -[patch."https://github.com/paritytech/polkadot-sdk"] -sp-crypto-ec-utils = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" } +# cargo believes the following are in-tree despite no features activating them +# We provide empty crates to not only prove they're unused, yet also clean up +# our Cargo.lock +w3f-bls = { path = "substrate/tree-cleanup/w3f-bls" } +[patch."https://github.com/w3f/ring-vrf"] +bandersnatch_vrfs = { path = "substrate/tree-cleanup/bandersnatch_vrfs" } diff --git a/deny.toml b/deny.toml index 72581dacf..45e1b5e90 100644 --- a/deny.toml +++ b/deny.toml @@ -8,7 +8,6 @@ notice = "warn" unmaintained = "warn" ignore = [ - "RUSTSEC-2021-0139", # https://github.com/serai-dex/serai/228 "RUSTSEC-2022-0061", # https://github.com/serai-dex/serai/227 ] diff --git a/substrate/tree-cleanup/bandersnatch_vrfs/Cargo.toml b/substrate/tree-cleanup/bandersnatch_vrfs/Cargo.toml new file mode 100644 index 000000000..1c6f93486 --- /dev/null +++ b/substrate/tree-cleanup/bandersnatch_vrfs/Cargo.toml @@ -0,0 +1,17 @@ +[package] +name = "bandersnatch_vrfs" +version = "0.0.3" +description = "Empty library to remove the unused bandersnatch_vrfs from the Cargo.lock" +license = "MIT" +repository = "https://github.com/serai-dex/serai/tree/develop/substrate/tree-cleanup/bandersnatch_vrfs" +authors = ["Luke Parker "] +keywords = [] +edition = "2021" +rust-version = "1.74" + +[package.metadata.docs.rs] +all-features = true +rustdoc-args = ["--cfg", "docsrs"] + +[features] +std = [] diff --git a/substrate/tree-cleanup/bandersnatch_vrfs/src/lib.rs b/substrate/tree-cleanup/bandersnatch_vrfs/src/lib.rs new file mode 100644 index 000000000..e69de29bb diff --git a/substrate/tree-cleanup/w3f-bls/Cargo.toml b/substrate/tree-cleanup/w3f-bls/Cargo.toml new file mode 100644 index 000000000..5b2941c3b --- /dev/null +++ b/substrate/tree-cleanup/w3f-bls/Cargo.toml @@ -0,0 +1,17 @@ +[package] +name = "w3f-bls" +version = "0.1.3" +description = "Empty library to remove the unused w3f-bls from the Cargo.lock" +license = "MIT" +repository = "https://github.com/serai-dex/serai/tree/develop/substrate/tree-cleanup/w3f-bls" +authors = ["Luke Parker "] +keywords = [] +edition = "2021" +rust-version = "1.74" + +[package.metadata.docs.rs] +all-features = true +rustdoc-args = ["--cfg", "docsrs"] + +[features] +std = [] diff --git a/substrate/tree-cleanup/w3f-bls/src/lib.rs b/substrate/tree-cleanup/w3f-bls/src/lib.rs new file mode 100644 index 000000000..e69de29bb