From 12cdb0e51a5095ae9f659be95206d405fc745f46 Mon Sep 17 00:00:00 2001 From: Denis Varlakov Date: Fri, 13 Dec 2024 11:30:52 +0100 Subject: [PATCH] Remove patches Signed-off-by: Denis Varlakov --- Cargo.lock | 80 +++++++++++++++++++++++++++--------------- Cargo.toml | 16 --------- givre/Cargo.toml | 2 -- wasm/no_std/Cargo.toml | 16 --------- 4 files changed, 52 insertions(+), 62 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 69cc39b..c62a2f5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "anyhow" @@ -129,7 +129,8 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "cggmp21-keygen" version = "0.5.0" -source = "git+https://github.com/lfdt-lockness/cggmp21?branch=update-hd-wallets#1a1984d10914fa3fd7e3d8c3b1f6c1bcaea63225" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aaa8c850290c494f951abe0350e56c31e4f5664863490197490ff48cb825447d" dependencies = [ "digest", "displaydoc", @@ -143,7 +144,7 @@ dependencies = [ "serde", "serde_with", "sha2", - "thiserror", + "thiserror 1.0.57", "udigest", ] @@ -221,7 +222,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.90", ] [[package]] @@ -245,7 +246,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.48", + "syn 2.0.90", ] [[package]] @@ -256,7 +257,7 @@ checksum = "c5a91391accf613803c2a9bf9abccdbaa07c54b4244a5b64883f9c3c137c86be" dependencies = [ "darling_core", "quote", - "syn 2.0.48", + "syn 2.0.90", ] [[package]] @@ -297,7 +298,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.90", ] [[package]] @@ -364,7 +365,7 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.90", ] [[package]] @@ -445,7 +446,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.90", ] [[package]] @@ -628,7 +629,8 @@ dependencies = [ [[package]] name = "hd-wallet" version = "0.6.0" -source = "git+https://github.com/lfdt-lockness/hd-wallet?branch=dt#158b65ce54ed6d0d031a9414890b4a9170dd4f11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d1e8b25f89c813ea3f4317b86c1e89ecc86843601ca8657448e47e4f68f69af" dependencies = [ "generic-array", "generic-ec", @@ -701,7 +703,8 @@ dependencies = [ [[package]] name = "key-share" version = "0.6.0" -source = "git+https://github.com/lfdt-lockness/cggmp21?branch=update-hd-wallets#1a1984d10914fa3fd7e3d8c3b1f6c1bcaea63225" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ee8e510bb9f738ac400b7dedd98aeb23677c6b48cd3b1b682651ea5091f4282" dependencies = [ "displaydoc", "generic-ec", @@ -711,7 +714,7 @@ dependencies = [ "rand_core", "serde", "serde_with", - "thiserror", + "thiserror 1.0.57", ] [[package]] @@ -821,9 +824,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -892,20 +895,21 @@ dependencies = [ [[package]] name = "round-based" version = "0.4.0" -source = "git+https://github.com/lfdt-lockness/round-based?branch=impr-sim#599cc6988e7e353da1b35dde085e544a5cc70402" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "079e623c882b5ec9c1a4140cb077179ea89f5352f85a7ebd879428c33ce66399" dependencies = [ - "displaydoc", "futures-util", "phantom-type 0.3.1", "round-based-derive", - "thiserror", + "thiserror 2.0.6", "tracing", ] [[package]] name = "round-based-derive" version = "0.2.2" -source = "git+https://github.com/lfdt-lockness/round-based?branch=impr-sim#599cc6988e7e353da1b35dde085e544a5cc70402" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4afa4d5b318bcafae8a7ebc57c1cb7d4b2db7358293e34d71bfd605fd327cc13" dependencies = [ "proc-macro2", "quote", @@ -982,7 +986,7 @@ checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.90", ] [[package]] @@ -1020,7 +1024,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.90", ] [[package]] @@ -1093,9 +1097,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.48" +version = "2.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" dependencies = [ "proc-macro2", "quote", @@ -1120,7 +1124,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.90", ] [[package]] @@ -1131,7 +1135,7 @@ checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.90", "test-case-core", ] @@ -1141,7 +1145,16 @@ version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.57", +] + +[[package]] +name = "thiserror" +version = "2.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fec2a1820ebd077e2b90c4df007bebf344cd394098a13c563957d0afc83ea47" +dependencies = [ + "thiserror-impl 2.0.6", ] [[package]] @@ -1152,7 +1165,18 @@ checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.90", +] + +[[package]] +name = "thiserror-impl" +version = "2.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d65750cab40f4ff1929fb1ba509e9914eb756131cef4210da8d5d700d26f6312" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", ] [[package]] @@ -1214,7 +1238,7 @@ checksum = "603329303137e0d59238ee4d6b9c085eada8e2a9d20666f3abd9dadf8f8543f4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.90", ] [[package]] @@ -1252,5 +1276,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.90", ] diff --git a/Cargo.toml b/Cargo.toml index 6902e9f..e2d3cfd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,19 +13,3 @@ exclude = [ givre = { path = "./givre" } round-based = { version = "0.4", default-features = false } - -[patch.crates-io.round-based] -git = "https://github.com/lfdt-lockness/round-based" -branch = "impr-sim" - -[patch.crates-io.cggmp21-keygen] -git = "https://github.com/lfdt-lockness/cggmp21" -branch = "update-hd-wallets" - -[patch.crates-io.key-share] -git = "https://github.com/lfdt-lockness/cggmp21" -branch = "update-hd-wallets" - -[patch.crates-io.hd-wallet] -git = "https://github.com/lfdt-lockness/hd-wallet" -branch = "dt" diff --git a/givre/Cargo.toml b/givre/Cargo.toml index 18a1040..b2b90ac 100644 --- a/givre/Cargo.toml +++ b/givre/Cargo.toml @@ -40,9 +40,7 @@ default = ["std"] std = [ "key-share/std", "cggmp21-keygen?/std", - "round-based?/std", "serde?/std", - "hd-wallet?/std" ] cggmp21-keygen = ["dep:cggmp21-keygen"] diff --git a/wasm/no_std/Cargo.toml b/wasm/no_std/Cargo.toml index 4647559..dc70f98 100644 --- a/wasm/no_std/Cargo.toml +++ b/wasm/no_std/Cargo.toml @@ -17,19 +17,3 @@ features = [ "hd-wallet", "taproot", ] - -[patch.crates-io.round-based] -git = "https://github.com/lfdt-lockness/round-based" -branch = "impr-sim" - -[patch.crates-io.cggmp21-keygen] -git = "https://github.com/lfdt-lockness/cggmp21" -branch = "update-hd-wallets" - -[patch.crates-io.key-share] -git = "https://github.com/lfdt-lockness/cggmp21" -branch = "update-hd-wallets" - -[patch.crates-io.hd-wallet] -git = "https://github.com/lfdt-lockness/hd-wallet" -branch = "dt"