From 8a00f4a3221b4796b6e5af9cb8b37b8e72bf93a3 Mon Sep 17 00:00:00 2001 From: Rob Date: Wed, 14 Aug 2024 16:01:21 -0400 Subject: [PATCH 1/6] Bump HotShot --- .github/actions/install-capnp/action.yml | 8 ------- .github/workflows/debug_build.yml | 3 --- .github/workflows/lint.yml | 3 --- Cargo.lock | 30 +++++++++++++++++------- Cargo.toml | 4 ++-- 5 files changed, 24 insertions(+), 24 deletions(-) delete mode 100644 .github/actions/install-capnp/action.yml 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/Cargo.lock b/Cargo.lock index ef08833..c1c6b83 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" @@ -2958,7 +2969,7 @@ dependencies = [ [[package]] name = "hotshot" version = "0.5.69" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.69#b3796d6abea494780f6220845d729cb186a11f6a" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.71#56e3f2c663aad796c3d831c77ca47e5648a209be" 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.69#b3796d6abea494780f6220845d729cb186a11f6a" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.71#56e3f2c663aad796c3d831c77ca47e5648a209be" dependencies = [ "async-trait", "clap", @@ -3052,7 +3063,7 @@ dependencies = [ [[package]] name = "hotshot-example-types" version = "0.5.69" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.69#b3796d6abea494780f6220845d729cb186a11f6a" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.71#56e3f2c663aad796c3d831c77ca47e5648a209be" dependencies = [ "anyhow", "async-broadcast", @@ -3085,7 +3096,7 @@ dependencies = [ [[package]] name = "hotshot-orchestrator" version = "0.5.69" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.69#b3796d6abea494780f6220845d729cb186a11f6a" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.71#56e3f2c663aad796c3d831c77ca47e5648a209be" dependencies = [ "anyhow", "async-compatibility-layer", @@ -3115,7 +3126,7 @@ dependencies = [ [[package]] name = "hotshot-task" version = "0.5.69" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.69#b3796d6abea494780f6220845d729cb186a11f6a" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.71#56e3f2c663aad796c3d831c77ca47e5648a209be" dependencies = [ "anyhow", "async-broadcast", @@ -3130,7 +3141,7 @@ dependencies = [ [[package]] name = "hotshot-task-impls" version = "0.5.69" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.69#b3796d6abea494780f6220845d729cb186a11f6a" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.71#56e3f2c663aad796c3d831c77ca47e5648a209be" 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.69#b3796d6abea494780f6220845d729cb186a11f6a" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.71#56e3f2c663aad796c3d831c77ca47e5648a209be" 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", @@ -4329,7 +4342,7 @@ dependencies = [ [[package]] name = "libp2p-networking" version = "0.5.69" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.69#b3796d6abea494780f6220845d729cb186a11f6a" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.71#56e3f2c663aad796c3d831c77ca47e5648a209be" 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 b604b54..070f6f6 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.69" } +hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "rc-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.69" } +hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "rc-0.5.71" } portpicker = "0.1.1" surf-disco = "0.9" From 6729a08b895f67551f040153c43fde1b9ed0d049 Mon Sep 17 00:00:00 2001 From: Rob Date: Wed, 14 Aug 2024 17:12:22 -0400 Subject: [PATCH 2/6] bump HS --- Cargo.lock | 28 ++++++++++++++-------------- Cargo.toml | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c1c6b83..deed51f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2968,8 +2968,8 @@ dependencies = [ [[package]] name = "hotshot" -version = "0.5.69" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.71#56e3f2c663aad796c3d831c77ca47e5648a209be" +version = "0.5.71" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4cc37458dfacfcdff340ef5e0bbbe6183367fb77" dependencies = [ "anyhow", "async-broadcast", @@ -3016,7 +3016,7 @@ dependencies = [ [[package]] name = "hotshot-builder-api" version = "0.1.7" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.71#56e3f2c663aad796c3d831c77ca47e5648a209be" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4cc37458dfacfcdff340ef5e0bbbe6183367fb77" dependencies = [ "async-trait", "clap", @@ -3062,8 +3062,8 @@ dependencies = [ [[package]] name = "hotshot-example-types" -version = "0.5.69" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.71#56e3f2c663aad796c3d831c77ca47e5648a209be" +version = "0.5.71" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4cc37458dfacfcdff340ef5e0bbbe6183367fb77" dependencies = [ "anyhow", "async-broadcast", @@ -3095,8 +3095,8 @@ dependencies = [ [[package]] name = "hotshot-orchestrator" -version = "0.5.69" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.71#56e3f2c663aad796c3d831c77ca47e5648a209be" +version = "0.5.71" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4cc37458dfacfcdff340ef5e0bbbe6183367fb77" dependencies = [ "anyhow", "async-compatibility-layer", @@ -3125,8 +3125,8 @@ dependencies = [ [[package]] name = "hotshot-task" -version = "0.5.69" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.71#56e3f2c663aad796c3d831c77ca47e5648a209be" +version = "0.5.71" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4cc37458dfacfcdff340ef5e0bbbe6183367fb77" dependencies = [ "anyhow", "async-broadcast", @@ -3140,8 +3140,8 @@ dependencies = [ [[package]] name = "hotshot-task-impls" -version = "0.5.69" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.71#56e3f2c663aad796c3d831c77ca47e5648a209be" +version = "0.5.71" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4cc37458dfacfcdff340ef5e0bbbe6183367fb77" dependencies = [ "anyhow", "async-broadcast", @@ -3178,7 +3178,7 @@ dependencies = [ [[package]] name = "hotshot-types" version = "0.1.11" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.71#56e3f2c663aad796c3d831c77ca47e5648a209be" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4cc37458dfacfcdff340ef5e0bbbe6183367fb77" dependencies = [ "anyhow", "ark-bn254", @@ -4341,8 +4341,8 @@ dependencies = [ [[package]] name = "libp2p-networking" -version = "0.5.69" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.71#56e3f2c663aad796c3d831c77ca47e5648a209be" +version = "0.5.71" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4cc37458dfacfcdff340ef5e0bbbe6183367fb77" dependencies = [ "anyhow", "async-compatibility-layer", diff --git a/Cargo.toml b/Cargo.toml index 070f6f6..f8743b2 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 = "rc-0.5.71" } +hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "bump/rc-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 = "rc-0.5.71" } +hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "bump/rc-0.5.71" } portpicker = "0.1.1" surf-disco = "0.9" From 7c61dc0cec437e692277929697d5c3cdf5f55244 Mon Sep 17 00:00:00 2001 From: Rob Date: Thu, 15 Aug 2024 08:48:30 -0400 Subject: [PATCH 3/6] bump HS again --- Cargo.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index deed51f..0d953b3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2969,7 +2969,7 @@ dependencies = [ [[package]] name = "hotshot" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4cc37458dfacfcdff340ef5e0bbbe6183367fb77" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#2d391be364524b585c50f3b83f5ad238b4cb3360" dependencies = [ "anyhow", "async-broadcast", @@ -3016,7 +3016,7 @@ dependencies = [ [[package]] name = "hotshot-builder-api" version = "0.1.7" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4cc37458dfacfcdff340ef5e0bbbe6183367fb77" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#2d391be364524b585c50f3b83f5ad238b4cb3360" dependencies = [ "async-trait", "clap", @@ -3063,7 +3063,7 @@ dependencies = [ [[package]] name = "hotshot-example-types" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4cc37458dfacfcdff340ef5e0bbbe6183367fb77" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#2d391be364524b585c50f3b83f5ad238b4cb3360" dependencies = [ "anyhow", "async-broadcast", @@ -3096,7 +3096,7 @@ dependencies = [ [[package]] name = "hotshot-orchestrator" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4cc37458dfacfcdff340ef5e0bbbe6183367fb77" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#2d391be364524b585c50f3b83f5ad238b4cb3360" dependencies = [ "anyhow", "async-compatibility-layer", @@ -3126,7 +3126,7 @@ dependencies = [ [[package]] name = "hotshot-task" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4cc37458dfacfcdff340ef5e0bbbe6183367fb77" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#2d391be364524b585c50f3b83f5ad238b4cb3360" dependencies = [ "anyhow", "async-broadcast", @@ -3141,7 +3141,7 @@ dependencies = [ [[package]] name = "hotshot-task-impls" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4cc37458dfacfcdff340ef5e0bbbe6183367fb77" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#2d391be364524b585c50f3b83f5ad238b4cb3360" dependencies = [ "anyhow", "async-broadcast", @@ -3178,7 +3178,7 @@ dependencies = [ [[package]] name = "hotshot-types" version = "0.1.11" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4cc37458dfacfcdff340ef5e0bbbe6183367fb77" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#2d391be364524b585c50f3b83f5ad238b4cb3360" dependencies = [ "anyhow", "ark-bn254", @@ -4342,7 +4342,7 @@ dependencies = [ [[package]] name = "libp2p-networking" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4cc37458dfacfcdff340ef5e0bbbe6183367fb77" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#2d391be364524b585c50f3b83f5ad238b4cb3360" dependencies = [ "anyhow", "async-compatibility-layer", From 468334045e6e92d604bee2e17d7c39a290507fa1 Mon Sep 17 00:00:00 2001 From: Rob Date: Thu, 15 Aug 2024 08:59:42 -0400 Subject: [PATCH 4/6] bump HS --- Cargo.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0d953b3..66f650e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2969,7 +2969,7 @@ dependencies = [ [[package]] name = "hotshot" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#2d391be364524b585c50f3b83f5ad238b4cb3360" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#3ed0268a832bfb325c5582d13c8482ca6abe6e3f" dependencies = [ "anyhow", "async-broadcast", @@ -3016,7 +3016,7 @@ dependencies = [ [[package]] name = "hotshot-builder-api" version = "0.1.7" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#2d391be364524b585c50f3b83f5ad238b4cb3360" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#3ed0268a832bfb325c5582d13c8482ca6abe6e3f" dependencies = [ "async-trait", "clap", @@ -3063,7 +3063,7 @@ dependencies = [ [[package]] name = "hotshot-example-types" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#2d391be364524b585c50f3b83f5ad238b4cb3360" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#3ed0268a832bfb325c5582d13c8482ca6abe6e3f" dependencies = [ "anyhow", "async-broadcast", @@ -3096,7 +3096,7 @@ dependencies = [ [[package]] name = "hotshot-orchestrator" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#2d391be364524b585c50f3b83f5ad238b4cb3360" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#3ed0268a832bfb325c5582d13c8482ca6abe6e3f" dependencies = [ "anyhow", "async-compatibility-layer", @@ -3126,7 +3126,7 @@ dependencies = [ [[package]] name = "hotshot-task" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#2d391be364524b585c50f3b83f5ad238b4cb3360" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#3ed0268a832bfb325c5582d13c8482ca6abe6e3f" dependencies = [ "anyhow", "async-broadcast", @@ -3141,7 +3141,7 @@ dependencies = [ [[package]] name = "hotshot-task-impls" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#2d391be364524b585c50f3b83f5ad238b4cb3360" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#3ed0268a832bfb325c5582d13c8482ca6abe6e3f" dependencies = [ "anyhow", "async-broadcast", @@ -3178,7 +3178,7 @@ dependencies = [ [[package]] name = "hotshot-types" version = "0.1.11" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#2d391be364524b585c50f3b83f5ad238b4cb3360" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#3ed0268a832bfb325c5582d13c8482ca6abe6e3f" dependencies = [ "anyhow", "ark-bn254", @@ -4342,7 +4342,7 @@ dependencies = [ [[package]] name = "libp2p-networking" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#2d391be364524b585c50f3b83f5ad238b4cb3360" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#3ed0268a832bfb325c5582d13c8482ca6abe6e3f" dependencies = [ "anyhow", "async-compatibility-layer", From 873cb90ae229c47b8c4d7627d826c526b90a0ab7 Mon Sep 17 00:00:00 2001 From: Rob Date: Thu, 15 Aug 2024 13:37:09 -0400 Subject: [PATCH 5/6] bump HS --- Cargo.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 66f650e..2486153 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2969,7 +2969,7 @@ dependencies = [ [[package]] name = "hotshot" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#3ed0268a832bfb325c5582d13c8482ca6abe6e3f" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" dependencies = [ "anyhow", "async-broadcast", @@ -3016,7 +3016,7 @@ dependencies = [ [[package]] name = "hotshot-builder-api" version = "0.1.7" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#3ed0268a832bfb325c5582d13c8482ca6abe6e3f" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" dependencies = [ "async-trait", "clap", @@ -3063,7 +3063,7 @@ dependencies = [ [[package]] name = "hotshot-example-types" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#3ed0268a832bfb325c5582d13c8482ca6abe6e3f" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" dependencies = [ "anyhow", "async-broadcast", @@ -3096,7 +3096,7 @@ dependencies = [ [[package]] name = "hotshot-orchestrator" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#3ed0268a832bfb325c5582d13c8482ca6abe6e3f" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" dependencies = [ "anyhow", "async-compatibility-layer", @@ -3126,7 +3126,7 @@ dependencies = [ [[package]] name = "hotshot-task" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#3ed0268a832bfb325c5582d13c8482ca6abe6e3f" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" dependencies = [ "anyhow", "async-broadcast", @@ -3141,7 +3141,7 @@ dependencies = [ [[package]] name = "hotshot-task-impls" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#3ed0268a832bfb325c5582d13c8482ca6abe6e3f" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" dependencies = [ "anyhow", "async-broadcast", @@ -3178,7 +3178,7 @@ dependencies = [ [[package]] name = "hotshot-types" version = "0.1.11" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#3ed0268a832bfb325c5582d13c8482ca6abe6e3f" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" dependencies = [ "anyhow", "ark-bn254", @@ -4342,7 +4342,7 @@ dependencies = [ [[package]] name = "libp2p-networking" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#3ed0268a832bfb325c5582d13c8482ca6abe6e3f" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" dependencies = [ "anyhow", "async-compatibility-layer", From b39e9f8674a1cb9085703ee8bf59414f54756d4d Mon Sep 17 00:00:00 2001 From: Rob Date: Mon, 19 Aug 2024 09:57:00 -0400 Subject: [PATCH 6/6] bump HS --- Cargo.lock | 16 ++++++++-------- Cargo.toml | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2486153..5153d6b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2969,7 +2969,7 @@ dependencies = [ [[package]] name = "hotshot" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" dependencies = [ "anyhow", "async-broadcast", @@ -3016,7 +3016,7 @@ dependencies = [ [[package]] name = "hotshot-builder-api" version = "0.1.7" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" dependencies = [ "async-trait", "clap", @@ -3063,7 +3063,7 @@ dependencies = [ [[package]] name = "hotshot-example-types" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" dependencies = [ "anyhow", "async-broadcast", @@ -3096,7 +3096,7 @@ dependencies = [ [[package]] name = "hotshot-orchestrator" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" dependencies = [ "anyhow", "async-compatibility-layer", @@ -3126,7 +3126,7 @@ dependencies = [ [[package]] name = "hotshot-task" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" dependencies = [ "anyhow", "async-broadcast", @@ -3141,7 +3141,7 @@ dependencies = [ [[package]] name = "hotshot-task-impls" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" dependencies = [ "anyhow", "async-broadcast", @@ -3178,7 +3178,7 @@ dependencies = [ [[package]] name = "hotshot-types" version = "0.1.11" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" dependencies = [ "anyhow", "ark-bn254", @@ -4342,7 +4342,7 @@ dependencies = [ [[package]] name = "libp2p-networking" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" dependencies = [ "anyhow", "async-compatibility-layer", diff --git a/Cargo.toml b/Cargo.toml index f8743b2..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", branch = "bump/rc-0.5.71" } +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", branch = "bump/rc-0.5.71" } +hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.71" } portpicker = "0.1.1" surf-disco = "0.9"