Merge pull request #1485 from EspressoSystems/keyao/merge

Sync with main

.github/workflows/build.yml

@@ -62,52 +62,19 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Generate docker metadata (libp2p)
+      - name: Generate docker metadata (web-server)
         uses: docker/metadata-action@v4
-        id: multi-machine-libp2p
+        id: web-server
         with:
-          images: ghcr.io/espressosystems/hotshot/multi-machine-libp2p
+          images: ghcr.io/espressosystems/hotshot/web-server
 
-      # Examples have been removed temporiraly, so the follwing workflows aren't applicable for now.
-
-      # - name: Build and push multi-machine-libp2p docker
-      #   uses: docker/build-push-action@v3
-      #   with:
-      #     context: ./
-      #     file: ./deploy/Dockerfile
-      #     platforms: linux/amd64
-      #     push: ${{ github.event_name != 'pull_request' }}
-      #     tags: ${{ steps.multi-machine-libp2p.outputs.tags }}
-      #     labels: ${{ steps.multi-machine-libp2p.outputs.labels }}
-
-      # - name: Generate docker metadata (centralized)
-      #   uses: docker/metadata-action@v4
-      #   id: multi-machine-centralized
-      #   with:
-      #     images: ghcr.io/espressosystems/hotshot/multi-machine-centralized
-
-      # - name: Build and push multi-machine-centralized docker
-      #   uses: docker/build-push-action@v3
-      #   with:
-      #     context: ./
-      #     file: ./deploy/multi-machine-centralized.Dockerfile
-      #     platforms: linux/amd64
-      #     push: ${{ github.event_name != 'pull_request' }}
-      #     tags: ${{ steps.multi-machine-centralized.outputs.tags }}
-      #     labels: ${{ steps.multi-machine-centralized.outputs.labels }}
-
-      # - name: Generate docker metadata (centralized vrf)
-      #   uses: docker/metadata-action@v4
-      #   id: multi-machine-vrf-centralized
-      #   with:
-      #     images: ghcr.io/espressosystems/hotshot/multi-machine-vrf-centralized
+      - name: Build and push web-server docker
+        uses: docker/build-push-action@v4
+        with:
+          context: ./
+          file: ./deploy/web-server.Dockerfile
+          platforms: linux/amd64
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.web-server.outputs.tags }}
+          labels: ${{ steps.web-server.outputs.labels }}
 
-      # - name: Build and push multi-machine-vrf-centralized docker
-      #   uses: docker/build-push-action@v3
-      #   with:
-      #     context: ./
-      #     file: ./deploy/multi-machine-vrf-centralized.Dockerfile
-      #     platforms: linux/amd64
-      #     push: ${{ github.event_name != 'pull_request' }}
-      #     tags: ${{ steps.multi-machine-vrf-centralized.outputs.tags }}
-      #     labels: ${{ steps.multi-machine-vrf-centralized.outputs.labels }}

.github/workflows/build_nix.yml

@@ -17,7 +17,7 @@ jobs:
           access_token: ${{ github.token }}
 
       - name: Install Nix
-        uses: cachix/install-nix-action@v21
+        uses: cachix/install-nix-action@v22
 
       - name: Checkout Repository
         uses: actions/checkout@v3

.github/workflows/careful.yml

@@ -12,7 +12,7 @@ jobs:
     timeout-minutes: 120
     steps:
       - name: Install Nix
-        uses: cachix/install-nix-action@v21
+        uses: cachix/install-nix-action@v22
 
       - name: Checkout Repository
         uses: actions/checkout@v3

.github/workflows/coverage.yml

@@ -16,7 +16,7 @@ jobs:
           access_token: ${{ github.token }}
 
       - name: Install Nix
-        uses: cachix/install-nix-action@v21
+        uses: cachix/install-nix-action@v22
 
       - name: Checkout Repository
         uses: actions/checkout@v3

.github/workflows/update_nix.yml

@@ -12,7 +12,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Install Nix
-        uses: cachix/install-nix-action@v21
+        uses: cachix/install-nix-action@v22
         with:
           extra_nix_config: |
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}

Cargo.toml

@@ -151,14 +151,14 @@ ark-std = { version = "0.4.0" }
 async-compatibility-layer = { git = "https://github.com/EspressoSystems/async-compatibility-layer.git", tag = "1.3.0", default-features = false, features = [ "logging-utils" ] }
 async-lock = "2.7"
 async-std = { version = "1.12", optional = true }
-async-trait = "0.1.68"
+async-trait = "0.1.71"
 bimap = "0.6.3"
 bincode = "1.3.3"
-blake3 = { version = "1.4.0", optional = true, features = ["traits-preview"] }
+blake3 = { version = "1.4.1", optional = true, features = ["traits-preview"] }
 clap = { version = "4.3", features = ["derive", "env"], optional = true }
 commit = { git = "https://github.com/EspressoSystems/commit", tag = "0.2.2" }
 custom_debug = "0.5"
-dashmap = "5.3.4"
+dashmap = "5.5.0"
 derivative = { version = "2.2.0", optional = true }
 digest = "0.10.7"
 either = { version = "1.8.1", features = [ "serde" ] }
@@ -202,14 +202,14 @@ libp2p = { version = "0.52.0", default-features = false, features = [
         "yamux",
 ] }
 nll = { git = "https://github.com/EspressoSystems/nll.git" }
-num = "0.4.0"
+num = "0.4.1"
 rand = "0.8.5"
 rand_chacha = "0.3.1"
-serde = { version = "1.0.164", features = ["derive", "rc"] }
-snafu = "0.7.4"
+serde = { version = "1.0.171", features = ["derive", "rc"] }
+snafu = "0.7.5"
 surf-disco = { git = "https://github.com/EspressoSystems/surf-disco.git", branch = "main" }
-time = "0.3.22"
-toml = { version = "0.7.4", optional = true }
+time = "0.3.23"
+toml = { version = "0.7.6", optional = true }
 tokio = { version = "1", optional = true, features = [
         "fs",
         "io-util",
@@ -231,9 +231,9 @@ tracing = "0.1.37"
 [dev-dependencies]
 async-std = { version = "1.12.0", features = ["attributes"] }
 clap = { version = "4.3", features = ["derive", "env"] }
-serde_json = "1.0.96"
-sha2 = { version = "0.10.1" }
-toml = "0.7.4"
+serde_json = "1.0.103"
+sha2 = { version = "0.10.7" }
+toml = "0.7.6"
 
 ### Profiles
 ###

README.md

@@ -1,3 +1,7 @@
+# License
+## Copyright
+**(c) 2022 Espresso Systems**.
+`HotShot` was developed by Espresso Systems. While we plan to adopt an open source license, we have not yet selected one. As such, all rights are reserved for the time being. Please reach out to us if you have thoughts on licensing.
 # HotShot Consensus Module
 
 HotShot is a BFT consensus protocol based off of HotStuff, with the addition of proof-of-stake and
@@ -244,8 +248,3 @@ NOTE: Do NOT configure dap at all with rust-tools. Do it manually.
 ## Vscode
 
 Install the extension and load the `launch.json` file. Then run the desired test target.
-
-# License
-
-## Copyright
-`HotShot` was developed by Espresso Systems. While we plan to adopt an open source license, we have not yet selected one. As such, all rights are reserved for the time being. Please reach out to us if you have thoughts on licensing.

centralized_server/Cargo.toml

@@ -28,7 +28,7 @@ channel-async-std = [
 [dependencies]
 async-compatibility-layer = { git = "https://github.com/EspressoSystems/async-compatibility-layer.git", tag = "1.3.0", default-features = false }
 async-std = { version = "1.12", optional = true }
-async-trait = "0.1.68"
+async-trait = "0.1.71"
 bincode = "1.3.3"
 commit = { git = "https://github.com/EspressoSystems/commit", tag = "0.2.2" }
 futures = "0.3.28"
@@ -52,7 +52,7 @@ tokio = { version = "1", optional = true, features = [
     "tracing",
 ] }
 tracing = "0.1.37"
-serde = { version = "1.0.164", features = ["derive"] }
-serde_json = "1.0.96"
-snafu = "0.7.4"
-toml = "0.7.4"
+serde = { version = "1.0.171", features = ["derive"] }
+serde_json = "1.0.103"
+snafu = "0.7.5"
+toml = "0.7.6"

consensus/Cargo.toml

@@ -30,7 +30,7 @@ channel-async-std = [
 async-compatibility-layer = { git = "https://github.com/EspressoSystems/async-compatibility-layer.git", tag = "1.3.0", default-features = false, features = [ "logging-utils" ] }
 async-lock = "2.7"
 async-std = { version = "1.12", optional = true }
-async-trait = "0.1.68"
+async-trait = "0.1.71"
 # TODO ed: Delete this dependency after https://github.com/EspressoSystems/HotShot/issues/614 is finished
 bincode = "1.3.3"
 commit = { git = "https://github.com/EspressoSystems/commit", tag = "0.2.2" }
@@ -40,7 +40,7 @@ either = { version = "1.8.1" }
 futures = "0.3.28"
 hotshot-types = { path = "../types", default-features = false }
 hotshot-utils = { path = "../utils"}
-snafu = "0.7.4"
+snafu = "0.7.5"
 tokio = { version = "1", optional = true, features = [
     "fs",
     "io-util",
@@ -57,4 +57,4 @@ tokio = { version = "1", optional = true, features = [
     "tracing",
 ] }
 tracing = "0.1.37"
-time = "0.3.22"
+time = "0.3.23"

deploy/web-server.Dockerfile

@@ -0,0 +1,8 @@
+# NOTE run from parent directory
+FROM ubuntu:jammy
+
+COPY target/release-lto/examples/web-server /bin/web-server
+
+EXPOSE 9000
+
+CMD ["web-server"]