diff --git a/.github/actions/install-capnp/action.yml b/.github/actions/install-capnp/action.yml deleted file mode 100644 index a0e9be8..0000000 --- a/.github/actions/install-capnp/action.yml +++ /dev/null @@ -1,8 +0,0 @@ -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/debug_build.yml b/.github/workflows/debug_build.yml index fbbaff3..2e27082 100644 --- a/.github/workflows/debug_build.yml +++ b/.github/workflows/debug_build.yml @@ -15,9 +15,6 @@ 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 98725a8..d0347d2 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -36,9 +36,6 @@ 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/.vscode/settings.json.example b/.vscode/settings.json.example index f01b5af..c2668da 100644 --- a/.vscode/settings.json.example +++ b/.vscode/settings.json.example @@ -1,5 +1,7 @@ // Sets features for Rust Analyzer, since some features are required to be set for compilation { - "rust-analyzer.cargo.features": [ - ], + "rust-analyzer.server.extraEnv": { + "RUSTFLAGS": "--cfg async_executor_impl=\"async-std\" --cfg async_channel_impl=\"async-std\"", + "CARGO_TARGET_DIR": "vsc/target" + }, } diff --git a/Cargo.lock b/Cargo.lock index 6506f41..5153d6b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1938,6 +1938,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.74", +] + [[package]] name = "der" version = "0.7.9" @@ -2957,8 +2968,8 @@ dependencies = [ [[package]] name = "hotshot" -version = "0.5.69" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.70#3e38cdf852816d73a3b4ffc58c5ccd3a0c6e8028" +version = "0.5.71" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" dependencies = [ "anyhow", "async-broadcast", @@ -3005,7 +3016,7 @@ dependencies = [ [[package]] name = "hotshot-builder-api" version = "0.1.7" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.70#3e38cdf852816d73a3b4ffc58c5ccd3a0c6e8028" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" dependencies = [ "async-trait", "clap", @@ -3051,8 +3062,8 @@ dependencies = [ [[package]] name = "hotshot-example-types" -version = "0.5.69" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.70#3e38cdf852816d73a3b4ffc58c5ccd3a0c6e8028" +version = "0.5.71" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" dependencies = [ "anyhow", "async-broadcast", @@ -3084,8 +3095,8 @@ dependencies = [ [[package]] name = "hotshot-orchestrator" -version = "0.5.69" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.70#3e38cdf852816d73a3b4ffc58c5ccd3a0c6e8028" +version = "0.5.71" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" dependencies = [ "anyhow", "async-compatibility-layer", @@ -3114,8 +3125,8 @@ dependencies = [ [[package]] name = "hotshot-task" -version = "0.5.69" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.70#3e38cdf852816d73a3b4ffc58c5ccd3a0c6e8028" +version = "0.5.71" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" dependencies = [ "anyhow", "async-broadcast", @@ -3129,8 +3140,8 @@ dependencies = [ [[package]] name = "hotshot-task-impls" -version = "0.5.69" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.70#3e38cdf852816d73a3b4ffc58c5ccd3a0c6e8028" +version = "0.5.71" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" dependencies = [ "anyhow", "async-broadcast", @@ -3167,7 +3178,7 @@ dependencies = [ [[package]] name = "hotshot-types" version = "0.1.11" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.70#3e38cdf852816d73a3b4ffc58c5ccd3a0c6e8028" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" dependencies = [ "anyhow", "ark-bn254", @@ -3200,11 +3211,13 @@ dependencies = [ "jf-utils", "jf-vid", "lazy_static", + "libp2p", "memoize", "rand 0.8.5", "rand_chacha 0.3.1", "reqwest", "serde", + "serde_bytes", "sha2 0.10.8", "snafu", "tagged-base64", @@ -4328,8 +4341,8 @@ dependencies = [ [[package]] name = "libp2p-networking" -version = "0.5.69" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.70#3e38cdf852816d73a3b4ffc58c5ccd3a0c6e8028" +version = "0.5.71" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" dependencies = [ "anyhow", "async-compatibility-layer", @@ -4339,6 +4352,7 @@ dependencies = [ "bincode", "blake3", "custom_debug", + "delegate", "derive_builder", "either", "futures", diff --git a/Cargo.toml b/Cargo.toml index 0638640..05c7599 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,7 @@ derivative = "2.2" derive_more = "0.99" either = { version = "1.12", features = ["serde"] } futures = "0.3" -hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.70" } +hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.71" } rand = "0.8.5" serde = { version = "1.0", features = ["derive"] } snafu = "0.8" @@ -28,6 +28,6 @@ tracing = "0.1" vbs = "0.1.4" [dev-dependencies] -hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.70" } +hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.71" } portpicker = "0.1.1" surf-disco = "0.9"