crates

Cargo.toml

@@ -1,5 +1,8 @@
 [workspace]
 members = [
-    "bindings",
     "app",
+    "crates/bindings",
 ]
+
+[workspace.dependencies]
+bindings = { path = "crates/bindings" }

Makefile

@@ -5,21 +5,22 @@ default: build
 
 # Define variables
 CARGO=cargo
+CRATES_FOLDER=crates
 CONTRACTS_PATH=./contracts
 BINDINGS_FOLDER=bindings
+BINDINGS_CRATES_FOLDER=$(CRATES_FOLDER)/$(BINDINGS_FOLDER)
 BINDINGS_OUT_PATH=$(CONTRACTS_PATH)/out/$(BINDINGS_FOLDER)
 
 # Target for generating bindings
 bindings:
-# Remove old bindings
-	rm -rf $(BINDINGS_FOLDER)
+	rm -rf $(BINDINGS_CRATES_FOLDER)
 	rm -rf $(BINDINGS_OUT_PATH)
 
 # Generate new bindings
 	@forge bind --root $(CONTRACTS_PATH) --crate-name $(BINDINGS_FOLDER)
 
 # Move bindings to the correct location
-	@mv -f $(BINDINGS_OUT_PATH) .
+	@mv -f $(BINDINGS_OUT_PATH) $(CRATES_FOLDER)
 
 # Target for building the project
 build: bindings

app/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bindings = { path = "../bindings" }
+bindings = { workspace = true } 
 ethers = { version = "2", default-features = false, features = ["rustls"] }
 eyre = "0.6"
-tokio = { version = "1.19", features = ["macros", "rt-multi-thread"] }
+tokio = { version = "1.19", features = ["macros", "rt-multi-thread"] }

rustfmt.toml

@@ -6,6 +6,6 @@ imports_granularity = "Crate"
 wrap_comments = true
 comment_width = 100
 # ignore automatically generated bindings
-ignore = ["bindings/"]
+ignore = ["crates/bindings/"]
 
 # See more keys and their definitions at https://rust-lang.github.io/rustfmt