add to workspace crates + CI workflow

EspressoSystems · Feb 12, 2025 · 012494b · 012494b
1 parent 83b0ee9
commit 012494b
Show file tree

Hide file tree

Showing 26 changed files with 64 additions and 0 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -20,6 +20,21 @@ env:
   RUST_LOG: info,libp2p=off
 
 jobs:
+  verify-workspace-hack:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        name: Checkout Repository
+
+      - name: Install cargo-hakari from crates.io
+        uses: baptiste0928/cargo-install@v3
+        with:
+          crate: cargo-hakari
+
+      - name: Run cargo-hakari
+        run: |
+          cargo hakari generate --diff
+
   lint:
     runs-on: ubuntu-latest
     steps:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/builder/Cargo.toml b/builder/Cargo.toml
@@ -32,6 +32,7 @@ tracing = { workspace = true }
 url = { workspace = true }
 vbs = { workspace = true }
 vec1 = { workspace = true }
+workspace-hack = { version = "0.1", path = "../workspace-hack" }
 
 [dev-dependencies]
 jf-signature = { workspace = true, features = ["bls"] }

diff --git a/client/Cargo.toml b/client/Cargo.toml
@@ -15,3 +15,4 @@ surf-disco = { workspace = true }
 tokio = { workspace = true }
 tracing = { workspace = true }
 vbs = { workspace = true }
+workspace-hack = { version = "0.1", path = "../workspace-hack" }
diff --git a/contract-bindings-alloy/Cargo.toml b/contract-bindings-alloy/Cargo.toml
@@ -5,3 +5,4 @@ edition = "2021"
 
 [dependencies]
 alloy = { workspace = true }
+workspace-hack = { version = "0.1", path = "../workspace-hack" }
diff --git a/contract-bindings-ethers/Cargo.toml b/contract-bindings-ethers/Cargo.toml
@@ -7,3 +7,4 @@ edition = "2021"
 [dependencies]
 ethers = { version = "2", default-features = false, features = ["abigen"] }
 serde = "1"
+workspace-hack = { version = "0.1", path = "../workspace-hack" }
diff --git a/contracts/rust/adapter/Cargo.toml b/contracts/rust/adapter/Cargo.toml
@@ -26,6 +26,7 @@ jf-utils = { workspace = true }
 num-bigint = { version = "0.4", default-features = false }
 num-traits = { version = "0.2", default-features = false }
 serde = { workspace = true }
+workspace-hack = { version = "0.1", path = "../../../workspace-hack" }
 
 [dev-dependencies]
 rand = { workspace = true }

diff --git a/contracts/rust/diff-test/Cargo.toml b/contracts/rust/diff-test/Cargo.toml
@@ -22,6 +22,7 @@ jf-plonk = { workspace = true }
 jf-signature = { workspace = true }
 jf-utils = { workspace = true }
 sha3 = { version = "0.10.8", default-features = false }
+workspace-hack = { version = "0.1", path = "../../../workspace-hack" }
 
 [[bin]]
 name = "diff-test"

diff --git a/contracts/rust/gen-vk-contract/Cargo.toml b/contracts/rust/gen-vk-contract/Cargo.toml
@@ -13,3 +13,4 @@ hotshot-contract-adapter = { workspace = true }
 hotshot-stake-table = { workspace = true }
 hotshot-state-prover = { workspace = true }
 jf-pcs = { workspace = true }
+workspace-hack = { version = "0.1", path = "../../../workspace-hack" }
diff --git a/ethers-conv/Cargo.toml b/ethers-conv/Cargo.toml
@@ -7,3 +7,4 @@ edition = { workspace = true }
 [dependencies]
 alloy = { workspace = true }
 ethers = { workspace = true }
+workspace-hack = { version = "0.1", path = "../workspace-hack" }
diff --git a/flake.nix b/flake.nix
@@ -195,6 +195,7 @@
             cargo-audit
             cargo-edit
             cargo-hack
+            cargo-hakari
             cargo-nextest
             cargo-sort
             typos

diff --git a/hotshot-builder-core-refactored/Cargo.toml b/hotshot-builder-core-refactored/Cargo.toml
@@ -29,6 +29,7 @@ tokio = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true }
 vbs = { workspace = true }
+workspace-hack = { version = "0.1", path = "../workspace-hack" }
 
 [dev-dependencies]
 hotshot-example-types = { workspace = true }

diff --git a/hotshot-builder-core/Cargo.toml b/hotshot-builder-core/Cargo.toml
@@ -29,6 +29,7 @@ tokio = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true }
 vbs = { workspace = true }
+workspace-hack = { version = "0.1", path = "../workspace-hack" }
 
 [dev-dependencies]
 hotshot-example-types = { workspace = true }

diff --git a/hotshot-events-service/Cargo.toml b/hotshot-events-service/Cargo.toml
@@ -21,6 +21,7 @@ toml = { workspace = true }
 tracing = { workspace = true }
 tracing-test = "0.2"
 vbs = { workspace = true }
+workspace-hack = { version = "0.1", path = "../workspace-hack" }
 
 [dev-dependencies]
 hotshot-example-types = { workspace = true }

diff --git a/hotshot-query-service/Cargo.toml b/hotshot-query-service/Cargo.toml
@@ -118,6 +118,7 @@ hotshot-example-types = { workspace = true }
 portpicker = { version = "0.1", optional = true }
 rand = { version = "0.8", optional = true }
 tempfile = { version = "3.10", optional = true }
+workspace-hack = { version = "0.1", path = "../workspace-hack" }
 
 # Dependencies enabled by feature "backtrace-on-stack-overflow".
 #

diff --git a/hotshot-state-prover/Cargo.toml b/hotshot-state-prover/Cargo.toml
@@ -41,6 +41,7 @@ toml = "0.8"
 tracing = { workspace = true }
 url = { workspace = true }
 vbs = { workspace = true }
+workspace-hack = { version = "0.1", path = "../workspace-hack" }
 
 [dev-dependencies]
 sequencer-utils = { path = "../utils", features = ["testing"] }

diff --git a/marketplace-builder-core/Cargo.toml b/marketplace-builder-core/Cargo.toml
@@ -23,6 +23,7 @@ tokio = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true }
 vbs = { workspace = true }
+workspace-hack = { version = "0.1", path = "../workspace-hack" }
 
 [dev-dependencies]
 hotshot-example-types = { workspace = true }

diff --git a/marketplace-builder-shared/Cargo.toml b/marketplace-builder-shared/Cargo.toml
@@ -36,6 +36,7 @@ tracing-subscriber = { workspace = true }
 url = { workspace = true }
 vbs = { workspace = true }
 vec1 = { workspace = true }
+workspace-hack = { version = "0.1", path = "../workspace-hack" }
 
 [dev-dependencies]
 portpicker = { workspace = true }

diff --git a/marketplace-builder/Cargo.toml b/marketplace-builder/Cargo.toml
@@ -42,6 +42,7 @@ tokio = { workspace = true }
 tracing = { workspace = true }
 url = { workspace = true }
 vbs = { workspace = true }
+workspace-hack = { version = "0.1", path = "../workspace-hack" }
 
 [dev-dependencies]
 hotshot-query-service = { workspace = true }

diff --git a/marketplace-solver/Cargo.toml b/marketplace-solver/Cargo.toml
@@ -32,6 +32,7 @@ tokio = { workspace = true }
 toml = { workspace = true }
 tracing = { workspace = true }
 vbs = { workspace = true }
+workspace-hack = { version = "0.1", path = "../workspace-hack" }
 
 [dev-dependencies]
 marketplace-solver = { path = ".", features = [ "testing" ] }

diff --git a/node-metrics/Cargo.toml b/node-metrics/Cargo.toml
@@ -38,3 +38,4 @@ toml = { workspace = true }
 tracing = { workspace = true }
 url = { workspace = true }
 vbs = { workspace = true }
+workspace-hack = { version = "0.1", path = "../workspace-hack" }
diff --git a/request-response/Cargo.toml b/request-response/Cargo.toml
@@ -22,3 +22,4 @@ thiserror = { workspace = true }
 tokio = { workspace = true }
 tokio-util = { version = "0.7", default-features = false, features = ["rt"] }
 tracing = { workspace = true }
+workspace-hack = { version = "0.1", path = "../workspace-hack" }
diff --git a/sequencer/Cargo.toml b/sequencer/Cargo.toml
@@ -123,6 +123,7 @@ tracing-subscriber = { workspace = true }
 url = { workspace = true }
 vbs = { workspace = true }
 vec1 = { workspace = true }
+workspace-hack = { version = "0.1", path = "../workspace-hack" }
 
 [package.metadata.cargo-udeps.ignore]
 normal = ["hotshot-testing"]

diff --git a/tests/Cargo.toml b/tests/Cargo.toml
@@ -20,3 +20,6 @@ reqwest = { workspace = true, features = ["json"] }
 surf-disco = { workspace = true }
 tokio = { workspace = true }
 vbs = { workspace = true }
+
+[dependencies]
+workspace-hack = { version = "0.1", path = "../workspace-hack" }
diff --git a/types/Cargo.toml b/types/Cargo.toml
@@ -56,6 +56,7 @@ tower-service = { version = "0.3", default-features = false }
 tracing = { workspace = true }
 url = { workspace = true }
 vbs = { workspace = true }
+workspace-hack = { version = "0.1", path = "../workspace-hack" }
 
 [dev-dependencies]
 espresso-types = { path = ".", features = [ "testing" ] }

diff --git a/utils/Cargo.toml b/utils/Cargo.toml
@@ -37,3 +37,4 @@ toml = { workspace = true }
 tower-service = { workspace = true }
 tracing = "0.1.37"
 url = "2.3.1"
+workspace-hack = { version = "0.1", path = "../workspace-hack" }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,3 +5,4 @@ edition = "2021"

		[dependencies]
		alloy = { workspace = true }
		workspace-hack = { version = "0.1", path = "../workspace-hack" }