diff --git a/Cargo.lock b/Cargo.lock index d87e53f..d163205 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -13,9 +13,9 @@ dependencies = [ [[package]] name = "adler2" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" +checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" [[package]] name = "ahash" @@ -62,9 +62,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstream" -version = "0.6.18" +version = "0.6.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" +checksum = "301af1932e46185686725e0fad2f8f2aa7da69dd70bf6ecc44d6b703844a3933" dependencies = [ "anstyle", "anstyle-parse", @@ -83,27 +83,27 @@ checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" [[package]] name = "anstyle-parse" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" +checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" +checksum = "6c8bdeb6047d8983be085bab0ba1472e6dc604e7041dbf6fcd5e71523014fae9" dependencies = [ "windows-sys", ] [[package]] name = "anstyle-wincon" -version = "3.0.8" +version = "3.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6680de5231bd6ee4c6191b8a1325daa282b415391ec9d3a37bd34f2060dc73fa" +checksum = "403f75924867bb1033c59fbf0797484329750cfbe3c4325cd33127941fabc882" dependencies = [ "anstyle", "once_cell_polyfill", @@ -571,15 +571,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" -[[package]] -name = "cc" -version = "1.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0fc897dc1e865cc67c0e05a836d9d3f1df3cbe442aa4a9473b18e12624a4951" -dependencies = [ - "shlex", -] - [[package]] name = "cfg-if" version = "1.0.0" @@ -655,9 +646,9 @@ checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" [[package]] name = "color-eyre" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6e1761c0e16f8883bbbb8ce5990867f4f06bf11a0253da6495a04ce4b6ef0ec" +checksum = "e5920befb47832a6d61ee3a3a846565cfa39b331331e68a3b1d1116630f2f26d" dependencies = [ "backtrace", "color-spantrace", @@ -670,9 +661,9 @@ dependencies = [ [[package]] name = "color-spantrace" -version = "0.2.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ddd8d5bfda1e11a501d0a7303f3bfed9aa632ebdb859be40d0fd70478ed70d5" +checksum = "b8b88ea9df13354b55bc7234ebcce36e6ef896aca2e42a15de9e10edce01b427" dependencies = [ "once_cell", "owo-colors", @@ -682,19 +673,9 @@ dependencies = [ [[package]] name = "colorchoice" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" - -[[package]] -name = "console_error_panic_hook" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" -dependencies = [ - "cfg-if", - "wasm-bindgen", -] +checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" [[package]] name = "const_format" @@ -767,15 +748,6 @@ dependencies = [ "itertools 0.10.5", ] -[[package]] -name = "crossbeam-channel" -version = "0.5.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2" -dependencies = [ - "crossbeam-utils", -] - [[package]] name = "crossbeam-deque" version = "0.8.6" @@ -993,10 +965,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" dependencies = [ "cfg-if", - "js-sys", "libc", "wasi 0.11.0+wasi-snapshot-preview1", - "wasm-bindgen", ] [[package]] @@ -1215,21 +1185,11 @@ dependencies = [ "zeroize", ] -[[package]] -name = "minicov" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f27fe9f1cc3c22e1687f9446c2083c4c5fc7f0bcf1c7a86bdbded14985895b4b" -dependencies = [ - "cc", - "walkdir", -] - [[package]] name = "miniz_oxide" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a" +checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" dependencies = [ "adler2", ] @@ -1292,9 +1252,9 @@ checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e" [[package]] name = "owo-colors" -version = "4.2.1" +version = "4.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26995317201fa17f3656c36716aed4a7c81743a9634ac4c99c0eeda495db0cec" +checksum = "48dd4f4a2c8405440fd0462561f0e5806bd0f77e86f51c761481bdd4018b545e" [[package]] name = "parity-scale-codec" @@ -1584,7 +1544,6 @@ checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ "crossbeam-deque", "crossbeam-utils", - "wasm_sync", ] [[package]] @@ -1668,25 +1627,6 @@ dependencies = [ "zerokit_utils", ] -[[package]] -name = "rln-wasm" -version = "0.2.0" -dependencies = [ - "console_error_panic_hook", - "getrandom 0.2.16", - "js-sys", - "num-bigint", - "rln", - "serde-wasm-bindgen", - "serde_json", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-bindgen-rayon", - "wasm-bindgen-test", - "web-sys", - "zerokit_utils", -] - [[package]] name = "rlp" version = "0.5.2" @@ -1732,9 +1672,9 @@ checksum = "48fd7bd8a6377e15ad9d42a8ec25371b94ddc67abe7c8b9127bec79bebaaae18" [[package]] name = "rustc-demangle" -version = "0.1.24" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" +checksum = "989e6739f80c4ad5b13e0fd7fe89531180375b18520cc8c82080e4dc4035b84f" [[package]] name = "rustc-hex" @@ -1820,17 +1760,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "serde-wasm-bindgen" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8302e169f0eddcc139c70f139d19d6467353af16f9fce27e8c30158036a1e16b" -dependencies = [ - "js-sys", - "serde", - "wasm-bindgen", -] - [[package]] name = "serde_derive" version = "1.0.219" @@ -1874,12 +1803,6 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - [[package]] name = "sled" version = "0.34.7" @@ -1970,12 +1893,11 @@ dependencies = [ [[package]] name = "thread_local" -version = "1.1.8" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185" dependencies = [ "cfg-if", - "once_cell", ] [[package]] @@ -2196,19 +2118,6 @@ dependencies = [ "wasm-bindgen-shared", ] -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61" -dependencies = [ - "cfg-if", - "js-sys", - "once_cell", - "wasm-bindgen", - "web-sys", -] - [[package]] name = "wasm-bindgen-macro" version = "0.2.100" @@ -2232,18 +2141,6 @@ dependencies = [ "wasm-bindgen-shared", ] -[[package]] -name = "wasm-bindgen-rayon" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9beda8dfdfaf2e0ec0b47e130a0794d18188fba4da8a2155dcc3bbeb7e0d454" -dependencies = [ - "crossbeam-channel", - "js-sys", - "rayon-core", - "wasm-bindgen", -] - [[package]] name = "wasm-bindgen-shared" version = "0.2.100" @@ -2253,41 +2150,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "wasm-bindgen-test" -version = "0.3.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66c8d5e33ca3b6d9fa3b4676d774c5778031d27a578c2b007f905acf816152c3" -dependencies = [ - "js-sys", - "minicov", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-bindgen-test-macro", -] - -[[package]] -name = "wasm-bindgen-test-macro" -version = "0.3.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17d5042cc5fa009658f9a7333ef24291b1291a25b6382dd68862a7f3b969f69b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.101", -] - -[[package]] -name = "wasm_sync" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff360cade7fec41ff0e9d2cda57fe58258c5f16def0e21302394659e6bbb0ea" -dependencies = [ - "js-sys", - "wasm-bindgen", - "web-sys", -] - [[package]] name = "web-sys" version = "0.3.77" diff --git a/Cargo.toml b/Cargo.toml index 028cbe3..2fe0522 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [workspace] -members = ["rln", "rln-cli", "rln-wasm", "utils"] -default-members = ["rln", "rln-cli", "rln-wasm", "utils"] +members = ["rln", "rln-cli", "utils"] +exclude = ["rln-wasm"] resolver = "2" # Compilation profile for any non-workspace member. diff --git a/rln-cli/Cargo.toml b/rln-cli/Cargo.toml index 1d8d785..b3b43ac 100644 --- a/rln-cli/Cargo.toml +++ b/rln-cli/Cargo.toml @@ -13,8 +13,8 @@ path = "src/examples/stateless.rs" required-features = ["stateless"] [dependencies] -rln = { path = "../rln", default-features = true } -zerokit_utils = { path = "../utils" } +rln = { path = "../rln", version = "0.8.0", default-features = true } +zerokit_utils = { path = "../utils", version = "0.6.0", default-features = false } clap = { version = "4.5.38", features = ["cargo", "derive", "env"] } color-eyre = "0.6.4" serde_json = "1.0" diff --git a/rln-wasm/Cargo.toml b/rln-wasm/Cargo.toml index 63d73a5..42505dd 100644 --- a/rln-wasm/Cargo.toml +++ b/rln-wasm/Cargo.toml @@ -6,12 +6,12 @@ license = "MIT or Apache2" [lib] crate-type = ["cdylib", "rlib"] -required-features = ["stateless"] [dependencies] -rln = { path = "../rln", version = "0.8.0", default-features = false } -zerokit_utils = { path = "../utils", version = "0.6.0" } - +rln = { path = "../rln", version = "0.8.0", default-features = false, features = [ + "stateless", +] } +zerokit_utils = { path = "../utils", version = "0.6.0", default-features = false } num-bigint = { version = "0.4.6", default-features = false } js-sys = "0.3.77" wasm-bindgen = "0.2.100" @@ -38,9 +38,8 @@ features = ["Window", "Navigator"] [features] default = ["console_error_panic_hook"] -stateless = ["rln/stateless"] arkzkey = ["rln/arkzkey"] multithread = ["wasm-bindgen-rayon"] [package.metadata.docs.rs] -all-features = true \ No newline at end of file +all-features = true diff --git a/rln-wasm/Makefile.toml b/rln-wasm/Makefile.toml index 9ecf868..1fac9d2 100644 --- a/rln-wasm/Makefile.toml +++ b/rln-wasm/Makefile.toml @@ -26,16 +26,7 @@ dependencies = [ [tasks.pack_build] command = "wasm-pack" -args = [ - "build", - "--release", - "--target", - "web", - "--scope", - "waku", - "--features", - "stateless", -] +args = ["build", "--release", "--target", "web", "--scope", "waku"] [tasks.pack_build_arkzkey] command = "wasm-pack" @@ -47,7 +38,7 @@ args = [ "--scope", "waku", "--features", - "stateless,arkzkey", + "arkzkey", ] [tasks.pack_build_multithread] @@ -65,7 +56,7 @@ args = [ "--scope", "waku", "--features", - "stateless,multithread", + "multithread", "-Z", "build-std=panic_abort,std", ] @@ -85,7 +76,7 @@ args = [ "--scope", "waku", "--features", - "stateless,multithread,arkzkey", + "multithread,arkzkey", "-Z", "build-std=panic_abort,std", ] @@ -121,8 +112,6 @@ args = [ "--node", "--target", "wasm32-unknown-unknown", - "--features", - "stateless", "--", "--nocapture", ] @@ -137,7 +126,7 @@ args = [ "--target", "wasm32-unknown-unknown", "--features", - "stateless,arkzkey", + "arkzkey", "--", "--nocapture", ] @@ -154,8 +143,6 @@ args = [ "--headless", "--target", "wasm32-unknown-unknown", - "--features", - "stateless", "--", "--nocapture", ] @@ -173,7 +160,7 @@ args = [ "--target", "wasm32-unknown-unknown", "--features", - "stateless,arkzkey", + "arkzkey", "--", "--nocapture", ] @@ -196,7 +183,7 @@ args = [ "--target", "wasm32-unknown-unknown", "--features", - "stateless,multithread", + "multithread", "-Z", "build-std=panic_abort,std", "--", @@ -221,7 +208,7 @@ args = [ "--target", "wasm32-unknown-unknown", "--features", - "stateless,multithread,arkzkey", + "multithread,arkzkey", "-Z", "build-std=panic_abort,std", "--", diff --git a/rln/Cargo.toml b/rln/Cargo.toml index 1411320..5b01963 100644 --- a/rln/Cargo.toml +++ b/rln/Cargo.toml @@ -53,7 +53,7 @@ rand = "0.8.5" rand_chacha = "0.3.1" ruint = { version = "1.15.0", features = ["rand", "serde", "ark-ff-04"] } tiny-keccak = { version = "2.0.2", features = ["keccak"] } -utils = { package = "zerokit_utils", version = "0.6.0", path = "../utils", default-features = false } +utils = { path = "../utils", package = "zerokit_utils", version = "0.6.0", default-features = false } # serialization prost = "0.13.5"