From 76f95afc6ab6ae5d07e6411575658e62d3650191 Mon Sep 17 00:00:00 2001 From: muji Date: Tue, 7 Mar 2023 15:35:12 +0800 Subject: [PATCH] Remove patched curv as found the culprit in fs-dkr. The fs-dkr dependency was enabling default-features for curv-kzen which in turn forced rust-gmp-kzen to be compiled which breaks webassembly. By switching off default-features we can now force the usage of num-bigint. --- Cargo.lock | 5 +++-- Cargo.toml | 5 +---- README.md | 11 +++++++++++ 3 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 README.md diff --git a/Cargo.lock b/Cargo.lock index d38c491..3019554 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -352,7 +352,8 @@ checksum = "e35f15e1a0699dd988fed910dd78fdc6407f44654cd12589c91fa44ea67d9159" [[package]] name = "curv-kzen" version = "0.10.0" -source = "git+https://github.com/tmpfs/curv?branch=disable-default-features#3f47aa38cfa2834faf497f4342772df02ed13169" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a616b5f766fd80307f0e83de6326ccd9fe7b3ba4225fe4e12ae3a692a939d07b" dependencies = [ "cryptoxide", "curve25519-dalek", @@ -528,7 +529,7 @@ dependencies = [ [[package]] name = "fs-dkr" version = "0.1.0" -source = "git+https://github.com/tmpfs/fs-dkr?branch=deps-update#1f9ceabaad1dc52503ddca9f7d76b744bfbb6c11" +source = "git+https://github.com/tmpfs/fs-dkr?branch=deps-update#8cc00728120fab70563268ad83adb2d717c38af7" dependencies = [ "bitvec", "curv-kzen", diff --git a/Cargo.toml b/Cargo.toml index 78ca8b3..d4efe00 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,6 +31,7 @@ branch = "deps-update" #path = "../forks/cggmp-threshold-ecdsa" default-features = false + [dependencies.curv-kzen] #git = "https://github.com/ZenGo-X/curv" #path = "../forks/curv" @@ -51,9 +52,5 @@ branch = "deps-update" default-features = false version = "*" -[patch.crates-io] -#curv-kzen = { path = "../forks/curv" } -curv-kzen = { git= "https://github.com/tmpfs/curv", branch = "disable-default-features" } - [dev-dependencies] wasm-bindgen-test = "0.3" diff --git a/README.md b/README.md new file mode 100644 index 0000000..bc376aa --- /dev/null +++ b/README.md @@ -0,0 +1,11 @@ +# CGGMP Webassembly + +Compiles the [cggmp-threshold-ecdsa][] library to webassembly using some forks which update dependencies to remove conflicts. + +Once these PRs are merged then we can revert to the `webb-tools` versions: + +1) https://github.com/webb-tools/multi-party-ecdsa/pull/14 +2) https://github.com/webb-tools/fs-dkr/pull/12 +3) https://github.com/webb-tools/cggmp-threshold-ecdsa/pull/13 + +[cggmp-threshold-ecdsa]: https://github.com/webb-tools/cggmp-threshold-ecdsa/