ci: update version string in docs

feat: implement generalized Freivalds' algorithm for arbitrary einsum (#990 )
--------- Co-authored-by: DoHoon Kim <59155248+DoHoonKim8@users.noreply.github.com> Co-authored-by: therealyingtong <yingtong.lai@gmail.com> Co-authored-by: DoHoonKim <dohoon1097819@gmail.com>
2026-01-13 16:27:59 -05:00 · 2025-10-08 11:34:48 +00:00 · 2025-10-08 07:34:32 -04:00 · 2025-08-15 23:58:04 -04:00 · 2025-08-14 18:21:06 -04:00 · 2025-08-10 23:03:45 +01:00
129 changed files with 8602 additions and 12064 deletions
--- a/.github/workflows/benchmarks.yml
+++ b/.github/workflows/benchmarks.yml
@@ -15,7 +15,7 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
-      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
+      - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
        with:
          toolchain: nightly-2023-06-27
          override: true
@@ -32,7 +32,7 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
-      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
+      - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
        with:
          toolchain: nightly-2023-06-27
          override: true
@@ -49,7 +49,7 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
-      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
+      - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
        with:
          toolchain: nightly-2023-06-27
          override: true
@@ -66,7 +66,7 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
-      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
+      - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
        with:
          toolchain: nightly-2023-06-27
          override: true
@@ -83,7 +83,7 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
-      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
+      - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
        with:
          toolchain: nightly-2023-06-27
          override: true
@@ -100,7 +100,7 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
-      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
+      - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
        with:
          toolchain: nightly-2023-06-27
          override: true
@@ -117,7 +117,7 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
-      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
+      - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
        with:
          toolchain: nightly-2023-06-27
          override: true
@@ -134,7 +134,7 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
-      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
+      - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
        with:
          toolchain: nightly-2023-06-27
          override: true
@@ -151,7 +151,7 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
-      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
+      - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
        with:
          toolchain: nightly-2023-06-27
          override: true
@@ -168,7 +168,7 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
-      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
+      - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
        with:
          toolchain: nightly-2023-06-27
          override: true
@@ -185,7 +185,7 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
-      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
+      - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
        with:
          toolchain: nightly-2023-06-27
          override: true
--- a/.github/workflows/engine.yml
+++ b/.github/workflows/engine.yml
@@ -18,29 +18,32 @@ jobs:
    permissions:
      contents: read
      packages: write
+      id-token: write # Required for provenance
    name: publish-wasm-bindings
    env:
      RELEASE_TAG: ${{ github.ref_name }}
+      RUSTFLAGS: "-C target-feature=+atomics,+bulk-memory"
    runs-on: ubuntu-latest
    if: startsWith(github.ref, 'refs/tags/')
    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
        with:
          persist-credentials: false
-      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
+      - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48 #v1.0.6
        with:
-          toolchain: nightly-2025-02-17
+          toolchain: nightly-2025-05-01
          override: true
          components: rustfmt, clippy
-      - uses: jetli/wasm-pack-action@0d096b08b4e5a7de8c28de67e11e945404e9eefa  #v0.4.0
+          cache: false
+      - uses: jetli/wasm-pack-action@0d096b08b4e5a7de8c28de67e11e945404e9eefa #v0.4.0
        with:
          # Pin to version 0.12.1
-          version: 'v0.12.1'
+          version: "v0.12.1"
      - name: Add wasm32-unknown-unknown target
        run: rustup target add wasm32-unknown-unknown

      - name: Add rust-src
-        run: rustup component add rust-src --toolchain nightly-2025-02-17-x86_64-unknown-linux-gnu
+        run: rustup component add rust-src --toolchain nightly-2025-05-01-x86_64-unknown-linux-gnu
      - name: Install binaryen
        run: |
          set -e
@@ -49,45 +52,45 @@ jobs:
          wasm-opt --version
      - name: Build wasm files for both web and nodejs compilation targets
        run: |
-            wasm-pack build --release --target nodejs --out-dir ./pkg/nodejs . -- -Z build-std="panic_abort,std"
-            wasm-pack build --release --target web --out-dir ./pkg/web . -- -Z build-std="panic_abort,std" --features web
+          wasm-pack build --release --target nodejs --out-dir ./pkg/nodejs . -- -Z build-std="panic_abort,std"
+          wasm-pack build --release --target web --out-dir ./pkg/web . -- -Z build-std="panic_abort,std" --features web
      - name: Create package.json in pkg folder
        shell: bash
        run: |
-            cat > pkg/package.json << EOF
-            {
-              "name": "@ezkljs/engine",
-              "version": "$RELEASE_TAG",
-              "dependencies": {
-                "@types/json-bigint": "^1.0.1",
-                "json-bigint": "^1.0.0"
-              },
-              "files": [
-                "nodejs/ezkl_bg.wasm",
-                "nodejs/ezkl.js",
-                "nodejs/ezkl.d.ts",
-                "nodejs/package.json",
-                "nodejs/utils.js",
-                "web/ezkl_bg.wasm",
-                "web/ezkl.js",
-                "web/ezkl.d.ts",
-                "web/snippets/**/*",
-                "web/package.json",
-                "web/utils.js",
-                "ezkl.d.ts"
-              ],
-              "main": "nodejs/ezkl.js",
-              "module": "web/ezkl.js",
-              "types": "nodejs/ezkl.d.ts",
-              "sideEffects": [
-                "web/snippets/*"
-              ]
-            }
-            EOF
+          cat > pkg/package.json << EOF
+          {
+            "name": "@ezkljs/engine",
+            "version": "$RELEASE_TAG",
+            "dependencies": {
+              "@types/json-bigint": "^1.0.1",
+              "json-bigint": "^1.0.0"
+            },
+            "files": [
+              "nodejs/ezkl_bg.wasm",
+              "nodejs/ezkl.js",
+              "nodejs/ezkl.d.ts",
+              "nodejs/package.json",
+              "nodejs/utils.js",
+              "web/ezkl_bg.wasm",
+              "web/ezkl.js",
+              "web/ezkl.d.ts",
+              "web/snippets/**/*",
+              "web/package.json",
+              "web/utils.js",
+              "ezkl.d.ts"
+            ],
+            "main": "nodejs/ezkl.js",
+            "module": "web/ezkl.js",
+            "types": "nodejs/ezkl.d.ts",
+            "sideEffects": [
+              "web/snippets/*"
+            ]
+          }
+          EOF

      - name: Replace memory definition in nodejs
        run: |
-          sed -i "3s|.*|imports['env'] = {memory: new WebAssembly.Memory({initial:20,maximum:65536,shared:true})}|" pkg/nodejs/ezkl.js
+          sed -i "3s|.*|imports['env'] = {memory: new WebAssembly.Memory({initial:21,maximum:65536,shared:true})}|" pkg/nodejs/ezkl.js

      - name: Replace `import.meta.url` with `import.meta.resolve` definition in workerHelpers.js
        run: |
@@ -175,76 +178,17 @@ jobs:
        run: |
          curl -s "https://raw.githubusercontent.com/zkonduit/ezkljs-engine/main/README.md" > ./pkg/README.md

+      # zizmor: ignore cache-poisoning
      - name: Set up Node.js
-        uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7  #v3.8.2
+        uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 #v3.8.2
        with:
          node-version: "18.12.1"
          registry-url: "https://registry.npmjs.org"
-      - name: Publish to npm
+          package-manager-cache: false
+
+      - name: Publish to npm with provenance
        run: |
          cd pkg
-          npm install
-          npm ci
-          npm publish
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-
-
-  in-browser-evm-ver-publish:
-    permissions:
-      contents: read
-      packages: write
-    name: publish-in-browser-evm-verifier-package
-    needs: [publish-wasm-bindings]
-    runs-on: ubuntu-latest
-    env:
-        RELEASE_TAG: ${{ github.ref_name }}
-    if: startsWith(github.ref, 'refs/tags/')
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
-        with:
-          persist-credentials: false
-      - name: Update version in package.json
-        shell: bash
-        run: |
-          sed -i "s|\"version\": \".*\"|\"version\": \"$RELEASE_TAG\"|" in-browser-evm-verifier/package.json
-      - name: Prepare tag and fetch package integrity
-        run: |
-          CLEANED_TAG=${RELEASE_TAG} # 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@eae0cfeb286e66ffb5155f1a79b90583a127a68b  #v2.4.1
-        with:
-          version: 8
-      - name: Set up Node.js
-        uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7  #v3.8.2
-        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
+          npm publish --provenance --access public
        env:
          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
--- a/.github/workflows/large-tests.yml
+++ b/.github/workflows/large-tests.yml
@@ -13,9 +13,9 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
-      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
+      - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
        with:
-          toolchain: nightly-2025-02-17
+          toolchain: nightly-2025-05-01
          override: true
          components: rustfmt, clippy
      - name: nanoGPT Mock
--- a/.github/workflows/pypi-gpu.yml
+++ b/.github/workflows/pypi-gpu.yml
@@ -27,6 +27,8 @@ jobs:
        target: [x86_64]
    env:
      RELEASE_TAG: ${{ github.ref_name }}
+      RUSTFLAGS: "-C linker=gcc"
+      OPENSSL_NO_VENDOR: 1
    steps:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
@@ -36,6 +38,16 @@ jobs:
          python-version: 3.12
          architecture: x64

+
+
+      - name: Install build dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y build-essential g++ gcc cmake libclang-dev llvm-dev libstdc++-12-dev libc6 libc6-dev libssl-dev pkg-config
+
+      - name: Force rebuild icicle dependencies
+        run: cargo clean -p icicle-runtime -p icicle-core -p icicle-hash -p icicle-bn254
+
      - name: Set pyproject.toml version to match github tag and rename ezkl to ezkl-gpu
        shell: bash
        run: |
@@ -43,11 +55,12 @@ jobs:
            sed "s/ezkl/ezkl-gpu/" pyproject.toml.orig > pyproject.toml.tmp
            sed "s/0\\.0\\.0/${RELEASE_TAG//v}/" pyproject.toml.tmp > pyproject.toml

-      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
+      - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
        with:
          toolchain: nightly-2023-06-27
          override: true
          components: rustfmt, clippy
+          cache: false

      - name: Set Cargo.toml version to match github tag and rename ezkl to ezkl-gpu
        shell: bash
@@ -70,7 +83,7 @@ jobs:
          target: ${{ matrix.target }}
          manylinux: auto
          container: off
-          args: --release --out dist --features python-bindings,icicle
+          args: --release --out dist --features python-bindings,gpu-accelerated

      - name: Install built wheel
        if: matrix.target == 'x86_64'
--- a/.github/workflows/pypi.yml
+++ b/.github/workflows/pypi.yml
@@ -48,11 +48,12 @@ jobs:
          mv Cargo.lock Cargo.lock.orig
          sed "s/0\\.0\\.0/${RELEASE_TAG//v}/" Cargo.lock.orig >Cargo.lock

-      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
+      - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
        with:
-          toolchain: nightly-2025-02-17
+          toolchain: nightly-2025-05-01
          override: true
          components: rustfmt, clippy
+          cache: false

      - name: Build wheels
        if: matrix.target == 'universal2-apple-darwin'
@@ -113,11 +114,12 @@ jobs:
          mv Cargo.lock Cargo.lock.orig
          sed "s/0\\.0\\.0/${RELEASE_TAG//v}/" Cargo.lock.orig >Cargo.lock

-      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
+      - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
        with:
-          toolchain: nightly-2025-02-17
+          toolchain: nightly-2025-05-01
          override: true
          components: rustfmt, clippy
+          cache: false

      - name: Build wheels
        uses: PyO3/maturin-action@5f8a1b3b0aad13193f46c9131f9b9e663def8ce5  #v1.46.0
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -26,7 +26,6 @@ jobs:
        shell: bash
        run: |
          echo "EZKL_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-          echo "version is: ${{ env.EZKL_VERSION }}"

      - name: Create Github Release
        id: create-release
@@ -48,23 +47,32 @@ jobs:
      TARGET_DIR: ./target
      RUST_BACKTRACE: 1
      PCRE2_SYS_STATIC: 1
+      RUSTFLAGS: "-C linker=gcc"
+      OPENSSL_NO_VENDOR: 1
    steps:
-      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
+      - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48   #v1.0.6
        with:
-          toolchain: nightly-2025-02-17
+          toolchain: nightly-2025-05-01
          override: true
          components: rustfmt, clippy
+          cache: false
      - name: Checkout repo
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false

+      - name: Install build dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y build-essential g++ gcc cmake libclang-dev llvm-dev libstdc++-12-dev libc6 libc6-dev libssl-dev pkg-config
+
+      - name: Force rebuild icicle dependencies
+        run: cargo clean -p icicle-runtime -p icicle-core -p icicle-hash -p icicle-bn254

      - name: Get release version from tag
        shell: bash
        run: |
          echo "EZKL_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-          echo "version is: ${{ env.EZKL_VERSION }}"

      - name: Set Cargo.toml version to match github tag
        shell: bash
@@ -80,7 +88,7 @@ jobs:
          sudo apt-get update

      - name: Build release binary
-        run: cargo build --release -Z sparse-registry --features icicle
+        run: cargo build --release -Z sparse-registry --features gpu-accelerated

      - name: Build archive
        shell: bash
@@ -119,27 +127,27 @@ jobs:
        include:
          - build: windows-msvc
            os: windows-latest
-            rust: nightly-2025-02-17
+            rust: nightly-2025-05-01
            target: x86_64-pc-windows-msvc
          - build: macos
            os: macos-13
-            rust: nightly-2025-02-17
+            rust: nightly-2025-05-01
            target: x86_64-apple-darwin
          - build: macos-aarch64
            os: macos-13
-            rust: nightly-2025-02-17
+            rust: nightly-2025-05-01
            target: aarch64-apple-darwin
          - build: linux-musl
            os: ubuntu-22.04
-            rust: nightly-2025-02-17
+            rust: nightly-2025-05-01
            target: x86_64-unknown-linux-musl
          - build: linux-gnu
            os: ubuntu-22.04
-            rust: nightly-2025-02-17
+            rust: nightly-2025-05-01
            target: x86_64-unknown-linux-gnu
          - build: linux-aarch64
            os: ubuntu-22.04
-            rust: nightly-2025-02-17
+            rust: nightly-2025-05-01
            target: aarch64-unknown-linux-gnu

    steps:
@@ -152,7 +160,6 @@ jobs:
        shell: bash
        run: |
          echo "EZKL_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-          echo "version is: ${{ env.EZKL_VERSION }}"

      - name: Set Cargo.toml version to match github tag
        shell: bash
@@ -202,7 +209,7 @@ jobs:

      - name: Build release binary (asm)
        if: matrix.build == 'linux-gnu'
-        run: ${{ env.CARGO }} build --release ${{ env.TARGET_FLAGS }} -Z sparse-registry --features asm,mimalloc
+        run: ${{ env.CARGO }} build --release ${{ env.TARGET_FLAGS }} -Z sparse-registry --features mimalloc

      - name: Build release binary (metal)
        if: matrix.build == 'macos-aarch64'
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
--- a/.github/workflows/static-analysis.yml
+++ b/.github/workflows/static-analysis.yml
@@ -15,9 +15,9 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
-      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
+      - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
        with:
-          toolchain: nightly-2025-02-17
+          toolchain: nightly-2025-05-01
          override: true
          components: rustfmt, clippy

--- a/.gitignore
+++ b/.gitignore
@@ -52,3 +52,5 @@ docs/python/build
 !tests/assets/vk_aggr.key
 cache
 out
+!tests/assets/wasm.code
+!tests/assets/wasm.sol
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -126,6 +126,27 @@ dependencies = [
 "winnow 0.6.26",
 ]

+[[package]]
+name = "alloy-eip2930"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0069cf0642457f87a01a014f6dc29d5d893cd4fd8fddf0c3cdfad1bb3ebafc41"
+dependencies = [
+ "alloy-primitives 0.8.25",
+ "alloy-rlp",
+]
+
+[[package]]
+name = "alloy-eip7702"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea59dc42102bc9a1905dc57901edc6dd48b9f38115df86c7d252acba70d71d04"
+dependencies = [
+ "alloy-primitives 0.8.25",
+ "alloy-rlp",
+ "k256",
+]
+
 [[package]]
 name = "alloy-eips"
 version = "0.1.0"
@@ -217,7 +238,7 @@ dependencies = [
 "bytes",
 "cfg-if",
 "const-hex",
- "derive_more",
+ "derive_more 0.99.20",
 "hex-literal",
 "itoa",
 "ruint",
@@ -234,7 +255,7 @@ dependencies = [
 "bytes",
 "cfg-if",
 "const-hex",
- "derive_more",
+ "derive_more 0.99.20",
 "getrandom 0.2.16",
 "hex-literal",
 "itoa",
@@ -247,6 +268,25 @@ dependencies = [
 "tiny-keccak",
 ]

+[[package]]
+name = "alloy-primitives"
+version = "0.8.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c77490fe91a0ce933a1f219029521f20fc28c2c0ca95d53fa4da9c00b8d9d4e"
+dependencies = [
+ "alloy-rlp",
+ "bytes",
+ "cfg-if",
+ "const-hex",
+ "derive_more 2.0.1",
+ "hashbrown 0.15.2",
+ "itoa",
+ "k256",
+ "paste",
+ "ruint",
+ "tiny-keccak",
+]
+
 [[package]]
 name = "alloy-provider"
 version = "0.1.0"
@@ -842,14 +882,13 @@ dependencies = [
 ]

 [[package]]
-name = "atty"
-version = "0.2.14"
+name = "aurora-engine-modexp"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+checksum = "518bc5745a6264b5fd7b09dffb9667e400ee9e2bbe18555fac75e1fe9afa0df9"
 dependencies = [
- "hermit-abi 0.1.19",
- "libc",
- "winapi",
+ "hex",
+ "num",
 ]

 [[package]]
@@ -920,29 +959,6 @@ dependencies = [
 "serde",
 ]

-[[package]]
-name = "bindgen"
-version = "0.69.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088"
-dependencies = [
- "bitflags 2.9.0",
- "cexpr",
- "clang-sys",
- "itertools 0.12.1",
- "lazy_static",
- "lazycell",
- "log",
- "prettyplease",
- "proc-macro2",
- "quote",
- "regex",
- "rustc-hash 1.1.0",
- "shlex",
- "syn 2.0.101",
- "which",
-]
-
 [[package]]
 name = "bit-set"
 version = "0.5.3"
@@ -1161,15 +1177,6 @@ dependencies = [
 "shlex",
 ]

-[[package]]
-name = "cexpr"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
-dependencies = [
- "nom",
-]
-
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
@@ -1220,29 +1227,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9"
 dependencies = [
 "ciborium-io",
- "half 2.6.0",
-]
-
-[[package]]
-name = "clang-sys"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
-dependencies = [
- "glob",
- "libc",
- "libloading",
-]
-
-[[package]]
-name = "clap"
-version = "2.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
-dependencies = [
- "bitflags 1.3.2",
- "textwrap 0.11.0",
- "unicode-width 0.1.14",
+ "half",
 ]

 [[package]]
@@ -1273,7 +1258,7 @@ version = "4.5.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c06f5378ea264ad4f82bbc826628b5aad714a75abf6ece087e923010eb937fb6"
 dependencies = [
- "clap 4.5.37",
+ "clap",
 ]

 [[package]]
@@ -1460,32 +1445,6 @@ dependencies = [
 "cfg-if",
 ]

-[[package]]
-name = "criterion"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f"
-dependencies = [
- "atty",
- "cast",
- "clap 2.34.0",
- "criterion-plot 0.4.5",
- "csv",
- "itertools 0.10.5",
- "lazy_static",
- "num-traits",
- "oorandom",
- "plotters",
- "rayon",
- "regex",
- "serde",
- "serde_cbor",
- "serde_derive",
- "serde_json",
- "tinytemplate",
- "walkdir",
-]
-
 [[package]]
 name = "criterion"
 version = "0.5.1"
@@ -1495,8 +1454,8 @@ dependencies = [
 "anes",
 "cast",
 "ciborium",
- "clap 4.5.37",
- "criterion-plot 0.5.0",
+ "clap",
+ "criterion-plot",
 "is-terminal",
 "itertools 0.10.5",
 "num-traits",
@@ -1512,16 +1471,6 @@ dependencies = [
 "walkdir",
 ]

-[[package]]
-name = "criterion-plot"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876"
-dependencies = [
- "cast",
- "itertools 0.10.5",
-]
-
 [[package]]
 name = "criterion-plot"
 version = "0.5.0"
@@ -1594,27 +1543,6 @@ dependencies = [
 "typenum",
 ]

-[[package]]
-name = "csv"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acdc4883a9c96732e4733212c01447ebd805833b7275a73ca3ee080fd77afdaf"
-dependencies = [
- "csv-core",
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "csv-core"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d02f3b0da4c6504f86e9cd789d8dbafab48c2321be74e9987593de5a894d93d"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "dashmap"
 version = "5.5.3"
@@ -1693,6 +1621,27 @@ dependencies = [
 "syn 2.0.101",
 ]

+[[package]]
+name = "derive_more"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678"
+dependencies = [
+ "derive_more-impl",
+]
+
+[[package]]
+name = "derive_more-impl"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+ "unicode-xid",
+]
+
 [[package]]
 name = "digest"
 version = "0.9.0"
@@ -1994,12 +1943,12 @@ dependencies = [
 "bincode",
 "camino",
 "chrono",
- "clap 4.5.37",
+ "clap",
 "clap_complete",
 "colored",
 "colored_json",
 "console_error_panic_hook",
- "criterion 0.5.1",
+ "criterion",
 "ecc",
 "env_logger 0.10.2",
 "ethabi",
@@ -2011,6 +1960,7 @@ dependencies = [
 "halo2_solidity_verifier",
 "halo2curves 0.7.0 (git+https://github.com/privacy-scaling-explorations/halo2curves?rev=b753a832e92d5c86c5c997327a9cf9de86a18851)",
 "hex",
+ "icicle-runtime",
 "indicatif",
 "instant",
 "itertools 0.10.5",
@@ -2257,7 +2207,7 @@ version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8640e34b88f7652208ce9e88b1a37a2ae95227d84abec377ccd3c5cfeb141ed4"
 dependencies = [
- "rustix 1.0.5",
+ "rustix",
 "windows-sys 0.59.0",
 ]

@@ -2450,12 +2400,6 @@ dependencies = [
 "subtle",
 ]

-[[package]]
-name = "half"
-version = "1.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403"
-
 [[package]]
 name = "half"
 version = "2.6.0"
@@ -2470,7 +2414,7 @@ dependencies = [
 [[package]]
 name = "halo2_gadgets"
 version = "0.2.0"
-source = "git+https://github.com/zkonduit/halo2#f441c920be45f8f05d2c06a173d82e8885a5ed4d"
+source = "git+https://github.com/zkonduit/halo2?branch=ac%2Fconditional-compilation-icicle2#1dd2090741f006fd031a07da7f3c9dfce5e0015e"
 dependencies = [
 "arrayvec 0.7.6",
 "bitvec",
@@ -2487,7 +2431,7 @@ dependencies = [
 [[package]]
 name = "halo2_proofs"
 version = "0.3.0"
-source = "git+https://github.com/zkonduit/halo2#f441c920be45f8f05d2c06a173d82e8885a5ed4d"
+source = "git+https://github.com/zkonduit/halo2#1dd2090741f006fd031a07da7f3c9dfce5e0015e?branch=ac%2Fconditional-compilation-icicle2#01c88842679b4308e43ae5ed91c4183e861669bd"
 dependencies = [
 "bincode",
 "blake2b_simd",
@@ -2497,7 +2441,7 @@ dependencies = [
 "halo2curves 0.7.0 (git+https://github.com/privacy-scaling-explorations/halo2curves?rev=b753a832e92d5c86c5c997327a9cf9de86a18851)",
 "icicle-bn254",
 "icicle-core",
- "icicle-cuda-runtime",
+ "icicle-runtime",
 "instant",
 "lazy_static",
 "log",
@@ -2505,7 +2449,7 @@ dependencies = [
 "mopro-msm",
 "rand_chacha 0.3.1",
 "rand_core 0.6.4",
- "rustc-hash 2.1.1",
+ "rustc-hash",
 "serde",
 "sha3 0.9.1",
 "tracing",
@@ -2514,13 +2458,15 @@ dependencies = [
 [[package]]
 name = "halo2_solidity_verifier"
 version = "0.1.0"
-source = "git+https://github.com/alexander-camuto/halo2-solidity-verifier#3d237d566ca6714c9ee6fcf3f2dcefffa79f914c"
+source = "git+https://github.com/zkonduit/ezkl-verifier?branch=main#a518a917f076adb851a1ae39e09527f8dbde5000"
 dependencies = [
 "askama",
 "blake2b_simd",
 "halo2_proofs",
 "hex",
 "itertools 0.11.0",
+ "regex",
+ "revm 14.0.3",
 "ruint",
 "sha3 0.10.8",
 ]
@@ -2718,15 +2664,6 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"

-[[package]]
-name = "hermit-abi"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "hermit-abi"
 version = "0.3.9"
@@ -2918,33 +2855,45 @@ dependencies = [

 [[package]]
 name = "icicle-bn254"
-version = "2.8.0"
-source = "git+https://github.com/ingonyama-zk/icicle?branch=ezkl-icicle2#5dfe006a0f1bc62ea82ca297709bbf3d22a2ca25"
+version = "3.7.0"
+source = "git+https://github.com/ingonyama-zk/icicle?branch=emir%2Fgate_eval_2#012e00694f4cf399fe7a42d9cfbfa6cd7a60f876"
 dependencies = [
 "cmake",
- "criterion 0.3.6",
 "icicle-core",
- "icicle-cuda-runtime",
+ "icicle-hash",
+ "icicle-runtime",
 ]

 [[package]]
 name = "icicle-core"
-version = "2.8.0"
-source = "git+https://github.com/ingonyama-zk/icicle?branch=ezkl-icicle2#5dfe006a0f1bc62ea82ca297709bbf3d22a2ca25"
+version = "3.7.0"
+source = "git+https://github.com/ingonyama-zk/icicle?branch=emir%2Fgate_eval_2#012e00694f4cf399fe7a42d9cfbfa6cd7a60f876"
 dependencies = [
- "criterion 0.3.6",
 "hex",
- "icicle-cuda-runtime",
+ "icicle-runtime",
+ "once_cell",
+ "rand 0.8.5",
 "rayon",
 ]

 [[package]]
-name = "icicle-cuda-runtime"
-version = "2.8.0"
-source = "git+https://github.com/ingonyama-zk/icicle?branch=ezkl-icicle2#5dfe006a0f1bc62ea82ca297709bbf3d22a2ca25"
+name = "icicle-hash"
+version = "3.7.0"
+source = "git+https://github.com/ingonyama-zk/icicle?branch=emir%2Fgate_eval_2#012e00694f4cf399fe7a42d9cfbfa6cd7a60f876"
 dependencies = [
- "bindgen",
- "bitflags 1.3.2",
+ "cmake",
+ "icicle-core",
+ "icicle-runtime",
+ "rand 0.8.5",
+]
+
+[[package]]
+name = "icicle-runtime"
+version = "3.7.0"
+source = "git+https://github.com/ingonyama-zk/icicle?branch=emir%2Fgate_eval_2#012e00694f4cf399fe7a42d9cfbfa6cd7a60f876"
+dependencies = [
+ "cmake",
+ "once_cell",
 ]

 [[package]]
@@ -3397,28 +3346,12 @@ dependencies = [
 "spin",
 ]

-[[package]]
-name = "lazycell"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
-
 [[package]]
 name = "libc"
 version = "0.2.172"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"

-[[package]]
-name = "libloading"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
-dependencies = [
- "cfg-if",
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "libm"
 version = "0.2.13"
@@ -3446,12 +3379,6 @@ dependencies = [
 "redox_syscall",
 ]

-[[package]]
-name = "linux-raw-sys"
-version = "0.4.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
-
 [[package]]
 name = "linux-raw-sys"
 version = "0.9.4"
@@ -3890,7 +3817,7 @@ dependencies = [
 "num-traits",
 "pyo3",
 "pyo3-build-config",
- "rustc-hash 2.1.1",
+ "rustc-hash",
 ]

 [[package]]
@@ -4321,16 +4248,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"

-[[package]]
-name = "prettyplease"
-version = "0.2.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "664ec5419c51e34154eec046ebcba56312d5a2fc3b09a06da188e1ad21afadf6"
-dependencies = [
- "proc-macro2",
- "syn 2.0.101",
-]
-
 [[package]]
 name = "primal-check"
 version = "0.3.4"
@@ -4583,7 +4500,7 @@ dependencies = [
 "pin-project-lite",
 "quinn-proto",
 "quinn-udp",
- "rustc-hash 2.1.1",
+ "rustc-hash",
 "rustls",
 "socket2",
 "thiserror 2.0.12",
@@ -4602,7 +4519,7 @@ dependencies = [
 "getrandom 0.3.2",
 "rand 0.9.1",
 "ring",
- "rustc-hash 2.1.1",
+ "rustc-hash",
 "rustls",
 "rustls-pki-types",
 "slab",
@@ -4918,8 +4835,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68f4ca8ae0345104523b4af1a8a7ea97cfa1865cdb7a7c25d23c1a18d9b48598"
 dependencies = [
 "auto_impl",
- "revm-interpreter",
- "revm-precompile",
+ "revm-interpreter 1.3.0",
+ "revm-precompile 2.2.0",
+]
+
+[[package]]
+name = "revm"
+version = "14.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "641702b12847f9ed418d552f4fcabe536d867a2c980e96b6e7e25d7b992f929f"
+dependencies = [
+ "auto_impl",
+ "cfg-if",
+ "dyn-clone",
+ "revm-interpreter 10.0.3",
+ "revm-precompile 11.0.3",
 ]

 [[package]]
@@ -4928,7 +4858,16 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f959cafdf64a7f89b014fa73dc2325001cf654b3d9400260b212d19a2ebe3da0"
 dependencies = [
- "revm-primitives",
+ "revm-primitives 1.3.0",
+]
+
+[[package]]
+name = "revm-interpreter"
+version = "10.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e5e14002afae20b5bf1566f22316122f42f57517000e559c55b25bf7a49cba2"
+dependencies = [
+ "revm-primitives 10.0.0",
 ]

 [[package]]
@@ -4940,7 +4879,23 @@ dependencies = [
 "k256",
 "num",
 "once_cell",
- "revm-primitives",
+ "revm-primitives 1.3.0",
+ "ripemd",
+ "sha2",
+ "substrate-bn",
+]
+
+[[package]]
+name = "revm-precompile"
+version = "11.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3198c06247e8d4ad0d1312591edf049b0de4ddffa9fecb625c318fd67db8639b"
+dependencies = [
+ "aurora-engine-modexp",
+ "cfg-if",
+ "k256",
+ "once_cell",
+ "revm-primitives 10.0.0",
 "ripemd",
 "sha2",
 "substrate-bn",
@@ -4962,6 +4917,24 @@ dependencies = [
 "hex",
 ]

+[[package]]
+name = "revm-primitives"
+version = "10.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f1525851a03aff9a9d6a1d018b414d76252d6802ab54695b27093ecd7e7a101"
+dependencies = [
+ "alloy-eip2930",
+ "alloy-eip7702",
+ "alloy-primitives 0.8.25",
+ "auto_impl",
+ "bitflags 2.9.0",
+ "bitvec",
+ "cfg-if",
+ "dyn-clone",
+ "enumn",
+ "hex",
+]
+
 [[package]]
 name = "rfc6979"
 version = "0.4.0"
@@ -5044,12 +5017,6 @@ version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"

-[[package]]
-name = "rustc-hash"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
-
 [[package]]
 name = "rustc-hash"
 version = "2.1.1"
@@ -5095,19 +5062,6 @@ dependencies = [
 "version_check",
 ]

-[[package]]
-name = "rustix"
-version = "0.38.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
-dependencies = [
- "bitflags 2.9.0",
- "errno",
- "libc",
- "linux-raw-sys 0.4.15",
- "windows-sys 0.59.0",
-]
-
 [[package]]
 name = "rustix"
 version = "1.0.5"
@@ -5117,7 +5071,7 @@ dependencies = [
 "bitflags 2.9.0",
 "errno",
 "libc",
- "linux-raw-sys 0.9.4",
+ "linux-raw-sys",
 "windows-sys 0.59.0",
 ]

@@ -5365,16 +5319,6 @@ dependencies = [
 "serde",
 ]

-[[package]]
-name = "serde_cbor"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5"
-dependencies = [
- "half 1.8.3",
- "serde",
-]
-
 [[package]]
 name = "serde_derive"
 version = "1.0.219"
@@ -5555,7 +5499,7 @@ dependencies = [
 "num-traits",
 "poseidon",
 "rand 0.8.5",
- "revm",
+ "revm 3.5.0",
 "serde",
 "sha3 0.10.8",
 ]
@@ -5821,7 +5765,7 @@ dependencies = [
 "fastrand",
 "getrandom 0.3.2",
 "once_cell",
- "rustix 1.0.5",
+ "rustix",
 "windows-sys 0.59.0",
 ]

@@ -5867,15 +5811,6 @@ dependencies = [
 "syn 1.0.109",
 ]

-[[package]]
-name = "textwrap"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-dependencies = [
- "unicode-width 0.1.14",
-]
-
 [[package]]
 name = "textwrap"
 version = "0.16.2"
@@ -6269,7 +6204,7 @@ dependencies = [
 "downcast-rs",
 "dyn-clone",
 "dyn-hash",
- "half 2.6.0",
+ "half",
 "itertools 0.12.1",
 "lazy_static",
 "maplit",
@@ -6304,7 +6239,7 @@ dependencies = [
 "downcast-rs",
 "dyn-clone",
 "dyn-hash",
- "half 2.6.0",
+ "half",
 "lazy_static",
 "liquid",
 "liquid-core",
@@ -6485,7 +6420,7 @@ dependencies = [
 "once_cell",
 "paste",
 "serde",
- "textwrap 0.16.2",
+ "textwrap",
 "toml 0.5.11",
 "uniffi_meta",
 "uniffi_testing",
@@ -6577,7 +6512,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cef408229a3a407fafa4c36dc4f6ece78a6fb258ab28d2b64bddd49c8cb680f6"
 dependencies = [
 "anyhow",
- "textwrap 0.16.2",
+ "textwrap",
 "uniffi_meta",
 "uniffi_testing",
 "weedle2",
@@ -6917,18 +6852,6 @@ dependencies = [
 "nom",
 ]

-[[package]]
-name = "which"
-version = "4.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
-dependencies = [
- "either",
- "home",
- "once_cell",
- "rustix 0.38.44",
-]
-
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -7306,7 +7229,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0d65cbf2f12c15564212d48f4e3dfb87923d25d611f2aed18f4cb23f0413d89e"
 dependencies = [
 "libc",
- "rustix 1.0.5",
+ "rustix",
 ]

 [[package]]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,12 +16,12 @@ crate-type = ["cdylib", "rlib", "staticlib"]


 [dependencies]
-halo2_gadgets = { git = "https://github.com/zkonduit/halo2" }
+halo2_gadgets = { git = "https://github.com/zkonduit/halo2", branch= "ac/conditional-compilation-icicle2" }
 halo2curves = { git = "https://github.com/privacy-scaling-explorations/halo2curves", rev = "b753a832e92d5c86c5c997327a9cf9de86a18851", features = [
    "derive_serde",
 ] }
-halo2_proofs = { git = "https://github.com/zkonduit/halo2", package = "halo2_proofs", features = [
-    "circuit-params",
+halo2_proofs = { git = "https://github.com/zkonduit/halo2", package = "halo2_proofs", branch= "ac/conditional-compilation-icicle2", features = [
+    "circuit-params", "mv-lookup"
 ] }
 rand = { version = "0.8", default-features = false }
 itertools = { version = "0.10.3", default-features = false }
@@ -33,9 +33,11 @@ thiserror = { version = "1.0.38", default-features = false }
 hex = { version = "0.4.3", default-features = false }
 halo2_wrong_ecc = { git = "https://github.com/zkonduit/halo2wrong", branch = "ac/chunked-mv-lookup", package = "ecc" }
 snark-verifier = { git = "https://github.com/zkonduit/snark-verifier", branch = "ac/chunked-mv-lookup", features = [
-    "derive_serde",
+    "derive_serde", "mv-lookup"
+] }
+halo2_solidity_verifier = { git = "https://github.com/zkonduit/ezkl-verifier", branch = "main", optional = true, features = [
+    "evm", "mv-lookup",
 ] }
-halo2_solidity_verifier = { git = "https://github.com/alexander-camuto/halo2-solidity-verifier", optional = true }
 maybe-rayon = { version = "0.1.1", default-features = false }
 bincode = { version = "1.3.3", default-features = false }
 unzip-n = "0.1.2"
@@ -43,10 +45,12 @@ num = "0.4.1"
 tosubcommand = { git = "https://github.com/zkonduit/enum_to_subcommand", package = "tosubcommand", optional = true }
 semver = { version = "1.0.22", optional = true }

+
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-serde_json = { version = "1.0.97", features = ["float_roundtrip", "raw_value"] }

 # evm related deps
+serde_json = { version = "1.0.97", features = ["float_roundtrip", "raw_value"] }
+
 alloy = { git = "https://github.com/alloy-rs/alloy", version = "0.1.0", rev = "5fbf57bac99edef9d8475190109a7ea9fb7e5e83", features = [
    "provider-http",
    "signers",
@@ -56,6 +60,7 @@ alloy = { git = "https://github.com/alloy-rs/alloy", version = "0.1.0", rev = "5
    "node-bindings",

 ], optional = true }
+
 foundry-compilers = { version = "0.4.1", features = [
    "svm-solc",
 ], optional = true }
@@ -98,6 +103,10 @@ uniffi_bindgen = { version = "=0.28.0", optional = true }
 camino = { version = "^1.1", optional = true }
 uuid = { version = "1.10.0", features = ["v4"], optional = true }

+# GPU / device related things (optional - only enabled with gpu-accelerated feature)
+icicle-runtime = { git = "https://github.com/ingonyama-zk/icicle", branch="emir/gate_eval_2", package="icicle-runtime", optional = true }
+
+
 [target.'cfg(not(all(target_arch = "wasm32", target_os = "unknown")))'.dependencies]
 colored = { version = "2.0.0", default-features = false, optional = true }
 env_logger = { version = "0.10.0", default-features = false, optional = true }
@@ -217,25 +226,31 @@ required-features = ["python-bindings"]
 [features]
 web = ["wasm-bindgen-rayon"]
 default = [
+    "eth",
+    "dep:halo2_solidity_verifier",
    "ezkl",
-    "mv-lookup",
    "precompute-coset",
    "no-banner",
    "parallel-poly-read",
+    "reusable-verifier",
 ]
 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"]
+universal-bindings = [
+    "uniffi",
+    "mv-lookup",
+    "precompute-coset",
+    "parallel-poly-read",
+    "dep:halo2_solidity_verifier"
+]
+logging = ["dep:colored", "dep:env_logger", "dep:chrono"]
+ios-bindings = ["universal-bindings"]
 ios-bindings-test = ["ios-bindings", "uniffi/bindgen-tests"]
 ezkl = [
    "onnx",
-    "dep:colored",
-    "dep:env_logger",
    "tabled/color",
    "serde_json/std",
    "colored_json",
-    "dep:alloy",
-    "dep:foundry-compilers",
    "dep:ethabi",
    "dep:indicatif",
    "dep:gag",
@@ -246,24 +261,21 @@ ezkl = [
    "dep:chrono",
    "dep:sha256",
    "dep:clap_complete",
-    "dep:halo2_solidity_verifier",
    "dep:semver",
    "dep:clap",
    "dep:tosubcommand",
+    "logging",
 ]
+eth = ["dep:alloy", "dep:foundry-compilers", "dep:ethabi"]
 parallel-poly-read = [
    "halo2_proofs/circuit-params",
    "halo2_proofs/parallel-poly-read",
 ]
-mv-lookup = [
-    "halo2_proofs/mv-lookup",
-    "snark-verifier/mv-lookup",
-    "halo2_solidity_verifier/mv-lookup",
-]
+mv-lookup = ["halo2_proofs/mv-lookup", "snark-verifier/mv-lookup"]
 asm = ["halo2curves/asm", "halo2_proofs/asm"]
 precompute-coset = ["halo2_proofs/precompute-coset"]
 det-prove = []
-icicle = ["halo2_proofs/icicle_gpu"]
+gpu-accelerated = ["halo2_proofs/gpu-accelerated", "dep:icicle-runtime"]
 empty-cmd = []
 no-banner = []
 no-update = []
@@ -271,6 +283,18 @@ macos-metal = ["halo2_proofs/macos"]
 ios-metal = ["halo2_proofs/ios"]
 jemalloc = ["dep:jemallocator"]
 mimalloc = ["dep:mimalloc"]
+reusable-verifier = []
+
+
+[patch.'https://github.com/zkonduit/halo2']
+halo2_proofs = { git = "https://github.com/zkonduit/halo2#1dd2090741f006fd031a07da7f3c9dfce5e0015e", package = "halo2_proofs", branch= "ac/conditional-compilation-icicle2", features = [
+    "circuit-params", "mv-lookup"
+] }
+
+[patch.'https://github.com/zkonduit/halo2#f441c920be45f8f05d2c06a173d82e8885a5ed4d']
+halo2_proofs = { git = "https://github.com/zkonduit/halo2#1dd2090741f006fd031a07da7f3c9dfce5e0015e", package = "halo2_proofs", branch= "ac/conditional-compilation-icicle2", features = [
+    "circuit-params", "mv-lookup"
+] }


 [patch.crates-io]
@@ -290,3 +314,5 @@ opt-level = 3

 [package.metadata.wasm-pack.profile.release]
 wasm-opt = ["-O4", "--flexible-inline-max-function-size", "4294967295"]
+
+
--- a/README.md
+++ b/README.md
@@ -76,11 +76,6 @@ For more details visit the [docs](https://docs.ezkl.xyz). The CLI is faster than

 Build the auto-generated rust documentation and open the docs in your browser locally. `cargo doc --open`

-#### In-browser EVM Verifier
-
-As an alternative to running the native Halo2 verifier as a WASM binding in the browser, you can use the in-browser EVM verifier. The source code of which you can find in the `in-browser-evm-verifier` directory and a README with instructions on how to use it.
-
-
 ### Building the Project 🔨

 #### Rust CLI
--- a/abis/DataAttestation.json
+++ b/abis/DataAttestation.json
@@ -1,312 +0,0 @@
-[
-    {
-        "inputs": [
-            {
-                "internalType": "address",
-                "name": "_contractAddresses",
-                "type": "address"
-            },
-            {
-                "internalType": "bytes",
-                "name": "_callData",
-                "type": "bytes"
-            },
-            {
-                "internalType": "uint256[]",
-                "name": "_decimals",
-                "type": "uint256[]"
-            },
-            {
-                "internalType": "uint256[]",
-                "name": "_bits",
-                "type": "uint256[]"
-            },
-            {
-                "internalType": "uint8",
-                "name": "_instanceOffset",
-                "type": "uint8"
-            }
-        ],
-        "stateMutability": "nonpayable",
-        "type": "constructor"
-    },
-    {
-        "inputs": [],
-        "name": "HALF_ORDER",
-        "outputs": [
-            {
-                "internalType": "uint256",
-                "name": "",
-                "type": "uint256"
-            }
-        ],
-        "stateMutability": "view",
-        "type": "function"
-    },
-    {
-        "inputs": [],
-        "name": "ORDER",
-        "outputs": [
-            {
-                "internalType": "uint256",
-                "name": "",
-                "type": "uint256"
-            }
-        ],
-        "stateMutability": "view",
-        "type": "function"
-    },
-    {
-        "inputs": [
-            {
-                "internalType": "uint256[]",
-                "name": "instances",
-                "type": "uint256[]"
-            }
-        ],
-        "name": "attestData",
-        "outputs": [],
-        "stateMutability": "view",
-        "type": "function"
-    },
-    {
-        "inputs": [],
-        "name": "callData",
-        "outputs": [
-            {
-                "internalType": "bytes",
-                "name": "",
-                "type": "bytes"
-            }
-        ],
-        "stateMutability": "view",
-        "type": "function"
-    },
-    {
-        "inputs": [],
-        "name": "contractAddress",
-        "outputs": [
-            {
-                "internalType": "address",
-                "name": "",
-                "type": "address"
-            }
-        ],
-        "stateMutability": "view",
-        "type": "function"
-    },
-    {
-        "inputs": [
-            {
-                "internalType": "bytes",
-                "name": "encoded",
-                "type": "bytes"
-            }
-        ],
-        "name": "getInstancesCalldata",
-        "outputs": [
-            {
-                "internalType": "uint256[]",
-                "name": "instances",
-                "type": "uint256[]"
-            }
-        ],
-        "stateMutability": "pure",
-        "type": "function"
-    },
-    {
-        "inputs": [
-            {
-                "internalType": "bytes",
-                "name": "encoded",
-                "type": "bytes"
-            }
-        ],
-        "name": "getInstancesMemory",
-        "outputs": [
-            {
-                "internalType": "uint256[]",
-                "name": "instances",
-                "type": "uint256[]"
-            }
-        ],
-        "stateMutability": "pure",
-        "type": "function"
-    },
-    {
-        "inputs": [
-            {
-                "internalType": "uint256",
-                "name": "index",
-                "type": "uint256"
-            }
-        ],
-        "name": "getScalars",
-        "outputs": [
-            {
-                "components": [
-                    {
-                        "internalType": "uint256",
-                        "name": "decimals",
-                        "type": "uint256"
-                    },
-                    {
-                        "internalType": "uint256",
-                        "name": "bits",
-                        "type": "uint256"
-                    }
-                ],
-                "internalType": "struct DataAttestation.Scalars",
-                "name": "",
-                "type": "tuple"
-            }
-        ],
-        "stateMutability": "view",
-        "type": "function"
-    },
-    {
-        "inputs": [],
-        "name": "instanceOffset",
-        "outputs": [
-            {
-                "internalType": "uint8",
-                "name": "",
-                "type": "uint8"
-            }
-        ],
-        "stateMutability": "view",
-        "type": "function"
-    },
-    {
-        "inputs": [
-            {
-                "internalType": "uint256",
-                "name": "x",
-                "type": "uint256"
-            },
-            {
-                "internalType": "uint256",
-                "name": "y",
-                "type": "uint256"
-            },
-            {
-                "internalType": "uint256",
-                "name": "denominator",
-                "type": "uint256"
-            }
-        ],
-        "name": "mulDiv",
-        "outputs": [
-            {
-                "internalType": "uint256",
-                "name": "result",
-                "type": "uint256"
-            }
-        ],
-        "stateMutability": "pure",
-        "type": "function"
-    },
-    {
-        "inputs": [
-            {
-                "internalType": "int256",
-                "name": "x",
-                "type": "int256"
-            },
-            {
-                "components": [
-                    {
-                        "internalType": "uint256",
-                        "name": "decimals",
-                        "type": "uint256"
-                    },
-                    {
-                        "internalType": "uint256",
-                        "name": "bits",
-                        "type": "uint256"
-                    }
-                ],
-                "internalType": "struct DataAttestation.Scalars",
-                "name": "_scalars",
-                "type": "tuple"
-            }
-        ],
-        "name": "quantizeData",
-        "outputs": [
-            {
-                "internalType": "int256",
-                "name": "quantized_data",
-                "type": "int256"
-            }
-        ],
-        "stateMutability": "pure",
-        "type": "function"
-    },
-    {
-        "inputs": [
-            {
-                "internalType": "address",
-                "name": "target",
-                "type": "address"
-            },
-            {
-                "internalType": "bytes",
-                "name": "data",
-                "type": "bytes"
-            }
-        ],
-        "name": "staticCall",
-        "outputs": [
-            {
-                "internalType": "bytes",
-                "name": "",
-                "type": "bytes"
-            }
-        ],
-        "stateMutability": "view",
-        "type": "function"
-    },
-    {
-        "inputs": [
-            {
-                "internalType": "int256",
-                "name": "x",
-                "type": "int256"
-            }
-        ],
-        "name": "toFieldElement",
-        "outputs": [
-            {
-                "internalType": "uint256",
-                "name": "field_element",
-                "type": "uint256"
-            }
-        ],
-        "stateMutability": "pure",
-        "type": "function"
-    },
-    {
-        "inputs": [
-            {
-                "internalType": "address",
-                "name": "verifier",
-                "type": "address"
-            },
-            {
-                "internalType": "bytes",
-                "name": "encoded",
-                "type": "bytes"
-            }
-        ],
-        "name": "verifyWithDataAttestation",
-        "outputs": [
-            {
-                "internalType": "bool",
-                "name": "",
-                "type": "bool"
-            }
-        ],
-        "stateMutability": "view",
-        "type": "function"
-    }
-]
--- a/abis/QuantizeData.json
+++ b/abis/QuantizeData.json
@@ -1,98 +0,0 @@
-[
-	{
-		"inputs": [
-			{
-				"internalType": "int256[]",
-				"name": "quantized_data",
-				"type": "int256[]"
-			}
-		],
-		"name": "check_is_valid_field_element",
-		"outputs": [
-			{
-				"internalType": "uint256[]",
-				"name": "output",
-				"type": "uint256[]"
-			}
-		],
-		"stateMutability": "pure",
-		"type": "function"
-	},
-	{
-		"inputs": [
-			{
-				"internalType": "bytes[]",
-				"name": "data",
-				"type": "bytes[]"
-			},
-			{
-				"internalType": "uint256[]",
-				"name": "decimals",
-				"type": "uint256[]"
-			},
-			{
-				"internalType": "uint256[]",
-				"name": "scales",
-				"type": "uint256[]"
-			}
-		],
-		"name": "quantize_data_multi",
-		"outputs": [
-			{
-				"internalType": "int256[]",
-				"name": "quantized_data",
-				"type": "int256[]"
-			}
-		],
-		"stateMutability": "pure",
-		"type": "function"
-	},
-	{
-		"inputs": [
-			{
-				"internalType": "bytes",
-				"name": "data",
-				"type": "bytes"
-			},
-			{
-				"internalType": "uint256",
-				"name": "decimals",
-				"type": "uint256"
-			},
-			{
-				"internalType": "uint256[]",
-				"name": "scales",
-				"type": "uint256[]"
-			}
-		],
-		"name": "quantize_data_single",
-		"outputs": [
-			{
-				"internalType": "int256[]",
-				"name": "quantized_data",
-				"type": "int256[]"
-			}
-		],
-		"stateMutability": "pure",
-		"type": "function"
-	},
-	{
-		"inputs": [
-			{
-				"internalType": "int64[]",
-				"name": "quantized_data",
-				"type": "int64[]"
-			}
-		],
-		"name": "to_field_element",
-		"outputs": [
-			{
-				"internalType": "uint256[]",
-				"name": "output",
-				"type": "uint256[]"
-			}
-		],
-		"stateMutability": "pure",
-		"type": "function"
-	}
-]
--- a/abis/TestReads.json
+++ b/abis/TestReads.json
@@ -1,32 +0,0 @@
-[
-	{
-		"inputs": [
-			{
-				"internalType": "int256[]",
-				"name": "_numbers",
-				"type": "int256[]"
-			}
-		],
-		"stateMutability": "nonpayable",
-		"type": "constructor"
-	},
-	{
-		"inputs": [
-			{
-				"internalType": "uint256",
-				"name": "",
-				"type": "uint256"
-			}
-		],
-		"name": "arr",
-		"outputs": [
-			{
-				"internalType": "int256",
-				"name": "",
-				"type": "int256"
-			}
-		],
-		"stateMutability": "view",
-		"type": "function"
-	}
-]
--- a/benches/accum_einsum_matmul.rs
+++ b/benches/accum_einsum_matmul.rs
@@ -1,53 +1,78 @@
-use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion, Throughput};
+use criterion::{
+    criterion_group, criterion_main, AxisScale, BenchmarkId, Criterion, PlotConfiguration,
+    Throughput,
+};
+use ezkl::circuit::einsum::analysis::analyze_einsum_usage;
+use ezkl::circuit::einsum::circuit_params::SingleEinsumParams;
 use ezkl::circuit::poly::PolyOp;
 use ezkl::circuit::*;
-use ezkl::pfsys::create_proof_circuit;
-use ezkl::pfsys::TranscriptType;
-use ezkl::pfsys::{create_keys, srs::gen_srs};
+use ezkl::pfsys::srs::gen_srs;
+use ezkl::pfsys::{create_keys, create_proof_circuit, TranscriptType};
 use ezkl::tensor::*;
+use halo2_proofs::circuit::floor_planner::V1;
 use halo2_proofs::poly::kzg::commitment::KZGCommitmentScheme;
-use halo2_proofs::poly::kzg::multiopen::ProverSHPLONK;
-use halo2_proofs::poly::kzg::multiopen::VerifierSHPLONK;
+use halo2_proofs::poly::kzg::multiopen::{ProverSHPLONK, VerifierSHPLONK};
 use halo2_proofs::poly::kzg::strategy::SingleStrategy;
 use halo2_proofs::{
    arithmetic::Field,
-    circuit::{Layouter, SimpleFloorPlanner, Value},
+    circuit::{Layouter, Value},
    plonk::{Circuit, ConstraintSystem, Error},
 };
 use halo2curves::bn256::{Bn256, Fr};
+use halo2curves::ff::PrimeField;
 use itertools::Itertools;
 use rand::rngs::OsRng;
 use snark_verifier::system::halo2::transcript::evm::EvmTranscript;
-use std::marker::PhantomData;
+use std::collections::HashMap;

 static mut LEN: usize = 4;
-const K: usize = 16;
+static mut K: usize = 15;

 #[derive(Clone)]
-struct MyCircuit {
-    inputs: [ValTensor<Fr>; 2],
-    _marker: PhantomData<Fr>,
+struct MyCircuit<F: PrimeField + TensorType + PartialOrd> {
+    inputs: [ValTensor<F>; 2],
+    einsum_params: SingleEinsumParams<F>,
 }

-impl Circuit<Fr> for MyCircuit {
+impl Circuit<Fr> for MyCircuit<Fr> {
    type Config = BaseConfig<Fr>;
-    type FloorPlanner = SimpleFloorPlanner;
-    type Params = ();
+    type FloorPlanner = V1;
+    type Params = SingleEinsumParams<Fr>;

    fn without_witnesses(&self) -> Self {
        self.clone()
    }

-    fn configure(cs: &mut ConstraintSystem<Fr>) -> Self::Config {
-        let len = unsafe { LEN };
+    fn configure_with_params(cs: &mut ConstraintSystem<Fr>, params: Self::Params) -> Self::Config {
+        let mut config = Self::Config::default();

-        let a = VarTensor::new_advice(cs, K, 1, len * len);
+        let mut equations = HashMap::new();
+        equations.insert((0, params.equation), params.input_axes_to_dims);
+        let analysis = analyze_einsum_usage(&equations).unwrap();
+        let num_einsum_inner_cols = 1;
+        unsafe {
+            config
+                .configure_einsums(cs, &analysis, num_einsum_inner_cols, K)
+                .unwrap();
+            let _constant = VarTensor::constant_cols(cs, K, 2, false);
+        }

-        let b = VarTensor::new_advice(cs, K, 1, len * len);
+        config
+    }

-        let output = VarTensor::new_advice(cs, K, 1, (len + 1) * len);
+    fn params(&self) -> Self::Params {
+        SingleEinsumParams::<Fr>::new(
+            &self.einsum_params.equation,
+            &[
+                &self.inputs[0].get_inner().unwrap(),
+                &self.inputs[1].get_inner().unwrap(),
+            ],
+        )
+        .unwrap()
+    }

-        Self::Config::configure(cs, &[a, b], &output, CheckMode::UNSAFE)
+    fn configure(_cs: &mut ConstraintSystem<Fr>) -> Self::Config {
+        unimplemented!("call configure_with_params instead")
    }

    fn synthesize(
@@ -55,16 +80,33 @@ impl Circuit<Fr> for MyCircuit {
        mut config: Self::Config,
        mut layouter: impl Layouter<Fr>,
    ) -> Result<(), Error> {
+        let challenges = config
+            .einsums
+            .as_ref()
+            .ok_or(Error::Synthesis)?
+            .challenges()
+            .unwrap()
+            .iter()
+            .map(|c| layouter.get_challenge(*c))
+            .collect_vec();
+
        layouter.assign_region(
            || "",
            |region| {
-                let mut region = region::RegionCtx::new(region, 0, 1, 1024, 2);
+                let mut region = region::RegionCtx::new_with_challenges(
+                    region,
+                    0,
+                    1,
+                    1024,
+                    2,
+                    challenges.clone(),
+                );
                config
                    .layout(
                        &mut region,
                        &self.inputs.iter().collect_vec(),
                        Box::new(PolyOp::Einsum {
-                            equation: "ab,bc->ac".to_string(),
+                            equation: self.einsum_params.equation.clone(),
                        }),
                    )
                    .unwrap();
@@ -77,41 +119,49 @@ impl Circuit<Fr> for MyCircuit {

 fn runmatmul(c: &mut Criterion) {
    let mut group = c.benchmark_group("accum_einsum_matmul");
-    let params = gen_srs::<KZGCommitmentScheme<_>>(17);
-    for &len in [4, 32].iter() {
-        unsafe {
-            LEN = len;
+    group.plot_config(PlotConfiguration::default().summary_scale(AxisScale::Linear));
+    group.sampling_mode(criterion::SamplingMode::Flat);
+    group.sample_size(10);
+    let len = 128;
+    unsafe {
+        LEN = len;
+    }
+    for k in 16..17 {
+        let params = unsafe {
+            K = k;
+            gen_srs::<KZGCommitmentScheme<_>>(K as u32)
        };

        let mut a = Tensor::from((0..len * len).map(|_| Value::known(Fr::random(OsRng))));
        a.reshape(&[len, len]).unwrap();

-        // parameters
        let mut b = Tensor::from((0..len * len).map(|_| Value::known(Fr::random(OsRng))));
        b.reshape(&[len, len]).unwrap();

+        let einsum_params = SingleEinsumParams::<Fr>::new("ij,jk->ik", &[&a, &b]).unwrap();
+
        let circuit = MyCircuit {
            inputs: [ValTensor::from(a), ValTensor::from(b)],
-            _marker: PhantomData,
+            einsum_params,
        };

        group.throughput(Throughput::Elements(len as u64));
-        group.bench_with_input(BenchmarkId::new("pk", len), &len, |b, &_| {
+        group.bench_with_input(BenchmarkId::new("pk", k), &k, |b, &_| {
            b.iter(|| {
-                create_keys::<KZGCommitmentScheme<Bn256>, MyCircuit>(&circuit, &params, true)
+                create_keys::<KZGCommitmentScheme<Bn256>, MyCircuit<Fr>>(&circuit, &params, true)
                    .unwrap();
            });
        });

-        let pk =
-            create_keys::<KZGCommitmentScheme<Bn256>, MyCircuit>(&circuit, &params, true).unwrap();
+        let pk = create_keys::<KZGCommitmentScheme<Bn256>, MyCircuit<Fr>>(&circuit, &params, false)
+            .unwrap();

        group.throughput(Throughput::Elements(len as u64));
-        group.bench_with_input(BenchmarkId::new("prove", len), &len, |b, &_| {
+        group.bench_with_input(BenchmarkId::new("prove", k), &k, |b, &_| {
            b.iter(|| {
                let prover = create_proof_circuit::<
                    KZGCommitmentScheme<_>,
-                    MyCircuit,
+                    MyCircuit<Fr>,
                    ProverSHPLONK<_>,
                    VerifierSHPLONK<_>,
                    SingleStrategy<_>,
--- a/contracts/AttestData.sol
+++ b/contracts/AttestData.sol
@@ -1,397 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
-contract LoadInstances {
-    /**
-     * @dev Parse the instances array from the Halo2Verifier encoded calldata.
-     * @notice must pass encoded bytes from memory
-     * @param encoded - verifier calldata
-     */
-    function getInstancesMemory(
-        bytes memory encoded
-    ) public pure returns (uint256[] memory instances) {
-        bytes4 funcSig;
-        uint256 instances_offset;
-        uint256 instances_length;
-        assembly {
-            // fetch function sig. Either `verifyProof(bytes,uint256[])` or `verifyProof(address,bytes,uint256[])`
-            funcSig := mload(add(encoded, 0x20))
-        }
-        if (funcSig == 0xaf83a18d) {
-            instances_offset = 0x64;
-        } else if (funcSig == 0x1e8e1e13) {
-            instances_offset = 0x44;
-        } else {
-            revert("Invalid function signature");
-        }
-        assembly {
-            // Fetch instances offset which is 4 + 32 + 32 bytes away from
-            // start of encoded for `verifyProof(bytes,uint256[])`,
-            // and 4 + 32 + 32 +32 away for `verifyProof(address,bytes,uint256[])`
-
-            instances_offset := mload(add(encoded, instances_offset))
-
-            instances_length := mload(add(add(encoded, 0x24), instances_offset))
-        }
-        instances = new uint256[](instances_length); // Allocate memory for the instances array.
-        assembly {
-            // Now instances points to the start of the array data
-            // (right after the length field).
-            for {
-                let i := 0x20
-            } lt(i, add(mul(instances_length, 0x20), 0x20)) {
-                i := add(i, 0x20)
-            } {
-                mstore(
-                    add(instances, i),
-                    mload(add(add(encoded, add(i, 0x24)), instances_offset))
-                )
-            }
-        }
-        require(
-            funcSig == 0xaf83a18d || funcSig == 0x1e8e1e13,
-            "Invalid function signature"
-        );
-    }
-    /**
-     * @dev Parse the instances array from the Halo2Verifier encoded calldata.
-     * @notice must pass encoded bytes from calldata
-     * @param encoded - verifier calldata
-     */
-    function getInstancesCalldata(
-        bytes calldata encoded
-    ) public pure returns (uint256[] memory instances) {
-        bytes4 funcSig;
-        uint256 instances_offset;
-        uint256 instances_length;
-        assembly {
-            // fetch function sig. Either `verifyProof(bytes,uint256[])` or `verifyProof(address,bytes,uint256[])`
-            funcSig := calldataload(encoded.offset)
-        }
-        if (funcSig == 0xaf83a18d) {
-            instances_offset = 0x44;
-        } else if (funcSig == 0x1e8e1e13) {
-            instances_offset = 0x24;
-        } else {
-            revert("Invalid function signature");
-        }
-        // We need to create a new assembly block in order for solidity
-        // to cast the funcSig to a bytes4 type. Otherwise it will load the entire first 32 bytes of the calldata
-        // within the block
-        assembly {
-            // Fetch instances offset which is 4 + 32 + 32 bytes away from
-            // start of encoded for `verifyProof(bytes,uint256[])`,
-            // and 4 + 32 + 32 +32 away for `verifyProof(address,bytes,uint256[])`
-
-            instances_offset := calldataload(
-                add(encoded.offset, instances_offset)
-            )
-
-            instances_length := calldataload(
-                add(add(encoded.offset, 0x04), instances_offset)
-            )
-        }
-        instances = new uint256[](instances_length); // Allocate memory for the instances array.
-        assembly {
-            // Now instances points to the start of the array data
-            // (right after the length field).
-
-            for {
-                let i := 0x20
-            } lt(i, add(mul(instances_length, 0x20), 0x20)) {
-                i := add(i, 0x20)
-            } {
-                mstore(
-                    add(instances, i),
-                    calldataload(
-                        add(add(encoded.offset, add(i, 0x04)), instances_offset)
-                    )
-                )
-            }
-        }
-    }
-}
-
-// The kzg commitments of a given model, all aggregated into a single bytes array.
-// At solidity generation time, the commitments are hardcoded into the contract via the COMMITMENT_KZG constant.
-// It will be used to check that the proof commitments match the expected commitments.
-bytes constant COMMITMENT_KZG = hex"1234";
-
-contract SwapProofCommitments {
-    /**
-     * @dev Swap the proof commitments
-     * @notice must pass encoded bytes from memory
-     * @param encoded - verifier calldata
-     */
-    function checkKzgCommits(
-        bytes calldata encoded
-    ) internal pure returns (bool equal) {
-        bytes4 funcSig;
-        uint256 proof_offset;
-        uint256 proof_length;
-        assembly {
-            // fetch function sig. Either `verifyProof(bytes,uint256[])` or `verifyProof(address,bytes,uint256[])`
-            funcSig := calldataload(encoded.offset)
-        }
-        if (funcSig == 0xaf83a18d) {
-            proof_offset = 0x24;
-        } else if (funcSig == 0x1e8e1e13) {
-            proof_offset = 0x04;
-        } else {
-            revert("Invalid function signature");
-        }
-        assembly {
-            // Fetch proof offset which is 4 + 32 bytes away from
-            // start of encoded for `verifyProof(bytes,uint256[])`,
-            // and 4 + 32 + 32 away for `verifyProof(address,bytes,uint256[])`
-
-            proof_offset := calldataload(add(encoded.offset, proof_offset))
-
-            proof_length := calldataload(
-                add(add(encoded.offset, 0x04), proof_offset)
-            )
-        }
-        // Check the length of the commitment against the proof bytes
-        if (proof_length < COMMITMENT_KZG.length) {
-            return false;
-        }
-
-        // Load COMMITMENT_KZG into memory
-        bytes memory commitment = COMMITMENT_KZG;
-
-        // Compare the first N bytes of the proof with COMMITMENT_KZG
-        uint words = (commitment.length + 31) / 32; // Calculate the number of 32-byte words
-
-        assembly {
-            // Now we compare the commitment with the proof,
-            // ensuring that the commitments divided up into 32 byte words are all equal.
-            for {
-                let i := 0x20
-            } lt(i, add(mul(words, 0x20), 0x20)) {
-                i := add(i, 0x20)
-            } {
-                let wordProof := calldataload(
-                    add(add(encoded.offset, add(i, 0x04)), proof_offset)
-                )
-                let wordCommitment := mload(add(commitment, i))
-                equal := eq(wordProof, wordCommitment)
-                if eq(equal, 0) {
-                    break
-                }
-            }
-        }
-
-        return equal; // Return true if the commitment comparison passed
-    } /// end checkKzgCommits
-}
-
-contract DataAttestation is LoadInstances, SwapProofCommitments {
-    // the address of the account to make calls to
-    address public immutable contractAddress;
-
-    // the abi encoded function calls to make to the `contractAddress` that returns the attested to data
-    bytes public callData;
-
-    struct Scalars {
-        // The number of base 10 decimals to scale the data by.
-        // For most ERC20 tokens this is 1e18
-        uint256 decimals;
-        // The number of fractional bits of the fixed point EZKL data points.
-        uint256 bits;
-    }
-
-    Scalars[] private scalars;
-
-    function getScalars(uint256 index) public view returns (Scalars memory) {
-        return scalars[index];
-    }
-
-    /**
-     * @notice EZKL P value
-     * @dev In order to prevent the verifier from accepting two version of the same pubInput, n and the quantity (n + P),  where n + P <= 2^256, we require that all instances are stricly less than P. a
-     * @dev The reason for this is that the assmebly code of the verifier performs all arithmetic operations modulo P and as a consequence can't distinguish between n and n + P.
-     */
-    uint256 public constant ORDER =
-        uint256(
-            0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001
-        );
-
-    uint256 public constant HALF_ORDER = ORDER >> 1;
-
-    uint8 public instanceOffset;
-
-    /**
-     * @dev Initialize the contract with account calls the EZKL model will read from.
-     * @param _contractAddresses - The calls to all the contracts EZKL reads storage from.
-     * @param _callData - The abi encoded function calls to make to the `contractAddress` that EZKL reads storage from.
-     */
-    constructor(
-        address _contractAddresses,
-        bytes memory _callData,
-        uint256[] memory _decimals,
-        uint[] memory _bits,
-        uint8 _instanceOffset
-    ) {
-        require(
-            _bits.length == _decimals.length,
-            "Invalid scalar array lengths"
-        );
-        for (uint i; i < _bits.length; i++) {
-            scalars.push(Scalars(10 ** _decimals[i], 1 << _bits[i]));
-        }
-        contractAddress = _contractAddresses;
-        callData = _callData;
-        instanceOffset = _instanceOffset;
-    }
-
-    function mulDiv(
-        uint256 x,
-        uint256 y,
-        uint256 denominator
-    ) public pure returns (uint256 result) {
-        unchecked {
-            uint256 prod0;
-            uint256 prod1;
-            assembly {
-                let mm := mulmod(x, y, not(0))
-                prod0 := mul(x, y)
-                prod1 := sub(sub(mm, prod0), lt(mm, prod0))
-            }
-
-            if (prod1 == 0) {
-                return prod0 / denominator;
-            }
-
-            require(denominator > prod1, "Math: mulDiv overflow");
-
-            uint256 remainder;
-            assembly {
-                remainder := mulmod(x, y, denominator)
-                prod1 := sub(prod1, gt(remainder, prod0))
-                prod0 := sub(prod0, remainder)
-            }
-
-            uint256 twos = denominator & (~denominator + 1);
-            assembly {
-                denominator := div(denominator, twos)
-                prod0 := div(prod0, twos)
-                twos := add(div(sub(0, twos), twos), 1)
-            }
-
-            prod0 |= prod1 * twos;
-
-            uint256 inverse = (3 * denominator) ^ 2;
-
-            inverse *= 2 - denominator * inverse;
-            inverse *= 2 - denominator * inverse;
-            inverse *= 2 - denominator * inverse;
-            inverse *= 2 - denominator * inverse;
-            inverse *= 2 - denominator * inverse;
-            inverse *= 2 - denominator * inverse;
-
-            result = prod0 * inverse;
-            return result;
-        }
-    }
-    /**
-     * @dev Quantize the data returned from the account calls to the scale used by the EZKL model.
-     * @param x - One of the elements of the data returned from the account calls
-     * @param _scalars - The scaling factors for the data returned from the account calls.
-     *
-     */
-    function quantizeData(
-        int x,
-        Scalars memory _scalars
-    ) public pure returns (int256 quantized_data) {
-        if (_scalars.bits == 1 && _scalars.decimals == 1) {
-            return x;
-        }
-        bool neg = x < 0;
-        if (neg) x = -x;
-        uint output = mulDiv(uint256(x), _scalars.bits, _scalars.decimals);
-        if (
-            mulmod(uint256(x), _scalars.bits, _scalars.decimals) * 2 >=
-            _scalars.decimals
-        ) {
-            output += 1;
-        }
-        if (output > HALF_ORDER) {
-            revert("Overflow field modulus");
-        }
-        quantized_data = neg ? -int256(output) : int256(output);
-    }
-    /**
-     * @dev Make a static call to the account to fetch the data that EZKL reads from.
-     * @param target - The address of the account to make calls to.
-     * @param data  - The abi encoded function calls to make to the `contractAddress` that EZKL reads storage from.
-     * @return The data returned from the account calls. (Must come from either a view or pure function. Will throw an error otherwise)
-     */
-    function staticCall(
-        address target,
-        bytes memory data
-    ) public view returns (bytes memory) {
-        (bool success, bytes memory returndata) = target.staticcall(data);
-        if (success) {
-            if (returndata.length == 0) {
-                require(
-                    target.code.length > 0,
-                    "Address: call to non-contract"
-                );
-            }
-            return returndata;
-        } else {
-            revert("Address: low-level call failed");
-        }
-    }
-    /**
-     * @dev Convert the fixed point quantized data into a field element.
-     * @param x - The quantized data.
-     * @return field_element - The field element.
-     */
-    function toFieldElement(
-        int256 x
-    ) public pure returns (uint256 field_element) {
-        // The casting down to uint256 is safe because the order is about 2^254, and the value
-        // of x ranges of -2^127 to 2^127, so x + int(ORDER) is always positive.
-        return uint256(x + int(ORDER)) % ORDER;
-    }
-
-    /**
-     * @dev Make the account calls to fetch the data that EZKL reads from and attest to the data.
-     * @param instances - The public instances to the proof (the data in the proof that publicly accessible to the verifier).
-     */
-    function attestData(uint256[] memory instances) public view {
-        bytes memory returnData = staticCall(contractAddress, callData);
-        int256[] memory x = abi.decode(returnData, (int256[]));
-        int output;
-        uint fieldElement;
-        for (uint i = 0; i < x.length; i++) {
-            output = quantizeData(x[i], scalars[i]);
-            fieldElement = toFieldElement(output);
-            if (fieldElement != instances[i]) {
-                revert("Public input does not match");
-            }
-        }
-    }
-
-    /**
-     * @dev Verify the proof with the data attestation.
-     * @param verifier - The address of the verifier contract.
-     * @param encoded - The verifier calldata.
-     */
-    function verifyWithDataAttestation(
-        address verifier,
-        bytes calldata encoded
-    ) public view returns (bool) {
-        require(verifier.code.length > 0, "Address: call to non-contract");
-        attestData(getInstancesCalldata(encoded));
-        require(checkKzgCommits(encoded), "Invalid KZG commitments");
-        // static call the verifier contract to verify the proof
-        (bool success, bytes memory returndata) = verifier.staticcall(encoded);
-
-        if (success) {
-            return abi.decode(returndata, (bool));
-        } else {
-            revert("low-level call to verifier failed");
-        }
-    }
-}
--- a/docs/python/src/conf.py
+++ b/docs/python/src/conf.py
@@ -1,7 +1,7 @@
 import ezkl

 project = 'ezkl'
-release = '0.0.0'
+release = '22.3.0'
 version = release


--- a/examples/accum_einsum_matmul.rs
+++ b/examples/accum_einsum_matmul.rs
@@ -0,0 +1,171 @@
+use ezkl::circuit::einsum::analysis::analyze_einsum_usage;
+use ezkl::circuit::poly::PolyOp;
+use ezkl::circuit::*;
+use ezkl::tensor::*;
+use halo2_proofs::circuit::floor_planner::V1;
+use halo2_proofs::dev::MockProver;
+use halo2_proofs::{
+    arithmetic::Field,
+    circuit::{Layouter, Value},
+    plonk::{Circuit, ConstraintSystem, Error},
+};
+use halo2curves::bn256::Fr;
+use halo2curves::ff::PrimeField;
+use itertools::Itertools;
+use rand::rngs::OsRng;
+use std::collections::HashMap;
+use std::marker::PhantomData;
+
+const K: usize = 13;
+
+#[derive(Clone)]
+struct MyCircuit<F: PrimeField + TensorType + PartialOrd> {
+    inputs: [ValTensor<F>; 2],
+    einsum: Einsum<F>,
+}
+
+#[derive(Clone, Default)]
+struct Einsum<F: PrimeField + TensorType + PartialOrd> {
+    equation: String,
+    input_axes_to_dims: HashMap<char, usize>,
+    _marker: PhantomData<F>,
+}
+
+impl<F: PrimeField + TensorType + PartialOrd> Einsum<F> {
+    pub fn new(equation: &str, inputs: &[&Tensor<Value<F>>]) -> Result<Self, CircuitError> {
+        let mut eq = equation.split("->");
+        let inputs_eq = eq.next().ok_or(CircuitError::InvalidEinsum)?;
+        let inputs_eq = inputs_eq.split(',').collect::<Vec<_>>();
+
+        // Check that the number of inputs matches the number of inputs in the equation
+        if inputs.len() != inputs_eq.len() {
+            return Err(TensorError::DimMismatch("einsum".to_string()).into());
+        }
+
+        let mut input_axes_to_dims = HashMap::new();
+        for (i, input) in inputs.iter().enumerate() {
+            for j in 0..inputs_eq[i].len() {
+                let c = inputs_eq[i]
+                    .chars()
+                    .nth(j)
+                    .ok_or(CircuitError::InvalidEinsum)?;
+                if let std::collections::hash_map::Entry::Vacant(e) = input_axes_to_dims.entry(c) {
+                    e.insert(input.dims()[j]);
+                } else if input_axes_to_dims[&c] != input.dims()[j] {
+                    return Err(TensorError::DimMismatch("einsum".to_string()).into());
+                }
+            }
+        }
+
+        Ok(Self {
+            equation: equation.to_owned(),
+            input_axes_to_dims,
+            _marker: PhantomData,
+        })
+    }
+}
+
+impl Circuit<Fr> for MyCircuit<Fr> {
+    type Config = BaseConfig<Fr>;
+    type FloorPlanner = V1;
+    type Params = Einsum<Fr>;
+
+    fn without_witnesses(&self) -> Self {
+        self.clone()
+    }
+
+    fn configure_with_params(cs: &mut ConstraintSystem<Fr>, params: Self::Params) -> Self::Config {
+        let mut config = Self::Config::default();
+
+        let mut equations = HashMap::new();
+        equations.insert((0, params.equation), params.input_axes_to_dims);
+        let analysis = analyze_einsum_usage(&equations).unwrap();
+        let num_einsum_inner_cols = 1;
+        config
+            .configure_einsums(cs, &analysis, num_einsum_inner_cols, K)
+            .unwrap();
+
+        config
+    }
+
+    fn params(&self) -> Self::Params {
+        Einsum::<Fr>::new(
+            &self.einsum.equation,
+            &[
+                &self.inputs[0].get_inner().unwrap(),
+                &self.inputs[1].get_inner().unwrap(),
+            ],
+        )
+        .unwrap()
+    }
+
+    fn configure(_cs: &mut ConstraintSystem<Fr>) -> Self::Config {
+        unimplemented!("call configure_with_params instead")
+    }
+
+    fn synthesize(
+        &self,
+        mut config: Self::Config,
+        mut layouter: impl Layouter<Fr>,
+    ) -> Result<(), Error> {
+        let challenges = config
+            .einsums
+            .as_ref()
+            .ok_or(Error::Synthesis)?
+            .challenges()
+            .unwrap()
+            .iter()
+            .map(|c| layouter.get_challenge(*c))
+            .collect_vec();
+
+        layouter.assign_region(
+            || "",
+            |region| {
+                let mut region = region::RegionCtx::new_with_challenges(
+                    region,
+                    0,
+                    1,
+                    1024,
+                    2,
+                    challenges.clone(),
+                );
+                config
+                    .layout(
+                        &mut region,
+                        &self.inputs.iter().collect_vec(),
+                        Box::new(PolyOp::Einsum {
+                            equation: self.einsum.equation.clone(),
+                        }),
+                    )
+                    .unwrap();
+                Ok(())
+            },
+        )?;
+        Ok(())
+    }
+}
+
+fn runmatmul() {
+    let len = 64;
+
+    let mut a = Tensor::from((0..len * len).map(|_| Value::known(Fr::random(OsRng))));
+    a.reshape(&[len, len]).unwrap();
+
+    // parameters
+    let mut b = Tensor::from((0..len * len).map(|_| Value::known(Fr::random(OsRng))));
+    b.reshape(&[len, len]).unwrap();
+
+    let einsum = Einsum::<Fr>::new("ij,jk->ik", &[&a, &b]).unwrap();
+
+    let circuit = MyCircuit {
+        inputs: [ValTensor::from(a), ValTensor::from(b)],
+        einsum,
+    };
+
+    let mock_prover = MockProver::run(K as u32, &circuit, vec![]).unwrap();
+    mock_prover.assert_satisfied();
+}
+
+pub fn main() {
+    runmatmul()
+}
--- a/examples/batch_mat_mul.rs
+++ b/examples/batch_mat_mul.rs
@@ -0,0 +1,179 @@
+use ezkl::circuit::einsum::analysis::analyze_einsum_usage;
+use ezkl::circuit::poly::PolyOp;
+use ezkl::circuit::*;
+use ezkl::tensor::*;
+use halo2_proofs::circuit::floor_planner::V1;
+use halo2_proofs::dev::MockProver;
+use halo2_proofs::{
+    arithmetic::Field,
+    circuit::{Layouter, Value},
+    plonk::{Circuit, ConstraintSystem, Error},
+};
+use halo2curves::bn256::Fr;
+use halo2curves::ff::PrimeField;
+use itertools::Itertools;
+use rand::rngs::OsRng;
+use std::collections::HashMap;
+use std::marker::PhantomData;
+
+static mut LEN: usize = 4;
+const K: usize = 11;
+
+#[derive(Clone)]
+struct MyCircuit<F: PrimeField + TensorType + PartialOrd> {
+    inputs: [ValTensor<F>; 2],
+    einsum: Einsum<F>,
+}
+
+#[derive(Clone, Default)]
+struct Einsum<F: PrimeField + TensorType + PartialOrd> {
+    equation: String,
+    input_axes_to_dims: HashMap<char, usize>,
+    _marker: PhantomData<F>,
+}
+
+impl<F: PrimeField + TensorType + PartialOrd> Einsum<F> {
+    pub fn new(equation: &str, inputs: &[&Tensor<Value<F>>]) -> Result<Self, CircuitError> {
+        let mut eq = equation.split("->");
+        let inputs_eq = eq.next().ok_or(CircuitError::InvalidEinsum)?;
+        let inputs_eq = inputs_eq.split(',').collect::<Vec<_>>();
+
+        // Check that the number of inputs matches the number of inputs in the equation
+        if inputs.len() != inputs_eq.len() {
+            return Err(TensorError::DimMismatch("einsum".to_string()).into());
+        }
+
+        let mut input_axes_to_dims = HashMap::new();
+        for (i, input) in inputs.iter().enumerate() {
+            for j in 0..inputs_eq[i].len() {
+                let c = inputs_eq[i]
+                    .chars()
+                    .nth(j)
+                    .ok_or(CircuitError::InvalidEinsum)?;
+                if let std::collections::hash_map::Entry::Vacant(e) = input_axes_to_dims.entry(c) {
+                    e.insert(input.dims()[j]);
+                } else if input_axes_to_dims[&c] != input.dims()[j] {
+                    return Err(TensorError::DimMismatch("einsum".to_string()).into());
+                }
+            }
+        }
+
+        Ok(Self {
+            equation: equation.to_owned(),
+            input_axes_to_dims,
+            _marker: PhantomData,
+        })
+    }
+}
+
+impl Circuit<Fr> for MyCircuit<Fr> {
+    type Config = BaseConfig<Fr>;
+    type FloorPlanner = V1;
+    type Params = Einsum<Fr>;
+
+    fn without_witnesses(&self) -> Self {
+        self.clone()
+    }
+
+    fn configure_with_params(cs: &mut ConstraintSystem<Fr>, params: Self::Params) -> Self::Config {
+        let len = unsafe { LEN };
+
+        let a = VarTensor::new_advice(cs, K, 1, len);
+        let b = VarTensor::new_advice(cs, K, 1, len);
+        let output = VarTensor::new_advice(cs, K, 1, len);
+
+        let mut config = Self::Config::configure(cs, &[a, b], &output, CheckMode::UNSAFE);
+
+        let mut equations = HashMap::new();
+        equations.insert((0, params.equation), params.input_axes_to_dims);
+        let analysis = analyze_einsum_usage(&equations).unwrap();
+        let num_einsum_inner_cols = 1;
+        config
+            .configure_einsums(cs, &analysis, num_einsum_inner_cols, K)
+            .unwrap();
+
+        config
+    }
+
+    fn params(&self) -> Self::Params {
+        Einsum::<Fr>::new(
+            &self.einsum.equation,
+            &[
+                &self.inputs[0].get_inner().unwrap(),
+                &self.inputs[1].get_inner().unwrap(),
+            ],
+        )
+        .unwrap()
+    }
+
+    fn configure(_cs: &mut ConstraintSystem<Fr>) -> Self::Config {
+        unimplemented!("call configure_with_params instead")
+    }
+
+    fn synthesize(
+        &self,
+        mut config: Self::Config,
+        mut layouter: impl Layouter<Fr>,
+    ) -> Result<(), Error> {
+        let challenges = config
+            .einsums
+            .as_ref()
+            .ok_or(Error::Synthesis)?
+            .challenges()
+            .unwrap()
+            .iter()
+            .map(|c| layouter.get_challenge(*c))
+            .collect_vec();
+
+        layouter.assign_region(
+            || "",
+            |region| {
+                let mut region = region::RegionCtx::new_with_challenges(
+                    region,
+                    0,
+                    1,
+                    1024,
+                    2,
+                    challenges.clone(),
+                );
+                config
+                    .layout(
+                        &mut region,
+                        &self.inputs.iter().collect_vec(),
+                        Box::new(PolyOp::Einsum {
+                            equation: self.einsum.equation.clone(),
+                        }),
+                    )
+                    .unwrap();
+                Ok(())
+            },
+        )?;
+        Ok(())
+    }
+}
+
+fn runbatchmatmul() {
+    let batch_size = 5;
+    let len = 12;
+
+    let mut a = Tensor::from((0..batch_size * len * len).map(|_| Value::known(Fr::random(OsRng))));
+    a.reshape(&[batch_size, len, len]).unwrap();
+
+    // parameters
+    let mut b = Tensor::from((0..batch_size * len * len).map(|_| Value::known(Fr::random(OsRng))));
+    b.reshape(&[batch_size, len, len]).unwrap();
+
+    let einsum = Einsum::<Fr>::new("ijk,ikl->ijl", &[&a, &b]).unwrap();
+
+    let circuit = MyCircuit {
+        inputs: [ValTensor::from(a), ValTensor::from(b)],
+        einsum,
+    };
+
+    let mock_prover = MockProver::run(K as u32, &circuit, vec![]).unwrap();
+    mock_prover.assert_satisfied();
+}
+
+pub fn main() {
+    runbatchmatmul()
+}
--- a/examples/notebooks/cat_and_dog.ipynb
+++ b/examples/notebooks/cat_and_dog.ipynb
@@ -866,7 +866,7 @@
        },
        {
            "cell_type": "code",
-            "execution_count": 98,
+            "execution_count": null,
            "metadata": {},
            "outputs": [],
            "source": [
@@ -879,6 +879,7 @@
                "run_args.input_visibility = \"private\"\n",
                "run_args.param_visibility = \"fixed\"\n",
                "run_args.output_visibility = \"public\"\n",
+                "run_args.disable_freivalds = True\n",
                "run_args.variables = [(\"batch_size\", 1)]\n",
                "\n",
                "\n",
@@ -904,7 +905,7 @@
            "outputs": [],
            "source": [
                "\n",
-                "res = await ezkl.calibrate_settings(\"input.json\", target=\"resources\", scales = [4])\n",
+                "res = ezkl.calibrate_settings(\"input.json\", target=\"resources\", scales = [4])\n",
                "assert res == True\n",
                "print(\"verified\")\n"
            ]
@@ -954,7 +955,7 @@
            "source": [
                "\n",
                "\n",
-                "res = await ezkl.gen_witness()\n"
+                "res = ezkl.gen_witness()\n"
            ]
        },
        {
--- a/examples/notebooks/data_attest.ipynb
+++ b/examples/notebooks/data_attest.ipynb
@@ -1,589 +0,0 @@
-{
-    "cells": [
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "# data-attest-ezkl\n",
-                "\n",
-                "Here's an example leveraging EZKL whereby the inputs to the model are read and attested to from an on-chain source.\n",
-                "\n",
-                "In this setup:\n",
-                "- the inputs and outputs are publicly known to the prover and verifier\n",
-                "- the on chain inputs will be fetched and then fed directly into the circuit\n",
-                "- the quantization of the on-chain inputs happens within the evm and is replicated at proving time \n"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "First we import the necessary dependencies and set up logging to be as informative as possible. "
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "# check if notebook is in colab\n",
-                "try:\n",
-                "    # install ezkl\n",
-                "    import google.colab\n",
-                "    import subprocess\n",
-                "    import sys\n",
-                "    subprocess.check_call([sys.executable, \"-m\", \"pip\", \"install\", \"ezkl\"])\n",
-                "    subprocess.check_call([sys.executable, \"-m\", \"pip\", \"install\", \"onnx\"])\n",
-                "\n",
-                "# rely on local installation of ezkl if the notebook is not in colab\n",
-                "except:\n",
-                "    pass\n",
-                "\n",
-                "\n",
-                "from torch import nn\n",
-                "import ezkl\n",
-                "import os\n",
-                "import json\n",
-                "import logging\n",
-                "\n",
-                "# uncomment for more descriptive logging \n",
-                "FORMAT = '%(levelname)s %(name)s %(asctime)-15s %(filename)s:%(lineno)d %(message)s'\n",
-                "logging.basicConfig(format=FORMAT)\n",
-                "logging.getLogger().setLevel(logging.DEBUG)\n"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "Now we define our model. It is a very simple PyTorch model that has just one layer, an average pooling 2D layer. "
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "import torch\n",
-                "# Defines the model\n",
-                "\n",
-                "class MyModel(nn.Module):\n",
-                "    def __init__(self):\n",
-                "        super(MyModel, self).__init__()\n",
-                "        self.layer = nn.AvgPool2d(2, 1, (1, 1))\n",
-                "\n",
-                "    def forward(self, x):\n",
-                "        return self.layer(x)[0]\n",
-                "\n",
-                "\n",
-                "circuit = MyModel()\n",
-                "\n",
-                "# this is where you'd train your model"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "We omit training for purposes of this demonstration. We've marked where training would happen in the cell above. \n",
-                "Now we export the model to onnx and create a corresponding (randomly generated) input. This input data will eventually be stored on chain and read from according to the call_data field in the graph input.\n",
-                "\n",
-                "You can replace the random `x` with real data if you so wish. "
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "x = 0.1*torch.rand(1,*[3, 2, 2], requires_grad=True)\n",
-                "\n",
-                "# Flips the neural net into inference mode\n",
-                "circuit.eval()\n",
-                "\n",
-                "    # Export the model\n",
-                "torch.onnx.export(circuit,               # model being run\n",
-                "                      x,                   # model input (or a tuple for multiple inputs)\n",
-                "                      \"network.onnx\",            # where to save the model (can be a file or file-like object)\n",
-                "                      export_params=True,        # store the trained parameter weights inside the model file\n",
-                "                      opset_version=10,          # the ONNX version to export the model to\n",
-                "                      do_constant_folding=True,  # whether to execute constant folding for optimization\n",
-                "                      input_names = ['input'],   # the model's input names\n",
-                "                      output_names = ['output'], # the model's output names\n",
-                "                      dynamic_axes={'input' : {0 : 'batch_size'},    # variable length axes\n",
-                "                                    'output' : {0 : 'batch_size'}})\n",
-                "\n",
-                "data_array = ((x).detach().numpy()).reshape([-1]).tolist()\n",
-                "\n",
-                "data = dict(input_data = [data_array])\n",
-                "\n",
-                "    # Serialize data into file:\n",
-                "json.dump(data, open(\"input.json\", 'w' ))\n",
-                "\n"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "We now define a function that will create a new anvil instance which we will deploy our test contract too. This contract will contain in its storage the data that we will read from and attest to. In production you would not need to set up a local anvil instance. Instead you would replace RPC_URL with the actual RPC endpoint of the chain you are deploying your verifiers too, reading from the data on said chain."
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "import subprocess\n",
-                "import time\n",
-                "import threading\n",
-                "\n",
-                "# make sure anvil is running locally\n",
-                "# $ anvil -p 3030\n",
-                "\n",
-                "RPC_URL = \"http://localhost:3030\"\n",
-                "\n",
-                "# Save process globally\n",
-                "anvil_process = None\n",
-                "\n",
-                "def start_anvil():\n",
-                "    global anvil_process\n",
-                "    if anvil_process is None:\n",
-                "        anvil_process = subprocess.Popen([\"anvil\", \"-p\", \"3030\", \"--code-size-limit=41943040\"])\n",
-                "        if anvil_process.returncode is not None:\n",
-                "            raise Exception(\"failed to start anvil process\")\n",
-                "        time.sleep(3)\n",
-                "\n",
-                "def stop_anvil():\n",
-                "    global anvil_process\n",
-                "    if anvil_process is not None:\n",
-                "        anvil_process.terminate()\n",
-                "        anvil_process = None\n"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "We define our `PyRunArgs` objects which contains the visibility parameters for out model. \n",
-                "- `input_visibility` defines the visibility of the model inputs\n",
-                "- `param_visibility` defines the visibility of the model weights and constants and parameters \n",
-                "- `output_visibility` defines the visibility of the model outputs\n",
-                "\n",
-                "Here we create the following setup:\n",
-                "- `input_visibility`: \"public\"\n",
-                "- `param_visibility`: \"private\"\n",
-                "- `output_visibility`: public\n"
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "import ezkl\n",
-                "\n",
-                "model_path = os.path.join('network.onnx')\n",
-                "compiled_model_path = os.path.join('network.compiled')\n",
-                "pk_path = os.path.join('test.pk')\n",
-                "vk_path = os.path.join('test.vk')\n",
-                "settings_path = os.path.join('settings.json')\n",
-                "srs_path = os.path.join('kzg.srs')\n",
-                "data_path = os.path.join('input.json')\n",
-                "\n",
-                "run_args = ezkl.PyRunArgs()\n",
-                "run_args.input_visibility = \"public\"\n",
-                "run_args.param_visibility = \"private\"\n",
-                "run_args.output_visibility = \"public\"\n",
-                "run_args.num_inner_cols = 1\n",
-                "run_args.variables = [(\"batch_size\", 1)]\n",
-                "\n",
-                "\n",
-                "\n"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "Now we generate a settings file. This file basically instantiates a bunch of parameters that determine their circuit shape, size etc... Because of the way we represent nonlinearities in the circuit (using Halo2's [lookup tables](https://zcash.github.io/halo2/design/proving-system/lookup.html)), it is often best to _calibrate_ this settings file as some data can fall out of range of these lookups.\n",
-                "\n",
-                "You can pass a dataset for calibration that will be representative of real inputs you might find if and when you deploy the prover. Here we create a dummy calibration dataset for demonstration purposes. "
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "!RUST_LOG=trace\n",
-                "# TODO: Dictionary outputs\n",
-                "res = ezkl.gen_settings(model_path, settings_path, py_run_args=run_args)\n",
-                "assert res == True"
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "# generate a bunch of dummy calibration data\n",
-                "cal_data = {\n",
-                "    \"input_data\": [(0.1*torch.rand(2, *[3, 2, 2])).flatten().tolist()],\n",
-                "}\n",
-                "\n",
-                "cal_path = os.path.join('val_data.json')\n",
-                "# save as json file\n",
-                "with open(cal_path, \"w\") as f:\n",
-                "    json.dump(cal_data, f)\n",
-                "\n",
-                "res = await ezkl.calibrate_settings(cal_path, model_path, settings_path, \"resources\")"
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "res = ezkl.compile_circuit(model_path, compiled_model_path, settings_path)\n",
-                "assert res == True"
-            ]
-        },
-        {
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "The graph input for on chain data sources is formatted completely differently compared to file based data sources.\n",
-                "\n",
-                "- For file data sources, the raw floating point values that eventually get quantized, converted into field elements and stored in `witness.json` to be consumed by the circuit are stored. The output data contains the expected floating point values returned as outputs from running your vanilla pytorch model on the given inputs.\n",
-                "- For on chain data sources, the input_data field contains all the data necessary to read and format the on chain data into something digestable by EZKL (aka field elements :-D). \n",
-                "Here is what the schema for an on-chain data source graph input file should look like for a single call data source:\n",
-                "    \n",
-                "```json\n",
-                "{\n",
-                "    \"input_data\": {\n",
-                "        \"rpc\": \"http://localhost:3030\", // The rpc endpoint of the chain you are deploying your verifier to\n",
-                "        \"calls\": {\n",
-                "            \"call_data\": \"1f3be514000000000000000000000000c6962004f452be9203591991d15f6b388e09e8d00000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000070000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000\", // The abi encoded call data to a view function that returns an array of on-chain data points we are attesting to. \n",
-                "            \"decimals\": 0, // The number of decimal places of the large uint256 value. This is our way of representing large wei values as floating points on chain, since the evm only natively supports integer values.\n",
-                "            \"address\": \"9A213F53334279C128C37DA962E5472eCD90554f\", // The address of the contract that we are calling to get the data. \n",
-                "            \"len\": 12 // The number of data points returned by the view function (the length of the array)\n",
-                "        }\n",
-                "    }\n",
-                "}\n",
-                "```"
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "await ezkl.setup_test_evm_data(\n",
-                "    data_path,\n",
-                "    compiled_model_path,\n",
-                "    # we write the call data to the same file as the input data\n",
-                "    data_path,\n",
-                "    input_source=ezkl.PyTestDataSource.OnChain,\n",
-                "    output_source=ezkl.PyTestDataSource.File,\n",
-                "    rpc_url=RPC_URL)"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "As we use Halo2 with KZG-commitments we need an SRS string from (preferably) a multi-party trusted setup ceremony. For an overview of the procedures for such a ceremony check out [this page](https://blog.ethereum.org/2023/01/16/announcing-kzg-ceremony). The `get_srs` command retrieves a correctly sized SRS given the calibrated settings file from [here](https://github.com/han0110/halo2-kzg-srs). \n",
-                "\n",
-                "These SRS were generated with [this](https://github.com/privacy-scaling-explorations/perpetualpowersoftau) ceremony. "
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "res = await ezkl.get_srs( settings_path)\n"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "We now need to generate the circuit witness. These are the model outputs (and any hashes) that are generated when feeding the previously generated `input.json` through the circuit / model. "
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "!export RUST_BACKTRACE=1\n",
-                "\n",
-                "witness_path = \"witness.json\"\n",
-                "\n",
-                "res = await ezkl.gen_witness(data_path, compiled_model_path, witness_path)"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "Here we setup verifying and proving keys for the circuit. As the name suggests the proving key is needed for ... proving and the verifying key is needed for ... verifying. "
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "# HERE WE SETUP THE CIRCUIT PARAMS\n",
-                "# WE GOT KEYS\n",
-                "# WE GOT CIRCUIT PARAMETERS\n",
-                "# EVERYTHING ANYONE HAS EVER NEEDED FOR ZK\n",
-                "res = ezkl.setup(\n",
-                "        compiled_model_path,\n",
-                "        vk_path,\n",
-                "        pk_path,\n",
-                "        \n",
-                "    )\n",
-                "\n",
-                "assert res == True\n",
-                "assert os.path.isfile(vk_path)\n",
-                "assert os.path.isfile(pk_path)\n",
-                "assert os.path.isfile(settings_path)"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "Now we generate a full proof. "
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "# GENERATE A PROOF\n",
-                "\n",
-                "proof_path = os.path.join('test.pf')\n",
-                "\n",
-                "res = ezkl.prove(\n",
-                "        witness_path,\n",
-                "        compiled_model_path,\n",
-                "        pk_path,\n",
-                "        proof_path,\n",
-                "        \n",
-                "        \"single\",\n",
-                "    )\n",
-                "\n",
-                "print(res)\n",
-                "assert os.path.isfile(proof_path)"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "And verify it as a sanity check. "
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "# VERIFY IT\n",
-                "\n",
-                "res = ezkl.verify(\n",
-                "        proof_path,\n",
-                "        settings_path,\n",
-                "        vk_path,\n",
-                "        \n",
-                "    )\n",
-                "\n",
-                "assert res == True\n",
-                "print(\"verified\")"
-            ]
-        },
-        {
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "We can now create and then deploy a vanilla evm verifier."
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "abi_path = 'test.abi'\n",
-                "sol_code_path = 'test.sol'\n",
-                "\n",
-                "res = await ezkl.create_evm_verifier(\n",
-                "        vk_path,\n",
-                "        \n",
-                "        settings_path,\n",
-                "        sol_code_path,\n",
-                "        abi_path,\n",
-                "    )\n",
-                "assert res == True"
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "import json\n",
-                "\n",
-                "addr_path_verifier = \"addr_verifier.txt\"\n",
-                "\n",
-                "res = await ezkl.deploy_evm(\n",
-                "    addr_path_verifier,\n",
-                "    'http://127.0.0.1:3030',\n",
-                "    sol_code_path,\n",
-                ")\n",
-                "\n",
-                "assert res == True"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "With the vanilla verifier deployed, we can now create the data attestation contract, which will read in the instances from the calldata to the verifier, attest to them, call the verifier and then return the result. "
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "\n",
-                "abi_path = 'test.abi'\n",
-                "sol_code_path = 'test.sol'\n",
-                "input_path = 'input.json'\n",
-                "\n",
-                "res = await ezkl.create_evm_data_attestation(\n",
-                "        input_path,\n",
-                "        settings_path,\n",
-                "        sol_code_path,\n",
-                "        abi_path,\n",
-                "    )"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "Now we can deploy the data attest verifier contract. For security reasons, this binding will only deploy to a local anvil instance, using accounts generated by anvil. \n",
-                "So should only be used for testing purposes."
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "addr_path_da = \"addr_da.txt\"\n",
-                "\n",
-                "res = await ezkl.deploy_da_evm(\n",
-                "        addr_path_da,\n",
-                "        input_path,\n",
-                "        RPC_URL,\n",
-                "        settings_path,\n",
-                "        sol_code_path,\n",
-                "    )\n"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "Call the view only verify method on the contract to verify the proof. Since it is a view function this is safe to use in production since you don't have to pass your private key."
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "# read the verifier address\n",
-                "addr_verifier = None\n",
-                "with open(addr_path_verifier, 'r') as f:\n",
-                "    addr = f.read()\n",
-                "#read the data attestation address\n",
-                "addr_da = None\n",
-                "with open(addr_path_da, 'r') as f:\n",
-                "    addr_da = f.read()\n",
-                "\n",
-                "res = await ezkl.verify_evm(\n",
-                "    addr,\n",
-                "    RPC_URL,\n",
-                "    proof_path,\n",
-                "    addr_da,\n",
-                ")"
-            ]
-        }
-    ],
-    "metadata": {
-        "kernelspec": {
-            "display_name": ".env",
-            "language": "python",
-            "name": "python3"
-        },
-        "language_info": {
-            "codemirror_mode": {
-                "name": "ipython",
-                "version": 3
-            },
-            "file_extension": ".py",
-            "mimetype": "text/x-python",
-            "name": "python",
-            "nbconvert_exporter": "python",
-            "pygments_lexer": "ipython3",
-            "version": "3.12.9"
-        },
-        "orig_nbformat": 4
-    },
-    "nbformat": 4,
-    "nbformat_minor": 2
-}
--- a/examples/notebooks/data_attest_hashed.ipynb
+++ b/examples/notebooks/data_attest_hashed.ipynb
@@ -1,660 +0,0 @@
-{
-    "cells": [
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "# data-attest-ezkl hashed\n",
-                "\n",
-                "Here's an example leveraging EZKL whereby the hashes of the outputs to the model are read and attested to from an on-chain source.\n",
-                "\n",
-                "In this setup:\n",
-                "- the hashes of outputs are publicly known to the prover and verifier\n"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "First we import the necessary dependencies and set up logging to be as informative as possible. "
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "# check if notebook is in colab\n",
-                "try:\n",
-                "    # install ezkl\n",
-                "    import google.colab\n",
-                "    import subprocess\n",
-                "    import sys\n",
-                "    subprocess.check_call([sys.executable, \"-m\", \"pip\", \"install\", \"ezkl\"])\n",
-                "    subprocess.check_call([sys.executable, \"-m\", \"pip\", \"install\", \"onnx\"])\n",
-                "\n",
-                "# rely on local installation of ezkl if the notebook is not in colab\n",
-                "except:\n",
-                "    pass\n",
-                "\n",
-                "\n",
-                "from torch import nn\n",
-                "import ezkl\n",
-                "import os\n",
-                "import json\n",
-                "import logging\n",
-                "\n",
-                "# uncomment for more descriptive logging \n",
-                "# FORMAT = '%(levelname)s %(name)s %(asctime)-15s %(filename)s:%(lineno)d %(message)s'\n",
-                "# logging.basicConfig(format=FORMAT)\n",
-                "# logging.getLogger().setLevel(logging.DEBUG)\n"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "Now we define our model. It is a very simple PyTorch model that has just one layer, an average pooling 2D layer. "
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "import torch\n",
-                "# Defines the model\n",
-                "\n",
-                "class MyModel(nn.Module):\n",
-                "    def __init__(self):\n",
-                "        super(MyModel, self).__init__()\n",
-                "        self.layer = nn.AvgPool2d(2, 1, (1, 1))\n",
-                "\n",
-                "    def forward(self, x):\n",
-                "        return self.layer(x)[0]\n",
-                "\n",
-                "\n",
-                "circuit = MyModel()\n",
-                "\n",
-                "# this is where you'd train your model\n",
-                "\n",
-                "\n"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "We omit training for purposes of this demonstration. We've marked where training would happen in the cell above. \n",
-                "Now we export the model to onnx and create a corresponding (randomly generated) input. This input data will eventually be stored on chain and read from according to the call_data field in the graph input.\n",
-                "\n",
-                "You can replace the random `x` with real data if you so wish. "
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "x = 0.1*torch.rand(1,*[3, 2, 2], requires_grad=True)\n",
-                "\n",
-                "# Flips the neural net into inference mode\n",
-                "circuit.eval()\n",
-                "\n",
-                "    # Export the model\n",
-                "torch.onnx.export(circuit,               # model being run\n",
-                "                      x,                   # model input (or a tuple for multiple inputs)\n",
-                "                      \"network.onnx\",            # where to save the model (can be a file or file-like object)\n",
-                "                      export_params=True,        # store the trained parameter weights inside the model file\n",
-                "                      opset_version=10,          # the ONNX version to export the model to\n",
-                "                      do_constant_folding=True,  # whether to execute constant folding for optimization\n",
-                "                      input_names = ['input'],   # the model's input names\n",
-                "                      output_names = ['output'], # the model's output names\n",
-                "                      dynamic_axes={'input' : {0 : 'batch_size'},    # variable length axes\n",
-                "                                    'output' : {0 : 'batch_size'}})\n",
-                "\n",
-                "data_array = ((x).detach().numpy()).reshape([-1]).tolist()\n",
-                "\n",
-                "data = dict(input_data = [data_array])\n",
-                "\n",
-                "    # Serialize data into file:\n",
-                "json.dump(data, open(\"input.json\", 'w' ))\n",
-                "\n"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "We now define a function that will create a new anvil instance which we will deploy our test contract too. This contract will contain in its storage the data that we will read from and attest to. In production you would not need to set up a local anvil instance. Instead you would replace RPC_URL with the actual RPC endpoint of the chain you are deploying your verifiers too, reading from the data on said chain."
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "import subprocess\n",
-                "import time\n",
-                "import threading\n",
-                "\n",
-                "# make sure anvil is running locally\n",
-                "# $ anvil -p 3030\n",
-                "\n",
-                "RPC_URL = \"http://localhost:3030\"\n",
-                "\n",
-                "# Save process globally\n",
-                "anvil_process = None\n",
-                "\n",
-                "def start_anvil():\n",
-                "    global anvil_process\n",
-                "    if anvil_process is None:\n",
-                "        anvil_process = subprocess.Popen([\"anvil\", \"-p\", \"3030\", \"--code-size-limit=41943040\"])\n",
-                "        if anvil_process.returncode is not None:\n",
-                "            raise Exception(\"failed to start anvil process\")\n",
-                "        time.sleep(3)\n",
-                "\n",
-                "def stop_anvil():\n",
-                "    global anvil_process\n",
-                "    if anvil_process is not None:\n",
-                "        anvil_process.terminate()\n",
-                "        anvil_process = None\n"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "We define our `PyRunArgs` objects which contains the visibility parameters for out model. \n",
-                "- `input_visibility` defines the visibility of the model inputs\n",
-                "- `param_visibility` defines the visibility of the model weights and constants and parameters \n",
-                "- `output_visibility` defines the visibility of the model outputs\n",
-                "\n",
-                "Here we create the following setup:\n",
-                "- `input_visibility`: \"private\"\n",
-                "- `param_visibility`: \"private\"\n",
-                "- `output_visibility`: hashed\n"
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "import ezkl\n",
-                "\n",
-                "model_path = os.path.join('network.onnx')\n",
-                "compiled_model_path = os.path.join('network.compiled')\n",
-                "pk_path = os.path.join('test.pk')\n",
-                "vk_path = os.path.join('test.vk')\n",
-                "settings_path = os.path.join('settings.json')\n",
-                "srs_path = os.path.join('kzg.srs')\n",
-                "data_path = os.path.join('input.json')\n",
-                "\n",
-                "run_args = ezkl.PyRunArgs()\n",
-                "run_args.input_visibility = \"private\"\n",
-                "run_args.param_visibility = \"private\"\n",
-                "run_args.output_visibility = \"hashed\"\n",
-                "run_args.variables = [(\"batch_size\", 1)]\n",
-                "\n",
-                "\n"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "Now we generate a settings file. This file basically instantiates a bunch of parameters that determine their circuit shape, size etc... Because of the way we represent nonlinearities in the circuit (using Halo2's [lookup tables](https://zcash.github.io/halo2/design/proving-system/lookup.html)), it is often best to _calibrate_ this settings file as some data can fall out of range of these lookups.\n",
-                "\n",
-                "You can pass a dataset for calibration that will be representative of real inputs you might find if and when you deploy the prover. Here we create a dummy calibration dataset for demonstration purposes. "
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "!RUST_LOG=trace\n",
-                "# TODO: Dictionary outputs\n",
-                "res = ezkl.gen_settings(model_path, settings_path, py_run_args=run_args)\n",
-                "assert res == True"
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "# generate a bunch of dummy calibration data\n",
-                "cal_data = {\n",
-                "    \"input_data\": [(0.1*torch.rand(2, *[3, 2, 2])).flatten().tolist()],\n",
-                "}\n",
-                "\n",
-                "cal_path = os.path.join('val_data.json')\n",
-                "# save as json file\n",
-                "with open(cal_path, \"w\") as f:\n",
-                "    json.dump(cal_data, f)\n",
-                "\n",
-                "res = await ezkl.calibrate_settings(cal_path, model_path, settings_path, \"resources\")"
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "res = ezkl.compile_circuit(model_path, compiled_model_path, settings_path)\n",
-                "assert res == True"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "As we use Halo2 with KZG-commitments we need an SRS string from (preferably) a multi-party trusted setup ceremony. For an overview of the procedures for such a ceremony check out [this page](https://blog.ethereum.org/2023/01/16/announcing-kzg-ceremony). The `get_srs` command retrieves a correctly sized SRS given the calibrated settings file from [here](https://github.com/han0110/halo2-kzg-srs). \n",
-                "\n",
-                "These SRS were generated with [this](https://github.com/privacy-scaling-explorations/perpetualpowersoftau) ceremony. "
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "res = await ezkl.get_srs( settings_path)\n"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "We now need to generate the circuit witness. These are the model outputs (and any hashes) that are generated when feeding the previously generated `input.json` through the circuit / model. "
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "!export RUST_BACKTRACE=1\n",
-                "\n",
-                "witness_path = \"witness.json\"\n",
-                "\n",
-                "res = await ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
-                "\n"
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "print(ezkl.felt_to_big_endian(res['processed_outputs']['poseidon_hash'][0]))"
-            ]
-        },
-        {
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "We now post the hashes of the outputs to the chain. This is the data that will be read from and attested to."
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "from web3 import Web3, HTTPProvider\n",
-                "from solcx import compile_standard\n",
-                "from decimal import Decimal\n",
-                "import json\n",
-                "import os\n",
-                "import torch\n",
-                "\n",
-                "\n",
-                "# setup web3 instance\n",
-                "w3 = Web3(HTTPProvider(RPC_URL))\n",
-                "\n",
-                "def test_on_chain_data(res):\n",
-                "    print(f'poseidon_hash: {res[\"processed_outputs\"][\"poseidon_hash\"]}')\n",
-                "    # Step 0: Convert the tensor to a flat list\n",
-                "    data = [int(ezkl.felt_to_big_endian(res['processed_outputs']['poseidon_hash'][0]), 0)]\n",
-                "\n",
-                "    # Step 1: Prepare the data\n",
-                "    # Step 2: Prepare and compile the contract.\n",
-                "    # We are using a test contract here but in production you would\n",
-                "    # use whatever contract you are fetching data from.\n",
-                "    contract_source_code = '''\n",
-                "    // SPDX-License-Identifier: UNLICENSED\n",
-                "    pragma solidity ^0.8.17;\n",
-                "\n",
-                "    contract TestReads {\n",
-                "\n",
-                "        uint[] public arr;\n",
-                "        constructor(uint256[] memory _numbers) {\n",
-                "            for(uint256 i = 0; i < _numbers.length; i++) {\n",
-                "                arr.push(_numbers[i]);\n",
-                "            }\n",
-                "        }\n",
-                "        function getArr() public view returns (uint[] memory) {\n",
-                "            return arr;\n",
-                "        }\n",
-                "    }\n",
-                "    '''\n",
-                "\n",
-                "    compiled_sol = compile_standard({\n",
-                "        \"language\": \"Solidity\",\n",
-                "        \"sources\": {\"testreads.sol\": {\"content\": contract_source_code}},\n",
-                "        \"settings\": {\"outputSelection\": {\"*\": {\"*\": [\"metadata\", \"evm.bytecode\", \"abi\"]}}}\n",
-                "    })\n",
-                "\n",
-                "    # Get bytecode\n",
-                "    bytecode = compiled_sol['contracts']['testreads.sol']['TestReads']['evm']['bytecode']['object']\n",
-                "\n",
-                "    # Get ABI\n",
-                "    # In production if you are reading from really large contracts you can just use\n",
-                "    # a stripped down version of the ABI of the contract you are calling, containing only the view functions you will fetch data from.\n",
-                "    abi = json.loads(compiled_sol['contracts']['testreads.sol']['TestReads']['metadata'])['output']['abi']\n",
-                "\n",
-                "    # Step 3: Deploy the contract\n",
-                "    TestReads = w3.eth.contract(abi=abi, bytecode=bytecode)\n",
-                "    tx_hash = TestReads.constructor(data).transact()\n",
-                "    tx_receipt = w3.eth.wait_for_transaction_receipt(tx_hash)\n",
-                "    # If you are deploying to production you can skip the 3 lines of code above and just instantiate the contract like this,\n",
-                "    # passing the address and abi of the contract you are fetching data from.\n",
-                "    contract = w3.eth.contract(address=tx_receipt['contractAddress'], abi=abi)\n",
-                "\n",
-                "    # Step 4: Interact with the contract\n",
-                "    calldata = contract.functions.getArr().build_transaction()['data'][2:]\n",
-                "\n",
-                "    # Prepare the calls_to_account object\n",
-                "    # If you were calling view functions across multiple contracts,\n",
-                "    # you would have multiple entries in the calls_to_account array,\n",
-                "    # one for each contract.\n",
-                "    decimals = [0] * len(data)\n",
-                "    call_to_account = {\n",
-                "        'call_data': calldata,\n",
-                "        'decimals': decimals,\n",
-                "        'address': contract.address[2:], # remove the '0x' prefix\n",
-                "    }\n",
-                "\n",
-                "    print(f'call_to_account: {call_to_account}')\n",
-                "\n",
-                "    return call_to_account\n",
-                "\n",
-                "# Now let's start the Anvil process. You don't need to do this if you are deploying to a non-local chain.\n",
-                "start_anvil()\n",
-                "\n",
-                "# Now let's call our function, passing in the same input tensor we used to export the model 2 cells above.\n",
-                "call_to_account = test_on_chain_data(res)\n",
-                "\n",
-                "data = dict(input_data = [data_array], output_data =  {'rpc': RPC_URL, 'call': call_to_account })\n",
-                "\n",
-                "# Serialize on-chain data into file:\n",
-                "json.dump(data, open(\"input.json\", 'w'))\n",
-                "\n"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "Here we setup verifying and proving keys for the circuit. As the name suggests the proving key is needed for ... proving and the verifying key is needed for ... verifying. "
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "# HERE WE SETUP THE CIRCUIT PARAMS\n",
-                "# WE GOT KEYS\n",
-                "# WE GOT CIRCUIT PARAMETERS\n",
-                "# EVERYTHING ANYONE HAS EVER NEEDED FOR ZK\n",
-                "res = ezkl.setup(\n",
-                "        compiled_model_path,\n",
-                "        vk_path,\n",
-                "        pk_path,\n",
-                "        \n",
-                "    )\n",
-                "\n",
-                "assert res == True\n",
-                "assert os.path.isfile(vk_path)\n",
-                "assert os.path.isfile(pk_path)\n",
-                "assert os.path.isfile(settings_path)"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "Now we generate a full proof. "
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "# GENERATE A PROOF\n",
-                "\n",
-                "proof_path = os.path.join('test.pf')\n",
-                "\n",
-                "res = ezkl.prove(\n",
-                "        witness_path,\n",
-                "        compiled_model_path,\n",
-                "        pk_path,\n",
-                "        proof_path,\n",
-                "        \n",
-                "        \"single\",\n",
-                "    )\n",
-                "\n",
-                "print(res)\n",
-                "assert os.path.isfile(proof_path)"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "And verify it as a sanity check. "
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "# VERIFY IT\n",
-                "\n",
-                "res = ezkl.verify(\n",
-                "        proof_path,\n",
-                "        settings_path,\n",
-                "        vk_path,\n",
-                "        \n",
-                "    )\n",
-                "\n",
-                "assert res == True\n",
-                "print(\"verified\")"
-            ]
-        },
-        {
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "We can now create and then deploy a vanilla evm verifier."
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "abi_path = 'test.abi'\n",
-                "sol_code_path = 'test.sol'\n",
-                "\n",
-                "res = await ezkl.create_evm_verifier(\n",
-                "        vk_path,\n",
-                "        \n",
-                "        settings_path,\n",
-                "        sol_code_path,\n",
-                "        abi_path,\n",
-                "    )\n",
-                "assert res == True"
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "import json\n",
-                "\n",
-                "addr_path_verifier = \"addr_verifier.txt\"\n",
-                "\n",
-                "res = await ezkl.deploy_evm(\n",
-                "    addr_path_verifier,\n",
-                "    'http://127.0.0.1:3030',\n",
-                "    sol_code_path,\n",
-                ")\n",
-                "\n",
-                "assert res == True"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "With the vanilla verifier deployed, we can now create the data attestation contract, which will read in the instances from the calldata to the verifier, attest to them, call the verifier and then return the result. "
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "\n",
-                "abi_path = 'test.abi'\n",
-                "sol_code_path = 'test.sol'\n",
-                "input_path = 'input.json'\n",
-                "\n",
-                "res = await ezkl.create_evm_data_attestation(\n",
-                "        input_path,\n",
-                "        settings_path,\n",
-                "        sol_code_path,\n",
-                "        abi_path,\n",
-                "    )"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "Now we can deploy the data attest verifier contract. For security reasons, this binding will only deploy to a local anvil instance, using accounts generated by anvil. \n",
-                "So should only be used for testing purposes."
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "addr_path_da = \"addr_da.txt\"\n",
-                "\n",
-                "res = await ezkl.deploy_da_evm(\n",
-                "        addr_path_da,\n",
-                "        input_path,\n",
-                "        RPC_URL,\n",
-                "        settings_path,\n",
-                "        sol_code_path,\n",
-                "    )\n"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "Call the view only verify method on the contract to verify the proof. Since it is a view function this is safe to use in production since you don't have to pass your private key."
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "# read the verifier address\n",
-                "addr_verifier = None\n",
-                "with open(addr_path_verifier, 'r') as f:\n",
-                "    addr = f.read()\n",
-                "#read the data attestation address\n",
-                "addr_da = None\n",
-                "with open(addr_path_da, 'r') as f:\n",
-                "    addr_da = f.read()\n",
-                "\n",
-                "res = await ezkl.verify_evm(\n",
-                "    addr,\n",
-                "    RPC_URL,\n",
-                "    proof_path,\n",
-                "    addr_da,\n",
-                ")"
-            ]
-        }
-    ],
-    "metadata": {
-        "kernelspec": {
-            "display_name": ".env",
-            "language": "python",
-            "name": "python3"
-        },
-        "language_info": {
-            "codemirror_mode": {
-                "name": "ipython",
-                "version": 3
-            },
-            "file_extension": ".py",
-            "mimetype": "text/x-python",
-            "name": "python",
-            "nbconvert_exporter": "python",
-            "pygments_lexer": "ipython3",
-            "version": "3.12.9"
-        },
-        "orig_nbformat": 4
-    },
-    "nbformat": 4,
-    "nbformat_minor": 2
-}
--- a/examples/notebooks/data_attest_kzg_vis.ipynb
+++ b/examples/notebooks/data_attest_kzg_vis.ipynb
@@ -1,592 +0,0 @@
-{
-    "cells": [
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "# data-attest-kzg-vis\n",
-                "\n",
-                "Here's an example leveraging EZKL whereby the inputs to the model are read and attested to from an on-chain source and the params and outputs are committed to using kzg-commitments. \n",
-                "\n",
-                "In this setup:\n",
-                "- the inputs and outputs are publicly known to the prover and verifier\n",
-                "- the on chain inputs will be fetched and then fed directly into the circuit\n",
-                "- the quantization of the on-chain inputs happens within the evm and is replicated at proving time \n",
-                "- The kzg commitment to the params and inputs will be read from the proof and checked to make sure it matches the expected commitment stored on-chain.\n"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "First we import the necessary dependencies and set up logging to be as informative as possible. "
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "# check if notebook is in colab\n",
-                "try:\n",
-                "    # install ezkl\n",
-                "    import google.colab\n",
-                "    import subprocess\n",
-                "    import sys\n",
-                "    subprocess.check_call([sys.executable, \"-m\", \"pip\", \"install\", \"ezkl\"])\n",
-                "    subprocess.check_call([sys.executable, \"-m\", \"pip\", \"install\", \"onnx\"])\n",
-                "\n",
-                "# rely on local installation of ezkl if the notebook is not in colab\n",
-                "except:\n",
-                "    pass\n",
-                "\n",
-                "\n",
-                "from torch import nn\n",
-                "import ezkl\n",
-                "import os\n",
-                "import json\n",
-                "import logging\n",
-                "\n",
-                "# uncomment for more descriptive logging \n",
-                "FORMAT = '%(levelname)s %(name)s %(asctime)-15s %(filename)s:%(lineno)d %(message)s'\n",
-                "logging.basicConfig(format=FORMAT)\n",
-                "logging.getLogger().setLevel(logging.DEBUG)\n"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "Now we define our model. It is a very simple PyTorch model that has just one layer, an average pooling 2D layer. "
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "import torch\n",
-                "# Defines the model\n",
-                "\n",
-                "class MyModel(nn.Module):\n",
-                "    def __init__(self):\n",
-                "        super(MyModel, self).__init__()\n",
-                "        self.layer = nn.AvgPool2d(2, 1, (1, 1))\n",
-                "\n",
-                "    def forward(self, x):\n",
-                "        return self.layer(x)[0]\n",
-                "\n",
-                "\n",
-                "circuit = MyModel()\n",
-                "\n",
-                "# this is where you'd train your model"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "We omit training for purposes of this demonstration. We've marked where training would happen in the cell above. \n",
-                "Now we export the model to onnx and create a corresponding (randomly generated) input. This input data will eventually be stored on chain and read from according to the call_data field in the graph input.\n",
-                "\n",
-                "You can replace the random `x` with real data if you so wish. "
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "x = 0.1*torch.rand(1,*[3, 2, 2], requires_grad=True)\n",
-                "\n",
-                "# Flips the neural net into inference mode\n",
-                "circuit.eval()\n",
-                "\n",
-                "    # Export the model\n",
-                "torch.onnx.export(circuit,               # model being run\n",
-                "                      x,                   # model input (or a tuple for multiple inputs)\n",
-                "                      \"network.onnx\",            # where to save the model (can be a file or file-like object)\n",
-                "                      export_params=True,        # store the trained parameter weights inside the model file\n",
-                "                      opset_version=10,          # the ONNX version to export the model to\n",
-                "                      do_constant_folding=True,  # whether to execute constant folding for optimization\n",
-                "                      input_names = ['input'],   # the model's input names\n",
-                "                      output_names = ['output'], # the model's output names\n",
-                "                      dynamic_axes={'input' : {0 : 'batch_size'},    # variable length axes\n",
-                "                                    'output' : {0 : 'batch_size'}})\n",
-                "\n",
-                "data_array = ((x).detach().numpy()).reshape([-1]).tolist()\n",
-                "\n",
-                "data = dict(input_data = [data_array])\n",
-                "\n",
-                "    # Serialize data into file:\n",
-                "json.dump(data, open(\"input.json\", 'w' ))\n",
-                "\n"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "We now define a function that will create a new anvil instance which we will deploy our test contract too. This contract will contain in its storage the data that we will read from and attest to. In production you would not need to set up a local anvil instance. Instead you would replace RPC_URL with the actual RPC endpoint of the chain you are deploying your verifiers too, reading from the data on said chain."
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "import subprocess\n",
-                "import time\n",
-                "import threading\n",
-                "\n",
-                "# make sure anvil is running locally\n",
-                "# $ anvil -p 3030\n",
-                "\n",
-                "RPC_URL = \"http://localhost:3030\"\n",
-                "\n",
-                "# Save process globally\n",
-                "anvil_process = None\n",
-                "\n",
-                "def start_anvil():\n",
-                "    global anvil_process\n",
-                "    if anvil_process is None:\n",
-                "        anvil_process = subprocess.Popen([\"anvil\", \"-p\", \"3030\", \"--code-size-limit=41943040\"])\n",
-                "        if anvil_process.returncode is not None:\n",
-                "            raise Exception(\"failed to start anvil process\")\n",
-                "        time.sleep(3)\n",
-                "\n",
-                "def stop_anvil():\n",
-                "    global anvil_process\n",
-                "    if anvil_process is not None:\n",
-                "        anvil_process.terminate()\n",
-                "        anvil_process = None\n"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "We define our `PyRunArgs` objects which contains the visibility parameters for out model. \n",
-                "- `input_visibility` defines the visibility of the model inputs\n",
-                "- `param_visibility` defines the visibility of the model weights and constants and parameters \n",
-                "- `output_visibility` defines the visibility of the model outputs\n",
-                "\n",
-                "Here we create the following setup:\n",
-                "- `input_visibility`: \"public\"\n",
-                "- `param_visibility`: \"polycommitment\" \n",
-                "- `output_visibility`: \"polycommitment\"\n",
-                "\n",
-                "**Note**:\n",
-                "When we set this to polycommitment, we are saying that the model parameters are committed to using a polynomial commitment scheme. This commitment will be stored on chain as a constant stored in the DA contract, and the proof will contain the commitment to the parameters. The DA verification will then check that the commitment in the proof matches the commitment stored on chain. \n"
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "import ezkl\n",
-                "\n",
-                "model_path = os.path.join('network.onnx')\n",
-                "compiled_model_path = os.path.join('network.compiled')\n",
-                "pk_path = os.path.join('test.pk')\n",
-                "vk_path = os.path.join('test.vk')\n",
-                "settings_path = os.path.join('settings.json')\n",
-                "srs_path = os.path.join('kzg.srs')\n",
-                "data_path = os.path.join('input.json')\n",
-                "\n",
-                "run_args = ezkl.PyRunArgs()\n",
-                "run_args.input_visibility = \"public\"\n",
-                "run_args.param_visibility = \"polycommit\"\n",
-                "run_args.output_visibility = \"polycommit\"\n",
-                "run_args.num_inner_cols = 1\n",
-                "run_args.variables = [(\"batch_size\", 1)]\n",
-                "\n",
-                "\n",
-                "\n"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "Now we generate a settings file. This file basically instantiates a bunch of parameters that determine their circuit shape, size etc... Because of the way we represent nonlinearities in the circuit (using Halo2's [lookup tables](https://zcash.github.io/halo2/design/proving-system/lookup.html)), it is often best to _calibrate_ this settings file as some data can fall out of range of these lookups.\n",
-                "\n",
-                "You can pass a dataset for calibration that will be representative of real inputs you might find if and when you deploy the prover. Here we create a dummy calibration dataset for demonstration purposes. "
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "!RUST_LOG=trace\n",
-                "# TODO: Dictionary outputs\n",
-                "res = ezkl.gen_settings(model_path, settings_path, py_run_args=run_args)\n",
-                "assert res == True"
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "# generate a bunch of dummy calibration data\n",
-                "cal_data = {\n",
-                "    \"input_data\": [(0.1*torch.rand(2, *[3, 2, 2])).flatten().tolist()],\n",
-                "}\n",
-                "\n",
-                "cal_path = os.path.join('val_data.json')\n",
-                "# save as json file\n",
-                "with open(cal_path, \"w\") as f:\n",
-                "    json.dump(cal_data, f)\n",
-                "\n",
-                "res = await ezkl.calibrate_settings(cal_path, model_path, settings_path, \"resources\")"
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "res = ezkl.compile_circuit(model_path, compiled_model_path, settings_path)\n",
-                "assert res == True"
-            ]
-        },
-        {
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "The graph input for on chain data sources is formatted completely differently compared to file based data sources.\n",
-                "\n",
-                "- For file data sources, the raw floating point values that eventually get quantized, converted into field elements and stored in `witness.json` to be consumed by the circuit are stored. The output data contains the expected floating point values returned as outputs from running your vanilla pytorch model on the given inputs.\n",
-                "- For on chain data sources, the input_data field contains all the data necessary to read and format the on chain data into something digestable by EZKL (aka field elements :-D). \n",
-                "Here is what the schema for an on-chain data source graph input file should look like for a single call data source:\n",
-                "    \n",
-                "```json\n",
-                "{\n",
-                "    \"input_data\": {\n",
-                "        \"rpc\": \"http://localhost:3030\", // The rpc endpoint of the chain you are deploying your verifier to\n",
-                "        \"calls\": {\n",
-                "            \"call_data\": \"1f3be514000000000000000000000000c6962004f452be9203591991d15f6b388e09e8d00000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000070000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000\", // The abi encoded call data to a view function that returns an array of on-chain data points we are attesting to. \n",
-                "            \"decimals\": 0, // The number of decimal places of the large uint256 value. This is our way of representing large wei values as floating points on chain, since the evm only natively supports integer values.\n",
-                "            \"address\": \"9A213F53334279C128C37DA962E5472eCD90554f\", // The address of the contract that we are calling to get the data. \n",
-                "            \"len\": 3 // The number of data points returned by the view function (the length of the array)\n",
-                "        }\n",
-                "    }\n",
-                "}\n",
-                "```"
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "await ezkl.setup_test_evm_data(\n",
-                "    data_path,\n",
-                "    compiled_model_path,\n",
-                "    # we write the call data to the same file as the input data\n",
-                "    data_path,\n",
-                "    input_source=ezkl.PyTestDataSource.OnChain,\n",
-                "    output_source=ezkl.PyTestDataSource.File,\n",
-                "    rpc_url=RPC_URL)"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "As we use Halo2 with KZG-commitments we need an SRS string from (preferably) a multi-party trusted setup ceremony. For an overview of the procedures for such a ceremony check out [this page](https://blog.ethereum.org/2023/01/16/announcing-kzg-ceremony). The `get_srs` command retrieves a correctly sized SRS given the calibrated settings file from [here](https://github.com/han0110/halo2-kzg-srs). \n",
-                "\n",
-                "These SRS were generated with [this](https://github.com/privacy-scaling-explorations/perpetualpowersoftau) ceremony. "
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "res = await ezkl.get_srs( settings_path)"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "We now need to generate the circuit witness. These are the model outputs (and any hashes) that are generated when feeding the previously generated `input.json` through the circuit / model. "
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "# HERE WE SETUP THE CIRCUIT PARAMS\n",
-                "# WE GOT KEYS\n",
-                "# WE GOT CIRCUIT PARAMETERS\n",
-                "# EVERYTHING ANYONE HAS EVER NEEDED FOR ZK\n",
-                "res = ezkl.setup(\n",
-                "        compiled_model_path,\n",
-                "        vk_path,\n",
-                "        pk_path,\n",
-                "    )\n",
-                "\n",
-                "assert res == True\n",
-                "assert os.path.isfile(vk_path)\n",
-                "assert os.path.isfile(pk_path)\n",
-                "assert os.path.isfile(settings_path)"
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "!export RUST_BACKTRACE=1\n",
-                "\n",
-                "witness_path = \"witness.json\"\n",
-                "\n",
-                "res = await ezkl.gen_witness(data_path, compiled_model_path, witness_path, vk_path)"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "Here we setup verifying and proving keys for the circuit. As the name suggests the proving key is needed for ... proving and the verifying key is needed for ... verifying. "
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "Now we generate a full proof. "
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "# GENERATE A PROOF\n",
-                "\n",
-                "proof_path = os.path.join('test.pf')\n",
-                "\n",
-                "res = ezkl.prove(\n",
-                "        witness_path,\n",
-                "        compiled_model_path,\n",
-                "        pk_path,\n",
-                "        proof_path,\n",
-                "        \n",
-                "        \"single\",\n",
-                "    )\n",
-                "\n",
-                "print(res)\n",
-                "assert os.path.isfile(proof_path)"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "And verify it as a sanity check. "
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "# VERIFY IT\n",
-                "\n",
-                "res = ezkl.verify(\n",
-                "        proof_path,\n",
-                "        settings_path,\n",
-                "        vk_path,\n",
-                "        \n",
-                "    )\n",
-                "\n",
-                "assert res == True\n",
-                "print(\"verified\")"
-            ]
-        },
-        {
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "We can now create and then deploy a vanilla evm verifier."
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "abi_path = 'test.abi'\n",
-                "sol_code_path = 'test.sol'\n",
-                "\n",
-                "res = await ezkl.create_evm_verifier(\n",
-                "        vk_path,\n",
-                "        \n",
-                "        settings_path,\n",
-                "        sol_code_path,\n",
-                "        abi_path,\n",
-                "    )\n",
-                "assert res == True"
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "\n",
-                "addr_path_verifier = \"addr_verifier.txt\"\n",
-                "\n",
-                "res = await ezkl.deploy_evm(\n",
-                "    addr_path_verifier,\n",
-                "    'http://127.0.0.1:3030',\n",
-                "    sol_code_path,\n",
-                ")\n",
-                "\n",
-                "assert res == True"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "When deploying a DA with kzg commitments, we need to make sure to also pass a witness file that contains the commitments to the parameters and inputs. This is because the verifier will need to check that the commitments in the proof match the commitments stored on chain."
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "\n",
-                "abi_path = 'test.abi'\n",
-                "sol_code_path = 'test.sol'\n",
-                "input_path = 'input.json'\n",
-                "\n",
-                "res = await ezkl.create_evm_data_attestation(\n",
-                "        input_path,\n",
-                "        settings_path,\n",
-                "        sol_code_path,\n",
-                "        abi_path,\n",
-                "        witness_path = witness_path,\n",
-                "    )"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "Now we can deploy the data attest verifier contract. For security reasons, this binding will only deploy to a local anvil instance, using accounts generated by anvil. \n",
-                "So should only be used for testing purposes."
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "addr_path_da = \"addr_da.txt\"\n",
-                "\n",
-                "res = await ezkl.deploy_da_evm(\n",
-                "        addr_path_da,\n",
-                "        input_path,\n",
-                "        RPC_URL,\n",
-                "        settings_path,\n",
-                "        sol_code_path,\n",
-                "    )\n"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "Call the view only verify method on the contract to verify the proof. Since it is a view function this is safe to use in production since you don't have to pass your private key."
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "# read the verifier address\n",
-                "addr_verifier = None\n",
-                "with open(addr_path_verifier, 'r') as f:\n",
-                "    addr = f.read()\n",
-                "#read the data attestation address\n",
-                "addr_da = None\n",
-                "with open(addr_path_da, 'r') as f:\n",
-                "    addr_da = f.read()\n",
-                "\n",
-                "res = await ezkl.verify_evm(\n",
-                "    addr,\n",
-                "    RPC_URL,\n",
-                "    proof_path,\n",
-                "    addr_da,\n",
-                ")"
-            ]
-        }
-    ],
-    "metadata": {
-        "kernelspec": {
-            "display_name": ".env",
-            "language": "python",
-            "name": "python3"
-        },
-        "language_info": {
-            "codemirror_mode": {
-                "name": "ipython",
-                "version": 3
-            },
-            "file_extension": ".py",
-            "mimetype": "text/x-python",
-            "name": "python",
-            "nbconvert_exporter": "python",
-            "pygments_lexer": "ipython3",
-            "version": "3.11.5"
-        },
-        "orig_nbformat": 4
-    },
-    "nbformat": 4,
-    "nbformat_minor": 2
-}
--- a/examples/notebooks/decision_tree.ipynb
+++ b/examples/notebooks/decision_tree.ipynb
@@ -150,7 +150,7 @@
                "res = ezkl.gen_settings(model_path, settings_path)\n",
                "assert res == True\n",
                "\n",
-                "res = await ezkl.calibrate_settings(data_path, model_path, settings_path, \"resources\")\n",
+                "res = ezkl.calibrate_settings(data_path, model_path, settings_path, \"resources\")\n",
                "assert res == True"
            ]
        },
@@ -170,7 +170,7 @@
                "with open(cal_path, \"w\") as f:\n",
                "    json.dump(cal_data, f)\n",
                "\n",
-                "res = await ezkl.calibrate_settings(cal_path, model_path, settings_path, \"resources\")"
+                "res = ezkl.calibrate_settings(cal_path, model_path, settings_path, \"resources\")"
            ]
        },
        {
@@ -204,7 +204,7 @@
            "source": [
                "# now generate the witness file \n",
                "\n",
-                "res = await ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
+                "res = ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
                "assert os.path.isfile(witness_path)"
            ]
        },
--- a/examples/notebooks/ezkl_demo.ipynb
+++ b/examples/notebooks/ezkl_demo.ipynb
@@ -437,7 +437,7 @@
        "\n",
        "# Optimize for resources, we cap logrows at 12 to reduce setup and proving time, at the expense of accuracy\n",
        "# You may want to increase the max logrows if accuracy is a concern\n",
-        "res = await ezkl.calibrate_settings(target = \"resources\", max_logrows = 12, scales = [2])"
+        "res = ezkl.calibrate_settings(target = \"resources\", max_logrows = 12, scales = [2])"
      ]
    },
    {
@@ -526,7 +526,7 @@
        "# now generate the witness file\n",
        "witness_path = os.path.join('witness.json')\n",
        "\n",
-        "res = await ezkl.gen_witness()\n",
+        "res = ezkl.gen_witness()\n",
        "assert os.path.isfile(witness_path)"
      ]
    },
@@ -736,4 +736,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 0
-}
+}
--- a/examples/notebooks/ezkl_demo_batch.ipynb
+++ b/examples/notebooks/ezkl_demo_batch.ipynb
--- a/examples/notebooks/felt_conversion_test.ipynb
+++ b/examples/notebooks/felt_conversion_test.ipynb
--- a/examples/notebooks/gcn.ipynb
+++ b/examples/notebooks/gcn.ipynb
@@ -467,7 +467,7 @@
      "outputs": [],
      "source": [
        "\n",
-        "res = await ezkl.calibrate_settings(data_path, model_path, settings_path, \"resources\")\n",
+        "res = ezkl.calibrate_settings(data_path, model_path, settings_path, \"resources\")\n",
        "assert res == True"
      ]
    },
@@ -508,7 +508,7 @@
      "source": [
        "# now generate the witness file\n",
        "\n",
-        "res = await ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
+        "res = ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
        "assert os.path.isfile(witness_path)"
      ]
    },
--- a/examples/notebooks/generalized_inverse.ipynb
+++ b/examples/notebooks/generalized_inverse.ipynb
@@ -196,7 +196,7 @@
        "json.dump(data, open(cal_path, 'w'))\n",
        "\n",
        "\n",
-        "res = await ezkl.calibrate_settings(data_path, model_path, settings_path, \"resources\")\n",
+        "res = ezkl.calibrate_settings(data_path, model_path, settings_path, \"resources\")\n",
        "assert res == True\n"
      ]
    },
@@ -237,7 +237,7 @@
      "source": [
        "# now generate the witness file\n",
        "\n",
-        "res = await ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
+        "res = ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
        "assert os.path.isfile(witness_path)"
      ]
    },
@@ -341,4 +341,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 5
-}
+}
--- a/examples/notebooks/gradient_boosted_trees.ipynb
+++ b/examples/notebooks/gradient_boosted_trees.ipynb
@@ -179,7 +179,7 @@
                "json.dump(data, open(cal_path, 'w'))\n",
                "\n",
                "\n",
-                "res = await ezkl.calibrate_settings(data_path, model_path, settings_path, \"resources\")\n",
+                "res = ezkl.calibrate_settings(data_path, model_path, settings_path, \"resources\")\n",
                "assert res == True\n"
            ]
        },
@@ -214,7 +214,7 @@
            "source": [
                "# now generate the witness file \n",
                "\n",
-                "res = await ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
+                "res = ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
                "assert os.path.isfile(witness_path)"
            ]
        },
--- a/examples/notebooks/hashed_vis.ipynb
+++ b/examples/notebooks/hashed_vis.ipynb
@@ -241,7 +241,7 @@
                "with open(cal_path, \"w\") as f:\n",
                "    json.dump(cal_data, f)\n",
                "\n",
-                "res = await ezkl.calibrate_settings(cal_path, model_path, settings_path, \"resources\")"
+                "res = ezkl.calibrate_settings(cal_path, model_path, settings_path, \"resources\")"
            ]
        },
        {
@@ -291,7 +291,7 @@
                "\n",
                "witness_path = \"witness.json\"\n",
                "\n",
-                "res = await ezkl.gen_witness(data_path, compiled_model_path, witness_path)"
+                "res = ezkl.gen_witness(data_path, compiled_model_path, witness_path)"
            ]
        },
        {
@@ -510,4 +510,4 @@
    },
    "nbformat": 4,
    "nbformat_minor": 2
-}
+}
--- a/examples/notebooks/keras_simple_demo.ipynb
+++ b/examples/notebooks/keras_simple_demo.ipynb
@@ -152,7 +152,7 @@
                "json.dump(data, open(cal_path, 'w'))\n",
                "\n",
                "\n",
-                "res = await ezkl.calibrate_settings(data_path, model_path, settings_path, \"resources\")\n",
+                "res = ezkl.calibrate_settings(data_path, model_path, settings_path, \"resources\")\n",
                "assert res == True\n"
            ]
        },
@@ -188,7 +188,7 @@
                "# now generate the witness file \n",
                "witness_path = \"witness.json\"\n",
                "\n",
-                "res = await ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
+                "res = ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
                "assert os.path.isfile(witness_path)"
            ]
        },
--- a/examples/notebooks/kmeans.ipynb
+++ b/examples/notebooks/kmeans.ipynb
@@ -155,7 +155,7 @@
                "json.dump(data, open(cal_path, 'w'))\n",
                "\n",
                "\n",
-                "res = await ezkl.calibrate_settings(data_path, model_path, settings_path, \"resources\")\n",
+                "res = ezkl.calibrate_settings(data_path, model_path, settings_path, \"resources\")\n",
                "assert res == True\n"
            ]
        },
@@ -190,7 +190,7 @@
            "source": [
                "# now generate the witness file \n",
                "\n",
-                "res = await ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
+                "res = ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
                "assert os.path.isfile(witness_path)"
            ]
        },
--- a/examples/notebooks/kzg_vis.ipynb
+++ b/examples/notebooks/kzg_vis.ipynb
@@ -233,7 +233,7 @@
                "with open(cal_path, \"w\") as f:\n",
                "    json.dump(cal_data, f)\n",
                "\n",
-                "res = await ezkl.calibrate_settings(cal_path, model_path, settings_path, \"resources\")"
+                "res = ezkl.calibrate_settings(cal_path, model_path, settings_path, \"resources\")"
            ]
        },
        {
@@ -315,7 +315,7 @@
                "\n",
                "witness_path = \"witness.json\"\n",
                "\n",
-                "res = await ezkl.gen_witness(data_path, compiled_model_path, witness_path, vk_path)\n"
+                "res = ezkl.gen_witness(data_path, compiled_model_path, witness_path, vk_path)\n"
            ]
        },
        {
@@ -512,4 +512,4 @@
    },
    "nbformat": 4,
    "nbformat_minor": 2
-}
+}
--- a/examples/notebooks/lightgbm.ipynb
+++ b/examples/notebooks/lightgbm.ipynb
@@ -193,7 +193,7 @@
                "json.dump(data, open(cal_path, 'w'))\n",
                "\n",
                "\n",
-                "res = await ezkl.calibrate_settings(data_path, model_path, settings_path, \"resources\")\n",
+                "res = ezkl.calibrate_settings(data_path, model_path, settings_path, \"resources\")\n",
                "assert res == True\n"
            ]
        },
@@ -228,7 +228,7 @@
            "source": [
                "# now generate the witness file \n",
                "\n",
-                "res = await ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
+                "res = ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
                "assert os.path.isfile(witness_path)"
            ]
        },
--- a/examples/notebooks/linear_regression.ipynb
+++ b/examples/notebooks/linear_regression.ipynb
@@ -1,284 +1,284 @@
 {
- "cells": [
-  {
-   "cell_type": "markdown",
-   "id": "cf69bb3f-94e6-4dba-92cd-ce08df117d67",
-   "metadata": {},
-   "source": [
-    "## Linear Regression\n",
-    "\n",
-    "\n",
-    "Sklearn based models are slightly finicky to get into a suitable onnx format. \n",
-    "This notebook showcases how to do so using the `hummingbird-ml` python package ! "
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "95613ee9",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# check if notebook is in colab\n",
-    "try:\n",
-    "    # install ezkl\n",
-    "    import google.colab\n",
-    "    import subprocess\n",
-    "    import sys\n",
-    "    subprocess.check_call([sys.executable, \"-m\", \"pip\", \"install\", \"ezkl\"])\n",
-    "    subprocess.check_call([sys.executable, \"-m\", \"pip\", \"install\", \"onnx\"])\n",
-    "    subprocess.check_call([sys.executable, \"-m\", \"pip\", \"install\", \"hummingbird-ml\"])\n",
-    "\n",
-    "# rely on local installation of ezkl if the notebook is not in colab\n",
-    "except:\n",
-    "    pass\n",
-    "\n",
-    "import os\n",
-    "import torch\n",
-    "import ezkl\n",
-    "import json\n",
-    "from hummingbird.ml import convert\n",
-    "\n",
-    "\n",
-    "# here we create and (potentially train a model)\n",
-    "\n",
-    "# make sure you have the dependencies required here already installed\n",
-    "import numpy as np\n",
-    "from sklearn.linear_model import LinearRegression\n",
-    "X = np.array([[1, 1], [1, 2], [2, 2], [2, 3]])\n",
-    "# y = 1 * x_0 + 2 * x_1 + 3\n",
-    "y = np.dot(X, np.array([1, 2])) + 3\n",
-    "reg = LinearRegression().fit(X, y)\n",
-    "reg.score(X, y)\n",
-    "\n",
-    "circuit = convert(reg, \"torch\", X[:1]).model\n",
-    "\n",
-    "\n",
-    "\n"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "b37637c4",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "model_path = os.path.join('network.onnx')\n",
-    "compiled_model_path = os.path.join('network.compiled')\n",
-    "pk_path = os.path.join('test.pk')\n",
-    "vk_path = os.path.join('test.vk')\n",
-    "settings_path = os.path.join('settings.json')\n",
-    "\n",
-    "witness_path = os.path.join('witness.json')\n",
-    "data_path = os.path.join('input.json')"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "82db373a",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "\n",
-    "\n",
-    "# export to onnx format\n",
-    "# !!!!!!!!!!!!!!!!! This will flash a warning but it is fine !!!!!!!!!!!!!!!!!!!!!\n",
-    "\n",
-    "# Input to the model\n",
-    "shape = X.shape[1:]\n",
-    "x = torch.rand(1, *shape, requires_grad=True)\n",
-    "torch_out = circuit(x)\n",
-    "# Export the model\n",
-    "torch.onnx.export(circuit,               # model being run\n",
-    "                  # model input (or a tuple for multiple inputs)\n",
-    "                  x,\n",
-    "                  # where to save the model (can be a file or file-like object)\n",
-    "                  \"network.onnx\",\n",
-    "                  export_params=True,        # store the trained parameter weights inside the model file\n",
-    "                  opset_version=10,          # the ONNX version to export the model to\n",
-    "                  do_constant_folding=True,  # whether to execute constant folding for optimization\n",
-    "                  input_names=['input'],   # the model's input names\n",
-    "                  output_names=['output'],  # the model's output names\n",
-    "                  dynamic_axes={'input': {0: 'batch_size'},    # variable length axes\n",
-    "                                'output': {0: 'batch_size'}})\n",
-    "\n",
-    "d = ((x).detach().numpy()).reshape([-1]).tolist()\n",
-    "\n",
-    "data = dict(input_shapes=[shape],\n",
-    "            input_data=[d],\n",
-    "            output_data=[((o).detach().numpy()).reshape([-1]).tolist() for o in torch_out])\n",
-    "\n",
-    "# Serialize data into file:\n",
-    "json.dump(data, open(\"input.json\", 'w'))\n",
-    "\n",
-    "\n",
-    "# note that you can also call the following function to generate random data for the model\n",
-    "# it is functionally equivalent to the code above\n",
-    "ezkl.gen_random_data()\n"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "d5e374a2",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "!RUST_LOG=trace\n",
-    "# TODO: Dictionary outputs\n",
-    "res = ezkl.gen_settings(model_path, settings_path)\n",
-    "assert res == True\n"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "cal_path = os.path.join(\"calibration.json\")\n",
-    "\n",
-    "data_array = (torch.randn(20, *shape).detach().numpy()).reshape([-1]).tolist()\n",
-    "\n",
-    "data = dict(input_data = [data_array])\n",
-    "\n",
-    "# Serialize data into file:\n",
-    "json.dump(data, open(cal_path, 'w'))\n",
-    "\n",
-    "res = await ezkl.calibrate_settings(data_path, model_path, settings_path, \"resources\")\n",
-    "assert res == True\n"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "3aa4f090",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "res = ezkl.compile_circuit(model_path, compiled_model_path, settings_path)\n",
-    "assert res == True"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "8b74dcee",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# srs path\n",
-    "res = await ezkl.get_srs( settings_path)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "18c8b7c7",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# now generate the witness file \n",
-    "\n",
-    "res = await ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
-    "assert os.path.isfile(witness_path)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "b1c561a8",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "\n",
-    "# HERE WE SETUP THE CIRCUIT PARAMS\n",
-    "# WE GOT KEYS\n",
-    "# WE GOT CIRCUIT PARAMETERS\n",
-    "# EVERYTHING ANYONE HAS EVER NEEDED FOR ZK\n",
-    "\n",
-    "\n",
-    "\n",
-    "res = ezkl.setup(\n",
-    "        compiled_model_path,\n",
-    "        vk_path,\n",
-    "        pk_path,\n",
-    "        \n",
-    "    )\n",
-    "\n",
-    "assert res == True\n",
-    "assert os.path.isfile(vk_path)\n",
-    "assert os.path.isfile(pk_path)\n",
-    "assert os.path.isfile(settings_path)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "c384cbc8",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# GENERATE A PROOF\n",
-    "\n",
-    "\n",
-    "proof_path = os.path.join('test.pf')\n",
-    "\n",
-    "res = ezkl.prove(\n",
-    "        witness_path,\n",
-    "        compiled_model_path,\n",
-    "        pk_path,\n",
-    "        proof_path,\n",
-    "        \n",
-    "        \"single\",\n",
-    "    )\n",
-    "\n",
-    "print(res)\n",
-    "assert os.path.isfile(proof_path)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "76f00d41",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# VERIFY IT\n",
-    "\n",
-    "res = ezkl.verify(\n",
-    "        proof_path,\n",
-    "        settings_path,\n",
-    "        vk_path,\n",
-    "        \n",
-    "    )\n",
-    "\n",
-    "assert res == True\n",
-    "print(\"verified\")"
-   ]
-  }
- ],
- "metadata": {
-  "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
-   "language": "python",
-   "name": "python3"
-  },
-  "language_info": {
-   "codemirror_mode": {
-    "name": "ipython",
-    "version": 3
-   },
-   "file_extension": ".py",
-   "mimetype": "text/x-python",
-   "name": "python",
-   "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.9.15"
-  }
- },
- "nbformat": 4,
- "nbformat_minor": 5
-}
+    "cells": [
+        {
+            "cell_type": "markdown",
+            "id": "cf69bb3f-94e6-4dba-92cd-ce08df117d67",
+            "metadata": {},
+            "source": [
+                "## Linear Regression\n",
+                "\n",
+                "\n",
+                "Sklearn based models are slightly finicky to get into a suitable onnx format. \n",
+                "This notebook showcases how to do so using the `hummingbird-ml` python package ! "
+            ]
+        },
+        {
+            "cell_type": "code",
+            "execution_count": null,
+            "id": "95613ee9",
+            "metadata": {},
+            "outputs": [],
+            "source": [
+                "# check if notebook is in colab\n",
+                "try:\n",
+                "    # install ezkl\n",
+                "    import google.colab\n",
+                "    import subprocess\n",
+                "    import sys\n",
+                "    subprocess.check_call([sys.executable, \"-m\", \"pip\", \"install\", \"ezkl\"])\n",
+                "    subprocess.check_call([sys.executable, \"-m\", \"pip\", \"install\", \"onnx\"])\n",
+                "    subprocess.check_call([sys.executable, \"-m\", \"pip\", \"install\", \"hummingbird-ml\"])\n",
+                "\n",
+                "# rely on local installation of ezkl if the notebook is not in colab\n",
+                "except:\n",
+                "    pass\n",
+                "\n",
+                "import os\n",
+                "import torch\n",
+                "import ezkl\n",
+                "import json\n",
+                "from hummingbird.ml import convert\n",
+                "\n",
+                "\n",
+                "# here we create and (potentially train a model)\n",
+                "\n",
+                "# make sure you have the dependencies required here already installed\n",
+                "import numpy as np\n",
+                "from sklearn.linear_model import LinearRegression\n",
+                "X = np.array([[1, 1], [1, 2], [2, 2], [2, 3]])\n",
+                "# y = 1 * x_0 + 2 * x_1 + 3\n",
+                "y = np.dot(X, np.array([1, 2])) + 3\n",
+                "reg = LinearRegression().fit(X, y)\n",
+                "reg.score(X, y)\n",
+                "\n",
+                "circuit = convert(reg, \"torch\", X[:1]).model\n",
+                "\n",
+                "\n",
+                "\n"
+            ]
+        },
+        {
+            "cell_type": "code",
+            "execution_count": null,
+            "id": "b37637c4",
+            "metadata": {},
+            "outputs": [],
+            "source": [
+                "model_path = os.path.join('network.onnx')\n",
+                "compiled_model_path = os.path.join('network.compiled')\n",
+                "pk_path = os.path.join('test.pk')\n",
+                "vk_path = os.path.join('test.vk')\n",
+                "settings_path = os.path.join('settings.json')\n",
+                "\n",
+                "witness_path = os.path.join('witness.json')\n",
+                "data_path = os.path.join('input.json')"
+            ]
+        },
+        {
+            "cell_type": "code",
+            "execution_count": null,
+            "id": "82db373a",
+            "metadata": {},
+            "outputs": [],
+            "source": [
+                "\n",
+                "\n",
+                "# export to onnx format\n",
+                "# !!!!!!!!!!!!!!!!! This will flash a warning but it is fine !!!!!!!!!!!!!!!!!!!!!\n",
+                "\n",
+                "# Input to the model\n",
+                "shape = X.shape[1:]\n",
+                "x = torch.rand(1, *shape, requires_grad=True)\n",
+                "torch_out = circuit(x)\n",
+                "# Export the model\n",
+                "torch.onnx.export(circuit,               # model being run\n",
+                "                  # model input (or a tuple for multiple inputs)\n",
+                "                  x,\n",
+                "                  # where to save the model (can be a file or file-like object)\n",
+                "                  \"network.onnx\",\n",
+                "                  export_params=True,        # store the trained parameter weights inside the model file\n",
+                "                  opset_version=10,          # the ONNX version to export the model to\n",
+                "                  do_constant_folding=True,  # whether to execute constant folding for optimization\n",
+                "                  input_names=['input'],   # the model's input names\n",
+                "                  output_names=['output'],  # the model's output names\n",
+                "                  dynamic_axes={'input': {0: 'batch_size'},    # variable length axes\n",
+                "                                'output': {0: 'batch_size'}})\n",
+                "\n",
+                "d = ((x).detach().numpy()).reshape([-1]).tolist()\n",
+                "\n",
+                "data = dict(input_shapes=[shape],\n",
+                "            input_data=[d],\n",
+                "            output_data=[((o).detach().numpy()).reshape([-1]).tolist() for o in torch_out])\n",
+                "\n",
+                "# Serialize data into file:\n",
+                "json.dump(data, open(\"input.json\", 'w'))\n",
+                "\n",
+                "\n",
+                "# note that you can also call the following function to generate random data for the model\n",
+                "# it is functionally equivalent to the code above\n",
+                "ezkl.gen_random_data()\n"
+            ]
+        },
+        {
+            "cell_type": "code",
+            "execution_count": null,
+            "id": "d5e374a2",
+            "metadata": {},
+            "outputs": [],
+            "source": [
+                "!RUST_LOG=trace\n",
+                "# TODO: Dictionary outputs\n",
+                "res = ezkl.gen_settings(model_path, settings_path)\n",
+                "assert res == True\n"
+            ]
+        },
+        {
+            "cell_type": "code",
+            "execution_count": null,
+            "metadata": {},
+            "outputs": [],
+            "source": [
+                "cal_path = os.path.join(\"calibration.json\")\n",
+                "\n",
+                "data_array = (torch.randn(20, *shape).detach().numpy()).reshape([-1]).tolist()\n",
+                "\n",
+                "data = dict(input_data = [data_array])\n",
+                "\n",
+                "# Serialize data into file:\n",
+                "json.dump(data, open(cal_path, 'w'))\n",
+                "\n",
+                "res = ezkl.calibrate_settings(data_path, model_path, settings_path, \"resources\")\n",
+                "assert res == True\n"
+            ]
+        },
+        {
+            "cell_type": "code",
+            "execution_count": null,
+            "id": "3aa4f090",
+            "metadata": {},
+            "outputs": [],
+            "source": [
+                "res = ezkl.compile_circuit(model_path, compiled_model_path, settings_path)\n",
+                "assert res == True"
+            ]
+        },
+        {
+            "cell_type": "code",
+            "execution_count": null,
+            "id": "8b74dcee",
+            "metadata": {},
+            "outputs": [],
+            "source": [
+                "# srs path\n",
+                "res = await ezkl.get_srs( settings_path)"
+            ]
+        },
+        {
+            "cell_type": "code",
+            "execution_count": null,
+            "id": "18c8b7c7",
+            "metadata": {},
+            "outputs": [],
+            "source": [
+                "# now generate the witness file \n",
+                "\n",
+                "res = ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
+                "assert os.path.isfile(witness_path)"
+            ]
+        },
+        {
+            "cell_type": "code",
+            "execution_count": null,
+            "id": "b1c561a8",
+            "metadata": {},
+            "outputs": [],
+            "source": [
+                "\n",
+                "# HERE WE SETUP THE CIRCUIT PARAMS\n",
+                "# WE GOT KEYS\n",
+                "# WE GOT CIRCUIT PARAMETERS\n",
+                "# EVERYTHING ANYONE HAS EVER NEEDED FOR ZK\n",
+                "\n",
+                "\n",
+                "\n",
+                "res = ezkl.setup(\n",
+                "        compiled_model_path,\n",
+                "        vk_path,\n",
+                "        pk_path,\n",
+                "        \n",
+                "    )\n",
+                "\n",
+                "assert res == True\n",
+                "assert os.path.isfile(vk_path)\n",
+                "assert os.path.isfile(pk_path)\n",
+                "assert os.path.isfile(settings_path)"
+            ]
+        },
+        {
+            "cell_type": "code",
+            "execution_count": null,
+            "id": "c384cbc8",
+            "metadata": {},
+            "outputs": [],
+            "source": [
+                "# GENERATE A PROOF\n",
+                "\n",
+                "\n",
+                "proof_path = os.path.join('test.pf')\n",
+                "\n",
+                "res = ezkl.prove(\n",
+                "        witness_path,\n",
+                "        compiled_model_path,\n",
+                "        pk_path,\n",
+                "        proof_path,\n",
+                "        \n",
+                "        \"single\",\n",
+                "    )\n",
+                "\n",
+                "print(res)\n",
+                "assert os.path.isfile(proof_path)"
+            ]
+        },
+        {
+            "cell_type": "code",
+            "execution_count": null,
+            "id": "76f00d41",
+            "metadata": {},
+            "outputs": [],
+            "source": [
+                "# VERIFY IT\n",
+                "\n",
+                "res = ezkl.verify(\n",
+                "        proof_path,\n",
+                "        settings_path,\n",
+                "        vk_path,\n",
+                "        \n",
+                "    )\n",
+                "\n",
+                "assert res == True\n",
+                "print(\"verified\")"
+            ]
+        }
+    ],
+    "metadata": {
+        "kernelspec": {
+            "display_name": "Python 3 (ipykernel)",
+            "language": "python",
+            "name": "python3"
+        },
+        "language_info": {
+            "codemirror_mode": {
+                "name": "ipython",
+                "version": 3
+            },
+            "file_extension": ".py",
+            "mimetype": "text/x-python",
+            "name": "python",
+            "nbconvert_exporter": "python",
+            "pygments_lexer": "ipython3",
+            "version": "3.9.15"
+        }
+    },
+    "nbformat": 4,
+    "nbformat_minor": 5
+}
--- a/examples/notebooks/little_transformer.ipynb
+++ b/examples/notebooks/little_transformer.ipynb
@@ -347,7 +347,7 @@
                "# Serialize data into file:\n",
                "json.dump(data, open(cal_path, 'w'))\n",
                "\n",
-                "res = await ezkl.calibrate_settings(data_path, model_path, settings_path, \"resources\")\n",
+                "res = ezkl.calibrate_settings(data_path, model_path, settings_path, \"resources\")\n",
                "assert res == True\n"
            ]
        },
@@ -383,7 +383,7 @@
                "# now generate the witness file \n",
                "witness_path = \"gan_witness.json\"\n",
                "\n",
-                "res = await ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
+                "res = ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
                "assert os.path.isfile(witness_path)"
            ]
        },
--- a/examples/notebooks/logistic_regression.ipynb
+++ b/examples/notebooks/logistic_regression.ipynb
@@ -142,7 +142,7 @@
                "# Serialize data into file:\n",
                "json.dump(data, open(cal_path, 'w'))\n",
                "\n",
-                "res = await ezkl.calibrate_settings(data_path, model_path, settings_path, \"resources\")\n",
+                "res = ezkl.calibrate_settings(data_path, model_path, settings_path, \"resources\")\n",
                "assert res == True\n"
            ]
        },
@@ -177,7 +177,7 @@
            "source": [
                "# now generate the witness file \n",
                "\n",
-                "res = await ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
+                "res = ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
                "assert os.path.isfile(witness_path)"
            ]
        },
@@ -276,4 +276,4 @@
    },
    "nbformat": 4,
    "nbformat_minor": 5
-}
+}
--- a/examples/notebooks/lstm.ipynb
+++ b/examples/notebooks/lstm.ipynb
@@ -139,7 +139,7 @@
                "res = ezkl.gen_settings(model_path, settings_path, py_run_args=run_args)\n",
                "assert res == True\n",
                "\n",
-                "res = await ezkl.calibrate_settings(data_path, model_path, settings_path, \"resources\")\n",
+                "res = ezkl.calibrate_settings(data_path, model_path, settings_path, \"resources\")\n",
                "assert res == True\n"
            ]
        },
@@ -193,7 +193,7 @@
                "# now generate the witness file \n",
                "witness_path = \"lstmwitness.json\"\n",
                "\n",
-                "res = await ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
+                "res = ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
                "assert os.path.isfile(witness_path)"
            ]
        },
--- a/examples/notebooks/mnist_classifier.ipynb
+++ b/examples/notebooks/mnist_classifier.ipynb
@@ -323,7 +323,7 @@
        "res = ezkl.gen_settings(model_path, settings_path, py_run_args=run_args)\n",
        "assert res == True\n",
        "\n",
-        "res = await ezkl.calibrate_settings(cal_path, model_path, settings_path, \"resources\", scales=[2,7])\n",
+        "res = ezkl.calibrate_settings(cal_path, model_path, settings_path, \"resources\", scales=[2,7])\n",
        "assert res == True"
      ]
    },
@@ -362,7 +362,7 @@
        "# now generate the witness file\n",
        "witness_path = \"witness.json\"\n",
        "\n",
-        "res = await ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
+        "res = ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
        "assert os.path.isfile(witness_path)"
      ]
    },
@@ -558,4 +558,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 0
-}
+}
--- a/examples/notebooks/mnist_gan.ipynb
+++ b/examples/notebooks/mnist_gan.ipynb
@@ -289,7 +289,7 @@
                "json.dump(data, open(cal_path, 'w'))\n",
                "\n",
                "\n",
-                "await ezkl.calibrate_settings(cal_path, model_path, settings_path, \"resources\", scales=[0,6])"
+                "ezkl.calibrate_settings(cal_path, model_path, settings_path, \"resources\", scales=[0,6])"
            ]
        },
        {
@@ -321,7 +321,7 @@
                "# now generate the witness file \n",
                "witness_path = \"gan_witness.json\"\n",
                "\n",
-                "res = await ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
+                "res = ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
                "assert os.path.isfile(witness_path)"
            ]
        },
@@ -425,4 +425,4 @@
    },
    "nbformat": 4,
    "nbformat_minor": 2
-}
+}
--- a/examples/notebooks/mnist_gan_proof_splitting.ipynb
+++ b/examples/notebooks/mnist_gan_proof_splitting.ipynb
@@ -341,7 +341,7 @@
                "\n",
                "    # generate settings for the current model\n",
                "    res = ezkl.gen_settings(model_path, settings_path, py_run_args=run_args)\n",
-                "    res = await ezkl.calibrate_settings(data_path, model_path, settings_path, \"resources\", scales=[run_args.input_scale], max_logrows=run_args.logrows)\n",
+                "    res = ezkl.calibrate_settings(data_path, model_path, settings_path, \"resources\", scales=[run_args.input_scale], max_logrows=run_args.logrows)\n",
                "    assert res == True\n",
                "\n",
                "    # load settings and print them to the console\n",
@@ -361,7 +361,7 @@
                "    assert res == True\n",
                "    assert os.path.isfile(vk_path)\n",
                "    assert os.path.isfile(pk_path)\n",
-                "    res = await ezkl.gen_witness(data_path, compiled_model_path, witness_path, vk_path)\n",
+                "    res = ezkl.gen_witness(data_path, compiled_model_path, witness_path, vk_path)\n",
                "    run_args.input_scale = settings[\"model_output_scales\"][0]\n",
                "\n",
                "for i in range(3):\n",
@@ -484,4 +484,4 @@
    },
    "nbformat": 4,
    "nbformat_minor": 2
-}
+}
--- a/examples/notebooks/mnist_vae.ipynb
+++ b/examples/notebooks/mnist_vae.ipynb
@@ -215,7 +215,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\")"
            ]
        },
        {
@@ -247,7 +247,7 @@
                "# now generate the witness file\n",
                "witness_path = \"ae_witness.json\"\n",
                "\n",
-                "res = await ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
+                "res = ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
                "assert os.path.isfile(witness_path)"
            ]
        },
@@ -451,7 +451,7 @@
                "res = ezkl.gen_settings(model_path, settings_path)\n",
                "assert res == True\n",
                "\n",
-                "res = await ezkl.calibrate_settings(data_path, model_path, settings_path, \"resources\")\n",
+                "res = ezkl.calibrate_settings(data_path, model_path, settings_path, \"resources\")\n",
                "assert res == True\n",
                "print(\"verified\")"
            ]
@@ -485,7 +485,7 @@
                "# now generate the witness file \n",
                "witness_path = \"vae_witness.json\"\n",
                "\n",
-                "res = await ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
+                "res = ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
                "assert os.path.isfile(witness_path)"
            ]
        },
@@ -590,4 +590,4 @@
    },
    "nbformat": 4,
    "nbformat_minor": 2
-}
+}
--- a/examples/notebooks/nbeats_timeseries_forecasting.ipynb
+++ b/examples/notebooks/nbeats_timeseries_forecasting.ipynb
@@ -845,7 +845,7 @@
        "res = ezkl.gen_settings(model_path, settings_path)\n",
        "assert res == True\n",
        "\n",
-        "res = await ezkl.calibrate_settings(data_path, model_path, settings_path, \"resources\", max_logrows = 20, scales = [3])\n",
+        "res = ezkl.calibrate_settings(data_path, model_path, settings_path, \"resources\", max_logrows = 20, scales = [3])\n",
        "assert res == True"
      ]
    },
@@ -881,7 +881,7 @@
      },
      "outputs": [],
      "source": [
-        "res = await ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
+        "res = ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
        "assert os.path.isfile(witness_path)"
      ]
    },
--- a/examples/notebooks/neural_bow.ipynb
+++ b/examples/notebooks/neural_bow.ipynb
--- a/examples/notebooks/proof_splitting.ipynb
+++ b/examples/notebooks/proof_splitting.ipynb
@@ -282,7 +282,7 @@
                "\n",
                "    # generate settings for the current model\n",
                "    res = ezkl.gen_settings(model_path, settings_path, py_run_args=run_args)\n",
-                "    res = await ezkl.calibrate_settings(data_path, model_path, settings_path, \"resources\", scales=[run_args.input_scale], max_logrows=run_args.logrows)\n",
+                "    res = ezkl.calibrate_settings(data_path, model_path, settings_path, \"resources\", scales=[run_args.input_scale], max_logrows=run_args.logrows)\n",
                "    assert res == True\n",
                "\n",
                "    # load settings and print them to the console\n",
@@ -303,7 +303,7 @@
                "    assert os.path.isfile(vk_path)\n",
                "    assert os.path.isfile(pk_path)\n",
                "\n",
-                "    res = await ezkl.gen_witness(data_path, compiled_model_path, witness_path, vk_path)\n",
+                "    res = ezkl.gen_witness(data_path, compiled_model_path, witness_path, vk_path)\n",
                "    run_args.input_scale = settings[\"model_output_scales\"][0]\n",
                "\n",
                "for i in range(2):\n",
@@ -472,4 +472,4 @@
    },
    "nbformat": 4,
    "nbformat_minor": 2
-}
+}
--- a/examples/notebooks/random_forest.ipynb
+++ b/examples/notebooks/random_forest.ipynb
@@ -176,7 +176,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\")"
            ]
        },
        {
@@ -210,7 +210,7 @@
            "source": [
                "# now generate the witness file \n",
                "\n",
-                "res = await ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
+                "res = ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
                "assert os.path.isfile(witness_path)"
            ]
        },
@@ -309,4 +309,4 @@
    },
    "nbformat": 4,
    "nbformat_minor": 5
-}
+}
--- a/examples/notebooks/reusable_verifier.ipynb
+++ b/examples/notebooks/reusable_verifier.ipynb
@@ -1,330 +1,336 @@
 {
- "cells": [
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "# Reusable Verifiers \n",
-    "\n",
-    "This notebook demonstrates how to create and reuse the same set of separated verifiers for different models. Specifically, we will use the same verifier for the following four models:\n",
-    "\n",
-    "- `1l_mlp sigmoid`\n",
-    "- `1l_mlp relu`\n",
-    "- `1l_conv sigmoid`\n",
-    "- `1l_conv relu`\n",
-    "\n",
-    "When deploying EZKL verifiers on the blockchain, each associated model typically requires its own unique verifier, leading to increased on-chain state usage. \n",
-    "However, with the reusable verifier, we can deploy a single verifier that can be used to verify proofs for any valid H2 circuit. This notebook shows how to do so. \n",
-    "\n",
-    "By reusing the same verifier across multiple models, we significantly reduce the amount of state bloat on the blockchain. Instead of deploying a unique verifier for each model, we deploy a unique and much smaller verifying key artifact (VKA) contract for each model while sharing a common separated verifier. The VKA contains the VK for the model as well circuit specific metadata that was otherwise hardcoded into the stack of the original non-reusable verifier."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import torch\n",
-    "import torch.nn as nn\n",
-    "import torch.onnx\n",
-    "\n",
-    "# Define the models\n",
-    "class MLP_Sigmoid(nn.Module):\n",
-    "    def __init__(self):\n",
-    "        super(MLP_Sigmoid, self).__init__()\n",
-    "        self.fc = nn.Linear(3, 3)\n",
-    "        self.sigmoid = nn.Sigmoid()\n",
-    "\n",
-    "    def forward(self, x):\n",
-    "        x = self.fc(x)\n",
-    "        x = self.sigmoid(x)\n",
-    "        return x\n",
-    "\n",
-    "class MLP_Relu(nn.Module):\n",
-    "    def __init__(self):\n",
-    "        super(MLP_Relu, self).__init__()\n",
-    "        self.fc = nn.Linear(3, 3)\n",
-    "        self.relu = nn.ReLU()\n",
-    "\n",
-    "    def forward(self, x):\n",
-    "        x = self.fc(x)\n",
-    "        x = self.relu(x)\n",
-    "        return x\n",
-    "\n",
-    "class Conv_Sigmoid(nn.Module):\n",
-    "    def __init__(self):\n",
-    "        super(Conv_Sigmoid, self).__init__()\n",
-    "        self.conv = nn.Conv1d(1, 1, kernel_size=3, stride=1)\n",
-    "        self.sigmoid = nn.Sigmoid()\n",
-    "\n",
-    "    def forward(self, x):\n",
-    "        x = self.conv(x)\n",
-    "        x = self.sigmoid(x)\n",
-    "        return x\n",
-    "\n",
-    "class Conv_Relu(nn.Module):\n",
-    "    def __init__(self):\n",
-    "        super(Conv_Relu, self).__init__()\n",
-    "        self.conv = nn.Conv1d(1, 1, kernel_size=3, stride=1)\n",
-    "        self.relu = nn.ReLU()\n",
-    "\n",
-    "    def forward(self, x):\n",
-    "        x = self.conv(x)\n",
-    "        x = self.relu(x)\n",
-    "        return x\n",
-    "\n",
-    "# Instantiate the models\n",
-    "mlp_sigmoid = MLP_Sigmoid()\n",
-    "mlp_relu = MLP_Relu()\n",
-    "conv_sigmoid = Conv_Sigmoid()\n",
-    "conv_relu = Conv_Relu()\n",
-    "\n",
-    "# Dummy input tensor for mlp\n",
-    "dummy_input_mlp = torch.tensor([[-1.5737053155899048, -1.708398461341858, 0.19544155895709991]])\n",
-    "input_mlp_path = 'mlp_input.json'\n",
-    "\n",
-    "# Dummy input tensor for conv\n",
-    "dummy_input_conv = torch.tensor([[[1.4124163389205933, 0.6938204169273376, 1.0664031505584717]]])\n",
-    "input_conv_path = 'conv_input.json'"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "names = ['mlp_sigmoid', 'mlp_relu', 'conv_sigmoid', 'conv_relu']\n",
-    "models = [mlp_sigmoid, mlp_relu, conv_sigmoid, conv_relu]\n",
-    "inputs = [dummy_input_mlp, dummy_input_mlp, dummy_input_conv, dummy_input_conv]\n",
-    "input_paths = [input_mlp_path, input_mlp_path, input_conv_path, input_conv_path]"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import os\n",
-    "import json\n",
-    "import torch\n",
-    "import ezkl\n",
-    "\n",
-    "for name, model, x, input_path in zip(names, models, inputs, input_paths):\n",
-    "    # Create a new directory for the model if it doesn't exist\n",
-    "    if not os.path.exists(name):\n",
-    "        os.mkdir(name)\n",
-    "    # Store the paths in each of their respective directories\n",
-    "    model_path = os.path.join(name, \"network.onnx\")\n",
-    "    compiled_model_path = os.path.join(name, \"network.compiled\")\n",
-    "    pk_path = os.path.join(name, \"test.pk\")\n",
-    "    vk_path = os.path.join(name, \"test.vk\")\n",
-    "    settings_path = os.path.join(name, \"settings.json\")\n",
-    "\n",
-    "    witness_path = os.path.join(name, \"witness.json\")\n",
-    "    sol_code_path = os.path.join(name, 'test.sol')\n",
-    "    sol_key_code_path = os.path.join(name, 'test_key.sol')\n",
-    "    abi_path = os.path.join(name, 'test.abi')\n",
-    "    proof_path = os.path.join(name, \"proof.json\")\n",
-    "\n",
-    "    # Flips the neural net into inference mode\n",
-    "    model.eval()\n",
-    "\n",
-    "    # Export the model\n",
-    "    torch.onnx.export(model, x, model_path, export_params=True, opset_version=10,\n",
-    "                      do_constant_folding=True, input_names=['input'],\n",
-    "                      output_names=['output'], dynamic_axes={'input': {0: 'batch_size'},\n",
-    "                                                              'output': {0: 'batch_size'}})\n",
-    "\n",
-    "    data_array = ((x).detach().numpy()).reshape([-1]).tolist()\n",
-    "    data = dict(input_data=[data_array])\n",
-    "    json.dump(data, open(input_path, 'w'))\n",
-    "\n",
-    "    py_run_args = ezkl.PyRunArgs()\n",
-    "    py_run_args.input_visibility = \"private\"\n",
-    "    py_run_args.output_visibility = \"public\"\n",
-    "    py_run_args.param_visibility = \"fixed\"  # private by default\n",
-    "\n",
-    "    res = ezkl.gen_settings(model_path, settings_path, py_run_args=py_run_args)\n",
-    "    assert res == True\n",
-    "\n",
-    "    await ezkl.calibrate_settings(input_path, model_path, settings_path, \"resources\")\n",
-    "\n",
-    "    res = ezkl.compile_circuit(model_path, compiled_model_path, settings_path)\n",
-    "    assert res == True\n",
-    "\n",
-    "    res = await ezkl.get_srs(settings_path)\n",
-    "    assert res == True\n",
-    "\n",
-    "    # now generate the witness file\n",
-    "    res = await ezkl.gen_witness(input_path, compiled_model_path, witness_path)\n",
-    "    assert os.path.isfile(witness_path) == True\n",
-    "\n",
-    "    # SETUP \n",
-    "    # We recommend disabling selector compression for the setup as it decreases the size of the VK artifact\n",
-    "    res = ezkl.setup(compiled_model_path, vk_path, pk_path, disable_selector_compression=True)\n",
-    "    assert res == True\n",
-    "    assert os.path.isfile(vk_path)\n",
-    "    assert os.path.isfile(pk_path)\n",
-    "    assert os.path.isfile(settings_path)\n",
-    "\n",
-    "    # GENERATE A PROOF\n",
-    "    res = ezkl.prove(witness_path, compiled_model_path, pk_path, proof_path, \"single\")\n",
-    "    assert os.path.isfile(proof_path)\n",
-    "\n",
-    "    res = await ezkl.create_evm_verifier(vk_path, settings_path, sol_code_path, abi_path, reusable=True)\n",
-    "    assert res == True\n",
-    "\n",
-    "    res = await ezkl.create_evm_vka(vk_path, settings_path, sol_key_code_path, abi_path)\n",
-    "    assert res == True\n"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import subprocess\n",
-    "import time\n",
-    "\n",
-    "# make sure anvil is running locally\n",
-    "# $ anvil -p 3030\n",
-    "\n",
-    "RPC_URL = \"http://localhost:3030\"\n",
-    "\n",
-    "# Save process globally\n",
-    "anvil_process = None\n",
-    "\n",
-    "def start_anvil():\n",
-    "    global anvil_process\n",
-    "    if anvil_process is None:\n",
-    "        anvil_process = subprocess.Popen([\"anvil\", \"-p\", \"3030\", \"--code-size-limit=41943040\"])\n",
-    "        if anvil_process.returncode is not None:\n",
-    "            raise Exception(\"failed to start anvil process\")\n",
-    "        time.sleep(3)\n",
-    "\n",
-    "def stop_anvil():\n",
-    "    global anvil_process\n",
-    "    if anvil_process is not None:\n",
-    "        anvil_process.terminate()\n",
-    "        anvil_process = None\n"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Check that the generated verifiers are identical for all models."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import filecmp\n",
-    "\n",
-    "def compare_files(file1, file2):\n",
-    "    return filecmp.cmp(file1, file2, shallow=False)\n",
-    "\n",
-    "sol_code_path_0 = os.path.join(\"mlp_sigmoid\", 'test.sol')\n",
-    "sol_code_path_1 = os.path.join(\"mlp_relu\", 'test.sol')\n",
-    "\n",
-    "sol_code_path_2 = os.path.join(\"conv_sigmoid\", 'test.sol')\n",
-    "sol_code_path_3 = os.path.join(\"conv_relu\", 'test.sol')\n",
-    "\n",
-    "\n",
-    "assert compare_files(sol_code_path_0, sol_code_path_1) == True\n",
-    "assert compare_files(sol_code_path_2, sol_code_path_3) == True"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Here we deploy separate verifier that will be shared by the four models. We picked the `1l_mlp sigmoid` model as an example but you could have used any of the generated verifiers since they are all identical. "
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import os \n",
-    "addr_path_verifier = \"addr_verifier.txt\"\n",
-    "sol_code_path = os.path.join(\"mlp_sigmoid\", 'test.sol')\n",
-    "\n",
-    "res = await ezkl.deploy_evm(\n",
-    "    addr_path_verifier,\n",
-    "    'http://127.0.0.1:3030',\n",
-    "    sol_code_path,\n",
-    "    \"verifier/reusable\"\n",
-    ")\n",
-    "\n",
-    "assert res == True\n",
-    "\n",
-    "with open(addr_path_verifier, 'r') as file:\n",
-    "    addr = file.read().rstrip()"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Finally we deploy each of the unique VK-artifacts and verify them using the shared verifier deployed in the previous step."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "for name in names:\n",
-    "    addr_path_vk = \"addr_vk.txt\"\n",
-    "    sol_key_code_path = os.path.join(name, 'test_key.sol')\n",
-    "    res = await ezkl.deploy_evm(addr_path_vk, 'http://127.0.0.1:3030', sol_key_code_path, \"vka\")\n",
-    "    assert res == True\n",
-    "\n",
-    "    with open(addr_path_vk, 'r') as file:\n",
-    "        addr_vk = file.read().rstrip()\n",
-    "        \n",
-    "    proof_path = os.path.join(name, \"proof.json\")\n",
-    "    sol_code_path = os.path.join(name, 'vk.sol')\n",
-    "    res = await ezkl.verify_evm(\n",
-    "        addr,\n",
-    "        \"http://127.0.0.1:3030\",\n",
-    "        proof_path,\n",
-    "        addr_vk = addr_vk\n",
-    "    )\n",
-    "    assert res == True"
-   ]
-  }
- ],
- "metadata": {
-  "kernelspec": {
-   "display_name": ".env",
-   "language": "python",
-   "name": "python3"
-  },
-  "language_info": {
-   "codemirror_mode": {
-    "name": "ipython",
-    "version": 3
-   },
-   "file_extension": ".py",
-   "mimetype": "text/x-python",
-   "name": "python",
-   "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.11.5"
-  }
- },
- "nbformat": 4,
- "nbformat_minor": 2
+    "cells": [
+        {
+            "cell_type": "markdown",
+            "metadata": {},
+            "source": [
+                "# Reusable Verifiers \n",
+                "\n",
+                "TODO: Update the reusable verifier solidity contract name.. Make it less generic to H2 and more bespoke to us.\n",
+                "\n",
+                "This notebook demonstrates how to create and reuse the same set of separated verifiers for different models. Specifically, we will use the same verifier for the following four models:\n",
+                "\n",
+                "- `1l_mlp sigmoid`\n",
+                "- `1l_mlp relu`\n",
+                "- `1l_conv sigmoid`\n",
+                "- `1l_conv relu`\n",
+                "\n",
+                "When deploying EZKL verifiers on the blockchain, each associated model typically requires its own unique verifier, leading to increased on-chain state usage. \n",
+                "However, with the reusable verifier, we can deploy a single verifier that can be used to verify proofs for any valid H2 circuit. This notebook shows how to do so. \n",
+                "\n",
+                "By reusing the same verifier across multiple models, we significantly reduce the amount of state bloat on the blockchain. Instead of deploying a unique verifier for each model, we register a unique and much smaller verifying key artifact (VKA) on the reusable verifier contract for each model while sharing a common separated verifier. The VKA contains the VK for the model as well circuit specific metadata that was otherwise hardcoded into the stack of the original non-reusable verifier. The VKA is passed as a parameter to the verifyProof method. This VKA calldata needs to be d with the reusable verifier before it can start verifying proofs by calling the registerVKA method. "
+            ]
+        },
+        {
+            "cell_type": "code",
+            "execution_count": null,
+            "metadata": {},
+            "outputs": [],
+            "source": [
+                "import torch\n",
+                "import torch.nn as nn\n",
+                "import torch.onnx\n",
+                "\n",
+                "# Define the models\n",
+                "class MLP_Sigmoid(nn.Module):\n",
+                "    def __init__(self):\n",
+                "        super(MLP_Sigmoid, self).__init__()\n",
+                "        self.fc = nn.Linear(3, 3)\n",
+                "        self.sigmoid = nn.Sigmoid()\n",
+                "\n",
+                "    def forward(self, x):\n",
+                "        x = self.fc(x)\n",
+                "        x = self.sigmoid(x)\n",
+                "        return x\n",
+                "\n",
+                "class MLP_Relu(nn.Module):\n",
+                "    def __init__(self):\n",
+                "        super(MLP_Relu, self).__init__()\n",
+                "        self.fc = nn.Linear(3, 3)\n",
+                "        self.relu = nn.ReLU()\n",
+                "\n",
+                "    def forward(self, x):\n",
+                "        x = self.fc(x)\n",
+                "        x = self.relu(x)\n",
+                "        return x\n",
+                "\n",
+                "class Conv_Sigmoid(nn.Module):\n",
+                "    def __init__(self):\n",
+                "        super(Conv_Sigmoid, self).__init__()\n",
+                "        self.conv = nn.Conv1d(1, 1, kernel_size=3, stride=1)\n",
+                "        self.sigmoid = nn.Sigmoid()\n",
+                "\n",
+                "    def forward(self, x):\n",
+                "        x = self.conv(x)\n",
+                "        x = self.sigmoid(x)\n",
+                "        return x\n",
+                "\n",
+                "class Conv_Relu(nn.Module):\n",
+                "    def __init__(self):\n",
+                "        super(Conv_Relu, self).__init__()\n",
+                "        self.conv = nn.Conv1d(1, 1, kernel_size=3, stride=1)\n",
+                "        self.relu = nn.ReLU()\n",
+                "\n",
+                "    def forward(self, x):\n",
+                "        x = self.conv(x)\n",
+                "        x = self.relu(x)\n",
+                "        return x\n",
+                "\n",
+                "# Instantiate the models\n",
+                "mlp_sigmoid = MLP_Sigmoid()\n",
+                "mlp_relu = MLP_Relu()\n",
+                "conv_sigmoid = Conv_Sigmoid()\n",
+                "conv_relu = Conv_Relu()\n",
+                "\n",
+                "# Dummy input tensor for mlp\n",
+                "dummy_input_mlp = torch.tensor([[-1.5737053155899048, -1.708398461341858, 0.19544155895709991]])\n",
+                "input_mlp_path = 'mlp_input.json'\n",
+                "\n",
+                "# Dummy input tensor for conv\n",
+                "dummy_input_conv = torch.tensor([[[1.4124163389205933, 0.6938204169273376, 1.0664031505584717]]])\n",
+                "input_conv_path = 'conv_input.json'"
+            ]
+        },
+        {
+            "cell_type": "code",
+            "execution_count": 5,
+            "metadata": {},
+            "outputs": [],
+            "source": [
+                "names = ['mlp_sigmoid', 'mlp_relu', 'conv_sigmoid', 'conv_relu']\n",
+                "models = [mlp_sigmoid, mlp_relu, conv_sigmoid, conv_relu]\n",
+                "inputs = [dummy_input_mlp, dummy_input_mlp, dummy_input_conv, dummy_input_conv]\n",
+                "input_paths = [input_mlp_path, input_mlp_path, input_conv_path, input_conv_path]"
+            ]
+        },
+        {
+            "cell_type": "code",
+            "execution_count": null,
+            "metadata": {},
+            "outputs": [],
+            "source": [
+                "import os\n",
+                "import json\n",
+                "import torch\n",
+                "import ezkl\n",
+                "\n",
+                "for name, model, x, input_path in zip(names, models, inputs, input_paths):\n",
+                "    # Create a new directory for the model if it doesn't exist\n",
+                "    if not os.path.exists(name):\n",
+                "        os.mkdir(name)\n",
+                "    # Store the paths in each of their respective directories\n",
+                "    model_path = os.path.join(name, \"network.onnx\")\n",
+                "    compiled_model_path = os.path.join(name, \"network.compiled\")\n",
+                "    pk_path = os.path.join(name, \"test.pk\")\n",
+                "    vk_path = os.path.join(name, \"test.vk\")\n",
+                "    settings_path = os.path.join(name, \"settings.json\")\n",
+                "\n",
+                "    witness_path = os.path.join(name, \"witness.json\")\n",
+                "    sol_code_path = os.path.join(name, 'test.sol')\n",
+                "    vka_path = os.path.join(name, 'vka.bytes')\n",
+                "    abi_path = os.path.join(name, 'test.abi')\n",
+                "    proof_path = os.path.join(name, \"proof.json\")\n",
+                "\n",
+                "    # Flips the neural net into inference mode\n",
+                "    model.eval()\n",
+                "\n",
+                "    # Export the model\n",
+                "    torch.onnx.export(model, x, model_path, export_params=True, opset_version=10,\n",
+                "                      do_constant_folding=True, input_names=['input'],\n",
+                "                      output_names=['output'], dynamic_axes={'input': {0: 'batch_size'},\n",
+                "                                                              'output': {0: 'batch_size'}})\n",
+                "\n",
+                "    data_array = ((x).detach().numpy()).reshape([-1]).tolist()\n",
+                "    data = dict(input_data=[data_array])\n",
+                "    json.dump(data, open(input_path, 'w'))\n",
+                "\n",
+                "    py_run_args = ezkl.PyRunArgs()\n",
+                "    py_run_args.input_visibility = \"private\"\n",
+                "    py_run_args.output_visibility = \"public\"\n",
+                "    py_run_args.param_visibility = \"fixed\"  # private by default\n",
+                "\n",
+                "    res = ezkl.gen_settings(model_path, settings_path, py_run_args=py_run_args)\n",
+                "    assert res == True\n",
+                "\n",
+                "    ezkl.calibrate_settings(input_path, model_path, settings_path, \"resources\")\n",
+                "\n",
+                "    res = ezkl.compile_circuit(model_path, compiled_model_path, settings_path)\n",
+                "    assert res == True\n",
+                "\n",
+                "    res = await ezkl.get_srs(settings_path)\n",
+                "    assert res == True\n",
+                "\n",
+                "    # now generate the witness file\n",
+                "    res = ezkl.gen_witness(input_path, compiled_model_path, witness_path)\n",
+                "    assert os.path.isfile(witness_path) == True\n",
+                "\n",
+                "    # SETUP \n",
+                "    # We recommend disabling selector compression for the setup as it decreases the size of the VK artifact\n",
+                "    res = ezkl.setup(compiled_model_path, vk_path, pk_path, disable_selector_compression=True)\n",
+                "    assert res == True\n",
+                "    assert os.path.isfile(vk_path)\n",
+                "    assert os.path.isfile(pk_path)\n",
+                "    assert os.path.isfile(settings_path)\n",
+                "\n",
+                "    # GENERATE A PROOF\n",
+                "    res = ezkl.prove(witness_path, compiled_model_path, pk_path, proof_path, \"single\")\n",
+                "    assert os.path.isfile(proof_path)\n",
+                "\n",
+                "    res = await ezkl.create_evm_verifier(vk_path, settings_path, sol_code_path, abi_path, reusable=True)\n",
+                "    # TODO: Add a flag force equals true to in the deprication process to preserve OG single purpose verifier?\n",
+                "    assert res == True\n",
+                "\n",
+                "    # TODO: \n",
+                "    res = await ezkl.create_evm_vka(vk_path, settings_path, vka_path, decimals=18)\n",
+                "    assert res == True\n"
+            ]
+        },
+        {
+            "cell_type": "code",
+            "execution_count": 7,
+            "metadata": {},
+            "outputs": [],
+            "source": [
+                "import subprocess\n",
+                "import time\n",
+                "\n",
+                "# make sure anvil is running locally\n",
+                "# $ anvil -p 3030\n",
+                "\n",
+                "RPC_URL = \"http://localhost:3030\"\n",
+                "\n",
+                "# Save process globally\n",
+                "anvil_process = None\n",
+                "\n",
+                "def start_anvil():\n",
+                "    global anvil_process\n",
+                "    if anvil_process is None:\n",
+                "        anvil_process = subprocess.Popen([\"anvil\", \"-p\", \"3030\", \"--code-size-limit=41943040\"])\n",
+                "        if anvil_process.returncode is not None:\n",
+                "            raise Exception(\"failed to start anvil process\")\n",
+                "        time.sleep(3)\n",
+                "\n",
+                "def stop_anvil():\n",
+                "    global anvil_process\n",
+                "    if anvil_process is not None:\n",
+                "        anvil_process.terminate()\n",
+                "        anvil_process = None\n"
+            ]
+        },
+        {
+            "cell_type": "markdown",
+            "metadata": {},
+            "source": [
+                "Check that the generated verifiers are identical for all models."
+            ]
+        },
+        {
+            "cell_type": "code",
+            "execution_count": 9,
+            "metadata": {},
+            "outputs": [],
+            "source": [
+                "import filecmp\n",
+                "\n",
+                "def compare_files(file1, file2):\n",
+                "    return filecmp.cmp(file1, file2, shallow=False)\n",
+                "\n",
+                "sol_code_path_0 = os.path.join(\"mlp_sigmoid\", 'test.sol')\n",
+                "sol_code_path_1 = os.path.join(\"mlp_relu\", 'test.sol')\n",
+                "\n",
+                "sol_code_path_2 = os.path.join(\"conv_sigmoid\", 'test.sol')\n",
+                "sol_code_path_3 = os.path.join(\"conv_relu\", 'test.sol')\n",
+                "\n",
+                "\n",
+                "assert compare_files(sol_code_path_0, sol_code_path_1) == True\n",
+                "assert compare_files(sol_code_path_2, sol_code_path_3) == True"
+            ]
+        },
+        {
+            "cell_type": "markdown",
+            "metadata": {},
+            "source": [
+                "Here we deploy reusable verifier that will be shared by the four models. We picked the `1l_mlp sigmoid` model as an example but you could have used any of the generated verifiers since they are all identical. "
+            ]
+        },
+        {
+            "cell_type": "code",
+            "execution_count": 10,
+            "metadata": {},
+            "outputs": [],
+            "source": [
+                "import os \n",
+                "addr_path_verifier = \"addr_verifier.txt\"\n",
+                "sol_code_path = os.path.join(\"mlp_sigmoid\", 'test.sol')\n",
+                "\n",
+                "res = await ezkl.deploy_evm(\n",
+                "    addr_path_verifier,\n",
+                "    'http://127.0.0.1:3030',\n",
+                "    sol_code_path,\n",
+                "    \"verifier/reusable\" # TODO deprecate this option for selecting the type of verifier you want to deploy. \n",
+                "    # verifier, verifier/reusable, vka\n",
+                ")\n",
+                "\n",
+                "assert res == True\n",
+                "\n",
+                "with open(addr_path_verifier, 'r') as file:\n",
+                "    addr = file.read().rstrip()"
+            ]
+        },
+        {
+            "cell_type": "markdown",
+            "metadata": {},
+            "source": [
+                "Finally we deploy each of the unique VK-artifacts and verify them using the shared verifier deployed in the previous step."
+            ]
+        },
+        {
+            "cell_type": "code",
+            "execution_count": null,
+            "metadata": {},
+            "outputs": [],
+            "source": [
+                "for name in names:\n",
+                "    addr_path_vk = \"addr_vk.txt\"\n",
+                "    vka_path = os.path.join(name, 'vka.bytes')\n",
+                "    res = await ezkl.register_vka(\n",
+                "        addr, # address of the reusable verifier. TODO: If we deploy the RV across all chains to a single canoncial address, we can hardcode that address and remove this param.\n",
+                "        'http://127.0.0.1:3030',\n",
+                "        vka_path=vka_path, # TODO: Pass in private key and potentially create new command that both creates and registers the vka. Simplify testing pipeline for us and other folks. \n",
+                "    )\n",
+                "    assert res == True\n",
+                "        \n",
+                "    proof_path = os.path.join(name, \"proof.json\")\n",
+                "    res = await ezkl.verify_evm(\n",
+                "        addr,\n",
+                "        \"http://127.0.0.1:3030\",\n",
+                "        proof_path,\n",
+                "        vka_path = vka_path # TODO: Turn this from optional to required if we deprecate the orignal verifier. \n",
+                "        # TODO: Make it where the use only needs to deply a vka.  \n",
+                "    )\n",
+                "    assert res == True"
+            ]
+        }
+    ],
+    "metadata": {
+        "kernelspec": {
+            "display_name": ".env",
+            "language": "python",
+            "name": "python3"
+        },
+        "language_info": {
+            "codemirror_mode": {
+                "name": "ipython",
+                "version": 3
+            },
+            "file_extension": ".py",
+            "mimetype": "text/x-python",
+            "name": "python",
+            "nbconvert_exporter": "python",
+            "pygments_lexer": "ipython3",
+            "version": "3.11.5"
+        }
+    },
+    "nbformat": 4,
+    "nbformat_minor": 2
 }
--- a/examples/notebooks/set_membership.ipynb
+++ b/examples/notebooks/set_membership.ipynb
@@ -231,7 +231,7 @@
      "source": [
        "# now generate the witness file\n",
        "\n",
-        "res = await ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
+        "res = ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
        "assert os.path.isfile(witness_path)"
      ]
    },
@@ -267,7 +267,7 @@
        "    # Serialize data into file:\n",
        "json.dump( data, open(data_path_faulty, 'w' ))\n",
        "\n",
-        "res = await ezkl.gen_witness(data_path_faulty, compiled_model_path, witness_path_faulty)\n",
+        "res = ezkl.gen_witness(data_path_faulty, compiled_model_path, witness_path_faulty)\n",
        "assert os.path.isfile(witness_path_faulty)"
      ]
    },
@@ -312,7 +312,7 @@
        "# Serialize data into file:\n",
        "json.dump( data, open(data_path_truthy, 'w' ))\n",
        "\n",
-        "res = await ezkl.gen_witness(data_path_truthy, compiled_model_path, witness_path_truthy)\n",
+        "res = ezkl.gen_witness(data_path_truthy, compiled_model_path, witness_path_truthy)\n",
        "assert os.path.isfile(witness_path_truthy)"
      ]
    },
--- a/examples/notebooks/simple_demo_aggregated_proofs.ipynb
+++ b/examples/notebooks/simple_demo_aggregated_proofs.ipynb
@@ -171,7 +171,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\")"
            ]
        },
        {
@@ -205,7 +205,7 @@
            "source": [
                "# now generate the witness file \n",
                "\n",
-                "res = await ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
+                "res = ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
                "assert os.path.isfile(witness_path)"
            ]
        },
@@ -404,4 +404,4 @@
    },
    "nbformat": 4,
    "nbformat_minor": 5
-}
+}
--- a/examples/notebooks/simple_demo_all_public.ipynb
+++ b/examples/notebooks/simple_demo_all_public.ipynb
@@ -171,7 +171,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\")"
            ]
        },
        {
@@ -205,7 +205,7 @@
            "source": [
                "# now generate the witness file \n",
                "\n",
-                "res = await ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
+                "res = ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
                "assert os.path.isfile(witness_path)"
            ]
        },
@@ -304,4 +304,4 @@
    },
    "nbformat": 4,
    "nbformat_minor": 5
-}
+}
--- 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\")"
            ]
        },
        {
@@ -203,7 +203,7 @@
            "source": [
                "# now generate the witness file \n",
                "\n",
-                "res = await ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
+                "res = ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
                "assert os.path.isfile(witness_path)"
            ]
        },
@@ -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\")"
            ]
        },
        {
@@ -204,7 +204,7 @@
            "source": [
                "# now generate the witness file \n",
                "\n",
-                "res = await ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
+                "res = ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
                "assert os.path.isfile(witness_path)"
            ]
        },
@@ -303,4 +303,4 @@
    },
    "nbformat": 4,
    "nbformat_minor": 5
-}
+}
--- a/examples/notebooks/sklearn_mlp.ipynb
+++ b/examples/notebooks/sklearn_mlp.ipynb
@@ -149,7 +149,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\")"
            ]
        },
        {
@@ -183,7 +183,7 @@
            "source": [
                "# now generate the witness file \n",
                "\n",
-                "res = await ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
+                "res = ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
                "assert os.path.isfile(witness_path)"
            ]
        },
--- a/examples/notebooks/solvency.ipynb
+++ b/examples/notebooks/solvency.ipynb
@@ -298,7 +298,7 @@
        "\n",
        "witness_path = \"witness.json\"\n",
        "\n",
-        "res = await ezkl.gen_witness(data_path, compiled_model_path, witness_path, vk_path)\n",
+        "res = ezkl.gen_witness(data_path, compiled_model_path, witness_path, vk_path)\n",
        "assert os.path.isfile(witness_path)\n",
        "\n",
        "# we force the output to be 1 this corresponds to the solvency test being true -- and we set this to a fixed vis output\n",
@@ -412,7 +412,7 @@
      "source": [
        "# now generate the witness file\n",
        "\n",
-        "res = await ezkl.gen_witness(data_path_faulty, compiled_model_path, witness_path, vk_path)\n",
+        "res = ezkl.gen_witness(data_path_faulty, compiled_model_path, witness_path, vk_path)\n",
        "assert os.path.isfile(witness_path)\n",
        "\n",
        "# we force the output to be 1 this corresponds to the solvency test being true -- and we set this to a fixed vis output\n",
--- a/examples/notebooks/stacked_regression.ipynb
+++ b/examples/notebooks/stacked_regression.ipynb
@@ -167,7 +167,7 @@
                "res = ezkl.gen_settings(model_path, settings_path)\n",
                "assert res == True\n",
                "\n",
-                "res = await ezkl.calibrate_settings(data_path, model_path, settings_path, \"resources\")\n",
+                "res = ezkl.calibrate_settings(data_path, model_path, settings_path, \"resources\")\n",
                "assert res == True"
            ]
        },
@@ -187,7 +187,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\")"
            ]
        },
        {
@@ -221,7 +221,7 @@
            "source": [
                "# now generate the witness file \n",
                "\n",
-                "res = await ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
+                "res = ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
                "assert os.path.isfile(witness_path)"
            ]
        },
--- a/examples/notebooks/svm.ipynb
+++ b/examples/notebooks/svm.ipynb
@@ -152,7 +152,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\")"
            ]
        },
        {
@@ -186,7 +186,7 @@
            "source": [
                "# now generate the witness file \n",
                "\n",
-                "res = await ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
+                "res = ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
                "assert os.path.isfile(witness_path)"
            ]
        },
@@ -392,7 +392,7 @@
                "res = ezkl.gen_settings(model_path, settings_path)\n",
                "assert res == True\n",
                "\n",
-                "res = await ezkl.calibrate_settings(data_path, model_path, settings_path, \"resources\")\n",
+                "res = ezkl.calibrate_settings(data_path, model_path, settings_path, \"resources\")\n",
                "assert res == True"
            ]
        }
@@ -418,4 +418,4 @@
    },
    "nbformat": 4,
    "nbformat_minor": 5
-}
+}
--- a/examples/notebooks/tictactoe_autoencoder.ipynb
+++ b/examples/notebooks/tictactoe_autoencoder.ipynb
@@ -637,7 +637,7 @@
                "json.dump(data, open(cal_path, 'w'))\n",
                "\n",
                "\n",
-                "await ezkl.calibrate_settings(cal_path, model_path, settings_path, \"resources\", scales = [11])"
+                "ezkl.calibrate_settings(cal_path, model_path, settings_path, \"resources\", scales = [11])"
            ]
        },
        {
@@ -683,7 +683,7 @@
                "    data = json.load(f)\n",
                "    print(len(data['input_data'][0]))\n",
                "\n",
-                "await ezkl.gen_witness(data_path, compiled_model_path, witness_path)"
+                "ezkl.gen_witness(data_path, compiled_model_path, witness_path)"
            ]
        },
        {
@@ -758,4 +758,4 @@
    },
    "nbformat": 4,
    "nbformat_minor": 4
-}
+}
--- a/examples/notebooks/tictactoe_binary_classification.ipynb
+++ b/examples/notebooks/tictactoe_binary_classification.ipynb
@@ -525,7 +525,7 @@
                "json.dump(data, open(cal_path, 'w'))\n",
                "\n",
                "\n",
-                "await ezkl.calibrate_settings(cal_path, model_path, settings_path, \"resources\", scales = [4])"
+                "ezkl.calibrate_settings(cal_path, model_path, settings_path, \"resources\", scales = [4])"
            ]
        },
        {
@@ -572,7 +572,7 @@
                "    data = json.load(f)\n",
                "    print(len(data['input_data'][0]))\n",
                "\n",
-                "await ezkl.gen_witness(data_path, compiled_model_path, witness_path)"
+                "ezkl.gen_witness(data_path, compiled_model_path, witness_path)"
            ]
        },
        {
@@ -647,4 +647,4 @@
    },
    "nbformat": 4,
    "nbformat_minor": 4
-}
+}
--- a/examples/notebooks/univ3-da.ipynb
+++ b/examples/notebooks/univ3-da.ipynb
@@ -1,685 +0,0 @@
-{
-    "cells": [
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "# univ3-da-ezkl\n",
-                "\n",
-                "Here's an example leveraging EZKL whereby the inputs to the model are read and attested to from an on-chain source. For this setup we make a single call to a view function that returns an array of UniV3 historical TWAP price data that we will attest to on-chain. \n"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "First we import the necessary dependencies and set up logging to be as informative as possible. "
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": 1,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "# check if notebook is in colab\n",
-                "try:\n",
-                "    # install ezkl\n",
-                "    import google.colab\n",
-                "    import subprocess\n",
-                "    import sys\n",
-                "    subprocess.check_call([sys.executable, \"-m\", \"pip\", \"install\", \"ezkl\"])\n",
-                "    subprocess.check_call([sys.executable, \"-m\", \"pip\", \"install\", \"onnx\"])\n",
-                "\n",
-                "# rely on local installation of ezkl if the notebook is not in colab\n",
-                "except:\n",
-                "    pass\n",
-                "\n",
-                "\n",
-                "from torch import nn\n",
-                "import ezkl\n",
-                "import os\n",
-                "import json\n",
-                "import logging\n",
-                "\n",
-                "# uncomment for more descriptive logging \n",
-                "FORMAT = '%(levelname)s %(name)s %(asctime)-15s %(filename)s:%(lineno)d %(message)s'\n",
-                "logging.basicConfig(format=FORMAT)\n",
-                "logging.getLogger().setLevel(logging.DEBUG)\n"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "Now we define our model. It is a very simple PyTorch model that has just one layer, an average pooling 2D layer. "
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": 2,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "import torch\n",
-                "# Defines the model\n",
-                "\n",
-                "class MyModel(nn.Module):\n",
-                "    def __init__(self):\n",
-                "        super(MyModel, self).__init__()\n",
-                "        self.layer = nn.AvgPool2d(2, 1, (1, 1))\n",
-                "\n",
-                "    def forward(self, x):\n",
-                "        return self.layer(x)[0]\n",
-                "\n",
-                "\n",
-                "circuit = MyModel()\n",
-                "\n",
-                "# this is where you'd train your model"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "We omit training for purposes of this demonstration. We've marked where training would happen in the cell above. \n",
-                "Now we export the model to onnx and create a corresponding (randomly generated) input. This input data will eventually be stored on chain and read from according to the call_data field in the graph input.\n",
-                "\n",
-                "You can replace the random `x` with real data if you so wish. "
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": 3,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "x = 0.1*torch.rand(1,*[3, 2, 2], requires_grad=True)\n",
-                "\n",
-                "# Flips the neural net into inference mode\n",
-                "circuit.eval()\n",
-                "\n",
-                "    # Export the model\n",
-                "torch.onnx.export(circuit,               # model being run\n",
-                "                      x,                   # model input (or a tuple for multiple inputs)\n",
-                "                      \"network.onnx\",            # where to save the model (can be a file or file-like object)\n",
-                "                      export_params=True,        # store the trained parameter weights inside the model file\n",
-                "                      opset_version=10,          # the ONNX version to export the model to\n",
-                "                      do_constant_folding=True,  # whether to execute constant folding for optimization\n",
-                "                      input_names = ['input'],   # the model's input names\n",
-                "                      output_names = ['output'], # the model's output names\n",
-                "                      dynamic_axes={'input' : {0 : 'batch_size'},    # variable length axes\n",
-                "                                    'output' : {0 : 'batch_size'}})\n",
-                "\n",
-                "data_array = ((x).detach().numpy()).reshape([-1]).tolist()\n",
-                "\n",
-                "data = dict(input_data = [data_array])\n",
-                "\n",
-                "    # Serialize data into file:\n",
-                "json.dump(data, open(\"input.json\", 'w' ))\n",
-                "\n"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "We now define a function that will create a new anvil instance which we will deploy our test contract too. This contract will contain in its storage the data that we will read from and attest to. In production you would not need to set up a local anvil instance. Instead you would replace RPC_URL with the actual RPC endpoint of the chain you are deploying your verifiers too, reading from the data on said chain."
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": 4,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "import subprocess\n",
-                "import time\n",
-                "import threading\n",
-                "\n",
-                "# make sure anvil is running locally\n",
-                "# $ anvil -p 3030\n",
-                "\n",
-                "RPC_URL = \"http://localhost:3030\"\n",
-                "\n",
-                "# Save process globally\n",
-                "anvil_process = None\n",
-                "\n",
-                "def start_anvil():\n",
-                "    global anvil_process\n",
-                "    if anvil_process is None:\n",
-                "        anvil_process = subprocess.Popen([\"anvil\", \"-p\", \"3030\", \"--fork-url\", \"https://arb1.arbitrum.io/rpc\", \"--code-size-limit=41943040\"])\n",
-                "        if anvil_process.returncode is not None:\n",
-                "            raise Exception(\"failed to start anvil process\")\n",
-                "        time.sleep(3)\n",
-                "\n",
-                "def stop_anvil():\n",
-                "    global anvil_process\n",
-                "    if anvil_process is not None:\n",
-                "        anvil_process.terminate()\n",
-                "        anvil_process = None\n"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "We define our `PyRunArgs` objects which contains the visibility parameters for out model. \n",
-                "- `input_visibility` defines the visibility of the model inputs\n",
-                "- `param_visibility` defines the visibility of the model weights and constants and parameters \n",
-                "- `output_visibility` defines the visibility of the model outputs\n",
-                "\n",
-                "Here we create the following setup:\n",
-                "- `input_visibility`: \"public\"\n",
-                "- `param_visibility`: \"private\"\n",
-                "- `output_visibility`: public\n"
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": 5,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "import ezkl\n",
-                "\n",
-                "model_path = os.path.join('network.onnx')\n",
-                "compiled_model_path = os.path.join('network.compiled')\n",
-                "pk_path = os.path.join('test.pk')\n",
-                "vk_path = os.path.join('test.vk')\n",
-                "settings_path = os.path.join('settings.json')\n",
-                "srs_path = os.path.join('kzg.srs')\n",
-                "data_path = os.path.join('input.json')\n",
-                "\n",
-                "run_args = ezkl.PyRunArgs()\n",
-                "run_args.input_visibility = \"public\"\n",
-                "run_args.param_visibility = \"private\"\n",
-                "run_args.output_visibility = \"public\"\n",
-                "run_args.decomp_legs=5\n",
-                "run_args.num_inner_cols = 1\n",
-                "run_args.variables = [(\"batch_size\", 1)]"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "Now we generate a settings file. This file basically instantiates a bunch of parameters that determine their circuit shape, size etc... Because of the way we represent nonlinearities in the circuit (using Halo2's [lookup tables](https://zcash.github.io/halo2/design/proving-system/lookup.html)), it is often best to _calibrate_ this settings file as some data can fall out of range of these lookups.\n",
-                "\n",
-                "You can pass a dataset for calibration that will be representative of real inputs you might find if and when you deploy the prover. Here we create a dummy calibration dataset for demonstration purposes. "
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "# TODO: Dictionary outputs\n",
-                "res = ezkl.gen_settings(model_path, settings_path, py_run_args=run_args)\n",
-                "assert res == True"
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "# generate a bunch of dummy calibration data\n",
-                "cal_data = {\n",
-                "    \"input_data\": [(0.1*torch.rand(2, *[3, 2, 2])).flatten().tolist()],\n",
-                "}\n",
-                "\n",
-                "cal_path = os.path.join('val_data.json')\n",
-                "# save as json file\n",
-                "with open(cal_path, \"w\") as f:\n",
-                "    json.dump(cal_data, f)\n",
-                "\n",
-                "res = await ezkl.calibrate_settings(cal_path, model_path, settings_path, \"resources\")"
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "res = ezkl.compile_circuit(model_path, compiled_model_path, settings_path)\n",
-                "assert res == True"
-            ]
-        },
-        {
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "The graph input for on chain data sources is formatted completely differently compared to file based data sources.\n",
-                "\n",
-                "- For file data sources, the raw floating point values that eventually get quantized, converted into field elements and stored in `witness.json` to be consumed by the circuit are stored. The output data contains the expected floating point values returned as outputs from running your vanilla pytorch model on the given inputs.\n",
-                "- For on chain data sources, the input_data field contains all the data necessary to read and format the on chain data into something digestable by EZKL (aka field elements :-D). \n",
-                "Here is what the schema for an on-chain data source graph input file should look like for a single call data source:\n",
-                "    \n",
-                "```json\n",
-                "{\n",
-                "    \"input_data\": {\n",
-                "        \"rpc\": \"http://localhost:3030\", // The rpc endpoint of the chain you are deploying your verifier to\n",
-                "        \"call\": {\n",
-                "            \"call_data\": \"1f3be514000000000000000000000000c6962004f452be9203591991d15f6b388e09e8d00000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000070000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000\", // The abi encoded call data to a view function that returns an array of on-chain data points we are attesting to. \n",
-                "            \"decimals\": 0, // The number of decimal places of the large uint256 value. This is our way of representing large wei values as floating points on chain, since the evm only natively supports integer values.\n",
-                "            \"address\": \"9A213F53334279C128C37DA962E5472eCD90554f\", // The address of the contract that we are calling to get the data. \n",
-                "            \"len\": 12 // The number of data points returned by the view function (the length of the array)\n",
-                "        }\n",
-                "    }\n",
-                "}\n",
-                "```"
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "from web3 import Web3, HTTPProvider\n",
-                "from solcx import compile_standard\n",
-                "from decimal import Decimal\n",
-                "import json\n",
-                "import os\n",
-                "import torch\n",
-                "import requests\n",
-                "\n",
-                "def count_decimal_places(num):\n",
-                "    num_str = str(num)\n",
-                "    if '.' in num_str:\n",
-                "        return len(num_str) - 1 - num_str.index('.')\n",
-                "    else:\n",
-                "        return 0\n",
-                "\n",
-                "w3 = Web3(HTTPProvider(RPC_URL)) \n",
-                "\n",
-                "def on_chain_data(tensor):\n",
-                "    data = tensor.view(-1).tolist()\n",
-                "    secondsAgo = [len(data) - 1 - i for i in range(len(data))]\n",
-                "\n",
-                "    contract_source_code = '''\n",
-                "    // SPDX-License-Identifier: MIT\n",
-                "    pragma solidity ^0.8.20;\n",
-                "\n",
-                "    interface IUniswapV3PoolDerivedState {\n",
-                "        function observe(\n",
-                "            uint32[] calldata secondsAgos\n",
-                "        ) external view returns (\n",
-                "            int56[] memory tickCumulatives,\n",
-                "            uint160[] memory secondsPerLiquidityCumulativeX128s\n",
-                "        );\n",
-                "    }\n",
-                "\n",
-                "    contract UniTickAttestor {\n",
-                "        int256[] private cachedTicks;\n",
-                "\n",
-                "        function consult(\n",
-                "            IUniswapV3PoolDerivedState pool,\n",
-                "            uint32[] memory secondsAgo\n",
-                "        ) public view returns (int256[] memory tickCumulatives) {\n",
-                "            tickCumulatives = new int256[](secondsAgo.length);\n",
-                "            (int56[] memory _ticks,) = pool.observe(secondsAgo);\n",
-                "            for (uint256 i = 0; i < secondsAgo.length; i++) {\n",
-                "                tickCumulatives[i] = int256(_ticks[i]);\n",
-                "            }\n",
-                "        }\n",
-                "\n",
-                "        function cache_price(\n",
-                "            IUniswapV3PoolDerivedState pool,\n",
-                "            uint32[] memory secondsAgo\n",
-                "        ) public {\n",
-                "            (int56[] memory _ticks,) = pool.observe(secondsAgo);\n",
-                "            cachedTicks = new int256[](_ticks.length);\n",
-                "            for (uint256 i = 0; i < _ticks.length; i++) {\n",
-                "                cachedTicks[i] = int256(_ticks[i]);\n",
-                "            }\n",
-                "        }\n",
-                "\n",
-                "        function readPriceCache() public view returns (int256[] memory) {\n",
-                "            return cachedTicks;\n",
-                "        }\n",
-                "    }\n",
-                "    '''\n",
-                "\n",
-                "    compiled_sol = compile_standard({\n",
-                "        \"language\": \"Solidity\",\n",
-                "        \"sources\": {\"UniTickAttestor.sol\": {\"content\": contract_source_code}},\n",
-                "        \"settings\": {\"outputSelection\": {\"*\": {\"*\": [\"metadata\", \"evm.bytecode\", \"abi\"]}}}\n",
-                "    })\n",
-                "\n",
-                "    bytecode = compiled_sol['contracts']['UniTickAttestor.sol']['UniTickAttestor']['evm']['bytecode']['object']\n",
-                "    abi = json.loads(compiled_sol['contracts']['UniTickAttestor.sol']['UniTickAttestor']['metadata'])['output']['abi']\n",
-                "\n",
-                "    # Deploy contract\n",
-                "    UniTickAttestor = w3.eth.contract(abi=abi, bytecode=bytecode)\n",
-                "    tx_hash = UniTickAttestor.constructor().transact()\n",
-                "    tx_receipt = w3.eth.wait_for_transaction_receipt(tx_hash)\n",
-                "    contract = w3.eth.contract(address=tx_receipt['contractAddress'], abi=abi)\n",
-                "\n",
-                "    # Step 4: Store data via cache_price transaction\n",
-                "    tx_hash = contract.functions.cache_price(\n",
-                "        \"0xC6962004f452bE9203591991D15f6b388e09E8D0\",\n",
-                "        secondsAgo\n",
-                "    ).transact()\n",
-                "    tx_receipt = w3.eth.wait_for_transaction_receipt(tx_hash)\n",
-                "\n",
-                "    # Step 5: Prepare calldata for readPriceCache\n",
-                "    call = contract.functions.readPriceCache().build_transaction()\n",
-                "    calldata = call['data'][2:]\n",
-                "\n",
-                "    # Get stored data\n",
-                "    result = contract.functions.readPriceCache().call()\n",
-                "    print(f'Cached ticks: {result}')\n",
-                "\n",
-                "    decimals = [0] * len(data)\n",
-                "\n",
-                "    call_to_account = {\n",
-                "        'call_data': calldata,\n",
-                "        'decimals': decimals,\n",
-                "        'address': contract.address[2:],\n",
-                "    }\n",
-                "\n",
-                "    return call_to_account\n",
-                "\n",
-                "start_anvil()\n",
-                "call_to_account = on_chain_data(x)\n",
-                "\n",
-                "data = dict(input_data =  {'rpc': RPC_URL, 'call': call_to_account })\n",
-                "json.dump(data, open(\"input.json\", 'w'))"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "As we use Halo2 with KZG-commitments we need an SRS string from (preferably) a multi-party trusted setup ceremony. For an overview of the procedures for such a ceremony check out [this page](https://blog.ethereum.org/2023/01/16/announcing-kzg-ceremony). The `get_srs` command retrieves a correctly sized SRS given the calibrated settings file from [here](https://github.com/han0110/halo2-kzg-srs). \n",
-                "\n",
-                "These SRS were generated with [this](https://github.com/privacy-scaling-explorations/perpetualpowersoftau) ceremony. "
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "res = await ezkl.get_srs( settings_path)"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "We now need to generate the circuit witness. These are the model outputs (and any hashes) that are generated when feeding the previously generated `input.json` through the circuit / model. "
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "# !export RUST_BACKTRACE=1\n",
-                "\n",
-                "witness_path = \"witness.json\"\n",
-                "\n",
-                "res = await ezkl.gen_witness(data_path, compiled_model_path, witness_path)"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "Here we setup verifying and proving keys for the circuit. As the name suggests the proving key is needed for ... proving and the verifying key is needed for ... verifying. "
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "# HERE WE SETUP THE CIRCUIT PARAMS\n",
-                "# WE GOT KEYS\n",
-                "# WE GOT CIRCUIT PARAMETERS\n",
-                "# EVERYTHING ANYONE HAS EVER NEEDED FOR ZK\n",
-                "res = ezkl.setup(\n",
-                "        compiled_model_path,\n",
-                "        vk_path,\n",
-                "        pk_path,\n",
-                "    )\n",
-                "\n",
-                "assert res == True\n",
-                "assert os.path.isfile(vk_path)\n",
-                "assert os.path.isfile(pk_path)\n",
-                "assert os.path.isfile(settings_path)"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "Now we generate a full proof. "
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "# GENERATE A PROOF\n",
-                "\n",
-                "proof_path = os.path.join('test.pf')\n",
-                "\n",
-                "res = ezkl.prove(\n",
-                "        witness_path,\n",
-                "        compiled_model_path,\n",
-                "        pk_path,\n",
-                "        proof_path,\n",
-                "        \"single\",\n",
-                "    )\n",
-                "\n",
-                "print(res)\n",
-                "assert os.path.isfile(proof_path)"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "And verify it as a sanity check. "
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "# VERIFY IT\n",
-                "\n",
-                "res = ezkl.verify(\n",
-                "        proof_path,\n",
-                "        settings_path,\n",
-                "        vk_path,\n",
-                "    )\n",
-                "\n",
-                "assert res == True\n",
-                "print(\"verified\")"
-            ]
-        },
-        {
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "We can now create and then deploy a vanilla evm verifier."
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "abi_path = 'test.abi'\n",
-                "sol_code_path = 'test.sol'\n",
-                "\n",
-                "res = await ezkl.create_evm_verifier(\n",
-                "        vk_path,\n",
-                "        settings_path,\n",
-                "        sol_code_path,\n",
-                "        abi_path,\n",
-                "    )\n",
-                "assert res == True"
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "import json\n",
-                "\n",
-                "addr_path_verifier = \"addr_verifier.txt\"\n",
-                "\n",
-                "res = await ezkl.deploy_evm(\n",
-                "    addr_path_verifier,\n",
-                "    'http://127.0.0.1:3030',\n",
-                "    sol_code_path,\n",
-                ")\n",
-                "\n",
-                "assert res == True"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "With the vanilla verifier deployed, we can now create the data attestation contract, which will read in the instances from the calldata to the verifier, attest to them, call the verifier and then return the result. "
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "\n",
-                "abi_path = 'test.abi'\n",
-                "sol_code_path = 'test.sol'\n",
-                "input_path = 'input.json'\n",
-                "\n",
-                "res = await ezkl.create_evm_data_attestation(\n",
-                "        input_path,\n",
-                "        settings_path,\n",
-                "        sol_code_path,\n",
-                "        abi_path,\n",
-                "    )"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "Now we can deploy the data attest verifier contract. For security reasons, this binding will only deploy to a local anvil instance, using accounts generated by anvil. \n",
-                "So should only be used for testing purposes."
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "addr_path_da = \"addr_da.txt\"\n",
-                "\n",
-                "res = await ezkl.deploy_da_evm(\n",
-                "        addr_path_da,\n",
-                "        input_path,\n",
-                "        RPC_URL,\n",
-                "        settings_path,\n",
-                "        sol_code_path,\n",
-                "    )\n"
-            ]
-        },
-        {
-            "attachments": {},
-            "cell_type": "markdown",
-            "metadata": {},
-            "source": [
-                "Here we need to regenerate the witness, prove and then verify all within the same cell. This is because we want to reduce the amount of latency between reading on-chain state and verifying it on-chain. This is because the attest input values read from the oracle are time sensitive (their values are derived from computing on block.timestamp) and can change between the time of reading and the time of verifying.\n",
-                "\n",
-                "Call the view only verify method on the contract to verify the proof. Since it is a view function this is safe to use in production since you don't have to pass your private key."
-            ]
-        },
-        {
-            "cell_type": "code",
-            "execution_count": null,
-            "metadata": {},
-            "outputs": [],
-            "source": [
-                "# !export RUST_BACKTRACE=1\n",
-                "\n",
-                "# print(res)\n",
-                "assert os.path.isfile(proof_path)\n",
-                "# read the verifier address\n",
-                "addr_verifier = None\n",
-                "with open(addr_path_verifier, 'r') as f:\n",
-                "    addr = f.read()\n",
-                "#read the data attestation address\n",
-                "addr_da = None\n",
-                "with open(addr_path_da, 'r') as f:\n",
-                "    addr_da = f.read()\n",
-                "\n",
-                "res = await ezkl.verify_evm(\n",
-                "    addr,\n",
-                "    RPC_URL,\n",
-                "    proof_path,\n",
-                "    addr_da,\n",
-                ")"
-            ]
-        }
-    ],
-    "metadata": {
-        "kernelspec": {
-            "display_name": ".env",
-            "language": "python",
-            "name": "python3"
-        },
-        "language_info": {
-            "codemirror_mode": {
-                "name": "ipython",
-                "version": 3
-            },
-            "file_extension": ".py",
-            "mimetype": "text/x-python",
-            "name": "python",
-            "nbconvert_exporter": "python",
-            "pygments_lexer": "ipython3",
-            "version": "3.11.5"
-        },
-        "orig_nbformat": 4
-    },
-    "nbformat": 4,
-    "nbformat_minor": 2
-}
--- a/examples/notebooks/variance.ipynb
+++ b/examples/notebooks/variance.ipynb
@@ -458,7 +458,7 @@
        "\n",
        "\n",
        "ezkl.gen_settings(onnx_filename, settings_filename)\n",
-        "await ezkl.calibrate_settings(\n",
+        "ezkl.calibrate_settings(\n",
        "    input_filename, onnx_filename, settings_filename, \"resources\", scales = [4])\n",
        "res = await ezkl.get_srs(settings_filename)\n",
        "ezkl.compile_circuit(onnx_filename, compiled_filename, settings_filename)\n",
@@ -527,7 +527,7 @@
        "\n",
        "witness_path = \"witness.json\"\n",
        "\n",
-        "res = await ezkl.gen_witness(input_filename, compiled_filename, witness_path)\n",
+        "res = ezkl.gen_witness(input_filename, compiled_filename, witness_path)\n",
        "assert os.path.isfile(witness_path)"
      ]
    },
@@ -762,4 +762,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 0
-}
+}
--- a/examples/notebooks/voice_judge.ipynb
+++ b/examples/notebooks/voice_judge.ipynb
@@ -629,7 +629,7 @@
            "source": [
                "\n",
                "\n",
-                "res = await ezkl.calibrate_settings(val_data, model_path, settings_path, \"resources\", scales = [4])\n",
+                "res = ezkl.calibrate_settings(val_data, model_path, settings_path, \"resources\", scales = [4])\n",
                "assert res == True\n",
                "print(\"verified\")\n"
            ]
@@ -680,7 +680,7 @@
                "\n",
                "witness_path = \"witness.json\"\n",
                "\n",
-                "res = await ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
+                "res = ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
                "assert os.path.isfile(witness_path)"
            ]
        },
@@ -905,4 +905,4 @@
    },
    "nbformat": 4,
    "nbformat_minor": 2
-}
+}
--- a/examples/notebooks/world_rotation.ipynb
+++ b/examples/notebooks/world_rotation.ipynb
@@ -1,539 +0,0 @@
-{
- "cells": [
-  {
-   "attachments": {},
-   "cell_type": "markdown",
-   "id": "cf69bb3f-94e6-4dba-92cd-ce08df117d67",
-   "metadata": {},
-   "source": [
-    "## World rotation\n",
-    "\n",
-    "Here we demonstrate how to use the EZKL package to rotate an on-chain world. \n",
-    "\n",
-    "![zk-gaming-diagram-transformed](https://hackmd.io/_uploads/HkApuQGV6.png)\n",
-    "> **A typical ZK application flow**. For the shape rotators out there — this is an easily digestible example. A user computes a ZK-proof that they have calculated a valid rotation of a world. They submit this proof to a verifier contract which governs an on-chain world, along with a new set of coordinates, and the world rotation updates. Observe that it’s possible for one player to initiate a *global* change.\n"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "95613ee9",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# check if notebook is in colab\n",
-    "try:\n",
-    "    # install ezkl\n",
-    "    import google.colab\n",
-    "    import subprocess\n",
-    "    import sys\n",
-    "    subprocess.check_call([sys.executable, \"-m\", \"pip\", \"install\", \"ezkl\"])\n",
-    "    subprocess.check_call([sys.executable, \"-m\", \"pip\", \"install\", \"onnx\"])\n",
-    "\n",
-    "# rely on local installation of ezkl if the notebook is not in colab\n",
-    "except:\n",
-    "    pass\n",
-    "\n"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "from torch import nn\n",
-    "import ezkl\n",
-    "import os\n",
-    "import json\n",
-    "import torch\n",
-    "import math\n",
-    "\n",
-    "# these are constants for the rotation\n",
-    "phi = torch.tensor(5 * math.pi / 180)\n",
-    "s = torch.sin(phi)\n",
-    "c = torch.cos(phi)\n",
-    "\n",
-    "\n",
-    "class RotateStuff(nn.Module):\n",
-    "    def __init__(self):\n",
-    "        super(RotateStuff, self).__init__()\n",
-    "\n",
-    "        # create a rotation matrix -- the matrix is constant and is transposed for convenience\n",
-    "        self.rot = torch.stack([torch.stack([c, -s]),\n",
-    "                   torch.stack([s, c])]).t()\n",
-    "\n",
-    "    def forward(self, x):\n",
-    "        x_rot = x @ self.rot   # same as x_rot = (rot @ x.t()).t() due to rot in O(n) (SO(n) even)\n",
-    "        return x_rot\n",
-    "\n",
-    "\n",
-    "circuit = RotateStuff()"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "This will showcase the principle directions of rotation by plotting the rotation of a single unit vector."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "from matplotlib import pyplot\n",
-    "pyplot.figure(figsize=(3, 3))\n",
-    "pyplot.arrow(0, 0, 1, 0, width=0.02, alpha=0.5)\n",
-    "pyplot.arrow(0, 0, 0, 1, width=0.02, alpha=0.5)\n",
-    "pyplot.arrow(0, 0, circuit.rot[0, 0].item(), circuit.rot[0, 1].item(), width=0.02)\n",
-    "pyplot.arrow(0, 0, circuit.rot[1, 0].item(), circuit.rot[1, 1].item(), width=0.02)\n"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "b37637c4",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "model_path = os.path.join('network.onnx')\n",
-    "compiled_model_path = os.path.join('network.compiled')\n",
-    "pk_path = os.path.join('test.pk')\n",
-    "vk_path = os.path.join('test.vk')\n",
-    "settings_path = os.path.join('settings.json')\n",
-    "srs_path = os.path.join('kzg.srs')\n",
-    "witness_path = os.path.join('witness.json')\n",
-    "data_path = os.path.join('input.json')"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "82db373a",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "\n",
-    "\n",
-    "# initial principle vectors for the rotation are as in the plot above\n",
-    "x = torch.tensor([[1, 0], [0, 1]], dtype=torch.float32)\n",
-    "\n",
-    "# Flips the neural net into inference mode\n",
-    "circuit.eval()\n",
-    "\n",
-    "    # Export the model\n",
-    "torch.onnx.export(circuit,               # model being run\n",
-    "                      x,                   # model input (or a tuple for multiple inputs)\n",
-    "                      model_path,            # where to save the model (can be a file or file-like object)\n",
-    "                      export_params=True,        # store the trained parameter weights inside the model file\n",
-    "                      opset_version=10,          # the ONNX version to export the model to\n",
-    "                      do_constant_folding=True,  # whether to execute constant folding for optimization\n",
-    "                      input_names = ['input'],   # the model's input names\n",
-    "                      output_names = ['output'], # the model's output names\n",
-    "                      )\n",
-    "\n",
-    "data_array = ((x).detach().numpy()).reshape([-1]).tolist()\n",
-    "\n",
-    "data = dict(input_data = [data_array])\n",
-    "\n",
-    "    # Serialize data into file:\n",
-    "json.dump( data, open(data_path, 'w' ))\n"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "### World rotation in 2D on-chain"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "For demo purposes we deploy these coordinates to a contract running locally using Anvil. This creates our on-chain world. We then rotate the world using the EZKL package and submit the proof to the contract. The contract then updates the world rotation. For demo purposes we do this repeatedly, rotating the world by 1 transform each time."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import subprocess\n",
-    "import time\n",
-    "import threading\n",
-    "\n",
-    "# make sure anvil is running locally\n",
-    "# $ anvil -p 3030\n",
-    "\n",
-    "RPC_URL = \"http://localhost:3030\"\n",
-    "\n",
-    "# Save process globally\n",
-    "anvil_process = None\n",
-    "\n",
-    "def start_anvil():\n",
-    "    global anvil_process\n",
-    "    if anvil_process is None:\n",
-    "        anvil_process = subprocess.Popen([\"anvil\", \"-p\", \"3030\", \"--code-size-limit=41943040\"])\n",
-    "        if anvil_process.returncode is not None:\n",
-    "            raise Exception(\"failed to start anvil process\")\n",
-    "        time.sleep(3)\n",
-    "\n",
-    "def stop_anvil():\n",
-    "    global anvil_process\n",
-    "    if anvil_process is not None:\n",
-    "        anvil_process.terminate()\n",
-    "        anvil_process = None\n"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "We define our `PyRunArgs` objects which contains the visibility parameters for out model. \n",
-    "- `input_visibility` defines the visibility of the model inputs\n",
-    "- `param_visibility` defines the visibility of the model weights and constants and parameters \n",
-    "- `output_visibility` defines the visibility of the model outputs\n",
-    "\n",
-    "Here we create the following setup:\n",
-    "- `input_visibility`: \"public\"\n",
-    "- `param_visibility`: \"fixed\"\n",
-    "- `output_visibility`: public"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "d5e374a2",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "py_run_args = ezkl.PyRunArgs()\n",
-    "py_run_args.input_visibility = \"public\"\n",
-    "py_run_args.output_visibility = \"public\"\n",
-    "py_run_args.param_visibility = \"private\" # private by default\n",
-    "py_run_args.scale_rebase_multiplier = 10\n",
-    "\n",
-    "res = ezkl.gen_settings(model_path, settings_path, py_run_args=py_run_args)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "3aa4f090",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "res = ezkl.compile_circuit(model_path, compiled_model_path, settings_path)\n",
-    "assert res == True"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "We also define a contract that holds out test data. This contract will contain in its storage the data that we will read from and attest to. In production you would not need to set up a local anvil instance. Instead you would replace RPC_URL with the actual RPC endpoint of the chain you are deploying your verifiers too, reading from the data on said chain."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "2007dc77",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "ezkl.setup_test_evm_data(\n",
-    "    data_path,\n",
-    "    compiled_model_path,\n",
-    "    # we write the call data to the same file as the input data\n",
-    "    data_path,\n",
-    "    input_source=ezkl.PyTestDataSource.OnChain,\n",
-    "    output_source=ezkl.PyTestDataSource.File,\n",
-    "    rpc_url=RPC_URL)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "ab993958",
-   "metadata": {},
-   "source": [
-    "As we use Halo2 with KZG-commitments we need an SRS string from (preferably) a multi-party trusted setup ceremony. For an overview of the procedures for such a ceremony check out [this page](https://blog.ethereum.org/2023/01/16/announcing-kzg-ceremony). The `get_srs` command retrieves a correctly sized SRS given the calibrated settings file from [here](https://github.com/han0110/halo2-kzg-srs). \n",
-    "\n",
-    "These SRS were generated with [this](https://github.com/privacy-scaling-explorations/perpetualpowersoftau) ceremony. "
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "8b74dcee",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# srs path\n",
-    "res = await ezkl.get_srs( settings_path)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "18c8b7c7",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# now generate the witness file \n",
-    "\n",
-    "witness = await ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
-    "assert os.path.isfile(witness_path)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "ad58432e",
-   "metadata": {},
-   "source": [
-    "Here we setup verifying and proving keys for the circuit. As the name suggests the proving key is needed for ... proving and the verifying key is needed for ... verifying. "
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "b1c561a8",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "res = ezkl.setup(\n",
-    "        compiled_model_path,\n",
-    "        vk_path,\n",
-    "        pk_path,\n",
-    "        \n",
-    "    )\n",
-    "\n",
-    "assert res == True\n",
-    "assert os.path.isfile(vk_path)\n",
-    "assert os.path.isfile(pk_path)\n",
-    "assert os.path.isfile(settings_path)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "1746c8d1",
-   "metadata": {},
-   "source": [
-    "We can now create an EVM verifier contract from our circuit. This contract will be deployed to the chain we are using. In this case we are using a local anvil instance."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "d1920c0f",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "abi_path = 'test.abi'\n",
-    "sol_code_path = 'test.sol'\n",
-    "\n",
-    "res = await ezkl.create_evm_verifier(\n",
-    "        vk_path,\n",
-    "        settings_path,\n",
-    "        sol_code_path,\n",
-    "        abi_path,\n",
-    "    )\n",
-    "assert res == True"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "0fd7f22b",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import json\n",
-    "\n",
-    "addr_path_verifier = \"addr_verifier.txt\"\n",
-    "\n",
-    "res = await ezkl.deploy_evm(\n",
-    "    addr_path_verifier,\n",
-    "    'http://127.0.0.1:3030',\n",
-    "    sol_code_path,\n",
-    ")\n",
-    "\n",
-    "assert res == True"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "9c0dffab",
-   "metadata": {},
-   "source": [
-    "With the vanilla verifier deployed, we can now create the data attestation contract, which will read in the instances from the calldata to the verifier, attest to them, call the verifier and then return the result. \n",
-    "\n"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "c2db14d7",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "abi_path = 'test.abi'\n",
-    "sol_code_path = 'test.sol'\n",
-    "input_path = 'input.json'\n",
-    "\n",
-    "res = await ezkl.create_evm_data_attestation(\n",
-    "        input_path,\n",
-    "        settings_path,\n",
-    "        sol_code_path,\n",
-    "        abi_path,\n",
-    "    )"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "5a018ba6",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "addr_path_da = \"addr_da.txt\"\n",
-    "\n",
-    "res = await ezkl.deploy_da_evm(\n",
-    "        addr_path_da,\n",
-    "        input_path,\n",
-    "        RPC_URL,\n",
-    "        settings_path,\n",
-    "        sol_code_path,\n",
-    "    )"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "2adad845",
-   "metadata": {},
-   "source": [
-    "Now we can pull in the data from the contract and calculate a new set of coordinates. We then rotate the world by 1 transform and submit the proof to the contract. The contract could then update the world rotation (logic not inserted here). For demo purposes we do this repeatedly, rotating the world by 1 transform. "
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "c384cbc8",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# GENERATE A PROOF\n",
-    "\n",
-    "\n",
-    "proof_path = os.path.join('test.pf')\n",
-    "\n",
-    "res = ezkl.prove(\n",
-    "        witness_path,\n",
-    "        compiled_model_path,\n",
-    "        pk_path,\n",
-    "        proof_path,\n",
-    "        \n",
-    "        \"single\",\n",
-    "    )\n",
-    "\n",
-    "print(res)\n",
-    "assert os.path.isfile(proof_path)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "90eda56e",
-   "metadata": {},
-   "source": [
-    "Call the view only verify method on the contract to verify the proof. Since it is a view function this is safe to use in production since you don't have to pass your private key."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "76f00d41",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# read the verifier address\n",
-    "addr_verifier = None\n",
-    "with open(addr_path_verifier, 'r') as f:\n",
-    "    addr = f.read()\n",
-    "#read the data attestation address\n",
-    "addr_da = None\n",
-    "with open(addr_path_da, 'r') as f:\n",
-    "    addr_da = f.read()\n",
-    "\n",
-    "res = ezkl.verify_evm(\n",
-    "    addr,\n",
-    "    RPC_URL,\n",
-    "    proof_path,\n",
-    "    addr_da,\n",
-    ")"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "As a sanity check lets plot the rotations of the unit vectors. We can see that the unit vectors rotate as expected by the output of the circuit. "
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "witness['outputs'][0][0]"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "settings = json.load(open(settings_path, 'r'))\n",
-    "out_scale = settings[\"model_output_scales\"][0]\n",
-    "\n",
-    "from matplotlib import pyplot\n",
-    "pyplot.figure(figsize=(3, 3))\n",
-    "pyplot.arrow(0, 0, 1, 0, width=0.02, alpha=0.5)\n",
-    "pyplot.arrow(0, 0, 0, 1, width=0.02, alpha=0.5)\n",
-    "\n",
-    "arrow_x = ezkl.felt_to_float(witness['outputs'][0][0], out_scale)\n",
-    "arrow_y = ezkl.felt_to_float(witness['outputs'][0][1], out_scale)\n",
-    "pyplot.arrow(0, 0, arrow_x, arrow_y, width=0.02)\n",
-    "arrow_x = ezkl.felt_to_float(witness['outputs'][0][2], out_scale)\n",
-    "arrow_y = ezkl.felt_to_float(witness['outputs'][0][3], out_scale)\n",
-    "pyplot.arrow(0, 0, arrow_x, arrow_y, width=0.02)"
-   ]
-  }
- ],
- "metadata": {
-  "kernelspec": {
-   "display_name": ".env",
-   "language": "python",
-   "name": "python3"
-  },
-  "language_info": {
-   "codemirror_mode": {
-    "name": "ipython",
-    "version": 3
-   },
-   "file_extension": ".py",
-   "mimetype": "text/x-python",
-   "name": "python",
-   "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.12.9"
-  }
- },
- "nbformat": 4,
- "nbformat_minor": 5
-}
--- a/examples/notebooks/xgboost.ipynb
+++ b/examples/notebooks/xgboost.ipynb
@@ -193,7 +193,7 @@
                "with open(cal_path, \"w\") as f:\n",
                "    json.dump(cal_data, f)\n",
                "\n",
-                "res = await ezkl.calibrate_settings(cal_path, model_path, settings_path, \"resources\")"
+                "res = ezkl.calibrate_settings(cal_path, model_path, settings_path, \"resources\")"
            ]
        },
        {
@@ -227,7 +227,7 @@
            "source": [
                "# now generate the witness file \n",
                "\n",
-                "res = await ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
+                "res = ezkl.gen_witness(data_path, compiled_model_path, witness_path)\n",
                "assert os.path.isfile(witness_path)"
            ]
        },
--- a/examples/onnx/large_mlp/gen.py
+++ b/examples/onnx/large_mlp/gen.py
@@ -0,0 +1,79 @@
+from torch import nn
+import torch.nn.init as init
+import torch
+import json
+
+N = 100
+
+class Model(nn.Module):
+    def __init__(self, inplace=False):
+        super(Model, self).__init__()
+
+        self.aff1 = nn.Linear(N,N)
+        self.aff2 = nn.Linear(N,N)
+        self.aff3 = nn.Linear(N,N)
+        self.aff4 = nn.Linear(N,N)
+        self.aff5 = nn.Linear(N,N)
+        self.aff6 = nn.Linear(N,N)
+        self.aff7 = nn.Linear(N,N)
+        self.aff8 = nn.Linear(N,N)
+        self.aff9 = nn.Linear(N,N)
+        self.relu = nn.ReLU()
+        self._initialize_weights()
+
+    def forward(self, x):
+        # concat 10 x along dim 0
+        x = x.repeat(10, 1)
+        x = self.aff1(x)
+        x = self.relu(x)
+        x = self.aff2(x)
+        x = self.relu(x)
+        x = self.aff3(x)
+        x = self.relu(x)
+        x = self.aff4(x)
+        x = self.relu(x)
+        x = self.aff5(x)
+        x = self.relu(x)
+        x = self.aff6(x)
+        x = self.relu(x)
+        x = self.aff7(x)
+        x = self.relu(x)
+        x = self.aff8(x)
+        x = self.relu(x)
+        x = self.aff9(x)
+        return x
+
+
+    def _initialize_weights(self):
+        init.orthogonal_(self.aff1.weight)
+
+model = Model()
+
+# Flips the neural net into inference mode
+model.eval()
+model.to('cpu')
+
+
+x = torch.randn(1, N)
+# Export the model
+torch.onnx.export(model,               # model being run
+                  # model input (or a tuple for multiple inputs)
+                  x,
+                  # where to save the model (can be a file or file-like object)
+                  "network.onnx",
+                  export_params=True,        # store the trained parameter weights inside the model file
+                  opset_version=12,          # the ONNX version to export the model to
+                  do_constant_folding=True,  # whether to execute constant folding for optimization
+                  input_names=['input'],   # the model's input names
+                  output_names=['output'],  # the model's output names
+                  dynamic_axes={'input': {0: 'batch_size'},    # variable length axes
+                                'output': {0: 'batch_size'}})
+
+data_array = ((x).detach().numpy()).reshape([-1]).tolist()
+
+data_json = dict(input_data=[data_array])
+
+print(data_json)
+
+# Serialize data into file:
+json.dump(data_json, open("input.json", 'w'))
--- a/examples/onnx/large_mlp/input.json
+++ b/examples/onnx/large_mlp/input.json
@@ -0,0 +1 @@
+{"input_data": [[0.33088353276252747, -0.8819183707237244, 1.245591163635254, -1.807046890258789, 1.9922369718551636, -0.3360576629638672, 0.4529011845588684, -0.3590165674686432, 0.08356846123933792, 0.5126393437385559, 0.44627535343170166, 1.4916497468948364, 0.49731069803237915, -0.9748706817626953, -0.4923185408115387, 1.3548223972320557, 0.2306872010231018, 1.125955581665039, -1.7063908576965332, 0.3777385354042053, -2.7988760471343994, -1.1846797466278076, 0.7473157048225403, 1.490412950515747, 0.017497723922133446, 2.113945245742798, -1.2141249179840088, -0.16120357811450958, 0.021127669140696526, 0.7207374572753906, -1.369688868522644, -0.7369781732559204, -0.630584180355072, -0.4520200788974762, 0.29123976826667786, 0.6334688067436218, -0.869332492351532, -1.258501648902893, 0.3012596666812897, -0.5507447123527527, 0.669975757598877, 0.15088629722595215, -0.1050339788198471, 0.5505334138870239, -0.1287376880645752, -1.4297826290130615, -0.01703289896249771, -1.2296998500823975, 0.5122153162956238, -0.16924428939819336, -0.415036678314209, -1.1979341506958008, 0.05831022188067436, -0.4411357045173645, 2.0713791847229004, 1.4611141681671143, -0.9357407093048096, -0.333297461271286, -0.676478385925293, 1.390028476715088, -0.05827632546424866, 1.535687804222107, 0.3060210347175598, -0.03171076253056526, -0.614985466003418, 1.2040390968322754, 0.31318482756614685, -1.2134959697723389, 0.13110508024692535, -1.4880926609039307, 1.7007993459701538, 1.5412729978561401, 0.09260450303554535, 0.7649128437042236, -0.5009126663208008, -0.5356241464614868, -0.069572813808918, -0.011717632412910461, 0.21314217150211334, -0.1985170543193817, -0.0223808903247118, 1.2128918170928955, 0.8334696888923645, 1.9029873609542847, -0.11491120606660843, -0.10303237289190292, -0.2467050403356552, 1.557223916053772, -1.1108328104019165, -0.9065343141555786, -0.2271333783864975, 0.6959827542304993, -0.48698121309280396, 0.5689510703086853, 1.115319013595581, -0.8907430768013, -0.24722427129745483, -0.7437837719917297, 0.6742106676101685, -1.7830933332443237]]}
--- a/examples/onnx/large_mlp/network.onnx
+++ b/examples/onnx/large_mlp/network.onnx
--- a/examples/onnx/multihead_attention/gen.py
+++ b/examples/onnx/multihead_attention/gen.py
@@ -104,5 +104,5 @@ json.dump(data, open("input.json", 'w'))
 # ezkl.gen_settings("network.onnx", "settings.json")

 # !RUST_LOG = full
-# res = await ezkl.calibrate_settings(
+# res = ezkl.calibrate_settings(
 #     "input.json", "network.onnx", "settings.json", "resources")
--- a/examples/tensor_contraction.rs
+++ b/examples/tensor_contraction.rs
@@ -0,0 +1,182 @@
+use ezkl::circuit::einsum::analysis::analyze_einsum_usage;
+use ezkl::circuit::poly::PolyOp;
+use ezkl::circuit::*;
+use ezkl::tensor::*;
+use halo2_proofs::circuit::floor_planner::V1;
+use halo2_proofs::dev::MockProver;
+use halo2_proofs::{
+    arithmetic::Field,
+    circuit::{Layouter, Value},
+    plonk::{Circuit, ConstraintSystem, Error},
+};
+use halo2curves::bn256::Fr;
+use halo2curves::ff::PrimeField;
+use itertools::Itertools;
+use rand::rngs::OsRng;
+use std::collections::HashMap;
+use std::marker::PhantomData;
+
+static mut LEN: usize = 4;
+const K: usize = 11;
+
+#[derive(Clone)]
+struct MyCircuit<F: PrimeField + TensorType + PartialOrd> {
+    inputs: [ValTensor<F>; 2],
+    einsum: Einsum<F>,
+}
+
+#[derive(Clone, Default)]
+struct Einsum<F: PrimeField + TensorType + PartialOrd> {
+    equation: String,
+    input_axes_to_dims: HashMap<char, usize>,
+    _marker: PhantomData<F>,
+}
+
+impl<F: PrimeField + TensorType + PartialOrd> Einsum<F> {
+    pub fn new(equation: &str, inputs: &[&Tensor<Value<F>>]) -> Result<Self, CircuitError> {
+        let mut eq = equation.split("->");
+        let inputs_eq = eq.next().ok_or(CircuitError::InvalidEinsum)?;
+        let inputs_eq = inputs_eq.split(',').collect::<Vec<_>>();
+
+        // Check that the number of inputs matches the number of inputs in the equation
+        if inputs.len() != inputs_eq.len() {
+            return Err(TensorError::DimMismatch("einsum".to_string()).into());
+        }
+
+        let mut input_axes_to_dims = HashMap::new();
+        for (i, input) in inputs.iter().enumerate() {
+            for j in 0..inputs_eq[i].len() {
+                let c = inputs_eq[i]
+                    .chars()
+                    .nth(j)
+                    .ok_or(CircuitError::InvalidEinsum)?;
+                if let std::collections::hash_map::Entry::Vacant(e) = input_axes_to_dims.entry(c) {
+                    e.insert(input.dims()[j]);
+                } else if input_axes_to_dims[&c] != input.dims()[j] {
+                    return Err(TensorError::DimMismatch("einsum".to_string()).into());
+                }
+            }
+        }
+
+        Ok(Self {
+            equation: equation.to_owned(),
+            input_axes_to_dims,
+            _marker: PhantomData,
+        })
+    }
+}
+
+impl Circuit<Fr> for MyCircuit<Fr> {
+    type Config = BaseConfig<Fr>;
+    type FloorPlanner = V1;
+    type Params = Einsum<Fr>;
+
+    fn without_witnesses(&self) -> Self {
+        self.clone()
+    }
+
+    fn configure_with_params(cs: &mut ConstraintSystem<Fr>, params: Self::Params) -> Self::Config {
+        let len = unsafe { LEN };
+
+        let a = VarTensor::new_advice(cs, K, 1, len);
+        let b = VarTensor::new_advice(cs, K, 1, len);
+        let output = VarTensor::new_advice(cs, K, 1, len);
+
+        let mut config = Self::Config::configure(cs, &[a, b], &output, CheckMode::UNSAFE);
+
+        let mut equations = HashMap::new();
+        equations.insert((0, params.equation), params.input_axes_to_dims);
+        let analysis = analyze_einsum_usage(&equations).unwrap();
+        let num_einsum_inner_cols = 2;
+        config
+            .configure_einsums(cs, &analysis, num_einsum_inner_cols, K)
+            .unwrap();
+        let _constant = VarTensor::constant_cols(cs, K, 2, false);
+
+        config
+    }
+
+    fn params(&self) -> Self::Params {
+        Einsum::<Fr>::new(
+            &self.einsum.equation,
+            &[
+                &self.inputs[0].get_inner().unwrap(),
+                &self.inputs[1].get_inner().unwrap(),
+            ],
+        )
+        .unwrap()
+    }
+
+    fn configure(_cs: &mut ConstraintSystem<Fr>) -> Self::Config {
+        unimplemented!("call configure_with_params instead")
+    }
+
+    fn synthesize(
+        &self,
+        mut config: Self::Config,
+        mut layouter: impl Layouter<Fr>,
+    ) -> Result<(), Error> {
+        let challenges = config
+            .einsums
+            .as_ref()
+            .ok_or(Error::Synthesis)?
+            .challenges()
+            .unwrap()
+            .iter()
+            .map(|c| layouter.get_challenge(*c))
+            .collect_vec();
+
+        layouter.assign_region(
+            || "",
+            |region| {
+                let mut region = region::RegionCtx::new_with_challenges(
+                    region,
+                    0,
+                    1,
+                    1024,
+                    2,
+                    challenges.clone(),
+                );
+                config
+                    .layout(
+                        &mut region,
+                        &self.inputs.iter().collect_vec(),
+                        Box::new(PolyOp::Einsum {
+                            equation: self.einsum.equation.clone(),
+                        }),
+                    )
+                    .unwrap();
+                Ok(())
+            },
+        )?;
+        Ok(())
+    }
+}
+
+fn runmatmul() {
+    let i = 10;
+    let n = 10;
+    let j = 40;
+    let k = 10;
+
+    let mut a = Tensor::from((0..i * n * j).map(|_| Value::known(Fr::random(OsRng))));
+    a.reshape(&[i, n, j]).unwrap();
+
+    // parameters
+    let mut b = Tensor::from((0..j * k).map(|_| Value::known(Fr::random(OsRng))));
+    b.reshape(&[j, k]).unwrap();
+
+    let einsum = Einsum::<Fr>::new("inj,jk->ik", &[&a, &b]).unwrap();
+
+    let circuit = MyCircuit {
+        inputs: [ValTensor::from(a), ValTensor::from(b)],
+        einsum,
+    };
+
+    let mock_prover = MockProver::run(K as u32, &circuit, vec![]).unwrap();
+    mock_prover.assert_satisfied();
+}
+
+pub fn main() {
+    runmatmul()
+}
--- a/ezkl.pyi
+++ b/ezkl.pyi
@@ -160,30 +160,6 @@ def compile_circuit(model:str | os.PathLike | pathlib.Path,compiled_circuit:str
    """
    ...

-def create_evm_data_attestation(input_data:str | os.PathLike | pathlib.Path,settings_path:str | os.PathLike | pathlib.Path,sol_code_path:str | os.PathLike | pathlib.Path,abi_path:str | os.PathLike | pathlib.Path,witness_path:typing.Optional[str | os.PathLike | pathlib.Path]) -> typing.Any:
-    r"""
-    Creates an EVM compatible data attestation verifier, you will need solc installed in your environment to run this
-    
-    Arguments
-    ---------
-    input_data: str
-        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
-    
-    settings_path: str
-        The path to the settings file
-    
-    sol_code_path: str
-        The path to the create the solidity verifier
-    
-    abi_path: str
-        The path to create the ABI for the solidity verifier
-    
-    Returns
-    -------
-    bool
-    """
-    ...
-
 def create_evm_verifier(vk_path:str | os.PathLike | pathlib.Path,settings_path:str | os.PathLike | pathlib.Path,sol_code_path:str | os.PathLike | pathlib.Path,abi_path:str | os.PathLike | pathlib.Path,srs_path:typing.Optional[str | os.PathLike | pathlib.Path],reusable:bool) -> typing.Any:
    r"""
    Creates an EVM compatible verifier, you will need solc installed in your environment to run this
@@ -247,7 +223,7 @@ def create_evm_verifier_aggr(aggregation_settings:typing.Sequence[str | os.PathL
    """
    ...

-def create_evm_vka(vk_path:str | os.PathLike | pathlib.Path,settings_path:str | os.PathLike | pathlib.Path,sol_code_path:str | os.PathLike | pathlib.Path,abi_path:str | os.PathLike | pathlib.Path,srs_path:typing.Optional[str | os.PathLike | pathlib.Path]) -> typing.Any:
+def create_evm_vka(vk_path:str | os.PathLike | pathlib.Path,settings_path:str | os.PathLike | pathlib.Path,vka_path:str | os.PathLike | pathlib.Path,srs_path:typing.Optional[str | os.PathLike | pathlib.Path]) -> typing.Any:
    r"""
    Creates an Evm VK artifact. This command generated a VK with circuit specific meta data encoding in memory for use by the reusable H2 verifier.
    This is useful for deploying verifier that were otherwise too big to fit on chain and required aggregation.
@@ -260,8 +236,8 @@ def create_evm_vka(vk_path:str | os.PathLike | pathlib.Path,settings_path:str |
    settings_path: str
        The path to the settings file
    
-    sol_code_path: str
-        The path to the create the solidity verifying key.
+    vka_path: str
+        The path to the create the vka calldata.
    
    abi_path: str
        The path to create the ABI for the solidity verifier
@@ -275,12 +251,6 @@ def create_evm_vka(vk_path:str | os.PathLike | pathlib.Path,settings_path:str |
    """
    ...

-def deploy_da_evm(addr_path:str | os.PathLike | pathlib.Path,input_data:str | os.PathLike | pathlib.Path,settings_path:str | os.PathLike | pathlib.Path,sol_code_path:str | os.PathLike | pathlib.Path,rpc_url:typing.Optional[str],optimizer_runs:int,private_key:typing.Optional[str]) -> typing.Any:
-    r"""
-    deploys the solidity da verifier
-    """
-    ...
-
 def deploy_evm(addr_path:str | os.PathLike | pathlib.Path,sol_code_path:str | os.PathLike | pathlib.Path,rpc_url:typing.Optional[str],contract_type:str,optimizer_runs:int,private_key:typing.Optional[str]) -> typing.Any:
    r"""
    deploys the solidity verifier
@@ -706,35 +676,6 @@ def setup_aggregate(sample_snarks:typing.Sequence[str | os.PathLike | pathlib.Pa
    """
    ...

-def setup_test_evm_data(data_path:str | os.PathLike | pathlib.Path,compiled_circuit_path:str | os.PathLike | pathlib.Path,test_data:str | os.PathLike | pathlib.Path,input_source:PyTestDataSource,output_source:PyTestDataSource,rpc_url:typing.Optional[str]) -> typing.Any:
-    r"""
-    Setup test evm data
-    
-    Arguments
-    ---------
-    data_path: str
-        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)
-    
-    compiled_circuit_path: str
-        The path to the compiled model file (generated using the compile-circuit command)
-    
-    test_data: str
-        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)
-    
-    input_sources: str
-        Where the input data comes from
-    
-    output_source: str
-        Where the output data comes from
-    
-    rpc_url: str
-        RPC URL for an EVM compatible node, if None, uses Anvil as a local RPC node
-    
-    Returns
-    -------
-    bool
-    """
-    ...

 def swap_proof_commitments(proof_path:str | os.PathLike | pathlib.Path,witness_path:str | os.PathLike | pathlib.Path) -> None:
    r"""
@@ -823,7 +764,7 @@ def verify_aggr(proof_path:str | os.PathLike | pathlib.Path,vk_path:str | os.Pat
    """
    ...

-def verify_evm(addr_verifier:str,proof_path:str | os.PathLike | pathlib.Path,rpc_url:typing.Optional[str],addr_da:typing.Optional[str],addr_vk:typing.Optional[str]) -> typing.Any:
+def verify_evm(addr_verifier:str,proof_path:str | os.PathLike | pathlib.Path,rpc_url:typing.Optional[str],vka_path:typing.Optional[str]) -> typing.Any:
    r"""
    verifies an evm compatible proof, you will need solc installed in your environment to run this
    
@@ -838,11 +779,8 @@ def verify_evm(addr_verifier:str,proof_path:str | os.PathLike | pathlib.Path,rpc
    rpc_url: str
        RPC URL for an Ethereum node, if None will use Anvil but WON'T persist state
    
-    addr_da: str
-        does the verifier use data attestation ?
-    
-    addr_vk: str
-        The addess of the separate VK contract (if the verifier key is rendered as a separate contract)
+    vka_path: str
+        The path to the VKA calldata bytes file (generated using the create_evm_vka command)
    Returns
    -------
    bool
--- a/in-browser-evm-verifier/README.md
+++ b/in-browser-evm-verifier/README.md
@@ -1,60 +0,0 @@
-# inbrowser-evm-verify
-
-We would like the Solidity verifier to be canonical and usually all you ever need. For this, we need to be able to run that verifier in browser.
-
-## How to use (Node js)
-
-```ts 
-import localEVMVerify from '@ezkljs/verify';
-
-// Load in the proof file as a buffer
-const proofFileBuffer = fs.readFileSync(`${path}/${example}/proof.pf`)
-
-// Stringified EZKL evm verifier bytecode (this is just an example don't use in production)
-const bytecode = '0x608060405234801561001057600080fd5b5060d38061001f6000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c8063cfae321714610046575b600080fd5b6100496100f1565b60405161005691906100f1565b60405180910390f35b'
-
-const result = await localEVMVerify(proofFileBuffer, bytecode)
-
-console.log('result', result)
-```
-
-**Note**: Run `ezkl create-evm-verifier` to get the Solidity verifier, with which you can retrieve the bytecode once compiled. We recommend compiling to the Shanghai hardfork target, else you will have to pass an additional parameter specifying the EVM version to the `localEVMVerify` function like so (for Paris hardfork):
-
-```ts
-import localEVMVerify, { hardfork } from '@ezkljs/verify';
-
-const result = await localEVMVerify(proofFileBuffer, bytecode, hardfork['Paris'])
-```
-
-**Note**: You can also verify separated vk verifiers using the `localEVMVerify` function. Just pass the vk verifier bytecode as the third parameter like so:
-```ts
-import localEVMVerify from '@ezkljs/verify';
-
-const result = await localEVMVerify(proofFileBuffer, verifierBytecode, VKBytecode)
-```
-
-
-## How to use (Browser)
-
-```ts
-import localEVMVerify from '@ezkljs/verify';
-
-// Load in the proof file as a buffer using the web apis (fetch, FileReader, etc)
-// We use fetch in this example to load the proof file as a buffer
-const proofFileBuffer = await fetch(`${path}/${example}/proof.pf`).then(res => res.arrayBuffer())
-
-// Stringified EZKL evm verifier bytecode (this is just an example don't use in production)
-const bytecode = '0x608060405234801561001057600080fd5b5060d38061001f6000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c8063cfae321714610046575b600080fd5b6100496100f1565b60405161005691906100f1565b60405180910390f35b'
-
-const result = await browserEVMVerify(proofFileBuffer, bytecode)
-
-console.log('result', result)
-```
-
-Output:
-
-```ts  
-result: true
-```
-
-
--- a/in-browser-evm-verifier/package.json
+++ b/in-browser-evm-verifier/package.json
@@ -1,42 +0,0 @@
-{
-  "name": "@ezkljs/verify",
-  "version": "v10.4.2",
-  "publishConfig": {
-    "access": "public"
-  },
-  "description": "Evm verify EZKL proofs in the browser.",
-  "main": "dist/commonjs/index.js",
-  "module": "dist/esm/index.js",
-  "types": "dist/commonjs/index.d.ts",
-  "files": [
-    "dist",
-    "LICENSE",
-    "README.md"
-  ],
-  "scripts": {
-    "clean": "rm -r dist || true",
-    "build:commonjs": "tsc --project tsconfig.commonjs.json && resolve-tspaths -p tsconfig.commonjs.json",
-    "build:esm": "tsc --project tsconfig.esm.json && resolve-tspaths -p tsconfig.esm.json",
-    "build": "npm run clean && npm run build:commonjs && npm run build:esm"
-  },
-  "dependencies": {
-    "@ethereumjs/common": "4.0.0",
-    "@ethereumjs/evm": "2.0.0",
-    "@ethereumjs/statemanager": "2.0.0",
-    "@ethereumjs/tx": "5.0.0",
-    "@ethereumjs/util": "9.0.0",
-    "@ethereumjs/vm": "7.0.0",
-    "@ethersproject/abi": "5.7.0",
-    "@ezkljs/engine": "10.4.2",
-    "ethers": "6.7.1",
-    "json-bigint": "1.0.0"
-  },
-  "devDependencies": {
-    "@types/node": "^20.8.3",
-    "ts-loader": "^9.5.0",
-    "ts-node": "^10.9.1",
-    "resolve-tspaths": "^0.8.16",
-    "tsconfig-paths": "^4.2.0",
-    "typescript": "^5.2.2"
-  }
-}
--- a/in-browser-evm-verifier/pnpm-lock.yaml
+++ b/in-browser-evm-verifier/pnpm-lock.yaml
--- a/in-browser-evm-verifier/src/index.ts
+++ b/in-browser-evm-verifier/src/index.ts
@@ -1,144 +0,0 @@
-import { defaultAbiCoder as AbiCoder } from '@ethersproject/abi'
-import { Address, hexToBytes } from '@ethereumjs/util'
-import { Chain, Common, Hardfork } from '@ethereumjs/common'
-import { LegacyTransaction, LegacyTxData } from '@ethereumjs/tx'
-// import { DefaultStateManager } from '@ethereumjs/statemanager'
-// import { Blockchain } from '@ethereumjs/blockchain'
-import { VM } from '@ethereumjs/vm'
-import { EVM } from '@ethereumjs/evm'
-import { buildTransaction, encodeDeployment } from './utils/tx-builder'
-import { getAccountNonce, insertAccount } from './utils/account-utils'
-import { encodeVerifierCalldata } from '../nodejs/ezkl';
-
-async function deployContract(
-  vm: VM,
-  common: Common,
-  senderPrivateKey: Uint8Array,
-  deploymentBytecode: string
-): Promise<Address> {
-  // Contracts are deployed by sending their deployment bytecode to the address 0
-  // The contract params should be abi-encoded and appended to the deployment bytecode.
-  // const data =
-  const data = encodeDeployment(deploymentBytecode)
-  const txData = {
-    data,
-    nonce: await getAccountNonce(vm, senderPrivateKey),
-  }
-
-  const tx = LegacyTransaction.fromTxData(
-    buildTransaction(txData) as LegacyTxData,
-    { common, allowUnlimitedInitCodeSize: true },
-  ).sign(senderPrivateKey)
-
-  const deploymentResult = await vm.runTx({
-    tx,
-    skipBlockGasLimitValidation: true,
-    skipNonce: true
-  })
-
-  if (deploymentResult.execResult.exceptionError) {
-    throw deploymentResult.execResult.exceptionError
-  }
-
-  return deploymentResult.createdAddress!
-}
-
-async function verify(
-  vm: VM,
-  contractAddress: Address,
-  caller: Address,
-  proof: Uint8Array | Uint8ClampedArray,
-  vkAddress?: Address | Uint8Array,
-): Promise<boolean> {
-  if (proof instanceof Uint8Array) {
-    proof = new Uint8ClampedArray(proof.buffer)
-  }
-  if (vkAddress) {
-    const vkAddressBytes = hexToBytes(vkAddress.toString())
-    const vkAddressArray = Array.from(vkAddressBytes)
-
-    let string = JSON.stringify(vkAddressArray)
-
-    const uint8Array = new TextEncoder().encode(string);
-
-    // Step 3: Convert to Uint8ClampedArray
-    vkAddress = new Uint8Array(uint8Array.buffer);
-
-    // convert uitn8array of length
-    console.error('vkAddress', vkAddress)
-  }
-  const data = encodeVerifierCalldata(proof, vkAddress)
-
-  const verifyResult = await vm.evm.runCall({
-    to: contractAddress,
-    caller: caller,
-    origin: caller, // The tx.origin is also the caller here
-    data: data,
-  })
-
-  if (verifyResult.execResult.exceptionError) {
-    throw verifyResult.execResult.exceptionError
-  }
-
-  const results = AbiCoder.decode(['bool'], verifyResult.execResult.returnValue)
-
-  return results[0]
-}
-
-/**
- * Spins up an ephemeral EVM instance for executing the bytecode of a solidity verifier
- * @param proof Json serialized proof file
- * @param bytecode The bytecode of a compiled solidity verifier.
- * @param bytecode_vk The bytecode of a contract that stores the vk. (Optional, only required if the vk is stored in a separate contract)
- * @param evmVersion The evm version to use for the verification. (Default: London)
- * @returns The result of the evm verification.
- * @throws If the verify transaction reverts
- */
-export default async function localEVMVerify(
-  proof: Uint8Array | Uint8ClampedArray,
-  bytecode_verifier: string,
-  bytecode_vk?: string,
-  evmVersion?: Hardfork,
-): Promise<boolean> {
-  try {
-    const hardfork = evmVersion ? evmVersion : Hardfork['Shanghai']
-    const common = new Common({ chain: Chain.Mainnet, hardfork })
-    const accountPk = hexToBytes(
-      '0xe331b6d69882b4cb4ea581d88e0b604039a3de5967688d3dcffdd2270c0fd109', // anvil deterministic Pk 
-    )
-
-    const evm = new EVM({
-      allowUnlimitedContractSize: true,
-      allowUnlimitedInitCodeSize: true,
-    })
-
-    const vm = await VM.create({ common, evm })
-    const accountAddress = Address.fromPrivateKey(accountPk)
-
-    await insertAccount(vm, accountAddress)
-
-    const verifierAddress = await deployContract(
-      vm,
-      common,
-      accountPk,
-      bytecode_verifier
-    )
-
-    if (bytecode_vk) {
-      const accountPk = hexToBytes("0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"); // anvil deterministic Pk
-      const accountAddress = Address.fromPrivateKey(accountPk)
-      await insertAccount(vm, accountAddress)
-      const output = await deployContract(vm, common, accountPk, bytecode_vk)
-      const result = await verify(vm, verifierAddress, accountAddress, proof, output)
-      return true
-    }
-
-    const result = await verify(vm, verifierAddress, accountAddress, proof)
-
-    return result
-  } catch (error) {
-    // log or re-throw the error, depending on your needs
-    console.error('An error occurred:', error)
-    throw error
-  }
-}
--- a/in-browser-evm-verifier/src/utils/account-utils.ts
+++ b/in-browser-evm-verifier/src/utils/account-utils.ts
@@ -1,32 +0,0 @@
-import { VM } from '@ethereumjs/vm'
-import { Account, Address } from '@ethereumjs/util'
-
-export const keyPair = {
-  secretKey:
-    '0x3cd7232cd6f3fc66a57a6bedc1a8ed6c228fff0a327e169c2bcc5e869ed49511',
-  publicKey:
-    '0x0406cc661590d48ee972944b35ad13ff03c7876eae3fd191e8a2f77311b0a3c6613407b5005e63d7d8d76b89d5f900cde691497688bb281e07a5052ff61edebdc0',
-}
-
-export const insertAccount = async (vm: VM, address: Address) => {
-  const acctData = {
-    nonce: 0,
-    balance: BigInt('1000000000000000000'), // 1 eth
-  }
-  const account = Account.fromAccountData(acctData)
-
-  await vm.stateManager.putAccount(address, account)
-}
-
-export const getAccountNonce = async (
-  vm: VM,
-  accountPrivateKey: Uint8Array,
-) => {
-  const address = Address.fromPrivateKey(accountPrivateKey)
-  const account = await vm.stateManager.getAccount(address)
-  if (account) {
-    return account.nonce
-  } else {
-    return BigInt(0)
-  }
-}
--- a/in-browser-evm-verifier/src/utils/tx-builder.ts
+++ b/in-browser-evm-verifier/src/utils/tx-builder.ts
@@ -1,59 +0,0 @@
-import { Interface, defaultAbiCoder as AbiCoder } from '@ethersproject/abi'
-import {
-  AccessListEIP2930TxData,
-  FeeMarketEIP1559TxData,
-  TxData,
-} from '@ethereumjs/tx'
-
-type TransactionsData =
-  | TxData
-  | AccessListEIP2930TxData
-  | FeeMarketEIP1559TxData
-
-export const encodeFunction = (
-  method: string,
-  params?: {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    types: any[]
-    values: unknown[]
-  },
-): string => {
-  const parameters = params?.types ?? []
-  const methodWithParameters = `function ${method}(${parameters.join(',')})`
-  const signatureHash = new Interface([methodWithParameters]).getSighash(method)
-  const encodedArgs = AbiCoder.encode(parameters, params?.values ?? [])
-
-  return signatureHash + encodedArgs.slice(2)
-}
-
-export const encodeDeployment = (
-  bytecode: string,
-  params?: {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    types: any[]
-    values: unknown[]
-  },
-) => {
-  const deploymentData = '0x' + bytecode
-  if (params) {
-    const argumentsEncoded = AbiCoder.encode(params.types, params.values)
-    return deploymentData + argumentsEncoded.slice(2)
-  }
-  return deploymentData
-}
-
-export const buildTransaction = (
-  data: Partial<TransactionsData>,
-): TransactionsData => {
-  const defaultData: Partial<TransactionsData> = {
-    gasLimit: 3_000_000_000_000_000,
-    gasPrice: 7,
-    value: 0,
-    data: '0x',
-  }
-
-  return {
-    ...defaultData,
-    ...data,
-  }
-}
--- a/in-browser-evm-verifier/tsconfig.commonjs.json
+++ b/in-browser-evm-verifier/tsconfig.commonjs.json
@@ -1,7 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "module": "CommonJS",
-    "outDir": "./dist/commonjs"
-  }
-}
--- a/in-browser-evm-verifier/tsconfig.esm.json
+++ b/in-browser-evm-verifier/tsconfig.esm.json
@@ -1,7 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "module": "ES2020",
-    "outDir": "./dist/esm"
-  }
-}
--- a/in-browser-evm-verifier/tsconfig.json
+++ b/in-browser-evm-verifier/tsconfig.json
@@ -1,62 +0,0 @@
-{
-  "compilerOptions": {
-    "rootDir": "src",
-    "target": "es2017",
-    "outDir": "dist",
-    "declaration": true,
-    "lib": [
-      "dom",
-      "dom.iterable",
-      "esnext"
-    ],
-    "allowJs": true,
-    "checkJs": true,
-    "skipLibCheck": true,
-    "strict": true,
-    "forceConsistentCasingInFileNames": true,
-    "noEmit": false,
-    "esModuleInterop": true,
-    "module": "CommonJS",
-    "moduleResolution": "node",
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "jsx": "preserve",
-    // "incremental": true,
-    "noUncheckedIndexedAccess": true,
-    "baseUrl": ".",
-    "paths": {
-      "@/*": [
-        "./src/*"
-      ]
-    }
-  },
-  "include": [
-    "src/**/*.ts",
-    "src/**/*.tsx",
-    "src/**/*.cjs",
-    "src/**/*.mjs"
-  ],
-  "exclude": [
-    "node_modules"
-  ],
-  // NEW: Options for file/directory watching
-  "watchOptions": {
-    // Use native file system events for files and directories
-    "watchFile": "useFsEvents",
-    "watchDirectory": "useFsEvents",
-    // Poll files for updates more frequently
-    // when they're updated a lot.
-    "fallbackPolling": "dynamicPriority",
-    // Don't coalesce watch notification
-    "synchronousWatchDirectory": true,
-    // Finally, two additional settings for reducing the amount of possible
-    // files to track  work from these directories
-    "excludeDirectories": [
-      "**/node_modules",
-      "_build"
-    ],
-    "excludeFiles": [
-      "build/fileWhichChangesOften.ts"
-    ]
-  }
-}
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,6 +9,6 @@ pytest==8.1.1
 tomli==2.0.1
 typing-extensions==4.10.0
 zipp==3.18.1
-onnx==1.15.0
+onnx==1.17.0
 onnxruntime==1.17.1
 numpy==1.26.4
--- a/2
+++ b/2
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2025-02-17"
+channel = "nightly-2025-05-01"
 components = ["rustfmt", "clippy"]
--- a/setup-gpu.sh
+++ b/setup-gpu.sh
@@ -0,0 +1,229 @@
+#!/bin/bash
+
+set -e
+
+# Colors for output
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+NC='\033[0m' # No Color
+
+# Default installation directory
+DEFAULT_INSTALL_DIR="/opt/icicle/lib/backend/halo2"
+
+# Halo2 repository details
+HALO2_REPO="https://github.com/zkonduit/halo2"
+HALO2_BRANCH="ac/conditional-compilation-icicle2"
+
+# Parse command line arguments
+AUTO_YES=false
+for arg in "$@"; do
+    case $arg in
+        -y|--yes)
+            AUTO_YES=true
+            shift
+            ;;
+        -h|--help)
+            echo "Usage: $0 [OPTIONS]"
+            echo "Options:"
+            echo "  -y, --yes    Automatically answer 'yes' to all prompts"
+            echo "  -h, --help   Show this help message"
+            exit 0
+            ;;
+        *)
+            echo "Unknown option: $arg"
+            echo "Use -h or --help for usage information"
+            exit 1
+            ;;
+    esac
+done
+
+echo -e "${GREEN}EZKL GPU Setup Script${NC}"
+echo -e "${GREEN}=====================${NC}"
+echo ""
+
+# Parse commit hash from Cargo.lock
+echo "Parsing halo2 commit hash from Cargo.lock..."
+if [ ! -f "Cargo.lock" ]; then
+    echo -e "${RED}Error: Cargo.lock not found. Please run this script from the project root.${NC}"
+    exit 1
+fi
+
+HALO2_COMMIT=$(grep "github\.com/zkonduit/halo2?" Cargo.lock | grep -v "halo2wrong" | head -1 | grep -o "#[a-f0-9]\{40\}" | cut -c2-)
+
+if [ -z "$HALO2_COMMIT" ]; then
+    echo -e "${RED}Error: Could not parse halo2 commit hash from Cargo.lock${NC}"
+    exit 1
+fi
+
+echo -e "${GREEN}Found halo2 commit: $HALO2_COMMIT${NC}"
+echo ""
+echo "This script will:"
+echo "1. Sparse checkout the halo2 repository at commit $HALO2_COMMIT"
+echo "2. Extract only the icicle/backend/cuda/ directory"
+echo "3. Set the ICICLE_BACKEND_INSTALL_DIR environment variable"
+echo ""
+
+# Check if user wants to override the default directory
+if [ "$AUTO_YES" = true ]; then
+    INSTALL_DIR="$DEFAULT_INSTALL_DIR"
+    echo -e "${GREEN}Using default installation directory: ${INSTALL_DIR}${NC}"
+else
+    echo -e "${YELLOW}Default installation directory: ${DEFAULT_INSTALL_DIR}${NC}"
+    read -p "Do you want to use a different directory? [y/N]: " -n 1 -r
+    echo
+    if [[ $REPLY =~ ^[Yy]$ ]]; then
+        read -p "Enter the installation directory: " INSTALL_DIR
+        INSTALL_DIR="${INSTALL_DIR/#\~/$HOME}"  # Expand ~ to $HOME
+    else
+        INSTALL_DIR="$DEFAULT_INSTALL_DIR"
+    fi
+
+    # Confirm the installation directory
+    echo ""
+    echo -e "${YELLOW}Installation directory: ${INSTALL_DIR}${NC}"
+    read -p "Continue with this directory? [y/N]: " -n 1 -r
+    echo
+    if [[ ! $REPLY =~ ^[Yy]$ ]]; then
+        echo -e "${RED}Setup cancelled by user.${NC}"
+        exit 1
+    fi
+fi
+
+# Check if ICICLE_BACKEND_INSTALL_DIR is already set
+if [ ! -z "$ICICLE_BACKEND_INSTALL_DIR" ] && [ "$AUTO_YES" = false ]; then
+    echo ""
+    echo -e "${YELLOW}Warning: ICICLE_BACKEND_INSTALL_DIR is already set to: $ICICLE_BACKEND_INSTALL_DIR${NC}"
+    read -p "Do you want to override it? [y/N]: " -n 1 -r
+    echo
+    if [[ ! $REPLY =~ ^[Yy]$ ]]; then
+        echo -e "${RED}Setup cancelled by user.${NC}"
+        exit 1
+    fi
+elif [ ! -z "$ICICLE_BACKEND_INSTALL_DIR" ] && [ "$AUTO_YES" = true ]; then
+    echo -e "${GREEN}Overriding existing ICICLE_BACKEND_INSTALL_DIR (was: $ICICLE_BACKEND_INSTALL_DIR)${NC}"
+fi
+
+echo ""
+echo -e "${GREEN}Starting GPU setup...${NC}"
+
+# Create installation directory
+echo "Creating installation directory..."
+mkdir -p "$INSTALL_DIR"
+
+# Create temporary directory for sparse checkout
+TEMP_DIR=$(mktemp -d)
+echo "Using temporary directory: $TEMP_DIR"
+
+# Clone with sparse checkout
+echo "Cloning halo2 repository with sparse checkout..."
+cd "$TEMP_DIR"
+git clone --filter=blob:none --sparse "$HALO2_REPO" halo2
+cd halo2
+
+# Checkout the specific branch and commit
+echo "Checking out branch $HALO2_BRANCH at commit $HALO2_COMMIT..."
+git checkout "$HALO2_BRANCH"
+git checkout "$HALO2_COMMIT"
+
+# Configure sparse checkout
+echo "Configuring sparse checkout for icicle/backend/cuda/..."
+git sparse-checkout init --cone
+git sparse-checkout set icicle/backend/cuda/
+
+# Copy the icicle directory to the installation location
+if [ -d "icicle/backend/cuda" ]; then
+    echo "Copying icicle/backend/cuda/ to $INSTALL_DIR..."
+    cp -r icicle/backend/cuda/* "$INSTALL_DIR/"
+    echo -e "${GREEN}Files copied successfully!${NC}"
+else
+    echo -e "${RED}Error: icicle/backend/cuda directory not found in the repository${NC}"
+    exit 1
+fi
+
+# Clean up temporary directory
+echo "Cleaning up temporary files..."
+rm -rf "$TEMP_DIR"
+
+# Ask user about setting environment variable permanently
+SETUP_PERMANENT_ENV=false
+if [ "$AUTO_YES" = true ]; then
+    SETUP_PERMANENT_ENV=true
+    echo ""
+    echo -e "${GREEN}Setting ICICLE_BACKEND_INSTALL_DIR environment variable permanently...${NC}"
+else
+    echo ""
+    echo -e "${YELLOW}Do you want to set ICICLE_BACKEND_INSTALL_DIR environment variable permanently?${NC}"
+    echo "This will add 'export ICICLE_BACKEND_INSTALL_DIR=\"$INSTALL_DIR\"' to your shell configuration file."
+    read -p "Set environment variable permanently? [y/N]: " -n 1 -r
+    echo
+    if [[ $REPLY =~ ^[Yy]$ ]]; then
+        SETUP_PERMANENT_ENV=true
+    fi
+fi
+
+if [ "$SETUP_PERMANENT_ENV" = true ]; then
+    echo "Setting ICICLE_BACKEND_INSTALL_DIR environment variable..."
+
+    # Detect shell and set environment variable accordingly
+    if [ -n "$ZSH_VERSION" ]; then
+        SHELL_RC="$HOME/.zshrc"
+    elif [ -n "$BASH_VERSION" ]; then
+        SHELL_RC="$HOME/.bashrc"
+    else
+        # Try to detect based on $SHELL
+        case "$SHELL" in
+            */zsh)
+                SHELL_RC="$HOME/.zshrc"
+                ;;
+            */bash)
+                SHELL_RC="$HOME/.bashrc"
+                ;;
+            *)
+                SHELL_RC="$HOME/.profile"
+                ;;
+        esac
+    fi
+
+    # Add environment variable to shell configuration
+    ENV_EXPORT="export ICICLE_BACKEND_INSTALL_DIR=\"$INSTALL_DIR\""
+
+    # Check if the variable is already set in the file
+    if [ -f "$SHELL_RC" ] && grep -q "ICICLE_BACKEND_INSTALL_DIR" "$SHELL_RC"; then
+        # Replace existing line
+        if [[ "$OSTYPE" == "darwin"* ]]; then
+            # macOS
+            sed -i '' "s|export ICICLE_BACKEND_INSTALL_DIR=.*|$ENV_EXPORT|" "$SHELL_RC"
+        else
+            # Linux
+            sed -i "s|export ICICLE_BACKEND_INSTALL_DIR=.*|$ENV_EXPORT|" "$SHELL_RC"
+        fi
+        echo "Updated existing ICICLE_BACKEND_INSTALL_DIR in $SHELL_RC"
+    else
+        # Add new line
+        echo "$ENV_EXPORT" >> "$SHELL_RC"
+        echo "Added ICICLE_BACKEND_INSTALL_DIR to $SHELL_RC"
+    fi
+
+    echo -e "${GREEN}Environment variable set permanently.${NC}"
+else
+    echo "Skipping permanent environment variable setup."
+fi
+
+# Export for current session regardless
+export ICICLE_BACKEND_INSTALL_DIR="$INSTALL_DIR"
+echo "Environment variable set for current session."
+
+echo ""
+echo -e "${GREEN}GPU setup completed successfully!${NC}"
+echo ""
+echo -e "${YELLOW}Important:${NC}"
+echo "1. The ICICLE_BACKEND_INSTALL_DIR environment variable has been set to: $INSTALL_DIR"
+if [ "$SETUP_PERMANENT_ENV" = true ]; then
+    echo "2. Please restart your terminal or run: source $SHELL_RC"
+else
+    echo "2. To use GPU features, set: export ICICLE_BACKEND_INSTALL_DIR=\"$INSTALL_DIR\""
+fi
+echo "3. You can now build with GPU support using: cargo build --features gpu-accelerated"
+echo ""
+echo -e "${GREEN}Setup complete!${NC}"
--- a/src/bin/ezkl.rs
+++ b/src/bin/ezkl.rs
@@ -15,9 +15,6 @@ use log::{error, info};
 #[cfg(not(any(target_arch = "wasm32", feature = "no-banner")))]
 use rand::prelude::SliceRandom;
 #[cfg(all(feature = "ezkl", not(target_arch = "wasm32")))]
-#[cfg(feature = "icicle")]
-use std::env;
-
 #[tokio::main(flavor = "current_thread")]
 #[cfg(all(feature = "ezkl", not(target_arch = "wasm32")))]
 pub async fn main() {
@@ -31,12 +28,7 @@ pub async fn main() {
        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");
-        }
+
        debug!(
            "command: \n {}",
            &command.as_json().to_colored_json_auto().unwrap()
--- a/src/bindings/mod.rs
+++ b/src/bindings/mod.rs
@@ -3,7 +3,7 @@
 pub mod python;
 /// Universal bindings for all platforms
 #[cfg(any(
-    feature = "ios-bindings",
+    feature = "universal-bindings",
    all(target_arch = "wasm32", target_os = "unknown")
 ))]
 pub mod universal;
--- a/src/bindings/python.rs
+++ b/src/bindings/python.rs
@@ -93,17 +93,6 @@ impl From<PyG1> for G1 {
    }
 }

-impl pyo3::ToPyObject for PyG1 {
-    fn to_object(&self, py: pyo3::Python) -> pyo3::PyObject {
-        let g1_dict = pyo3::types::PyDict::new(py);
-
-        g1_dict.set_item("x", self.x.to_object(py)).unwrap();
-        g1_dict.set_item("y", self.y.to_object(py)).unwrap();
-        g1_dict.set_item("z", self.z.to_object(py)).unwrap();
-        g1_dict.into()
-    }
-}
-
 /// pyclass containing the struct used for G1
 #[pyclass]
 #[derive(Debug, Clone)]
@@ -135,16 +124,6 @@ impl From<PyG1Affine> for G1Affine {
    }
 }

-impl pyo3::ToPyObject for PyG1Affine {
-    fn to_object(&self, py: pyo3::Python) -> pyo3::PyObject {
-        let g1_dict = pyo3::types::PyDict::new(py);
-
-        g1_dict.set_item("x", self.x.to_object(py)).unwrap();
-        g1_dict.set_item("y", self.y.to_object(py)).unwrap();
-        g1_dict.into()
-    }
-}
-
 /// Python class containing the struct used for run_args
 ///
 /// Returns
@@ -161,6 +140,9 @@ struct PyRunArgs {
    #[pyo3(get, set)]
    /// int:  The denominator in the fixed point representation used when quantizing parameters
    pub param_scale: crate::Scale,
+    /// int: The scale to rebase to (optional). If None, we rebase to the max of input_scale and param_scale
+    /// This is an advanced parameter that should be used with caution
+    pub rebase_scale: Option<crate::Scale>,
    #[pyo3(get, set)]
    /// int: 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)
    pub scale_rebase_multiplier: u32,
@@ -209,6 +191,9 @@ struct PyRunArgs {
    /// float: epsilon used for arguments that use division
    #[pyo3(get, set)]
    pub epsilon: f64,
+    /// bool: Whether to disable using Freivalds' argument in einsum operations
+    #[pyo3(get, set)]
+    pub disable_freivalds: bool,
 }

 /// default instantiation of PyRunArgs
@@ -227,6 +212,7 @@ impl From<PyRunArgs> for RunArgs {
            bounded_log_lookup: py_run_args.bounded_log_lookup,
            input_scale: py_run_args.input_scale,
            param_scale: py_run_args.param_scale,
+            rebase_scale: py_run_args.rebase_scale,
            num_inner_cols: py_run_args.num_inner_cols,
            scale_rebase_multiplier: py_run_args.scale_rebase_multiplier,
            lookup_range: py_run_args.lookup_range,
@@ -242,6 +228,7 @@ impl From<PyRunArgs> for RunArgs {
            decomp_legs: py_run_args.decomp_legs,
            ignore_range_check_inputs_outputs: py_run_args.ignore_range_check_inputs_outputs,
            epsilon: Some(py_run_args.epsilon),
+            disable_freivalds: py_run_args.disable_freivalds,
        }
    }
 }
@@ -253,6 +240,7 @@ impl Into<PyRunArgs> for RunArgs {
            bounded_log_lookup: self.bounded_log_lookup,
            input_scale: self.input_scale,
            param_scale: self.param_scale,
+            rebase_scale: self.rebase_scale,
            num_inner_cols: self.num_inner_cols,
            scale_rebase_multiplier: self.scale_rebase_multiplier,
            lookup_range: self.lookup_range,
@@ -268,6 +256,7 @@ impl Into<PyRunArgs> for RunArgs {
            decomp_legs: self.decomp_legs,
            ignore_range_check_inputs_outputs: self.ignore_range_check_inputs_outputs,
            epsilon: eps,
+            disable_freivalds: self.disable_freivalds,
        }
    }
 }
@@ -694,7 +683,7 @@ fn ipa_commit(
        .map_err(|_| PyIOError::new_err("Failed to load circuit settings"))?;

    let srs_path =
-        crate::execute::get_srs_path(settings.run_args.logrows, srs_path, Commitments::KZG);
+        crate::execute::get_srs_path(settings.run_args.logrows, srs_path, Commitments::IPA);

    let srs = load_srs_prover::<IPACommitmentScheme<G1Affine>>(srs_path)
        .map_err(|_| PyIOError::new_err("Failed to load srs"))?;
@@ -884,7 +873,7 @@ fn gen_srs(srs_path: PathBuf, logrows: usize) -> PyResult<()> {
 ))]
 #[gen_stub_pyfunction]
 fn get_srs(
-    py: Python,
+    py: Python<'_>,
    settings_path: Option<PathBuf>,
    logrows: Option<u32>,
    srs_path: Option<PathBuf>,
@@ -1030,7 +1019,6 @@ fn gen_random_data(
 ))]
 #[gen_stub_pyfunction]
 fn calibrate_settings(
-    py: Python,
    data: String,
    model: PathBuf,
    settings: PathBuf,
@@ -1039,26 +1027,23 @@ fn calibrate_settings(
    scales: Option<Vec<crate::Scale>>,
    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)
-        })?;
+) -> PyResult<bool> {
+    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
@@ -1094,22 +1079,18 @@ fn calibrate_settings(
 ))]
 #[gen_stub_pyfunction]
 fn gen_witness(
-    py: Python,
    data: String,
    model: PathBuf,
    output: Option<PathBuf>,
    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)))
-    })
+) -> PyResult<PyObject> {
+    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.into_pyobject(py).unwrap().into()))
 }

 /// Mocks the prover
@@ -1291,7 +1272,7 @@ fn prove(
        PyRuntimeError::new_err(err_str)
    })?;

-    Python::with_gil(|py| Ok(snark.to_object(py)))
+    Python::with_gil(|py| Ok(snark.into_pyobject(py).unwrap().into()))
 }

 /// Verifies a given proof
@@ -1607,22 +1588,15 @@ fn verify_aggr(
 #[pyfunction(signature = (
    proof=PathBuf::from(DEFAULT_PROOF),
    calldata=PathBuf::from(DEFAULT_CALLDATA),
-    addr_vk=None,
+    vka_path=None,
 ))]
 #[gen_stub_pyfunction]
 fn encode_evm_calldata<'a>(
    proof: PathBuf,
    calldata: PathBuf,
-    addr_vk: Option<&'a str>,
+    vka_path: Option<PathBuf>,
 ) -> 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| {
+    crate::execute::encode_evm_calldata(proof, calldata, vka_path).map_err(|e| {
        let err_str = format!("Failed to generate calldata: {}", e);
        PyRuntimeError::new_err(err_str)
    })
@@ -1664,7 +1638,7 @@ fn encode_evm_calldata<'a>(
 ))]
 #[gen_stub_pyfunction]
 fn create_evm_verifier(
-    py: Python,
+    py: Python<'_>,
    vk_path: PathBuf,
    settings_path: PathBuf,
    sol_code_path: PathBuf,
@@ -1691,6 +1665,7 @@ fn create_evm_verifier(
    })
 }

+#[cfg(feature = "reusable-verifier")]
 /// Creates an Evm VK artifact. This command generated a VK with circuit specific meta data encoding in memory for use by the reusable H2 verifier.
 /// This is useful for deploying verifier that were otherwise too big to fit on chain and required aggregation.
 ///
@@ -1702,15 +1677,15 @@ fn create_evm_verifier(
 /// settings_path: str
 ///     The path to the settings file
 ///
-/// sol_code_path: str
-///     The path to the create the solidity verifying key.
-///
-/// abi_path: str
-///     The path to create the ABI for the solidity verifier
+/// vka_path: str
+///     The path to the verification artifact calldata bytes file.
 ///
 /// srs_path: str
 ///     The path to the SRS file
 ///
+/// decimals: int
+///    The number of decimals used for the rescaling of fixed point felt instances into on-chain floats.
+///
 /// Returns
 /// -------
 /// bool
@@ -1718,21 +1693,21 @@ fn create_evm_verifier(
 #[pyfunction(signature = (
    vk_path=PathBuf::from(DEFAULT_VK),
    settings_path=PathBuf::from(DEFAULT_SETTINGS),
-    sol_code_path=PathBuf::from(DEFAULT_VK_SOL),
-    abi_path=PathBuf::from(DEFAULT_VERIFIER_ABI),
-    srs_path=None
+    vka_path=PathBuf::from(DEFAULT_VKA),
+    srs_path=None,
+    decimals=DEFAULT_DECIMALS.parse().unwrap(),
 ))]
 #[gen_stub_pyfunction]
 fn create_evm_vka(
-    py: Python,
+    py: Python<'_>,
    vk_path: PathBuf,
    settings_path: PathBuf,
-    sol_code_path: PathBuf,
-    abi_path: PathBuf,
+    vka_path: PathBuf,
    srs_path: Option<PathBuf>,
+    decimals: usize,
 ) -> PyResult<Bound<'_, PyAny>> {
    pyo3_async_runtimes::tokio::future_into_py(py, async move {
-        crate::execute::create_evm_vka(vk_path, srs_path, settings_path, sol_code_path, abi_path)
+        crate::execute::create_evm_vka(vk_path, srs_path, settings_path, vka_path, decimals)
            .await
            .map_err(|e| {
                let err_str = format!("Failed to run create_evm_verifier: {}", e);
@@ -1743,124 +1718,7 @@ fn create_evm_vka(
    })
 }

-/// Creates an EVM compatible data attestation verifier, you will need solc installed in your environment to run this
-///
-/// Arguments
-/// ---------
-/// input_data: str
-///     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
-///
-/// settings_path: str
-///     The path to the settings file
-///
-/// sol_code_path: str
-///     The path to the create the solidity verifier
-///
-/// abi_path: str
-///     The path to create the ABI for the solidity verifier
-///
-/// Returns
-/// -------
-/// bool
-///
-#[pyfunction(signature = (
-    input_data=String::from(DEFAULT_DATA),
-    settings_path=PathBuf::from(DEFAULT_SETTINGS),
-    sol_code_path=PathBuf::from(DEFAULT_SOL_CODE_DA),
-    abi_path=PathBuf::from(DEFAULT_VERIFIER_DA_ABI),
-    witness_path=None,
-))]
-#[gen_stub_pyfunction]
-fn create_evm_data_attestation(
-    py: Python,
-    input_data: String,
-    settings_path: PathBuf,
-    sol_code_path: PathBuf,
-    abi_path: PathBuf,
-    witness_path: Option<PathBuf>,
-) -> PyResult<Bound<'_, PyAny>> {
-    pyo3_async_runtimes::tokio::future_into_py(py, async move {
-        crate::execute::create_evm_data_attestation(
-            settings_path,
-            sol_code_path,
-            abi_path,
-            input_data,
-            witness_path,
-        )
-        .await
-        .map_err(|e| {
-            let err_str = format!("Failed to run create_evm_data_attestation: {}", e);
-            PyRuntimeError::new_err(err_str)
-        })?;
-
-        Ok(true)
-    })
-}
-
-/// Setup test evm witness
-///
-/// Arguments
-/// ---------
-/// data_path: str
-///     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)
-///
-/// compiled_circuit_path: str
-///     The path to the compiled model file (generated using the compile-circuit command)
-///
-/// test_data: str
-///     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)
-///
-/// input_sources: str
-///     Where the input data comes from
-///
-/// output_source: str
-///     Where the output data comes from
-///
-/// rpc_url: str
-///     RPC URL for an EVM compatible node, if None, uses Anvil as a local RPC node
-///
-/// Returns
-/// -------
-/// bool
-///
-#[pyfunction(signature = (
-    data_path,
-    compiled_circuit_path,
-    test_data,
-    input_source,
-    output_source,
-    rpc_url,
-))]
-#[gen_stub_pyfunction]
-fn setup_test_evm_data(
-    py: Python,
-    data_path: String,
-    compiled_circuit_path: PathBuf,
-    test_data: PathBuf,
-    input_source: PyTestDataSource,
-    output_source: PyTestDataSource,
-    rpc_url: String,
-) -> PyResult<Bound<'_, PyAny>> {
-    pyo3_async_runtimes::tokio::future_into_py(py, async move {
-        crate::execute::setup_test_evm_data(
-            data_path,
-            compiled_circuit_path,
-            test_data,
-            rpc_url,
-            input_source.into(),
-            output_source.into(),
-        )
-        .await
-        .map_err(|e| {
-            let err_str = format!("Failed to run setup_test_evm_data: {}", e);
-            PyRuntimeError::new_err(err_str)
-        })?;
-
-        Ok(true)
-    })
-}
-
-/// deploys the solidity verifier
+/// Deploys the solidity verifier
 #[pyfunction(signature = (
    addr_path,
    rpc_url,
@@ -1871,7 +1729,7 @@ fn setup_test_evm_data(
 ))]
 #[gen_stub_pyfunction]
 fn deploy_evm(
-    py: Python,
+    py: Python<'_>,
    addr_path: PathBuf,
    rpc_url: String,
    sol_code_path: PathBuf,
@@ -1898,46 +1756,65 @@ fn deploy_evm(
    })
 }

-/// deploys the solidity da verifier
+#[cfg(feature = "reusable-verifier")]
+/// Registers a VKA on the EZKL reusable verifier contract
+///
+/// Arguments
+/// ---------
+/// addr_verifier: str
+///     The reusable verifier contract's address as a hex string
+///
+/// rpc_url: str
+///     RPC URL for an Ethereum node, if None will use Anvil but WON'T persist state
+///
+/// vka_path: str
+///     The path to the VKA calldata bytes file (generated using the create_evm_vka command)
+///
+/// vka_digest_path: str
+///     The path to the VKA digest file, aka hash of the VKA calldata bytes file
+///
+/// private_key: str
+///     The private key to use for signing the transaction. If None, will use the default private key
+///
+/// Returns
+/// -------
+/// bool
+///
 #[pyfunction(signature = (
-    addr_path,
-    input_data,
+    addr_verifier,
    rpc_url,
-    settings_path=PathBuf::from(DEFAULT_SETTINGS),
-    sol_code_path=PathBuf::from(DEFAULT_SOL_CODE_DA),
-    optimizer_runs=DEFAULT_OPTIMIZER_RUNS.parse().unwrap(),
-    private_key=None
+    vka_path=PathBuf::from(DEFAULT_VKA),
+    vka_digest_path=PathBuf::from(DEFAULT_VKA_DIGEST),
+    private_key=None,
 ))]
 #[gen_stub_pyfunction]
-fn deploy_da_evm(
-    py: Python,
-    addr_path: PathBuf,
-    input_data: String,
+fn register_vka<'a>(
+    py: Python<'a>,
+    addr_verifier: &'a str,
    rpc_url: String,
-    settings_path: PathBuf,
-    sol_code_path: PathBuf,
-    optimizer_runs: usize,
+    vka_path: PathBuf,
+    vka_digest_path: PathBuf,
    private_key: Option<String>,
-) -> PyResult<Bound<'_, PyAny>> {
+) -> PyResult<Bound<'a, PyAny>> {
+    let addr_verifier = H160Flag::from(addr_verifier);
    pyo3_async_runtimes::tokio::future_into_py(py, async move {
-        crate::execute::deploy_da_evm(
-            input_data,
-            settings_path,
-            sol_code_path,
+        crate::execute::register_vka(
            rpc_url,
-            addr_path,
-            optimizer_runs,
+            addr_verifier,
+            vka_path,
+            vka_digest_path,
            private_key,
        )
        .await
        .map_err(|e| {
-            let err_str = format!("Failed to run deploy_da_evm: {}", e);
+            let err_str = format!("Failed to run register_vka: {}", e);
            PyRuntimeError::new_err(err_str)
        })?;

        Ok(true)
    })
 }
+
 /// verifies an evm compatible proof, you will need solc installed in your environment to run this
 ///
 /// Arguments
@@ -1951,11 +1828,11 @@ fn deploy_da_evm(
 /// rpc_url: str
 ///     RPC URL for an Ethereum node, if None will use Anvil but WON'T persist state
 ///
-/// addr_da: str
-///     does the verifier use data attestation ?
+/// vka_path: str
+///     The path to the VKA calldata bytes file (generated using the create_evm_vka command)
 ///
-/// addr_vk: str
-///     The address of the separate VK contract (if the verifier key is rendered as a separate contract)
+/// encoded_calldata: str
+///     The path to the encoded calldata bytes file (generated using the encode calldata command)
 /// Returns
 /// -------
 /// bool
@@ -1964,8 +1841,8 @@ fn deploy_da_evm(
    addr_verifier,
    rpc_url,
    proof_path=PathBuf::from(DEFAULT_PROOF),
-    addr_da = None,
-    addr_vk = None,
+    vka_path = None,
+    encoded_calldata = None,
 ))]
 #[gen_stub_pyfunction]
 fn verify_evm<'a>(
@@ -1973,30 +1850,24 @@ fn verify_evm<'a>(
    addr_verifier: &'a str,
    rpc_url: String,
    proof_path: PathBuf,
-    addr_da: Option<&'a str>,
-    addr_vk: Option<&'a str>,
+    vka_path: Option<PathBuf>,
+    encoded_calldata: Option<PathBuf>,
 ) -> PyResult<Bound<'a, PyAny>> {
    let addr_verifier = H160Flag::from(addr_verifier);
-    let addr_da = if let Some(addr_da) = addr_da {
-        let addr_da = H160Flag::from(addr_da);
-        Some(addr_da)
-    } else {
-        None
-    };
-    let addr_vk = if let Some(addr_vk) = addr_vk {
-        let addr_vk = H160Flag::from(addr_vk);
-        Some(addr_vk)
-    } else {
-        None
-    };

    pyo3_async_runtimes::tokio::future_into_py(py, async move {
-        crate::execute::verify_evm(proof_path, addr_verifier, rpc_url, addr_da, addr_vk)
-            .await
-            .map_err(|e| {
-                let err_str = format!("Failed to run verify_evm: {}", e);
-                PyRuntimeError::new_err(err_str)
-            })?;
+        crate::execute::verify_evm(
+            proof_path,
+            addr_verifier,
+            rpc_url,
+            vka_path,
+            encoded_calldata,
+        )
+        .await
+        .map_err(|e| {
+            let err_str = format!("Failed to run verify_evm: {}", e);
+            PyRuntimeError::new_err(err_str)
+        })?;

        Ok(true)
    })
@@ -2042,7 +1913,7 @@ fn verify_evm<'a>(
 ))]
 #[gen_stub_pyfunction]
 fn create_evm_verifier_aggr(
-    py: Python,
+    py: Python<'_>,
    aggregation_settings: Vec<PathBuf>,
    vk_path: PathBuf,
    sol_code_path: PathBuf,
@@ -2113,14 +1984,14 @@ fn ezkl(m: &Bound<'_, PyModule>) -> PyResult<()> {
    m.add_function(wrap_pyfunction!(compile_circuit, m)?)?;
    m.add_function(wrap_pyfunction!(verify_aggr, m)?)?;
    m.add_function(wrap_pyfunction!(create_evm_verifier, m)?)?;
+    #[cfg(feature = "reusable-verifier")]
    m.add_function(wrap_pyfunction!(create_evm_vka, m)?)?;
    m.add_function(wrap_pyfunction!(deploy_evm, m)?)?;
-    m.add_function(wrap_pyfunction!(deploy_da_evm, m)?)?;
    m.add_function(wrap_pyfunction!(verify_evm, m)?)?;
-    m.add_function(wrap_pyfunction!(setup_test_evm_data, 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)?)?;
+    #[cfg(feature = "reusable-verifier")]
+    m.add_function(wrap_pyfunction!(register_vka, m)?)?;
    Ok(())
 }

--- a/src/bindings/universal.rs
+++ b/src/bindings/universal.rs
@@ -23,7 +23,7 @@ use crate::{
    circuit::region::RegionSettings,
    graph::GraphSettings,
    pfsys::{
-        create_proof_circuit,
+        create_proof_circuit, encode_calldata,
        evm::aggregation_kzg::{AggregationCircuit, PoseidonTranscript},
        verify_proof_circuit, TranscriptType,
    },
@@ -31,8 +31,12 @@ use crate::{
    CheckMode, Commitments, EZKLError as InnerEZKLError,
 };

+use crate::circuit::modules::poseidon::{
+    spec::{PoseidonSpec, POSEIDON_RATE, POSEIDON_WIDTH},
+    PoseidonChip,
+};
+use crate::circuit::modules::Module;
 use crate::graph::{GraphCircuit, GraphWitness};
-use halo2_solidity_verifier::encode_calldata;
 use halo2curves::{
    bn256::{Bn256, Fr, G1Affine},
    ff::{FromUniformBytes, PrimeField},
@@ -61,49 +65,74 @@ impl From<InnerEZKLError> for EZKLError {
    }
 }

+/// Hash the input message with poseidon
+#[cfg_attr(feature = "ios-bindings", uniffi::export)]
+pub fn poseidon_hash(message: Vec<u8>) -> Result<Vec<u8>, EZKLError> {
+    let message: Vec<Fr> = serde_json::from_slice(&message[..]).map_err(InnerEZKLError::from)?;
+
+    let output = PoseidonChip::<PoseidonSpec, POSEIDON_WIDTH, POSEIDON_RATE>::run(message.clone())
+        .map_err(InnerEZKLError::from)?;
+
+    Ok(serde_json::to_vec(&output).map_err(InnerEZKLError::from)?)
+}
+
+/// Hash the input message with poseidon without converting to Fr
+#[cfg_attr(feature = "ios-bindings", uniffi::export)]
+pub fn poseidon_hash_no_felt(message: Vec<u8>) -> Result<Vec<u8>, EZKLError> {
+    let message: Vec<Fr> = message.iter().map(|x| Fr::from(*x as u64)).collect();
+
+    let output = PoseidonChip::<PoseidonSpec, POSEIDON_WIDTH, POSEIDON_RATE>::run(message.clone())
+        .map_err(InnerEZKLError::from)?;
+
+    Ok(serde_json::to_vec(&output).map_err(InnerEZKLError::from)?)
+}
+
 /// Encode verifier calldata from proof and ethereum vk_address
 #[cfg_attr(feature = "ios-bindings", uniffi::export)]
-pub(crate) fn encode_verifier_calldata(
-    // TODO - shuold it be pub(crate) or pub or pub(super)?
+pub fn encode_verifier_calldata(
+    // TODO - shuold it be pub or pub or pub(super)?
    proof: Vec<u8>,
-    vk_address: Option<Vec<u8>>,
+    vka: Option<Vec<u8>>,
 ) -> Result<Vec<u8>, EZKLError> {
    let snark: crate::pfsys::Snark<Fr, G1Affine> =
        serde_json::from_slice(&proof[..]).map_err(InnerEZKLError::from)?;

-    let vk_address: Option<[u8; 20]> = if let Some(vk_address) = vk_address {
-        let array: [u8; 20] =
-            serde_json::from_slice(&vk_address[..]).map_err(InnerEZKLError::from)?;
+    let vka_buf: Option<Vec<[u8; 32]>> = if let Some(vka) = vka {
+        let array: Vec<[u8; 32]> =
+            serde_json::from_slice(&vka[..]).map_err(InnerEZKLError::from)?;
        Some(array)
    } else {
        None
    };

+    let vka: Option<&[[u8; 32]]> = vka_buf.as_deref();
+
    let flattened_instances = snark.instances.into_iter().flatten();

-    let encoded = encode_calldata(
-        vk_address,
-        &snark.proof,
-        &flattened_instances.collect::<Vec<_>>(),
-    );
+    let encoded = encode_calldata(vka, &snark.proof, &flattened_instances.collect::<Vec<_>>());

    Ok(encoded)
 }

 /// Generate witness from compiled circuit and input json
 #[cfg_attr(feature = "ios-bindings", uniffi::export)]
-pub(crate) fn gen_witness(compiled_circuit: Vec<u8>, input: Vec<u8>) -> Result<Vec<u8>, EZKLError> {
+pub fn gen_witness(compiled_circuit: Vec<u8>, input: Vec<u8>) -> Result<Vec<u8>, EZKLError> {
+    println!("[circuit]");
    let mut circuit: crate::graph::GraphCircuit = bincode::deserialize(&compiled_circuit[..])
        .map_err(|e| {
            EZKLError::InternalError(format!("Failed to deserialize compiled model: {}", e))
        })?;
+
+    println!("[input]");
    let input: crate::graph::input::GraphData = serde_json::from_slice(&input[..])
        .map_err(|e| EZKLError::InternalError(format!("Failed to deserialize input: {}", e)))?;

+    println!("[load graph input]");
    let mut input = circuit
        .load_graph_input(&input)
        .map_err(|e| EZKLError::InternalError(format!("{}", e)))?;

+    println!("[load graph witness]");
    let witness = circuit
        .forward::<KZGCommitmentScheme<Bn256>>(
            &mut input,
@@ -116,13 +145,14 @@ pub(crate) fn gen_witness(compiled_circuit: Vec<u8>, input: Vec<u8>) -> Result<V
        )
        .map_err(|e| EZKLError::InternalError(format!("{}", e)))?;

+    println!("[serialize witness]");
    serde_json::to_vec(&witness)
        .map_err(|e| EZKLError::InternalError(format!("Failed to serialize witness: {}", e)))
 }

 /// Generate verifying key from compiled circuit, and parameters srs
 #[cfg_attr(feature = "ios-bindings", uniffi::export)]
-pub(crate) fn gen_vk(
+pub fn gen_vk(
    compiled_circuit: Vec<u8>,
    srs: Vec<u8>,
    compress_selectors: bool,
@@ -152,11 +182,7 @@ pub(crate) fn gen_vk(

 /// Generate proving key from vk, compiled circuit and parameters srs
 #[cfg_attr(feature = "ios-bindings", uniffi::export)]
-pub(crate) fn gen_pk(
-    vk: Vec<u8>,
-    compiled_circuit: Vec<u8>,
-    srs: Vec<u8>,
-) -> Result<Vec<u8>, EZKLError> {
+pub fn gen_pk(vk: Vec<u8>, compiled_circuit: Vec<u8>, srs: Vec<u8>) -> Result<Vec<u8>, EZKLError> {
    let mut reader = BufReader::new(&srs[..]);
    let params: ParamsKZG<Bn256> = get_params(&mut reader)?;

@@ -183,7 +209,7 @@ pub(crate) fn gen_pk(

 /// Verify proof with vk, proof json, circuit settings json and srs
 #[cfg_attr(feature = "ios-bindings", uniffi::export)]
-pub(crate) fn verify(
+pub fn verify(
    proof: Vec<u8>,
    vk: Vec<u8>,
    settings: Vec<u8>,
@@ -265,7 +291,7 @@ pub(crate) fn verify(

 /// Verify aggregate proof with vk, proof, circuit settings and srs
 #[cfg_attr(feature = "ios-bindings", uniffi::export)]
-pub(crate) fn verify_aggr(
+pub fn verify_aggr(
    proof: Vec<u8>,
    vk: Vec<u8>,
    logrows: u64,
@@ -347,7 +373,7 @@ pub(crate) fn verify_aggr(

 /// Prove in browser with compiled circuit, witness json, proving key, and srs
 #[cfg_attr(feature = "ios-bindings", uniffi::export)]
-pub(crate) fn prove(
+pub fn prove(
    witness: Vec<u8>,
    pk: Vec<u8>,
    compiled_circuit: Vec<u8>,
@@ -445,7 +471,7 @@ pub(crate) fn prove(

 /// Validate the witness json
 #[cfg_attr(feature = "ios-bindings", uniffi::export)]
-pub(crate) fn witness_validation(witness: Vec<u8>) -> Result<bool, EZKLError> {
+pub fn witness_validation(witness: Vec<u8>) -> Result<bool, EZKLError> {
    let _: GraphWitness = serde_json::from_slice(&witness[..]).map_err(InnerEZKLError::from)?;

    Ok(true)
@@ -453,7 +479,7 @@ pub(crate) fn witness_validation(witness: Vec<u8>) -> Result<bool, EZKLError> {

 /// Validate the compiled circuit
 #[cfg_attr(feature = "ios-bindings", uniffi::export)]
-pub(crate) fn compiled_circuit_validation(compiled_circuit: Vec<u8>) -> Result<bool, EZKLError> {
+pub fn compiled_circuit_validation(compiled_circuit: Vec<u8>) -> Result<bool, EZKLError> {
    let _: GraphCircuit = bincode::deserialize(&compiled_circuit[..]).map_err(|e| {
        EZKLError::InternalError(format!("Failed to deserialize compiled circuit: {}", e))
    })?;
@@ -463,7 +489,7 @@ pub(crate) fn compiled_circuit_validation(compiled_circuit: Vec<u8>) -> Result<b

 /// Validate the input json
 #[cfg_attr(feature = "ios-bindings", uniffi::export)]
-pub(crate) fn input_validation(input: Vec<u8>) -> Result<bool, EZKLError> {
+pub fn input_validation(input: Vec<u8>) -> Result<bool, EZKLError> {
    let _: crate::graph::input::GraphData =
        serde_json::from_slice(&input[..]).map_err(InnerEZKLError::from)?;

@@ -472,7 +498,7 @@ pub(crate) fn input_validation(input: Vec<u8>) -> Result<bool, EZKLError> {

 /// Validate the proof json
 #[cfg_attr(feature = "ios-bindings", uniffi::export)]
-pub(crate) fn proof_validation(proof: Vec<u8>) -> Result<bool, EZKLError> {
+pub fn proof_validation(proof: Vec<u8>) -> Result<bool, EZKLError> {
    let _: crate::pfsys::Snark<Fr, G1Affine> =
        serde_json::from_slice(&proof[..]).map_err(InnerEZKLError::from)?;

@@ -481,7 +507,7 @@ pub(crate) fn proof_validation(proof: Vec<u8>) -> Result<bool, EZKLError> {

 /// Validate the verifying key given the settings json
 #[cfg_attr(feature = "ios-bindings", uniffi::export)]
-pub(crate) fn vk_validation(vk: Vec<u8>, settings: Vec<u8>) -> Result<bool, EZKLError> {
+pub fn vk_validation(vk: Vec<u8>, settings: Vec<u8>) -> Result<bool, EZKLError> {
    let circuit_settings: GraphSettings =
        serde_json::from_slice(&settings[..]).map_err(InnerEZKLError::from)?;

@@ -498,7 +524,7 @@ pub(crate) fn vk_validation(vk: Vec<u8>, settings: Vec<u8>) -> Result<bool, EZKL

 /// Validate the proving key given the settings json
 #[cfg_attr(feature = "ios-bindings", uniffi::export)]
-pub(crate) fn pk_validation(pk: Vec<u8>, settings: Vec<u8>) -> Result<bool, EZKLError> {
+pub fn pk_validation(pk: Vec<u8>, settings: Vec<u8>) -> Result<bool, EZKLError> {
    let circuit_settings: GraphSettings =
        serde_json::from_slice(&settings[..]).map_err(InnerEZKLError::from)?;

@@ -515,7 +541,7 @@ pub(crate) fn pk_validation(pk: Vec<u8>, settings: Vec<u8>) -> Result<bool, EZKL

 /// Validate the settings json
 #[cfg_attr(feature = "ios-bindings", uniffi::export)]
-pub(crate) fn settings_validation(settings: Vec<u8>) -> Result<bool, EZKLError> {
+pub fn settings_validation(settings: Vec<u8>) -> Result<bool, EZKLError> {
    let _: GraphSettings = serde_json::from_slice(&settings[..]).map_err(InnerEZKLError::from)?;

    Ok(true)
@@ -523,7 +549,7 @@ pub(crate) fn settings_validation(settings: Vec<u8>) -> Result<bool, EZKLError>

 /// Validate the srs
 #[cfg_attr(feature = "ios-bindings", uniffi::export)]
-pub(crate) fn srs_validation(srs: Vec<u8>) -> Result<bool, EZKLError> {
+pub fn srs_validation(srs: Vec<u8>) -> Result<bool, EZKLError> {
    let mut reader = BufReader::new(&srs[..]);
    let _: ParamsKZG<Bn256> =
        halo2_proofs::poly::commitment::Params::<'_, G1Affine>::read(&mut reader).map_err(|e| {
--- a/src/bindings/wasm.rs
+++ b/src/bindings/wasm.rs
@@ -1,12 +1,5 @@
 use crate::{
-    circuit::modules::{
-        polycommit::PolyCommitChip,
-        poseidon::{
-            spec::{PoseidonSpec, POSEIDON_RATE, POSEIDON_WIDTH},
-            PoseidonChip,
-        },
-        Module,
-    },
+    circuit::modules::polycommit::PolyCommitChip,
    fieldutils::{felt_to_integer_rep, integer_rep_to_felt},
    graph::{quantize_float, scale_to_multiplier, GraphCircuit, GraphSettings},
 };
@@ -15,6 +8,7 @@ use halo2_proofs::{
    plonk::*,
    poly::kzg::commitment::{KZGCommitmentScheme, ParamsKZG},
 };
+use halo2_solidity_verifier::Evm;
 use halo2curves::{
    bn256::{Bn256, Fr, G1Affine},
    ff::PrimeField,
@@ -225,15 +219,9 @@ pub fn bufferToVecOfFelt(
 pub fn poseidonHash(
    message: wasm_bindgen::Clamped<Vec<u8>>,
 ) -> Result<wasm_bindgen::Clamped<Vec<u8>>, JsError> {
-    let message: Vec<Fr> = serde_json::from_slice(&message[..])
-        .map_err(|e| JsError::new(&format!("Failed to deserialize message: {}", e)))?;
-
-    let output = PoseidonChip::<PoseidonSpec, POSEIDON_WIDTH, POSEIDON_RATE>::run(message.clone())
-        .map_err(|e| JsError::new(&format!("{}", e)))?;
-
-    Ok(wasm_bindgen::Clamped(serde_json::to_vec(&output).map_err(
-        |e| JsError::new(&format!("Failed to serialize poseidon hash output: {}", e)),
-    )?))
+    super::universal::poseidon_hash(message.0)
+        .map_err(JsError::from)
+        .map(|x| wasm_bindgen::Clamped(x.clone()))
 }

 /// Generate a witness file from input.json, compiled model and a settings.json file.
@@ -279,6 +267,33 @@ pub fn verify(
    super::universal::verify(proof_js.0, vk.0, settings.0, srs.0).map_err(JsError::from)
 }

+/// Verify proof in browser evm using wasm
+#[wasm_bindgen]
+#[allow(non_snake_case)]
+pub fn verifyEVM(
+    proof_js: wasm_bindgen::Clamped<Vec<u8>>,
+    bytecode_verifier: Vec<u8>,
+    bytecode_vka: Option<Vec<u8>>,
+) -> Result<bool, JsError> {
+    let mut evm = Evm::unlimited();
+    let decoded_verifier = utf8_bytes_to_hex_decoded(&bytecode_verifier)?;
+    let (verifier_address, _) = evm.create(decoded_verifier);
+    // if bytecode_vk is Some, then create the vk contract
+    let vk_address = if let Some(bytecode_vka) = bytecode_vka {
+        let decoded_vka = utf8_bytes_to_hex_decoded(&bytecode_vka)?;
+        let (address, _) = evm.create(decoded_vka);
+        Some(address.as_slice().to_vec())
+        // check if bytecode_verifier is none and if so then generate the
+        // reusable verifier
+    } else {
+        None
+    };
+    let calldata = encode_verifier_calldata(proof_js.0, vk_address).map_err(JsError::from);
+    let output = evm.call(verifier_address, calldata?).1;
+    let true_word = [vec![0; 31], vec![1]].concat();
+    Ok(output == true_word)
+}
+
 /// Verify aggregate proof in browser using wasm
 #[wasm_bindgen]
 #[allow(non_snake_case)]
@@ -371,3 +386,13 @@ pub fn u8_array_to_u128_le(arr: [u8; 16]) -> u128 {
    }
    n
 }
+///
+pub fn utf8_bytes_to_hex_decoded(input: &[u8]) -> Result<Vec<u8>, JsError> {
+    let string = std::str::from_utf8(input)?.trim();
+    let hex_string = if string.starts_with("0x") {
+        &string[2..]
+    } else {
+        string
+    };
+    hex::decode(hex_string).map_err(JsError::from)
+}
--- a/src/circuit/ops/chip.rs
+++ b/src/circuit/ops/chip.rs
@@ -7,17 +7,14 @@ use halo2_proofs::{
 };
 use log::debug;
 #[cfg(feature = "python-bindings")]
-use pyo3::{
-    conversion::{FromPyObject, IntoPy},
-    exceptions::PyValueError,
-    prelude::*,
-};
+use pyo3::{conversion::FromPyObject, exceptions::PyValueError, prelude::*, IntoPyObject};
 use serde::{Deserialize, Serialize};
 #[cfg(all(feature = "ezkl", not(target_arch = "wasm32")))]
 use tosubcommand::ToFlags;

 use crate::{
    circuit::{
+        chip::einsum::analysis::EinsumAnalysis,
        ops::base::BaseOp,
        table::{Range, RangeCheck, Table},
    },
@@ -28,6 +25,9 @@ use std::{collections::BTreeMap, marker::PhantomData};
 use super::{lookup::LookupOp, region::RegionCtx, CircuitError, Op};
 use halo2curves::ff::{Field, PrimeField};

+///
+pub mod einsum;
+
 #[allow(missing_docs)]
 /// An enum representing activating the sanity checks we can perform on the accumulated arguments
 #[derive(
@@ -86,12 +86,17 @@ impl CheckMode {

 #[cfg(feature = "python-bindings")]
 /// Converts CheckMode into a PyObject (Required for CheckMode to be compatible with Python)
-impl IntoPy<PyObject> for CheckMode {
-    fn into_py(self, py: Python) -> PyObject {
-        match self {
-            CheckMode::SAFE => "safe".to_object(py),
-            CheckMode::UNSAFE => "unsafe".to_object(py),
-        }
+impl<'py> IntoPyObject<'py> for CheckMode {
+    type Target = pyo3::PyAny;
+    type Output = pyo3::Bound<'py, Self::Target>;
+    type Error = pyo3::PyErr;
+
+    fn into_pyobject(self, py: Python<'py>) -> Result<Self::Output, Self::Error> {
+        let result = match self {
+            CheckMode::SAFE => "safe",
+            CheckMode::UNSAFE => "unsafe",
+        };
+        Ok(result.into_pyobject(py)?.into_any())
    }
 }

@@ -265,6 +270,8 @@ pub struct BaseConfig<F: PrimeField + TensorType + PartialOrd> {
    pub range_checks: RangeChecks<F>,
    /// [Selector]s for the shuffles
    pub shuffles: Shuffles,
+    /// Einsum-specific configuration
+    pub einsums: Option<einsum::Einsums<F>>,
    /// Activate sanity checks
    pub check_mode: CheckMode,
    _marker: PhantomData<F>,
@@ -279,6 +286,22 @@ impl<F: PrimeField + TensorType + PartialOrd + std::hash::Hash> BaseConfig<F> {
            custom_gates: CustomGates::dummy(col_size, num_inner_cols),
            static_lookups: StaticLookups::dummy(col_size, num_inner_cols),
            dynamic_lookups: DynamicLookups::dummy(col_size, num_inner_cols),
+            einsums: Some(einsum::Einsums::<F>::dummy(col_size, num_inner_cols)),
+            shuffles: Shuffles::dummy(col_size, num_inner_cols),
+            range_checks: RangeChecks::dummy(col_size, num_inner_cols),
+            check_mode: CheckMode::SAFE,
+            shared_table_inputs: vec![],
+            _marker: PhantomData,
+        }
+    }
+
+    /// Returns a new [BaseConfig] with no inputs, no selectors, no tables, and no Freivalds' argument.
+    pub fn dummy_without_freivalds(col_size: usize, num_inner_cols: usize) -> Self {
+        Self {
+            custom_gates: CustomGates::dummy(col_size, num_inner_cols),
+            static_lookups: StaticLookups::dummy(col_size, num_inner_cols),
+            dynamic_lookups: DynamicLookups::dummy(col_size, num_inner_cols),
+            einsums: None,
            shuffles: Shuffles::dummy(col_size, num_inner_cols),
            range_checks: RangeChecks::dummy(col_size, num_inner_cols),
            check_mode: CheckMode::SAFE,
@@ -413,6 +436,7 @@ impl<F: PrimeField + TensorType + PartialOrd + std::hash::Hash> BaseConfig<F> {
            },
            static_lookups: StaticLookups::default(),
            dynamic_lookups: DynamicLookups::default(),
+            einsums: None,
            shuffles: Shuffles::default(),
            range_checks: RangeChecks::default(),
            shared_table_inputs: vec![],
@@ -687,6 +711,27 @@ impl<F: PrimeField + TensorType + PartialOrd + std::hash::Hash> BaseConfig<F> {
        Ok(())
    }

+    /// Configures and creates einsums
+    #[allow(clippy::too_many_arguments)]
+    pub fn configure_einsums(
+        &mut self,
+        cs: &mut ConstraintSystem<F>,
+        analysis: &EinsumAnalysis,
+        num_inner_cols: usize,
+        logrows: usize,
+    ) -> Result<(), CircuitError>
+    where
+        F: Field,
+    {
+        self.einsums = Some(einsum::Einsums::configure_universal(
+            cs,
+            analysis,
+            num_inner_cols,
+            logrows,
+        ));
+        Ok(())
+    }
+
    /// Configures and creates lookup selectors
    #[allow(clippy::too_many_arguments)]
    pub fn configure_shuffles(
--- a/src/circuit/ops/chip/einsum/analysis.rs
+++ b/src/circuit/ops/chip/einsum/analysis.rs
@@ -0,0 +1,210 @@
+use std::collections::{HashMap, HashSet};
+
+use itertools::Itertools;
+
+use crate::circuit::{
+    einsum::reduction_planner::{self, Reduction},
+    CircuitError,
+};
+
+///
+#[derive(Debug, Clone)]
+pub struct EinsumAnalysis {
+    /// max size of input tensors
+    pub max_input_size: usize,
+    /// max size of output tensors
+    pub max_output_size: usize,
+    /// max number of input tensors
+    pub max_num_inputs: usize,
+    /// max number of output axes
+    pub max_num_output_axes: usize,
+    /// the sum of the lengths of dot product to compute all the reductions
+    pub reduction_length: usize,
+}
+
+/// The strategy to use for einsum
+#[derive(Debug, Clone)]
+pub enum EinsumStrategy {
+    /// Use only base ops
+    BaseOps,
+    /// Use Freivalds' argument
+    Freivalds,
+}
+
+///
+#[derive(Debug, Clone)]
+pub struct SingleEquationAnalysis {
+    ///
+    pub equation: String,
+    ///
+    pub num_inputs: usize,
+    ///
+    pub max_input_size: usize,
+    ///
+    pub output_size: usize,
+    ///
+    pub num_output_axes: usize,
+    ///
+    pub output_indices: Vec<char>,
+    /// the length of dot product to compute all the reductions
+    pub reduction_length: usize,
+    /// the strategy to use for einsum
+    pub strategy: EinsumStrategy,
+}
+
+///
+pub fn analyze_einsum_usage(
+    equations: &HashMap<(usize, String), HashMap<char, usize>>,
+) -> Result<EinsumAnalysis, CircuitError> {
+    let mut max_num_inputs = 0;
+    let mut max_input_size = 0;
+    let mut max_output_size = 0;
+    let mut max_num_output_axes = 0;
+    let mut reduction_length = 0;
+
+    for ((_, equation), input_axes_to_dim) in equations.iter() {
+        let analysis = analyze_single_equation(equation, input_axes_to_dim)?;
+        max_input_size = max_input_size.max(analysis.max_input_size);
+        max_output_size = max_output_size.max(analysis.output_size);
+        max_num_inputs = max_num_inputs.max(analysis.num_inputs);
+        max_num_output_axes = max_num_output_axes.max(analysis.num_output_axes);
+        reduction_length += analysis.reduction_length;
+    }
+
+    Ok(EinsumAnalysis {
+        max_input_size,
+        max_output_size,
+        max_num_inputs,
+        max_num_output_axes,
+        reduction_length,
+    })
+}
+
+///
+pub fn analyze_single_equation(
+    equation: &str,
+    input_axes_to_dim: &HashMap<char, usize>,
+) -> Result<SingleEquationAnalysis, CircuitError> {
+    // Sanitise equation to remove trivial axes
+    let equation = {
+        let (inputs_str, output_str) = equation.split_once("->").unwrap();
+        let input_equations: Vec<&str> = inputs_str.split(',').collect();
+
+        let inputs: Vec<String> = input_equations
+            .iter()
+            .map(|input| {
+                input
+                    .chars()
+                    .filter(|char| *input_axes_to_dim.get(char).unwrap() > 1)
+                    .collect()
+            })
+            .collect();
+
+        let output = output_str
+            .chars()
+            .filter(|c| {
+                input_axes_to_dim.get(c).is_some() && *input_axes_to_dim.get(c).unwrap() > 1
+            })
+            .collect();
+
+        [inputs.join(","), output].join("->")
+    };
+
+    let (inputs_eq, output_eq) = equation.split_once("->").unwrap();
+    let input_equations: Vec<&str> = inputs_eq.split(',').collect();
+
+    let max_input_size = input_equations
+        .iter()
+        .map(|eqn| {
+            eqn.chars()
+                .map(|c| input_axes_to_dim.get(&c).unwrap())
+                .product()
+        })
+        .max()
+        .unwrap();
+
+    let output_indices: Vec<char> = output_eq.chars().collect();
+    let output_dims = output_indices
+        .iter()
+        .map(|c| input_axes_to_dim.get(&c).unwrap());
+    let output_size = output_dims.clone().product();
+
+    let output_reduction_length = {
+        let mut output_dims = output_dims.rev().cloned().collect_vec();
+        let mut total_length = 0;
+        for _ in 0..output_dims.len() {
+            let dot_product_len = output_dims.remove(0);
+            let num_dot_products: usize = output_dims.iter().product();
+            total_length += dot_product_len * num_dot_products;
+        }
+        total_length
+    };
+
+    let input_reductions_length = {
+        let input_reductions = reduction_planner::input_reductions(&equation)?;
+        input_reductions
+            .into_iter()
+            .map(|reduction| {
+                let (_, output_expr) = reduction.expression().split_once("->").unwrap();
+                let num_inputs = reduction.input_indices().len();
+                let dot_product_len = match reduction {
+                    Reduction::RLC { axis, .. } => *input_axes_to_dim.get(&axis).unwrap(),
+                    Reduction::Contraction { axis, .. } => *axis
+                        .and_then(|axis| input_axes_to_dim.get(&axis))
+                        .unwrap_or(&1),
+                };
+                let num_dot_products: usize = output_expr
+                    .chars()
+                    .map(|c| input_axes_to_dim.get(&c).unwrap())
+                    .product();
+                // since `multi_dot` does pairwise mult between input pairs and final summation
+                if num_inputs <= 2 {
+                    num_dot_products * dot_product_len
+                } else {
+                    num_dot_products * (dot_product_len * num_inputs)
+                }
+            })
+            .sum::<usize>()
+    };
+
+    let dispatch_to_einsum_with_base_ops = {
+        let mut seen = HashSet::new();
+        let mut common_indices_to_inputs = vec![];
+        for input in input_equations.iter() {
+            for c in input.chars() {
+                if !seen.contains(&c) {
+                    seen.insert(c);
+                } else {
+                    common_indices_to_inputs.push(c);
+                }
+            }
+        }
+        let non_common_indices = input_axes_to_dim
+            .keys()
+            .filter(|&x| {
+                !common_indices_to_inputs.contains(x)
+                    && input_axes_to_dim.get(x).cloned().unwrap() > 1
+            })
+            .collect::<Vec<_>>();
+        !(output_indices.len() > 0
+            && common_indices_to_inputs.len() > 0
+            && non_common_indices.len() > 1)
+    };
+
+    let strategy = if dispatch_to_einsum_with_base_ops {
+        EinsumStrategy::BaseOps
+    } else {
+        EinsumStrategy::Freivalds
+    };
+
+    Ok(SingleEquationAnalysis {
+        output_size,
+        max_input_size,
+        equation: equation.to_string(),
+        num_inputs: input_equations.len(),
+        num_output_axes: output_indices.len(),
+        output_indices,
+        reduction_length: output_reduction_length + input_reductions_length,
+        strategy,
+    })
+}
--- a/src/circuit/ops/chip/einsum/circuit_params.rs
+++ b/src/circuit/ops/chip/einsum/circuit_params.rs
@@ -0,0 +1,54 @@
+use std::{collections::HashMap, marker::PhantomData};
+
+use halo2_proofs::circuit::Value;
+use halo2curves::ff::PrimeField;
+
+use crate::{
+    circuit::CircuitError,
+    tensor::{Tensor, TensorError, TensorType},
+};
+
+/// Circuit parameter for a single einsum equation
+#[derive(Clone, Debug, Default)]
+pub struct SingleEinsumParams<F: PrimeField + TensorType + PartialOrd> {
+    ///
+    pub equation: String,
+    /// Map from input axes to dimensions
+    pub input_axes_to_dims: HashMap<char, usize>,
+    _marker: PhantomData<F>,
+}
+
+impl<F: PrimeField + TensorType + PartialOrd> SingleEinsumParams<F> {
+    ///
+    pub fn new(equation: &str, inputs: &[&Tensor<Value<F>>]) -> Result<Self, CircuitError> {
+        let mut eq = equation.split("->");
+        let inputs_eq = eq.next().ok_or(CircuitError::InvalidEinsum)?;
+        let inputs_eq = inputs_eq.split(',').collect::<Vec<_>>();
+
+        // Check that the number of inputs matches the number of inputs in the equation
+        if inputs.len() != inputs_eq.len() {
+            return Err(TensorError::DimMismatch("einsum".to_string()).into());
+        }
+
+        let mut input_axes_to_dims = HashMap::new();
+        for (i, input) in inputs.iter().enumerate() {
+            for j in 0..inputs_eq[i].len() {
+                let c = inputs_eq[i]
+                    .chars()
+                    .nth(j)
+                    .ok_or(CircuitError::InvalidEinsum)?;
+                if let std::collections::hash_map::Entry::Vacant(e) = input_axes_to_dims.entry(c) {
+                    e.insert(input.dims()[j]);
+                } else if input_axes_to_dims[&c] != input.dims()[j] {
+                    return Err(TensorError::DimMismatch("einsum".to_string()).into());
+                }
+            }
+        }
+
+        Ok(Self {
+            equation: equation.to_owned(),
+            input_axes_to_dims,
+            _marker: PhantomData,
+        })
+    }
+}
--- a/src/circuit/ops/chip/einsum/layouts.rs
+++ b/src/circuit/ops/chip/einsum/layouts.rs
@@ -0,0 +1,359 @@
+use halo2curves::ff::PrimeField;
+use log::{error, trace};
+
+use crate::{
+    circuit::{base::BaseOp, einsum::BaseOpInfo, region::RegionCtx, CheckMode, CircuitError},
+    tensor::{
+        get_broadcasted_shape,
+        ops::{accumulated, add, mult, sub},
+        TensorError, TensorType, ValTensor, ValType,
+    },
+};
+
+use super::ContractionConfig;
+
+/// Pairwise (elementwise) op layout
+pub fn pairwise<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
+    config: &ContractionConfig<F>,
+    region: &mut RegionCtx<F>,
+    values: &[&ValTensor<F>; 2],
+    op: BaseOp,
+    phases: &[usize; 2],
+) -> Result<ValTensor<F>, CircuitError> {
+    let (mut lhs, mut rhs) = if phases[0] <= phases[1] {
+        (values[0].clone(), values[1].clone())
+    } else {
+        (values[1].clone(), values[0].clone())
+    };
+
+    let broadcasted_shape = get_broadcasted_shape(lhs.dims(), rhs.dims())?;
+
+    lhs.expand(&broadcasted_shape)?;
+    rhs.expand(&broadcasted_shape)?;
+
+    if lhs.len() != rhs.len() {
+        return Err(CircuitError::DimMismatch(format!(
+            "pairwise {} layout",
+            op.as_str()
+        )));
+    }
+
+    region.flush_einsum()?;
+
+    let input_vars = config.get_input_vars(phases.as_slice().into());
+    let output_var = config.get_output_var(phases.as_slice().into());
+
+    let inputs = [lhs, rhs]
+        .iter()
+        .zip(input_vars)
+        .map(|(val, var)| {
+            let res = region.assign_einsum(var, val)?;
+            Ok(res.get_inner()?)
+        })
+        .collect::<Result<Vec<_>, CircuitError>>()?;
+
+    // Now we can assign the dot product
+    // time the calc
+    let op_result = match op {
+        BaseOp::Add => add(&inputs),
+        BaseOp::Sub => sub(&inputs),
+        BaseOp::Mult => mult(&inputs),
+        _ => return Err(CircuitError::UnsupportedOp),
+    }
+    .map_err(|e| {
+        error!("{}", e);
+        halo2_proofs::plonk::Error::Synthesis
+    })?;
+
+    let assigned_len = op_result.len();
+    let mut output = region.assign_einsum(output_var, &op_result.into())?;
+
+    // Enable the selectors
+    if !region.is_dummy() {
+        (0..assigned_len)
+            .map(|i| {
+                let (x, y, z) = output_var.cartesian_coord(region.einsum_col_coord() + i);
+                let op_info = BaseOpInfo {
+                    op_kind: op.clone(),
+                    input_phases: phases.as_slice().into(),
+                };
+                let selector = config.selectors.get(&(op_info, x, y));
+
+                region.enable(selector, z)?;
+
+                Ok(())
+            })
+            .collect::<Result<Vec<_>, CircuitError>>()?;
+    }
+    region.increment_einsum_col_coord(assigned_len);
+
+    output.reshape(&broadcasted_shape)?;
+
+    Ok(output)
+}
+
+pub fn sum<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
+    config: &ContractionConfig<F>,
+    region: &mut RegionCtx<F>,
+    values: &[&ValTensor<F>; 1],
+    phase: usize,
+    check_mode: &CheckMode,
+) -> Result<ValTensor<F>, CircuitError> {
+    if values[0].len() == 1 {
+        return Ok(values[0].clone());
+    }
+    assert!(phase == 0 || phase == 1);
+
+    region.flush_einsum()?;
+    let mut input = values[0].clone();
+
+    let block_width = config.block_width();
+
+    let assigned_len: usize;
+    let input = {
+        input.pad_to_zero_rem(block_width, ValType::Constant(F::ZERO))?;
+        let var = config.get_input_vars([phase].as_slice().into())[0];
+        let (res, len) = region.assign_einsum_with_duplication_unconstrained(var, &input)?;
+        assigned_len = len;
+        res.get_inner()?
+    };
+
+    // Now we can assign the dot product
+    let accumulated_sum = accumulated::sum(&input, block_width)?;
+
+    let output_var = config.get_output_var([phase].as_slice().into());
+    let (output, output_assigned_len) = region.assign_einsum_with_duplication_constrained(
+        output_var,
+        &accumulated_sum.into(),
+        check_mode,
+    )?;
+
+    // enable the selectors
+    if !region.is_dummy() {
+        for i in 0..output_assigned_len {
+            let (x, _, z) = output_var.cartesian_coord(region.einsum_col_coord() + i * block_width);
+            // skip over duplicates at start of column
+            if z == 0 && i > 0 {
+                continue;
+            }
+            let selector = if i == 0 {
+                let op_info = BaseOpInfo {
+                    op_kind: BaseOp::SumInit,
+                    input_phases: [phase].as_slice().into(),
+                };
+                config.selectors.get(&(op_info, x, 0))
+            } else {
+                let op_info = BaseOpInfo {
+                    op_kind: BaseOp::Sum,
+                    input_phases: [phase].as_slice().into(),
+                };
+                config.selectors.get(&(op_info, x, 0))
+            };
+
+            region.enable(selector, z)?;
+        }
+    }
+
+    let last_elem = output.last()?;
+
+    region.increment_einsum_col_coord(assigned_len);
+
+    // last element is the result
+    Ok(last_elem)
+}
+
+pub fn prod<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
+    config: &ContractionConfig<F>,
+    region: &mut RegionCtx<F>,
+    values: &[&ValTensor<F>; 1],
+    phase: usize,
+    check_mode: &CheckMode,
+) -> Result<ValTensor<F>, CircuitError> {
+    assert!(phase == 0 || phase == 1);
+    region.flush_einsum()?;
+    let block_width = config.block_width();
+    let assigned_len: usize;
+    let input = {
+        let mut input = values[0].clone();
+        input.pad_to_zero_rem(block_width, ValType::Constant(F::ONE))?;
+        let var = config.get_input_vars([phase].as_slice().into())[0];
+        let (res, len) = region.assign_einsum_with_duplication_unconstrained(var, &input)?;
+        assigned_len = len;
+        res.get_inner()?
+    };
+
+    // Now we can assign the dot product
+    let accumulated_prod = accumulated::prod(&input, block_width)?;
+
+    let output_var = config.get_output_var([phase].as_slice().into());
+    let (output, output_assigned_len) = region.assign_einsum_with_duplication_constrained(
+        output_var,
+        &accumulated_prod.into(),
+        check_mode,
+    )?;
+
+    // enable the selectors
+    if !region.is_dummy() {
+        (0..output_assigned_len)
+            .map(|i| {
+                let (x, _, z) =
+                    output_var.cartesian_coord(region.einsum_col_coord() + i * block_width);
+                // skip over duplicates at start of column
+                if z == 0 && i > 0 {
+                    return Ok(());
+                }
+                let selector = if i == 0 {
+                    let op_info = BaseOpInfo {
+                        op_kind: BaseOp::CumProdInit,
+                        input_phases: [phase].as_slice().into(),
+                    };
+                    config.selectors.get(&(op_info, x, 0))
+                } else {
+                    let op_info = BaseOpInfo {
+                        op_kind: BaseOp::CumProd,
+                        input_phases: [phase].as_slice().into(),
+                    };
+                    config.selectors.get(&(op_info, x, 0))
+                };
+
+                region.enable(selector, z)?;
+                Ok(())
+            })
+            .collect::<Result<Vec<_>, CircuitError>>()?;
+    }
+
+    let last_elem = output.last()?;
+
+    region.increment_einsum_col_coord(assigned_len);
+
+    // last element is the result
+    Ok(last_elem)
+}
+
+pub fn dot<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
+    config: &ContractionConfig<F>,
+    region: &mut RegionCtx<F>,
+    values: &[&ValTensor<F>; 2],
+    phases: &[usize; 2],
+    check_mode: &CheckMode,
+) -> Result<ValTensor<F>, CircuitError> {
+    if values[0].len() != values[1].len() {
+        return Err(TensorError::DimMismatch("dot".to_string()).into());
+    }
+
+    region.flush_einsum()?;
+    // time this entire function run
+    let global_start = instant::Instant::now();
+
+    let mut values = if phases[0] <= phases[1] {
+        [values[0].clone(), values[1].clone()]
+    } else {
+        [values[1].clone(), values[0].clone()]
+    };
+    let vars = config.get_input_vars(phases.as_slice().into());
+
+    let mut inputs = vec![];
+    let block_width = config.block_width();
+
+    let mut assigned_len = 0;
+    for (val, var) in values.iter_mut().zip(vars) {
+        val.pad_to_zero_rem(block_width, ValType::Constant(F::ZERO))?;
+        let inp = {
+            let (res, len) = region.assign_einsum_with_duplication_unconstrained(var, &val)?;
+            assigned_len = len;
+            res.get_inner()?
+        };
+        inputs.push(inp);
+    }
+
+    // Now we can assign the dot product
+    // time this step
+    let accumulated_dot = accumulated::dot(&inputs[0], &inputs[1], block_width)?;
+    let output_var = config.get_output_var(phases.as_slice().into());
+    let (output, output_assigned_len) = region
+        .assign_einsum_with_duplication_constrained(output_var, &accumulated_dot.into(), check_mode)
+        .expect("failed to assign einsum with duplication constrained");
+
+    // enable the selectors
+    if !region.is_dummy() {
+        (0..output_assigned_len)
+            .map(|i| {
+                let (x, _, z) =
+                    output_var.cartesian_coord(region.einsum_col_coord() + i * block_width);
+                // hop over duplicates at start of column
+                if z == 0 && i > 0 {
+                    return Ok(());
+                }
+                let selector = if i == 0 {
+                    let op_info = BaseOpInfo {
+                        op_kind: BaseOp::DotInit,
+                        input_phases: phases.as_slice().into(),
+                    };
+                    config.selectors.get(&(op_info, x, 0))
+                } else {
+                    let op_info = BaseOpInfo {
+                        op_kind: BaseOp::Dot,
+                        input_phases: phases.as_slice().into(),
+                    };
+                    config.selectors.get(&(op_info, x, 0))
+                };
+                region.enable(selector, z)?;
+
+                Ok(())
+            })
+            .collect::<Result<Vec<_>, CircuitError>>()?;
+    }
+
+    let last_elem = output.last()?;
+
+    region.increment_einsum_col_coord(assigned_len);
+
+    let elapsed = global_start.elapsed();
+    trace!("dot layout took: {:?}, row {}", elapsed, region.row());
+    trace!("----------------------------");
+    Ok(last_elem)
+}
+
+/// Dot product of more than two tensors
+pub fn multi_dot<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
+    config: &ContractionConfig<F>,
+    region: &mut RegionCtx<F>,
+    values: &[&ValTensor<F>],
+    phases: &[usize],
+    check_mode: &CheckMode,
+) -> Result<ValTensor<F>, CircuitError> {
+    assert!(phases.iter().all(|phase| *phase == 0 || *phase == 1));
+    if !values.iter().all(|value| value.len() == values[0].len()) {
+        return Err(TensorError::DimMismatch("dot".to_string()).into());
+    }
+    // time this entire function run
+    let global_start = instant::Instant::now();
+
+    let values: Vec<ValTensor<F>> = values.iter().copied().cloned().collect();
+    // do pairwise dot product between intermediate tensor and the next tensor
+    let (intermediate, output_phase) = values
+        .into_iter()
+        .zip(phases.iter().cloned())
+        .reduce(|(intermediate, intermediate_phase), (input, phase)| {
+            (
+                pairwise(
+                    config,
+                    region,
+                    &[&intermediate, &input],
+                    BaseOp::Mult,
+                    &[intermediate_phase, phase],
+                )
+                .unwrap(),
+                std::cmp::max(intermediate_phase, phase),
+            )
+        })
+        .unwrap();
+
+    let accumulated_dot = sum(config, region, &[&intermediate], output_phase, check_mode)?;
+    let last_elem = accumulated_dot.last()?;
+
+    let elapsed = global_start.elapsed();
+    trace!("multi_dot layout took: {:?}, row {}", elapsed, region.row());
+    trace!("----------------------------");
+    Ok(last_elem)
+}
--- a/src/circuit/ops/chip/einsum/mod.rs
+++ b/src/circuit/ops/chip/einsum/mod.rs
@@ -0,0 +1,867 @@
+use crate::circuit::base::BaseOp;
+use crate::circuit::chip::einsum::analysis::{analyze_single_equation, EinsumAnalysis};
+use crate::circuit::einsum::layouts::{pairwise, sum};
+use crate::circuit::einsum::reduction_planner::Reduction;
+use crate::circuit::layouts::einsum_with_base_ops;
+use crate::circuit::region::RegionCtx;
+use crate::circuit::{BaseConfig, CheckMode, CircuitError};
+use crate::tensor::{Tensor, TensorError, TensorType, ValTensor, ValType, VarTensor};
+use halo2_proofs::circuit::Value;
+use halo2_proofs::plonk::{
+    Challenge, ConstraintSystem, Constraints, Expression, FirstPhase, Selector,
+};
+use halo2curves::ff::PrimeField;
+use itertools::Itertools;
+use layouts::{dot, multi_dot, prod};
+use std::collections::{BTreeMap, HashMap};
+use std::marker::PhantomData;
+
+///
+pub mod analysis;
+///
+pub mod circuit_params;
+mod layouts;
+mod reduction_planner;
+
+/// The maximum number of challenges
+pub const NUM_MAX_EINSUM_CHALLENGES: usize = 10;
+
+/// A struct representing reductions for the einsums
+#[derive(Clone, Debug, Default)]
+pub struct Einsums<F: PrimeField + TensorType + PartialOrd> {
+    /// custom gate to constrain tensor contractions
+    contraction_gate: ContractionConfig<F>,
+    /// custom gate to constrain random linear combinations used by Freivalds' argument
+    rlc_gates: Vec<RLCConfig<F>>,
+}
+
+impl<F: PrimeField + TensorType + PartialOrd + std::hash::Hash> Einsums<F> {
+    ///
+    pub fn dummy(col_size: usize, num_inner_cols: usize) -> Self {
+        let dummy_var = VarTensor::dummy(col_size, num_inner_cols);
+        let dummy_contraction_gate = ContractionConfig {
+            inputs: [
+                [dummy_var.clone(), dummy_var.clone()],
+                [dummy_var.clone(), dummy_var.clone()],
+            ],
+            outputs: [dummy_var.clone(), dummy_var.clone()],
+            selectors: BTreeMap::default(),
+            _marker: PhantomData,
+        };
+        Self {
+            contraction_gate: dummy_contraction_gate,
+            rlc_gates: (0..NUM_MAX_EINSUM_CHALLENGES)
+                .map(|_| RLCConfig::dummy(&dummy_var))
+                .collect(),
+        }
+    }
+
+    /// Configure the columns based on universal Einsum analysis
+    pub fn configure_universal(
+        meta: &mut ConstraintSystem<F>,
+        analysis: &EinsumAnalysis,
+        num_inner_cols: usize,
+        logrows: usize,
+    ) -> Self {
+        let capacity = analysis.reduction_length;
+        let inputs: [VarTensor; 4] = [
+            VarTensor::new_advice(meta, logrows, num_inner_cols, capacity),
+            VarTensor::new_advice(meta, logrows, num_inner_cols, capacity),
+            VarTensor::new_advice_in_second_phase(meta, logrows, num_inner_cols, capacity),
+            VarTensor::new_advice_in_second_phase(meta, logrows, num_inner_cols, capacity),
+        ];
+        let outputs = [
+            VarTensor::new_advice(meta, logrows, num_inner_cols, capacity),
+            VarTensor::new_advice_in_second_phase(meta, logrows, num_inner_cols, capacity),
+        ];
+        let contraction_gate = ContractionConfig::new(
+            meta,
+            &[&[&inputs[0], &inputs[1]], &[&inputs[2], &inputs[3]]],
+            &[&outputs[0], &outputs[1]],
+        );
+
+        let mut rlc_gates = vec![];
+        for _ in 0..analysis.max_num_output_axes {
+            let rlc_gate =
+                RLCConfig::new(meta, &[inputs[0].clone(), inputs[2].clone()], &outputs[1]);
+            rlc_gates.push(rlc_gate);
+        }
+
+        Self {
+            contraction_gate,
+            rlc_gates,
+        }
+    }
+
+    /// In dummy layout phase, calling this function will return error
+    pub fn challenges(&self) -> Result<Vec<Challenge>, CircuitError> {
+        self.rlc_gates
+            .iter()
+            .map(|gate| gate.challenge.ok_or(CircuitError::ChallengeNotSet))
+            .collect::<Result<Vec<_>, _>>()
+    }
+
+    ///
+    pub fn assign_einsum(
+        &self,
+        base_config: &BaseConfig<F>,
+        region: &mut RegionCtx<F>,
+        input_tensors: &[&ValTensor<F>],
+        output_tensor: &ValTensor<F>,
+        equation: &str,
+        check_mode: &CheckMode,
+    ) -> Result<(), CircuitError> {
+        region.set_num_einsum_inner_cols(self.contraction_gate.block_width());
+
+        let (input_exprs, _) = equation.split_once("->").unwrap();
+        let input_exprs = input_exprs.split(",").collect_vec();
+        assert_eq!(input_exprs.len(), input_tensors.len());
+
+        let mut input_tensors = input_tensors.iter().copied().cloned().collect_vec();
+        let mut output_tensor = output_tensor.clone();
+
+        let mut input_axes_to_dim: HashMap<char, usize> = HashMap::new();
+        input_exprs
+            .iter()
+            .zip(input_tensors.iter())
+            .for_each(|(indices, tensor)| {
+                indices.chars().zip(tensor.dims()).for_each(|(index, dim)| {
+                    if let std::collections::hash_map::Entry::Vacant(e) =
+                        input_axes_to_dim.entry(index)
+                    {
+                        e.insert(*dim);
+                    }
+                });
+            });
+
+        let equation_analysis = analyze_single_equation(&equation, &input_axes_to_dim)?;
+        let equation = equation_analysis.equation;
+
+        // Remove trivial axes from tensors
+        input_tensors
+            .iter_mut()
+            .map(|tensor| tensor.remove_trivial_axes())
+            .collect::<Result<Vec<_>, TensorError>>()?;
+        output_tensor.remove_trivial_axes()?;
+
+        if matches!(
+            equation_analysis.strategy,
+            analysis::EinsumStrategy::BaseOps
+        ) {
+            let _ = einsum_with_base_ops(
+                base_config,
+                region,
+                &input_tensors.iter().collect_vec(),
+                &equation,
+            )?;
+            return Ok(());
+        }
+
+        let output_shape = equation_analysis
+            .output_indices
+            .iter()
+            .map(|c| input_axes_to_dim.get(c).copied().unwrap())
+            .collect_vec();
+        let squashed_output =
+            self.assign_output(region, &output_tensor, output_shape, check_mode)?;
+
+        // reorder the reduction of input tensors and reduce
+        let reordered_input_reductions = reduction_planner::input_reductions(&equation).unwrap();
+        let mut tensors = input_tensors;
+        let mut reduced_input_phase = 0;
+
+        for reduction in reordered_input_reductions.iter() {
+            let (input_expr, output_expr) = reduction.expression().split_once("->").unwrap();
+            let input_exprs = input_expr.split(",").collect_vec();
+
+            let remaining_axes = output_expr.chars().collect_vec();
+            let mut remaining_axes_indices = remaining_axes
+                .iter()
+                .map(|c| 0..input_axes_to_dim[c])
+                .multi_cartesian_product()
+                .collect_vec();
+
+            // Dummy value to ensure the for loop runs at least once
+            if remaining_axes.is_empty() {
+                remaining_axes_indices.push(vec![]);
+            }
+
+            let input_tensors = reduction
+                .input_indices()
+                .iter()
+                .map(|idx| tensors[*idx].clone())
+                .collect_vec();
+
+            let mut flattened_input_tensors: Vec<Vec<ValTensor<F>>> =
+                vec![vec![]; input_tensors.len()];
+            for remaining_axes_indices in remaining_axes_indices {
+                // corresponds to 1 running sum of input tensors
+                for (i, (input_tensor, input_expr)) in
+                    input_tensors.iter().zip(input_exprs.iter()).enumerate()
+                {
+                    let mut sliced_dim = vec![];
+                    input_expr.chars().for_each(|axis| {
+                        if let Some(pos) = remaining_axes.iter().position(|c| *c == axis) {
+                            sliced_dim
+                                .push(remaining_axes_indices[pos]..remaining_axes_indices[pos] + 1);
+                        } else {
+                            // common axis
+                            sliced_dim.push(0..input_axes_to_dim[&axis]);
+                        }
+                    });
+                    let mut sliced_input_tensor = input_tensor.get_slice(&sliced_dim)?;
+                    sliced_input_tensor.flatten();
+                    flattened_input_tensors[i].push(sliced_input_tensor);
+                }
+            }
+            let flattened_input_tensors = flattened_input_tensors
+                .into_iter()
+                .map(|tensors| {
+                    ValTensor::from(
+                        tensors
+                            .into_iter()
+                            .flat_map(|t| t.get_inner_tensor().unwrap().clone().into_iter())
+                            .collect_vec(),
+                    )
+                })
+                .collect_vec();
+
+            let output_dims = output_expr
+                .chars()
+                .map(|c| input_axes_to_dim[&c])
+                .collect_vec();
+
+            let contracted_output = match reduction {
+                Reduction::RLC {
+                    axis,
+                    input_phase,
+                    challenge_index,
+                    ..
+                } => {
+                    assert_eq!(flattened_input_tensors.len(), 1);
+                    let rlc_len = input_axes_to_dim[axis];
+                    let mut result = self.rlc_gates[*challenge_index].assign_rlc(
+                        region,
+                        &flattened_input_tensors[0],
+                        region.challenges()[*challenge_index],
+                        rlc_len,
+                        *input_phase,
+                        check_mode,
+                    )?;
+                    result.reshape(&output_dims)?;
+                    result
+                }
+                Reduction::Contraction {
+                    axis, input_phases, ..
+                } => match axis {
+                    Some(axis) => {
+                        let dot_product_len = input_axes_to_dim[axis];
+                        assign_input_contraction(
+                            &self.contraction_gate,
+                            region,
+                            flattened_input_tensors,
+                            dot_product_len,
+                            &output_dims,
+                            input_phases,
+                            check_mode,
+                        )?
+                    }
+                    None => {
+                        let mut result = assign_pairwise_mult(
+                            &self.contraction_gate,
+                            region,
+                            flattened_input_tensors,
+                            input_phases,
+                        )?;
+                        result.reshape(&output_dims)?;
+                        result
+                    }
+                },
+            };
+            tensors.push(contracted_output);
+            reduced_input_phase = reduction.output_phase();
+        }
+        tensors.retain(|tensor| tensor.is_singleton());
+
+        let scalars: ValTensor<F> = tensors
+            .into_iter()
+            .map(|t| t.get_inner_tensor().unwrap().get_scalar())
+            .collect_vec()
+            .into();
+        let squashed_input = prod(
+            &self.contraction_gate,
+            region,
+            &[&scalars],
+            reduced_input_phase,
+            check_mode,
+        )?;
+
+        region.constrain_equal(&squashed_input, &squashed_output)
+    }
+
+    fn assign_output(
+        &self,
+        region: &mut RegionCtx<F>,
+        output: &ValTensor<F>,
+        output_shape: Vec<usize>,
+        check_mode: &CheckMode,
+    ) -> Result<ValTensor<F>, CircuitError> {
+        let mut intermediate_values = output.clone();
+
+        let challenges = region
+            .challenges()
+            .iter()
+            .take(output_shape.len())
+            .copied()
+            .collect_vec();
+
+        // Loop over the output axes
+        for (idx, (rlc_config, challenge)) in self
+            .rlc_gates
+            .iter()
+            .take(output_shape.len())
+            .zip(challenges.iter())
+            .rev()
+            .enumerate()
+        {
+            let rlc_len = output_shape[output_shape.len() - idx - 1];
+            intermediate_values.flatten();
+            let phase = if idx > 0 { 1 } else { 0 };
+            intermediate_values = rlc_config.assign_rlc(
+                region,
+                &intermediate_values,
+                *challenge,
+                rlc_len,
+                phase,
+                check_mode,
+            )?;
+        }
+
+        let phase = if challenges.len() > 0 { 1 } else { 0 };
+        let output_var = self
+            .contraction_gate
+            .get_output_var([phase].as_slice().into());
+        let res = region.assign_einsum(output_var, &intermediate_values)?;
+        region.increment_einsum_col_coord(1);
+
+        Ok(res)
+    }
+}
+
+fn assign_pairwise_mult<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
+    config: &ContractionConfig<F>,
+    region: &mut RegionCtx<F>,
+    flattened_tensors: Vec<ValTensor<F>>,
+    input_phases: &[usize],
+) -> Result<ValTensor<F>, CircuitError> {
+    assert_eq!(flattened_tensors.len(), input_phases.len());
+    let (result, _) = flattened_tensors
+        .into_iter()
+        .zip(input_phases.iter().cloned())
+        .reduce(|(acc, acc_phase), (input, phase)| {
+            (
+                pairwise(
+                    config,
+                    region,
+                    &[&acc, &input],
+                    BaseOp::Mult,
+                    &[acc_phase, phase],
+                )
+                .unwrap(),
+                std::cmp::max(acc_phase, phase),
+            )
+        })
+        .unwrap();
+    Ok(result)
+}
+
+fn assign_input_contraction<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
+    config: &ContractionConfig<F>,
+    region: &mut RegionCtx<F>,
+    flattened_tensors: Vec<ValTensor<F>>,
+    dot_product_len: usize,
+    output_shape: &[usize],
+    input_phases: &[usize],
+    check_mode: &CheckMode,
+) -> Result<ValTensor<F>, CircuitError> {
+    assert_eq!(flattened_tensors.len(), input_phases.len());
+    let num_dot_products = output_shape.iter().product();
+    let mut dot_product_results = vec![];
+    for chunk_idx in 0..num_dot_products {
+        let start = chunk_idx * dot_product_len;
+        let tensors: Vec<_> = flattened_tensors
+            .iter()
+            .map(|tensor| tensor.get_slice(&[start..(start + dot_product_len)]))
+            .collect::<Result<Vec<_>, TensorError>>()?;
+        let result = if tensors.len() == 1 {
+            sum(config, region, &[&tensors[0]], input_phases[0], check_mode)?
+        } else if tensors.len() == 2 {
+            dot(
+                config,
+                region,
+                &[&tensors[0], &tensors[1]],
+                &[input_phases[0], input_phases[1]],
+                check_mode,
+            )?
+        } else {
+            multi_dot(
+                config,
+                region,
+                tensors.iter().collect_vec().as_slice(),
+                input_phases,
+                check_mode,
+            )?
+        };
+        dot_product_results.push(result.get_inner_tensor()?.get_scalar());
+    }
+    let mut tensor = ValTensor::from(dot_product_results);
+    tensor.reshape(output_shape)?;
+    Ok(tensor)
+}
+
+#[derive(Debug, Clone, Copy, Ord, PartialOrd, Eq, PartialEq, Hash)]
+enum InputPhases {
+    FirstPhase,
+    SecondPhase,
+    BothFirstPhase,  // [0, 0]
+    Mixed,           // [0, 1] or [1, 0]
+    BothSecondPhase, // [1, 1]
+}
+
+impl From<&[usize]> for InputPhases {
+    fn from(phases: &[usize]) -> Self {
+        match phases {
+            [0] => Self::FirstPhase,
+            [1] => Self::SecondPhase,
+            [0, 0] => Self::BothFirstPhase,
+            [0, 1] | [1, 0] => Self::Mixed,
+            [1, 1] => Self::BothSecondPhase,
+            _ => panic!("Invalid phase combination"),
+        }
+    }
+}
+
+#[derive(Clone, Debug, Eq, Ord, PartialEq, PartialOrd)]
+struct BaseOpInfo {
+    pub op_kind: BaseOp,
+    pub input_phases: InputPhases,
+}
+
+/// `ContractionConfig` is the custom gate to constrain tensor contractions
+#[derive(Clone, Debug, Default)]
+struct ContractionConfig<F: PrimeField + TensorType + PartialOrd> {
+    // [[first phase, first phase], [second phase, second phase]]
+    inputs: [[VarTensor; 2]; 2],
+    // [first phase, second phase]
+    outputs: [VarTensor; 2],
+    // (BaseOpInfo, block index, inner column index) -> selector
+    selectors: BTreeMap<(BaseOpInfo, usize, usize), Selector>,
+    _marker: PhantomData<F>,
+}
+
+impl<F: PrimeField + TensorType + PartialOrd> ContractionConfig<F> {
+    fn get_input_vars(&self, input_phases: InputPhases) -> Vec<&VarTensor> {
+        match input_phases {
+            InputPhases::FirstPhase => vec![&self.inputs[0][0]],
+            InputPhases::SecondPhase => vec![&self.inputs[1][0]],
+            InputPhases::BothFirstPhase => vec![&self.inputs[0][0], &self.inputs[0][1]],
+            InputPhases::Mixed => vec![&self.inputs[0][0], &self.inputs[1][0]],
+            InputPhases::BothSecondPhase => vec![&self.inputs[1][0], &self.inputs[1][1]],
+        }
+    }
+
+    fn get_output_var(&self, input_phases: InputPhases) -> &VarTensor {
+        match input_phases {
+            InputPhases::FirstPhase => &self.outputs[0],
+            InputPhases::SecondPhase => &self.outputs[1],
+            InputPhases::BothFirstPhase => &self.outputs[0],
+            InputPhases::Mixed => &self.outputs[1],
+            InputPhases::BothSecondPhase => &self.outputs[1],
+        }
+    }
+
+    fn block_width(&self) -> usize {
+        self.outputs[0].num_inner_cols()
+    }
+
+    fn new(
+        meta: &mut ConstraintSystem<F>,
+        inputs: &[&[&VarTensor; 2]; 2],
+        outputs: &[&VarTensor; 2],
+    ) -> Self {
+        let mut selectors = BTreeMap::new();
+        let num_blocks = outputs[0].num_blocks();
+        let block_width = outputs[0].num_inner_cols();
+        for input_phases in [
+            InputPhases::BothFirstPhase,
+            InputPhases::Mixed,
+            InputPhases::BothSecondPhase,
+        ] {
+            for i in 0..num_blocks {
+                for j in 0..block_width {
+                    selectors.insert(
+                        (
+                            BaseOpInfo {
+                                op_kind: BaseOp::Mult,
+                                input_phases,
+                            },
+                            i,
+                            j,
+                        ),
+                        meta.selector(),
+                    );
+                }
+                for i in 0..num_blocks {
+                    selectors.insert(
+                        (
+                            BaseOpInfo {
+                                op_kind: BaseOp::DotInit,
+                                input_phases,
+                            },
+                            i,
+                            0,
+                        ),
+                        meta.selector(),
+                    );
+                    selectors.insert(
+                        (
+                            BaseOpInfo {
+                                op_kind: BaseOp::Dot,
+                                input_phases,
+                            },
+                            i,
+                            0,
+                        ),
+                        meta.selector(),
+                    );
+                }
+            }
+        }
+
+        for input_phases in [InputPhases::FirstPhase, InputPhases::SecondPhase] {
+            for i in 0..num_blocks {
+                selectors.insert(
+                    (
+                        BaseOpInfo {
+                            op_kind: BaseOp::SumInit,
+                            input_phases,
+                        },
+                        i,
+                        0,
+                    ),
+                    meta.selector(),
+                );
+                selectors.insert(
+                    (
+                        BaseOpInfo {
+                            op_kind: BaseOp::Sum,
+                            input_phases,
+                        },
+                        i,
+                        0,
+                    ),
+                    meta.selector(),
+                );
+                selectors.insert(
+                    (
+                        BaseOpInfo {
+                            op_kind: BaseOp::CumProdInit,
+                            input_phases,
+                        },
+                        i,
+                        0,
+                    ),
+                    meta.selector(),
+                );
+                selectors.insert(
+                    (
+                        BaseOpInfo {
+                            op_kind: BaseOp::CumProd,
+                            input_phases,
+                        },
+                        i,
+                        0,
+                    ),
+                    meta.selector(),
+                );
+            }
+        }
+        for ((base_op, block_idx, inner_col_idx), selector) in selectors.iter() {
+            let inputs = match base_op.input_phases {
+                InputPhases::FirstPhase => vec![inputs[0][0]],
+                InputPhases::SecondPhase => vec![inputs[1][0]],
+                InputPhases::BothFirstPhase => vec![inputs[0][0], inputs[0][1]],
+                InputPhases::Mixed => vec![inputs[0][0], inputs[1][0]],
+                InputPhases::BothSecondPhase => vec![inputs[1][0], inputs[1][1]],
+            };
+            let output = match base_op.input_phases {
+                InputPhases::FirstPhase => outputs[0],
+                InputPhases::SecondPhase => outputs[1],
+                InputPhases::BothFirstPhase => outputs[0],
+                InputPhases::Mixed => outputs[1],
+                InputPhases::BothSecondPhase => outputs[1],
+            };
+            assert_eq!(inputs.len(), base_op.op_kind.num_inputs());
+            match base_op.op_kind {
+                BaseOp::Mult => {
+                    meta.create_gate(base_op.op_kind.as_str(), |meta| {
+                        let selector = meta.query_selector(*selector);
+
+                        let zero = Expression::<F>::Constant(F::ZERO);
+                        let mut qis = vec![zero; 2];
+                        for (q_i, input) in qis.iter_mut().zip(inputs) {
+                            *q_i = input
+                                .query_rng(meta, *block_idx, *inner_col_idx, 0, 1)
+                                .expect("contraction config: input query failed")[0]
+                                .clone()
+                        }
+                        // Get output expressions for each input channel
+                        let (rotation_offset, rng) = base_op.op_kind.query_offset_rng();
+                        let constraints = {
+                            let expected_output: Tensor<Expression<F>> = output
+                                .query_rng(meta, *block_idx, *inner_col_idx, rotation_offset, rng)
+                                .expect("contraction config: output query failed");
+
+                            let res = base_op.op_kind.nonaccum_f((qis[0].clone(), qis[1].clone()));
+                            vec![expected_output[base_op.op_kind.constraint_idx()].clone() - res]
+                        };
+                        Constraints::with_selector(selector, constraints)
+                    });
+                }
+                _ => {
+                    meta.create_gate(base_op.op_kind.as_str(), |meta| {
+                        let selector = meta.query_selector(*selector);
+                        let mut qis = vec![vec![]; 2];
+                        for (q_i, input) in qis.iter_mut().zip(inputs) {
+                            *q_i = input
+                                .query_whole_block(meta, *block_idx, 0, 1)
+                                .expect("contraction config: input query failed")
+                                .into_iter()
+                                .collect()
+                        }
+                        // Get output expressions for each input channel
+                        let (rotation_offset, rng) = base_op.op_kind.query_offset_rng();
+                        let expected_output: Tensor<Expression<F>> = output
+                            .query_rng(meta, *block_idx, 0, rotation_offset, rng)
+                            .expect("contraction config: output query failed");
+
+                        let res = base_op.op_kind.accum_f(
+                            expected_output[0].clone(),
+                            qis[1].clone(),
+                            qis[0].clone(),
+                        );
+                        let constraints =
+                            vec![expected_output[base_op.op_kind.constraint_idx()].clone() - res];
+
+                        Constraints::with_selector(selector, constraints)
+                    });
+                }
+            }
+        }
+
+        let first_phase_inputs: [VarTensor; 2] = inputs[0]
+            .iter()
+            .copied()
+            .cloned()
+            .collect_vec()
+            .try_into()
+            .unwrap();
+        let second_phase_inputs: [VarTensor; 2] = inputs[1]
+            .iter()
+            .copied()
+            .cloned()
+            .collect_vec()
+            .try_into()
+            .unwrap();
+
+        Self {
+            inputs: [first_phase_inputs, second_phase_inputs],
+            outputs: [outputs[0].clone(), outputs[1].clone()],
+            selectors,
+            _marker: PhantomData,
+        }
+    }
+}
+
+/// `RLCConfig` is the custom gate used for random linear combination with the specific challenge
+#[derive(Clone, Debug)]
+struct RLCConfig<F: PrimeField + TensorType + PartialOrd> {
+    /// The challenge used for the random linear combination
+    /// Challenge is `None` in the dummy configuration
+    pub challenge: Option<Challenge>,
+    /// [first phase, second phase]
+    pub inputs: [VarTensor; 2],
+    pub output: VarTensor,
+    /// (phase of input, block index) -> (init selector, acc selector)
+    pub selectors: BTreeMap<(usize, usize), (Selector, Selector)>,
+    _marker: PhantomData<F>,
+}
+
+impl<F: PrimeField + TensorType + PartialOrd + std::hash::Hash> RLCConfig<F> {
+    fn dummy(dummy_var: &VarTensor) -> Self {
+        let challenge = None;
+        let inputs = [dummy_var.clone(), dummy_var.clone()];
+        let output = dummy_var.clone();
+        let selectors = BTreeMap::new();
+        Self {
+            challenge,
+            inputs,
+            output,
+            selectors,
+            _marker: PhantomData,
+        }
+    }
+
+    fn new(meta: &mut ConstraintSystem<F>, inputs: &[VarTensor; 2], output: &VarTensor) -> Self {
+        let challenge = meta.challenge_usable_after(FirstPhase);
+
+        let mut selectors = BTreeMap::new();
+        for (phase, input) in inputs.iter().enumerate() {
+            for block_idx in 0..input.num_blocks() {
+                let selector = (meta.selector(), meta.selector());
+                selectors.insert((phase, block_idx), selector);
+            }
+        }
+        let block_width = output.num_inner_cols();
+        let powers_of_challenge = (0..block_width)
+            .scan(Expression::Constant(F::ONE), |r_power, _| {
+                *r_power = r_power.clone() * challenge.expr();
+                Some(r_power.clone())
+            })
+            .collect_vec();
+        for ((phase, block_idx), (init_selector, acc_selector)) in selectors.iter() {
+            meta.create_gate("init", |meta| {
+                let selector = meta.query_selector(*init_selector);
+                let input_exprs = inputs[*phase]
+                    .query_whole_block(meta, *block_idx, 0, 1)
+                    .expect("rlc config: input query failed")
+                    .into_iter()
+                    .collect();
+                let constraints = {
+                    let expected_output: Tensor<Expression<F>> = output
+                        .query_rng(meta, *block_idx, 0, 0, 1)
+                        .expect("rlc config: output query failed");
+
+                    let res = BaseOp::Dot.accum_f(
+                        Expression::Constant(F::ZERO),
+                        powers_of_challenge.iter().cloned().rev().collect_vec(),
+                        input_exprs,
+                    );
+                    vec![expected_output[0].clone() - res]
+                };
+                Constraints::with_selector(selector, constraints)
+            });
+            meta.create_gate("acc", |meta| {
+                let selector = meta.query_selector(*acc_selector);
+                let input_exprs = inputs[*phase]
+                    .query_whole_block(meta, *block_idx, 0, 1)
+                    .expect("rlc config: input query failed")
+                    .into_iter()
+                    .collect();
+                let constraints = {
+                    let expected_output: Tensor<Expression<F>> = output
+                        .query_rng(meta, *block_idx, 0, -1, 2)
+                        .expect("rlc config: output query failed");
+
+                    let res = BaseOp::Dot.accum_f(
+                        expected_output[0].clone() * powers_of_challenge.last().cloned().unwrap(),
+                        powers_of_challenge.iter().cloned().rev().collect_vec(),
+                        input_exprs,
+                    );
+                    vec![expected_output[1].clone() - res]
+                };
+                Constraints::with_selector(selector, constraints)
+            });
+        }
+        Self {
+            inputs: inputs.clone(),
+            output: output.clone(),
+            selectors,
+            challenge: Some(challenge),
+            _marker: PhantomData,
+        }
+    }
+
+    fn assign_rlc(
+        &self,
+        region: &mut RegionCtx<F>,
+        flattened_input: &ValTensor<F>,
+        challenge: Value<F>,
+        rlc_len: usize,
+        phase: usize,
+        check_mode: &CheckMode,
+    ) -> Result<ValTensor<F>, CircuitError> {
+        region.flush_einsum()?;
+        let block_width = self.output.num_inner_cols();
+        let powers_of_challenge = (0..block_width)
+            .scan(Value::known(F::ONE), |challenge_power, _| {
+                *challenge_power = challenge_power.clone() * challenge;
+                Some(challenge_power.clone())
+            })
+            .collect_vec();
+        let mut rlc_results: Vec<ValType<F>> = vec![];
+        for tensor in flattened_input.get_inner_tensor()?.chunks_exact(rlc_len) {
+            let running_sums = tensor
+                .iter()
+                .chunks(block_width)
+                .into_iter()
+                .scan(Value::known(F::ZERO), |state, val| {
+                    let curr_sum: Value<F> = val
+                        .into_iter()
+                        .zip(powers_of_challenge.iter().rev())
+                        .map(|(v, c_power)| {
+                            c_power.and_then(|c_power| {
+                                v.get_felt_eval()
+                                    .and_then(|v| Some(Value::known(c_power * v)))
+                                    .unwrap_or(Value::unknown())
+                            })
+                        })
+                        .reduce(|acc, v| acc + v)
+                        .unwrap();
+                    *state = *state * powers_of_challenge.last().unwrap() + curr_sum;
+                    Some(*state)
+                })
+                .collect_vec();
+
+            let assigned_len = {
+                let mut input: ValTensor<F> = tensor.iter().collect_vec().into();
+                input.pad_to_zero_rem(block_width, ValType::Constant(F::ZERO))?;
+                let (_, len) = region
+                    .assign_einsum_with_duplication_unconstrained(&self.inputs[phase], &input)?;
+                len
+            };
+            let (assigned_output, assigned_output_len) = {
+                let running_sums = running_sums.into_iter().map(ValType::from).collect_vec();
+                region.assign_einsum_with_duplication_constrained(
+                    &self.output,
+                    &running_sums.into(),
+                    check_mode,
+                )?
+            };
+
+            (0..assigned_output_len)
+                .map(|i| {
+                    let (block_idx, _, z) = self
+                        .output
+                        .cartesian_coord(region.einsum_col_coord() + i * block_width);
+                    if z == 0 && i > 0 {
+                        return Ok(());
+                    }
+                    let selector = if i == 0 {
+                        self.selectors
+                            .get(&(phase, block_idx))
+                            .map(|(init, _)| init)
+                    } else {
+                        self.selectors.get(&(phase, block_idx)).map(|(_, acc)| acc)
+                    };
+                    region.enable(selector, z)?;
+                    Ok(())
+                })
+                .collect::<Result<Vec<_>, CircuitError>>()?;
+            rlc_results.push(assigned_output.last()?.get_inner_tensor()?.get_scalar());
+
+            region.increment_einsum_col_coord(assigned_len);
+        }
+        Ok(rlc_results.into())
+    }
+}
--- a/src/circuit/ops/chip/einsum/reduction_planner.rs
+++ b/src/circuit/ops/chip/einsum/reduction_planner.rs
@@ -0,0 +1,205 @@
+use std::{collections::BTreeSet, ops::Index};
+
+use halo2curves::ff::PrimeField;
+use itertools::Itertools;
+
+use crate::{
+    circuit::CircuitError,
+    tensor::{TensorType, ValTensor},
+};
+
+/// inj,jk->ik                [inj,jk]
+/// inj,i->nj => RLC          [jk,nj]
+/// jk,k->j   => RLC          [nj,j]
+/// nj,j->n   => Contraction  [n]
+/// n->       => Contraction  []
+///
+/// bn,anm,bm->ba                         [bn,anm,bm]
+/// bn,bm->bnm             => Contraction [anm,bnm]
+/// bnm,b->nm              => RLC         [anm,nm]
+/// anm,a->nm              => RLC         [nm,nm]
+/// nm,nm->m               => Contraction [m]
+/// m->                    => Contraction []
+
+#[derive(Debug)]
+pub enum Reduction {
+    /// Random linear combination with powers of challenge along the axis
+    RLC {
+        expression: String,
+        axis: char,
+        /// Uniquely identifying index of input tensor to be reduced
+        input_index: TensorIndex,
+        /// phase of input tensor
+        input_phase: usize,
+        /// phase of output tensor
+        output_phase: usize,
+        challenge_index: usize,
+    },
+    Contraction {
+        expression: String,
+        /// when axis is `None`, the contraction is pairwise multiplication
+        axis: Option<char>,
+        /// Uniquely identifying indices of input tensors to be contracted
+        input_indices: Vec<TensorIndex>,
+        /// phases of input tensors
+        input_phases: Vec<usize>,
+        /// phase of output tensor
+        output_phase: usize,
+    },
+}
+
+#[derive(Clone, Copy, Debug)]
+pub struct TensorIndex(usize);
+
+impl<T: PrimeField + TensorType + PartialOrd> Index<TensorIndex> for Vec<ValTensor<T>> {
+    type Output = ValTensor<T>;
+
+    fn index(&self, index: TensorIndex) -> &Self::Output {
+        &self[index.0]
+    }
+}
+
+impl Reduction {
+    pub fn expression(&self) -> &str {
+        match self {
+            Reduction::Contraction { expression, .. } => expression,
+            Reduction::RLC { expression, .. } => &expression,
+        }
+    }
+
+    pub fn input_indices(&self) -> Vec<TensorIndex> {
+        match self {
+            Reduction::Contraction { input_indices, .. } => input_indices.clone(),
+            Reduction::RLC { input_index, .. } => vec![*input_index],
+        }
+    }
+
+    pub fn output_phase(&self) -> usize {
+        match self {
+            Reduction::Contraction { output_phase, .. } => *output_phase,
+            Reduction::RLC { output_phase, .. } => *output_phase,
+        }
+    }
+}
+
+pub fn input_reductions(expression: &str) -> Result<Vec<Reduction>, CircuitError> {
+    let (input_exprs, output_expr) = expression.split_once("->").unwrap();
+    let input_exprs: Vec<_> = input_exprs.split(",").map(|eq| eq.to_string()).collect();
+    // (phase, expression)
+    let input_exprs: Vec<(usize, String)> =
+        input_exprs.into_iter().map(|expr| (0, expr)).collect_vec();
+
+    let mut input_tensor_counter = input_exprs.len();
+    let mut input_exprs: Vec<((usize, String), TensorIndex)> = input_exprs
+        .into_iter()
+        .zip((0..input_tensor_counter).map(TensorIndex))
+        .collect();
+    let mut reductions: Vec<Reduction> = vec![];
+
+    // Reduce input_exprs along given axis
+    let mut reduce = |input_exprs: Vec<((usize, String), TensorIndex)>,
+                      axis: char|
+     -> (Reduction, Vec<((usize, String), TensorIndex)>) {
+        let inputs = input_exprs
+            .iter()
+            .filter(|((_, eq), _)| eq.chars().contains(&axis))
+            .cloned()
+            .collect_vec();
+        let (inputs_axes, input_indices): (Vec<(usize, String)>, Vec<TensorIndex>) =
+            inputs.iter().cloned().unzip();
+        let (input_phases, inputs_axes): (Vec<usize>, Vec<String>) =
+            inputs_axes.into_iter().unzip();
+
+        let is_output_axis = output_expr.chars().contains(&axis);
+        let output: String = if is_output_axis == true && inputs.len() > 1 {
+            let output: BTreeSet<char> =
+                inputs_axes.iter().flat_map(|input| input.chars()).collect();
+            output.iter().collect()
+        } else {
+            let output: BTreeSet<char> = inputs_axes
+                .iter()
+                .flat_map(|input| input.chars().filter(|&c| c != axis))
+                .collect();
+            output.iter().collect()
+        };
+
+        let reduction = if is_output_axis == true && inputs.len() == 1 {
+            let mut expression = inputs_axes.join(",");
+            expression.push_str(format!(",{axis}").as_str());
+            expression.push_str("->");
+            expression.push_str(&output);
+            Reduction::RLC {
+                expression,
+                axis,
+                input_index: input_indices[0],
+                input_phase: input_phases[0],
+                output_phase: 1,
+                challenge_index: output_expr.chars().position(|c| c == axis).unwrap(),
+            }
+        } else if is_output_axis == true {
+            let mut expression = inputs_axes.join(",");
+            let output_phase = input_phases.iter().copied().max().unwrap();
+            expression.push_str("->");
+            expression.push_str(&output);
+            Reduction::Contraction {
+                expression,
+                axis: None,
+                input_indices: input_indices,
+                input_phases,
+                output_phase,
+            }
+        } else {
+            let mut expression = inputs_axes.join(",");
+            let output_phase = input_phases.iter().copied().max().unwrap();
+            expression.push_str("->");
+            expression.push_str(&output);
+            Reduction::Contraction {
+                expression,
+                axis: Some(axis),
+                input_indices: input_indices,
+                input_phases,
+                output_phase,
+            }
+        };
+
+        // Mutate input_exprs
+        let mut input_exprs = input_exprs.clone();
+        input_exprs.retain(|((_, input_eq), _)| !inputs_axes.contains(input_eq));
+        input_exprs.push((
+            (reduction.output_phase(), output.clone()),
+            TensorIndex(input_tensor_counter),
+        ));
+        input_tensor_counter += 1;
+
+        (reduction, input_exprs)
+    };
+
+    let mut output_axes = output_expr.chars().collect_vec();
+    while let Some(axis) = output_axes.first().cloned() {
+        let num_inputs = input_exprs
+            .iter()
+            .filter(|((_, eq), _)| eq.chars().contains(&axis))
+            .count();
+        if num_inputs == 0 {
+            output_axes.remove(0);
+        } else {
+            let (reduction, new_input_exprs) = reduce(input_exprs, axis);
+            reductions.push(reduction);
+            input_exprs = new_input_exprs;
+        }
+    }
+
+    // These are not output axes and were not contracted with random vectors
+    let remaining_axes: BTreeSet<_> = input_exprs
+        .iter()
+        .flat_map(|((_, eq), _)| eq.chars())
+        .collect();
+
+    for axis in remaining_axes.iter() {
+        let (reduction, new_input_exprs) = reduce(input_exprs, *axis);
+        reductions.push(reduction);
+        input_exprs = new_input_exprs;
+    }
+
+    Ok(reductions)
+}
--- a/src/circuit/ops/errors.rs
+++ b/src/circuit/ops/errors.rs
@@ -46,6 +46,9 @@ pub enum CircuitError {
    /// Failed to get shuffle
    #[error("failed to get shuffle for op: {0}")]
    GetShuffleError(String),
+    /// Failed to get einsum
+    #[error("failed to get einsum for op: {0}")]
+    GetEinsumError(String),
    /// Failed to get constants
    #[error("failed to get constants for op: {0}")]
    GetConstantsError(String),
@@ -61,6 +64,9 @@ pub enum CircuitError {
    /// Missing product in einsum
    #[error("missing product in einsum")]
    MissingEinsumProduct,
+    /// Missing config in einsum
+    #[error("missing config in einsum")]
+    MissingEinsumConfig,
    /// Mismatched lookup length
    #[error("mismatched lookup lengths: {0} and {1}")]
    MismatchedLookupLength(usize, usize),
@@ -109,4 +115,7 @@ pub enum CircuitError {
    /// A decomposition base overflowed
    #[error("decomposition base overflowed")]
    DecompositionBaseOverflow,
+    /// Challenge not set
+    #[error("challenge not set")]
+    ChallengeNotSet,
 }
--- a/src/circuit/ops/layouts.rs
+++ b/src/circuit/ops/layouts.rs
@@ -22,9 +22,8 @@ use crate::{
    tensor::{
        create_unit_tensor, get_broadcasted_shape,
        ops::{accumulated, add, mult, sub},
-        Tensor, TensorError, ValType,
+        DataFormat, KernelFormat, Tensor, TensorError, ValType,
    },
-    tensor::{DataFormat, KernelFormat},
 };

 use super::*;
@@ -823,14 +822,73 @@ pub fn dot<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
 /// let result = einsum::<Fp>(&dummy_config, &mut dummy_region, &[&x, &k], "mk,n->ma").unwrap();
 /// let expected = Tensor::<IntegerRep>::new(Some(&[1773]), &[1, 1]).unwrap();
 /// assert_eq!(result.int_evals().unwrap(), expected);
-///
 /// ```
-///
 pub fn einsum<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
    config: &BaseConfig<F>,
    region: &mut RegionCtx<F>,
    inputs: &[&ValTensor<F>],
    equation: &str,
+) -> Result<ValTensor<F>, CircuitError> {
+    let mut eq = equation.split("->");
+    let inputs_eq = eq.next().ok_or(CircuitError::InvalidEinsum)?;
+    let inputs_eq = inputs_eq.split(',').collect::<Vec<_>>();
+
+    // Check that the number of inputs matches the number of inputs in the equation
+    if inputs.len() != inputs_eq.len() {
+        return Err(TensorError::DimMismatch("einsum".to_string()).into());
+    }
+
+    let mut indices_to_size = HashMap::new();
+    for (i, input) in inputs.iter().enumerate() {
+        for j in 0..inputs_eq[i].len() {
+            let c = inputs_eq[i]
+                .chars()
+                .nth(j)
+                .ok_or(CircuitError::InvalidEinsum)?;
+            if let std::collections::hash_map::Entry::Vacant(e) = indices_to_size.entry(c) {
+                e.insert(input.dims()[j]);
+            } else if indices_to_size[&c] != input.dims()[j] {
+                return Err(TensorError::DimMismatch("einsum".to_string()).into());
+            }
+        }
+    }
+
+    // Track the einsum equation
+    region.add_used_einsum_equation(equation.to_string(), &indices_to_size)?;
+
+    if config.einsums.is_none() {
+        return einsum_with_base_ops(config, region, inputs, equation);
+    }
+
+    let input_values = inputs
+        .iter()
+        .map(|t| t.get_inner())
+        .collect::<Result<Vec<_>, TensorError>>()?;
+    let (output_tensor, _) =
+        crate::tensor::ops::accumulated::einsum(equation, &input_values.iter().collect_vec())?;
+
+    config.einsums.as_ref().unwrap().assign_einsum(
+        config,
+        region,
+        inputs,
+        &output_tensor.clone().into(),
+        equation,
+        &config.check_mode,
+    )?;
+
+    let output: ValTensor<F> = output_tensor.into();
+
+    region.increment_einsum_index(1);
+
+    Ok(output)
+}
+
+/// einsum with base ops
+pub fn einsum_with_base_ops<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
+    config: &BaseConfig<F>,
+    region: &mut RegionCtx<F>,
+    inputs: &[&ValTensor<F>],
+    equation: &str,
 ) -> Result<ValTensor<F>, CircuitError> {
    let mut equation = equation.split("->");
    let inputs_eq = equation.next().ok_or(CircuitError::InvalidEinsum)?;
@@ -1036,6 +1094,8 @@ pub fn einsum<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(

    let output: ValTensor<F> = output.into();

+    region.increment_einsum_index(1);
+
    Ok(output)
 }

@@ -4626,7 +4686,7 @@ pub(crate) fn rescale<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>
    let mut rescaled_inputs = vec![];
    for (i, ri) in values.iter().enumerate() {
        if scales[i].1 == 1 {
-            rescaled_inputs.push(ri.clone().clone());
+            rescaled_inputs.push((*ri).clone());
            continue;
        }

@@ -5709,13 +5769,13 @@ pub fn ln<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
    let abs_distance_to_prior_pow2 = l1_distance(config, region, &[&input, &prior_pow2])?;

    // because we round up this can be equal
-    let is_closest_to_0: ValTensor<F> = less(
+    let is_closest_to_0: ValTensor<F> = less_equal(
        config,
        region,
        &[&abs_distance_to_claimed, &abs_distance_to_next_pow2],
    )?;

-    let is_closest_to_1 = less(
+    let is_closest_to_1 = less_equal(
        config,
        region,
        &[&abs_distance_to_claimed, &abs_distance_to_prior_pow2],
--- a/src/circuit/ops/mod.rs
+++ b/src/circuit/ops/mod.rs
@@ -364,7 +364,15 @@ impl<
        };
        Ok(Some(if self.decomp {
            log::debug!("constraining constant to be decomp");
-            super::layouts::decompose(config, region, &[&value], &region.base(), &region.legs(), false)?.1
+            super::layouts::decompose(
+                config,
+                region,
+                &[&value],
+                &region.base(),
+                &region.legs(),
+                false,
+            )?
+            .1
        } else {
            log::debug!("constraining constant to be identity");
            super::layouts::identity(config, region, &[&value])?
--- a/src/circuit/ops/region.rs
+++ b/src/circuit/ops/region.rs
@@ -1,12 +1,12 @@
 use crate::{
-    circuit::table::Range,
+    circuit::{einsum::NUM_MAX_EINSUM_CHALLENGES, table::Range},
    fieldutils::IntegerRep,
    tensor::{Tensor, TensorType, ValTensor, ValType, VarTensor},
 };
 #[cfg(all(feature = "ezkl", not(target_arch = "wasm32")))]
 use colored::Colorize;
 use halo2_proofs::{
-    circuit::Region,
+    circuit::{Region, Value},
    plonk::{Error, Selector},
 };
 use halo2curves::ff::PrimeField;
@@ -85,6 +85,45 @@ impl ShuffleIndex {
    }
 }

+/// Einsum index
+#[derive(Clone, Debug, Default)]
+pub struct EinsumIndex {
+    index: usize,
+    col_coord: usize,
+    // (einsum equation, input axes to dimensions map)
+    equations: Vec<(String, HashMap<char, usize>)>,
+    num_inner_cols: usize,
+}
+
+impl EinsumIndex {
+    /// Create a new einsum index
+    pub fn new(index: usize, col_coord: usize, num_inner_cols: usize) -> EinsumIndex {
+        EinsumIndex {
+            index,
+            col_coord,
+            equations: Vec::new(),
+            num_inner_cols,
+        }
+    }
+
+    /// Get the einsum index
+    pub fn index(&self) -> usize {
+        self.index
+    }
+
+    /// Get the column coord
+    pub fn col_coord(&self) -> usize {
+        self.col_coord
+    }
+
+    /// update with another einsum index
+    pub fn update(&mut self, other: &EinsumIndex) {
+        self.index += other.index;
+        self.col_coord += other.col_coord;
+        self.equations.extend(other.equations.clone());
+    }
+}
+
 #[derive(Debug, Clone)]
 /// Some settings for a region to differentiate it across the different phases of proof generation
 pub struct RegionSettings {
@@ -176,9 +215,11 @@ pub struct RegionCtx<'a, F: PrimeField + TensorType + PartialOrd + std::hash::Ha
    num_inner_cols: usize,
    dynamic_lookup_index: DynamicLookupIndex,
    shuffle_index: ShuffleIndex,
+    einsum_index: EinsumIndex,
    statistics: RegionStatistics,
    settings: RegionSettings,
    assigned_constants: ConstantsMap<F>,
+    challenges: Vec<Value<F>>,
    max_dynamic_input_len: usize,
 }

@@ -250,6 +291,16 @@ impl<'a, F: PrimeField + TensorType + PartialOrd + std::hash::Hash> RegionCtx<'a
        self.shuffle_index.col_coord += n;
    }

+    /// increment the einsum index
+    pub fn increment_einsum_index(&mut self, n: usize) {
+        self.einsum_index.index += n;
+    }
+
+    /// increment the einsum column coordinate
+    pub fn increment_einsum_col_coord(&mut self, n: usize) {
+        self.einsum_index.col_coord += n;
+    }
+
    ///
    pub fn witness_gen(&self) -> bool {
        self.settings.witness_gen
@@ -265,6 +316,11 @@ impl<'a, F: PrimeField + TensorType + PartialOrd + std::hash::Hash> RegionCtx<'a
        &self.statistics
    }

+    ///
+    pub fn challenges(&self) -> &[Value<F>] {
+        &self.challenges
+    }
+
    /// Create a new region context
    pub fn new(
        region: Region<'a, F>,
@@ -283,9 +339,11 @@ impl<'a, F: PrimeField + TensorType + PartialOrd + std::hash::Hash> RegionCtx<'a
            linear_coord,
            dynamic_lookup_index: DynamicLookupIndex::default(),
            shuffle_index: ShuffleIndex::default(),
+            einsum_index: EinsumIndex::default(),
            statistics: RegionStatistics::default(),
            settings: RegionSettings::all_true(decomp_base, decomp_legs),
            assigned_constants: HashMap::new(),
+            challenges: vec![],
            max_dynamic_input_len: 0,
        }
    }
@@ -304,6 +362,20 @@ impl<'a, F: PrimeField + TensorType + PartialOrd + std::hash::Hash> RegionCtx<'a
        new_self
    }

+    /// Create a new region context with challenges
+    pub fn new_with_challenges(
+        region: Region<'a, F>,
+        row: usize,
+        num_inner_cols: usize,
+        decomp_base: usize,
+        decomp_legs: usize,
+        challenges: Vec<Value<F>>,
+    ) -> RegionCtx<'a, F> {
+        let mut new_self = Self::new(region, row, num_inner_cols, decomp_base, decomp_legs);
+        new_self.challenges = challenges;
+        new_self
+    }
+
    /// Create a new region context
    pub fn new_dummy(
        row: usize,
@@ -320,9 +392,11 @@ impl<'a, F: PrimeField + TensorType + PartialOrd + std::hash::Hash> RegionCtx<'a
            row,
            dynamic_lookup_index: DynamicLookupIndex::default(),
            shuffle_index: ShuffleIndex::default(),
+            einsum_index: EinsumIndex::default(),
            statistics: RegionStatistics::default(),
            settings,
            assigned_constants: HashMap::new(),
+            challenges: vec![Value::unknown(); NUM_MAX_EINSUM_CHALLENGES],
            max_dynamic_input_len: 0,
        }
    }
@@ -333,6 +407,7 @@ impl<'a, F: PrimeField + TensorType + PartialOrd + std::hash::Hash> RegionCtx<'a
        linear_coord: usize,
        num_inner_cols: usize,
        settings: RegionSettings,
+        challenges: Vec<Value<F>>,
    ) -> RegionCtx<'a, F> {
        let region = None;
        RegionCtx {
@@ -342,9 +417,11 @@ impl<'a, F: PrimeField + TensorType + PartialOrd + std::hash::Hash> RegionCtx<'a
            row,
            dynamic_lookup_index: DynamicLookupIndex::default(),
            shuffle_index: ShuffleIndex::default(),
+            einsum_index: EinsumIndex::default(),
            statistics: RegionStatistics::default(),
            settings,
            assigned_constants: HashMap::new(),
+            challenges,
            max_dynamic_input_len: 0,
        }
    }
@@ -398,6 +475,7 @@ impl<'a, F: PrimeField + TensorType + PartialOrd + std::hash::Hash> RegionCtx<'a
        let statistics = Arc::new(Mutex::new(self.statistics.clone()));
        let shuffle_index = Arc::new(Mutex::new(self.shuffle_index.clone()));
        let dynamic_lookup_index = Arc::new(Mutex::new(self.dynamic_lookup_index.clone()));
+        let einsum_index = Arc::new(Mutex::new(self.einsum_index.clone()));
        let constants = Arc::new(Mutex::new(self.assigned_constants.clone()));

        *output = output.par_enum_map(|idx, _| {
@@ -412,6 +490,7 @@ impl<'a, F: PrimeField + TensorType + PartialOrd + std::hash::Hash> RegionCtx<'a
                starting_linear_coord,
                self.num_inner_cols,
                self.settings.clone(),
+                self.challenges.clone(),
            );
            let res = inner_loop_function(idx, &mut local_reg);
            // we update the offset and constants
@@ -430,6 +509,9 @@ impl<'a, F: PrimeField + TensorType + PartialOrd + std::hash::Hash> RegionCtx<'a
            // update the shuffle index
            let mut shuffle_index = shuffle_index.lock().unwrap();
            shuffle_index.update(&local_reg.shuffle_index);
+            // update the einsum index
+            let mut einsum_index = einsum_index.lock().unwrap();
+            einsum_index.update(&local_reg.einsum_index);
            // update the constants
            let mut constants = constants.lock().unwrap();
            constants.extend(local_reg.assigned_constants);
@@ -450,6 +532,10 @@ impl<'a, F: PrimeField + TensorType + PartialOrd + std::hash::Hash> RegionCtx<'a
            .map_err(|e| CircuitError::GetShuffleError(format!("{:?}", e)))?
            .into_inner()
            .map_err(|e| CircuitError::GetShuffleError(format!("{:?}", e)))?;
+        self.einsum_index = Arc::try_unwrap(einsum_index)
+            .map_err(|e| CircuitError::GetEinsumError(format!("{:?}", e)))?
+            .into_inner()
+            .map_err(|e| CircuitError::GetEinsumError(format!("{:?}", e)))?;
        self.assigned_constants = Arc::try_unwrap(constants)
            .map_err(|e| CircuitError::GetConstantsError(format!("{:?}", e)))?
            .into_inner()
@@ -516,6 +602,18 @@ impl<'a, F: PrimeField + TensorType + PartialOrd + std::hash::Hash> RegionCtx<'a
        self.update_max_min_lookup_range(range)
    }

+    /// add used einsum equation
+    pub fn add_used_einsum_equation(
+        &mut self,
+        equation: String,
+        input_axes_to_dims: &HashMap<char, usize>,
+    ) -> Result<(), CircuitError> {
+        self.einsum_index
+            .equations
+            .push((equation, input_axes_to_dims.clone()));
+        Ok(())
+    }
+
    /// Get the offset
    pub fn row(&self) -> usize {
        self.row
@@ -551,6 +649,31 @@ impl<'a, F: PrimeField + TensorType + PartialOrd + std::hash::Hash> RegionCtx<'a
        self.shuffle_index.col_coord
    }

+    /// einsum index
+    pub fn einsum_index(&self) -> usize {
+        self.einsum_index.index
+    }
+
+    /// einsum column coordinate
+    pub fn einsum_col_coord(&self) -> usize {
+        self.einsum_index.col_coord
+    }
+
+    /// get used einsum equations
+    pub fn used_einsum_equations(&self) -> Vec<(String, HashMap<char, usize>)> {
+        self.einsum_index.equations.clone()
+    }
+
+    /// set the number of inner columns used in einsum custom gate
+    pub fn set_num_einsum_inner_cols(&mut self, num_inner_cols: usize) {
+        self.einsum_index.num_inner_cols = num_inner_cols;
+    }
+
+    /// number of inner columns used in einsum custom gate
+    pub fn num_einsum_inner_cols(&self) -> usize {
+        self.einsum_index.num_inner_cols
+    }
+
    /// get used lookups
    pub fn used_lookups(&self) -> HashSet<LookupOp> {
        self.statistics.used_lookups.clone()
@@ -640,6 +763,28 @@ impl<'a, F: PrimeField + TensorType + PartialOrd + std::hash::Hash> RegionCtx<'a
        self.assign_dynamic_lookup(var, values)
    }

+    /// Assign a valtensor to a vartensor in einsum area
+    pub fn assign_einsum(
+        &mut self,
+        var: &VarTensor,
+        values: &ValTensor<F>,
+    ) -> Result<ValTensor<F>, CircuitError> {
+        if let Some(region) = &self.region {
+            Ok(var.assign(
+                &mut region.borrow_mut(),
+                self.einsum_col_coord(),
+                values,
+                &mut self.assigned_constants,
+            )?)
+        } else {
+            if !values.is_instance() {
+                let values_map = values.create_constants_map_iterator();
+                self.assigned_constants.par_extend(values_map);
+            }
+            Ok(values.clone())
+        }
+    }
+
    /// Assign a valtensor to a vartensor with duplication
    pub fn assign_with_duplication_unconstrained(
        &mut self,
@@ -697,6 +842,63 @@ impl<'a, F: PrimeField + TensorType + PartialOrd + std::hash::Hash> RegionCtx<'a
        }
    }

+    /// Assign a valtensor to a vartensor with duplication
+    pub fn assign_einsum_with_duplication_unconstrained(
+        &mut self,
+        var: &VarTensor,
+        values: &ValTensor<F>,
+    ) -> Result<(ValTensor<F>, usize), Error> {
+        if let Some(region) = &self.region {
+            // duplicates every nth element to adjust for column overflow
+            let (res, len) = var.assign_with_duplication_unconstrained(
+                &mut region.borrow_mut(),
+                self.einsum_col_coord(),
+                values,
+                &mut self.assigned_constants,
+            )?;
+            Ok((res, len))
+        } else {
+            let (_, len) = var.dummy_assign_with_duplication(
+                self.row,
+                self.einsum_col_coord(),
+                values,
+                false,
+                &mut self.assigned_constants,
+            )?;
+            Ok((values.clone(), len))
+        }
+    }
+
+    /// Assign a valtensor to a vartensor with duplication
+    pub fn assign_einsum_with_duplication_constrained(
+        &mut self,
+        var: &VarTensor,
+        values: &ValTensor<F>,
+        check_mode: &crate::circuit::CheckMode,
+    ) -> Result<(ValTensor<F>, usize), Error> {
+        if let Some(region) = &self.region {
+            // duplicates every nth element to adjust for column overflow
+            let (res, len) = var.assign_with_duplication_constrained(
+                &mut region.borrow_mut(),
+                self.row,
+                self.einsum_col_coord(),
+                values,
+                check_mode,
+                &mut self.assigned_constants,
+            )?;
+            Ok((res, len))
+        } else {
+            let (_, len) = var.dummy_assign_with_duplication(
+                self.row,
+                self.einsum_col_coord(),
+                values,
+                true,
+                &mut self.assigned_constants,
+            )?;
+            Ok((values.clone(), len))
+        }
+    }
+
    /// Enable a selector
    pub fn enable(&mut self, selector: Option<&Selector>, offset: usize) -> Result<(), Error> {
        match &self.region {
@@ -763,4 +965,19 @@ impl<'a, F: PrimeField + TensorType + PartialOrd + std::hash::Hash> RegionCtx<'a
        }
        Ok(())
    }
+
+    /// flush row to the next row in einsum area
+    pub fn flush_einsum(&mut self) -> Result<(), CircuitError> {
+        // increment by the difference between the current linear coord and the next row
+        let num_einsum_inner_cols = self.num_einsum_inner_cols();
+        let remainder = self.einsum_col_coord() % num_einsum_inner_cols;
+        if remainder != 0 {
+            let diff = num_einsum_inner_cols - remainder;
+            self.increment_einsum_col_coord(diff);
+        }
+        if self.einsum_col_coord() % num_einsum_inner_cols != 0 {
+            return Err(CircuitError::FlushError);
+        }
+        Ok(())
+    }
 }
--- a/src/commands.rs
+++ b/src/commands.rs
@@ -1,3 +1,4 @@
+#[cfg(all(feature = "eth", not(target_arch = "wasm32")))]
 use alloy::primitives::Address as H160;
 use clap::{Command, Parser, Subcommand};
 use clap_complete::{generate, Generator, Shell};
@@ -11,7 +12,6 @@ use tosubcommand::{ToFlags, ToSubcommand};
 use crate::{pfsys::ProofType, Commitments, RunArgs};

 use crate::circuit::CheckMode;
-use crate::graph::TestDataSource;
 use crate::pfsys::TranscriptType;

 /// The default path to the .json data file
@@ -42,20 +42,14 @@ pub const DEFAULT_SPLIT: &str = "false";
 pub const DEFAULT_VERIFIER_ABI: &str = "verifier_abi.json";
 /// Default verifier abi for aggregated proofs
 pub const DEFAULT_VERIFIER_AGGREGATED_ABI: &str = "verifier_aggr_abi.json";
-/// Default verifier abi for data attestation
-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
-pub const DEFAULT_SOL_CODE_DA: &str = "evm_deploy_da.sol";
 /// Default contract address
 pub const DEFAULT_CONTRACT_ADDRESS: &str = "contract.address";
-/// Default contract address for data attestation
-pub const DEFAULT_CONTRACT_ADDRESS_DA: &str = "contract_da.address";
 /// Default contract address for vk
 pub const DEFAULT_CONTRACT_ADDRESS_VK: &str = "contract_vk.address";
 /// Default check mode
@@ -78,8 +72,8 @@ pub const DEFAULT_DISABLE_SELECTOR_COMPRESSION: &str = "false";
 pub const DEFAULT_RENDER_REUSABLE: &str = "false";
 /// Default contract deployment type
 pub const DEFAULT_CONTRACT_DEPLOYMENT_TYPE: &str = "verifier";
-/// Default VK sol path
-pub const DEFAULT_VK_SOL: &str = "vk.sol";
+/// Default VKA calldata path
+pub const DEFAULT_VKA: &str = "vka.bytes";
 /// Default VK abi path
 pub const DEFAULT_VK_ABI: &str = "vk.abi";
 /// Default scale rebase multipliers for calibration
@@ -92,15 +86,24 @@ pub const DEFAULT_ONLY_RANGE_CHECK_REBASE: &str = "false";
 pub const DEFAULT_COMMITMENT: &str = "kzg";
 /// Default seed used to generate random data
 pub const DEFAULT_SEED: &str = "21242";
+/// Default number of decimals for instances rescaling on-chain.
+pub const DEFAULT_DECIMALS: &str = "18";
+/// Default path for the vka digest file
+pub const DEFAULT_VKA_DIGEST: &str = "vka.digest";

 #[cfg(feature = "python-bindings")]
 /// Converts TranscriptType into a PyObject (Required for TranscriptType to be compatible with Python)
-impl IntoPy<PyObject> for TranscriptType {
-    fn into_py(self, py: Python) -> PyObject {
-        match self {
-            TranscriptType::Poseidon => "poseidon".to_object(py),
-            TranscriptType::EVM => "evm".to_object(py),
-        }
+impl<'py> IntoPyObject<'py> for TranscriptType {
+    type Target = pyo3::PyAny;
+    type Output = pyo3::Bound<'py, Self::Target>;
+    type Error = pyo3::PyErr;
+
+    fn into_pyobject(self, py: Python<'py>) -> Result<Self::Output, Self::Error> {
+        let result = match self {
+            TranscriptType::Poseidon => "poseidon",
+            TranscriptType::EVM => "evm",
+        };
+        Ok(result.into_pyobject(py)?.into_any())
    }
 }
 #[cfg(feature = "python-bindings")]
@@ -187,8 +190,6 @@ pub enum ContractType {
        /// Can also be used as an alternative to aggregation for verifiers that are otherwise too large to fit on-chain.
        reusable: bool,
    },
-    /// Deploys a verifying key artifact that the reusable verifier loads into memory during runtime. Encodes the circuit specific data that was otherwise hardcoded onto the stack.
-    VerifyingKeyArtifact,
 }

 impl Default for ContractType {
@@ -207,7 +208,6 @@ impl std::fmt::Display for ContractType {
                    "verifier/reusable".to_string()
                }
                ContractType::Verifier { reusable: false } => "verifier".to_string(),
-                ContractType::VerifyingKeyArtifact => "vka".to_string(),
            }
        )
    }
@@ -224,7 +224,6 @@ impl From<&str> for ContractType {
        match s {
            "verifier" => ContractType::Verifier { reusable: false },
            "verifier/reusable" => ContractType::Verifier { reusable: true },
-            "vka" => ContractType::VerifyingKeyArtifact,
            _ => {
                log::error!("Invalid value for ContractType");
                log::warn!("Defaulting to verifier");
@@ -234,24 +233,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 {
@@ -262,17 +262,20 @@ impl From<&str> for H160Flag {

 #[cfg(feature = "python-bindings")]
 /// Converts CalibrationTarget into a PyObject (Required for CalibrationTarget to be compatible with Python)
-impl IntoPy<PyObject> for CalibrationTarget {
-    fn into_py(self, py: Python) -> PyObject {
-        match self {
-            CalibrationTarget::Resources { col_overflow: true } => {
-                "resources/col-overflow".to_object(py)
-            }
+impl<'py> IntoPyObject<'py> for CalibrationTarget {
+    type Target = pyo3::PyAny;
+    type Output = pyo3::Bound<'py, Self::Target>;
+    type Error = pyo3::PyErr;
+
+    fn into_pyobject(self, py: Python<'py>) -> Result<Self::Output, Self::Error> {
+        let result = match self {
+            CalibrationTarget::Resources { col_overflow: true } => "resources/col-overflow",
            CalibrationTarget::Resources {
                col_overflow: false,
-            } => "resources".to_object(py),
-            CalibrationTarget::Accuracy => "accuracy".to_object(py),
-        }
+            } => "resources",
+            CalibrationTarget::Accuracy => "accuracy",
+        };
+        Ok(result.into_pyobject(py)?.into_any())
    }
 }

@@ -294,13 +297,17 @@ impl<'source> FromPyObject<'source> for CalibrationTarget {

 #[cfg(feature = "python-bindings")]
 /// Converts ContractType into a PyObject (Required for ContractType to be compatible with Python)
-impl IntoPy<PyObject> for ContractType {
-    fn into_py(self, py: Python) -> PyObject {
-        match self {
-            ContractType::Verifier { reusable: true } => "verifier/reusable".to_object(py),
-            ContractType::Verifier { reusable: false } => "verifier".to_object(py),
-            ContractType::VerifyingKeyArtifact => "vka".to_object(py),
-        }
+impl<'py> IntoPyObject<'py> for ContractType {
+    type Target = pyo3::PyAny;
+    type Output = pyo3::Bound<'py, Self::Target>;
+    type Error = pyo3::PyErr;
+
+    fn into_pyobject(self, py: Python<'py>) -> Result<Self::Output, Self::Error> {
+        let result = match self {
+            ContractType::Verifier { reusable: true } => "verifier/reusable",
+            ContractType::Verifier { reusable: false } => "verifier",
+        };
+        Ok(result.into_pyobject(py)?.into_any())
    }
 }

@@ -312,7 +319,6 @@ impl<'source> FromPyObject<'source> for ContractType {
        match strval.to_lowercase().as_str() {
            "verifier" => Ok(ContractType::Verifier { reusable: false }),
            "verifier/reusable" => Ok(ContractType::Verifier { reusable: true }),
-            "vka" => Ok(ContractType::VerifyingKeyArtifact),
            _ => Err(PyValueError::new_err("Invalid value for ContractType")),
        }
    }
@@ -669,30 +675,6 @@ pub enum Commands {
        #[arg(long, default_value = DEFAULT_DISABLE_SELECTOR_COMPRESSION, action = clap::ArgAction::SetTrue)]
        disable_selector_compression: Option<bool>,
    },
-    /// Deploys a test contact that the data attester reads from and creates a data attestation formatted input.json file that contains call data information
-    #[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)]
-        data: Option<String>,
-        /// The path to the compiled model file (generated using the compile-circuit command)
-        #[arg(short = 'M', long, value_hint = clap::ValueHint::FilePath)]
-        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)]
-        test_data: PathBuf,
-        /// RPC URL for an Ethereum node
-        #[arg(short = 'U', long, value_hint = clap::ValueHint::Url)]
-        rpc_url: String,
-        /// where the input data come from
-        #[arg(long, default_value = "on-chain", value_hint = clap::ValueHint::Other)]
-        input_source: TestDataSource,
-        /// where the output data come from
-        #[arg(long, default_value = "on-chain", value_hint = clap::ValueHint::Other)]
-        output_source: TestDataSource,
-    },
    /// Swaps the positions in the transcript that correspond to commitments
    SwapProofCommitments {
        /// The path to the proof file
@@ -735,6 +717,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)]
@@ -742,12 +725,13 @@ pub enum Commands {
        /// 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>,
+        /// The path to the serialized VKA file
+        #[cfg_attr(all(feature = "reusable-verifier", not(target_arch = "wasm32")), arg(long, value_hint = clap::ValueHint::Other))]
+        vka_path: Option<PathBuf>,
    },
    /// 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)]
@@ -764,12 +748,17 @@ pub enum Commands {
        /// The path to output the Solidity verifier ABI
        #[arg(long, default_value = DEFAULT_VERIFIER_ABI, value_hint = clap::ValueHint::FilePath)]
        abi_path: Option<PathBuf>,
-        /// Whether the to render the verifier as reusable or not. If true, you will need to deploy a VK artifact, passing it as part of the calldata to the verifier.
-        #[arg(long, default_value = DEFAULT_RENDER_REUSABLE, action = clap::ArgAction::SetTrue)]
+        /// Whether to render the verifier as reusable or not. If true, you will need to deploy a VK artifact, passing it as part of the calldata to the verifier.
+        #[cfg_attr(all(feature = "reusable-verifier", not(target_arch = "wasm32")), arg(short = 'R', long, default_value = DEFAULT_RENDER_REUSABLE, action = clap::ArgAction::SetTrue))]
        reusable: Option<bool>,
    },
-    /// Creates an Evm verifier artifact for a single proof to be used by the reusable verifier
+    /// Creates an evm verifier artifact to be used by the reusable verifier
    #[command(name = "create-evm-vka")]
+    #[cfg(all(
+        feature = "eth",
+        feature = "reusable-verifier",
+        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)]
@@ -780,39 +769,18 @@ pub enum Commands {
        /// The path to load the desired verification key file
        #[arg(long, default_value = DEFAULT_VK, value_hint = clap::ValueHint::FilePath)]
        vk_path: Option<PathBuf>,
-        /// The path to output the Solidity code
-        #[arg(long, default_value = DEFAULT_VK_SOL, value_hint = clap::ValueHint::FilePath)]
-        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)]
-        abi_path: Option<PathBuf>,
-    },
-    /// Creates an Evm verifier that attests to on-chain inputs for a single proof
-    #[command(name = "create-evm-da")]
-    CreateEvmDa {
-        /// 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)]
-        settings_path: Option<PathBuf>,
-        /// The path to output the Solidity code
-        #[arg(long, default_value = DEFAULT_SOL_CODE_DA, value_hint = clap::ValueHint::FilePath)]
-        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)]
-        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)]
-        data: Option<String>,
-        /// The path to the witness file. This is needed for proof swapping for kzg commitments.
-        #[arg(short = 'W', long, default_value = DEFAULT_WITNESS, value_hint = clap::ValueHint::FilePath)]
-        witness: Option<PathBuf>,
+        /// The path to output the vka calldata
+        #[arg(long, default_value = DEFAULT_VKA, value_hint = clap::ValueHint::FilePath)]
+        vka_path: Option<PathBuf>,
+        /// The number of decimals we want to use for the rescaling of the instances into on-chain floats
+        /// Default is 18, which is the number of decimals used by most ERC20 tokens
+        #[arg(long, default_value = DEFAULT_DECIMALS, value_hint = clap::ValueHint::Other)]
+        decimals: Option<usize>,
    },

    /// 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)]
@@ -832,8 +800,8 @@ pub enum Commands {
        // logrows used for aggregation circuit
        #[arg(long, default_value = DEFAULT_AGGREGATED_LOGROWS, value_hint = clap::ValueHint::Other)]
        logrows: Option<u32>,
-        /// Whether the to render the verifier as reusable or not. If true, you will need to deploy a VK artifact, passing it as part of the calldata to the verifier.
-        #[arg(long, default_value = DEFAULT_RENDER_REUSABLE, action = clap::ArgAction::SetTrue)]
+        /// Whether to render the verifier as reusable or not. If true, you will need to deploy a VK artifact, passing it as part of the calldata to the verifier.
+        #[cfg_attr(all(feature = "reusable-verifier", not(target_arch = "wasm32")), arg(short = 'R', long, action = clap::ArgAction::SetTrue))]
        reusable: Option<bool>,
    },
    /// Verifies a proof, returning accept or reject
@@ -876,6 +844,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)]
@@ -893,36 +862,13 @@ pub enum Commands {
        #[arg(short = 'P', long, value_hint = clap::ValueHint::Other)]
        private_key: Option<String>,
        /// Contract type to be deployed
+        #[cfg(all(feature = "reusable-verifier", not(target_arch = "wasm32")))]
        #[arg(long = "contract-type", short = 'C', default_value = DEFAULT_CONTRACT_DEPLOYMENT_TYPE, value_hint = clap::ValueHint::Other)]
        contract: ContractType,
    },
-    /// Deploys an evm verifier that allows for data attestation
-    #[command(name = "deploy-evm-da")]
-    DeployEvmDa {
-        /// 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)]
-        data: Option<String>,
-        /// 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)]
-        settings_path: Option<PathBuf>,
-        /// The path to the Solidity code
-        #[arg(long, default_value = DEFAULT_SOL_CODE_DA, value_hint = clap::ValueHint::FilePath)]
-        sol_code_path: Option<PathBuf>,
-        /// RPC URL for an Ethereum node
-        #[arg(short = 'U', long, value_hint = clap::ValueHint::Url)]
-        rpc_url: String,
-        #[arg(long, default_value = DEFAULT_CONTRACT_ADDRESS_DA, value_hint = clap::ValueHint::FilePath)]
-        /// 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)]
-        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)]
-        private_key: Option<String>,
-    },
    /// 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)]
@@ -933,12 +879,32 @@ pub enum Commands {
        /// RPC URL for an Ethereum node
        #[arg(short = 'U', long, value_hint = clap::ValueHint::Url)]
        rpc_url: String,
-        /// does the verifier use data attestation ?
-        #[arg(long, value_hint = clap::ValueHint::Other)]
-        addr_da: Option<H160Flag>,
-        // is the vk rendered seperately, if so specify an address
-        #[arg(long, value_hint = clap::ValueHint::Other)]
-        addr_vk: Option<H160Flag>,
+        /// The path to the serialized vka file
+        #[cfg_attr(all(feature = "reusable-verifier", not(target_arch = "wasm32")), arg(long, value_hint = clap::ValueHint::FilePath))]
+        vka_path: Option<PathBuf>,
+        /// The path to the serialized encoded calldata file generated via the encode_calldata command
+        #[arg(long, value_hint = clap::ValueHint::FilePath)]
+        encoded_calldata: Option<PathBuf>,
+    },
+    /// Registers a VKA, returning the its digest used to identify it on-chain.
+    #[command(name = "register-vka")]
+    #[cfg(feature = "reusable-verifier")]
+    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)]
+        rpc_url: String,
+        /// The path to the reusable verifier contract's address
+        #[arg(long, default_value = DEFAULT_CONTRACT_ADDRESS, value_hint = clap::ValueHint::Other)]
+        addr_verifier: H160Flag,
+        /// The path to the serialized VKA file
+        #[arg(long, default_value = DEFAULT_VKA, value_hint = clap::ValueHint::FilePath)]
+        vka_path: Option<PathBuf>,
+        /// The path to output the VKA digest to
+        #[arg(long, default_value = DEFAULT_VKA_DIGEST, value_hint = clap::ValueHint::FilePath)]
+        vka_digest_path: Option<PathBuf>,
+        /// 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)]
+        private_key: Option<String>,
    },
    #[cfg(not(feature = "no-update"))]
    /// Updates ezkl binary to version specified (or latest if not specified)
--- a/src/eth.rs
+++ b/src/eth.rs
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
github-actions[bot]	36c10459c8	ci: update version string in docs	2025-10-08 11:34:48 +00:00
dante	365d92a5f2	feat: implement generalized Freivalds' algorithm for arbitrary einsum (#990 ) --------- Co-authored-by: DoHoon Kim <59155248+DoHoonKim8@users.noreply.github.com> Co-authored-by: therealyingtong <yingtong.lai@gmail.com> Co-authored-by: DoHoonKim <dohoon1097819@gmail.com>	2025-10-08 07:34:32 -04:00
dante	d64749fc71	refactor: make default visibility public (#1004 )	2025-08-15 23:58:04 -04:00
dante	d7b04d0d25	chore: update icicle to latest (#998 )	2025-08-14 18:21:06 -04:00
GarmashAlex	d50a4b7d59	fix: correct commitment type in ipa_commit function (#997 )	2025-08-10 23:03:45 +01:00
dante	fad31de5b4	refactor: make reusable-verifier feat default (#996 )	2025-07-30 14:54:08 -04:00
dante	2f1a3f430e	feat: optional rebase scale override (#993 )	2025-07-27 21:05:54 +01:00
dante	edd4d7f5b8	fix: less bleeding edge toolchain (#992 )	2025-07-25 10:19:13 -04:00
dante	1c3ae450e1	fix: ios build	2025-07-25 09:57:23 -04:00
dante	afb4ca9f06	fix: release pipeline (#991 )	2025-07-25 09:34:57 -04:00
dante	0e79d36238	fix: ln arg is too restrictive on distances (#989 )	2025-07-24 18:56:50 -04:00
dante	e1c126c735	fix: ci (#988 )	2025-07-23 20:11:31 -04:00
dante	9077b8debc	refactor: shuffle + dynamic lookup params	2025-07-22 14:36:39 -04:00
dante	28594c7651	chore: simplify `DataSource` (#986 )	2025-07-03 10:52:31 -04:00
DoHoon Kim	b9c5ae76c0	chore: bump halo2_solidity_verifier (#985 )	2025-07-03 09:54:46 -04:00
dante	c34ce000ff	chore: rm git creds from ci (#984 )	2025-06-28 09:30:12 +01:00
Ethan Cemer	3ea68f08b3	feat: vka hashing squash (#982 )	2025-06-27 22:58:10 +02:00
dante	e81d93a73a	chore: display calibration fail reasons (#983 )	2025-06-21 19:24:30 +02:00
				`@@ -0,0 +1 @@`
				{"input_data": [[0.33088353276252747, -0.8819183707237244, 1.245591163635254, -1.807046890258789, 1.9922369718551636, -0.3360576629638672, 0.4529011845588684, -0.3590165674686432, 0.08356846123933792, 0.5126393437385559, 0.44627535343170166, 1.4916497468948364, 0.49731069803237915, -0.9748706817626953, -0.4923185408115387, 1.3548223972320557, 0.2306872010231018, 1.125955581665039, -1.7063908576965332, 0.3777385354042053, -2.7988760471343994, -1.1846797466278076, 0.7473157048225403, 1.490412950515747, 0.017497723922133446, 2.113945245742798, -1.2141249179840088, -0.16120357811450958, 0.021127669140696526, 0.7207374572753906, -1.369688868522644, -0.7369781732559204, -0.630584180355072, -0.4520200788974762, 0.29123976826667786, 0.6334688067436218, -0.869332492351532, -1.258501648902893, 0.3012596666812897, -0.5507447123527527, 0.669975757598877, 0.15088629722595215, -0.1050339788198471, 0.5505334138870239, -0.1287376880645752, -1.4297826290130615, -0.01703289896249771, -1.2296998500823975, 0.5122153162956238, -0.16924428939819336, -0.415036678314209, -1.1979341506958008, 0.05831022188067436, -0.4411357045173645, 2.0713791847229004, 1.4611141681671143, -0.9357407093048096, -0.333297461271286, -0.676478385925293, 1.390028476715088, -0.05827632546424866, 1.535687804222107, 0.3060210347175598, -0.03171076253056526, -0.614985466003418, 1.2040390968322754, 0.31318482756614685, -1.2134959697723389, 0.13110508024692535, -1.4880926609039307, 1.7007993459701538, 1.5412729978561401, 0.09260450303554535, 0.7649128437042236, -0.5009126663208008, -0.5356241464614868, -0.069572813808918, -0.011717632412910461, 0.21314217150211334, -0.1985170543193817, -0.0223808903247118, 1.2128918170928955, 0.8334696888923645, 1.9029873609542847, -0.11491120606660843, -0.10303237289190292, -0.2467050403356552, 1.557223916053772, -1.1108328104019165, -0.9065343141555786, -0.2271333783864975, 0.6959827542304993, -0.48698121309280396, 0.5689510703086853, 1.115319013595581, -0.8907430768013, -0.24722427129745483, -0.7437837719917297, 0.6742106676101685, -1.7830933332443237]]}