From 1f252b21d021896cd8e5d88b7561968f3f5a161f Mon Sep 17 00:00:00 2001 From: Nathan F Yospe Date: Fri, 8 Mar 2024 15:42:23 -0500 Subject: [PATCH 01/15] Dependency updates --- Cargo.lock | 147 ++++++++++++++++++++++++++++------------------------- Cargo.toml | 10 ++-- 2 files changed, 83 insertions(+), 74 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2a96a954..f3291b9d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -866,19 +866,6 @@ name = "async-tungstenite" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07b30ef0ea5c20caaa54baea49514a206308989c68be7ecd86c7f956e4da6378" -dependencies = [ - "futures-io", - "futures-util", - "log", - "pin-project-lite 0.2.13", - "tungstenite 0.13.0", -] - -[[package]] -name = "async-tungstenite" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "742cc7dcb20b2f84a42f4691aa999070ec7e78f8e7e7438bf14be7017b44907e" dependencies = [ "async-native-tls", "async-std", @@ -887,7 +874,7 @@ dependencies = [ "futures-util", "log", "pin-project-lite 0.2.13", - "tungstenite 0.15.0", + "tungstenite", ] [[package]] @@ -1592,6 +1579,27 @@ dependencies = [ "serdect", ] +[[package]] +name = "csv" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" +dependencies = [ + "csv-core", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "csv-core" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" +dependencies = [ + "memchr", +] + [[package]] name = "ctr" version = "0.6.0" @@ -2744,8 +2752,8 @@ dependencies = [ [[package]] name = "hotshot" -version = "0.3.3" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.21#eba2d0ec9dd27e555febbb42acad3fe24b9b5f3c" +version = "0.5.22" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=adding_vbs_support#5946d588df51bb81dc21534ea93fb2e29da9c5b5" dependencies = [ "async-broadcast", "async-compatibility-layer", @@ -2753,7 +2761,6 @@ dependencies = [ "async-std", "async-trait", "bimap", - "bincode", "commit", "custom_debug", "dashmap", @@ -2779,26 +2786,27 @@ dependencies = [ "time 0.3.34", "tokio", "tracing", + "versioned-binary-serialization", ] [[package]] name = "hotshot-constants" -version = "0.3.3" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.21#eba2d0ec9dd27e555febbb42acad3fe24b9b5f3c" +version = "0.5.22" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=adding_vbs_support#5946d588df51bb81dc21534ea93fb2e29da9c5b5" dependencies = [ "serde", + "versioned-binary-serialization", ] [[package]] name = "hotshot-example-types" -version = "0.1.0" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.21#eba2d0ec9dd27e555febbb42acad3fe24b9b5f3c" +version = "0.5.22" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=adding_vbs_support#5946d588df51bb81dc21534ea93fb2e29da9c5b5" dependencies = [ "async-broadcast", "async-compatibility-layer", "async-lock 2.8.0", "async-std", - "bincode", "bitvec", "commit", "either", @@ -2816,22 +2824,25 @@ dependencies = [ "sha2 0.10.8", "sha3", "snafu", + "time 0.3.34", "tokio", "tracing", ] [[package]] name = "hotshot-orchestrator" -version = "0.1.1" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.21#eba2d0ec9dd27e555febbb42acad3fe24b9b5f3c" +version = "0.5.22" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=adding_vbs_support#5946d588df51bb81dc21534ea93fb2e29da9c5b5" dependencies = [ "async-compatibility-layer", "async-lock 2.8.0", "async-std", "blake3", "clap", + "csv", "futures", "hotshot-types", + "hotshot-utils", "libp2p", "serde", "serde-inline-default", @@ -2846,8 +2857,8 @@ dependencies = [ [[package]] name = "hotshot-task" -version = "0.1.0" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.21#eba2d0ec9dd27e555febbb42acad3fe24b9b5f3c" +version = "0.5.22" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=adding_vbs_support#5946d588df51bb81dc21534ea93fb2e29da9c5b5" dependencies = [ "async-broadcast", "async-compatibility-layer", @@ -2859,8 +2870,8 @@ dependencies = [ [[package]] name = "hotshot-task-impls" -version = "0.1.0" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.21#eba2d0ec9dd27e555febbb42acad3fe24b9b5f3c" +version = "0.5.22" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=adding_vbs_support#5946d588df51bb81dc21534ea93fb2e29da9c5b5" dependencies = [ "async-broadcast", "async-compatibility-layer", @@ -2883,13 +2894,15 @@ dependencies = [ "time 0.3.34", "tokio", "tracing", + "versioned-binary-serialization", ] [[package]] name = "hotshot-types" -version = "0.1.0" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.21#eba2d0ec9dd27e555febbb42acad3fe24b9b5f3c" +version = "0.5.22" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=adding_vbs_support#5946d588df51bb81dc21534ea93fb2e29da9c5b5" dependencies = [ + "anyhow", "ark-bls12-381", "ark-ec", "ark-ed-on-bn254", @@ -2930,12 +2943,13 @@ dependencies = [ "tokio", "tracing", "typenum", + "versioned-binary-serialization", ] [[package]] name = "hotshot-utils" -version = "0.1.0" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.21#eba2d0ec9dd27e555febbb42acad3fe24b9b5f3c" +version = "0.5.22" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=adding_vbs_support#5946d588df51bb81dc21534ea93fb2e29da9c5b5" dependencies = [ "bincode", "hotshot-constants", @@ -2943,8 +2957,8 @@ dependencies = [ [[package]] name = "hotshot-web-server" -version = "0.1.1" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.21#eba2d0ec9dd27e555febbb42acad3fe24b9b5f3c" +version = "0.5.22" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=adding_vbs_support#5946d588df51bb81dc21534ea93fb2e29da9c5b5" dependencies = [ "async-compatibility-layer", "async-lock 2.8.0", @@ -2962,7 +2976,7 @@ dependencies = [ [[package]] name = "hs-builder-api" version = "0.1.1" -source = "git+https://github.com/EspressoSystems/hs-builder-api?branch=main#2ae2fc6ba9cebd9dfee94521ce9a9e7ed73de7fa" +source = "git+https://github.com/EspressoSystems/hs-builder-api?branch=adding_vbs_support#2000ea1647a9bed6d18454ae156ef9dd75397923" dependencies = [ "async-trait", "clap", @@ -3426,7 +3440,7 @@ checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "jf-plonk" version = "0.4.0-pre.0" -source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.0#214227e0608c231cb55234809727723c2a6740c2" +source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.1#e96464c4bd8beb608a6a4afc8b8a2441c981f21a" dependencies = [ "ark-ec", "ark-ff", @@ -3455,7 +3469,7 @@ dependencies = [ [[package]] name = "jf-primitives" version = "0.4.0-pre.0" -source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.0#214227e0608c231cb55234809727723c2a6740c2" +source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.1#e96464c4bd8beb608a6a4afc8b8a2441c981f21a" dependencies = [ "anyhow", "ark-bls12-377", @@ -3500,7 +3514,7 @@ dependencies = [ [[package]] name = "jf-relation" version = "0.4.0-pre.0" -source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.0#214227e0608c231cb55234809727723c2a6740c2" +source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.1#e96464c4bd8beb608a6a4afc8b8a2441c981f21a" dependencies = [ "ark-bls12-377", "ark-bls12-381", @@ -3526,7 +3540,7 @@ dependencies = [ [[package]] name = "jf-utils" version = "0.4.0-pre.0" -source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.0#214227e0608c231cb55234809727723c2a6740c2" +source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.1#e96464c4bd8beb608a6a4afc8b8a2441c981f21a" dependencies = [ "ark-ec", "ark-ff", @@ -3907,14 +3921,14 @@ dependencies = [ [[package]] name = "libp2p-networking" -version = "0.1.0" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.21#eba2d0ec9dd27e555febbb42acad3fe24b9b5f3c" +version = "0.5.22" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=adding_vbs_support#5946d588df51bb81dc21534ea93fb2e29da9c5b5" dependencies = [ + "anyhow", "async-compatibility-layer", "async-lock 2.8.0", "async-std", "async-trait", - "bincode", "blake3", "custom_debug", "dashmap", @@ -3934,6 +3948,7 @@ dependencies = [ "tokio", "tokio-stream", "tracing", + "versioned-binary-serialization", "void", ] @@ -6389,12 +6404,11 @@ dependencies = [ [[package]] name = "surf-disco" -version = "0.4.6" -source = "git+https://github.com/EspressoSystems/surf-disco.git?tag=v0.4.6#95181bced2719214fc88e8adcac739d86cb1387e" +version = "0.4.7" +source = "git+https://github.com/EspressoSystems/surf-disco.git?tag=v0.4.7#070e18d1daf0c9783e009a1a3b7f8b28b4546e24" dependencies = [ "async-std", - "async-tungstenite 0.15.0", - "bincode", + "async-tungstenite", "derivative", "futures", "hex", @@ -6402,6 +6416,7 @@ dependencies = [ "serde_json", "surf", "tide-disco", + "versioned-binary-serialization", ] [[package]] @@ -6647,12 +6662,12 @@ dependencies = [ [[package]] name = "tide-disco" -version = "0.4.6" -source = "git+https://github.com/EspressoSystems/tide-disco?tag=v0.4.6#4ced31cef8aae769994098d245e026c127801b74" +version = "0.4.7" +source = "git+https://github.com/EspressoSystems/tide-disco?tag=v0.4.7#1f8515bde918b9e2c50875a68dfa0e23b8167579" dependencies = [ + "anyhow", "async-std", "async-trait", - "bincode", "clap", "config", "derivative", @@ -6693,6 +6708,7 @@ dependencies = [ "tracing-log", "tracing-subscriber", "url", + "versioned-binary-serialization", ] [[package]] @@ -6703,7 +6719,7 @@ checksum = "3592c5cb5cb1b7a2ff3a0e5353170c1bb5b104b2f66dd06f73304169b52cc725" dependencies = [ "async-dup", "async-std", - "async-tungstenite 0.13.1", + "async-tungstenite", "base64 0.13.1", "futures-util", "pin-project", @@ -7112,25 +7128,6 @@ dependencies = [ "httparse", "input_buffer", "log", - "rand 0.8.5", - "sha-1", - "thiserror", - "url", - "utf-8", -] - -[[package]] -name = "tungstenite" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "983d40747bce878d2fb67d910dcb8bd3eca2b2358540c3cc1b98c027407a3ae3" -dependencies = [ - "base64 0.13.1", - "byteorder", - "bytes 1.5.0", - "http 0.2.11", - "httparse", - "log", "native-tls", "rand 0.8.5", "sha-1", @@ -7325,6 +7322,18 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +[[package]] +name = "versioned-binary-serialization" +version = "0.1.0" +source = "git+https://github.com/EspressoSystems/versioned-binary-serialization.git?tag=0.1.0#6b5bf0c0b74f8384c940880d5a988d5ec757de3e" +dependencies = [ + "anyhow", + "bincode", + "displaydoc", + "serde", + "serde_with", +] + [[package]] name = "void" version = "1.0.2" diff --git a/Cargo.toml b/Cargo.toml index e8663f05..258c6b93 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,12 +16,12 @@ async-trait = "0.1" clap = { version = "4.4", features = ["derive", "env"] } commit = { git = "https://github.com/EspressoSystems/commit.git" } futures = "0.3" -hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.21" } -hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.21" } -hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.21" } -hs-builder-api = { git = "https://github.com/EspressoSystems/hs-builder-api", branch = "main" } +hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "adding_vbs_support" } +hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "adding_vbs_support" } +hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "adding_vbs_support" } +hs-builder-api = { git = "https://github.com/EspressoSystems/hs-builder-api", branch = "adding_vbs_support" } sha2 = "0.10" serde = { version = "1.0", features = ["derive"] } -tide-disco = { git = "https://github.com/EspressoSystems/tide-disco", tag = "v0.4.6" } +tide-disco = { git = "https://github.com/EspressoSystems/tide-disco", tag = "v0.4.7" } tagged-base64 = { git = "https://github.com/EspressoSystems/tagged-base64", tag = "0.3.4" } tracing = "0.1" From b2a8eb712305725c6c934da1dfb78223ca6e2baf Mon Sep 17 00:00:00 2001 From: Nathan F Yospe Date: Mon, 18 Mar 2024 12:12:21 -0400 Subject: [PATCH 02/15] Updating dependencies --- Cargo.lock | 1447 ++++++++++++++++++++++++++++++++++++++++++++++++---- Cargo.toml | 4 +- 2 files changed, 1336 insertions(+), 115 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f3291b9d..622b38dd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -124,6 +124,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b79b82693f705137f8fb9b37871d99e4f9a7df12b917eed79c3d3954830a60b" dependencies = [ "cfg-if", + "getrandom 0.2.12", "once_cell", "version_check", "zerocopy", @@ -222,6 +223,12 @@ dependencies = [ "derive_arbitrary", ] +[[package]] +name = "arc-swap" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b3d0060af21e8d11a926981cc00c6c1541aa91dd64b9f881985c3da1094425f" + [[package]] name = "ark-bls12-377" version = "0.4.0" @@ -579,7 +586,27 @@ dependencies = [ "async-std", "async-trait", "color-eyre", - "console-subscriber", + "console-subscriber 0.1.10", + "flume 0.11.0", + "futures", + "tokio", + "tokio-stream", + "tracing", + "tracing-error", + "tracing-subscriber", +] + +[[package]] +name = "async-compatibility-layer" +version = "1.0.0" +source = "git+https://github.com/EspressoSystems/async-compatibility-layer.git?tag=1.4.2#482cece7d27f20d5a543e209a5d88b1837778b4c" +dependencies = [ + "async-channel 1.9.0", + "async-lock 2.8.0", + "async-std", + "async-trait", + "color-eyre", + "console-subscriber 0.2.0", "flume 0.11.0", "futures", "tokio", @@ -638,6 +665,7 @@ dependencies = [ "blocking", "futures-lite 2.2.0", "once_cell", + "tokio", ] [[package]] @@ -831,6 +859,28 @@ dependencies = [ "socket2 0.5.6", ] +[[package]] +name = "async-stream" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" +dependencies = [ + "async-stream-impl", + "futures-core", + "pin-project-lite 0.2.13", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + [[package]] name = "async-task" version = "4.7.0" @@ -874,7 +924,7 @@ dependencies = [ "futures-util", "log", "pin-project-lite 0.2.13", - "tungstenite", + "tungstenite 0.13.0", ] [[package]] @@ -903,6 +953,15 @@ dependencies = [ "pin-project-lite 0.2.13", ] +[[package]] +name = "atoi" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" +dependencies = [ + "num-traits", +] + [[package]] name = "atomic-waker" version = "1.1.2" @@ -1042,6 +1101,9 @@ name = "bitflags" version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +dependencies = [ + "serde", +] [[package]] name = "bitvec" @@ -1145,6 +1207,28 @@ version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" +[[package]] +name = "bytecheck" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2" +dependencies = [ + "bytecheck_derive", + "ptr_meta", + "simdutf8", +] + +[[package]] +name = "bytecheck_derive" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "byteorder" version = "1.5.0" @@ -1166,6 +1250,24 @@ dependencies = [ "serde", ] +[[package]] +name = "capnp" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4bfb7088540597aa9a835f445dae750aa0792f84d253c6cd515940486e98e00" +dependencies = [ + "embedded-io", +] + +[[package]] +name = "capnpc" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c75ba30e0f08582d53c2f3710cf4bb65ff562614b1ba86906d7391adffe189ec" +dependencies = [ + "capnp", +] + [[package]] name = "cbor4ii" version = "0.3.2" @@ -1181,6 +1283,94 @@ version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02f341c093d19155a6e41631ce5971aac4e9a868262212153124c15fa22d1cdc" +[[package]] +name = "cdn-broker" +version = "0.1.0" +source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.1.6#f20093380e852f1a6d8e94ecc89301d4a241c35d" +dependencies = [ + "async-std", + "cdn-proto", + "clap", + "dashmap", + "delegate", + "derivative", + "derive_builder", + "jf-primitives 0.4.0-pre.0 (git+https://github.com/EspressoSystems/jellyfish?tag=0.4.1)", + "lazy_static", + "local-ip-address", + "parking_lot", + "paste", + "prometheus", + "rkyv", + "tokio", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "cdn-client" +version = "0.1.0" +source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.1.6#f20093380e852f1a6d8e94ecc89301d4a241c35d" +dependencies = [ + "async-std", + "cdn-proto", + "clap", + "derive_builder", + "jf-primitives 0.4.0-pre.0 (git+https://github.com/EspressoSystems/jellyfish?tag=0.4.1)", + "rand 0.8.5", + "tokio", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "cdn-marshal" +version = "0.1.0" +source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.1.6#f20093380e852f1a6d8e94ecc89301d4a241c35d" +dependencies = [ + "async-std", + "cdn-proto", + "clap", + "derive_builder", + "jf-primitives 0.4.0-pre.0 (git+https://github.com/EspressoSystems/jellyfish?tag=0.4.1)", + "tokio", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "cdn-proto" +version = "0.1.0" +source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.1.6#f20093380e852f1a6d8e94ecc89301d4a241c35d" +dependencies = [ + "anyhow", + "ark-serialize", + "async-std", + "async-trait", + "capnp", + "capnpc", + "derivative", + "jf-primitives 0.4.0-pre.0 (git+https://github.com/EspressoSystems/jellyfish?tag=0.4.1)", + "kanal", + "lazy_static", + "mnemonic", + "mockall", + "pem", + "prometheus", + "quinn", + "rand 0.8.5", + "rcgen 0.12.1", + "redis", + "rkyv", + "rustls 0.21.10", + "sqlx", + "thiserror", + "tokio", + "tracing", + "url", + "warp", +] + [[package]] name = "cfg-if" version = "1.0.0" @@ -1319,10 +1509,24 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +[[package]] +name = "combine" +version = "4.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +dependencies = [ + "bytes 1.5.0", + "futures-core", + "memchr", + "pin-project-lite 0.2.13", + "tokio", + "tokio-util", +] + [[package]] name = "commit" version = "0.2.2" -source = "git+https://github.com/EspressoSystems/commit.git#dd9f16e084d45e9ea52459c776f5fdcb6b000889" +source = "git+https://github.com/EspressoSystems/commit.git#30679718efd4ecf870b66950160077125dcb8d93" dependencies = [ "arbitrary", "ark-serialize", @@ -1370,9 +1574,22 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2895653b4d9f1538a83970077cb01dfc77a4810524e51a110944688e916b18e" dependencies = [ - "prost", - "prost-types", - "tonic", + "prost 0.11.9", + "prost-types 0.11.9", + "tonic 0.9.2", + "tracing-core", +] + +[[package]] +name = "console-api" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd326812b3fd01da5bb1af7d340d0d555fd3d4b641e7f1dfcf5962a902952787" +dependencies = [ + "futures-core", + "prost 0.12.3", + "prost-types 0.12.3", + "tonic 0.10.2", "tracing-core", ] @@ -1382,19 +1599,43 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4cf42660ac07fcebed809cfe561dd8730bcd35b075215e6479c516bcd0d11cb" dependencies = [ - "console-api", + "console-api 0.5.0", "crossbeam-channel", "crossbeam-utils", "futures", "hdrhistogram", "humantime", - "prost-types", + "prost-types 0.11.9", + "serde", + "serde_json", + "thread_local", + "tokio", + "tokio-stream", + "tonic 0.9.2", + "tracing", + "tracing-core", + "tracing-subscriber", +] + +[[package]] +name = "console-subscriber" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7481d4c57092cd1c19dd541b92bdce883de840df30aa5d03fd48a3935c01842e" +dependencies = [ + "console-api 0.6.0", + "crossbeam-channel", + "crossbeam-utils", + "futures-task", + "hdrhistogram", + "humantime", + "prost-types 0.12.3", "serde", "serde_json", "thread_local", "tokio", "tokio-stream", - "tonic", + "tonic 0.10.2", "tracing", "tracing-core", "tracing-subscriber", @@ -1481,12 +1722,27 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" +[[package]] +name = "crc" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" +dependencies = [ + "crc-catalog", +] + [[package]] name = "crc-any" version = "2.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c01a5e1f881f6fb6099a7bdf949e946719fd4f1fefa56264890574febf0eb6d0" +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + [[package]] name = "crc32fast" version = "1.4.0" @@ -1524,6 +1780,15 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "crossbeam-queue" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "crossbeam-utils" version = "0.8.19" @@ -1817,6 +2082,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "delegate" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e018fccbeeb50ff26562ece792ed06659b9c2dae79ece77c4456bb10d9bf79b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + [[package]] name = "der" version = "0.7.8" @@ -1824,6 +2100,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" dependencies = [ "const-oid", + "pem-rfc7468", "zeroize", ] @@ -1933,6 +2210,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer 0.10.4", + "const-oid", "crypto-common", "subtle", ] @@ -1987,6 +2265,18 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" +[[package]] +name = "dotenvy" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" + +[[package]] +name = "downcast" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" + [[package]] name = "downcast-rs" version = "1.2.0" @@ -2062,6 +2352,12 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "embedded-io" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d" + [[package]] name = "encoding_rs" version = "0.8.33" @@ -2118,6 +2414,17 @@ name = "espresso-systems-common" version = "0.4.1" source = "git+https://github.com/espressosystems/espresso-systems-common?tag=0.4.1#2e889e878866c2a5cce1daaab947f7c93d5811ae" +[[package]] +name = "etcetera" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" +dependencies = [ + "cfg-if", + "home", + "windows-sys 0.48.0", +] + [[package]] name = "ethbloom" version = "0.13.0" @@ -2235,6 +2542,12 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1676f435fc1dadde4d03e43f5d62b259e1ce5f40bd4ffb21db2b42ebe59c1382" +[[package]] +name = "finl_unicode" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" + [[package]] name = "fixed-hash" version = "0.8.0" @@ -2310,6 +2623,12 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "fragile" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" + [[package]] name = "funty" version = "2.0.0" @@ -2369,6 +2688,17 @@ dependencies = [ "num_cpus", ] +[[package]] +name = "futures-intrusive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" +dependencies = [ + "futures-core", + "lock_api", + "parking_lot", +] + [[package]] name = "futures-io" version = "0.3.30" @@ -2597,6 +2927,15 @@ dependencies = [ "allocator-api2", ] +[[package]] +name = "hashlink" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" +dependencies = [ + "hashbrown 0.14.3", +] + [[package]] name = "hdrhistogram" version = "7.5.4" @@ -2611,14 +2950,41 @@ dependencies = [ ] [[package]] -name = "heck" -version = "0.4.1" +name = "headers" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" +dependencies = [ + "base64 0.21.7", + "bytes 1.5.0", + "headers-core", + "http 0.2.11", + "httpdate", + "mime", + "sha1 0.10.6", +] [[package]] -name = "hermit-abi" -version = "0.3.9" +name = "headers-core" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" +dependencies = [ + "http 0.2.11", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "hermit-abi" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" @@ -2739,6 +3105,15 @@ dependencies = [ "hmac 0.8.1", ] +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + [[package]] name = "hostname" version = "0.3.1" @@ -2752,28 +3127,32 @@ dependencies = [ [[package]] name = "hotshot" -version = "0.5.22" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=adding_vbs_support#5946d588df51bb81dc21534ea93fb2e29da9c5b5" +version = "0.5.26" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=adding_vbs_support#eb11d5d44e1f586217f0a6c9bcf9882535425c5c" dependencies = [ + "anyhow", "async-broadcast", - "async-compatibility-layer", + "async-compatibility-layer 1.0.0 (git+https://github.com/EspressoSystems/async-compatibility-layer.git?tag=1.4.2)", "async-lock 2.8.0", "async-std", "async-trait", "bimap", + "bincode", + "cdn-broker", + "cdn-client", + "cdn-marshal", "commit", "custom_debug", "dashmap", "derive_more", "either", "embed-doc-image", + "ethereum-types", "futures", - "hotshot-constants", "hotshot-orchestrator", "hotshot-task", "hotshot-task-impls", "hotshot-types", - "hotshot-utils", "hotshot-web-server", "libp2p-identity", "libp2p-networking", @@ -2789,22 +3168,13 @@ dependencies = [ "versioned-binary-serialization", ] -[[package]] -name = "hotshot-constants" -version = "0.5.22" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=adding_vbs_support#5946d588df51bb81dc21534ea93fb2e29da9c5b5" -dependencies = [ - "serde", - "versioned-binary-serialization", -] - [[package]] name = "hotshot-example-types" -version = "0.5.22" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=adding_vbs_support#5946d588df51bb81dc21534ea93fb2e29da9c5b5" +version = "0.5.26" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=adding_vbs_support#eb11d5d44e1f586217f0a6c9bcf9882535425c5c" dependencies = [ "async-broadcast", - "async-compatibility-layer", + "async-compatibility-layer 1.0.0 (git+https://github.com/EspressoSystems/async-compatibility-layer.git?tag=1.4.2)", "async-lock 2.8.0", "async-std", "bitvec", @@ -2813,12 +3183,10 @@ dependencies = [ "ethereum-types", "futures", "hotshot", - "hotshot-constants", "hotshot-orchestrator", "hotshot-task", "hotshot-task-impls", "hotshot-types", - "hotshot-utils", "rand 0.8.5", "serde", "sha2 0.10.8", @@ -2831,10 +3199,10 @@ dependencies = [ [[package]] name = "hotshot-orchestrator" -version = "0.5.22" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=adding_vbs_support#5946d588df51bb81dc21534ea93fb2e29da9c5b5" +version = "0.5.26" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=adding_vbs_support#eb11d5d44e1f586217f0a6c9bcf9882535425c5c" dependencies = [ - "async-compatibility-layer", + "async-compatibility-layer 1.0.0 (git+https://github.com/EspressoSystems/async-compatibility-layer.git?tag=1.4.2)", "async-lock 2.8.0", "async-std", "blake3", @@ -2842,7 +3210,6 @@ dependencies = [ "csv", "futures", "hotshot-types", - "hotshot-utils", "libp2p", "serde", "serde-inline-default", @@ -2851,17 +3218,18 @@ dependencies = [ "thiserror", "tide-disco", "tokio", - "toml 0.8.10", + "toml 0.8.11", "tracing", + "versioned-binary-serialization", ] [[package]] name = "hotshot-task" -version = "0.5.22" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=adding_vbs_support#5946d588df51bb81dc21534ea93fb2e29da9c5b5" +version = "0.5.26" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=adding_vbs_support#eb11d5d44e1f586217f0a6c9bcf9882535425c5c" dependencies = [ "async-broadcast", - "async-compatibility-layer", + "async-compatibility-layer 1.0.0 (git+https://github.com/EspressoSystems/async-compatibility-layer.git?tag=1.4.2)", "async-std", "futures", "tokio", @@ -2870,11 +3238,11 @@ dependencies = [ [[package]] name = "hotshot-task-impls" -version = "0.5.22" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=adding_vbs_support#5946d588df51bb81dc21534ea93fb2e29da9c5b5" +version = "0.5.26" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=adding_vbs_support#eb11d5d44e1f586217f0a6c9bcf9882535425c5c" dependencies = [ "async-broadcast", - "async-compatibility-layer", + "async-compatibility-layer 1.0.0 (git+https://github.com/EspressoSystems/async-compatibility-layer.git?tag=1.4.2)", "async-lock 2.8.0", "async-std", "async-trait", @@ -2884,13 +3252,16 @@ dependencies = [ "commit", "either", "futures", - "hotshot-constants", "hotshot-task", "hotshot-types", - "hotshot-utils", - "jf-primitives", + "hs-builder-api", + "jf-primitives 0.4.0-pre.0 (git+https://github.com/EspressoSystems/jellyfish?tag=0.4.2)", + "rand 0.8.5", + "serde", "sha2 0.10.8", "snafu", + "surf-disco", + "tagged-base64", "time 0.3.34", "tokio", "tracing", @@ -2899,17 +3270,18 @@ dependencies = [ [[package]] name = "hotshot-types" -version = "0.5.22" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=adding_vbs_support#5946d588df51bb81dc21534ea93fb2e29da9c5b5" +version = "0.1.7" +source = "git+https://github.com/EspressoSystems/hotshot-types.git?branch=adding_vbs_support#6ce0afaa6b8eaa25e462da2a5754e0a0daf6ee34" dependencies = [ "anyhow", "ark-bls12-381", + "ark-bn254", "ark-ec", "ark-ed-on-bn254", "ark-ff", "ark-serialize", "ark-std", - "async-compatibility-layer", + "async-compatibility-layer 1.0.0 (git+https://github.com/EspressoSystems/async-compatibility-layer.git?tag=1.4.1)", "async-lock 2.8.0", "async-std", "async-trait", @@ -2925,14 +3297,12 @@ dependencies = [ "either", "espresso-systems-common 0.4.1", "ethereum-types", + "futures", "generic-array", - "hotshot-constants", - "hotshot-utils", "jf-plonk", - "jf-primitives", - "jf-utils", + "jf-primitives 0.4.0-pre.0 (git+https://github.com/EspressoSystems/jellyfish?tag=0.4.2)", + "jf-utils 0.4.0-pre.0 (git+https://github.com/EspressoSystems/jellyfish?tag=0.4.2)", "lazy_static", - "libp2p-networking", "rand 0.8.5", "rand_chacha 0.3.1", "serde", @@ -2946,21 +3316,12 @@ dependencies = [ "versioned-binary-serialization", ] -[[package]] -name = "hotshot-utils" -version = "0.5.22" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=adding_vbs_support#5946d588df51bb81dc21534ea93fb2e29da9c5b5" -dependencies = [ - "bincode", - "hotshot-constants", -] - [[package]] name = "hotshot-web-server" -version = "0.5.22" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=adding_vbs_support#5946d588df51bb81dc21534ea93fb2e29da9c5b5" +version = "0.5.26" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=adding_vbs_support#eb11d5d44e1f586217f0a6c9bcf9882535425c5c" dependencies = [ - "async-compatibility-layer", + "async-compatibility-layer 1.0.0 (git+https://github.com/EspressoSystems/async-compatibility-layer.git?tag=1.4.2)", "async-lock 2.8.0", "async-std", "clap", @@ -2969,14 +3330,15 @@ dependencies = [ "rand 0.8.5", "tide-disco", "tokio", - "toml 0.8.10", + "toml 0.8.11", "tracing", + "versioned-binary-serialization", ] [[package]] name = "hs-builder-api" -version = "0.1.1" -source = "git+https://github.com/EspressoSystems/hs-builder-api?branch=adding_vbs_support#2000ea1647a9bed6d18454ae156ef9dd75397923" +version = "0.1.2" +source = "git+https://github.com/EspressoSystems/hs-builder-api?branch=adding_vbs_support#94278f062a514304ceb614cfff3979520b1a2f7f" dependencies = [ "async-trait", "clap", @@ -2987,7 +3349,8 @@ dependencies = [ "snafu", "tagged-base64", "tide-disco", - "toml 0.8.10", + "toml 0.8.11", + "versioned-binary-serialization", ] [[package]] @@ -2995,7 +3358,7 @@ name = "hs-builder-core" version = "0.1.1" dependencies = [ "async-broadcast", - "async-compatibility-layer", + "async-compatibility-layer 1.0.0 (git+https://github.com/EspressoSystems/async-compatibility-layer.git?tag=1.4.1)", "async-lock 2.8.0", "async-std", "async-trait", @@ -3147,7 +3510,7 @@ dependencies = [ "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core 0.52.0", + "windows-core", ] [[package]] @@ -3440,7 +3803,7 @@ checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "jf-plonk" version = "0.4.0-pre.0" -source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.1#e96464c4bd8beb608a6a4afc8b8a2441c981f21a" +source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.2#f85f9024ef42ab8be95b2c81bd15fd6cbadeafbf" dependencies = [ "ark-ec", "ark-ff", @@ -3454,9 +3817,9 @@ 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.0-pre.0 (git+https://github.com/EspressoSystems/jellyfish?tag=0.4.2)", + "jf-relation 0.4.0-pre.0 (git+https://github.com/EspressoSystems/jellyfish?tag=0.4.2)", + "jf-utils 0.4.0-pre.0 (git+https://github.com/EspressoSystems/jellyfish?tag=0.4.2)", "merlin", "num-bigint", "rand_chacha 0.3.1", @@ -3496,8 +3859,53 @@ dependencies = [ "generic-array", "hashbrown 0.14.3", "itertools 0.12.1", - "jf-relation", - "jf-utils", + "jf-relation 0.4.0-pre.0 (git+https://github.com/EspressoSystems/jellyfish?tag=0.4.1)", + "jf-utils 0.4.0-pre.0 (git+https://github.com/EspressoSystems/jellyfish?tag=0.4.1)", + "merlin", + "num-bigint", + "num-traits", + "rand_chacha 0.3.1", + "rayon", + "serde", + "sha2 0.10.8", + "sha3", + "tagged-base64", + "typenum", + "zeroize", +] + +[[package]] +name = "jf-primitives" +version = "0.4.0-pre.0" +source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.2#f85f9024ef42ab8be95b2c81bd15fd6cbadeafbf" +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.0-pre.0 (git+https://github.com/EspressoSystems/jellyfish?tag=0.4.2)", + "jf-utils 0.4.0-pre.0 (git+https://github.com/EspressoSystems/jellyfish?tag=0.4.2)", "merlin", "num-bigint", "num-traits", @@ -3531,7 +3939,33 @@ 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 (git+https://github.com/EspressoSystems/jellyfish?tag=0.4.1)", + "num-bigint", + "rand_chacha 0.3.1", + "rayon", +] + +[[package]] +name = "jf-relation" +version = "0.4.0-pre.0" +source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.2#f85f9024ef42ab8be95b2c81bd15fd6cbadeafbf" +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.0-pre.0 (git+https://github.com/EspressoSystems/jellyfish?tag=0.4.2)", "num-bigint", "rand_chacha 0.3.1", "rayon", @@ -3553,6 +3987,22 @@ dependencies = [ "tagged-base64", ] +[[package]] +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", + "rayon", + "serde", + "sha2 0.10.8", + "tagged-base64", +] + [[package]] name = "js-sys" version = "0.3.68" @@ -3573,6 +4023,16 @@ dependencies = [ "serde", ] +[[package]] +name = "kanal" +version = "0.1.0-pre8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b05d55519627edaf7fd0f29981f6dc03fb52df3f5b257130eb8d0bf2801ea1d7" +dependencies = [ + "futures-core", + "lock_api", +] + [[package]] name = "keccak" version = "0.1.5" @@ -3596,6 +4056,9 @@ name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +dependencies = [ + "spin 0.5.2", +] [[package]] name = "libc" @@ -3603,6 +4066,12 @@ version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +[[package]] +name = "libm" +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" @@ -3921,11 +4390,11 @@ dependencies = [ [[package]] name = "libp2p-networking" -version = "0.5.22" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=adding_vbs_support#5946d588df51bb81dc21534ea93fb2e29da9c5b5" +version = "0.5.26" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=adding_vbs_support#eb11d5d44e1f586217f0a6c9bcf9882535425c5c" dependencies = [ "anyhow", - "async-compatibility-layer", + "async-compatibility-layer 1.0.0 (git+https://github.com/EspressoSystems/async-compatibility-layer.git?tag=1.4.2)", "async-lock 2.8.0", "async-std", "async-trait", @@ -3935,14 +4404,14 @@ dependencies = [ "derive_builder", "either", "futures", - "hotshot-constants", - "hotshot-utils", + "hotshot-types", "lazy_static", "libp2p", "libp2p-identity", "libp2p-swarm-derive", "rand 0.8.5", "serde", + "serde_bytes", "serde_json", "snafu", "tokio", @@ -4186,7 +4655,7 @@ dependencies = [ "futures-rustls", "libp2p-core", "libp2p-identity", - "rcgen", + "rcgen 0.11.3", "ring 0.16.20", "rustls 0.21.10", "rustls-webpki", @@ -4316,6 +4785,17 @@ dependencies = [ "libsecp256k1-core", ] +[[package]] +name = "libsqlite3-sys" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", +] + [[package]] name = "libz-sys" version = "1.1.15" @@ -4346,6 +4826,18 @@ version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +[[package]] +name = "local-ip-address" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "612ed4ea9ce5acfb5d26339302528a5e1e59dfed95e9e11af3c083236ff1d15d" +dependencies = [ + "libc", + "neli", + "thiserror", + "windows-sys 0.48.0", +] + [[package]] name = "lock_api" version = "0.4.11" @@ -4438,6 +4930,16 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "md-5" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" +dependencies = [ + "cfg-if", + "digest 0.10.7", +] + [[package]] name = "memchr" version = "2.7.1" @@ -4498,6 +5000,61 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "mnemonic" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29fae0e4c0b155d3b019a7cbc27abe4a90e15c06814d27889ce9f5f44e2faf77" +dependencies = [ + "byteorder", + "lazy_static", +] + +[[package]] +name = "mockall" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43766c2b5203b10de348ffe19f7e54564b64f3d6018ff7648d1e2d6d3a0f0a48" +dependencies = [ + "cfg-if", + "downcast", + "fragile", + "lazy_static", + "mockall_derive", + "predicates", + "predicates-tree", +] + +[[package]] +name = "mockall_derive" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af7cbce79ec385a1d4f54baa90a76401eb15d9cab93685f62e7e9f942aa00ae2" +dependencies = [ + "cfg-if", + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "multer" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01acbdc23469fd8fe07ab135923371d5f5a422fbf9c522158677c8eb15bc51c2" +dependencies = [ + "bytes 1.5.0", + "encoding_rs", + "futures-util", + "http 0.2.11", + "httparse", + "log", + "memchr", + "mime", + "spin 0.9.8", + "version_check", +] + [[package]] name = "multiaddr" version = "0.18.1" @@ -4580,6 +5137,31 @@ dependencies = [ "tempfile", ] +[[package]] +name = "neli" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1100229e06604150b3becd61a4965d5c70f3be1759544ea7274166f4be41ef43" +dependencies = [ + "byteorder", + "libc", + "log", + "neli-proc-macros", +] + +[[package]] +name = "neli-proc-macros" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c168194d373b1e134786274020dae7fc5513d565ea2ebb9bc9ff17ffb69106d4" +dependencies = [ + "either", + "proc-macro2", + "quote", + "serde", + "syn 1.0.109", +] + [[package]] name = "netlink-packet-core" version = "0.4.2" @@ -4695,6 +5277,23 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-bigint-dig" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" +dependencies = [ + "byteorder", + "lazy_static", + "libm", + "num-integer", + "num-iter", + "num-traits", + "rand 0.8.5", + "smallvec", + "zeroize", +] + [[package]] name = "num-conv" version = "0.1.0" @@ -4721,6 +5320,17 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-iter" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + [[package]] name = "num-traits" version = "0.2.18" @@ -4728,6 +5338,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", + "libm", ] [[package]] @@ -4920,7 +5531,16 @@ dependencies = [ ] [[package]] -name = "percent-encoding" +name = "pem-rfc7468" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" +dependencies = [ + "base64ct", +] + +[[package]] +name = "percent-encoding" version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" @@ -5025,6 +5645,17 @@ dependencies = [ "futures-io", ] +[[package]] +name = "pkcs1" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" +dependencies = [ + "der", + "pkcs8", + "spki", +] + [[package]] name = "pkcs8" version = "0.10.2" @@ -5132,6 +5763,32 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +[[package]] +name = "predicates" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8" +dependencies = [ + "anstyle", + "predicates-core", +] + +[[package]] +name = "predicates-core" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" + +[[package]] +name = "predicates-tree" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" +dependencies = [ + "predicates-core", + "termtree", +] + [[package]] name = "primitive-types" version = "0.12.2" @@ -5238,7 +5895,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" dependencies = [ "bytes 1.5.0", - "prost-derive", + "prost-derive 0.11.9", +] + +[[package]] +name = "prost" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a" +dependencies = [ + "bytes 1.5.0", + "prost-derive 0.12.3", ] [[package]] @@ -5254,13 +5921,35 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "prost-derive" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e" +dependencies = [ + "anyhow", + "itertools 0.10.5", + "proc-macro2", + "quote", + "syn 2.0.52", +] + [[package]] name = "prost-types" version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" dependencies = [ - "prost", + "prost 0.11.9", +] + +[[package]] +name = "prost-types" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e" +dependencies = [ + "prost 0.12.3", ] [[package]] @@ -5269,6 +5958,26 @@ version = "2.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" +[[package]] +name = "ptr_meta" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" +dependencies = [ + "ptr_meta_derive", +] + +[[package]] +name = "ptr_meta_derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "quick-error" version = "1.2.3" @@ -5341,6 +6050,7 @@ dependencies = [ "ring 0.16.20", "rustc-hash", "rustls 0.21.10", + "rustls-native-certs", "slab", "thiserror", "tinyvec", @@ -5478,6 +6188,42 @@ dependencies = [ "yasna", ] +[[package]] +name = "rcgen" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48406db8ac1f3cbc7dcdb56ec355343817958a356ff430259bb07baf7607e1e1" +dependencies = [ + "pem", + "ring 0.17.8", + "time 0.3.34", + "yasna", +] + +[[package]] +name = "redis" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c580d9cbbe1d1b479e8d67cf9daf6a62c957e6846048408b80b43ac3f6af84cd" +dependencies = [ + "arc-swap", + "async-trait", + "bytes 1.5.0", + "combine", + "futures", + "futures-util", + "itoa", + "percent-encoding", + "pin-project-lite 0.2.13", + "ryu", + "sha1_smol", + "socket2 0.4.10", + "tokio", + "tokio-retry", + "tokio-util", + "url", +] + [[package]] name = "redox_syscall" version = "0.4.1" @@ -5542,6 +6288,15 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +[[package]] +name = "rend" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" +dependencies = [ + "bytecheck", +] + [[package]] name = "resolv-conf" version = "0.7.0" @@ -5582,6 +6337,35 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "rkyv" +version = "0.7.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0" +dependencies = [ + "bitvec", + "bytecheck", + "bytes 1.5.0", + "hashbrown 0.12.3", + "ptr_meta", + "rend", + "rkyv_derive", + "seahash", + "tinyvec", + "uuid", +] + +[[package]] +name = "rkyv_derive" +version = "0.7.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "rlp" version = "0.5.2" @@ -5619,6 +6403,26 @@ dependencies = [ "smartstring", ] +[[package]] +name = "rsa" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" +dependencies = [ + "const-oid", + "digest 0.10.7", + "num-bigint-dig", + "num-integer", + "num-traits", + "pkcs1", + "pkcs8", + "rand_core 0.6.4", + "signature", + "spki", + "subtle", + "zeroize", +] + [[package]] name = "rtnetlink" version = "0.10.1" @@ -5742,6 +6546,27 @@ dependencies = [ "sct 0.7.1", ] +[[package]] +name = "rustls-native-certs" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +dependencies = [ + "openssl-probe", + "rustls-pemfile", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64 0.21.7", +] + [[package]] name = "rustls-webpki" version = "0.101.7" @@ -5793,6 +6618,12 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + [[package]] name = "scopeguard" version = "1.2.0" @@ -5819,6 +6650,12 @@ dependencies = [ "untrusted 0.9.0", ] +[[package]] +name = "seahash" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" + [[package]] name = "security-framework" version = "2.9.2" @@ -5883,6 +6720,15 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "serde_bytes" +version = "0.11.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" +dependencies = [ + "serde", +] + [[package]] name = "serde_derive" version = "1.0.197" @@ -6008,6 +6854,17 @@ dependencies = [ "sha1_smol", ] +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest 0.10.7", +] + [[package]] name = "sha1_smol" version = "1.0.0" @@ -6103,9 +6960,16 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ + "digest 0.10.7", "rand_core 0.6.4", ] +[[package]] +name = "simdutf8" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" + [[package]] name = "slab" version = "0.4.9" @@ -6278,6 +7142,215 @@ dependencies = [ "der", ] +[[package]] +name = "sqlformat" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce81b7bd7c4493975347ef60d8c7e8b742d4694f4c49f93e0a12ea263938176c" +dependencies = [ + "itertools 0.12.1", + "nom", + "unicode_categories", +] + +[[package]] +name = "sqlx" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9a2ccff1a000a5a59cd33da541d9f2fdcd9e6e8229cc200565942bff36d0aaa" +dependencies = [ + "sqlx-core", + "sqlx-macros", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", +] + +[[package]] +name = "sqlx-core" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24ba59a9342a3d9bab6c56c118be528b27c9b60e490080e9711a04dccac83ef6" +dependencies = [ + "ahash 0.8.10", + "atoi", + "byteorder", + "bytes 1.5.0", + "crc", + "crossbeam-queue", + "either", + "event-listener 2.5.3", + "futures-channel", + "futures-core", + "futures-intrusive", + "futures-io", + "futures-util", + "hashlink", + "hex", + "indexmap 2.2.5", + "log", + "memchr", + "once_cell", + "paste", + "percent-encoding", + "serde", + "serde_json", + "sha2 0.10.8", + "smallvec", + "sqlformat", + "thiserror", + "time 0.3.34", + "tokio", + "tokio-stream", + "tracing", + "url", +] + +[[package]] +name = "sqlx-macros" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ea40e2345eb2faa9e1e5e326db8c34711317d2b5e08d0d5741619048a803127" +dependencies = [ + "proc-macro2", + "quote", + "sqlx-core", + "sqlx-macros-core", + "syn 1.0.109", +] + +[[package]] +name = "sqlx-macros-core" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5833ef53aaa16d860e92123292f1f6a3d53c34ba8b1969f152ef1a7bb803f3c8" +dependencies = [ + "dotenvy", + "either", + "heck", + "hex", + "once_cell", + "proc-macro2", + "quote", + "serde", + "serde_json", + "sha2 0.10.8", + "sqlx-core", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", + "syn 1.0.109", + "tempfile", + "tokio", + "url", +] + +[[package]] +name = "sqlx-mysql" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ed31390216d20e538e447a7a9b959e06ed9fc51c37b514b46eb758016ecd418" +dependencies = [ + "atoi", + "base64 0.21.7", + "bitflags 2.4.2", + "byteorder", + "bytes 1.5.0", + "crc", + "digest 0.10.7", + "dotenvy", + "either", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "generic-array", + "hex", + "hkdf 0.12.4", + "hmac 0.12.1", + "itoa", + "log", + "md-5", + "memchr", + "once_cell", + "percent-encoding", + "rand 0.8.5", + "rsa", + "serde", + "sha1 0.10.6", + "sha2 0.10.8", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "time 0.3.34", + "tracing", + "whoami", +] + +[[package]] +name = "sqlx-postgres" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c824eb80b894f926f89a0b9da0c7f435d27cdd35b8c655b114e58223918577e" +dependencies = [ + "atoi", + "base64 0.21.7", + "bitflags 2.4.2", + "byteorder", + "crc", + "dotenvy", + "etcetera", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "hex", + "hkdf 0.12.4", + "hmac 0.12.1", + "home", + "itoa", + "log", + "md-5", + "memchr", + "once_cell", + "rand 0.8.5", + "serde", + "serde_json", + "sha2 0.10.8", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "time 0.3.34", + "tracing", + "whoami", +] + +[[package]] +name = "sqlx-sqlite" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b244ef0a8414da0bed4bb1910426e890b19e5e9bccc27ada6b797d05c55ae0aa" +dependencies = [ + "atoi", + "flume 0.11.0", + "futures-channel", + "futures-core", + "futures-executor", + "futures-intrusive", + "futures-util", + "libsqlite3-sys", + "log", + "percent-encoding", + "serde", + "sqlx-core", + "time 0.3.34", + "tracing", + "url", + "urlencoding", +] + [[package]] name = "standback" version = "0.2.17" @@ -6332,7 +7405,7 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "sha1", + "sha1 0.6.1", "syn 1.0.109", ] @@ -6342,6 +7415,17 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" +[[package]] +name = "stringprep" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6" +dependencies = [ + "finl_unicode", + "unicode-bidi", + "unicode-normalization", +] + [[package]] name = "strsim" version = "0.10.0" @@ -6404,8 +7488,8 @@ dependencies = [ [[package]] name = "surf-disco" -version = "0.4.7" -source = "git+https://github.com/EspressoSystems/surf-disco.git?tag=v0.4.7#070e18d1daf0c9783e009a1a3b7f8b28b4546e24" +version = "0.4.8" +source = "git+https://github.com/EspressoSystems/surf-disco.git?tag=v0.4.8#522b160f6fa03793f6b1a920568d93980ab18f19" dependencies = [ "async-std", "async-tungstenite", @@ -6600,6 +7684,12 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "termtree" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" + [[package]] name = "thiserror" version = "1.0.57" @@ -6662,8 +7752,8 @@ dependencies = [ [[package]] name = "tide-disco" -version = "0.4.7" -source = "git+https://github.com/EspressoSystems/tide-disco?tag=v0.4.7#1f8515bde918b9e2c50875a68dfa0e23b8167579" +version = "0.4.8" +source = "git+https://github.com/EspressoSystems/tide-disco?tag=v0.4.8#d0d2bfb8de1fcee6c28362c768efd6a2928d7b56" dependencies = [ "anyhow", "async-std", @@ -6701,7 +7791,7 @@ dependencies = [ "tagged-base64", "tide", "tide-websockets", - "toml 0.8.10", + "toml 0.8.11", "tracing", "tracing-distributed", "tracing-futures", @@ -6863,6 +7953,17 @@ dependencies = [ "syn 2.0.52", ] +[[package]] +name = "tokio-retry" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f" +dependencies = [ + "pin-project", + "rand 0.8.5", + "tokio", +] + [[package]] name = "tokio-stream" version = "0.1.14" @@ -6874,6 +7975,18 @@ 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" @@ -6899,14 +8012,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" +checksum = "af06656561d28735e9c1cd63dfd57132c8155426aa6af24f36a00a351f88c48e" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.6", + "toml_edit 0.22.7", ] [[package]] @@ -6931,9 +8044,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.6" +version = "0.22.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" +checksum = "18769cd1cec395d70860ceb4d932812a0b4d06b1a4bb336745a4d21b9496e992" dependencies = [ "indexmap 2.2.5", "serde", @@ -6961,7 +8074,34 @@ dependencies = [ "hyper-timeout", "percent-encoding", "pin-project", - "prost", + "prost 0.11.9", + "tokio", + "tokio-stream", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tonic" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e" +dependencies = [ + "async-stream", + "async-trait", + "axum", + "base64 0.21.7", + "bytes 1.5.0", + "h2", + "http 0.2.11", + "http-body", + "hyper", + "hyper-timeout", + "percent-encoding", + "pin-project", + "prost 0.12.3", "tokio", "tokio-stream", "tower", @@ -7136,6 +8276,25 @@ 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.5.0", + "data-encoding", + "http 0.2.11", + "httparse", + "log", + "rand 0.8.5", + "sha1 0.10.6", + "thiserror", + "url", + "utf-8", +] + [[package]] name = "typenum" version = "1.17.0" @@ -7190,12 +8349,24 @@ dependencies = [ "tinyvec", ] +[[package]] +name = "unicode-segmentation" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + [[package]] name = "unicode-xid" version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" +[[package]] +name = "unicode_categories" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" + [[package]] name = "universal-hash" version = "0.4.0" @@ -7256,6 +8427,12 @@ dependencies = [ "serde", ] +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + [[package]] name = "utf-8" version = "0.7.6" @@ -7268,6 +8445,12 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +[[package]] +name = "uuid" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" + [[package]] name = "valuable" version = "0.1.0" @@ -7324,8 +8507,8 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "versioned-binary-serialization" -version = "0.1.0" -source = "git+https://github.com/EspressoSystems/versioned-binary-serialization.git?tag=0.1.0#6b5bf0c0b74f8384c940880d5a988d5ec757de3e" +version = "0.1.2" +source = "git+https://github.com/EspressoSystems/versioned-binary-serialization.git?tag=0.1.2#6874f91a3c8d64acc24fe0abe4ad93c35b75eb9d" dependencies = [ "anyhow", "bincode", @@ -7355,6 +8538,37 @@ dependencies = [ "try-lock", ] +[[package]] +name = "warp" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1e92e22e03ff1230c03a1a8ee37d2f89cd489e2e541b7550d6afad96faed169" +dependencies = [ + "bytes 1.5.0", + "futures-channel", + "futures-util", + "headers", + "http 0.2.11", + "hyper", + "log", + "mime", + "mime_guess", + "multer", + "percent-encoding", + "pin-project", + "rustls-pemfile", + "scoped-tls", + "serde", + "serde_json", + "serde_urlencoded", + "tokio", + "tokio-stream", + "tokio-tungstenite", + "tokio-util", + "tower-service", + "tracing", +] + [[package]] name = "wasi" version = "0.9.0+wasi-snapshot-preview1" @@ -7367,6 +8581,12 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +[[package]] +name = "wasite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" + [[package]] name = "wasm-bindgen" version = "0.2.91" @@ -7470,6 +8690,16 @@ version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" +[[package]] +name = "whoami" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9" +dependencies = [ + "redox_syscall", + "wasite", +] + [[package]] name = "widestring" version = "1.0.2" @@ -7504,7 +8734,7 @@ version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" dependencies = [ - "windows-core 0.51.1", + "windows-core", "windows-targets 0.48.5", ] @@ -7517,15 +8747,6 @@ dependencies = [ "windows-targets 0.48.5", ] -[[package]] -name = "windows-core" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" -dependencies = [ - "windows-targets 0.52.4", -] - [[package]] name = "windows-sys" version = "0.48.0" diff --git a/Cargo.toml b/Cargo.toml index 258c6b93..16047c81 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,10 +18,10 @@ commit = { git = "https://github.com/EspressoSystems/commit.git" } futures = "0.3" hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "adding_vbs_support" } hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "adding_vbs_support" } -hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "adding_vbs_support" } +hotshot-types = { git = "https://github.com/EspressoSystems/hotshot-types.git", branch = "adding_vbs_support" } hs-builder-api = { git = "https://github.com/EspressoSystems/hs-builder-api", branch = "adding_vbs_support" } sha2 = "0.10" serde = { version = "1.0", features = ["derive"] } -tide-disco = { git = "https://github.com/EspressoSystems/tide-disco", tag = "v0.4.7" } +tide-disco = { git = "https://github.com/EspressoSystems/tide-disco", tag = "v0.4.8" } tagged-base64 = { git = "https://github.com/EspressoSystems/tagged-base64", tag = "0.3.4" } tracing = "0.1" From e04ceadb7cc96cbf17636c1c2fd04a0e76c9d12a Mon Sep 17 00:00:00 2001 From: Nathan F Yospe Date: Fri, 22 Mar 2024 12:29:50 -0400 Subject: [PATCH 03/15] fixes, minus the LeafInfo for test --- Cargo.lock | 530 +++++++++++++++----------------------- Cargo.toml | 12 +- src/builder_state.rs | 12 +- src/service.rs | 11 +- src/testing/basic_test.rs | 4 +- 5 files changed, 224 insertions(+), 345 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 622b38dd..b9626f89 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -576,26 +576,6 @@ dependencies = [ "pin-project-lite 0.2.13", ] -[[package]] -name = "async-compatibility-layer" -version = "1.0.0" -source = "git+https://github.com/EspressoSystems/async-compatibility-layer.git?tag=1.4.1#568122b0ef39648daee91d16546985d41c3b0b15" -dependencies = [ - "async-channel 1.9.0", - "async-lock 2.8.0", - "async-std", - "async-trait", - "color-eyre", - "console-subscriber 0.1.10", - "flume 0.11.0", - "futures", - "tokio", - "tokio-stream", - "tracing", - "tracing-error", - "tracing-subscriber", -] - [[package]] name = "async-compatibility-layer" version = "1.0.0" @@ -606,7 +586,7 @@ dependencies = [ "async-std", "async-trait", "color-eyre", - "console-subscriber 0.2.0", + "console-subscriber", "flume 0.11.0", "futures", "tokio", @@ -1286,7 +1266,7 @@ checksum = "02f341c093d19155a6e41631ce5971aac4e9a868262212153124c15fa22d1cdc" [[package]] name = "cdn-broker" version = "0.1.0" -source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.1.6#f20093380e852f1a6d8e94ecc89301d4a241c35d" +source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.1.9#8f9cc2d56e725a6cc29a792c6ed67e2e9efee756" dependencies = [ "async-std", "cdn-proto", @@ -1294,8 +1274,8 @@ dependencies = [ "dashmap", "delegate", "derivative", - "derive_builder", - "jf-primitives 0.4.0-pre.0 (git+https://github.com/EspressoSystems/jellyfish?tag=0.4.1)", + "derive_builder 0.13.1", + "jf-primitives", "lazy_static", "local-ip-address", "parking_lot", @@ -1310,13 +1290,13 @@ dependencies = [ [[package]] name = "cdn-client" version = "0.1.0" -source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.1.6#f20093380e852f1a6d8e94ecc89301d4a241c35d" +source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.1.9#8f9cc2d56e725a6cc29a792c6ed67e2e9efee756" dependencies = [ "async-std", "cdn-proto", "clap", - "derive_builder", - "jf-primitives 0.4.0-pre.0 (git+https://github.com/EspressoSystems/jellyfish?tag=0.4.1)", + "derive_builder 0.13.1", + "jf-primitives", "rand 0.8.5", "tokio", "tracing", @@ -1326,13 +1306,13 @@ dependencies = [ [[package]] name = "cdn-marshal" version = "0.1.0" -source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.1.6#f20093380e852f1a6d8e94ecc89301d4a241c35d" +source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.1.9#8f9cc2d56e725a6cc29a792c6ed67e2e9efee756" dependencies = [ "async-std", "cdn-proto", "clap", - "derive_builder", - "jf-primitives 0.4.0-pre.0 (git+https://github.com/EspressoSystems/jellyfish?tag=0.4.1)", + "derive_builder 0.13.1", + "jf-primitives", "tokio", "tracing", "tracing-subscriber", @@ -1341,7 +1321,7 @@ dependencies = [ [[package]] name = "cdn-proto" version = "0.1.0" -source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.1.6#f20093380e852f1a6d8e94ecc89301d4a241c35d" +source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.1.9#8f9cc2d56e725a6cc29a792c6ed67e2e9efee756" dependencies = [ "anyhow", "ark-serialize", @@ -1350,11 +1330,12 @@ dependencies = [ "capnp", "capnpc", "derivative", - "jf-primitives 0.4.0-pre.0 (git+https://github.com/EspressoSystems/jellyfish?tag=0.4.1)", + "jf-primitives", "kanal", "lazy_static", "mnemonic", "mockall", + "parking_lot", "pem", "prometheus", "quinn", @@ -1551,11 +1532,12 @@ dependencies = [ [[package]] name = "config" -version = "0.13.4" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23738e11972c7643e4ec947840fc463b6a571afcd3e735bdfce7d03c7a784aca" +checksum = "7328b20597b53c2454f0b1919720c25c7339051c02b72b7e05409e00b14132be" dependencies = [ "async-trait", + "convert_case 0.6.0", "json5", "lazy_static", "nom", @@ -1564,22 +1546,10 @@ dependencies = [ "rust-ini", "serde", "serde_json", - "toml 0.5.11", + "toml", "yaml-rust", ] -[[package]] -name = "console-api" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2895653b4d9f1538a83970077cb01dfc77a4810524e51a110944688e916b18e" -dependencies = [ - "prost 0.11.9", - "prost-types 0.11.9", - "tonic 0.9.2", - "tracing-core", -] - [[package]] name = "console-api" version = "0.6.0" @@ -1587,34 +1557,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd326812b3fd01da5bb1af7d340d0d555fd3d4b641e7f1dfcf5962a902952787" dependencies = [ "futures-core", - "prost 0.12.3", - "prost-types 0.12.3", - "tonic 0.10.2", - "tracing-core", -] - -[[package]] -name = "console-subscriber" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4cf42660ac07fcebed809cfe561dd8730bcd35b075215e6479c516bcd0d11cb" -dependencies = [ - "console-api 0.5.0", - "crossbeam-channel", - "crossbeam-utils", - "futures", - "hdrhistogram", - "humantime", - "prost-types 0.11.9", - "serde", - "serde_json", - "thread_local", - "tokio", - "tokio-stream", - "tonic 0.9.2", - "tracing", + "prost", + "prost-types", + "tonic", "tracing-core", - "tracing-subscriber", ] [[package]] @@ -1623,19 +1569,19 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7481d4c57092cd1c19dd541b92bdce883de840df30aa5d03fd48a3935c01842e" dependencies = [ - "console-api 0.6.0", + "console-api", "crossbeam-channel", "crossbeam-utils", "futures-task", "hdrhistogram", "humantime", - "prost-types 0.12.3", + "prost-types", "serde", "serde_json", "thread_local", "tokio", "tokio-stream", - "tonic 0.10.2", + "tonic", "tracing", "tracing-core", "tracing-subscriber", @@ -1647,6 +1593,26 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" +[[package]] +name = "const-random" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" +dependencies = [ + "const-random-macro", +] + +[[package]] +name = "const-random-macro" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" +dependencies = [ + "getrandom 0.2.12", + "once_cell", + "tiny-keccak", +] + [[package]] name = "const_fn" version = "0.4.9" @@ -1665,6 +1631,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" +[[package]] +name = "convert_case" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" +dependencies = [ + "unicode-segmentation", +] + [[package]] name = "cookie" version = "0.14.4" @@ -2156,7 +2131,16 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f59169f400d8087f238c5c0c7db6a28af18681717f3b623227d92f397e938c7" dependencies = [ - "derive_builder_macro", + "derive_builder_macro 0.13.1", +] + +[[package]] +name = "derive_builder" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7" +dependencies = [ + "derive_builder_macro 0.20.0", ] [[package]] @@ -2171,23 +2155,45 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "derive_builder_core" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" +dependencies = [ + "darling 0.20.8", + "proc-macro2", + "quote", + "syn 2.0.52", +] + [[package]] name = "derive_builder_macro" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "870368c3fb35b8031abb378861d4460f573b92238ec2152c927a21f77e3e0127" dependencies = [ - "derive_builder_core", + "derive_builder_core 0.13.1", "syn 1.0.109", ] +[[package]] +name = "derive_builder_macro" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" +dependencies = [ + "derive_builder_core 0.20.0", + "syn 2.0.52", +] + [[package]] name = "derive_more" version = "0.99.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ - "convert_case", + "convert_case 0.4.0", "proc-macro2", "quote", "rustc_version 0.4.0", @@ -2255,9 +2261,12 @@ dependencies = [ [[package]] name = "dlv-list" -version = "0.3.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257" +checksum = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f" +dependencies = [ + "const-random", +] [[package]] name = "doc-comment" @@ -3128,11 +3137,11 @@ dependencies = [ [[package]] name = "hotshot" version = "0.5.26" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=adding_vbs_support#eb11d5d44e1f586217f0a6c9bcf9882535425c5c" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.27#8bf55cfb3a1d096c0330ba62d03ed1e5f7298cf8" 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", "async-lock 2.8.0", "async-std", "async-trait", @@ -3160,7 +3169,7 @@ dependencies = [ "portpicker", "rand 0.8.5", "serde", - "snafu", + "snafu 0.8.2", "surf-disco", "time 0.3.34", "tokio", @@ -3168,15 +3177,35 @@ dependencies = [ "versioned-binary-serialization", ] +[[package]] +name = "hotshot-builder-api" +version = "0.1.6" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.27#8bf55cfb3a1d096c0330ba62d03ed1e5f7298cf8" +dependencies = [ + "async-trait", + "clap", + "derive_more", + "futures", + "hotshot-types", + "serde", + "snafu 0.8.2", + "tagged-base64", + "tide-disco", + "toml", + "versioned-binary-serialization", +] + [[package]] name = "hotshot-example-types" version = "0.5.26" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=adding_vbs_support#eb11d5d44e1f586217f0a6c9bcf9882535425c5c" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.27#8bf55cfb3a1d096c0330ba62d03ed1e5f7298cf8" 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", "async-lock 2.8.0", "async-std", + "async-trait", "bitvec", "commit", "either", @@ -3191,7 +3220,7 @@ dependencies = [ "serde", "sha2 0.10.8", "sha3", - "snafu", + "snafu 0.8.2", "time 0.3.34", "tokio", "tracing", @@ -3200,9 +3229,9 @@ dependencies = [ [[package]] name = "hotshot-orchestrator" version = "0.5.26" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=adding_vbs_support#eb11d5d44e1f586217f0a6c9bcf9882535425c5c" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.27#8bf55cfb3a1d096c0330ba62d03ed1e5f7298cf8" dependencies = [ - "async-compatibility-layer 1.0.0 (git+https://github.com/EspressoSystems/async-compatibility-layer.git?tag=1.4.2)", + "async-compatibility-layer", "async-lock 2.8.0", "async-std", "blake3", @@ -3218,7 +3247,7 @@ dependencies = [ "thiserror", "tide-disco", "tokio", - "toml 0.8.11", + "toml", "tracing", "versioned-binary-serialization", ] @@ -3226,10 +3255,10 @@ dependencies = [ [[package]] name = "hotshot-task" version = "0.5.26" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=adding_vbs_support#eb11d5d44e1f586217f0a6c9bcf9882535425c5c" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.27#8bf55cfb3a1d096c0330ba62d03ed1e5f7298cf8" 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", "async-std", "futures", "tokio", @@ -3239,10 +3268,10 @@ dependencies = [ [[package]] name = "hotshot-task-impls" version = "0.5.26" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=adding_vbs_support#eb11d5d44e1f586217f0a6c9bcf9882535425c5c" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.27#8bf55cfb3a1d096c0330ba62d03ed1e5f7298cf8" 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", "async-lock 2.8.0", "async-std", "async-trait", @@ -3252,14 +3281,14 @@ dependencies = [ "commit", "either", "futures", + "hotshot-builder-api", "hotshot-task", "hotshot-types", - "hs-builder-api", - "jf-primitives 0.4.0-pre.0 (git+https://github.com/EspressoSystems/jellyfish?tag=0.4.2)", + "jf-primitives", "rand 0.8.5", "serde", "sha2 0.10.8", - "snafu", + "snafu 0.8.2", "surf-disco", "tagged-base64", "time 0.3.34", @@ -3270,8 +3299,8 @@ dependencies = [ [[package]] name = "hotshot-types" -version = "0.1.7" -source = "git+https://github.com/EspressoSystems/hotshot-types.git?branch=adding_vbs_support#6ce0afaa6b8eaa25e462da2a5754e0a0daf6ee34" +version = "0.1.11" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.27#8bf55cfb3a1d096c0330ba62d03ed1e5f7298cf8" dependencies = [ "anyhow", "ark-bls12-381", @@ -3281,7 +3310,7 @@ 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.1)", + "async-compatibility-layer", "async-lock 2.8.0", "async-std", "async-trait", @@ -3300,14 +3329,14 @@ dependencies = [ "futures", "generic-array", "jf-plonk", - "jf-primitives 0.4.0-pre.0 (git+https://github.com/EspressoSystems/jellyfish?tag=0.4.2)", - "jf-utils 0.4.0-pre.0 (git+https://github.com/EspressoSystems/jellyfish?tag=0.4.2)", + "jf-primitives", + "jf-utils", "lazy_static", "rand 0.8.5", "rand_chacha 0.3.1", "serde", "sha2 0.10.8", - "snafu", + "snafu 0.8.2", "tagged-base64", "time 0.3.34", "tokio", @@ -3319,9 +3348,9 @@ dependencies = [ [[package]] name = "hotshot-web-server" version = "0.5.26" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=adding_vbs_support#eb11d5d44e1f586217f0a6c9bcf9882535425c5c" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.27#8bf55cfb3a1d096c0330ba62d03ed1e5f7298cf8" dependencies = [ - "async-compatibility-layer 1.0.0 (git+https://github.com/EspressoSystems/async-compatibility-layer.git?tag=1.4.2)", + "async-compatibility-layer", "async-lock 2.8.0", "async-std", "clap", @@ -3330,35 +3359,17 @@ dependencies = [ "rand 0.8.5", "tide-disco", "tokio", - "toml 0.8.11", + "toml", "tracing", "versioned-binary-serialization", ] -[[package]] -name = "hs-builder-api" -version = "0.1.2" -source = "git+https://github.com/EspressoSystems/hs-builder-api?branch=adding_vbs_support#94278f062a514304ceb614cfff3979520b1a2f7f" -dependencies = [ - "async-trait", - "clap", - "derive_more", - "futures", - "hotshot-types", - "serde", - "snafu", - "tagged-base64", - "tide-disco", - "toml 0.8.11", - "versioned-binary-serialization", -] - [[package]] name = "hs-builder-core" version = "0.1.1" 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", "async-lock 2.8.0", "async-std", "async-trait", @@ -3366,9 +3377,9 @@ dependencies = [ "commit", "futures", "hotshot", + "hotshot-builder-api", "hotshot-example-types", "hotshot-types", - "hs-builder-api", "serde", "sha2 0.10.8", "tagged-base64", @@ -3817,61 +3828,16 @@ dependencies = [ "espresso-systems-common 0.4.0", "hashbrown 0.14.3", "itertools 0.12.1", - "jf-primitives 0.4.0-pre.0 (git+https://github.com/EspressoSystems/jellyfish?tag=0.4.2)", - "jf-relation 0.4.0-pre.0 (git+https://github.com/EspressoSystems/jellyfish?tag=0.4.2)", - "jf-utils 0.4.0-pre.0 (git+https://github.com/EspressoSystems/jellyfish?tag=0.4.2)", - "merlin", - "num-bigint", - "rand_chacha 0.3.1", - "rayon", - "serde", - "sha3", - "tagged-base64", -] - -[[package]] -name = "jf-primitives" -version = "0.4.0-pre.0" -source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.1#e96464c4bd8beb608a6a4afc8b8a2441c981f21a" -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.0-pre.0 (git+https://github.com/EspressoSystems/jellyfish?tag=0.4.1)", - "jf-utils 0.4.0-pre.0 (git+https://github.com/EspressoSystems/jellyfish?tag=0.4.1)", + "jf-primitives", + "jf-relation", + "jf-utils", "merlin", "num-bigint", - "num-traits", "rand_chacha 0.3.1", "rayon", "serde", - "sha2 0.10.8", "sha3", "tagged-base64", - "typenum", - "zeroize", ] [[package]] @@ -3904,8 +3870,8 @@ dependencies = [ "generic-array", "hashbrown 0.14.3", "itertools 0.12.1", - "jf-relation 0.4.0-pre.0 (git+https://github.com/EspressoSystems/jellyfish?tag=0.4.2)", - "jf-utils 0.4.0-pre.0 (git+https://github.com/EspressoSystems/jellyfish?tag=0.4.2)", + "jf-relation", + "jf-utils", "merlin", "num-bigint", "num-traits", @@ -3919,32 +3885,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "jf-relation" -version = "0.4.0-pre.0" -source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.1#e96464c4bd8beb608a6a4afc8b8a2441c981f21a" -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.0-pre.0 (git+https://github.com/EspressoSystems/jellyfish?tag=0.4.1)", - "num-bigint", - "rand_chacha 0.3.1", - "rayon", -] - [[package]] name = "jf-relation" version = "0.4.0-pre.0" @@ -3965,28 +3905,12 @@ 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 0.4.0-pre.0 (git+https://github.com/EspressoSystems/jellyfish?tag=0.4.2)", + "jf-utils", "num-bigint", "rand_chacha 0.3.1", "rayon", ] -[[package]] -name = "jf-utils" -version = "0.4.0-pre.0" -source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.1#e96464c4bd8beb608a6a4afc8b8a2441c981f21a" -dependencies = [ - "ark-ec", - "ark-ff", - "ark-serialize", - "ark-std", - "digest 0.10.7", - "rayon", - "serde", - "sha2 0.10.8", - "tagged-base64", -] - [[package]] name = "jf-utils" version = "0.4.0-pre.0" @@ -4391,17 +4315,17 @@ dependencies = [ [[package]] name = "libp2p-networking" version = "0.5.26" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=adding_vbs_support#eb11d5d44e1f586217f0a6c9bcf9882535425c5c" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.27#8bf55cfb3a1d096c0330ba62d03ed1e5f7298cf8" dependencies = [ "anyhow", - "async-compatibility-layer 1.0.0 (git+https://github.com/EspressoSystems/async-compatibility-layer.git?tag=1.4.2)", + "async-compatibility-layer", "async-lock 2.8.0", "async-std", "async-trait", "blake3", "custom_debug", "dashmap", - "derive_builder", + "derive_builder 0.20.0", "either", "futures", "hotshot-types", @@ -4413,7 +4337,7 @@ dependencies = [ "serde", "serde_bytes", "serde_json", - "snafu", + "snafu 0.8.2", "tokio", "tokio-stream", "tracing", @@ -4909,9 +4833,9 @@ checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" [[package]] name = "maud" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0bab19cef8a7fe1c18a43e881793bfc9d4ea984befec3ae5bd0415abf3ecf00" +checksum = "df518b75016b4289cdddffa1b01f2122f4a49802c93191f3133f6dc2472ebcaa" dependencies = [ "itoa", "maud_macros", @@ -4920,14 +4844,14 @@ dependencies = [ [[package]] name = "maud_macros" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0be95d66c3024ffce639216058e5bae17a83ecaf266ffc6e4d060ad447c9eed2" +checksum = "fa453238ec218da0af6b11fc5978d3b5c3a45ed97b722391a2a11f3306274e18" dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.52", ] [[package]] @@ -5433,12 +5357,12 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "ordered-multimap" -version = "0.4.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a" +checksum = "4ed8acf08e98e744e5384c8bc63ceb0364e68a6854187221c18df61c4797690e" dependencies = [ "dlv-list", - "hashbrown 0.12.3", + "hashbrown 0.13.2", ] [[package]] @@ -5820,7 +5744,6 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn 1.0.109", "version_check", ] @@ -5888,16 +5811,6 @@ dependencies = [ "syn 2.0.52", ] -[[package]] -name = "prost" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" -dependencies = [ - "bytes 1.5.0", - "prost-derive 0.11.9", -] - [[package]] name = "prost" version = "0.12.3" @@ -5905,20 +5818,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a" dependencies = [ "bytes 1.5.0", - "prost-derive 0.12.3", -] - -[[package]] -name = "prost-derive" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" -dependencies = [ - "anyhow", - "itertools 0.10.5", - "proc-macro2", - "quote", - "syn 1.0.109", + "prost-derive", ] [[package]] @@ -5934,22 +5834,13 @@ dependencies = [ "syn 2.0.52", ] -[[package]] -name = "prost-types" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" -dependencies = [ - "prost 0.11.9", -] - [[package]] name = "prost-types" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e" dependencies = [ - "prost 0.12.3", + "prost", ] [[package]] @@ -6378,13 +6269,14 @@ dependencies = [ [[package]] name = "ron" -version = "0.7.1" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88073939a61e5b7680558e6be56b419e208420c2adb92be54921fa6b72283f1a" +checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ - "base64 0.13.1", - "bitflags 1.3.2", + "base64 0.21.7", + "bitflags 2.4.2", "serde", + "serde_derive", ] [[package]] @@ -6441,9 +6333,9 @@ dependencies = [ [[package]] name = "rust-ini" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df" +checksum = "7e2a3bcec1f113553ef1c88aae6c020a369d03d55b58de9869a0908930385091" dependencies = [ "cfg-if", "ordered-multimap", @@ -6794,9 +6686,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.6.1" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15d167997bd841ec232f5b2b8e0e26606df2e7caa4c31b95ea9ca52b200bd270" +checksum = "ee80b0e361bbf88fd2f6e242ccd19cfda072cb0faa6ae694ecee08199938569a" dependencies = [ "base64 0.21.7", "chrono", @@ -6812,9 +6704,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.6.1" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "865f9743393e638991566a8b7a479043c2c8da94a33e0a31f18214c9cae0a64d" +checksum = "6561dc161a9224638a31d876ccdfefbc1df91d3f3a8342eddb35f055d48c7655" dependencies = [ "darling 0.20.8", "proc-macro2", @@ -7041,7 +6933,16 @@ checksum = "e4de37ad025c587a29e8f3f5605c00f70b98715ef90b9061a815b9e59e9042d6" dependencies = [ "backtrace", "doc-comment", - "snafu-derive", + "snafu-derive 0.7.5", +] + +[[package]] +name = "snafu" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75976f4748ab44f6e5332102be424e7c2dc18daeaf7e725f2040c3ebb133512e" +dependencies = [ + "snafu-derive 0.8.2", ] [[package]] @@ -7056,6 +6957,18 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "snafu-derive" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4b19911debfb8c2fb1107bc6cb2d61868aaf53a988449213959bb1b5b1ed95f" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.52", +] + [[package]] name = "snow" version = "0.9.6" @@ -7440,15 +7353,15 @@ checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" [[package]] name = "strum" -version = "0.25.0" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" [[package]] name = "strum_macros" -version = "0.25.3" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" dependencies = [ "heck", "proc-macro2", @@ -7488,8 +7401,8 @@ dependencies = [ [[package]] name = "surf-disco" -version = "0.4.8" -source = "git+https://github.com/EspressoSystems/surf-disco.git?tag=v0.4.8#522b160f6fa03793f6b1a920568d93980ab18f19" +version = "0.5.0" +source = "git+https://github.com/EspressoSystems/surf-disco.git?tag=v0.5.0#956cebd8d9784de42ea41fd30ec382de8246cb9c" dependencies = [ "async-std", "async-tungstenite", @@ -7652,7 +7565,7 @@ dependencies = [ "base64 0.21.7", "crc-any", "serde", - "snafu", + "snafu 0.7.5", "tagged-base64-macros", "wasm-bindgen", ] @@ -7752,8 +7665,8 @@ dependencies = [ [[package]] name = "tide-disco" -version = "0.4.8" -source = "git+https://github.com/EspressoSystems/tide-disco?tag=v0.4.8#d0d2bfb8de1fcee6c28362c768efd6a2928d7b56" +version = "0.5.0" +source = "git+https://github.com/EspressoSystems/tide-disco?tag=v0.5.0#07e489171089650cebfaca9ca6a6a6ddd843610d" dependencies = [ "anyhow", "async-std", @@ -7784,14 +7697,14 @@ dependencies = [ "shellexpand", "signal-hook", "signal-hook-async-std", - "snafu", + "snafu 0.8.2", "strum", "strum_macros", "surf", "tagged-base64", "tide", "tide-websockets", - "toml 0.8.11", + "toml", "tracing", "tracing-distributed", "tracing-futures", @@ -8001,15 +7914,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - [[package]] name = "toml" version = "0.8.11" @@ -8055,34 +7959,6 @@ dependencies = [ "winnow 0.6.5", ] -[[package]] -name = "tonic" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" -dependencies = [ - "async-trait", - "axum", - "base64 0.21.7", - "bytes 1.5.0", - "futures-core", - "futures-util", - "h2", - "http 0.2.11", - "http-body", - "hyper", - "hyper-timeout", - "percent-encoding", - "pin-project", - "prost 0.11.9", - "tokio", - "tokio-stream", - "tower", - "tower-layer", - "tower-service", - "tracing", -] - [[package]] name = "tonic" version = "0.10.2" @@ -8101,7 +7977,7 @@ dependencies = [ "hyper-timeout", "percent-encoding", "pin-project", - "prost 0.12.3", + "prost", "tokio", "tokio-stream", "tower", diff --git a/Cargo.toml b/Cargo.toml index 16047c81..e0ce8651 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [dependencies] async-broadcast = "0.7.0" -async-compatibility-layer = { git = "https://github.com/EspressoSystems/async-compatibility-layer.git", tag = "1.4.1", features = [ +async-compatibility-layer = { git = "https://github.com/EspressoSystems/async-compatibility-layer.git", tag = "1.4.2", features = [ "logging-utils", ] } async-lock = "2.8" @@ -16,12 +16,12 @@ async-trait = "0.1" clap = { version = "4.4", features = ["derive", "env"] } commit = { git = "https://github.com/EspressoSystems/commit.git" } futures = "0.3" -hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "adding_vbs_support" } -hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "adding_vbs_support" } -hotshot-types = { git = "https://github.com/EspressoSystems/hotshot-types.git", branch = "adding_vbs_support" } -hs-builder-api = { git = "https://github.com/EspressoSystems/hs-builder-api", branch = "adding_vbs_support" } +hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.27" } +hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.27" } +hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.27" } +hotshot-builder-api = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.27" } sha2 = "0.10" serde = { version = "1.0", features = ["derive"] } -tide-disco = { git = "https://github.com/EspressoSystems/tide-disco", tag = "v0.4.8" } +tide-disco = { git = "https://github.com/EspressoSystems/tide-disco", tag = "v0.5.0" } tagged-base64 = { git = "https://github.com/EspressoSystems/tagged-base64", tag = "0.3.4" } tracing = "0.1" diff --git a/src/builder_state.rs b/src/builder_state.rs index d3eea4e8..08017a36 100644 --- a/src/builder_state.rs +++ b/src/builder_state.rs @@ -55,7 +55,7 @@ pub struct TransactionMessage { pub tx_type: TransactionSource, } /// Decide Message to be put on the decide channel -#[derive(Clone, Debug, PartialEq)] +#[derive(Clone, Debug)] pub struct DecideMessage { pub leaf_chain: Arc>, pub qc: Arc>, @@ -407,11 +407,11 @@ impl BuilderProgress for BuilderState { let _qc = decide_msg.qc; let _block_size = decide_msg.block_size; - let _latest_decide_parent_commitment = leaf_chain[0].0.parent_commitment; + let _latest_decide_parent_commitment = leaf_chain[0].leaf.parent_commitment; - let _latest_decide_commitment = leaf_chain[0].0.commit(); + let _latest_decide_commitment = leaf_chain[0].leaf.commit(); - let leaf_view_number = leaf_chain[0].0.view_number; + let leaf_view_number = leaf_chain[0].leaf.view_number; // bootstrapping case // handle the case when we hear a decide event before we have atleast one clone, in that case, we might exit the builder @@ -437,11 +437,11 @@ impl BuilderProgress for BuilderState { // go through all the leafs for leaf in leaf_chain.iter() { - let block_payload = leaf.0.get_block_payload(); + let block_payload = leaf.leaf.get_block_payload(); match block_payload { Some(block_payload) => { tracing::debug!("Block payload in decide event {:?}", block_payload); - let metadata = leaf_chain[0].0.get_block_header().metadata(); + let metadata = leaf_chain[0].leaf.get_block_header().metadata(); let transactions_commitments = block_payload.transaction_commitments(metadata); // iterate over the transactions and remove them from tx_hash_to_tx and timestamp_to_tx for tx_hash in transactions_commitments.iter() { diff --git a/src/service.rs b/src/service.rs index 02d0daec..482fe0f4 100644 --- a/src/service.rs +++ b/src/service.rs @@ -4,6 +4,11 @@ #![allow(clippy::redundant_field_names)] use hotshot::{traits::NodeImplementation, types::SystemContextHandle}; +use hotshot_builder_api::{ + block_info::{AvailableBlockData, AvailableBlockHeaderInput, AvailableBlockInfo}, + builder::BuildError, + data_source::{AcceptsTxnSubmits, BuilderDataSource}, +}; use hotshot_types::{ event::EventType, traits::{ @@ -15,11 +20,6 @@ use hotshot_types::{ utils::BuilderCommitment, vid::VidCommitment, }; -use hs_builder_api::{ - block_info::{AvailableBlockData, AvailableBlockHeaderInput, AvailableBlockInfo}, - builder::BuildError, - data_source::{AcceptsTxnSubmits, BuilderDataSource}, -}; use async_broadcast::Sender as BroadcastSender; use async_compatibility_layer::channel::UnboundedReceiver; @@ -332,6 +332,7 @@ pub async fn run_standalone_builder_service Date: Fri, 22 Mar 2024 12:34:31 -0400 Subject: [PATCH 04/15] Adding the test fix --- src/testing/basic_test.rs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/testing/basic_test.rs b/src/testing/basic_test.rs index 7ca3d5a6..544477ad 100644 --- a/src/testing/basic_test.rs +++ b/src/testing/basic_test.rs @@ -43,6 +43,7 @@ mod tests { use hotshot::types::SignatureKey; use hotshot_types::{ data::QuorumProposal, + event::LeafInfo, message::Message, simple_certificate::Threshold, simple_vote::QuorumData, @@ -145,6 +146,7 @@ mod tests { let mut sreq_msgs: Vec> = Vec::new(); // storing response messages let mut rres_msgs: Vec = Vec::new(); + let validated_state = Arc::new(TestValidatedState::default()); // generate num_test messages for each type and send it to the respective channels; for i in 0..num_test_messages as u32 { @@ -212,7 +214,7 @@ mod tests { let block_header = TestBlockHeader { block_number: i as u64, payload_commitment: encoded_txns_vid_commitment, - timestamp: i as u64, + timestamp: i as u64 + 1u64, }; let justify_qc = match i { @@ -330,7 +332,12 @@ mod tests { }; let sdecide_msg = DecideMessage:: { - leaf_chain: Arc::new(vec![(leaf.clone(), None)]), + leaf_chain: Arc::new(vec![LeafInfo::new( + leaf.clone(), + validated_state.clone(), + None, + None, + )]), qc: Arc::new(justify_qc), block_size: Some(encoded_transactions.len() as u64), }; From 1bc770fb7292fbce9420b6f84d1077114b1524a7 Mon Sep 17 00:00:00 2001 From: Nathan F Yospe Date: Fri, 22 Mar 2024 13:06:56 -0400 Subject: [PATCH 05/15] adding capnproto to nix --- flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake.nix b/flake.nix index a15bf921..56df73c2 100644 --- a/flake.nix +++ b/flake.nix @@ -173,6 +173,7 @@ nixpkgs-fmt git mdbook # make-doc, documentation generation + capnproto protobuf rustToolchain ] ++ myPython ++ rustDeps; From abb9aa3be1057eb35bf2e143125f6f37d013fe50 Mon Sep 17 00:00:00 2001 From: Nathan F Yospe Date: Fri, 22 Mar 2024 14:24:19 -0400 Subject: [PATCH 06/15] trying github actions fixes for capnproto --- .github/actions/install-capnp/action.yml | 8 ++++++++ .github/workflows/build.yml | 3 +++ .github/workflows/build_windows.yml | 8 +++++++- .github/workflows/debug_build.yml | 3 +++ .github/workflows/lint.yml | 3 +++ 5 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 .github/actions/install-capnp/action.yml diff --git a/.github/actions/install-capnp/action.yml b/.github/actions/install-capnp/action.yml new file mode 100644 index 00000000..a0e9be83 --- /dev/null +++ b/.github/actions/install-capnp/action.yml @@ -0,0 +1,8 @@ +name: Install Capn Proto +runs: + using: composite + steps: + - run: | + sudo apt-get update + sudo apt-get install -y capnproto + shell: bash diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9d042f79..9d5e433a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,6 +30,9 @@ jobs: - name: Install Protoc uses: arduino/setup-protoc@v2 + - name: Install capnproto + uses: ./.github/actions/install-capnp + - uses: dtolnay/rust-toolchain@stable - name: Configure Git diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml index acd52bc3..fc3118ba 100644 --- a/.github/workflows/build_windows.yml +++ b/.github/workflows/build_windows.yml @@ -27,7 +27,7 @@ jobs: windows: runs-on: windows-latest env: - RUSTFLAGS: "--cfg async_executor_impl=\"async-std\" --cfg async_channel_impl=\"async-std\" --cfg hotshot_example" + RUSTFLAGS: "--cfg async_executor_impl=\"async-std\" --cfg async_channel_impl=\"async-std\"" RUST_LOG: info steps: - name: Configure Git @@ -40,6 +40,12 @@ jobs: - name: Install Protoc uses: arduino/setup-protoc@v2 + # Will this work? + # - name: Install Cap'n Proto + # run: | + # curl https://capnproto.org/capnproto-c++-win32-1.0.2.zip -o capnproto.zip + # 7z.exe e capnproto.zip *.exe + - name: Checkout Repository uses: actions/checkout@v4 diff --git a/.github/workflows/debug_build.yml b/.github/workflows/debug_build.yml index 2e27082c..fbbaff35 100644 --- a/.github/workflows/debug_build.yml +++ b/.github/workflows/debug_build.yml @@ -15,6 +15,9 @@ jobs: - name: Install Protoc uses: arduino/setup-protoc@v2 + - name: Install capnproto + uses: ./.github/actions/install-capnp + - uses: dtolnay/rust-toolchain@stable - uses: styfle/cancel-workflow-action@0.12.0 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index d0347d28..d16268da 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -36,6 +36,9 @@ jobs: - name: Install Protoc uses: arduino/setup-protoc@v2 + - name: Install capnproto + uses: ./.github/actions/install-capnp + - uses: dtolnay/rust-toolchain@stable - name: Configure Git From 1b38ebafc45c39e0adf63a269f2e97390e653888 Mon Sep 17 00:00:00 2001 From: Nathan F Yospe Date: Fri, 22 Mar 2024 14:40:16 -0400 Subject: [PATCH 07/15] remove audit from the build CI action --- .github/workflows/build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9d5e433a..24723256 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -54,8 +54,9 @@ jobs: token: ${{ github.token }} args: --workspace --all-features --all-targets -- -D warnings - - name: Audit - run: cargo audit --ignore RUSTSEC-2023-0018 --ignore RUSTSEC-2023-0052 --ignore RUSTSEC-2023-0065 + # TODO: This should not be the basis of a build failure. Move to a different job + # - name: Audit + # run: cargo audit --ignore RUSTSEC-2023-0018 --ignore RUSTSEC-2023-0052 --ignore RUSTSEC-2023-0065 - name: Build # Build in release without `testing` feature, this should work without `hotshot_example` config. From fcd776d8cdc3fb64b9f4363ad96c3bf84cc6e7aa Mon Sep 17 00:00:00 2001 From: Nathan F Yospe Date: Fri, 22 Mar 2024 14:47:23 -0400 Subject: [PATCH 08/15] attempt to enable windows capnproto --- .github/workflows/build_windows.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml index fc3118ba..057b9c9d 100644 --- a/.github/workflows/build_windows.yml +++ b/.github/workflows/build_windows.yml @@ -41,10 +41,11 @@ jobs: uses: arduino/setup-protoc@v2 # Will this work? - # - name: Install Cap'n Proto - # run: | - # curl https://capnproto.org/capnproto-c++-win32-1.0.2.zip -o capnproto.zip - # 7z.exe e capnproto.zip *.exe + - name: Install Cap'n Proto + run: | + curl https://capnproto.org/capnproto-c++-win32-1.0.2.zip -o capnproto.zip + 7z.exe e capnproto.zip *.exe + echo "{path}" >> $GITHUB_PATH - name: Checkout Repository uses: actions/checkout@v4 From 8e12ceae43ef602b3c9a85990a30b76c734820df Mon Sep 17 00:00:00 2001 From: Nathan F Yospe Date: Fri, 22 Mar 2024 16:28:39 -0400 Subject: [PATCH 09/15] another attempt to enable windows capnproto --- .github/workflows/build_windows.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml index 057b9c9d..14fe5434 100644 --- a/.github/workflows/build_windows.yml +++ b/.github/workflows/build_windows.yml @@ -44,7 +44,8 @@ jobs: - name: Install Cap'n Proto run: | curl https://capnproto.org/capnproto-c++-win32-1.0.2.zip -o capnproto.zip - 7z.exe e capnproto.zip *.exe + 7z.exe e capnproto.zip -r *.exe + echo "Unpacking capnp.exe to {path}" echo "{path}" >> $GITHUB_PATH - name: Checkout Repository @@ -55,6 +56,7 @@ jobs: - name: Build run: | + echo "building with PATH=$PATH" cargo build --workspace --release - name: Test From db4eca5c5c049b5a7c992ac7bd80e0fa73d7b112 Mon Sep 17 00:00:00 2001 From: Nathan F Yospe Date: Fri, 22 Mar 2024 17:10:40 -0400 Subject: [PATCH 10/15] one last attempt to enable windows capnproto --- .github/workflows/build_windows.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml index 14fe5434..2cdca127 100644 --- a/.github/workflows/build_windows.yml +++ b/.github/workflows/build_windows.yml @@ -44,9 +44,9 @@ jobs: - name: Install Cap'n Proto run: | curl https://capnproto.org/capnproto-c++-win32-1.0.2.zip -o capnproto.zip - 7z.exe e capnproto.zip -r *.exe - echo "Unpacking capnp.exe to {path}" - echo "{path}" >> $GITHUB_PATH + 7z.exe e capnproto.zip -r *.exe -o${{github.workspace}}/capnproto + Write-Output "Unpacking capnp.exe to ${{github.workspace}}/capnproto" + echo "${{github.workspace}}/capnproto" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8 - name: Checkout Repository uses: actions/checkout@v4 @@ -56,7 +56,7 @@ jobs: - name: Build run: | - echo "building with PATH=$PATH" + Write-Output "building with PATH=$env:PATH" cargo build --workspace --release - name: Test From add4f6aa691844b3a0786c210692df4f9c137bff Mon Sep 17 00:00:00 2001 From: Nathan F Yospe Date: Fri, 22 Mar 2024 17:30:38 -0400 Subject: [PATCH 11/15] Windows path syntax... --- .github/workflows/build_windows.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml index 2cdca127..275f7d86 100644 --- a/.github/workflows/build_windows.yml +++ b/.github/workflows/build_windows.yml @@ -44,9 +44,9 @@ jobs: - name: Install Cap'n Proto run: | curl https://capnproto.org/capnproto-c++-win32-1.0.2.zip -o capnproto.zip - 7z.exe e capnproto.zip -r *.exe -o${{github.workspace}}/capnproto - Write-Output "Unpacking capnp.exe to ${{github.workspace}}/capnproto" - echo "${{github.workspace}}/capnproto" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8 + 7z.exe e capnproto.zip -r *.exe -o${{github.workspace}}\\capnproto + Write-Output "Unpacking capnp.exe to ${{github.workspace}}\\capnproto\\" + echo "${{github.workspace}}\\capnproto" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8 - name: Checkout Repository uses: actions/checkout@v4 @@ -56,7 +56,7 @@ jobs: - name: Build run: | - Write-Output "building with PATH=$env:PATH" + capnp.exe --version cargo build --workspace --release - name: Test From e03455f1358cc68a486161b0dfb7df93319def92 Mon Sep 17 00:00:00 2001 From: Nathan F Yospe Date: Fri, 22 Mar 2024 17:42:16 -0400 Subject: [PATCH 12/15] I WILL figure this out --- .github/workflows/build_windows.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml index 275f7d86..11bf2a3c 100644 --- a/.github/workflows/build_windows.yml +++ b/.github/workflows/build_windows.yml @@ -46,6 +46,7 @@ jobs: curl https://capnproto.org/capnproto-c++-win32-1.0.2.zip -o capnproto.zip 7z.exe e capnproto.zip -r *.exe -o${{github.workspace}}\\capnproto Write-Output "Unpacking capnp.exe to ${{github.workspace}}\\capnproto\\" + Get-ChildItem -Path ${{github.workspace}}\\capnproto\\ echo "${{github.workspace}}\\capnproto" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8 - name: Checkout Repository @@ -56,7 +57,8 @@ jobs: - name: Build run: | - capnp.exe --version + Get-Command capnp -All + capnp --version cargo build --workspace --release - name: Test From bf1d912fe65f8c9dde3a71a17e9e9f8149b26f4f Mon Sep 17 00:00:00 2001 From: Nathan F Yospe Date: Fri, 22 Mar 2024 17:49:31 -0400 Subject: [PATCH 13/15] ... --- .github/workflows/build_windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml index 11bf2a3c..a2f18b39 100644 --- a/.github/workflows/build_windows.yml +++ b/.github/workflows/build_windows.yml @@ -48,6 +48,8 @@ jobs: Write-Output "Unpacking capnp.exe to ${{github.workspace}}\\capnproto\\" Get-ChildItem -Path ${{github.workspace}}\\capnproto\\ echo "${{github.workspace}}\\capnproto" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8 + $env:Path += ';${{github.workspace}}\\capnproto' + Get-Command capnp -All - name: Checkout Repository uses: actions/checkout@v4 @@ -57,8 +59,6 @@ jobs: - name: Build run: | - Get-Command capnp -All - capnp --version cargo build --workspace --release - name: Test From f2e5f9795673e9a7735f7a919a0995b17dce7653 Mon Sep 17 00:00:00 2001 From: Nathan F Yospe Date: Fri, 22 Mar 2024 18:09:48 -0400 Subject: [PATCH 14/15] grrr --- .github/workflows/build_windows.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml index a2f18b39..0d051834 100644 --- a/.github/workflows/build_windows.yml +++ b/.github/workflows/build_windows.yml @@ -44,12 +44,13 @@ jobs: - name: Install Cap'n Proto run: | curl https://capnproto.org/capnproto-c++-win32-1.0.2.zip -o capnproto.zip - 7z.exe e capnproto.zip -r *.exe -o${{github.workspace}}\\capnproto - Write-Output "Unpacking capnp.exe to ${{github.workspace}}\\capnproto\\" + 7z.exe e capnproto.zip -r *.exe -o${{github.workspace}}\capnproto + Write-Output "Unpacking capnp.exe to ${{github.workspace}}\capnproto\" Get-ChildItem -Path ${{github.workspace}}\\capnproto\\ - echo "${{github.workspace}}\\capnproto" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8 - $env:Path += ';${{github.workspace}}\\capnproto' + echo "${{github.workspace}}\capnproto" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8 + $env:Path += ';${{github.workspace}}\capnproto' Get-Command capnp -All + capnp --version - name: Checkout Repository uses: actions/checkout@v4 @@ -59,6 +60,8 @@ jobs: - name: Build run: | + $env:Path += ';${{github.workspace}}\capnproto' + capnp --version cargo build --workspace --release - name: Test From 6a361dbf969190f9a158367d0a6af0728e973b08 Mon Sep 17 00:00:00 2001 From: Nathan F Yospe Date: Fri, 22 Mar 2024 18:18:47 -0400 Subject: [PATCH 15/15] ??? --- .github/workflows/build_windows.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml index 0d051834..41d9a5eb 100644 --- a/.github/workflows/build_windows.yml +++ b/.github/workflows/build_windows.yml @@ -46,7 +46,7 @@ jobs: curl https://capnproto.org/capnproto-c++-win32-1.0.2.zip -o capnproto.zip 7z.exe e capnproto.zip -r *.exe -o${{github.workspace}}\capnproto Write-Output "Unpacking capnp.exe to ${{github.workspace}}\capnproto\" - Get-ChildItem -Path ${{github.workspace}}\\capnproto\\ + Get-ChildItem -Path ${{github.workspace}}\capnproto\ echo "${{github.workspace}}\capnproto" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8 $env:Path += ';${{github.workspace}}\capnproto' Get-Command capnp -All @@ -60,6 +60,7 @@ jobs: - name: Build run: | + Get-ChildItem -Path ${{github.workspace}}\capnproto\ $env:Path += ';${{github.workspace}}\capnproto' capnp --version cargo build --workspace --release