refactor: DataSource enum -> struct

.github/workflows/rust.yml

@@ -25,7 +25,7 @@ jobs:
       contents: read
     runs-on: large-self-hosted
     env:
-      VERIFICATION_EZKL_TOKEN: ${{ secrets.VERIFICATION_EZKL_TOKEN }} 
+      VERIFICATION_EZKL_TOKEN: ${{ secrets.VERIFICATION_EZKL_TOKEN }}
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
         with:
@@ -36,12 +36,12 @@ jobs:
             echo "❌ VERIFICATION_EZKL_TOKEN is empty – check repo/org secrets" >&2
             exit 1
           fi
-          
+
           # Configure git to use the token for all GitHub requests
           git config --global credential.helper store
           echo "https://${VERIFICATION_EZKL_TOKEN}:x-oauth-basic@github.com" > ~/.git-credentials
           chmod 600 ~/.git-credentials
-          
+
           # Also set the URL replacement as before
           git config --global \
             url."https://${VERIFICATION_EZKL_TOKEN}:x-oauth-basic@github.com/".insteadOf \
@@ -66,7 +66,7 @@ jobs:
       contents: read
     runs-on: ubuntu-latest
     env:
-      VERIFICATION_EZKL_TOKEN: ${{ secrets.VERIFICATION_EZKL_TOKEN }} 
+      VERIFICATION_EZKL_TOKEN: ${{ secrets.VERIFICATION_EZKL_TOKEN }}
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
         with:
@@ -77,12 +77,12 @@ jobs:
             echo "❌ VERIFICATION_EZKL_TOKEN is empty – check repo/org secrets" >&2
             exit 1
           fi
-          
+
           # Configure git to use the token for all GitHub requests
           git config --global credential.helper store
           echo "https://${VERIFICATION_EZKL_TOKEN}:x-oauth-basic@github.com" > ~/.git-credentials
           chmod 600 ~/.git-credentials
-          
+
           # Also set the URL replacement as before
           git config --global \
             url."https://${VERIFICATION_EZKL_TOKEN}:x-oauth-basic@github.com/".insteadOf \
@@ -103,7 +103,7 @@ jobs:
       contents: read
     runs-on: ubuntu-latest
     env:
-      VERIFICATION_EZKL_TOKEN: ${{ secrets.VERIFICATION_EZKL_TOKEN }} 
+      VERIFICATION_EZKL_TOKEN: ${{ secrets.VERIFICATION_EZKL_TOKEN }}
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
         with:
@@ -114,12 +114,12 @@ jobs:
             echo "❌ VERIFICATION_EZKL_TOKEN is empty – check repo/org secrets" >&2
             exit 1
           fi
-          
+
           # Configure git to use the token for all GitHub requests
           git config --global credential.helper store
           echo "https://${VERIFICATION_EZKL_TOKEN}:x-oauth-basic@github.com" > ~/.git-credentials
           chmod 600 ~/.git-credentials
-          
+
           # Also set the URL replacement as before
           git config --global \
             url."https://${VERIFICATION_EZKL_TOKEN}:x-oauth-basic@github.com/".insteadOf \
@@ -140,7 +140,7 @@ jobs:
       contents: read
     runs-on: ubuntu-latest-32-cores
     env:
-      VERIFICATION_EZKL_TOKEN: ${{ secrets.VERIFICATION_EZKL_TOKEN }} 
+      VERIFICATION_EZKL_TOKEN: ${{ secrets.VERIFICATION_EZKL_TOKEN }}
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
         with:
@@ -151,12 +151,12 @@ jobs:
             echo "❌ VERIFICATION_EZKL_TOKEN is empty – check repo/org secrets" >&2
             exit 1
           fi
-          
+
           # Configure git to use the token for all GitHub requests
           git config --global credential.helper store
           echo "https://${VERIFICATION_EZKL_TOKEN}:x-oauth-basic@github.com" > ~/.git-credentials
           chmod 600 ~/.git-credentials
-          
+
           # Also set the URL replacement as before
           git config --global \
             url."https://${VERIFICATION_EZKL_TOKEN}:x-oauth-basic@github.com/".insteadOf \
@@ -179,7 +179,7 @@ jobs:
       - name: Library tests
         run: cargo nextest run --lib --verbose
       - name: Library tests (original lookup)
-        run: cargo nextest run --lib --verbose --no-default-features --features ezkl
+        run: cargo nextest run --lib --verbose --no-default-features --features ezkl,eth-original-lookup
 
   # ultra-overflow-tests-gpu:
   #   runs-on: GPU
@@ -219,7 +219,7 @@ jobs:
       contents: read
     runs-on: non-gpu
     env:
-      VERIFICATION_EZKL_TOKEN: ${{ secrets.VERIFICATION_EZKL_TOKEN }} 
+      VERIFICATION_EZKL_TOKEN: ${{ secrets.VERIFICATION_EZKL_TOKEN }}
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
         with:
@@ -230,12 +230,12 @@ jobs:
             echo "❌ VERIFICATION_EZKL_TOKEN is empty – check repo/org secrets" >&2
             exit 1
           fi
-          
+
           # Configure git to use the token for all GitHub requests
           git config --global credential.helper store
           echo "https://${VERIFICATION_EZKL_TOKEN}:x-oauth-basic@github.com" > ~/.git-credentials
           chmod 600 ~/.git-credentials
-          
+
           # Also set the URL replacement as before
           git config --global \
             url."https://${VERIFICATION_EZKL_TOKEN}:x-oauth-basic@github.com/".insteadOf \
@@ -260,20 +260,20 @@ jobs:
       # - name: Conv overflow (wasi)
       #   run: cargo wasi test conv_col_ultra_overflow -- --include-ignored --nocapture
       - name: lookup overflow
-        run: cargo nextest run --release lookup_ultra_overflow --no-capture --no-default-features --features ezkl -- --include-ignored
+        run: cargo nextest run --release lookup_ultra_overflow --no-capture --no-default-features --features ezkl,eth-original-lookup -- --include-ignored
       - name: Matmul overflow
-        run: RUST_LOG=debug cargo nextest run --release matmul_col_ultra_overflow --no-capture --no-default-features --features ezkl -- --include-ignored
+        run: RUST_LOG=debug cargo nextest run --release matmul_col_ultra_overflow --no-capture --no-default-features --features ezkl,eth-original-lookup -- --include-ignored
       - name: Conv overflow
-        run: RUST_LOG=debug cargo nextest run --release conv_col_ultra_overflow --no-capture --no-default-features --features ezkl -- --include-ignored
+        run: RUST_LOG=debug cargo nextest run --release conv_col_ultra_overflow --no-capture --no-default-features --features ezkl,eth-original-lookup -- --include-ignored
       - name: Conv + relu overflow
-        run: cargo nextest run --release conv_relu_col_ultra_overflow --no-capture --no-default-features --features ezkl -- --include-ignored
+        run: cargo nextest run --release conv_relu_col_ultra_overflow --no-capture --no-default-features --features ezkl,eth-original-lookup -- --include-ignored
 
   ultra-overflow-tests:
     permissions:
       contents: read
     runs-on: non-gpu
     env:
-      VERIFICATION_EZKL_TOKEN: ${{ secrets.VERIFICATION_EZKL_TOKEN }} 
+      VERIFICATION_EZKL_TOKEN: ${{ secrets.VERIFICATION_EZKL_TOKEN }}
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
         with:
@@ -284,12 +284,12 @@ jobs:
             echo "❌ VERIFICATION_EZKL_TOKEN is empty – check repo/org secrets" >&2
             exit 1
           fi
-          
+
           # Configure git to use the token for all GitHub requests
           git config --global credential.helper store
           echo "https://${VERIFICATION_EZKL_TOKEN}:x-oauth-basic@github.com" > ~/.git-credentials
           chmod 600 ~/.git-credentials
-          
+
           # Also set the URL replacement as before
           git config --global \
             url."https://${VERIFICATION_EZKL_TOKEN}:x-oauth-basic@github.com/".insteadOf \
@@ -327,7 +327,7 @@ jobs:
       contents: read
     runs-on: ubuntu-latest-16-cores
     env:
-      VERIFICATION_EZKL_TOKEN: ${{ secrets.VERIFICATION_EZKL_TOKEN }} 
+      VERIFICATION_EZKL_TOKEN: ${{ secrets.VERIFICATION_EZKL_TOKEN }}
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
         with:
@@ -338,12 +338,12 @@ jobs:
             echo "❌ VERIFICATION_EZKL_TOKEN is empty – check repo/org secrets" >&2
             exit 1
           fi
-          
+
           # Configure git to use the token for all GitHub requests
           git config --global credential.helper store
           echo "https://${VERIFICATION_EZKL_TOKEN}:x-oauth-basic@github.com" > ~/.git-credentials
           chmod 600 ~/.git-credentials
-          
+
           # Also set the URL replacement as before
           git config --global \
             url."https://${VERIFICATION_EZKL_TOKEN}:x-oauth-basic@github.com/".insteadOf \
@@ -368,7 +368,7 @@ jobs:
       contents: read
     runs-on: non-gpu
     env:
-      VERIFICATION_EZKL_TOKEN: ${{ secrets.VERIFICATION_EZKL_TOKEN }} 
+      VERIFICATION_EZKL_TOKEN: ${{ secrets.VERIFICATION_EZKL_TOKEN }}
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
         with:
@@ -379,12 +379,12 @@ jobs:
             echo "❌ VERIFICATION_EZKL_TOKEN is empty – check repo/org secrets" >&2
             exit 1
           fi
-          
+
           # Configure git to use the token for all GitHub requests
           git config --global credential.helper store
           echo "https://${VERIFICATION_EZKL_TOKEN}:x-oauth-basic@github.com" > ~/.git-credentials
           chmod 600 ~/.git-credentials
-          
+
           # Also set the URL replacement as before
           git config --global \
             url."https://${VERIFICATION_EZKL_TOKEN}:x-oauth-basic@github.com/".insteadOf \
@@ -437,7 +437,7 @@ jobs:
       contents: read
     runs-on: non-gpu
     env:
-      VERIFICATION_EZKL_TOKEN: ${{ secrets.VERIFICATION_EZKL_TOKEN }} 
+      VERIFICATION_EZKL_TOKEN: ${{ secrets.VERIFICATION_EZKL_TOKEN }}
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
         with:
@@ -448,12 +448,12 @@ jobs:
             echo "❌ VERIFICATION_EZKL_TOKEN is empty – check repo/org secrets" >&2
             exit 1
           fi
-          
+
           # Configure git to use the token for all GitHub requests
           git config --global credential.helper store
           echo "https://${VERIFICATION_EZKL_TOKEN}:x-oauth-basic@github.com" > ~/.git-credentials
           chmod 600 ~/.git-credentials
-          
+
           # Also set the URL replacement as before
           git config --global \
             url."https://${VERIFICATION_EZKL_TOKEN}:x-oauth-basic@github.com/".insteadOf \
@@ -525,7 +525,7 @@ jobs:
     runs-on: non-gpu
     needs: [build, library-tests, docs, python-tests, python-integration-tests]
     env:
-      VERIFICATION_EZKL_TOKEN: ${{ secrets.VERIFICATION_EZKL_TOKEN }} 
+      VERIFICATION_EZKL_TOKEN: ${{ secrets.VERIFICATION_EZKL_TOKEN }}
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
         with:
@@ -536,12 +536,12 @@ jobs:
             echo "❌ VERIFICATION_EZKL_TOKEN is empty – check repo/org secrets" >&2
             exit 1
           fi
-          
+
           # Configure git to use the token for all GitHub requests
           git config --global credential.helper store
           echo "https://${VERIFICATION_EZKL_TOKEN}:x-oauth-basic@github.com" > ~/.git-credentials
           chmod 600 ~/.git-credentials
-          
+
           # Also set the URL replacement as before
           git config --global \
             url."https://${VERIFICATION_EZKL_TOKEN}:x-oauth-basic@github.com/".insteadOf \
@@ -665,7 +665,7 @@ jobs:
     runs-on: non-gpu
     needs: [build, library-tests, docs]
     env:
-      VERIFICATION_EZKL_TOKEN: ${{ secrets.VERIFICATION_EZKL_TOKEN }} 
+      VERIFICATION_EZKL_TOKEN: ${{ secrets.VERIFICATION_EZKL_TOKEN }}
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
         with:
@@ -676,12 +676,12 @@ jobs:
             echo "❌ VERIFICATION_EZKL_TOKEN is empty – check repo/org secrets" >&2
             exit 1
           fi
-          
+
           # Configure git to use the token for all GitHub requests
           git config --global credential.helper store
           echo "https://${VERIFICATION_EZKL_TOKEN}:x-oauth-basic@github.com" > ~/.git-credentials
           chmod 600 ~/.git-credentials
-          
+
           # Also set the URL replacement as before
           git config --global \
             url."https://${VERIFICATION_EZKL_TOKEN}:x-oauth-basic@github.com/".insteadOf \
@@ -805,7 +805,7 @@ jobs:
     runs-on: self-hosted
     needs: [build, library-tests, docs, python-tests, python-integration-tests]
     env:
-      VERIFICATION_EZKL_TOKEN: ${{ secrets.VERIFICATION_EZKL_TOKEN }} 
+      VERIFICATION_EZKL_TOKEN: ${{ secrets.VERIFICATION_EZKL_TOKEN }}
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
         with:
@@ -816,12 +816,12 @@ jobs:
             echo "❌ VERIFICATION_EZKL_TOKEN is empty – check repo/org secrets" >&2
             exit 1
           fi
-          
+
           # Configure git to use the token for all GitHub requests
           git config --global credential.helper store
           echo "https://${VERIFICATION_EZKL_TOKEN}:x-oauth-basic@github.com" > ~/.git-credentials
           chmod 600 ~/.git-credentials
-          
+
           # Also set the URL replacement as before
           git config --global \
             url."https://${VERIFICATION_EZKL_TOKEN}:x-oauth-basic@github.com/".insteadOf \
@@ -867,7 +867,7 @@ jobs:
     runs-on: large-self-hosted
     needs: [build, library-tests, docs, python-tests, python-integration-tests]
     env:
-      VERIFICATION_EZKL_TOKEN: ${{ secrets.VERIFICATION_EZKL_TOKEN }} 
+      VERIFICATION_EZKL_TOKEN: ${{ secrets.VERIFICATION_EZKL_TOKEN }}
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
         with:
@@ -878,12 +878,12 @@ jobs:
             echo "❌ VERIFICATION_EZKL_TOKEN is empty – check repo/org secrets" >&2
             exit 1
           fi
-          
+
           # Configure git to use the token for all GitHub requests
           git config --global credential.helper store
           echo "https://${VERIFICATION_EZKL_TOKEN}:x-oauth-basic@github.com" > ~/.git-credentials
           chmod 600 ~/.git-credentials
-          
+
           # Also set the URL replacement as before
           git config --global \
             url."https://${VERIFICATION_EZKL_TOKEN}:x-oauth-basic@github.com/".insteadOf \
@@ -909,7 +909,7 @@ jobs:
     runs-on: large-self-hosted
     needs: [build, library-tests, docs, python-tests, python-integration-tests]
     env:
-      VERIFICATION_EZKL_TOKEN: ${{ secrets.VERIFICATION_EZKL_TOKEN }} 
+      VERIFICATION_EZKL_TOKEN: ${{ secrets.VERIFICATION_EZKL_TOKEN }}
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
         with:
@@ -920,12 +920,12 @@ jobs:
             echo "❌ VERIFICATION_EZKL_TOKEN is empty – check repo/org secrets" >&2
             exit 1
           fi
-          
+
           # Configure git to use the token for all GitHub requests
           git config --global credential.helper store
           echo "https://${VERIFICATION_EZKL_TOKEN}:x-oauth-basic@github.com" > ~/.git-credentials
           chmod 600 ~/.git-credentials
-          
+
           # Also set the URL replacement as before
           git config --global \
             url."https://${VERIFICATION_EZKL_TOKEN}:x-oauth-basic@github.com/".insteadOf \
@@ -955,7 +955,7 @@ jobs:
     runs-on: ubuntu-latest-32-cores
     needs: [build, library-tests, docs]
     env:
-      VERIFICATION_EZKL_TOKEN: ${{ secrets.VERIFICATION_EZKL_TOKEN }} 
+      VERIFICATION_EZKL_TOKEN: ${{ secrets.VERIFICATION_EZKL_TOKEN }}
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
         with:
@@ -966,12 +966,12 @@ jobs:
             echo "❌ VERIFICATION_EZKL_TOKEN is empty – check repo/org secrets" >&2
             exit 1
           fi
-          
+
           # Configure git to use the token for all GitHub requests
           git config --global credential.helper store
           echo "https://${VERIFICATION_EZKL_TOKEN}:x-oauth-basic@github.com" > ~/.git-credentials
           chmod 600 ~/.git-credentials
-          
+
           # Also set the URL replacement as before
           git config --global \
             url."https://${VERIFICATION_EZKL_TOKEN}:x-oauth-basic@github.com/".insteadOf \
@@ -997,7 +997,7 @@ jobs:
     runs-on: non-gpu
     needs: [build, library-tests, docs]
     env:
-      VERIFICATION_EZKL_TOKEN: ${{ secrets.VERIFICATION_EZKL_TOKEN }} 
+      VERIFICATION_EZKL_TOKEN: ${{ secrets.VERIFICATION_EZKL_TOKEN }}
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
         with:
@@ -1008,12 +1008,12 @@ jobs:
             echo "❌ VERIFICATION_EZKL_TOKEN is empty – check repo/org secrets" >&2
             exit 1
           fi
-          
+
           # Configure git to use the token for all GitHub requests
           git config --global credential.helper store
           echo "https://${VERIFICATION_EZKL_TOKEN}:x-oauth-basic@github.com" > ~/.git-credentials
           chmod 600 ~/.git-credentials
-          
+
           # Also set the URL replacement as before
           git config --global \
             url."https://${VERIFICATION_EZKL_TOKEN}:x-oauth-basic@github.com/".insteadOf \
@@ -1048,7 +1048,7 @@ jobs:
     runs-on: non-gpu
     needs: [build, library-tests, docs, python-tests, python-integration-tests]
     env:
-      VERIFICATION_EZKL_TOKEN: ${{ secrets.VERIFICATION_EZKL_TOKEN }} 
+      VERIFICATION_EZKL_TOKEN: ${{ secrets.VERIFICATION_EZKL_TOKEN }}
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
         with:
@@ -1059,12 +1059,12 @@ jobs:
             echo "❌ VERIFICATION_EZKL_TOKEN is empty – check repo/org secrets" >&2
             exit 1
           fi
-          
+
           # Configure git to use the token for all GitHub requests
           git config --global credential.helper store
           echo "https://${VERIFICATION_EZKL_TOKEN}:x-oauth-basic@github.com" > ~/.git-credentials
           chmod 600 ~/.git-credentials
-          
+
           # Also set the URL replacement as before
           git config --global \
             url."https://${VERIFICATION_EZKL_TOKEN}:x-oauth-basic@github.com/".insteadOf \
@@ -1120,7 +1120,7 @@ jobs:
           # Maps tcp port 5432 on service container to the host
           - 5432:5432
     env:
-      VERIFICATION_EZKL_TOKEN: ${{ secrets.VERIFICATION_EZKL_TOKEN }} 
+      VERIFICATION_EZKL_TOKEN: ${{ secrets.VERIFICATION_EZKL_TOKEN }}
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
         with:
@@ -1131,12 +1131,12 @@ jobs:
             echo "❌ VERIFICATION_EZKL_TOKEN is empty – check repo/org secrets" >&2
             exit 1
           fi
-          
+
           # Configure git to use the token for all GitHub requests
           git config --global credential.helper store
           echo "https://${VERIFICATION_EZKL_TOKEN}:x-oauth-basic@github.com" > ~/.git-credentials
           chmod 600 ~/.git-credentials
-          
+
           # Also set the URL replacement as before
           git config --global \
             url."https://${VERIFICATION_EZKL_TOKEN}:x-oauth-basic@github.com/".insteadOf \
@@ -1158,7 +1158,7 @@ jobs:
           locked: true
       # - name: Install solc
       #   run: (hash svm 2>/dev/null || cargo install svm-rs) && svm install 0.8.20 && solc --version
-      - name: Install Anvil 
+      - name: Install Anvil
         run: cargo install --git https://github.com/foundry-rs/foundry --rev 62cdea8ff9e6efef011f77e295823b5f2dbeb3a1 --locked anvil --force
       - name: Install pip
         run: python -m ensurepip --upgrade
@@ -1199,7 +1199,7 @@ jobs:
       contents: read
     runs-on: macos-latest
     env:
-      VERIFICATION_EZKL_TOKEN: ${{ secrets.VERIFICATION_EZKL_TOKEN }} 
+      VERIFICATION_EZKL_TOKEN: ${{ secrets.VERIFICATION_EZKL_TOKEN }}
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
         with:
@@ -1210,12 +1210,12 @@ jobs:
             echo "❌ VERIFICATION_EZKL_TOKEN is empty – check repo/org secrets" >&2
             exit 1
           fi
-          
+
           # Configure git to use the token for all GitHub requests
           git config --global credential.helper store
           echo "https://${VERIFICATION_EZKL_TOKEN}:x-oauth-basic@github.com" > ~/.git-credentials
           chmod 600 ~/.git-credentials
-          
+
           # Also set the URL replacement as before
           git config --global \
             url."https://${VERIFICATION_EZKL_TOKEN}:x-oauth-basic@github.com/".insteadOf \
@@ -1242,7 +1242,7 @@ jobs:
     needs: [ios-integration-tests]
 
     env:
-      VERIFICATION_EZKL_TOKEN: ${{ secrets.VERIFICATION_EZKL_TOKEN }} 
+      VERIFICATION_EZKL_TOKEN: ${{ secrets.VERIFICATION_EZKL_TOKEN }}
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
         with:
@@ -1253,12 +1253,12 @@ jobs:
             echo "❌ VERIFICATION_EZKL_TOKEN is empty – check repo/org secrets" >&2
             exit 1
           fi
-          
+
           # Configure git to use the token for all GitHub requests
           git config --global credential.helper store
           echo "https://${VERIFICATION_EZKL_TOKEN}:x-oauth-basic@github.com" > ~/.git-credentials
           chmod 600 ~/.git-credentials
-          
+
           # Also set the URL replacement as before
           git config --global \
             url."https://${VERIFICATION_EZKL_TOKEN}:x-oauth-basic@github.com/".insteadOf \

Cargo.toml

@@ -217,15 +217,15 @@ required-features = ["python-bindings"]
 [features]
 web = ["wasm-bindgen-rayon"]
 default = [
+    "eth-mv-lookup",
     "ezkl",
-    "mv-lookup",
     "precompute-coset",
     "no-banner",
     "parallel-poly-read",
 ]
 onnx = ["dep:tract-onnx"]
 python-bindings = ["pyo3", "pyo3-log", "pyo3-async-runtimes", "pyo3-stub-gen"]
-ios-bindings = ["mv-lookup", "precompute-coset", "parallel-poly-read", "uniffi"]
+ios-bindings = ["eth-mv-lookup", "precompute-coset", "parallel-poly-read", "uniffi"]
 ios-bindings-test = ["ios-bindings", "uniffi/bindgen-tests"]
 ezkl = [
     "onnx",
@@ -234,8 +234,6 @@ ezkl = [
     "tabled/color",
     "serde_json/std",
     "colored_json",
-    "dep:alloy",
-    "dep:foundry-compilers",
     "dep:ethabi",
     "dep:indicatif",
     "dep:gag",
@@ -247,11 +245,30 @@ ezkl = [
     "dep:chrono",
     "dep:sha256",
     "dep:clap_complete",
-    "dep:halo2_solidity_verifier",
     "dep:semver",
     "dep:clap",
     "dep:tosubcommand",
 ]
+eth = [
+    "dep:alloy",
+    "dep:foundry-compilers",
+    "dep:ethabi",
+]
+solidity-verifier = [
+    "dep:halo2_solidity_verifier",
+]
+solidity-verifier-mv-lookup = [
+    "halo2_solidity_verifier/mv-lookup",
+]
+eth-mv-lookup = [
+    "solidity-verifier-mv-lookup",
+    "mv-lookup",
+    "eth",
+]
+eth-original-lookup = [
+    "eth",
+    "solidity-verifier",
+]
 parallel-poly-read = [
     "halo2_proofs/circuit-params",
     "halo2_proofs/parallel-poly-read",
@@ -259,7 +276,6 @@ parallel-poly-read = [
 mv-lookup = [
     "halo2_proofs/mv-lookup",
     "snark-verifier/mv-lookup",
-    "halo2_solidity_verifier/mv-lookup",
 ]
 asm = ["halo2curves/asm", "halo2_proofs/asm"]
 precompute-coset = ["halo2_proofs/precompute-coset"]

src/bindings/python.rs

@@ -1,34 +1,34 @@
-use crate::Commitments;
-use crate::RunArgs;
-use crate::circuit::CheckMode;
-use crate::circuit::InputType;
-use crate::circuit::modules::Module;
 use crate::circuit::modules::polycommit::PolyCommitChip;
 use crate::circuit::modules::poseidon::{
+    spec::{PoseidonSpec, POSEIDON_RATE, POSEIDON_WIDTH},
     PoseidonChip,
-    spec::{POSEIDON_RATE, POSEIDON_WIDTH, PoseidonSpec},
 };
+use crate::circuit::modules::Module;
+use crate::circuit::CheckMode;
+use crate::circuit::InputType;
 use crate::commands::*;
-use crate::fieldutils::{IntegerRep, felt_to_integer_rep, integer_rep_to_felt};
+use crate::fieldutils::{felt_to_integer_rep, integer_rep_to_felt, IntegerRep};
 use crate::graph::TestDataSource;
 use crate::graph::{
-    GraphCircuit, GraphSettings, Model, Visibility, quantize_float, scale_to_multiplier,
+    quantize_float, scale_to_multiplier, GraphCircuit, GraphSettings, Model, Visibility,
 };
 use crate::pfsys::evm::aggregation_kzg::AggregationCircuit;
 use crate::pfsys::{
-    ProofType, TranscriptType, load_pk, load_vk, save_params, save_vk,
-    srs::gen_srs as ezkl_gen_srs, srs::load_srs_prover,
+    load_pk, load_vk, save_params, save_vk, srs::gen_srs as ezkl_gen_srs, srs::load_srs_prover,
+    ProofType, TranscriptType,
 };
+use crate::Commitments;
+use crate::RunArgs;
 use halo2_proofs::poly::ipa::commitment::IPACommitmentScheme;
 use halo2_proofs::poly::kzg::commitment::KZGCommitmentScheme;
-use halo2curves::bn256::{Bn256, Fq, Fr, G1, G1Affine};
+use halo2curves::bn256::{Bn256, Fq, Fr, G1Affine, G1};
 use pyo3::exceptions::{PyIOError, PyRuntimeError};
 use pyo3::prelude::*;
 use pyo3::wrap_pyfunction;
 use pyo3_log;
 use pyo3_stub_gen::{
-    TypeInfo, define_stub_info_gatherer, derive::gen_stub_pyclass, derive::gen_stub_pyclass_enum,
-    derive::gen_stub_pyfunction,
+    define_stub_info_gatherer, derive::gen_stub_pyclass, derive::gen_stub_pyclass_enum,
+    derive::gen_stub_pyfunction, TypeInfo,
 };
 use snark_verifier::util::arithmetic::PrimeField;
 use std::collections::HashSet;
@@ -1040,25 +1040,22 @@ fn calibrate_settings(
     scale_rebase_multiplier: Vec<u32>,
     max_logrows: Option<u32>,
 ) -> PyResult<Bound<'_, PyAny>> {
-    pyo3_async_runtimes::tokio::future_into_py(py, async move {
-        crate::execute::calibrate(
-            model,
-            data,
-            settings,
-            target,
-            lookup_safety_margin,
-            scales,
-            scale_rebase_multiplier,
-            max_logrows,
-        )
-        .await
-        .map_err(|e| {
-            let err_str = format!("Failed to calibrate settings: {}", e);
-            PyRuntimeError::new_err(err_str)
-        })?;
+    crate::execute::calibrate(
+        model,
+        data,
+        settings,
+        target,
+        lookup_safety_margin,
+        scales,
+        scale_rebase_multiplier,
+        max_logrows,
+    )
+    .map_err(|e| {
+        let err_str = format!("Failed to calibrate settings: {}", e);
+        PyRuntimeError::new_err(err_str)
+    })?;
 
-        Ok(true)
-    })
+    Ok(true)
 }
 
 /// Runs the forward pass operation to generate a witness
@@ -1101,15 +1098,12 @@ fn gen_witness(
     vk_path: Option<PathBuf>,
     srs_path: Option<PathBuf>,
 ) -> PyResult<Bound<'_, PyAny>> {
-    pyo3_async_runtimes::tokio::future_into_py(py, async move {
-        let output = crate::execute::gen_witness(model, data, output, vk_path, srs_path)
-            .await
-            .map_err(|e| {
-                let err_str = format!("Failed to generate witness: {}", e);
-                PyRuntimeError::new_err(err_str)
-            })?;
-        Python::with_gil(|py| Ok(output.to_object(py)))
-    })
+    let output =
+        crate::execute::gen_witness(model, data, output, vk_path, srs_path).map_err(|e| {
+            let err_str = format!("Failed to generate witness: {}", e);
+            PyRuntimeError::new_err(err_str)
+        })?;
+    Python::with_gil(|py| Ok(output.to_object(py)))
 }
 
 /// Mocks the prover

src/commands.rs

@@ -1,6 +1,7 @@
+#[cfg(all(feature = "eth", not(target_arch = "wasm32")))]
 use alloy::primitives::Address as H160;
 use clap::{Command, Parser, Subcommand};
-use clap_complete::{Generator, Shell, generate};
+use clap_complete::{generate, Generator, Shell};
 #[cfg(feature = "python-bindings")]
 use pyo3::{conversion::FromPyObject, exceptions::PyValueError, prelude::*};
 use serde::{Deserialize, Serialize};
@@ -8,7 +9,7 @@ use std::path::PathBuf;
 use std::str::FromStr;
 use tosubcommand::{ToFlags, ToSubcommand};
 
-use crate::{Commitments, RunArgs, pfsys::ProofType};
+use crate::{pfsys::ProofType, Commitments, RunArgs};
 
 use crate::circuit::CheckMode;
 use crate::pfsys::TranscriptType;
@@ -227,24 +228,25 @@ impl From<&str> for ContractType {
     }
 }
 
+#[cfg(all(feature = "eth", not(target_arch = "wasm32")))]
 #[derive(Debug, Copy, Clone, Serialize, Deserialize, PartialEq, PartialOrd)]
 /// wrapper for H160 to make it easy to parse into flag vals
 pub struct H160Flag {
     inner: H160,
 }
-
+#[cfg(all(feature = "eth", not(target_arch = "wasm32")))]
 impl From<H160Flag> for H160 {
     fn from(val: H160Flag) -> H160 {
         val.inner
     }
 }
-
+#[cfg(all(feature = "eth", not(target_arch = "wasm32")))]
 impl ToFlags for H160Flag {
     fn to_flags(&self) -> Vec<String> {
         vec![format!("{:#x}", self.inner)]
     }
 }
-
+#[cfg(all(feature = "eth", not(target_arch = "wasm32")))]
 impl From<&str> for H160Flag {
     fn from(s: &str) -> Self {
         Self {
@@ -704,6 +706,7 @@ pub enum Commands {
     },
     /// Encodes a proof into evm calldata
     #[command(name = "encode-evm-calldata")]
+    #[cfg(all(feature = "eth", not(target_arch = "wasm32")))]
     EncodeEvmCalldata {
         /// The path to the proof file (generated using the prove command)
         #[arg(long, default_value = DEFAULT_PROOF, value_hint = clap::ValueHint::FilePath)]
@@ -717,6 +720,7 @@ pub enum Commands {
     },
     /// Creates an Evm verifier for a single proof
     #[command(name = "create-evm-verifier")]
+    #[cfg(all(feature = "eth", not(target_arch = "wasm32")))]
     CreateEvmVerifier {
         /// The path to SRS, if None will use ~/.ezkl/srs/kzg{logrows}.srs
         #[arg(long, value_hint = clap::ValueHint::FilePath)]
@@ -739,6 +743,7 @@ pub enum Commands {
     },
     /// Creates an evm verifier artifact to be used by the reusable verifier
     #[command(name = "create-evm-vka")]
+    #[cfg(all(feature = "eth", not(target_arch = "wasm32")))]
     CreateEvmVka {
         /// The path to SRS, if None will use ~/.ezkl/srs/kzg{logrows}.srs
         #[arg(long, value_hint = clap::ValueHint::FilePath)]
@@ -760,6 +765,7 @@ pub enum Commands {
 
     /// Creates an Evm verifier for an aggregate proof
     #[command(name = "create-evm-verifier-aggr")]
+    #[cfg(all(feature = "eth", not(target_arch = "wasm32")))]
     CreateEvmVerifierAggr {
         /// The path to SRS, if None will use ~/.ezkl/srs/kzg{logrows}.srs
         #[arg(long, value_hint = clap::ValueHint::FilePath)]
@@ -823,6 +829,7 @@ pub enum Commands {
         commitment: Option<Commitments>,
     },
     /// Deploys an evm contract (verifier, reusable verifier, or vk artifact) that is generated by ezkl
+    #[cfg(all(feature = "eth", not(target_arch = "wasm32")))]
     DeployEvm {
         /// 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)]
@@ -845,6 +852,7 @@ pub enum Commands {
     },
     /// Verifies a proof using a local Evm executor, returning accept or reject
     #[command(name = "verify-evm")]
+    #[cfg(all(feature = "eth", not(target_arch = "wasm32")))]
     VerifyEvm {
         /// The path to the proof file (generated using the prove command)
         #[arg(long, default_value = DEFAULT_PROOF, value_hint = clap::ValueHint::FilePath)]
@@ -861,6 +869,7 @@ pub enum Commands {
     },
     /// Registers a VKA, returning the its digest used to identify it on-chain.
     #[command(name = "register-vka")]
+    #[cfg(all(feature = "eth", not(target_arch = "wasm32")))]
     RegisterVka {
         /// 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)]

src/execute.rs

@@ -1,29 +1,30 @@
-use crate::EZKL_BUF_CAPACITY;
-use crate::circuit::CheckMode;
 use crate::circuit::region::RegionSettings;
+use crate::circuit::CheckMode;
 use crate::commands::CalibrationTarget;
+#[cfg(all(feature = "eth", not(target_arch = "wasm32")))]
 use crate::eth::{deploy_contract_via_solidity, register_vka_via_rv};
 #[allow(unused_imports)]
+#[cfg(all(feature = "eth", not(target_arch = "wasm32")))]
 use crate::eth::{get_contract_artifacts, verify_proof_via_solidity};
 use crate::graph::input::GraphData;
 use crate::graph::{GraphCircuit, GraphSettings, GraphWitness, Model};
 use crate::pfsys::evm::aggregation_kzg::{AggregationCircuit, PoseidonTranscript};
 use crate::pfsys::{
-    ProofSplitCommit, create_proof_circuit, swap_proof_commitments_polycommit, verify_proof_circuit,
+    create_keys, load_pk, load_vk, save_params, save_pk, Snark, StrategyType, TranscriptType,
 };
 use crate::pfsys::{
-    Snark, StrategyType, TranscriptType, create_keys, load_pk, load_vk, save_params, save_pk,
+    create_proof_circuit, swap_proof_commitments_polycommit, verify_proof_circuit, ProofSplitCommit,
 };
 use crate::pfsys::{save_vk, srs::*};
 use crate::tensor::TensorError;
+use crate::EZKL_BUF_CAPACITY;
+use crate::{commands::*, EZKLError};
 use crate::{Commitments, RunArgs};
-use crate::{EZKLError, commands::*};
 use colored::Colorize;
 #[cfg(unix)]
 use gag::Gag;
 use halo2_proofs::dev::VerifyFailure;
 use halo2_proofs::plonk::{self, Circuit};
-use halo2_proofs::poly::VerificationStrategy;
 use halo2_proofs::poly::commitment::{CommitmentScheme, Params};
 use halo2_proofs::poly::commitment::{ParamsProver, Verifier};
 use halo2_proofs::poly::ipa::commitment::{IPACommitmentScheme, ParamsIPA};
@@ -36,7 +37,9 @@ use halo2_proofs::poly::kzg::strategy::AccumulatorStrategy as KZGAccumulatorStra
 use halo2_proofs::poly::kzg::{
     commitment::ParamsKZG, strategy::SingleStrategy as KZGSingleStrategy,
 };
+use halo2_proofs::poly::VerificationStrategy;
 use halo2_proofs::transcript::{EncodedChallenge, TranscriptReadBuffer};
+#[cfg(all(feature = "eth", not(target_arch = "wasm32")))]
 use halo2_solidity_verifier;
 use halo2curves::bn256::{Bn256, Fr, G1Affine};
 use halo2curves::ff::{FromUniformBytes, WithSmallOrderMulGroup};
@@ -47,15 +50,18 @@ use itertools::Itertools;
 use lazy_static::lazy_static;
 use log::debug;
 use log::{info, trace, warn};
-use serde::Serialize;
 use serde::de::DeserializeOwned;
+use serde::Serialize;
 use snark_verifier::loader::native::NativeLoader;
-use snark_verifier::system::halo2::Config;
 use snark_verifier::system::halo2::compile;
 use snark_verifier::system::halo2::transcript::evm::EvmTranscript;
+use snark_verifier::system::halo2::Config;
+#[cfg(all(feature = "eth", not(target_arch = "wasm32")))]
 use std::fs::File;
 use std::io::BufWriter;
-use std::io::{Cursor, Write};
+use std::io::Cursor;
+#[cfg(all(feature = "eth", not(target_arch = "wasm32")))]
+use std::io::Write;
 use std::path::Path;
 use std::path::PathBuf;
 use std::str::FromStr;
@@ -165,7 +171,6 @@ pub async fn run(command: Commands) -> Result<String, EZKLError> {
             scale_rebase_multiplier,
             max_logrows,
         )
-        .await
         .map(|e| serde_json::to_string(&e).unwrap()),
         Commands::GenWitness {
             data,
@@ -180,12 +185,12 @@ pub async fn run(command: Commands) -> Result<String, EZKLError> {
             vk_path,
             srs_path,
         )
-        .await
         .map(|e| serde_json::to_string(&e).unwrap()),
         Commands::Mock { model, witness } => mock(
             model.unwrap_or(DEFAULT_MODEL.into()),
             witness.unwrap_or(DEFAULT_WITNESS.into()),
         ),
+        #[cfg(all(feature = "eth", not(target_arch = "wasm32")))]
         Commands::CreateEvmVerifier {
             vk_path,
             srs_path,
@@ -204,6 +209,7 @@ pub async fn run(command: Commands) -> Result<String, EZKLError> {
             )
             .await
         }
+        #[cfg(all(feature = "eth", not(target_arch = "wasm32")))]
         Commands::EncodeEvmCalldata {
             proof_path,
             calldata_path,
@@ -214,6 +220,7 @@ pub async fn run(command: Commands) -> Result<String, EZKLError> {
             vka_path,
         )
         .map(|e| serde_json::to_string(&e).unwrap()),
+        #[cfg(all(feature = "eth", not(target_arch = "wasm32")))]
         Commands::CreateEvmVka {
             vk_path,
             srs_path,
@@ -230,6 +237,7 @@ pub async fn run(command: Commands) -> Result<String, EZKLError> {
             )
             .await
         }
+        #[cfg(all(feature = "eth", not(target_arch = "wasm32")))]
         Commands::CreateEvmVerifierAggr {
             vk_path,
             srs_path,
@@ -383,6 +391,7 @@ pub async fn run(command: Commands) -> Result<String, EZKLError> {
             commitment.into(),
         )
         .map(|e| serde_json::to_string(&e).unwrap()),
+        #[cfg(all(feature = "eth", not(target_arch = "wasm32")))]
         Commands::DeployEvm {
             sol_code_path,
             rpc_url,
@@ -401,6 +410,7 @@ pub async fn run(command: Commands) -> Result<String, EZKLError> {
             )
             .await
         }
+        #[cfg(all(feature = "eth", not(target_arch = "wasm32")))]
         Commands::VerifyEvm {
             proof_path,
             addr_verifier,
@@ -415,6 +425,7 @@ pub async fn run(command: Commands) -> Result<String, EZKLError> {
             )
             .await
         }
+        #[cfg(all(feature = "eth", not(target_arch = "wasm32")))]
         Commands::RegisterVka {
             addr_verifier,
             vka_path,
@@ -678,7 +689,7 @@ pub(crate) fn table(model: PathBuf, run_args: RunArgs) -> Result<String, EZKLErr
     Ok(String::new())
 }
 
-pub(crate) async fn gen_witness(
+pub(crate) fn gen_witness(
     compiled_circuit_path: PathBuf,
     data: String,
     output: Option<PathBuf>,
@@ -700,7 +711,7 @@ pub(crate) async fn gen_witness(
         None
     };
 
-    let mut input = circuit.load_graph_input(&data).await?;
+    let mut input = circuit.load_graph_input(&data)?;
     #[cfg(any(not(feature = "ezkl"), target_arch = "wasm32"))]
     let mut input = circuit.load_graph_input(&data)?;
 
@@ -1011,7 +1022,7 @@ impl AccuracyResults {
 /// Calibrate the circuit parameters to a given a dataset
 #[allow(trivial_casts)]
 #[allow(clippy::too_many_arguments)]
-pub(crate) async fn calibrate(
+pub(crate) fn calibrate(
     model_path: PathBuf,
     data: String,
     settings_path: PathBuf,
@@ -1037,7 +1048,7 @@ pub(crate) async fn calibrate(
 
     let input_shapes = model.graph.input_shapes()?;
 
-    let chunks = data.split_into_batches(input_shapes).await?;
+    let chunks = data.split_into_batches(input_shapes)?;
     info!("num calibration batches: {}", chunks.len());
 
     debug!("running onnx predictions...");
@@ -1148,7 +1159,7 @@ pub(crate) async fn calibrate(
                 let chunk = chunk.clone();
 
                 let data = circuit
-                    .load_graph_from_file_exclusively(&chunk)
+                    .load_graph_input(&chunk)
                     .map_err(|e| format!("failed to load circuit inputs: {}", e))?;
 
                 let forward_res = circuit
@@ -1403,6 +1414,7 @@ pub(crate) fn mock(
     Ok(String::new())
 }
 
+#[cfg(all(feature = "eth", not(target_arch = "wasm32")))]
 pub(crate) async fn create_evm_verifier(
     vk_path: PathBuf,
     srs_path: Option<PathBuf>,
@@ -1452,6 +1464,7 @@ pub(crate) async fn create_evm_verifier(
     Ok(String::new())
 }
 
+#[cfg(all(feature = "eth", not(target_arch = "wasm32")))]
 pub(crate) async fn create_evm_vka(
     vk_path: PathBuf,
     srs_path: Option<PathBuf>,
@@ -1512,6 +1525,7 @@ pub(crate) async fn create_evm_vka(
 
     Ok(String::new())
 }
+#[cfg(all(feature = "eth", not(target_arch = "wasm32")))]
 pub(crate) async fn deploy_evm(
     sol_code_path: PathBuf,
     rpc_url: String,
@@ -1540,6 +1554,7 @@ pub(crate) async fn deploy_evm(
     Ok(String::new())
 }
 
+#[cfg(all(feature = "eth", not(target_arch = "wasm32")))]
 pub(crate) async fn register_vka(
     rpc_url: String,
     rv_addr: H160Flag,
@@ -1569,6 +1584,7 @@ pub(crate) async fn register_vka(
 /// Encodes the calldata for the EVM verifier (both aggregated and single proof)
 /// TODO: Add a "RV address param" which will query the "RegisteredVKA" events to fetch the
 /// VKA from the vka_digest.
+#[cfg(all(feature = "eth", not(target_arch = "wasm32")))]
 pub(crate) fn encode_evm_calldata(
     proof_path: PathBuf,
     calldata_path: PathBuf,
@@ -1606,6 +1622,7 @@ pub(crate) fn encode_evm_calldata(
 
 /// TODO: Add an optional vka_digest param that will allow use to fetch the assocaited VKA
 /// from the RegisteredVKA events on the RV.
+#[cfg(all(feature = "eth", not(target_arch = "wasm32")))]
 pub(crate) async fn verify_evm(
     proof_path: PathBuf,
     addr_verifier: H160Flag,
@@ -1631,6 +1648,7 @@ pub(crate) async fn verify_evm(
     Ok(String::new())
 }
 
+#[cfg(all(feature = "eth", not(target_arch = "wasm32")))]
 pub(crate) async fn create_evm_aggregate_verifier(
     vk_path: PathBuf,
     srs_path: Option<PathBuf>,

src/graph/errors.rs

@@ -104,6 +104,7 @@ pub enum GraphError {
         not(all(target_arch = "wasm32", target_os = "unknown"))
     ))]
     #[error("[eth] {0}")]
+    #[cfg(all(feature = "eth", not(target_arch = "wasm32")))]
     EthError(#[from] crate::eth::EthError),
     /// Json error
     #[error("[json] {0}")]

src/graph/input.rs

@@ -1,15 +1,15 @@
 use super::errors::GraphError;
 use super::quantize_float;
-use crate::EZKL_BUF_CAPACITY;
 use crate::circuit::InputType;
 use crate::fieldutils::integer_rep_to_felt;
+use crate::EZKL_BUF_CAPACITY;
 use halo2curves::bn256::Fr as Fp;
 #[cfg(feature = "python-bindings")]
-use pyo3::ToPyObject;
-#[cfg(feature = "python-bindings")]
 use pyo3::prelude::*;
 #[cfg(feature = "python-bindings")]
 use pyo3::types::PyDict;
+#[cfg(feature = "python-bindings")]
+use pyo3::ToPyObject;
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use std::io::BufReader;
 use std::io::BufWriter;
@@ -17,7 +17,7 @@ use std::io::Read;
 use std::panic::UnwindSafe;
 #[cfg(all(feature = "ezkl", not(target_arch = "wasm32")))]
 use tract_onnx::tract_core::{
-    tract_data::{TVec, prelude::Tensor as TractTensor},
+    tract_data::{prelude::Tensor as TractTensor, TVec},
     value::TValue,
 };
 
@@ -209,27 +209,30 @@ pub struct CallToAccount {
 
 /// Represents different sources of input/output data for the EZKL model
 #[derive(Clone, Debug, Serialize, PartialOrd, PartialEq)]
-#[serde(untagged)]
-pub enum DataSource {
-    /// Data from a JSON file containing arrays of values
-    File(FileSource),
+pub struct DataSource(FileSource);
+
+impl DataSource {
+    /// Gets the underlying file source data
+    pub fn values(&self) -> &FileSource {
+        &self.0
+    }
 }
 
 impl Default for DataSource {
     fn default() -> Self {
-        DataSource::File(vec![vec![]])
+        DataSource(vec![vec![]])
     }
 }
 
 impl From<FileSource> for DataSource {
     fn from(data: FileSource) -> Self {
-        DataSource::File(data)
+        DataSource(data)
     }
 }
 
 impl From<Vec<Vec<Fp>>> for DataSource {
     fn from(data: Vec<Vec<Fp>>) -> Self {
-        DataSource::File(
+        DataSource(
             data.iter()
                 .map(|e| e.iter().map(|e| FileSourceInner::Field(*e)).collect())
                 .collect(),
@@ -239,7 +242,7 @@ impl From<Vec<Vec<Fp>>> for DataSource {
 
 impl From<Vec<Vec<f64>>> for DataSource {
     fn from(data: Vec<Vec<f64>>) -> Self {
-        DataSource::File(
+        DataSource(
             data.iter()
                 .map(|e| e.iter().map(|e| FileSourceInner::Float(*e)).collect())
                 .collect(),
@@ -258,7 +261,7 @@ impl<'de> Deserialize<'de> for DataSource {
         // Try deserializing as FileSource first
         let first_try: Result<FileSource, _> = serde_json::from_str(this_json.get());
         if let Ok(t) = first_try {
-            return Ok(DataSource::File(t));
+            return Ok(DataSource(t));
         }
 
         Err(serde::de::Error::custom("failed to deserialize DataSource"))
@@ -294,19 +297,16 @@ impl GraphData {
         datum_types: &[tract_onnx::prelude::DatumType],
     ) -> Result<TVec<TValue>, GraphError> {
         let mut inputs = TVec::new();
-        match &self.input_data {
-            DataSource::File(data) => {
-                for (i, input) in data.iter().enumerate() {
-                    if !input.is_empty() {
-                        let dt = datum_types[i];
-                        let input = input.iter().map(|e| e.to_float()).collect::<Vec<f64>>();
-                        let tt = TractTensor::from_shape(&shapes[i], &input)?;
-                        let tt = tt.cast_to_dt(dt)?;
-                        inputs.push(tt.into_owned().into());
-                    }
-                }
+        for (i, input) in self.input_data.values().iter().enumerate() {
+            if !input.is_empty() {
+                let dt = datum_types[i];
+                let input = input.iter().map(|e| e.to_float()).collect::<Vec<f64>>();
+                let tt = TractTensor::from_shape(&shapes[i], &input)?;
+                let tt = tt.cast_to_dt(dt)?;
+                inputs.push(tt.into_owned().into());
             }
         }
+
         Ok(inputs)
     }
 
@@ -338,7 +338,7 @@ impl GraphData {
             }
         }
         Ok(GraphData {
-            input_data: DataSource::File(input_data),
+            input_data: DataSource(input_data),
             output_data: None,
         })
     }
@@ -420,7 +420,7 @@ impl GraphData {
     /// Returns error if:
     /// - Data is from on-chain source
     /// - Input size is not evenly divisible by batch size
-    pub async fn split_into_batches(
+    pub fn split_into_batches(
         &self,
         input_shapes: Vec<Vec<usize>>,
     ) -> Result<Vec<Self>, GraphError> {
@@ -428,7 +428,7 @@ impl GraphData {
 
         let iterable = match self {
             GraphData {
-                input_data: DataSource::File(data),
+                input_data: DataSource(data),
                 output_data: _,
             } => data.clone(),
         };
@@ -476,12 +476,12 @@ impl GraphData {
             for input in batched_inputs.iter() {
                 batch.push(input[i].clone());
             }
-            input_batches.push(DataSource::File(batch));
+            input_batches.push(DataSource(batch));
         }
 
         // Ensure at least one batch exists
         if input_batches.is_empty() {
-            input_batches.push(DataSource::File(vec![vec![]]));
+            input_batches.push(DataSource(vec![vec![]]));
         }
 
         // Create GraphData instance for each batch
@@ -556,9 +556,7 @@ impl ToPyObject for CallToAccount {
 #[cfg(feature = "python-bindings")]
 impl ToPyObject for DataSource {
     fn to_object(&self, py: Python) -> PyObject {
-        match self {
-            DataSource::File(data) => data.to_object(py),
-        }
+        self.0.to_object(py)
     }
 }
 

src/graph/mod.rs

@@ -35,12 +35,12 @@ use self::modules::{GraphModules, ModuleConfigs, ModuleForwardResult, ModuleSize
 use crate::circuit::lookup::LookupOp;
 use crate::circuit::modules::ModulePlanner;
 use crate::circuit::region::{ConstantsMap, RegionSettings};
-use crate::circuit::table::{RESERVED_BLINDING_ROWS_PAD, Range, Table, num_cols_required};
+use crate::circuit::table::{num_cols_required, Range, Table, RESERVED_BLINDING_ROWS_PAD};
 use crate::circuit::{CheckMode, InputType};
-use crate::fieldutils::{IntegerRep, felt_to_f64};
+use crate::fieldutils::{felt_to_f64, IntegerRep};
 use crate::pfsys::PrettyElements;
 use crate::tensor::{Tensor, ValTensor};
-use crate::{EZKL_BUF_CAPACITY, RunArgs};
+use crate::{RunArgs, EZKL_BUF_CAPACITY};
 
 use halo2_proofs::{
     circuit::Layouter,
@@ -55,13 +55,13 @@ use maybe_rayon::prelude::{IntoParallelRefIterator, ParallelIterator};
 pub use model::*;
 pub use node::*;
 #[cfg(feature = "python-bindings")]
-use pyo3::ToPyObject;
-#[cfg(feature = "python-bindings")]
 use pyo3::prelude::*;
 #[cfg(feature = "python-bindings")]
 use pyo3::types::PyDict;
 #[cfg(feature = "python-bindings")]
 use pyo3::types::PyDictMethods;
+#[cfg(feature = "python-bindings")]
+use pyo3::ToPyObject;
 
 use serde::{Deserialize, Serialize};
 use std::ops::Deref;
@@ -952,77 +952,11 @@ impl GraphCircuit {
     }
 
     ///
-    #[cfg(any(not(feature = "ezkl"), target_arch = "wasm32"))]
     pub fn load_graph_input(&mut self, data: &GraphData) -> Result<Vec<Tensor<Fp>>, GraphError> {
         let shapes = self.model().graph.input_shapes()?;
         let scales = self.model().graph.get_input_scales();
         let input_types = self.model().graph.get_input_types()?;
-        self.process_data_source(&data.input_data, shapes, scales, input_types)
-    }
-
-    ///
-    #[cfg(all(feature = "ezkl", not(target_arch = "wasm32")))]
-    pub fn load_graph_from_file_exclusively(
-        &mut self,
-        data: &GraphData,
-    ) -> Result<Vec<Tensor<Fp>>, GraphError> {
-        let shapes = self.model().graph.input_shapes()?;
-        let scales = self.model().graph.get_input_scales();
-        let input_types = self.model().graph.get_input_types()?;
-        debug!("input scales: {:?}", scales);
-
-        match &data.input_data {
-            DataSource::File(file_data) => {
-                self.load_file_data(file_data, &shapes, scales, input_types)
-            }
-        }
-    }
-
-    ///
-    #[cfg(all(feature = "ezkl", not(target_arch = "wasm32")))]
-    pub async fn load_graph_input(
-        &mut self,
-        data: &GraphData,
-    ) -> Result<Vec<Tensor<Fp>>, GraphError> {
-        let shapes = self.model().graph.input_shapes()?;
-        let scales = self.model().graph.get_input_scales();
-        let input_types = self.model().graph.get_input_types()?;
-        debug!("input scales: {:?}", scales);
-
-        self.process_data_source(&data.input_data, shapes, scales, input_types)
-            .await
-    }
-
-    #[cfg(any(not(feature = "ezkl"), target_arch = "wasm32"))]
-    /// Process the data source for the model
-    fn process_data_source(
-        &mut self,
-        data: &DataSource,
-        shapes: Vec<Vec<usize>>,
-        scales: Vec<crate::Scale>,
-        input_types: Vec<InputType>,
-    ) -> Result<Vec<Tensor<Fp>>, GraphError> {
-        match &data {
-            DataSource::File(file_data) => {
-                self.load_file_data(file_data, &shapes, scales, input_types)
-            }
-        }
-    }
-
-    #[cfg(all(feature = "ezkl", not(target_arch = "wasm32")))]
-    /// Process the data source for the model
-    async fn process_data_source(
-        &mut self,
-        data: &DataSource,
-        shapes: Vec<Vec<usize>>,
-        scales: Vec<crate::Scale>,
-        input_types: Vec<InputType>,
-    ) -> Result<Vec<Tensor<Fp>>, GraphError> {
-        match &data {
-            DataSource::File(file_data) => {
-                self.load_file_data(file_data, &shapes, scales, input_types)
-            }
-        }
+        self.load_file_data(data.input_data.values(), &shapes, scales, input_types)
     }
 
     ///

src/lib.rs

@@ -44,6 +44,7 @@ pub enum EZKLError {
         not(all(target_arch = "wasm32", target_os = "unknown"))
     ))]
     #[error("[eth] {0}")]
+    #[cfg(all(feature = "eth", not(target_arch = "wasm32")))]
     EthError(#[from] eth::EthError),
     #[error("[graph] {0}")]
     GraphError(#[from] graph::errors::GraphError),
@@ -97,11 +98,11 @@ impl From<String> for EZKLError {
 
 use std::str::FromStr;
 
-use circuit::{CheckMode, table::Range};
+use circuit::{table::Range, CheckMode};
 #[cfg(all(feature = "ezkl", not(target_arch = "wasm32")))]
 use clap::Args;
 use fieldutils::IntegerRep;
-use graph::{MAX_PUBLIC_SRS, Visibility};
+use graph::{Visibility, MAX_PUBLIC_SRS};
 use halo2_proofs::poly::{
     ipa::commitment::IPACommitmentScheme, kzg::commitment::KZGCommitmentScheme,
 };
@@ -134,7 +135,7 @@ pub mod circuit;
 /// CLI commands.
 #[cfg(all(feature = "ezkl", not(target_arch = "wasm32")))]
 pub mod commands;
-#[cfg(all(feature = "ezkl", not(target_arch = "wasm32")))]
+#[cfg(all(feature = "eth", not(target_arch = "wasm32")))]
 // abigen doesn't generate docs for this module
 #[allow(missing_docs)]
 /// Utility functions for contracts

tests/integration_tests.rs

@@ -3,10 +3,10 @@
 mod native_tests {
 
     // use ezkl::circuit::table::RESERVED_BLINDING_ROWS_PAD;
-    use ezkl::Commitments;
     use ezkl::graph::input::{FileSource, GraphData};
-    use ezkl::graph::{DataSource, GraphSettings};
+    use ezkl::graph::GraphSettings;
     use ezkl::pfsys::Snark;
+    use ezkl::Commitments;
     use halo2_proofs::poly::kzg::commitment::KZGCommitmentScheme;
     use halo2curves::bn256::Bn256;
     use lazy_static::lazy_static;
@@ -163,17 +163,14 @@ mod native_tests {
             let data = GraphData::from_path(format!("{}/{}/input.json", test_dir, test).into())
                 .expect("failed to load input data");
 
-            let input_data = match data.input_data {
-                DataSource::File(data) => data,
-                _ => panic!("Only File data sources support batching"),
-            };
-
-            let duplicated_input_data: FileSource = input_data
+            let duplicated_input_data: FileSource = data
+                .input_data
+                .values()
                 .iter()
                 .map(|data| (0..num_batches).flat_map(|_| data.clone()).collect())
                 .collect();
 
-            let duplicated_data = GraphData::new(DataSource::File(duplicated_input_data));
+            let duplicated_data = GraphData::new(duplicated_input_data.into());
 
             let res =
                 duplicated_data.save(format!("{}/{}/input.json", test_dir, output_dir).into());
@@ -2247,7 +2244,7 @@ mod native_tests {
         // not macos-metal and not icicle
         #[cfg(all(not(feature = "icicle"), not(feature = "macos-metal")))]
         let args = ["build", "--profile=test-runs", "--bin", "ezkl"];
-        #[cfg(not(feature = "mv-lookup"))]
+        #[cfg(feature = "eth-original-lookup")]
         let args = [
             "build",
             "--profile=test-runs",
@@ -2255,7 +2252,7 @@ mod native_tests {
             "ezkl",
             "--no-default-features",
             "--features",
-            "ezkl",
+            "ezkl,solidity-verifier,eth",
         ];
 
         let status = Command::new("cargo")