From 1d5053109082594f591da37bbb452aa1c7f0054b Mon Sep 17 00:00:00 2001 From: Abdul Basit <45506001+imabdulbasit@users.noreply.github.com> Date: Thu, 11 Apr 2024 12:15:39 +0300 Subject: [PATCH] update deps (#72) * update deps * update hotshot to 0.5.34 * update event service to tag 0.1.2 --- Cargo.lock | 853 +++++++++++++++++++++----------------- Cargo.toml | 20 +- src/builder_state.rs | 2 +- src/service.rs | 6 +- src/testing/basic_test.rs | 13 +- 5 files changed, 496 insertions(+), 398 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 55ce6c4f..2c5fe61a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -425,6 +425,7 @@ dependencies = [ "ark-ff", "ark-std", "tracing", + "tracing-subscriber 0.2.25", ] [[package]] @@ -587,33 +588,33 @@ dependencies = [ "async-trait", "color-eyre", "console-subscriber 0.1.10", - "flume 0.11.0", + "flume", "futures", "tokio", "tokio-stream", "tracing", "tracing-error", - "tracing-subscriber", + "tracing-subscriber 0.3.18", ] [[package]] name = "async-compatibility-layer" -version = "1.0.0" -source = "git+https://github.com/EspressoSystems/async-compatibility-layer.git?tag=1.4.2#482cece7d27f20d5a543e209a5d88b1837778b4c" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7d24a8f9d6fec5b9313ceebbd82133ae87cf94944c362e8169d7ec735c88a23" dependencies = [ - "async-channel 1.9.0", - "async-lock 2.8.0", + "async-lock 3.3.0", "async-std", "async-trait", "color-eyre", "console-subscriber 0.2.0", - "flume 0.11.0", + "flume", "futures", "tokio", "tokio-stream", "tracing", "tracing-error", - "tracing-subscriber", + "tracing-subscriber 0.3.18", ] [[package]] @@ -924,7 +925,7 @@ dependencies = [ "futures-util", "log", "pin-project-lite 0.2.13", - "tungstenite 0.13.0", + "tungstenite", ] [[package]] @@ -933,7 +934,7 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4057f2c32adbb2fc158e22fb38433c8e9bbf76b75a4732c7c0cbaf695fb65568" dependencies = [ - "bytes 1.6.0", + "bytes", "futures-sink", "futures-util", "memchr", @@ -946,7 +947,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a860072022177f903e59730004fb5dc13db9275b79bb2aef7ba8ce831956c233" dependencies = [ - "bytes 1.6.0", + "bytes", "futures-sink", "futures-util", "memchr", @@ -994,11 +995,11 @@ dependencies = [ "async-trait", "axum-core", "bitflags 1.3.2", - "bytes 1.6.0", + "bytes", "futures-util", "http 0.2.12", - "http-body", - "hyper", + "http-body 0.4.6", + "hyper 0.14.28", "itoa", "matchit", "memchr", @@ -1020,10 +1021,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" dependencies = [ "async-trait", - "bytes 1.6.0", + "bytes", "futures-util", "http 0.2.12", - "http-body", + "http-body 0.4.6", "mime", "rustversion", "tower-layer", @@ -1069,6 +1070,12 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "base64" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" + [[package]] name = "base64ct" version = "1.6.0" @@ -1235,12 +1242,6 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" -[[package]] -name = "bytes" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" - [[package]] name = "bytes" version = "1.6.0" @@ -1277,7 +1278,7 @@ checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" [[package]] name = "cdn-broker" version = "0.1.0" -source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.1.19#b9b6424db150aee7f78db8172f1324ecc757cc74" +source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.1.23#c709b7b6f6f93534b458fcbb994c61c2cdebeadf" dependencies = [ "async-std", "cdn-proto", @@ -1285,7 +1286,7 @@ dependencies = [ "dashmap", "derivative", "derive_builder", - "jf-primitives", + "jf-primitives 0.4.0-pre.0", "lazy_static", "local-ip-address", "parking_lot", @@ -1294,52 +1295,51 @@ dependencies = [ "rkyv", "tokio", "tracing", - "tracing-subscriber", + "tracing-subscriber 0.3.18", ] [[package]] name = "cdn-client" version = "0.1.0" -source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.1.19#b9b6424db150aee7f78db8172f1324ecc757cc74" +source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.1.23#c709b7b6f6f93534b458fcbb994c61c2cdebeadf" dependencies = [ "async-std", "cdn-proto", "clap", "derive_builder", - "jf-primitives", + "jf-primitives 0.4.0-pre.0", "rand 0.8.5", "tokio", "tracing", - "tracing-subscriber", + "tracing-subscriber 0.3.18", ] [[package]] name = "cdn-marshal" version = "0.1.0" -source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.1.19#b9b6424db150aee7f78db8172f1324ecc757cc74" +source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.1.23#c709b7b6f6f93534b458fcbb994c61c2cdebeadf" dependencies = [ "async-std", "cdn-proto", "clap", "derive_builder", - "jf-primitives", + "jf-primitives 0.4.0-pre.0", "tokio", "tracing", - "tracing-subscriber", + "tracing-subscriber 0.3.18", ] [[package]] name = "cdn-proto" version = "0.1.0" -source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.1.19#b9b6424db150aee7f78db8172f1324ecc757cc74" +source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.1.23#c709b7b6f6f93534b458fcbb994c61c2cdebeadf" dependencies = [ "anyhow", "ark-serialize", - "async-std", "async-trait", "capnp", "derivative", - "jf-primitives", + "jf-primitives 0.4.0-pre.0", "kanal", "lazy_static", "mnemonic", @@ -1505,7 +1505,7 @@ version = "4.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" dependencies = [ - "bytes 1.6.0", + "bytes", "futures-core", "memchr", "pin-project-lite 0.2.13", @@ -1514,9 +1514,10 @@ dependencies = [ ] [[package]] -name = "commit" -version = "0.2.2" -source = "git+https://github.com/EspressoSystems/commit.git#30679718efd4ecf870b66950160077125dcb8d93" +name = "committable" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93c989a517928da3346fce6f6f75794285420edc3ef42c995ced45519f065acd" dependencies = [ "arbitrary", "ark-serialize", @@ -1527,7 +1528,7 @@ dependencies = [ "hex", "serde", "sha3", - "tagged-base64", + "tagged-base64 0.4.0", ] [[package]] @@ -1605,7 +1606,7 @@ dependencies = [ "tonic 0.9.2", "tracing", "tracing-core", - "tracing-subscriber", + "tracing-subscriber 0.3.18", ] [[package]] @@ -1629,7 +1630,7 @@ dependencies = [ "tonic 0.10.2", "tracing", "tracing-core", - "tracing-subscriber", + "tracing-subscriber 0.3.18", ] [[package]] @@ -1914,37 +1915,6 @@ dependencies = [ "rand 0.7.3", ] -[[package]] -name = "curl" -version = "0.4.46" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e2161dd6eba090ff1594084e95fd67aeccf04382ffea77999ea94ed42ec67b6" -dependencies = [ - "curl-sys", - "libc", - "openssl-probe", - "openssl-sys", - "schannel", - "socket2 0.5.6", - "windows-sys 0.52.0", -] - -[[package]] -name = "curl-sys" -version = "0.4.72+curl-8.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29cbdc8314c447d11e8fd156dcdd031d9e02a7a976163e396b548c03153bc9ea" -dependencies = [ - "cc", - "libc", - "libnghttp2-sys", - "libz-sys", - "openssl-sys", - "pkg-config", - "vcpkg", - "windows-sys 0.52.0", -] - [[package]] name = "curve25519-dalek" version = "4.1.2" @@ -2535,17 +2505,6 @@ dependencies = [ "miniz_oxide", ] -[[package]] -name = "flume" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bebadab126f8120d410b677ed95eee4ba6eb7c6dd8e34a5ec88a08050e26132" -dependencies = [ - "futures-core", - "futures-sink", - "spinning_top", -] - [[package]] name = "flume" version = "0.11.0" @@ -2851,7 +2810,7 @@ version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fbd2820c5e49886948654ab546d0688ff24530286bdcf8fca3cefb16d4618eb" dependencies = [ - "bytes 1.6.0", + "bytes", "fnv", "futures-core", "futures-sink", @@ -2864,6 +2823,25 @@ dependencies = [ "tracing", ] +[[package]] +name = "h2" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 1.1.0", + "indexmap 2.2.6", + "slab", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "hashbrown" version = "0.12.3" @@ -2921,7 +2899,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" dependencies = [ "base64 0.21.7", - "bytes 1.6.0", + "bytes", "headers-core", "http 0.2.12", "httpdate", @@ -3099,11 +3077,11 @@ dependencies = [ [[package]] name = "hotshot" version = "0.5.26" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.32#10dfcc7065ae99462cdf87538a225e5a562df2a4" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.34#cf967c227edc56b2a88c6d38b24a10b8c8ffa90d" dependencies = [ "anyhow", "async-broadcast", - "async-compatibility-layer 1.0.0 (git+https://github.com/EspressoSystems/async-compatibility-layer.git?tag=1.4.2)", + "async-compatibility-layer 1.1.0", "async-lock 2.8.0", "async-std", "async-trait", @@ -3113,7 +3091,7 @@ dependencies = [ "cdn-broker", "cdn-client", "cdn-marshal", - "commit", + "committable", "custom_debug", "dashmap", "derive_more", @@ -3125,7 +3103,7 @@ dependencies = [ "hotshot-task-impls", "hotshot-types", "hotshot-web-server", - "jf-primitives", + "jf-primitives 0.4.3", "libp2p-identity", "libp2p-networking", "lru 0.12.3", @@ -3137,26 +3115,26 @@ dependencies = [ "time 0.3.34", "tokio", "tracing", - "versioned-binary-serialization", + "vbs", ] [[package]] name = "hotshot-builder-api" version = "0.1.6" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.32#10dfcc7065ae99462cdf87538a225e5a562df2a4" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.34#cf967c227edc56b2a88c6d38b24a10b8c8ffa90d" dependencies = [ "async-trait", "clap", - "commit", + "committable", "derive_more", "futures", "hotshot-types", "serde", "snafu 0.8.2", - "tagged-base64", + "tagged-base64 0.4.0", "tide-disco", "toml", - "versioned-binary-serialization", + "vbs", ] [[package]] @@ -3164,12 +3142,12 @@ name = "hotshot-builder-core" version = "0.1.2" dependencies = [ "async-broadcast", - "async-compatibility-layer 1.0.0 (git+https://github.com/EspressoSystems/async-compatibility-layer.git?tag=1.4.1)", + "async-compatibility-layer 1.0.0", "async-lock 2.8.0", "async-std", "async-trait", "clap", - "commit", + "committable", "futures", "hotshot", "hotshot-builder-api", @@ -3180,19 +3158,19 @@ dependencies = [ "sha2 0.10.8", "snafu 0.8.2", "surf-disco", - "tagged-base64", + "tagged-base64 0.4.0", "tide-disco", "tracing", - "versioned-binary-serialization", + "vbs", ] [[package]] name = "hotshot-events-service" -version = "0.1.1" -source = "git+https://github.com/EspressoSystems/hotshot-events-service.git?tag=0.1.1#ddb375d9bdd857fa5f2ef0255d6f0c24ce4779f3" +version = "0.1.2" +source = "git+https://github.com/EspressoSystems/hotshot-events-service.git?tag=0.1.2#8c671da15877c7be853bfb13979b4ea4909a5966" dependencies = [ "async-broadcast", - "async-compatibility-layer 1.0.0 (git+https://github.com/EspressoSystems/async-compatibility-layer.git?tag=1.4.1)", + "async-compatibility-layer 1.0.0", "async-lock 2.8.0", "async-std", "async-trait", @@ -3204,26 +3182,26 @@ dependencies = [ "hotshot-types", "serde", "snafu 0.8.2", - "tagged-base64", + "tagged-base64 0.4.0", "tide-disco", "toml", "tracing", - "versioned-binary-serialization", + "vbs", ] [[package]] name = "hotshot-example-types" version = "0.5.26" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.32#10dfcc7065ae99462cdf87538a225e5a562df2a4" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.34#cf967c227edc56b2a88c6d38b24a10b8c8ffa90d" dependencies = [ "anyhow", "async-broadcast", - "async-compatibility-layer 1.0.0 (git+https://github.com/EspressoSystems/async-compatibility-layer.git?tag=1.4.2)", + "async-compatibility-layer 1.1.0", "async-lock 2.8.0", "async-std", "async-trait", "bitvec", - "commit", + "committable", "either", "ethereum-types", "futures", @@ -3244,10 +3222,10 @@ dependencies = [ [[package]] name = "hotshot-orchestrator" version = "0.5.26" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.32#10dfcc7065ae99462cdf87538a225e5a562df2a4" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.34#cf967c227edc56b2a88c6d38b24a10b8c8ffa90d" dependencies = [ "anyhow", - "async-compatibility-layer 1.0.0 (git+https://github.com/EspressoSystems/async-compatibility-layer.git?tag=1.4.2)", + "async-compatibility-layer 1.1.0", "async-lock 2.8.0", "async-std", "bincode", @@ -3267,16 +3245,16 @@ dependencies = [ "tokio", "toml", "tracing", - "versioned-binary-serialization", + "vbs", ] [[package]] name = "hotshot-task" version = "0.5.26" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.32#10dfcc7065ae99462cdf87538a225e5a562df2a4" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.34#cf967c227edc56b2a88c6d38b24a10b8c8ffa90d" dependencies = [ "async-broadcast", - "async-compatibility-layer 1.0.0 (git+https://github.com/EspressoSystems/async-compatibility-layer.git?tag=1.4.2)", + "async-compatibility-layer 1.1.0", "async-std", "futures", "tokio", @@ -3286,40 +3264,40 @@ dependencies = [ [[package]] name = "hotshot-task-impls" version = "0.5.26" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.32#10dfcc7065ae99462cdf87538a225e5a562df2a4" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.34#cf967c227edc56b2a88c6d38b24a10b8c8ffa90d" dependencies = [ + "anyhow", "async-broadcast", - "async-compatibility-layer 1.0.0 (git+https://github.com/EspressoSystems/async-compatibility-layer.git?tag=1.4.2)", + "async-compatibility-layer 1.1.0", "async-lock 2.8.0", "async-std", "async-trait", "bincode", "bitvec", "chrono", - "commit", + "committable", "either", "futures", "hotshot-builder-api", "hotshot-task", "hotshot-types", - "jf-primitives", - "memoize", + "jf-primitives 0.4.3", "rand 0.8.5", "serde", "sha2 0.10.8", "snafu 0.8.2", "surf-disco", - "tagged-base64", + "tagged-base64 0.4.0", "time 0.3.34", "tokio", "tracing", - "versioned-binary-serialization", + "vbs", ] [[package]] name = "hotshot-types" version = "0.1.11" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.32#10dfcc7065ae99462cdf87538a225e5a562df2a4" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.34#cf967c227edc56b2a88c6d38b24a10b8c8ffa90d" dependencies = [ "anyhow", "ark-bls12-381", @@ -3329,14 +3307,14 @@ dependencies = [ "ark-ff", "ark-serialize", "ark-std", - "async-compatibility-layer 1.0.0 (git+https://github.com/EspressoSystems/async-compatibility-layer.git?tag=1.4.2)", + "async-compatibility-layer 1.1.0", "async-lock 2.8.0", "async-std", "async-trait", "bincode", "bitvec", "blake3", - "commit", + "committable", "custom_debug", "derivative", "digest 0.10.7", @@ -3348,28 +3326,30 @@ dependencies = [ "futures", "generic-array", "jf-plonk", - "jf-primitives", - "jf-utils", + "jf-primitives 0.4.3", + "jf-utils 0.4.3", "lazy_static", + "memoize", "rand 0.8.5", "rand_chacha 0.3.1", "serde", "sha2 0.10.8", "snafu 0.8.2", - "tagged-base64", + "tagged-base64 0.4.0", "time 0.3.34", "tokio", "tracing", "typenum", - "versioned-binary-serialization", + "url", + "vbs", ] [[package]] name = "hotshot-web-server" version = "0.5.26" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.32#10dfcc7065ae99462cdf87538a225e5a562df2a4" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.34#cf967c227edc56b2a88c6d38b24a10b8c8ffa90d" dependencies = [ - "async-compatibility-layer 1.0.0 (git+https://github.com/EspressoSystems/async-compatibility-layer.git?tag=1.4.2)", + "async-compatibility-layer 1.1.0", "async-lock 2.8.0", "async-std", "clap", @@ -3380,7 +3360,7 @@ dependencies = [ "tokio", "toml", "tracing", - "versioned-binary-serialization", + "vbs", ] [[package]] @@ -3389,7 +3369,7 @@ version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ - "bytes 1.6.0", + "bytes", "fnv", "itoa", ] @@ -3400,7 +3380,7 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ - "bytes 1.6.0", + "bytes", "fnv", "itoa", ] @@ -3411,22 +3391,43 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ - "bytes 1.6.0", + "bytes", "http 0.2.12", "pin-project-lite 0.2.13", ] +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http 1.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +dependencies = [ + "bytes", + "futures-core", + "http 1.1.0", + "http-body 1.0.0", + "pin-project-lite 0.2.13", +] + [[package]] name = "http-client" version = "6.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1947510dc91e2bf586ea5ffb412caad7673264e14bb39fb9078da114a94ce1a5" dependencies = [ - "async-std", "async-trait", "cfg-if", "http-types", - "isahc", "log", ] @@ -3476,13 +3477,13 @@ version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ - "bytes 1.6.0", + "bytes", "futures-channel", "futures-core", "futures-util", - "h2", + "h2 0.3.25", "http 0.2.12", - "http-body", + "http-body 0.4.6", "httparse", "httpdate", "itoa", @@ -3494,18 +3495,74 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2 0.4.4", + "http 1.1.0", + "http-body 1.0.0", + "httparse", + "itoa", + "pin-project-lite 0.2.13", + "smallvec", + "tokio", + "want", +] + [[package]] name = "hyper-timeout" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ - "hyper", + "hyper 0.14.28", "pin-project-lite 0.2.13", "tokio", "tokio-io-timeout", ] +[[package]] +name = "hyper-tls" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" +dependencies = [ + "bytes", + "http-body-util", + "hyper 1.2.0", + "hyper-util", + "native-tls", + "tokio", + "tokio-native-tls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "hyper 1.2.0", + "pin-project-lite 0.2.13", + "socket2 0.5.6", + "tokio", + "tower", + "tower-service", + "tracing", +] + [[package]] name = "iana-time-zone" version = "0.1.60" @@ -3593,10 +3650,10 @@ checksum = "064d90fec10d541084e7b39ead8875a5a80d9114a2b18791565253bae25f49e4" dependencies = [ "async-trait", "attohttpc", - "bytes 1.6.0", + "bytes", "futures", "http 0.2.12", - "hyper", + "hyper 0.14.28", "log", "rand 0.8.5", "tokio", @@ -3710,7 +3767,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f97967975f448f1a7ddb12b0bc41069d09ed6a1c161a92687e057325db35d413" dependencies = [ - "bytes 1.6.0", + "bytes", ] [[package]] @@ -3742,7 +3799,7 @@ dependencies = [ "socket2 0.5.6", "widestring", "windows-sys 0.48.0", - "winreg", + "winreg 0.50.0", ] [[package]] @@ -3751,29 +3808,6 @@ version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" -[[package]] -name = "isahc" -version = "0.9.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2948a0ce43e2c2ef11d7edf6816508998d99e13badd1150be0914205df9388a" -dependencies = [ - "bytes 0.5.6", - "crossbeam-utils", - "curl", - "curl-sys", - "flume 0.9.2", - "futures-lite 1.13.0", - "http 0.2.12", - "log", - "once_cell", - "slab", - "sluice", - "tracing", - "tracing-futures", - "url", - "waker-fn", -] - [[package]] name = "itertools" version = "0.9.0" @@ -3818,8 +3852,8 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jf-plonk" -version = "0.4.0-pre.0" -source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.2#f85f9024ef42ab8be95b2c81bd15fd6cbadeafbf" +version = "0.4.3" +source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.3#4a2e7b7c3f8f10b352262869133a17e30ae94981" dependencies = [ "ark-ec", "ark-ff", @@ -3833,16 +3867,16 @@ dependencies = [ "espresso-systems-common 0.4.0", "hashbrown 0.14.3", "itertools 0.12.1", - "jf-primitives", - "jf-relation", - "jf-utils", + "jf-primitives 0.4.3", + "jf-relation 0.4.3", + "jf-utils 0.4.3", "merlin", "num-bigint", "rand_chacha 0.3.1", "rayon", "serde", "sha3", - "tagged-base64", + "tagged-base64 0.4.0", ] [[package]] @@ -3875,21 +3909,64 @@ dependencies = [ "generic-array", "hashbrown 0.14.3", "itertools 0.12.1", - "jf-relation", - "jf-utils", + "jf-relation 0.4.0-pre.0", + "jf-utils 0.4.0-pre.0", "merlin", "num-bigint", "num-traits", "rand_chacha 0.3.1", - "rayon", "serde", "sha2 0.10.8", "sha3", - "tagged-base64", + "tagged-base64 0.3.4", "typenum", "zeroize", ] +[[package]] +name = "jf-primitives" +version = "0.4.3" +source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.3#4a2e7b7c3f8f10b352262869133a17e30ae94981" +dependencies = [ + "anyhow", + "ark-bls12-377", + "ark-bls12-381", + "ark-bn254", + "ark-bw6-761", + "ark-crypto-primitives", + "ark-ec", + "ark-ed-on-bls12-377", + "ark-ed-on-bls12-381", + "ark-ed-on-bn254", + "ark-ff", + "ark-pallas", + "ark-poly", + "ark-serialize", + "ark-std", + "blst", + "chacha20poly1305", + "crypto_kx", + "derivative", + "digest 0.10.7", + "displaydoc", + "espresso-systems-common 0.4.0", + "generic-array", + "hashbrown 0.14.3", + "itertools 0.12.1", + "jf-relation 0.4.3", + "jf-utils 0.4.3", + "merlin", + "num-bigint", + "num-traits", + "rand_chacha 0.3.1", + "rayon", + "serde", + "sha2 0.10.8", + "sha3", + "tagged-base64 0.4.0", + "zeroize", +] + [[package]] name = "jf-relation" version = "0.4.0-pre.0" @@ -3910,7 +3987,32 @@ dependencies = [ "dyn-clone 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)", "hashbrown 0.14.3", "itertools 0.12.1", - "jf-utils", + "jf-utils 0.4.0-pre.0", + "num-bigint", + "rand_chacha 0.3.1", +] + +[[package]] +name = "jf-relation" +version = "0.4.3" +source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.3#4a2e7b7c3f8f10b352262869133a17e30ae94981" +dependencies = [ + "ark-bls12-377", + "ark-bls12-381", + "ark-bn254", + "ark-bw6-761", + "ark-ec", + "ark-ff", + "ark-poly", + "ark-serialize", + "ark-std", + "derivative", + "displaydoc", + "downcast-rs", + "dyn-clone 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)", + "hashbrown 0.14.3", + "itertools 0.12.1", + "jf-utils 0.4.3", "num-bigint", "rand_chacha 0.3.1", "rayon", @@ -3920,6 +4022,21 @@ dependencies = [ name = "jf-utils" version = "0.4.0-pre.0" source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.2#f85f9024ef42ab8be95b2c81bd15fd6cbadeafbf" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-serialize", + "ark-std", + "digest 0.10.7", + "serde", + "sha2 0.10.8", + "tagged-base64 0.3.4", +] + +[[package]] +name = "jf-utils" +version = "0.4.3" +source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.3#4a2e7b7c3f8f10b352262869133a17e30ae94981" dependencies = [ "ark-ec", "ark-ff", @@ -3929,7 +4046,7 @@ dependencies = [ "rayon", "serde", "sha2 0.10.8", - "tagged-base64", + "tagged-base64 0.4.0", ] [[package]] @@ -4001,23 +4118,13 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" -[[package]] -name = "libnghttp2-sys" -version = "0.1.9+1.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b57e858af2798e167e709b9d969325b6d8e9d50232fcbc494d7d54f976854a64" -dependencies = [ - "cc", - "libc", -] - [[package]] name = "libp2p" version = "0.53.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "681fb3f183edfbedd7a57d32ebe5dcdc0b9f94061185acf3c30249349cc6fc99" dependencies = [ - "bytes 1.6.0", + "bytes", "either", "futures", "futures-timer", @@ -4153,7 +4260,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2fd9bc67af5415858262de3b37eb777159f10c0c349ff3214842faf8179ee087" dependencies = [ "asynchronous-codec 0.6.2", - "bytes 1.6.0", + "bytes", "cuckoofilter", "fnv", "futures", @@ -4177,7 +4284,7 @@ dependencies = [ "asynchronous-codec 0.7.0", "base64 0.21.7", "byteorder", - "bytes 1.6.0", + "bytes", "either", "fnv", "futures", @@ -4252,7 +4359,7 @@ checksum = "5cc5767727d062c4eac74dd812c998f0e488008e82cce9c33b463d38423f9ad2" dependencies = [ "arrayvec", "asynchronous-codec 0.7.0", - "bytes 1.6.0", + "bytes", "either", "fnv", "futures", @@ -4320,10 +4427,10 @@ dependencies = [ [[package]] name = "libp2p-networking" version = "0.5.26" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.32#10dfcc7065ae99462cdf87538a225e5a562df2a4" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.34#cf967c227edc56b2a88c6d38b24a10b8c8ffa90d" dependencies = [ "anyhow", - "async-compatibility-layer 1.0.0 (git+https://github.com/EspressoSystems/async-compatibility-layer.git?tag=1.4.2)", + "async-compatibility-layer 1.1.0", "async-lock 2.8.0", "async-std", "async-trait", @@ -4345,7 +4452,7 @@ dependencies = [ "tokio", "tokio-stream", "tracing", - "versioned-binary-serialization", + "vbs", "void", ] @@ -4356,7 +4463,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ecd0545ce077f6ea5434bcb76e8d0fe942693b4380aaad0d34a358c2bd05793" dependencies = [ "asynchronous-codec 0.7.0", - "bytes 1.6.0", + "bytes", "curve25519-dalek", "futures", "libp2p-core", @@ -4400,7 +4507,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67330af40b67217e746d42551913cfb7ad04c74fa300fb329660a56318590b3f" dependencies = [ "asynchronous-codec 0.6.2", - "bytes 1.6.0", + "bytes", "futures", "libp2p-core", "libp2p-identity", @@ -4430,7 +4537,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0375cdfee57b47b313ef1f0fdb625b78aed770d33a40cf1c294a371ff5e6666" dependencies = [ "async-std", - "bytes 1.6.0", + "bytes", "futures", "futures-timer", "if-watch", @@ -4455,7 +4562,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0aadb213ffc8e1a6f2b9c48dcf0fc07bf370f2ea4db7981813d45e50671c8d9d" dependencies = [ "asynchronous-codec 0.7.0", - "bytes 1.6.0", + "bytes", "either", "futures", "futures-bounded", @@ -4724,18 +4831,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "libz-sys" -version = "1.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e143b5e666b2695d28f6bca6497720813f699c9602dd7f5cac91008b8ada7f9" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - [[package]] name = "linked-hash-map" version = "0.5.6" @@ -4993,24 +5088,6 @@ dependencies = [ "syn 2.0.55", ] -[[package]] -name = "multer" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01acbdc23469fd8fe07ab135923371d5f5a422fbf9c522158677c8eb15bc51c2" -dependencies = [ - "bytes 1.6.0", - "encoding_rs", - "futures-util", - "http 0.2.12", - "httparse", - "log", - "memchr", - "mime", - "spin 0.9.8", - "version_check", -] - [[package]] name = "multiaddr" version = "0.18.1" @@ -5058,7 +5135,7 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea0df8e5eec2298a62b326ee4f0d7fe1a6b90a09dfcf9df37b38f947a8c42f19" dependencies = [ - "bytes 1.6.0", + "bytes", "futures", "log", "pin-project", @@ -5162,7 +5239,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "65b4b14489ab424703c092062176d52ba55485a89c076b4f9db05092b7223aa6" dependencies = [ - "bytes 1.6.0", + "bytes", "futures", "log", "netlink-packet-core", @@ -5178,7 +5255,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6471bf08e7ac0135876a9581bf3217ef0333c191c128d34878079f42ee150411" dependencies = [ "async-io 1.13.0", - "bytes 1.6.0", + "bytes", "futures", "libc", "log", @@ -5850,7 +5927,7 @@ version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" dependencies = [ - "bytes 1.6.0", + "bytes", "prost-derive 0.11.9", ] @@ -5860,7 +5937,7 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a" dependencies = [ - "bytes 1.6.0", + "bytes", "prost-derive 0.12.3", ] @@ -5956,7 +6033,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8ededb1cd78531627244d51dd0c7139fbe736c7d57af0092a76f0ffb2f56e98" dependencies = [ "asynchronous-codec 0.6.2", - "bytes 1.6.0", + "bytes", "quick-protobuf", "thiserror", "unsigned-varint 0.7.2", @@ -5969,7 +6046,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "15a0580ab32b169745d7a39db2ba969226ca16738931be152a3209b409de2474" dependencies = [ "asynchronous-codec 0.7.0", - "bytes 1.6.0", + "bytes", "quick-protobuf", "thiserror", "unsigned-varint 0.8.0", @@ -5983,7 +6060,7 @@ checksum = "8cc2c5017e4b43d5995dcea317bc46c1e09404c0a9664d2908f7f02dfe943d75" dependencies = [ "async-io 1.13.0", "async-std", - "bytes 1.6.0", + "bytes", "futures-io", "pin-project-lite 0.2.13", "quinn-proto", @@ -6001,12 +6078,11 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "141bf7dfde2fbc246bfd3fe12f2455aa24b0fbd9af535d8c86c7bd1381ff2b1a" dependencies = [ - "bytes 1.6.0", + "bytes", "rand 0.8.5", "ring 0.16.20", "rustc-hash", "rustls 0.21.10", - "rustls-native-certs", "slab", "thiserror", "tinyvec", @@ -6019,7 +6095,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7" dependencies = [ - "bytes 1.6.0", + "bytes", "libc", "socket2 0.5.6", "tracing", @@ -6165,7 +6241,7 @@ checksum = "c580d9cbbe1d1b479e8d67cf9daf6a62c957e6846048408b80b43ac3f6af84cd" dependencies = [ "arc-swap", "async-trait", - "bytes 1.6.0", + "bytes", "combine", "futures", "futures-util", @@ -6173,8 +6249,6 @@ dependencies = [ "percent-encoding", "pin-project-lite 0.2.13", "ryu", - "sha1_smol", - "socket2 0.4.10", "tokio", "tokio-retry", "tokio-util", @@ -6254,6 +6328,48 @@ dependencies = [ "bytecheck", ] +[[package]] +name = "reqwest" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e6cc1e89e689536eb5aeede61520e874df5a4707df811cd5da4aa5fbb2aae19" +dependencies = [ + "base64 0.22.0", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2 0.4.4", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.2.0", + "hyper-tls", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite 0.2.13", + "rustls-pemfile 2.1.2", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "system-configuration", + "tokio", + "tokio-native-tls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg 0.52.0", +] + [[package]] name = "resolv-conf" version = "0.7.0" @@ -6302,7 +6418,7 @@ checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0" dependencies = [ "bitvec", "bytecheck", - "bytes 1.6.0", + "bytes", "hashbrown 0.12.3", "ptr_meta", "rend", @@ -6329,7 +6445,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb919243f34364b6bd2fc10ef797edbfa75f33c252e7998527479c6d6b47e1ec" dependencies = [ - "bytes 1.6.0", + "bytes", "rustc-hex", ] @@ -6505,26 +6621,30 @@ dependencies = [ ] [[package]] -name = "rustls-native-certs" -version = "0.6.3" +name = "rustls-pemfile" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "openssl-probe", - "rustls-pemfile", - "schannel", - "security-framework", + "base64 0.21.7", ] [[package]] name = "rustls-pemfile" -version = "1.0.4" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" dependencies = [ - "base64 0.21.7", + "base64 0.22.0", + "rustls-pki-types", ] +[[package]] +name = "rustls-pki-types" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247" + [[package]] name = "rustls-webpki" version = "0.101.7" @@ -6937,17 +7057,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "sluice" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7400c0eff44aa2fcb5e31a5f24ba9716ed90138769e4977a2ba6014ae63eb5" -dependencies = [ - "async-channel 1.9.0", - "futures-core", - "futures-io", -] - [[package]] name = "smallvec" version = "1.13.2" @@ -7079,7 +7188,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41d1c5305e39e09653383c2c7244f2f78b3bcae37cf50c64cb4789c9f5096ec2" dependencies = [ "base64 0.13.1", - "bytes 1.6.0", + "bytes", "futures", "httparse", "log", @@ -7102,15 +7211,6 @@ dependencies = [ "lock_api", ] -[[package]] -name = "spinning_top" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9eb1a2f4c41445a3a0ff9abc5221c5fcd28e1f13cd7c0397706f9ac938ddb0" -dependencies = [ - "lock_api", -] - [[package]] name = "spki" version = "0.7.3" @@ -7152,11 +7252,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24ba59a9342a3d9bab6c56c118be528b27c9b60e490080e9711a04dccac83ef6" dependencies = [ "ahash 0.8.11", - "async-io 1.13.0", - "async-std", "atoi", "byteorder", - "bytes 1.6.0", + "bytes", "crc", "crossbeam-queue", "either", @@ -7206,7 +7304,6 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5833ef53aaa16d860e92123292f1f6a3d53c34ba8b1969f152ef1a7bb803f3c8" dependencies = [ - "async-std", "dotenvy", "either", "heck 0.4.1", @@ -7237,7 +7334,7 @@ dependencies = [ "base64 0.21.7", "bitflags 2.5.0", "byteorder", - "bytes 1.6.0", + "bytes", "crc", "digest 0.10.7", "dotenvy", @@ -7316,7 +7413,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b244ef0a8414da0bed4bb1910426e890b19e5e9bccc27ada6b797d05c55ae0aa" dependencies = [ "atoi", - "flume 0.11.0", + "flume", "futures-channel", "futures-core", "futures-executor", @@ -7445,44 +7542,23 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" -[[package]] -name = "surf" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718b1ae6b50351982dedff021db0def601677f2120938b070eadb10ba4038dd7" -dependencies = [ - "async-std", - "async-trait", - "cfg-if", - "encoding_rs", - "futures-util", - "getrandom 0.2.12", - "http-client", - "http-types", - "log", - "mime_guess", - "once_cell", - "pin-project-lite 0.2.13", - "serde", - "serde_json", - "web-sys", -] - [[package]] name = "surf-disco" -version = "0.5.0" -source = "git+https://github.com/EspressoSystems/surf-disco?tag=v0.5.0#956cebd8d9784de42ea41fd30ec382de8246cb9c" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b649b5919e809b105a8ae833154430f7069b0e3a392fff26a672211c6b8e30d" dependencies = [ "async-std", "async-tungstenite", "derivative", "futures", "hex", + "reqwest", "serde", "serde_json", - "surf", "tide-disco", - "versioned-binary-serialization", + "tracing", + "vbs", ] [[package]] @@ -7635,7 +7711,23 @@ dependencies = [ "crc-any", "serde", "snafu 0.7.5", - "tagged-base64-macros", + "tagged-base64-macros 0.3.3", + "wasm-bindgen", +] + +[[package]] +name = "tagged-base64" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b74bbf1db405a3fd2c6f8cd403bfa14727faa145925efe3012fa270b61551f1" +dependencies = [ + "ark-serialize", + "ark-std", + "base64 0.22.0", + "crc-any", + "serde", + "snafu 0.8.2", + "tagged-base64-macros 0.4.0", "wasm-bindgen", ] @@ -7648,6 +7740,16 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "tagged-base64-macros" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcdea3c0150898fad2f7196a173ec3264f7fc455ba570939163c558f48ae85ac" +dependencies = [ + "quote", + "syn 1.0.109", +] + [[package]] name = "tap" version = "1.0.1" @@ -7734,8 +7836,9 @@ dependencies = [ [[package]] name = "tide-disco" -version = "0.5.0" -source = "git+https://github.com/EspressoSystems/tide-disco?tag=v0.5.0#07e489171089650cebfaca9ca6a6a6ddd843610d" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf3579d6f1362fffc7d1686ed061537afe8a187fd0b18e0f5694ad17e977ff3" dependencies = [ "anyhow", "async-std", @@ -7750,6 +7853,7 @@ dependencies = [ "futures-util", "http 1.1.0", "include_dir", + "itertools 0.12.1", "lazy_static", "libc", "markdown", @@ -7758,6 +7862,7 @@ dependencies = [ "num-traits", "parking_lot", "prometheus", + "reqwest", "routefinder", "semver 1.0.22", "serde", @@ -7769,8 +7874,7 @@ dependencies = [ "snafu 0.8.2", "strum", "strum_macros", - "surf", - "tagged-base64", + "tagged-base64 0.4.0", "tide", "tide-websockets", "toml", @@ -7778,9 +7882,9 @@ dependencies = [ "tracing-distributed", "tracing-futures", "tracing-log", - "tracing-subscriber", + "tracing-subscriber 0.3.18", "url", - "versioned-binary-serialization", + "vbs", ] [[package]] @@ -7901,7 +8005,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" dependencies = [ "backtrace", - "bytes 1.6.0", + "bytes", "libc", "mio", "num_cpus", @@ -7935,6 +8039,16 @@ dependencies = [ "syn 2.0.55", ] +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", +] + [[package]] name = "tokio-retry" version = "0.3.0" @@ -7957,25 +8071,13 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-tungstenite" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" -dependencies = [ - "futures-util", - "log", - "tokio", - "tungstenite 0.20.1", -] - [[package]] name = "tokio-util" version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" dependencies = [ - "bytes 1.6.0", + "bytes", "futures-core", "futures-sink", "pin-project-lite 0.2.13", @@ -8037,13 +8139,13 @@ dependencies = [ "async-trait", "axum", "base64 0.21.7", - "bytes 1.6.0", + "bytes", "futures-core", "futures-util", - "h2", + "h2 0.3.25", "http 0.2.12", - "http-body", - "hyper", + "http-body 0.4.6", + "hyper 0.14.28", "hyper-timeout", "percent-encoding", "pin-project", @@ -8066,11 +8168,11 @@ dependencies = [ "async-trait", "axum", "base64 0.21.7", - "bytes 1.6.0", - "h2", + "bytes", + "h2 0.3.25", "http 0.2.12", - "http-body", - "hyper", + "http-body 0.4.6", + "hyper 0.14.28", "hyper-timeout", "percent-encoding", "pin-project", @@ -8157,7 +8259,7 @@ dependencies = [ "itertools 0.9.0", "tracing", "tracing-core", - "tracing-subscriber", + "tracing-subscriber 0.3.18", ] [[package]] @@ -8167,7 +8269,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" dependencies = [ "tracing", - "tracing-subscriber", + "tracing-subscriber 0.3.18", ] [[package]] @@ -8201,6 +8303,15 @@ dependencies = [ "tracing-core", ] +[[package]] +name = "tracing-subscriber" +version = "0.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71" +dependencies = [ + "tracing-core", +] + [[package]] name = "tracing-subscriber" version = "0.3.18" @@ -8236,7 +8347,7 @@ checksum = "5fe8dada8c1a3aeca77d6b51a4f1314e0f4b8e438b7b1b71e3ddaca8080e4093" dependencies = [ "base64 0.13.1", "byteorder", - "bytes 1.6.0", + "bytes", "http 0.2.12", "httparse", "input_buffer", @@ -8249,25 +8360,6 @@ dependencies = [ "utf-8", ] -[[package]] -name = "tungstenite" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" -dependencies = [ - "byteorder", - "bytes 1.6.0", - "data-encoding", - "http 0.2.12", - "httparse", - "log", - "rand 0.8.5", - "sha1 0.10.6", - "thiserror", - "url", - "utf-8", -] - [[package]] name = "typenum" version = "1.17.0" @@ -8367,7 +8459,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6889a77d49f1f013504cec6bf97a2c730394adedaeb1deb5ea08949a50541105" dependencies = [ "asynchronous-codec 0.6.2", - "bytes 1.6.0", + "bytes", ] [[package]] @@ -8466,6 +8558,19 @@ dependencies = [ "sval_serde", ] +[[package]] +name = "vbs" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "971bcbd6c41e4e53fa9eab95b2a8ddaf1826be2f3e86b4101efebc8c3a17fde0" +dependencies = [ + "anyhow", + "bincode", + "derive_more", + "serde", + "serde_with", +] + [[package]] name = "vcpkg" version = "0.2.15" @@ -8478,18 +8583,6 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -[[package]] -name = "versioned-binary-serialization" -version = "0.1.2" -source = "git+https://github.com/EspressoSystems/versioned-binary-serialization.git?tag=0.1.2#6874f91a3c8d64acc24fe0abe4ad93c35b75eb9d" -dependencies = [ - "anyhow", - "bincode", - "displaydoc", - "serde", - "serde_with", -] - [[package]] name = "void" version = "1.0.2" @@ -8517,26 +8610,24 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1e92e22e03ff1230c03a1a8ee37d2f89cd489e2e541b7550d6afad96faed169" dependencies = [ - "bytes 1.6.0", + "bytes", "futures-channel", "futures-util", "headers", "http 0.2.12", - "hyper", + "hyper 0.14.28", "log", "mime", "mime_guess", - "multer", "percent-encoding", "pin-project", - "rustls-pemfile", + "rustls-pemfile 1.0.4", "scoped-tls", "serde", "serde_json", "serde_urlencoded", "tokio", "tokio-stream", - "tokio-tungstenite", "tokio-util", "tower-service", "tracing", @@ -8889,6 +8980,16 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "winreg" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + [[package]] name = "wyz" version = "0.5.1" diff --git a/Cargo.toml b/Cargo.toml index dc940709..b46acd70 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,20 +13,20 @@ async-lock = "2.8" async-std = { version = "1.9.0", features = ["unstable", "attributes"] } async-trait = "0.1" clap = { version = "4.4", features = ["derive", "env"] } -commit = { git = "https://github.com/EspressoSystems/commit.git" } +committable = "0.2" futures = "0.3" -hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.32" } -hotshot-builder-api = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.32" } -hotshot-events-service = { git = "https://github.com/EspressoSystems/hotshot-events-service.git", tag = "0.1.1" } -hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.32" } +hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.34" } +hotshot-builder-api = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.34" } +hotshot-events-service = { git = "https://github.com/EspressoSystems/hotshot-events-service.git", tag = "0.1.2" } +hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.34" } serde = { version = "1.0", features = ["derive"] } sha2 = "0.10" snafu = "0.8" -surf-disco = { git = "https://github.com/EspressoSystems/surf-disco", tag = "v0.5.0" } -tagged-base64 = { git = "https://github.com/EspressoSystems/tagged-base64", tag = "0.3.4" } -tide-disco = { git = "https://github.com/EspressoSystems/tide-disco", tag = "v0.5.0" } +surf-disco = "0.6" +tagged-base64 = "0.4" +tide-disco = "0.6" tracing = "0.1" -versioned-binary-serialization = { git = "https://github.com/EspressoSystems/versioned-binary-serialization.git", tag = "0.1.2" } +vbs = "0.1" [dev-dependencies] -hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.32" } +hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.34" } diff --git a/src/builder_state.rs b/src/builder_state.rs index 850b2ea2..4dad89d4 100644 --- a/src/builder_state.rs +++ b/src/builder_state.rs @@ -12,7 +12,7 @@ use hotshot_types::{ vote::Certificate, }; -use commit::{Commitment, Committable}; +use committable::{Commitment, Committable}; use crate::service::GlobalState; use crate::WaitAndKeep; diff --git a/src/service.rs b/src/service.rs index becfdcce..da4456c4 100644 --- a/src/service.rs +++ b/src/service.rs @@ -32,7 +32,7 @@ pub use async_broadcast::{broadcast, RecvError, TryRecvError}; use async_compatibility_layer::channel::UnboundedReceiver; use async_lock::RwLock; use async_trait::async_trait; -use commit::Committable; +use committable::Committable; use futures::future::BoxFuture; use futures::stream::StreamExt; use hotshot_events_service::{ @@ -44,7 +44,6 @@ use std::collections::HashMap; use std::num::NonZeroUsize; use std::sync::Arc; use tide_disco::method::ReadState; -use tracing; #[allow(clippy::type_complexity)] #[derive(Debug)] @@ -207,7 +206,6 @@ where metadata: block.1.clone(), signature: signature_over_builder_commitment, sender: self.builder_keys.0.clone(), - _phantom: Default::default(), }; Ok(block_data) } else { @@ -297,7 +295,7 @@ pub async fn run_non_permissioned_standalone_builder_service< BuilderEvent, surf_disco::socket::Unsupported, EventStreamError, - versioned_binary_serialization::version::StaticVersion<0, 1>, + vbs::version::StaticVersion<0, 1>, >, // instance state diff --git a/src/testing/basic_test.rs b/src/testing/basic_test.rs index 0f846421..0f73d356 100644 --- a/src/testing/basic_test.rs +++ b/src/testing/basic_test.rs @@ -26,7 +26,6 @@ mod tests { use async_compatibility_layer::channel::unbounded; use hotshot::types::SignatureKey; use hotshot_types::{ - data::QuorumProposal, event::LeafInfo, simple_vote::QuorumData, traits::block_contents::{vid_commitment, BlockHeader}, @@ -44,15 +43,15 @@ mod tests { use crate::service::GlobalState; use async_lock::RwLock; use async_std::task; - use commit::{Commitment, CommitmentBoundsArkless, Committable}; + use committable::{Commitment, CommitmentBoundsArkless, Committable}; use sha2::{Digest, Sha256}; use std::sync::Arc; - #[derive(Debug, Clone)] - pub struct CustomError { - pub index: usize, - pub error: TryRecvError, - } + // #[derive(Debug, Clone)] + // pub struct CustomError { + // pub index: usize, + // pub error: TryRecvError, + // } use serde::{Deserialize, Serialize}; /// This test simulates multiple builder states receiving messages from the channels and processing them