feat(zint): support foundry tests (#328)

* feat(zint): add initial implementation of Zink testing utilities and CLI

* feat(zint): update Ztest testing utilities and correct path

* feat(zint): support foundry tests

* fix(ci): remove unnecessary feat

* feat(zint): support foundry tests

* feat(zint): support foundry tests

---------

Co-authored-by: g4titanx <g4titan1@gmail.com>

Author: BiliqisO

.github/workflows/main.yml

@@ -25,6 +25,11 @@ jobs:
       - name: Build Examples
         run: cargo build --examples --target wasm32-unknown-unknown --release
 
+      - name: Build and Install zint-cli
+        run: |
+          cargo build --release -p zint-cli
+          cargo install --path crates/zint/cli
+
       - name: Run Tests
         run: cargo nextest run --workspace --no-fail-fast --release
 
@@ -33,10 +38,17 @@ jobs:
 
       - name: Test Elko Addition Example
         run: |
-            cargo run -p elko -- new addition
-            cd addition
-            cargo run -p elko --manifest-path ../Cargo.toml -- build
-            cargo test
+          cargo run -p elko -- new addition
+          cd addition
+          cargo run -p elko --manifest-path ../Cargo.toml -- build
+          cargo test
+
+      - name: Test Foundry Integration
+        run: |
+          cd crates/zint/storage
+          forge build
+          cargo zint new
+          cargo zint run
 
   check:
     name: Check

Cargo.lock

@@ -7,12 +7,13 @@ members = [
   "codegen",
   "compiler",
   "compiler/filetests",
+  "crates/zint",
+  "crates/zint/cli",
   "evm/opcodes",
   "evm/abi",
   "zink/abi",
   "zink/codegen",
   "zink/elko",
-  "zink/zint",
   "zink/abi-macro",
 ]
 resolver = "2"
@@ -28,6 +29,7 @@ repository = "https://github.com/clearloop/zink.git"
 [workspace.dependencies]
 anyhow = "1.0.79"
 cargo_metadata = "0.18.1"
+clap = { version = "4.5.35", features = ["derive"] }
 ccli = "0.0.1"
 colored = "2.1.0"
 etc = "0.1.19"
@@ -71,7 +73,7 @@ zink = { path = ".", version = "0.1.12" }
 zink-abi-macro = { path = "zink/abi-macro", version = "0.1.12" }
 zink-codegen = { path = "zink/codegen", version = "0.1.12" }
 zinkc = { path = "compiler", version = "0.1.12" }
-zint = { path = "zink/zint", version = "0.1.12" }
+zint = { path = "crates/zint", version = "0.1.12" }
 
 [workspace.metadata.conta]
 packages = [
@@ -83,6 +85,7 @@ packages = [
   "zink-codegen",
   "zink-abi-macro",
   "zink",
+  "cargo-zint",
   "elko",
 ]
 
@@ -111,6 +114,7 @@ zink-codegen.workspace = true
 zink-abi-macro = { workspace = true, optional = true }
 zabi.workspace = true
 smallvec.workspace = true
+clap.workspace = true
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 tiny-keccak.workspace = true

Cargo.toml

@@ -0,0 +1,29 @@
+[package]
+name = "zint-cli"
+description = "CLI tool for Zink testing with Foundry projects"
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+homepage.workspace = true
+repository.workspace = true
+
+[[bin]]
+name = "cargo-zint"
+path = "src/main.rs"
+
+[dependencies]
+anyhow.workspace = true
+cargo_metadata.workspace = true
+clap.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+toml.workspace = true
+zint.workspace = true
+zink.workspace = true
+
+[dev-dependencies]
+tempfile.workspace = true
+
+[build-dependencies]
+cargo_metadata.workspace = true

zink/zint/Cargo.toml renamed to crates/zint/Cargo.toml

@@ -0,0 +1,23 @@
+use cargo_metadata::MetadataCommand;
+
+fn main() {
+    // Rerun the build script if Cargo.toml changes
+    println!("cargo:rerun-if-changed=Cargo.toml");
+
+    // Fetch metadata from the workspace
+    let metadata = MetadataCommand::new()
+        .manifest_path("Cargo.toml")
+        .exec()
+        .expect("Failed to fetch cargo metadata");
+
+    // Find the zink package in the workspace
+    let zink_version = metadata
+        .packages
+        .iter()
+        .find(|p| p.name == "zink")
+        .map(|p| p.version.to_string())
+        .expect("Could not find zink dependency in metadata");
+
+    // Emit the version as a cargo key-value pair
+    println!("cargo:ZINK_VERSION={}", zink_version);
+}