ci: update version string in docs

2026-01-13 16:27:59 -05:00 · 2024-05-13 03:41:40 +00:00
25 changed files with 278 additions and 493 deletions
--- a/.github/workflows/engine.yml
+++ b/.github/workflows/engine.yml
@@ -178,58 +178,3 @@ jobs:
          npm publish
        env:
          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-
-
-  in-browser-evm-ver-publish:
-    name: publish-in-browser-evm-verifier-package
-    needs: [publish-wasm-bindings]
-    runs-on: ubuntu-latest
-    if: startsWith(github.ref, 'refs/tags/')
-    steps:
-      - uses: actions/checkout@v4
-      - name: Update version in package.json
-        shell: bash
-        env:
-          RELEASE_TAG: ${{ github.ref_name }}
-        run: |
-          sed -i "s|\"version\": \".*\"|\"version\": \"${{ github.ref_name }}\"|" in-browser-evm-verifier/package.json
-      - name: Prepare tag and fetch package integrity
-        run: |
-          CLEANED_TAG=${{ github.ref_name }} # Get the tag from ref_name
-          CLEANED_TAG="${CLEANED_TAG#v}" # Remove leading 'v'
-          echo "CLEANED_TAG=${CLEANED_TAG}" >> $GITHUB_ENV # Set it as an environment variable for later steps
-          ENGINE_INTEGRITY=$(npm view @ezkljs/engine@$CLEANED_TAG dist.integrity)
-          echo "ENGINE_INTEGRITY=$ENGINE_INTEGRITY" >> $GITHUB_ENV
-      - name: Update @ezkljs/engine version in package.json
-        shell: bash
-        env:
-          RELEASE_TAG: ${{ github.ref_name }}
-        run: |
-          sed -i "s|\"@ezkljs/engine\": \".*\"|\"@ezkljs/engine\": \"$CLEANED_TAG\"|" in-browser-evm-verifier/package.json
-      - name: Update the engine import in in-browser-evm-verifier to use @ezkljs/engine package instead of the local one;
-        run: |
-          sed -i "s|import { encodeVerifierCalldata } from '../nodejs/ezkl';|import { encodeVerifierCalldata } from '@ezkljs/engine';|" in-browser-evm-verifier/src/index.ts
-      - name: Update pnpm-lock.yaml versions and integrity
-        run: |
-          awk -v integrity="$ENGINE_INTEGRITY" -v tag="$CLEANED_TAG" '
-          NR==30{$0="    specifier: \"" tag "\""}
-          NR==31{$0="    version: \"" tag "\""}
-          NR==400{$0="  /@ezkljs/engine@" tag ":"}
-          NR==401{$0="    resolution: {integrity: \"" integrity "\"}"} 1' in-browser-evm-verifier/pnpm-lock.yaml > temp.yaml && mv temp.yaml in-browser-evm-verifier/pnpm-lock.yaml  
-      - name: Use pnpm 8
-        uses: pnpm/action-setup@v2
-        with:
-          version: 8
-      - name: Set up Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: "18.12.1"
-          registry-url: "https://registry.npmjs.org"
-      - name: Publish to npm
-        run: |
-          cd in-browser-evm-verifier
-          pnpm install --frozen-lockfile
-          pnpm run build
-          pnpm publish --no-git-checks
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}  
--- a/.github/workflows/pypi.yml
+++ b/.github/workflows/pypi.yml
@@ -50,7 +50,6 @@ jobs:
          target: ${{ matrix.target }}
          args: --release --out dist --features python-bindings
      - name: Install built wheel
-        if: matrix.target == 'universal2-apple-darwin'
        run: |
          pip install ezkl --no-index --find-links dist --force-reinstall
          python -c "import ezkl"
@@ -111,7 +110,7 @@ jobs:
    if: startsWith(github.ref, 'refs/tags/')
    strategy:
      matrix:
-        target: [x86_64]
+        target: [x86_64, i686]
    steps:
      - uses: actions/checkout@v4
      - uses: actions/setup-python@v4
--- a/.github/workflows/verify.yml
+++ b/.github/workflows/verify.yml
@@ -0,0 +1,65 @@
+name: Build and Publish EZKL npm packages (wasm bindings and in-browser evm verifier)
+
+on:
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: "The tag to release"
+        required: true
+  push:
+    tags:
+      - "*"
+
+defaults:
+  run:
+    working-directory: .
+jobs:
+  in-browser-evm-ver-publish:
+    name: publish-in-browser-evm-verifier-package
+    runs-on: ubuntu-latest
+    if: startsWith(github.ref, 'refs/tags/')
+    steps:
+      - uses: actions/checkout@v4
+      - name: Update version in package.json
+        shell: bash
+        env:
+          RELEASE_TAG: ${{ github.ref_name }}
+        run: |
+          sed -i "s|\"version\": \".*\"|\"version\": \"${{ github.ref_name }}\"|" in-browser-evm-verifier/package.json
+      - name: Update @ezkljs/engine version in package.json
+        shell: bash
+        env:
+          RELEASE_TAG: ${{ github.ref_name }}
+        run: |
+          sed -i "s|\"@ezkljs/engine\": \".*\"|\"@ezkljs/engine\": \"${{ github.ref_name#v }}\"|" in-browser-evm-verifier/package.json
+      - name: Update the engine import in in-browser-evm-verifier to use @ezkljs/engine package instead of the local one;
+        run: |
+          sed -i "s|import { encodeVerifierCalldata } from '../nodejs/ezkl';|import { encodeVerifierCalldata } from '@ezkljs/engine';|" in-browser-evm-verifier/src/index.ts
+      - name: Fetch integrity
+        run: |
+          ENGINE_INTEGRITY=$(npm view @ezkljs/engine@${{ github.ref_name#v }} dist.integrity)
+          echo "ENGINE_INTEGRITY=$ENGINE_INTEGRITY" >> $GITHUB_ENV
+      - name: Update pnpm-lock.yaml versions and integrity
+        run: |
+          awk -v integrity="$ENGINE_INTEGRITY" -v tag="${{ github.ref_name#v }}" '
+          NR==30{$0="    specifier: \"" tag "\""}
+          NR==31{$0="    version: \"" tag "\""}
+          NR==400{$0="  /@ezkljs/engine@" tag ":"}
+          NR==401{$0="    resolution: {integrity: \"" integrity "\"}"} 1' in-browser-evm-verifier/pnpm-lock.yaml > temp.yaml && mv temp.yaml in-browser-evm-verifier/pnpm-lock.yaml  
+      - name: Use pnpm 8
+        uses: pnpm/action-setup@v2
+        with:
+          version: 8
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: "18.12.1"
+          registry-url: "https://registry.npmjs.org"
+      - name: Publish to npm
+        run: |
+          cd in-browser-evm-verifier
+          pnpm install --frozen-lockfile
+          pnpm run build
+          pnpm publish
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -58,7 +58,7 @@ checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
 [[package]]
 name = "alloy"
 version = "0.1.0"
-source = "git+https://github.com/alloy-rs/alloy?rev=5fbf57bac99edef9d8475190109a7ea9fb7e5e83#5fbf57bac99edef9d8475190109a7ea9fb7e5e83"
+source = "git+https://github.com/alloy-rs/alloy#e60d64cff86d995657f0acea85c2bbd52f9bd810"
 dependencies = [
 "alloy-consensus",
 "alloy-contract",
@@ -80,7 +80,7 @@ dependencies = [
 [[package]]
 name = "alloy-consensus"
 version = "0.1.0"
-source = "git+https://github.com/alloy-rs/alloy?rev=5fbf57bac99edef9d8475190109a7ea9fb7e5e83#5fbf57bac99edef9d8475190109a7ea9fb7e5e83"
+source = "git+https://github.com/alloy-rs/alloy#e60d64cff86d995657f0acea85c2bbd52f9bd810"
 dependencies = [
 "alloy-eips",
 "alloy-primitives 0.7.2",
@@ -93,7 +93,7 @@ dependencies = [
 [[package]]
 name = "alloy-contract"
 version = "0.1.0"
-source = "git+https://github.com/alloy-rs/alloy?rev=5fbf57bac99edef9d8475190109a7ea9fb7e5e83#5fbf57bac99edef9d8475190109a7ea9fb7e5e83"
+source = "git+https://github.com/alloy-rs/alloy#e60d64cff86d995657f0acea85c2bbd52f9bd810"
 dependencies = [
 "alloy-dyn-abi",
 "alloy-json-abi",
@@ -140,7 +140,7 @@ dependencies = [
 [[package]]
 name = "alloy-eips"
 version = "0.1.0"
-source = "git+https://github.com/alloy-rs/alloy?rev=5fbf57bac99edef9d8475190109a7ea9fb7e5e83#5fbf57bac99edef9d8475190109a7ea9fb7e5e83"
+source = "git+https://github.com/alloy-rs/alloy#e60d64cff86d995657f0acea85c2bbd52f9bd810"
 dependencies = [
 "alloy-primitives 0.7.2",
 "alloy-rlp",
@@ -154,7 +154,7 @@ dependencies = [
 [[package]]
 name = "alloy-genesis"
 version = "0.1.0"
-source = "git+https://github.com/alloy-rs/alloy?rev=5fbf57bac99edef9d8475190109a7ea9fb7e5e83#5fbf57bac99edef9d8475190109a7ea9fb7e5e83"
+source = "git+https://github.com/alloy-rs/alloy#e60d64cff86d995657f0acea85c2bbd52f9bd810"
 dependencies = [
 "alloy-primitives 0.7.2",
 "alloy-serde",
@@ -177,7 +177,7 @@ dependencies = [
 [[package]]
 name = "alloy-json-rpc"
 version = "0.1.0"
-source = "git+https://github.com/alloy-rs/alloy?rev=5fbf57bac99edef9d8475190109a7ea9fb7e5e83#5fbf57bac99edef9d8475190109a7ea9fb7e5e83"
+source = "git+https://github.com/alloy-rs/alloy#e60d64cff86d995657f0acea85c2bbd52f9bd810"
 dependencies = [
 "alloy-primitives 0.7.2",
 "serde",
@@ -189,7 +189,7 @@ dependencies = [
 [[package]]
 name = "alloy-network"
 version = "0.1.0"
-source = "git+https://github.com/alloy-rs/alloy?rev=5fbf57bac99edef9d8475190109a7ea9fb7e5e83#5fbf57bac99edef9d8475190109a7ea9fb7e5e83"
+source = "git+https://github.com/alloy-rs/alloy#e60d64cff86d995657f0acea85c2bbd52f9bd810"
 dependencies = [
 "alloy-consensus",
 "alloy-eips",
@@ -206,7 +206,7 @@ dependencies = [
 [[package]]
 name = "alloy-node-bindings"
 version = "0.1.0"
-source = "git+https://github.com/alloy-rs/alloy?rev=5fbf57bac99edef9d8475190109a7ea9fb7e5e83#5fbf57bac99edef9d8475190109a7ea9fb7e5e83"
+source = "git+https://github.com/alloy-rs/alloy#e60d64cff86d995657f0acea85c2bbd52f9bd810"
 dependencies = [
 "alloy-genesis",
 "alloy-primitives 0.7.2",
@@ -261,7 +261,7 @@ dependencies = [
 [[package]]
 name = "alloy-provider"
 version = "0.1.0"
-source = "git+https://github.com/alloy-rs/alloy?rev=5fbf57bac99edef9d8475190109a7ea9fb7e5e83#5fbf57bac99edef9d8475190109a7ea9fb7e5e83"
+source = "git+https://github.com/alloy-rs/alloy#e60d64cff86d995657f0acea85c2bbd52f9bd810"
 dependencies = [
 "alloy-eips",
 "alloy-json-rpc",
@@ -281,7 +281,6 @@ dependencies = [
 "futures",
 "futures-utils-wasm",
 "lru",
- "pin-project",
 "reqwest",
 "serde_json",
 "tokio",
@@ -314,7 +313,7 @@ dependencies = [
 [[package]]
 name = "alloy-rpc-client"
 version = "0.1.0"
-source = "git+https://github.com/alloy-rs/alloy?rev=5fbf57bac99edef9d8475190109a7ea9fb7e5e83#5fbf57bac99edef9d8475190109a7ea9fb7e5e83"
+source = "git+https://github.com/alloy-rs/alloy#e60d64cff86d995657f0acea85c2bbd52f9bd810"
 dependencies = [
 "alloy-json-rpc",
 "alloy-transport",
@@ -334,7 +333,7 @@ dependencies = [
 [[package]]
 name = "alloy-rpc-types"
 version = "0.1.0"
-source = "git+https://github.com/alloy-rs/alloy?rev=5fbf57bac99edef9d8475190109a7ea9fb7e5e83#5fbf57bac99edef9d8475190109a7ea9fb7e5e83"
+source = "git+https://github.com/alloy-rs/alloy#e60d64cff86d995657f0acea85c2bbd52f9bd810"
 dependencies = [
 "alloy-consensus",
 "alloy-eips",
@@ -352,7 +351,7 @@ dependencies = [
 [[package]]
 name = "alloy-rpc-types-trace"
 version = "0.1.0"
-source = "git+https://github.com/alloy-rs/alloy?rev=5fbf57bac99edef9d8475190109a7ea9fb7e5e83#5fbf57bac99edef9d8475190109a7ea9fb7e5e83"
+source = "git+https://github.com/alloy-rs/alloy#e60d64cff86d995657f0acea85c2bbd52f9bd810"
 dependencies = [
 "alloy-primitives 0.7.2",
 "alloy-rpc-types",
@@ -364,7 +363,7 @@ dependencies = [
 [[package]]
 name = "alloy-serde"
 version = "0.1.0"
-source = "git+https://github.com/alloy-rs/alloy?rev=5fbf57bac99edef9d8475190109a7ea9fb7e5e83#5fbf57bac99edef9d8475190109a7ea9fb7e5e83"
+source = "git+https://github.com/alloy-rs/alloy#e60d64cff86d995657f0acea85c2bbd52f9bd810"
 dependencies = [
 "alloy-primitives 0.7.2",
 "serde",
@@ -374,7 +373,7 @@ dependencies = [
 [[package]]
 name = "alloy-signer"
 version = "0.1.0"
-source = "git+https://github.com/alloy-rs/alloy?rev=5fbf57bac99edef9d8475190109a7ea9fb7e5e83#5fbf57bac99edef9d8475190109a7ea9fb7e5e83"
+source = "git+https://github.com/alloy-rs/alloy#e60d64cff86d995657f0acea85c2bbd52f9bd810"
 dependencies = [
 "alloy-primitives 0.7.2",
 "async-trait",
@@ -387,7 +386,7 @@ dependencies = [
 [[package]]
 name = "alloy-signer-wallet"
 version = "0.1.0"
-source = "git+https://github.com/alloy-rs/alloy?rev=5fbf57bac99edef9d8475190109a7ea9fb7e5e83#5fbf57bac99edef9d8475190109a7ea9fb7e5e83"
+source = "git+https://github.com/alloy-rs/alloy#e60d64cff86d995657f0acea85c2bbd52f9bd810"
 dependencies = [
 "alloy-consensus",
 "alloy-network",
@@ -460,7 +459,7 @@ dependencies = [
 [[package]]
 name = "alloy-transport"
 version = "0.1.0"
-source = "git+https://github.com/alloy-rs/alloy?rev=5fbf57bac99edef9d8475190109a7ea9fb7e5e83#5fbf57bac99edef9d8475190109a7ea9fb7e5e83"
+source = "git+https://github.com/alloy-rs/alloy#e60d64cff86d995657f0acea85c2bbd52f9bd810"
 dependencies = [
 "alloy-json-rpc",
 "base64 0.22.1",
@@ -478,7 +477,7 @@ dependencies = [
 [[package]]
 name = "alloy-transport-http"
 version = "0.1.0"
-source = "git+https://github.com/alloy-rs/alloy?rev=5fbf57bac99edef9d8475190109a7ea9fb7e5e83#5fbf57bac99edef9d8475190109a7ea9fb7e5e83"
+source = "git+https://github.com/alloy-rs/alloy#e60d64cff86d995657f0acea85c2bbd52f9bd810"
 dependencies = [
 "alloy-json-rpc",
 "alloy-transport",
@@ -1208,15 +1207,6 @@ dependencies = [
 "strsim",
 ]

-[[package]]
-name = "clap_complete"
-version = "4.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd79504325bf38b10165b02e89b4347300f855f273c4cb30c4a3209e6583275e"
-dependencies = [
- "clap 4.5.3",
-]
-
 [[package]]
 name = "clap_derive"
 version = "4.5.3"
@@ -1841,7 +1831,6 @@ dependencies = [
 "bincode",
 "chrono",
 "clap 4.5.3",
- "clap_complete",
 "colored",
 "colored_json",
 "console_error_panic_hook",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,7 +23,6 @@ halo2curves = { git = "https://github.com/privacy-scaling-explorations/halo2curv
 rand = { version = "0.8", default_features = false }
 itertools = { version = "0.10.3", default_features = false }
 clap = { version = "4.5.3", features = ["derive"] }
-clap_complete = "4.5.2"
 serde = { version = "1.0.126", features = ["derive"], optional = true }
 serde_json = { version = "1.0.97", default_features = false, features = [
    "float_roundtrip",
@@ -48,7 +47,7 @@ metal = { git = "https://github.com/gfx-rs/metal-rs", optional = true }

 # evm related deps
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-alloy = { git = "https://github.com/alloy-rs/alloy", version = "0.1.0", rev="5fbf57bac99edef9d8475190109a7ea9fb7e5e83", features = ["provider-http", "signers", "contract", "rpc-types-eth", "signer-wallet", "node-bindings"] }
+alloy = { git = "https://github.com/alloy-rs/alloy", version = "0.1.0", features = ["provider-http", "signers", "contract", "rpc-types-eth", "signer-wallet", "node-bindings"] }
 foundry-compilers = {version = "0.4.1", features = ["svm-solc"]}
 ethabi = "18"
 indicatif = { version = "0.17.5", features = ["rayon"] }
--- a/docs/python/requirements-docs.txt
+++ b/docs/python/requirements-docs.txt
@@ -1,4 +1,4 @@
-ezkl==11.2.3
+ezkl==11.0.9
 sphinx
 sphinx-rtd-theme
 sphinxcontrib-napoleon
--- a/docs/python/src/conf.py
+++ b/docs/python/src/conf.py
@@ -1,7 +1,7 @@
 import ezkl

 project = 'ezkl'
-release = '11.2.3'
+release = '11.0.9'
 version = release


--- a/examples/notebooks/simple_demo_all_public.ipynb
+++ b/examples/notebooks/simple_demo_all_public.ipynb
@@ -157,7 +157,6 @@
        {
            "cell_type": "code",
            "execution_count": null,
-            "id": "b78d3cbf",
            "metadata": {},
            "outputs": [],
            "source": [
@@ -193,7 +192,7 @@
            "outputs": [],
            "source": [
                "# srs path\n",
-                "res = ezkl.get_srs( settings_path)"
+                "res = await ezkl.get_srs( settings_path)"
            ]
        },
        {
@@ -299,7 +298,7 @@
            "name": "python",
            "nbconvert_exporter": "python",
            "pygments_lexer": "ipython3",
-            "version": "3.12.3"
+            "version": "3.9.15"
        }
    },
    "nbformat": 4,
--- a/examples/notebooks/simple_demo_public_input_output.ipynb
+++ b/examples/notebooks/simple_demo_public_input_output.ipynb
@@ -169,7 +169,7 @@
                "json.dump(data, open(cal_path, 'w'))\n",
                "\n",
                "\n",
-                "await ezkl.calibrate_settings(cal_path, model_path, settings_path, \"resources\")"
+                "ezkl.calibrate_settings(cal_path, model_path, settings_path, \"resources\")"
            ]
        },
        {
@@ -302,4 +302,4 @@
    },
    "nbformat": 4,
    "nbformat_minor": 5
-}
+}
--- a/examples/notebooks/simple_demo_public_network_output.ipynb
+++ b/examples/notebooks/simple_demo_public_network_output.ipynb
@@ -170,7 +170,7 @@
                "json.dump(data, open(cal_path, 'w'))\n",
                "\n",
                "\n",
-                "await ezkl.calibrate_settings(cal_path, model_path, settings_path, \"resources\")"
+                "ezkl.calibrate_settings(cal_path, model_path, settings_path, \"resources\")"
            ]
        },
        {
--- a/install_ezkl_cli.sh
+++ b/install_ezkl_cli.sh
@@ -126,6 +126,7 @@ elif [ "$PLATFORM" == "macos" ]; then

        echo "Cleaning up"
        rm "$EZKL_DIR/build-artifacts.ezkl-macos-aarch64.tar.gz"
+
    else
        JSON_RESPONSE=$(curl -s "$RELEASE_URL")
        FILE_URL=$(echo "$JSON_RESPONSE" | grep -o 'https://github.com[^"]*' | grep "build-artifacts.ezkl-macos.tar.gz")
@@ -154,7 +155,7 @@ elif [ "$PLATFORM" == "linux" ]; then

        echo "Cleaning up"
        rm "$EZKL_DIR/build-artifacts.ezkl-linux-gnu.tar.gz"
-    elif [ "$ARCHITECTURE" == "aarch64" ]; then
+    else if [ "$ARCHITECTURE" == "aarch64" ]; then
        JSON_RESPONSE=$(curl -s "$RELEASE_URL")
        FILE_URL=$(echo "$JSON_RESPONSE" | grep -o 'https://github.com[^"]*' | grep "build-artifacts.ezkl-linux-aarch64.tar.gz")

--- a/src/bin/ezkl.rs
+++ b/src/bin/ezkl.rs
@@ -1,7 +1,7 @@
 // ignore file if compiling for wasm

 #[cfg(not(target_arch = "wasm32"))]
-use clap::{CommandFactory, Parser};
+use clap::Parser;
 #[cfg(not(target_arch = "wasm32"))]
 use colored_json::ToColoredJson;
 #[cfg(not(target_arch = "wasm32"))]
@@ -24,30 +24,22 @@ use std::error::Error;
 #[cfg(not(target_arch = "wasm32"))]
 pub async fn main() -> Result<(), Box<dyn Error>> {
    let args = Cli::parse();
-
-    if let Some(generator) = args.generator {
-        ezkl::commands::print_completions(generator, &mut Cli::command());
-        Ok(())
-    } else if let Some(command) = args.command {
-        init_logger();
-        #[cfg(not(any(target_arch = "wasm32", feature = "no-banner")))]
-        banner();
-        #[cfg(feature = "icicle")]
-        if env::var("ENABLE_ICICLE_GPU").is_ok() {
-            info!("Running with ICICLE GPU");
-        } else {
-            info!("Running with CPU");
-        }
-        info!("command: \n {}", &command.as_json().to_colored_json_auto()?);
-        let res = run(command).await;
-        match &res {
-            Ok(_) => info!("succeeded"),
-            Err(e) => error!("failed: {}", e),
-        };
-        res.map(|_| ())
+    init_logger();
+    #[cfg(not(any(target_arch = "wasm32", feature = "no-banner")))]
+    banner();
+    #[cfg(feature = "icicle")]
+    if env::var("ENABLE_ICICLE_GPU").is_ok() {
+        info!("Running with ICICLE GPU");
    } else {
-        Err("No command provided".into())
+        info!("Running with CPU");
    }
+    info!("command: \n {}", &args.as_json()?.to_colored_json_auto()?);
+    let res = run(args.command).await;
+    match &res {
+        Ok(_) => info!("succeeded"),
+        Err(e) => error!("failed: {}", e),
+    };
+    res.map(|_| ())
 }

 #[cfg(target_arch = "wasm32")]
--- a/src/circuit/ops/layouts.rs
+++ b/src/circuit/ops/layouts.rs
@@ -3910,7 +3910,7 @@ pub(crate) fn range_check<F: PrimeField + TensorType + PartialOrd + std::hash::H
        let int_values = w.get_int_evals()?;
        for v in int_values.iter() {
            if v < &range.0 || v > &range.1 {
-                log::warn!("Value ({:?}) out of range: {:?}", v, range);
+                log::error!("Value ({:?}) out of range: {:?}", v, range);
                return Err(Box::new(TensorError::TableLookupError));
            }
        }
--- a/src/commands.rs
+++ b/src/commands.rs
@@ -1,7 +1,6 @@
 #[cfg(not(target_arch = "wasm32"))]
 use alloy::primitives::Address as H160;
-use clap::{Command, Parser, Subcommand};
-use clap_complete::{generate, Generator, Shell};
+use clap::{Parser, Subcommand};
 #[cfg(feature = "python-bindings")]
 use pyo3::{
    conversion::{FromPyObject, PyTryFrom},
@@ -11,7 +10,7 @@ use pyo3::{
 };
 use serde::{Deserialize, Serialize};
 use std::path::PathBuf;
-use std::str::FromStr;
+use std::{error::Error, str::FromStr};
 use tosubcommand::{ToFlags, ToSubcommand};

 use crate::{pfsys::ProofType, Commitments, RunArgs};
@@ -53,8 +52,6 @@ pub const DEFAULT_VERIFIER_AGGREGATED_ABI: &str = "verifier_aggr_abi.json";
 pub const DEFAULT_VERIFIER_DA_ABI: &str = "verifier_da_abi.json";
 /// Default solidity code
 pub const DEFAULT_SOL_CODE: &str = "evm_deploy.sol";
-/// Default calldata path
-pub const DEFAULT_CALLDATA: &str = "calldata.bytes";
 /// Default solidity code for aggregated proofs
 pub const DEFAULT_SOL_CODE_AGGREGATED: &str = "evm_deploy_aggr.sol";
 /// Default solidity code for data attestation
@@ -81,7 +78,7 @@ pub const DEFAULT_CALIBRATION_FILE: &str = "calibration.json";
 pub const DEFAULT_LOOKUP_SAFETY_MARGIN: &str = "2";
 /// Default Compress selectors
 pub const DEFAULT_DISABLE_SELECTOR_COMPRESSION: &str = "false";
-/// Default render vk separately
+/// Default render vk seperately
 pub const DEFAULT_RENDER_VK_SEPERATELY: &str = "false";
 /// Default VK sol path
 pub const DEFAULT_VK_SOL: &str = "vk.sol";
@@ -256,65 +253,32 @@ lazy_static! {
    };
 }

-/// Get the styles for the CLI
-pub fn get_styles() -> clap::builder::Styles {
-    clap::builder::Styles::styled()
-        .usage(
-            clap::builder::styling::Style::new()
-                .bold()
-                .underline()
-                .fg_color(Some(clap::builder::styling::Color::Ansi(clap::builder::styling::AnsiColor::Cyan))),
-        )
-        .header(
-            clap::builder::styling::Style::new()
-                .bold()
-                .underline()
-                .fg_color(Some(clap::builder::styling::Color::Ansi(clap::builder::styling::AnsiColor::Cyan))),
-        )
-        .literal(
-            clap::builder::styling::Style::new().fg_color(Some(clap::builder::styling::Color::Ansi(clap::builder::styling::AnsiColor::Magenta))),
-        )
-        .invalid(
-            clap::builder::styling::Style::new()
-                .bold()
-                .fg_color(Some(clap::builder::styling::Color::Ansi(clap::builder::styling::AnsiColor::Red))),
-        )
-        .error(
-            clap::builder::styling::Style::new()
-                .bold()
-                .fg_color(Some(clap::builder::styling::Color::Ansi(clap::builder::styling::AnsiColor::Red))),
-        )
-        .valid(
-            clap::builder::styling::Style::new()
-                .bold()
-                .underline()
-                .fg_color(Some(clap::builder::styling::Color::Ansi(clap::builder::styling::AnsiColor::Green))),
-        )
-        .placeholder(
-            clap::builder::styling::Style::new().fg_color(Some(clap::builder::styling::Color::Ansi(clap::builder::styling::AnsiColor::White))),
-        )
-}
-
-
-/// Print completions for the given generator
-pub fn print_completions<G: Generator>(gen: G, cmd: &mut Command) {
-    generate(gen, cmd, cmd.get_name().to_string(), &mut std::io::stdout());
-}
-
-
 #[allow(missing_docs)]
-#[derive(Parser, Debug, Clone)]
+#[derive(Parser, Debug, Clone, Deserialize, Serialize)]
 #[command(author, about, long_about = None)]
-#[clap(version = *VERSION, styles = get_styles(), trailing_var_arg = true)]
+#[clap(version = *VERSION)]
 pub struct Cli {
-    /// If provided, outputs the completion file for given shell
-    #[clap(long = "generate", value_parser)]
-    pub generator: Option<Shell>,
    #[command(subcommand)]
    #[allow(missing_docs)]
-    pub command: Option<Commands>,
+    pub command: Commands,
 }

+impl Cli {
+    /// Export the ezkl configuration as json
+    pub fn as_json(&self) -> Result<String, Box<dyn Error>> {
+        let serialized = match serde_json::to_string(&self) {
+            Ok(s) => s,
+            Err(e) => {
+                return Err(Box::new(e));
+            }
+        };
+        Ok(serialized)
+    }
+    /// Parse an ezkl configuration from a json
+    pub fn from_json(arg_json: &str) -> Result<Self, serde_json::Error> {
+        serde_json::from_str(arg_json)
+    }
+}

 #[allow(missing_docs)]
 #[derive(Debug, Subcommand, Clone, Deserialize, Serialize, PartialEq, PartialOrd, ToSubcommand)]
@@ -325,7 +289,7 @@ pub enum Commands {
    /// Loads model and prints model table
    Table {
        /// The path to the .onnx model file
-        #[arg(short = 'M', long, default_value = DEFAULT_MODEL, value_hint = clap::ValueHint::FilePath)]
+        #[arg(short = 'M', long, default_value = DEFAULT_MODEL)]
        model: Option<PathBuf>,
        /// proving arguments
        #[clap(flatten)]
@@ -335,29 +299,29 @@ pub enum Commands {
    /// Generates the witness from an input file.
    GenWitness {
        /// The path to the .json data file
-        #[arg(short = 'D', long, default_value = DEFAULT_DATA, value_hint = clap::ValueHint::FilePath)]
+        #[arg(short = 'D', long, default_value = DEFAULT_DATA)]
        data: Option<PathBuf>,
        /// The path to the compiled model file (generated using the compile-circuit command)
-        #[arg(short = 'M', long, default_value = DEFAULT_COMPILED_CIRCUIT, value_hint = clap::ValueHint::FilePath)]
+        #[arg(short = 'M', long, default_value = DEFAULT_COMPILED_CIRCUIT)]
        compiled_circuit: Option<PathBuf>,
        /// Path to output the witness .json file
-        #[arg(short = 'O', long, default_value = DEFAULT_WITNESS, value_hint = clap::ValueHint::FilePath)]
+        #[arg(short = 'O', long, default_value = DEFAULT_WITNESS)]
        output: Option<PathBuf>,
        /// Path to the verification key file (optional - solely used to generate kzg commits)
-        #[arg(short = 'V', long, value_hint = clap::ValueHint::FilePath)]
+        #[arg(short = 'V', long)]
        vk_path: Option<PathBuf>,
        /// Path to the srs file (optional - solely used to generate kzg commits)
-        #[arg(short = 'P', long, value_hint = clap::ValueHint::FilePath)]
+        #[arg(short = 'P', long)]
        srs_path: Option<PathBuf>,
    },

    /// Produces the proving hyperparameters, from run-args
    GenSettings {
        /// The path to the .onnx model file
-        #[arg(short = 'M', long, default_value = DEFAULT_MODEL, value_hint = clap::ValueHint::FilePath)]
+        #[arg(short = 'M', long, default_value = DEFAULT_MODEL)]
        model: Option<PathBuf>,
        /// The path to generate the circuit settings .json file to
-        #[arg(short = 'O', long, default_value = DEFAULT_SETTINGS, value_hint = clap::ValueHint::FilePath)]
+        #[arg(short = 'O', long, default_value = DEFAULT_SETTINGS)]
        settings_path: Option<PathBuf>,
        /// proving arguments
        #[clap(flatten)]
@@ -368,34 +332,33 @@ pub enum Commands {
    #[cfg(not(target_arch = "wasm32"))]
    CalibrateSettings {
        /// The path to the .json calibration data file.
-        #[arg(short = 'D', long, default_value = DEFAULT_CALIBRATION_FILE, value_hint = clap::ValueHint::FilePath)]
+        #[arg(short = 'D', long, default_value = DEFAULT_CALIBRATION_FILE)]
        data: Option<PathBuf>,
        /// The path to the .onnx model file
-        #[arg(short = 'M', long, default_value = DEFAULT_MODEL, value_hint = clap::ValueHint::FilePath)]
+        #[arg(short = 'M', long, default_value = DEFAULT_MODEL)]
        model: Option<PathBuf>,
        /// The path to load circuit settings .json file AND overwrite (generated using the gen-settings command).
-        #[arg(short = 'O', long, default_value = DEFAULT_SETTINGS, value_hint = clap::ValueHint::FilePath)]
+        #[arg(short = 'O', long, default_value = DEFAULT_SETTINGS)]
        settings_path: Option<PathBuf>,
-        #[arg(long = "target", default_value = DEFAULT_CALIBRATION_TARGET, value_hint = clap::ValueHint::Other)]
+        #[arg(long = "target", default_value = DEFAULT_CALIBRATION_TARGET)]
        /// Target for calibration. Set to "resources" to optimize for computational resource. Otherwise, set to "accuracy" to optimize for accuracy.
        target: CalibrationTarget,
        /// the lookup safety margin to use for calibration. if the max lookup is 2^k, then the max lookup will be 2^k * lookup_safety_margin. larger = safer but slower
-        #[arg(long, default_value = DEFAULT_LOOKUP_SAFETY_MARGIN, value_hint = clap::ValueHint::Other)]
+        #[arg(long, default_value = DEFAULT_LOOKUP_SAFETY_MARGIN)]
        lookup_safety_margin: i64,
        /// Optional scales to specifically try for calibration. Example, --scales 0,4
-        #[arg(long, value_delimiter = ',', allow_hyphen_values = true, value_hint = clap::ValueHint::Other)]
+        #[arg(long, value_delimiter = ',', allow_hyphen_values = true)]
        scales: Option<Vec<crate::Scale>>,
        /// Optional scale rebase multipliers to specifically try for calibration. This is the multiplier at which we divide to return to the input scale. Example, --scale-rebase-multipliers 0,4
        #[arg(
            long,
            value_delimiter = ',',
            allow_hyphen_values = true,
-            default_value = DEFAULT_SCALE_REBASE_MULTIPLIERS,
-            value_hint = clap::ValueHint::Other
+            default_value = DEFAULT_SCALE_REBASE_MULTIPLIERS
        )]
        scale_rebase_multiplier: Vec<u32>,
        /// max logrows to use for calibration, 26 is the max public SRS size
-        #[arg(long, value_hint = clap::ValueHint::Other)]
+        #[arg(long)]
        max_logrows: Option<u32>,
        // whether to only range check rebases (instead of trying both range check and lookup)
        #[arg(long, default_value = DEFAULT_ONLY_RANGE_CHECK_REBASE, action = clap::ArgAction::SetTrue)]
@@ -406,13 +369,13 @@ pub enum Commands {
    #[command(name = "gen-srs", arg_required_else_help = true)]
    GenSrs {
        /// The path to output the generated SRS
-        #[arg(long, value_hint = clap::ValueHint::FilePath)]
+        #[arg(long)]
        srs_path: PathBuf,
        /// number of logrows to use for srs
-        #[arg(long, value_hint = clap::ValueHint::Other)]
+        #[arg(long)]
        logrows: usize,
        /// commitment used
-        #[arg(long, default_value = DEFAULT_COMMITMENT, value_hint = clap::ValueHint::Other)]
+        #[arg(long, default_value = DEFAULT_COMMITMENT)]
        commitment: Option<Commitments>,
    },

@@ -421,57 +384,57 @@ pub enum Commands {
    #[command(name = "get-srs")]
    GetSrs {
        /// The path to output the desired srs file, if set to None will save to $EZKL_REPO_PATH/srs
-        #[arg(long, default_value = None, value_hint = clap::ValueHint::FilePath)]
+        #[arg(long)]
        srs_path: Option<PathBuf>,
        /// Path to the circuit settings .json file to read in logrows from. Overriden by logrows if specified.
-        #[arg(short = 'S', long, default_value = DEFAULT_SETTINGS, value_hint = clap::ValueHint::FilePath)]
+        #[arg(short = 'S', long, default_value = DEFAULT_SETTINGS)]
        settings_path: Option<PathBuf>,
        /// Number of logrows to use for srs. Overrides settings_path if specified.
-        #[arg(long, default_value = None, value_hint = clap::ValueHint::Other)]
+        #[arg(long, default_value = None)]
        logrows: Option<u32>,
        /// Commitment used
-        #[arg(long, default_value = None, value_hint = clap::ValueHint::Other)]
+        #[arg(long, default_value = None)]
        commitment: Option<Commitments>,
    },
    /// Loads model and input and runs mock prover (for testing)
    Mock {
        /// The path to the .json witness file (generated using the gen-witness command)
-        #[arg(short = 'W', long, default_value = DEFAULT_WITNESS, value_hint = clap::ValueHint::FilePath)]
+        #[arg(short = 'W', long, default_value = DEFAULT_WITNESS)]
        witness: Option<PathBuf>,
        /// The path to the compiled model file (generated using the compile-circuit command)
-        #[arg(short = 'M', long, default_value = DEFAULT_COMPILED_CIRCUIT, value_hint = clap::ValueHint::FilePath)]
+        #[arg(short = 'M', long, default_value = DEFAULT_COMPILED_CIRCUIT)]
        model: Option<PathBuf>,
    },

    /// Mock aggregate proofs
    MockAggregate {
        /// The path to the snarks to aggregate over (generated using the prove command with the --proof-type=for-aggr flag)
-        #[arg(long, default_value = DEFAULT_PROOF, value_delimiter = ',', allow_hyphen_values = true, value_hint = clap::ValueHint::FilePath)]
+        #[arg(long, default_value = DEFAULT_PROOF, value_delimiter = ',', allow_hyphen_values = true)]
        aggregation_snarks: Vec<PathBuf>,
        /// logrows used for aggregation circuit
-        #[arg(long, default_value = DEFAULT_AGGREGATED_LOGROWS, value_hint = clap::ValueHint::Other)]
+        #[arg(long, default_value = DEFAULT_AGGREGATED_LOGROWS)]
        logrows: Option<u32>,
        /// whether the accumulated are segments of a larger proof
        #[arg(long, default_value = DEFAULT_SPLIT, action = clap::ArgAction::SetTrue)]
        split_proofs: Option<bool>,
    },

-    /// Setup aggregation circuit and generate pk and vk
+    /// setup aggregation circuit :)
    SetupAggregate {
        /// The path to samples of snarks that will be aggregated over (generated using the prove command with the --proof-type=for-aggr flag)
-        #[arg(long, default_value = DEFAULT_PROOF, value_delimiter = ',', allow_hyphen_values = true, value_hint = clap::ValueHint::FilePath)]
+        #[arg(long, default_value = DEFAULT_PROOF, value_delimiter = ',', allow_hyphen_values = true)]
        sample_snarks: Vec<PathBuf>,
        /// The path to save the desired verification key file to
-        #[arg(long, default_value = DEFAULT_VK_AGGREGATED, value_hint = clap::ValueHint::FilePath)]
+        #[arg(long, default_value = DEFAULT_VK_AGGREGATED)]
        vk_path: Option<PathBuf>,
        /// The path to save the proving key to
-        #[arg(long, default_value = DEFAULT_PK_AGGREGATED, value_hint = clap::ValueHint::FilePath)]
+        #[arg(long, default_value = DEFAULT_PK_AGGREGATED)]
        pk_path: Option<PathBuf>,
        /// The path to SRS, if None will use $EZKL_REPO_PATH/srs/kzg{logrows}.srs
-        #[arg(long, value_hint = clap::ValueHint::FilePath)]
+        #[arg(long)]
        srs_path: Option<PathBuf>,
        /// logrows used for aggregation circuit
-        #[arg(long, default_value = DEFAULT_AGGREGATED_LOGROWS, value_hint = clap::ValueHint::Other)]
+        #[arg(long, default_value = DEFAULT_AGGREGATED_LOGROWS)]
        logrows: Option<u32>,
        /// whether the accumulated are segments of a larger proof
        #[arg(long, default_value = DEFAULT_SPLIT, action = clap::ArgAction::SetTrue)]
@@ -480,19 +443,19 @@ pub enum Commands {
        #[arg(long, default_value = DEFAULT_DISABLE_SELECTOR_COMPRESSION, action = clap::ArgAction::SetTrue)]
        disable_selector_compression: Option<bool>,
        /// commitment used
-        #[arg(long, default_value = DEFAULT_COMMITMENT, value_hint = clap::ValueHint::Other)]
+        #[arg(long, default_value = DEFAULT_COMMITMENT)]
        commitment: Option<Commitments>,
    },
-    /// Aggregates proofs
+    /// Aggregates proofs :)
    Aggregate {
        /// The path to the snarks to aggregate over (generated using the prove command with the --proof-type=for-aggr flag)
-        #[arg(long, default_value = DEFAULT_PROOF, value_delimiter = ',', allow_hyphen_values = true, value_hint = clap::ValueHint::FilePath)]
+        #[arg(long, default_value = DEFAULT_PROOF, value_delimiter = ',', allow_hyphen_values = true)]
        aggregation_snarks: Vec<PathBuf>,
        /// The path to load the desired proving key file (generated using the setup-aggregate command)
-        #[arg(long, default_value = DEFAULT_PK_AGGREGATED, value_hint = clap::ValueHint::FilePath)]
+        #[arg(long, default_value = DEFAULT_PK_AGGREGATED)]
        pk_path: Option<PathBuf>,
        /// The path to output the proof file to
-        #[arg(long, default_value = DEFAULT_PROOF_AGGREGATED, value_hint = clap::ValueHint::FilePath)]
+        #[arg(long, default_value = DEFAULT_PROOF_AGGREGATED)]
        proof_path: Option<PathBuf>,
        /// The path to SRS, if None will use $EZKL_REPO_PATH/srs/kzg{logrows}.srs
        #[arg(long)]
@@ -502,51 +465,50 @@ pub enum Commands {
            require_equals = true,
            num_args = 0..=1,
            default_value_t = TranscriptType::default(),
-            value_enum, 
-            value_hint = clap::ValueHint::Other
+            value_enum
        )]
        transcript: TranscriptType,
        /// logrows used for aggregation circuit
-        #[arg(long, default_value = DEFAULT_AGGREGATED_LOGROWS, value_hint = clap::ValueHint::Other)]
+        #[arg(long, default_value = DEFAULT_AGGREGATED_LOGROWS)]
        logrows: Option<u32>,
        /// run sanity checks during calculations (safe or unsafe)
-        #[arg(long, default_value = DEFAULT_CHECKMODE, value_hint = clap::ValueHint::Other)]
+        #[arg(long, default_value = DEFAULT_CHECKMODE)]
        check_mode: Option<CheckMode>,
        /// whether the accumulated proofs are segments of a larger circuit
        #[arg(long, default_value = DEFAULT_SPLIT, action = clap::ArgAction::SetTrue)]
        split_proofs: Option<bool>,
        /// commitment used
-        #[arg(long, default_value = DEFAULT_COMMITMENT, value_hint = clap::ValueHint::Other)]
+        #[arg(long, default_value = DEFAULT_COMMITMENT)]
        commitment: Option<Commitments>,
    },
    /// Compiles a circuit from onnx to a simplified graph (einsum + other ops) and parameters as sets of field elements
    CompileCircuit {
        /// The path to the .onnx model file
-        #[arg(short = 'M', long, default_value = DEFAULT_MODEL, value_hint = clap::ValueHint::FilePath)]
+        #[arg(short = 'M', long, default_value = DEFAULT_MODEL)]
        model: Option<PathBuf>,
        /// The path to the compiled model file (generated using the compile-circuit command)
-        #[arg(long, default_value = DEFAULT_COMPILED_CIRCUIT, value_hint = clap::ValueHint::FilePath)]
+        #[arg(long, default_value = DEFAULT_COMPILED_CIRCUIT)]
        compiled_circuit: Option<PathBuf>,
        /// The path to load circuit settings .json file from (generated using the gen-settings command)
-        #[arg(short = 'S', long, default_value = DEFAULT_SETTINGS, value_hint = clap::ValueHint::FilePath)]
+        #[arg(short = 'S', long, default_value = DEFAULT_SETTINGS)]
        settings_path: Option<PathBuf>,
    },
    /// Creates pk and vk
    Setup {
        /// The path to the compiled model file (generated using the compile-circuit command)
-        #[arg(short = 'M', long, default_value = DEFAULT_COMPILED_CIRCUIT, value_hint = clap::ValueHint::FilePath)]
+        #[arg(short = 'M', long, default_value = DEFAULT_COMPILED_CIRCUIT)]
        compiled_circuit: Option<PathBuf>,
        /// The path to SRS, if None will use $EZKL_REPO_PATH/srs/kzg{logrows}.srs
-        #[arg(long, value_hint = clap::ValueHint::FilePath)]
+        #[arg(long)]
        srs_path: Option<PathBuf>,
        /// The path to output the verification key file to
-        #[arg(long, default_value = DEFAULT_VK, value_hint = clap::ValueHint::FilePath)]
+        #[arg(long, default_value = DEFAULT_VK)]
        vk_path: Option<PathBuf>,
        /// The path to output the proving key file to
-        #[arg(long, default_value = DEFAULT_PK, value_hint = clap::ValueHint::FilePath)]
+        #[arg(long, default_value = DEFAULT_PK)]
        pk_path: Option<PathBuf>,
        /// The graph witness (optional - used to override fixed values in the circuit)
-        #[arg(short = 'W', long, value_hint = clap::ValueHint::FilePath)]
+        #[arg(short = 'W', long)]
        witness: Option<PathBuf>,
        /// compress selectors
        #[arg(long, default_value = DEFAULT_DISABLE_SELECTOR_COMPRESSION, action = clap::ArgAction::SetTrue)]
@@ -557,24 +519,24 @@ pub enum Commands {
    #[command(arg_required_else_help = true)]
    SetupTestEvmData {
        /// The path to the .json data file, which should include both the network input (possibly private) and the network output (public input to the proof)
-        #[arg(short = 'D', long, value_hint = clap::ValueHint::FilePath)]
+        #[arg(short = 'D', long)]
        data: Option<PathBuf>,
        /// The path to the compiled model file (generated using the compile-circuit command)
-        #[arg(short = 'M', long, value_hint = clap::ValueHint::FilePath)]
+        #[arg(short = 'M', long)]
        compiled_circuit: Option<PathBuf>,
        /// For testing purposes only. The optional path to the .json data file that will be generated that contains the OnChain data storage information
        /// derived from the file information in the data .json file.
        /// Should include both the network input (possibly private) and the network output (public input to the proof)
-        #[arg(short = 'T', long, value_hint = clap::ValueHint::FilePath)]
+        #[arg(short = 'T', long)]
        test_data: PathBuf,
        /// RPC URL for an Ethereum node, if None will use Anvil but WON'T persist state
-        #[arg(short = 'U', long, value_hint = clap::ValueHint::Url)]
+        #[arg(short = 'U', long)]
        rpc_url: Option<String>,
        /// where the input data come from
-        #[arg(long, default_value = "on-chain", value_hint = clap::ValueHint::Other)]
+        #[arg(long, default_value = "on-chain")]
        input_source: TestDataSource,
        /// where the output data come from
-        #[arg(long, default_value = "on-chain", value_hint = clap::ValueHint::Other)]
+        #[arg(long, default_value = "on-chain")]
        output_source: TestDataSource,
    },
    #[cfg(not(target_arch = "wasm32"))]
@@ -582,23 +544,23 @@ pub enum Commands {
    #[command(arg_required_else_help = true)]
    TestUpdateAccountCalls {
        /// The path to the verifier contract's address
-        #[arg(long, value_hint = clap::ValueHint::Other)]
+        #[arg(long)]
        addr: H160Flag,
        /// The path to the .json data file.
-        #[arg(short = 'D', long, value_hint = clap::ValueHint::FilePath)]
+        #[arg(short = 'D', long)]
        data: Option<PathBuf>,
        /// RPC URL for an Ethereum node, if None will use Anvil but WON'T persist state
-        #[arg(short = 'U', long, value_hint = clap::ValueHint::Url)]
+        #[arg(short = 'U', long)]
        rpc_url: Option<String>,
    },
    #[cfg(not(target_arch = "wasm32"))]
    /// Swaps the positions in the transcript that correspond to commitments
    SwapProofCommitments {
        /// The path to the proof file
-        #[arg(short = 'P', long, default_value = DEFAULT_PROOF, value_hint = clap::ValueHint::FilePath)]
+        #[arg(short = 'P', long, default_value = DEFAULT_PROOF)]
        proof_path: Option<PathBuf>,
        /// The path to the witness file
-        #[arg(short = 'W', long, default_value = DEFAULT_WITNESS, value_hint = clap::ValueHint::FilePath)]
+        #[arg(short = 'W', long, default_value = DEFAULT_WITNESS)]
        witness_path: Option<PathBuf>,
    },

@@ -606,65 +568,50 @@ pub enum Commands {
    /// Loads model, data, and creates proof
    Prove {
        /// The path to the .json witness file (generated using the gen-witness command)
-        #[arg(short = 'W', long, default_value = DEFAULT_WITNESS, value_hint = clap::ValueHint::FilePath)]
+        #[arg(short = 'W', long, default_value = DEFAULT_WITNESS)]
        witness: Option<PathBuf>,
        /// The path to the compiled model file (generated using the compile-circuit command)
-        #[arg(short = 'M', long, default_value = DEFAULT_COMPILED_CIRCUIT, value_hint = clap::ValueHint::FilePath)]
+        #[arg(short = 'M', long, default_value = DEFAULT_COMPILED_CIRCUIT)]
        compiled_circuit: Option<PathBuf>,
        /// The path to load the desired proving key file (generated using the setup command)
-        #[arg(long, default_value = DEFAULT_PK, value_hint = clap::ValueHint::FilePath)]
+        #[arg(long, default_value = DEFAULT_PK)]
        pk_path: Option<PathBuf>,
        /// The path to output the proof file to
-        #[arg(long, default_value = DEFAULT_PROOF, value_hint = clap::ValueHint::FilePath)]
+        #[arg(long, default_value = DEFAULT_PROOF)]
        proof_path: Option<PathBuf>,
        /// The path to SRS, if None will use $EZKL_REPO_PATH/srs/kzg{logrows}.srs
-        #[arg(long, value_hint = clap::ValueHint::FilePath)]
+        #[arg(long)]
        srs_path: Option<PathBuf>,
        #[arg(
            long,
            require_equals = true,
            num_args = 0..=1,
            default_value_t = ProofType::Single,
-            value_enum, 
-            value_hint = clap::ValueHint::Other
+            value_enum
        )]
        proof_type: ProofType,
        /// run sanity checks during calculations (safe or unsafe)
-        #[arg(long, default_value = DEFAULT_CHECKMODE, value_hint = clap::ValueHint::Other)]
+        #[arg(long, default_value = DEFAULT_CHECKMODE)]
        check_mode: Option<CheckMode>,
    },
    #[cfg(not(target_arch = "wasm32"))]
-    /// Encodes a proof into evm calldata
-    #[command(name = "encode-evm-calldata")]
-    EncodeEvmCalldata {
-        /// The path to the proof file (generated using the prove command)
-        #[arg(long, default_value = DEFAULT_PROOF, value_hint = clap::ValueHint::FilePath)]
-        proof_path: Option<PathBuf>,
-        /// The path to save the calldata to
-        #[arg(long, default_value = DEFAULT_CALLDATA, value_hint = clap::ValueHint::FilePath)]
-        calldata_path: Option<PathBuf>,
-        /// The path to the verification key address (only used if the vk is rendered as a separate contract)
-        #[arg(long, value_hint = clap::ValueHint::Other)]
-        addr_vk: Option<H160Flag>,
-    },
-    #[cfg(not(target_arch = "wasm32"))]
    /// Creates an Evm verifier for a single proof
    #[command(name = "create-evm-verifier")]
    CreateEvmVerifier {
        /// The path to SRS, if None will use $EZKL_REPO_PATH/srs/kzg{logrows}.srs
-        #[arg(long, value_hint = clap::ValueHint::FilePath)]
+        #[arg(long)]
        srs_path: Option<PathBuf>,
        /// The path to load circuit settings .json file from (generated using the gen-settings command)
-        #[arg(short = 'S', long, default_value = DEFAULT_SETTINGS, value_hint = clap::ValueHint::FilePath)]
+        #[arg(short = 'S', long, default_value = DEFAULT_SETTINGS)]
        settings_path: Option<PathBuf>,
        /// The path to load the desired verification key file
-        #[arg(long, default_value = DEFAULT_VK, value_hint = clap::ValueHint::FilePath)]
+        #[arg(long, default_value = DEFAULT_VK)]
        vk_path: Option<PathBuf>,
        /// The path to output the Solidity code
-        #[arg(long, default_value = DEFAULT_SOL_CODE, value_hint = clap::ValueHint::FilePath)]
+        #[arg(long, default_value = DEFAULT_SOL_CODE)]
        sol_code_path: Option<PathBuf>,
        /// The path to output the Solidity verifier ABI
-        #[arg(long, default_value = DEFAULT_VERIFIER_ABI, value_hint = clap::ValueHint::FilePath)]
+        #[arg(long, default_value = DEFAULT_VERIFIER_ABI)]
        abi_path: Option<PathBuf>,
        /// Whether the verifier key should be rendered as a separate contract.
        /// We recommend disabling selector compression if this is enabled.
@@ -677,19 +624,19 @@ pub enum Commands {
    #[command(name = "create-evm-vk")]
    CreateEvmVK {
        /// The path to SRS, if None will use $EZKL_REPO_PATH/srs/kzg{logrows}.srs
-        #[arg(long, value_hint = clap::ValueHint::FilePath)]
+        #[arg(long)]
        srs_path: Option<PathBuf>,
        /// The path to load circuit settings .json file from (generated using the gen-settings command)
-        #[arg(short = 'S', long, default_value = DEFAULT_SETTINGS, value_hint = clap::ValueHint::FilePath)]
+        #[arg(short = 'S', long, default_value = DEFAULT_SETTINGS)]
        settings_path: Option<PathBuf>,
        /// The path to load the desired verification key file
-        #[arg(long, default_value = DEFAULT_VK, value_hint = clap::ValueHint::FilePath)]
+        #[arg(long, default_value = DEFAULT_VK)]
        vk_path: Option<PathBuf>,
        /// The path to output the Solidity code
-        #[arg(long, default_value = DEFAULT_VK_SOL, value_hint = clap::ValueHint::FilePath)]
+        #[arg(long, default_value = DEFAULT_VK_SOL)]
        sol_code_path: Option<PathBuf>,
        /// The path to output the Solidity verifier ABI
-        #[arg(long, default_value = DEFAULT_VK_ABI, value_hint = clap::ValueHint::FilePath)]
+        #[arg(long, default_value = DEFAULT_VK_ABI)]
        abi_path: Option<PathBuf>,
    },
    #[cfg(not(target_arch = "wasm32"))]
@@ -697,20 +644,20 @@ pub enum Commands {
    #[command(name = "create-evm-da")]
    CreateEvmDataAttestation {
        /// The path to load circuit settings .json file from (generated using the gen-settings command)
-        #[arg(short = 'S', long, default_value = DEFAULT_SETTINGS, value_hint = clap::ValueHint::FilePath)]
+        #[arg(short = 'S', long, default_value = DEFAULT_SETTINGS)]
        settings_path: Option<PathBuf>,
        /// The path to output the Solidity code
-        #[arg(long, default_value = DEFAULT_SOL_CODE_DA, value_hint = clap::ValueHint::FilePath)]
+        #[arg(long, default_value = DEFAULT_SOL_CODE_DA)]
        sol_code_path: Option<PathBuf>,
        /// The path to output the Solidity verifier ABI
-        #[arg(long, default_value = DEFAULT_VERIFIER_DA_ABI, value_hint = clap::ValueHint::FilePath)]
+        #[arg(long, default_value = DEFAULT_VERIFIER_DA_ABI)]
        abi_path: Option<PathBuf>,
        /// The path to the .json data file, which should
        /// contain the necessary calldata and account addresses
        /// needed to read from all the on-chain
        /// view functions that return the data that the network
        /// ingests as inputs.
-        #[arg(short = 'D', long, default_value = DEFAULT_DATA, value_hint = clap::ValueHint::FilePath)]
+        #[arg(short = 'D', long, default_value = DEFAULT_DATA)]
        data: Option<PathBuf>,
    },

@@ -719,22 +666,22 @@ pub enum Commands {
    #[command(name = "create-evm-verifier-aggr")]
    CreateEvmVerifierAggr {
        /// The path to SRS, if None will use $EZKL_REPO_PATH/srs/kzg{logrows}.srs
-        #[arg(long, value_hint = clap::ValueHint::FilePath)]
+        #[arg(long)]
        srs_path: Option<PathBuf>,
        /// The path to load the desired verification key file
-        #[arg(long, default_value = DEFAULT_VK_AGGREGATED, value_hint = clap::ValueHint::FilePath)]
+        #[arg(long, default_value = DEFAULT_VK_AGGREGATED)]
        vk_path: Option<PathBuf>,
        /// The path to the Solidity code
-        #[arg(long, default_value = DEFAULT_SOL_CODE_AGGREGATED, value_hint = clap::ValueHint::FilePath)]
+        #[arg(long, default_value = DEFAULT_SOL_CODE_AGGREGATED)]
        sol_code_path: Option<PathBuf>,
        /// The path to output the Solidity verifier ABI
-        #[arg(long, default_value = DEFAULT_VERIFIER_AGGREGATED_ABI, value_hint = clap::ValueHint::FilePath)]
+        #[arg(long, default_value = DEFAULT_VERIFIER_AGGREGATED_ABI)]
        abi_path: Option<PathBuf>,
        // aggregated circuit settings paths, used to calculate the number of instances in the aggregate proof
-        #[arg(long, default_value = DEFAULT_SETTINGS, value_delimiter = ',', allow_hyphen_values = true, value_hint = clap::ValueHint::FilePath)]
+        #[arg(long, default_value = DEFAULT_SETTINGS, value_delimiter = ',', allow_hyphen_values = true)]
        aggregation_settings: Vec<PathBuf>,
        // logrows used for aggregation circuit
-        #[arg(long, default_value = DEFAULT_AGGREGATED_LOGROWS, value_hint = clap::ValueHint::Other)]
+        #[arg(long, default_value = DEFAULT_AGGREGATED_LOGROWS)]
        logrows: Option<u32>,
        /// Whether the verifier key should be rendered as a separate contract.
        /// We recommend disabling selector compression if this is enabled.
@@ -745,16 +692,16 @@ pub enum Commands {
    /// Verifies a proof, returning accept or reject
    Verify {
        /// The path to load circuit settings .json file from (generated using the gen-settings command)
-        #[arg(short = 'S', long, default_value = DEFAULT_SETTINGS, value_hint = clap::ValueHint::FilePath)]
+        #[arg(short = 'S', long, default_value = DEFAULT_SETTINGS)]
        settings_path: Option<PathBuf>,
        /// The path to the proof file (generated using the prove command)
-        #[arg(long, default_value = DEFAULT_PROOF, value_hint = clap::ValueHint::FilePath)]
+        #[arg(long, default_value = DEFAULT_PROOF)]
        proof_path: Option<PathBuf>,
        /// The path to the verification key file (generated using the setup command)
-        #[arg(long, default_value = DEFAULT_VK, value_hint = clap::ValueHint::FilePath)]
+        #[arg(long, default_value = DEFAULT_VK)]
        vk_path: Option<PathBuf>,
        /// The path to SRS, if None will use $EZKL_REPO_PATH/srs/kzg{logrows}.srs
-        #[arg(long, value_hint = clap::ValueHint::FilePath)]
+        #[arg(long)]
        srs_path: Option<PathBuf>,
        /// Reduce SRS logrows to the number of instances rather than the number of logrows used for proofs (only works if the srs were generated in the same ceremony)
        #[arg(long, default_value = DEFAULT_USE_REDUCED_SRS_FOR_VERIFICATION, action = clap::ArgAction::SetTrue)]
@@ -763,60 +710,60 @@ pub enum Commands {
    /// Verifies an aggregate proof, returning accept or reject
    VerifyAggr {
        /// The path to the proof file (generated using the prove command)
-        #[arg(long, default_value = DEFAULT_PROOF_AGGREGATED, value_hint = clap::ValueHint::FilePath)]
+        #[arg(long, default_value = DEFAULT_PROOF_AGGREGATED)]
        proof_path: Option<PathBuf>,
        /// The path to the verification key file (generated using the setup-aggregate command)
-        #[arg(long, default_value = DEFAULT_VK_AGGREGATED, value_hint = clap::ValueHint::FilePath)]
+        #[arg(long, default_value = DEFAULT_VK_AGGREGATED)]
        vk_path: Option<PathBuf>,
        /// reduced srs
        #[arg(long, default_value = DEFAULT_USE_REDUCED_SRS_FOR_VERIFICATION, action = clap::ArgAction::SetTrue)]
        reduced_srs: Option<bool>,
        /// The path to SRS, if None will use $EZKL_REPO_PATH/srs/kzg{logrows}.srs
-        #[arg(long, value_hint = clap::ValueHint::FilePath)]
+        #[arg(long)]
        srs_path: Option<PathBuf>,
        /// logrows used for aggregation circuit
-        #[arg(long, default_value = DEFAULT_AGGREGATED_LOGROWS, value_hint = clap::ValueHint::Other)]
+        #[arg(long, default_value = DEFAULT_AGGREGATED_LOGROWS)]
        logrows: Option<u32>,
        /// commitment
-        #[arg(long, default_value = DEFAULT_COMMITMENT, value_hint = clap::ValueHint::Other)]
+        #[arg(long, default_value = DEFAULT_COMMITMENT)]
        commitment: Option<Commitments>,
    },
    #[cfg(not(target_arch = "wasm32"))]
    /// Deploys an evm verifier that is generated by ezkl
    DeployEvmVerifier {
        /// The path to the Solidity code (generated using the create-evm-verifier command)
-        #[arg(long, default_value = DEFAULT_SOL_CODE, value_hint = clap::ValueHint::FilePath)]
+        #[arg(long, default_value = DEFAULT_SOL_CODE)]
        sol_code_path: Option<PathBuf>,
        /// RPC URL for an Ethereum node, if None will use Anvil but WON'T persist state
-        #[arg(short = 'U', long, value_hint = clap::ValueHint::Url)]
+        #[arg(short = 'U', long)]
        rpc_url: Option<String>,
-        #[arg(long, default_value = DEFAULT_CONTRACT_ADDRESS, value_hint = clap::ValueHint::Other)]
+        #[arg(long, default_value = DEFAULT_CONTRACT_ADDRESS)]
        /// The path to output the contract address
        addr_path: Option<PathBuf>,
        /// The optimizer runs to set on the verifier. Lower values optimize for deployment cost, while higher values optimize for gas cost.
-        #[arg(long, default_value = DEFAULT_OPTIMIZER_RUNS, value_hint = clap::ValueHint::Other)]
+        #[arg(long, default_value = DEFAULT_OPTIMIZER_RUNS)]
        optimizer_runs: usize,
        /// Private secp256K1 key in hex format, 64 chars, no 0x prefix, of the account signing transactions. If None the private key will be generated by Anvil
-        #[arg(short = 'P', long, value_hint = clap::ValueHint::Other)]
+        #[arg(short = 'P', long)]
        private_key: Option<String>,
    },
    #[cfg(not(target_arch = "wasm32"))]
    /// Deploys an evm verifier that is generated by ezkl
    DeployEvmVK {
        /// The path to the Solidity code (generated using the create-evm-verifier command)
-        #[arg(long, default_value = DEFAULT_VK_SOL, value_hint = clap::ValueHint::FilePath)]
+        #[arg(long, default_value = DEFAULT_VK_SOL)]
        sol_code_path: Option<PathBuf>,
        /// RPC URL for an Ethereum node, if None will use Anvil but WON'T persist state
-        #[arg(short = 'U', long, value_hint = clap::ValueHint::Url)]
+        #[arg(short = 'U', long)]
        rpc_url: Option<String>,
-        #[arg(long, default_value = DEFAULT_CONTRACT_ADDRESS_VK, value_hint = clap::ValueHint::Other)]
+        #[arg(long, default_value = DEFAULT_CONTRACT_ADDRESS_VK)]
        /// The path to output the contract address
        addr_path: Option<PathBuf>,
        /// The optimizer runs to set on the verifier. Lower values optimize for deployment cost, while higher values optimize for gas cost.
-        #[arg(long, default_value = DEFAULT_OPTIMIZER_RUNS, value_hint = clap::ValueHint::Other)]
+        #[arg(long, default_value = DEFAULT_OPTIMIZER_RUNS)]
        optimizer_runs: usize,
        /// Private secp256K1 key in hex format, 64 chars, no 0x prefix, of the account signing transactions. If None the private key will be generated by Anvil
-        #[arg(short = 'P', long, value_hint = clap::ValueHint::Other)]
+        #[arg(short = 'P', long)]
        private_key: Option<String>,
    },
    #[cfg(not(target_arch = "wasm32"))]
@@ -824,25 +771,25 @@ pub enum Commands {
    #[command(name = "deploy-evm-da")]
    DeployEvmDataAttestation {
        /// The path to the .json data file, which should include both the network input (possibly private) and the network output (public input to the proof)
-        #[arg(short = 'D', long, default_value = DEFAULT_DATA, value_hint = clap::ValueHint::FilePath)]
+        #[arg(short = 'D', long, default_value = DEFAULT_DATA)]
        data: Option<PathBuf>,
        /// The path to load circuit settings .json file from (generated using the gen-settings command)
-        #[arg(long, default_value = DEFAULT_SETTINGS, value_hint = clap::ValueHint::FilePath)]
+        #[arg(long, default_value = DEFAULT_SETTINGS)]
        settings_path: Option<PathBuf>,
        /// The path to the Solidity code
-        #[arg(long, default_value = DEFAULT_SOL_CODE_DA, value_hint = clap::ValueHint::FilePath)]
+        #[arg(long, default_value = DEFAULT_SOL_CODE_DA)]
        sol_code_path: Option<PathBuf>,
        /// RPC URL for an Ethereum node, if None will use Anvil but WON'T persist state
-        #[arg(short = 'U', long, value_hint = clap::ValueHint::Url)]
+        #[arg(short = 'U', long)]
        rpc_url: Option<String>,
-        #[arg(long, default_value = DEFAULT_CONTRACT_ADDRESS_DA, value_hint = clap::ValueHint::FilePath)]
+        #[arg(long, default_value = DEFAULT_CONTRACT_ADDRESS_DA)]
        /// The path to output the contract address
        addr_path: Option<PathBuf>,
        /// The optimizer runs to set on the verifier. (Lower values optimize for deployment, while higher values optimize for execution)
-        #[arg(long, default_value = DEFAULT_OPTIMIZER_RUNS, value_hint = clap::ValueHint::Other)]
+        #[arg(long, default_value = DEFAULT_OPTIMIZER_RUNS)]
        optimizer_runs: usize,
        /// Private secp256K1 key in hex format, 64 chars, no 0x prefix, of the account signing transactions. If None the private key will be generated by Anvil
-        #[arg(short = 'P', long, value_hint = clap::ValueHint::Other)]
+        #[arg(short = 'P', long)]
        private_key: Option<String>,
    },
    #[cfg(not(target_arch = "wasm32"))]
@@ -850,32 +797,19 @@ pub enum Commands {
    #[command(name = "verify-evm")]
    VerifyEvm {
        /// The path to the proof file (generated using the prove command)
-        #[arg(long, default_value = DEFAULT_PROOF, value_hint = clap::ValueHint::FilePath)]
+        #[arg(long, default_value = DEFAULT_PROOF)]
        proof_path: Option<PathBuf>,
        /// The path to verifier contract's address
-        #[arg(long, default_value = DEFAULT_CONTRACT_ADDRESS, value_hint = clap::ValueHint::Other)]
+        #[arg(long, default_value = DEFAULT_CONTRACT_ADDRESS)]
        addr_verifier: H160Flag,
        /// RPC URL for an Ethereum node, if None will use Anvil but WON'T persist state
-        #[arg(short = 'U', long, value_hint = clap::ValueHint::Url)]
+        #[arg(short = 'U', long)]
        rpc_url: Option<String>,
        /// does the verifier use data attestation ?
-        #[arg(long, value_hint = clap::ValueHint::Other)]
+        #[arg(long)]
        addr_da: Option<H160Flag>,
        // is the vk rendered seperately, if so specify an address
-        #[arg(long, value_hint = clap::ValueHint::Other)]
+        #[arg(long)]
        addr_vk: Option<H160Flag>,
    },
 }
-
-
-impl Commands {
-    /// Converts the commands to a json string
-    pub fn as_json(&self) -> String {
-        serde_json::to_string(self).unwrap()
-    }
-
-    /// Converts a json string to a Commands struct
-    pub fn from_json(json: &str) -> Self {
-        serde_json::from_str(json).unwrap()
-    }
-}
--- a/src/eth.rs
+++ b/src/eth.rs
@@ -23,6 +23,7 @@ use alloy::providers::fillers::{
 use alloy::providers::network::{Ethereum, EthereumSigner};
 use alloy::providers::ProviderBuilder;
 use alloy::providers::{Identity, Provider, RootProvider};
+use alloy::rpc::types::eth::BlockId;
 use alloy::rpc::types::eth::TransactionInput;
 use alloy::rpc::types::eth::TransactionRequest;
 use alloy::signers::wallet::LocalWallet;
@@ -590,7 +591,7 @@ pub async fn verify_proof_via_solidity(
        return Err(Box::new(EvmVerificationError::InvalidProof));
    }

-    let gas = client.estimate_gas(&tx).await?;
+    let gas = client.estimate_gas(&tx, BlockId::default()).await?;

    info!("estimated verify gas cost: {:#?}", gas);

@@ -724,7 +725,7 @@ pub async fn verify_proof_with_data_attestation(
    debug!("transaction {:#?}", tx);
    info!(
        "estimated verify gas cost: {:#?}",
-        client.estimate_gas(&tx).await?
+        client.estimate_gas(&tx, BlockId::default()).await?
    );

    let result = client.call(&tx).await;
@@ -922,15 +923,13 @@ pub async fn get_contract_artifacts(
        return Err(format!("file not found: {:#?}", sol_code_path).into());
    }

-    let settings = SolcSettings {
-        optimizer: Optimizer {
-            enabled: Some(true),
-            runs: Some(runs),
-            details: None,
-        },
-        output_selection: OutputSelection::default_output_selection(),
-        ..Default::default()
+    let mut settings = SolcSettings::default();
+    settings.optimizer = Optimizer {
+        enabled: Some(true),
+        runs: Some(runs),
+        details: None,
    };
+    settings.output_selection = OutputSelection::default_output_selection();

    let input = SolcInput::build(
        std::collections::BTreeMap::from([(
--- a/src/execute.rs
+++ b/src/execute.rs
@@ -204,18 +204,6 @@ pub async fn run(command: Commands) -> Result<String, Box<dyn Error>> {
            )
            .await
        }
-        #[cfg(not(target_arch = "wasm32"))]
-        Commands::EncodeEvmCalldata {
-            proof_path,
-            calldata_path,
-            addr_vk,
-        } => encode_evm_calldata(
-            proof_path.unwrap_or(DEFAULT_PROOF.into()),
-            calldata_path.unwrap_or(DEFAULT_CALLDATA.into()),
-            addr_vk,
-        )
-        .map(|e| serde_json::to_string(&e).unwrap()),
-
        Commands::CreateEvmVK {
            vk_path,
            srs_path,
@@ -1190,6 +1178,7 @@ pub(crate) async fn calibrate(
            );
            num_passed += 1;
        } else {
+            error!("calibration failed {}", res.err().unwrap());
            num_failed += 1;
        }

@@ -1542,32 +1531,6 @@ pub(crate) async fn deploy_evm(
    Ok(String::new())
 }

-/// Encodes the calldata for the EVM verifier (both aggregated and single proof)
-pub(crate) fn encode_evm_calldata(
-    proof_path: PathBuf,
-    calldata_path: PathBuf,
-    addr_vk: Option<H160Flag>,
-) -> Result<Vec<u8>, Box<dyn Error>> {
-    let snark = Snark::load::<IPACommitmentScheme<G1Affine>>(&proof_path)?;
-
-    let flattened_instances = snark.instances.into_iter().flatten();
-
-    let encoded = halo2_solidity_verifier::encode_calldata(
-        addr_vk
-            .as_ref()
-            .map(|x| alloy::primitives::Address::from(*x).0)
-            .map(|x| x.0),
-        &snark.proof,
-        &flattened_instances.collect::<Vec<_>>(),
-    );
-
-    log::debug!("Encoded calldata: {:?}", encoded);
-
-    File::create(calldata_path)?.write_all(encoded.as_slice())?;
-
-    Ok(encoded)
-}
-
 #[cfg(not(target_arch = "wasm32"))]
 pub(crate) async fn verify_evm(
    proof_path: PathBuf,
--- a/src/graph/modules.rs
+++ b/src/graph/modules.rs
@@ -15,7 +15,7 @@ use super::{VarVisibility, Visibility};

 /// poseidon len to hash in tree
 pub const POSEIDON_LEN_GRAPH: usize = 32;
-/// Poseidon number of instances
+/// Poseidon number of instancess
 pub const POSEIDON_INSTANCES: usize = 1;

 /// Poseidon module type
--- a/src/graph/node.rs
+++ b/src/graph/node.rs
@@ -550,7 +550,7 @@ impl Node {
            .collect::<Result<Vec<_>, Box<dyn Error>>>()?;

        let homogenous_inputs = opkind.requires_homogenous_input_scales();
-        // automatically increases a constant's scale if it is only used once and
+        // autoamtically increases a constant's scale if it is only used once and
        for input in homogenous_inputs
            .into_iter()
            .filter(|i| !deleted_indices.contains(i))
--- a/src/graph/postgres.rs
+++ b/src/graph/postgres.rs
@@ -1,7 +1,6 @@
 use log::{debug, error, info};
 use std::fmt::Debug;
 use std::net::IpAddr;
-#[cfg(unix)]
 use std::path::Path;
 use std::str::FromStr;
 use std::sync::Arc;
--- a/src/graph/vars.rs
+++ b/src/graph/vars.rs
@@ -72,7 +72,7 @@ impl ToFlags for Visibility {
 impl<'a> From<&'a str> for Visibility {
    fn from(s: &'a str) -> Self {
        if s.contains("hashed/private") {
-            // split on last occurrence of '/'
+            // split on last occurence of '/'
            let (_, outlets) = s.split_at(s.rfind('/').unwrap());
            let outlets = outlets
                .trim_start_matches('/')
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -178,37 +178,37 @@ impl From<String> for Commitments {
 #[derive(Debug, Args, Deserialize, Serialize, Clone, PartialEq, PartialOrd, ToFlags)]
 pub struct RunArgs {
    /// The tolerance for error on model outputs
-    #[arg(short = 'T', long, default_value = "0", value_hint = clap::ValueHint::Other)]
+    #[arg(short = 'T', long, default_value = "0")]
    pub tolerance: Tolerance,
    /// The denominator in the fixed point representation used when quantizing inputs
-    #[arg(short = 'S', long, default_value = "7", value_hint = clap::ValueHint::Other)]
+    #[arg(short = 'S', long, default_value = "7", allow_hyphen_values = true)]
    pub input_scale: Scale,
    /// The denominator in the fixed point representation used when quantizing parameters
-    #[arg(long, default_value = "7", value_hint = clap::ValueHint::Other)]
+    #[arg(long, default_value = "7", allow_hyphen_values = true)]
    pub param_scale: Scale,
    /// if the scale is ever > scale_rebase_multiplier * input_scale then the scale is rebased to input_scale (this a more advanced parameter, use with caution)
-    #[arg(long, default_value = "1",  value_hint = clap::ValueHint::Other)]
+    #[arg(long, default_value = "1")]
    pub scale_rebase_multiplier: u32,
    /// The min and max elements in the lookup table input column
    #[arg(short = 'B', long, value_parser = parse_key_val::<i64, i64>, default_value = "-32768->32768")]
    pub lookup_range: Range,
    /// The log_2 number of rows
-    #[arg(short = 'K', long, default_value = "17", value_hint = clap::ValueHint::Other)]
+    #[arg(short = 'K', long, default_value = "17")]
    pub logrows: u32,
    /// The log_2 number of rows
-    #[arg(short = 'N', long, default_value = "2", value_hint = clap::ValueHint::Other)]
+    #[arg(short = 'N', long, default_value = "2")]
    pub num_inner_cols: usize,
    /// Hand-written parser for graph variables, eg. batch_size=1
-    #[arg(short = 'V', long, value_parser = parse_key_val::<String, usize>, default_value = "batch_size->1", value_delimiter = ',', value_hint = clap::ValueHint::Other)]
+    #[arg(short = 'V', long, value_parser = parse_key_val::<String, usize>, default_value = "batch_size->1", value_delimiter = ',')]
    pub variables: Vec<(String, usize)>,
    /// Flags whether inputs are public, private, fixed, hashed, polycommit
-    #[arg(long, default_value = "private", value_hint = clap::ValueHint::Other)]
+    #[arg(long, default_value = "private")]
    pub input_visibility: Visibility,
    /// Flags whether outputs are public, private, fixed, hashed, polycommit
-    #[arg(long, default_value = "public", value_hint = clap::ValueHint::Other)]
+    #[arg(long, default_value = "public")]
    pub output_visibility: Visibility,
    /// Flags whether params are fixed, private, hashed, polycommit
-    #[arg(long, default_value = "private", value_hint = clap::ValueHint::Other)]
+    #[arg(long, default_value = "private")]
    pub param_visibility: Visibility,
    #[arg(long, default_value = "false")]
    /// Rebase the scale using lookup table for division instead of using a range check
@@ -217,10 +217,10 @@ pub struct RunArgs {
    #[arg(long, default_value = "false")]
    pub rebase_frac_zero_constants: bool,
    /// check mode (safe, unsafe, etc)
-    #[arg(long, default_value = "unsafe", value_hint = clap::ValueHint::Other)]
+    #[arg(long, default_value = "unsafe")]
    pub check_mode: CheckMode,
    /// commitment scheme
-    #[arg(long, default_value = "kzg", value_hint = clap::ValueHint::Other)]
+    #[arg(long, default_value = "kzg")]
    pub commitment: Option<Commitments>,
 }

--- a/src/pfsys/evm/mod.rs
+++ b/src/pfsys/evm/mod.rs
@@ -21,7 +21,7 @@ pub enum EvmVerificationError {
    /// EVM verify errors
    #[error("evm deployment failed")]
    Deploy,
-    /// Invalid Visibility
+    /// Invalid Visibilit
    #[error("Invalid visibility")]
    InvalidVisibility,
 }
--- a/src/python.rs
+++ b/src/python.rs
@@ -466,7 +466,7 @@ fn buffer_to_felts(buffer: Vec<u8>) -> PyResult<Vec<String>> {
 /// Arguments
 /// -------
 /// message: list[str]
-///     List of field elements represented as strings
+///     List of field elements represnted as strings
 ///
 /// Returns
 /// -------
@@ -1430,47 +1430,6 @@ fn verify_aggr(
    Ok(true)
 }

-/// Creates encoded evm calldata from a proof file
-///
-/// Arguments
-/// ---------
-/// proof: str
-///     Path to the proof file
-///
-/// calldata: str
-///    Path to the calldata file to save
-///
-/// addr_vk: str
-///    The address of the verification key contract (if the verifier key is to be rendered as a separate contract)
-///
-/// Returns
-/// -------
-/// vec[u8]
-///    The encoded calldata
-///
-#[pyfunction(signature = (
-    proof=PathBuf::from(DEFAULT_PROOF),
-    calldata=PathBuf::from(DEFAULT_CALLDATA),
-    addr_vk=None,
-))]
-fn encode_evm_calldata<'a>(
-    proof: PathBuf,
-    calldata: PathBuf,
-    addr_vk: Option<&'a str>,
-) -> Result<Vec<u8>, PyErr> {
-    let addr_vk = if let Some(addr_vk) = addr_vk {
-        let addr_vk = H160Flag::from(addr_vk);
-        Some(addr_vk)
-    } else {
-        None
-    };
-
-    crate::execute::encode_evm_calldata(proof, calldata, addr_vk).map_err(|e| {
-        let err_str = format!("Failed to generate calldata: {}", e);
-        PyRuntimeError::new_err(err_str)
-    })
-}
-
 /// Creates an EVM compatible verifier, you will need solc installed in your environment to run this
 ///
 /// Arguments
@@ -1929,6 +1888,6 @@ fn ezkl(_py: Python<'_>, m: &PyModule) -> PyResult<()> {
    m.add_function(wrap_pyfunction!(setup_test_evm_witness, m)?)?;
    m.add_function(wrap_pyfunction!(create_evm_verifier_aggr, m)?)?;
    m.add_function(wrap_pyfunction!(create_evm_data_attestation, m)?)?;
-    m.add_function(wrap_pyfunction!(encode_evm_calldata, m)?)?;
+
    Ok(())
 }
--- a/tests/integration_tests.rs
+++ b/tests/integration_tests.rs
@@ -1814,18 +1814,6 @@ mod native_tests {
        let settings_arg = format!("{}/{}/settings.json", test_dir, example_name);
        let private_key = format!("--private-key={}", *ANVIL_DEFAULT_PRIVATE_KEY);

-        // create encoded calldata
-        let status = Command::new(format!("{}/release/ezkl", *CARGO_TARGET_DIR))
-            .args([
-                "encode-evm-calldata",
-                "--proof-path",
-                &format!("{}/{}/aggr.pf", test_dir, example_name),
-            ])
-            .status()
-            .expect("failed to execute process");
-
-        assert!(status.success());
-
        let base_args = vec![
            "create-evm-verifier-aggr",
            "--vk-path",
@@ -2048,18 +2036,6 @@ mod native_tests {
        let addr_path_arg = format!("--addr-path={}/{}/addr.txt", test_dir, example_name);
        let settings_arg = format!("--settings-path={}", settings_path);

-        // create encoded calldata
-        let status = Command::new(format!("{}/release/ezkl", *CARGO_TARGET_DIR))
-            .args([
-                "encode-evm-calldata",
-                "--proof-path",
-                &format!("{}/{}/proof.pf", test_dir, example_name),
-            ])
-            .status()
-            .expect("failed to execute process");
-
-        assert!(status.success());
-
        // create the verifier
        let mut args = vec!["create-evm-verifier", "--vk-path", &vk_arg, &settings_arg];

@@ -2229,19 +2205,6 @@ mod native_tests {

        let deployed_addr_arg_vk = format!("--addr-vk={}", addr_vk);

-        // create encoded calldata
-        let status = Command::new(format!("{}/release/ezkl", *CARGO_TARGET_DIR))
-            .args([
-                "encode-evm-calldata",
-                "--proof-path",
-                &format!("{}/{}/proof.pf", test_dir, example_name),
-                &deployed_addr_arg_vk,
-            ])
-            .status()
-            .expect("failed to execute process");
-
-        assert!(status.success());
-
        // now verify the proof
        let pf_arg = format!("{}/{}/proof.pf", test_dir, example_name);
        let mut args = vec![
@@ -2413,18 +2376,6 @@ mod native_tests {

        let settings_arg = format!("--settings-path={}", settings_path);

-        // create encoded calldata
-        let status = Command::new(format!("{}/release/ezkl", *CARGO_TARGET_DIR))
-            .args([
-                "encode-evm-calldata",
-                "--proof-path",
-                &format!("{}/{}/proof.pf", test_dir, example_name),
-            ])
-            .status()
-            .expect("failed to execute process");
-
-        assert!(status.success());
-
        // create the verifier
        let mut args = vec!["create-evm-verifier", "--vk-path", &vk_arg, &settings_arg];

--- a/tests/python/binding_tests.py
+++ b/tests/python/binding_tests.py
@@ -402,15 +402,6 @@ async def test_create_evm_verifier():
    settings_path = os.path.join(folder_path, 'settings.json')
    sol_code_path = os.path.join(folder_path, 'test.sol')
    abi_path = os.path.join(folder_path, 'test.abi')
-    proof_path = os.path.join(folder_path, 'test_evm.pf')
-    calldata_path = os.path.join(folder_path, 'calldata.bytes')
-
-    # res is now a vector of bytes
-    res = ezkl.encode_evm_calldata(proof_path, calldata_path)
-
-    assert os.path.isfile(calldata_path)
-    assert len(res) > 0
-

    res = await ezkl.create_evm_verifier(
        vk_path,