chore: simplify DataSource

.github/workflows/benchmarks.yml

@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
         with:
           persist-credentials: false
-      - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #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-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #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-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #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-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #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-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #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-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #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-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #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-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #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-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #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-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #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-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
         with:
           toolchain: nightly-2023-06-27
           override: true

.github/workflows/engine.yml

@@ -21,19 +21,17 @@ jobs:
     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
         with:
           persist-credentials: false
-      - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
         with:
-          toolchain: nightly-2025-06-16
+          toolchain: nightly-2025-02-17
           override: true
           components: rustfmt, clippy
-          cache: false
       - uses: jetli/wasm-pack-action@0d096b08b4e5a7de8c28de67e11e945404e9eefa  #v0.4.0
         with:
           # Pin to version 0.12.1
@@ -42,7 +40,7 @@ jobs:
         run: rustup target add wasm32-unknown-unknown
 
       - name: Add rust-src
-        run: rustup component add rust-src --toolchain nightly-2025-06-16-x86_64-unknown-linux-gnu
+        run: rustup component add rust-src --toolchain nightly-2025-02-17-x86_64-unknown-linux-gnu
       - name: Install binaryen
         run: |
           set -e

.github/workflows/large-tests.yml

@@ -13,9 +13,9 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
         with:
           persist-credentials: false
-      - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
         with:
-          toolchain: nightly-2025-06-16
+          toolchain: nightly-2025-02-17
           override: true
           components: rustfmt, clippy
       - name: nanoGPT Mock

.github/workflows/pypi-gpu.yml

@@ -43,12 +43,11 @@ 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-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #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

.github/workflows/pypi.yml

@@ -48,12 +48,11 @@ jobs:
           mv Cargo.lock Cargo.lock.orig
           sed "s/0\\.0\\.0/${RELEASE_TAG//v}/" Cargo.lock.orig >Cargo.lock
 
-      - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
         with:
-          toolchain: nightly-2025-06-16
+          toolchain: nightly-2025-02-17
           override: true
           components: rustfmt, clippy
-          cache: false
 
       - name: Build wheels
         if: matrix.target == 'universal2-apple-darwin'
@@ -114,12 +113,11 @@ jobs:
           mv Cargo.lock Cargo.lock.orig
           sed "s/0\\.0\\.0/${RELEASE_TAG//v}/" Cargo.lock.orig >Cargo.lock
 
-      - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
         with:
-          toolchain: nightly-2025-06-16
+          toolchain: nightly-2025-02-17
           override: true
           components: rustfmt, clippy
-          cache: false
 
       - name: Build wheels
         uses: PyO3/maturin-action@5f8a1b3b0aad13193f46c9131f9b9e663def8ce5  #v1.46.0

.github/workflows/release.yml

@@ -48,12 +48,11 @@ jobs:
       RUST_BACKTRACE: 1
       PCRE2_SYS_STATIC: 1
     steps:
-      - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48   #v1.0.6
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
         with:
-          toolchain: nightly-2025-06-16
+          toolchain: nightly-2025-02-17
           override: true
           components: rustfmt, clippy
-          cache: false
       - name: Checkout repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
         with:
@@ -118,27 +117,27 @@ jobs:
         include:
           - build: windows-msvc
             os: windows-latest
-            rust: nightly-2025-06-16
+            rust: nightly-2025-02-17
             target: x86_64-pc-windows-msvc
           - build: macos
             os: macos-13
-            rust: nightly-2025-06-16
+            rust: nightly-2025-02-17
             target: x86_64-apple-darwin
           - build: macos-aarch64
             os: macos-13
-            rust: nightly-2025-06-16
+            rust: nightly-2025-02-17
             target: aarch64-apple-darwin
           - build: linux-musl
-            os: ubuntu-latest-64-cores
-            rust: nightly-2025-06-16
+            os: ubuntu-22.04
+            rust: nightly-2025-02-17
             target: x86_64-unknown-linux-musl
           - build: linux-gnu
-            os: ubuntu-latest-64-cores
-            rust: nightly-2025-06-16
+            os: ubuntu-22.04
+            rust: nightly-2025-02-17
             target: x86_64-unknown-linux-gnu
           - build: linux-aarch64
-            os: ubuntu-latest-64-cores
-            rust: nightly-2025-06-16
+            os: ubuntu-22.04
+            rust: nightly-2025-02-17
             target: aarch64-unknown-linux-gnu
 
     steps:

.github/workflows/rust.yml

@@ -31,9 +31,9 @@ jobs:
         with:
           persist-credentials: false
 
-      - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
         with:
-          toolchain: nightly-2025-06-16
+          toolchain: nightly-2025-02-17
           override: true
           components: rustfmt, clippy
       - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3
@@ -55,9 +55,9 @@ jobs:
           persist-credentials: false
 
 
-      - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
         with:
-          toolchain: nightly-2025-06-16
+          toolchain: nightly-2025-02-17
           override: true
           components: rustfmt, clippy
       - name: Build
@@ -73,9 +73,9 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
         with:
           persist-credentials: false
-      - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
         with:
-          toolchain: nightly-2025-06-16
+          toolchain: nightly-2025-02-17
           override: true
           components: rustfmt, clippy
       - name: Docs
@@ -91,9 +91,9 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
         with:
           persist-credentials: false
-      - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
         with:
-          toolchain: nightly-2025-06-16
+          toolchain: nightly-2025-02-17
           override: true
           components: rustfmt, clippy
       - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3  #v3.3.0
@@ -116,9 +116,9 @@ jobs:
   #     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
   # with:
   #   persist-credentials: false
-  #     - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
+  #     - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
   #       with:
-  #         toolchain: nightly-2025-06-16
+  #         toolchain: nightly-2025-02-17
   #         override: true
   #         components: rustfmt, clippy
   #     - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3  #v3.3.0
@@ -144,7 +144,7 @@ jobs:
   ultra-overflow-tests_og-lookup:
     permissions:
       contents: read
-    runs-on: non-gpu,non-sgx
+    runs-on: non-gpu
     env:
       EVM_VERIFIER_EZKL_TOKEN: ${{ secrets.EVM_VERIFIER_EZKL_TOKEN }}
     steps:
@@ -152,9 +152,9 @@ jobs:
         with:
           persist-credentials: false
 
-      - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
         with:
-          toolchain: nightly-2025-06-16
+          toolchain: nightly-2025-02-17
           override: true
           components: rustfmt, clippy
       - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3  #v3.3.0
@@ -180,22 +180,20 @@ jobs:
   ultra-overflow-tests:
     permissions:
       contents: read
-    runs-on: non-gpu,non-sgx
+    runs-on: non-gpu
     env:
       EVM_VERIFIER_EZKL_TOKEN: ${{ secrets.EVM_VERIFIER_EZKL_TOKEN }}
-
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
         with:
           persist-credentials: false
+      
 
-
-      - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
         with:
-          toolchain: nightly-2025-06-16
+          toolchain: nightly-2025-02-17
           override: true
           components: rustfmt, clippy
-
       - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3  #v3.3.0
         with:
           crate: cargo-nextest
@@ -222,16 +220,15 @@ jobs:
     runs-on: ubuntu-latest-16-cores
     env:
       EVM_VERIFIER_EZKL_TOKEN: ${{ secrets.EVM_VERIFIER_EZKL_TOKEN }}
-
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
         with:
           persist-credentials: false
+      
 
-
-      - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
         with:
-          toolchain: nightly-2025-06-16
+          toolchain: nightly-2025-02-17
           override: true
           components: rustfmt, clippy
       - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3  #v3.3.0
@@ -247,18 +244,15 @@ jobs:
     runs-on: ubuntu-latest-64-cores
     env:
       EVM_VERIFIER_EZKL_TOKEN: ${{ secrets.EVM_VERIFIER_EZKL_TOKEN }}
-      # add `atomics` and `bulk-memory` to RUSTFLAGS to enable wasm-bindgen tests
-      RUSTFLAGS: "-C target-feature=+atomics,+bulk-memory"
-
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
         with:
           persist-credentials: false
+      
 
-
-      - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
         with:
-          toolchain: nightly-2025-06-16
+          toolchain: nightly-2025-02-17
           override: true
           components: rustfmt, clippy
       - uses: jetli/wasm-pack-action@0d096b08b4e5a7de8c28de67e11e945404e9eefa  #v0.4.0
@@ -271,7 +265,7 @@ jobs:
       - name: Install wasm32-unknown-unknown
         run: rustup target add wasm32-unknown-unknown
       - name: Add rust-src
-        run: rustup component add rust-src --toolchain nightly-2025-06-16-x86_64-unknown-linux-gnu
+        run: rustup component add rust-src --toolchain nightly-2025-02-17-x86_64-unknown-linux-gnu
       - name: Create webdriver.json to disable timeouts
         run: |
           echo '{"args": ["--headless", "--disable-gpu", "--disable-dev-shm-usage", "--no-sandbox"]}' > webdriver.json
@@ -286,7 +280,7 @@ jobs:
   mock-proving-tests:
     permissions:
       contents: read
-    runs-on: non-gpu,non-sgx
+    runs-on: non-gpu
     env:
       EVM_VERIFIER_EZKL_TOKEN: ${{ secrets.EVM_VERIFIER_EZKL_TOKEN }}
 
@@ -294,10 +288,10 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
         with:
           persist-credentials: false
-
-      - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
+      
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
         with:
-          toolchain: nightly-2025-06-16
+          toolchain: nightly-2025-02-17
           override: true
           components: rustfmt, clippy
       - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3  #v3.3.0
@@ -356,27 +350,21 @@ jobs:
   prove-and-verify-evm-tests:
     permissions:
       contents: read
-    runs-on: non-gpu,non-sgx
+    runs-on: non-gpu
     # needs: [build, library-tests, docs, python-tests, python-integration-tests]
     env:
       EVM_VERIFIER_EZKL_TOKEN: ${{ secrets.EVM_VERIFIER_EZKL_TOKEN }}
-      RUSTFLAGS: "-C target-feature=+atomics,+bulk-memory"
-
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
         with:
           persist-credentials: false
+      
 
-
-      - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
         with:
-          toolchain: nightly-2025-06-16
+          toolchain: nightly-2025-02-17
           override: true
           components: rustfmt, clippy
-      - uses: jetli/wasm-pack-action@0d096b08b4e5a7de8c28de67e11e945404e9eefa  #v0.4.0
-        with:
-          # Pin to version 0.12.1
-          version: "v0.12.1"
       - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3  #v3.3.0
         with:
           crate: cargo-nextest
@@ -394,14 +382,14 @@ jobs:
           node-version: "18.12.1"
           cache: "pnpm"
       - name: "Add rust-src"
-        run: rustup component add rust-src --toolchain nightly-2025-06-16-x86_64-unknown-linux-gnu
+        run: rustup component add rust-src --toolchain nightly-2025-02-17-x86_64-unknown-linux-gnu
       - name: Install dependencies for js tests and package
         run: |
           pnpm install --frozen-lockfile
       # - name: Install solc
       #   run: (hash svm 2>/dev/null || cargo install svm-rs) && svm install 0.8.20 && solc --version
       - name: Install Anvil
-        run: cargo install --git https://github.com/foundry-rs/foundry --rev 56b806a3ba7866a3b061093bebd0fa2ace97f1fc --locked anvil --force
+        run: cargo install --git https://github.com/foundry-rs/foundry --rev 62cdea8ff9e6efef011f77e295823b5f2dbeb3a1 --locked anvil --force
       - name: Build wasm package for nodejs target.
         run: |
           wasm-pack build --target nodejs --out-dir ./tests/wasm/nodejs . -- -Z build-std="panic_abort,std"
@@ -431,9 +419,9 @@ jobs:
   #     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
   #       with:
   #         persist-credentials: false
-  #     - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
+  #     - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
   #       with:
-  #         toolchain: nightly-2025-06-16
+  #         toolchain: nightly-2025-02-17
   #         override: true
   #         components: rustfmt, clippy
   #     - uses: jetli/wasm-pack-action@0d096b08b4e5a7de8c28de67e11e945404e9eefa  #v0.4.0
@@ -441,7 +429,7 @@ jobs:
   #         # Pin to version 0.12.1
   #         version: 'v0.12.1'
   #     - name: Add rust-src
-  #       run: rustup component add rust-src --toolchain nightly-2025-06-16
+  #       run: rustup component add rust-src --toolchain nightly-2025-02-17
   #     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
   #       with:
   #         persist-credentials: false
@@ -459,21 +447,19 @@ jobs:
   prove-and-verify-tests:
     permissions:
       contents: read
-    runs-on: non-gpu,non-sgx
+    runs-on: non-gpu
     needs: [build, library-tests, docs]
     env:
       EVM_VERIFIER_EZKL_TOKEN: ${{ secrets.EVM_VERIFIER_EZKL_TOKEN }}
-      RUSTFLAGS: "-C target-feature=+atomics,+bulk-memory"
-
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
         with:
           persist-credentials: false
+      
 
-
-      - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
         with:
-          toolchain: nightly-2025-06-16
+          toolchain: nightly-2025-02-17
           override: true
           components: rustfmt, clippy
       - uses: jetli/wasm-pack-action@0d096b08b4e5a7de8c28de67e11e945404e9eefa  #v0.4.0
@@ -484,7 +470,7 @@ jobs:
         run: rustup target add wasm32-unknown-unknown
 
       - name: Add rust-src
-        run: rustup component add rust-src --toolchain nightly-2025-06-16-x86_64-unknown-linux-gnu
+        run: rustup component add rust-src --toolchain nightly-2025-02-17-x86_64-unknown-linux-gnu
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
         with:
           persist-credentials: false
@@ -549,13 +535,13 @@ jobs:
   #     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
   # with:
   #   persist-credentials: false
-  #     - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
+  #     - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
   #       with:
-  #         toolchain: nightly-2025-06-16
+  #         toolchain: nightly-2025-02-17
   #         override: true
   #         components: rustfmt, clippy
   #     - name: Add rust-src
-  #       run: rustup component add rust-src --toolchain nightly-2025-06-16-x86_64-unknown-linux-gnu
+  #       run: rustup component add rust-src --toolchain nightly-2025-02-17-x86_64-unknown-linux-gnu
   #     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
   #     - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3  #v3.3.0
   #       with:
@@ -585,16 +571,15 @@ jobs:
     needs: [build, library-tests, docs, python-tests, python-integration-tests]
     env:
       EVM_VERIFIER_EZKL_TOKEN: ${{ secrets.EVM_VERIFIER_EZKL_TOKEN }}
-
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
         with:
           persist-credentials: false
-
+      
 
       - uses: dtolnay/rust-toolchain@4f94fbe7e03939b0e674bcc9ca609a16088f63ff  #nightly branch, TODO: update when required
         with:
-          toolchain: nightly-2025-06-16
+          toolchain: nightly-2025-02-17
           override: true
           components: rustfmt, clippy
       - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3  #v3.3.0
@@ -612,9 +597,9 @@ jobs:
   #     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
   # with:
   #   persist-credentials: false
-  #     - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
+  #     - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
   #       with:
-  #         toolchain: nightly-2025-06-16
+  #         toolchain: nightly-2025-02-17
   #         override: true
   #         components: rustfmt, clippy
   #     - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3  #v3.3.0
@@ -631,16 +616,15 @@ jobs:
     needs: [build, library-tests, docs, python-tests, python-integration-tests]
     env:
       EVM_VERIFIER_EZKL_TOKEN: ${{ secrets.EVM_VERIFIER_EZKL_TOKEN }}
-
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
         with:
           persist-credentials: false
+      
 
-
-      - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
         with:
-          toolchain: nightly-2025-06-16
+          toolchain: nightly-2025-02-17
           override: true
           components: rustfmt, clippy
       - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3  #v3.3.0
@@ -657,16 +641,15 @@ jobs:
     needs: [build, library-tests, docs, python-tests, python-integration-tests]
     env:
       EVM_VERIFIER_EZKL_TOKEN: ${{ secrets.EVM_VERIFIER_EZKL_TOKEN }}
-
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
         with:
           persist-credentials: false
+      
 
-
-      - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
         with:
-          toolchain: nightly-2025-06-16
+          toolchain: nightly-2025-02-17
           override: true
           components: rustfmt, clippy
       - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3  #v3.3.0
@@ -676,7 +659,7 @@ jobs:
       # - name: Install solc
       #   run: (hash svm 2>/dev/null || cargo install svm-rs) && svm install 0.8.20 && solc --version
       - name: Install Anvil
-        run: cargo install --git https://github.com/foundry-rs/foundry --rev 56b806a3ba7866a3b061093bebd0fa2ace97f1fc --locked anvil --force
+        run: cargo install --git https://github.com/foundry-rs/foundry --rev 62cdea8ff9e6efef011f77e295823b5f2dbeb3a1 --locked anvil --force
       - name: KZG prove and verify aggr tests
         run: cargo nextest run  --verbose tests_evm::kzg_evm_aggr_prove_and_verify_::t --test-threads 4 -- --include-ignored
 
@@ -687,16 +670,15 @@ jobs:
     needs: [build, library-tests, docs]
     env:
       EVM_VERIFIER_EZKL_TOKEN: ${{ secrets.EVM_VERIFIER_EZKL_TOKEN }}
-
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
         with:
           persist-credentials: false
+      
 
-
-      - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
         with:
-          toolchain: nightly-2025-06-16
+          toolchain: nightly-2025-02-17
           override: true
           components: rustfmt, clippy
       - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3  #v3.3.0
@@ -709,23 +691,22 @@ jobs:
   python-tests:
     permissions:
       contents: read
-    runs-on: non-gpu,non-sgx
+    runs-on: non-gpu
     needs: [build, library-tests, docs]
     env:
       EVM_VERIFIER_EZKL_TOKEN: ${{ secrets.EVM_VERIFIER_EZKL_TOKEN }}
-
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
         with:
           persist-credentials: false
-
+      
 
       - uses: actions/setup-python@b64ffcaf5b410884ad320a9cfac8866006a109aa  #v4.8.0
         with:
           python-version: "3.12"
-      - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
         with:
-          toolchain: nightly-2025-06-16
+          toolchain: nightly-2025-02-17
           override: true
           components: rustfmt, clippy
       - name: Install cmake
@@ -735,7 +716,7 @@ jobs:
       - name: Setup Virtual Env and Install python dependencies
         run: python -m venv .env --clear; source .env/bin/activate; pip install -r requirements.txt;
       - name: Install Anvil
-        run: cargo install --git https://github.com/foundry-rs/foundry --rev 56b806a3ba7866a3b061093bebd0fa2ace97f1fc --locked anvil --force
+        run: cargo install --git https://github.com/foundry-rs/foundry --rev 62cdea8ff9e6efef011f77e295823b5f2dbeb3a1 --locked anvil --force
       - name: Build python ezkl
         run: source .env/bin/activate; unset CONDA_PREFIX; maturin develop --features python-bindings,reusable-verifier --profile=test-runs
       - name: Run pytest
@@ -744,23 +725,22 @@ jobs:
   accuracy-measurement-tests:
     permissions:
       contents: read
-    runs-on: non-gpu,non-sgx
+    runs-on: non-gpu
     needs: [build, library-tests, docs, python-tests, python-integration-tests]
     env:
       EVM_VERIFIER_EZKL_TOKEN: ${{ secrets.EVM_VERIFIER_EZKL_TOKEN }}
-
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
         with:
           persist-credentials: false
-
+      
 
       - uses: actions/setup-python@b64ffcaf5b410884ad320a9cfac8866006a109aa  #v4.8.0
         with:
           python-version: "3.12"
-      - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
         with:
-          toolchain: nightly-2025-06-16
+          toolchain: nightly-2025-02-17
           override: true
           components: rustfmt, clippy
       - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3  #v3.3.0
@@ -786,19 +766,18 @@ jobs:
     runs-on: large-self-hosted
     env:
       EVM_VERIFIER_EZKL_TOKEN: ${{ secrets.EVM_VERIFIER_EZKL_TOKEN }}
-
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
         with:
           persist-credentials: false
-
+      
 
       - uses: actions/setup-python@b64ffcaf5b410884ad320a9cfac8866006a109aa  #v4.8.0
         with:
           python-version: "3.11"
-      - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
         with:
-          toolchain: nightly-2025-06-16
+          toolchain: nightly-2025-02-17
           override: true
           components: rustfmt, clippy
       - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3  #v3.3.0
@@ -808,7 +787,7 @@ jobs:
       # - name: Install solc
       #   run: (hash svm 2>/dev/null || cargo install svm-rs) && svm install 0.8.20 && solc --version
       - name: Install Anvil
-        run: cargo install --git https://github.com/foundry-rs/foundry --rev 56b806a3ba7866a3b061093bebd0fa2ace97f1fc --locked anvil --force
+        run: cargo install --git https://github.com/foundry-rs/foundry --rev 62cdea8ff9e6efef011f77e295823b5f2dbeb3a1 --locked anvil --force
       - name: Install pip
         run: python -m ensurepip --upgrade
       - name: Setup Virtual Env and Install python dependencies
@@ -849,16 +828,15 @@ jobs:
     runs-on: macos-latest
     env:
       EVM_VERIFIER_EZKL_TOKEN: ${{ secrets.EVM_VERIFIER_EZKL_TOKEN }}
-
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
         with:
           persist-credentials: false
+      
 
-
-      - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
         with:
-          toolchain: nightly-2025-06-16
+          toolchain: nightly-2025-02-17
           override: true
           components: rustfmt, clippy
       - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3  #v3.3.0
@@ -866,7 +844,7 @@ jobs:
           crate: cargo-nextest
           locked: true
       - name: Run ios tests
-        run: CARGO_BUILD_TARGET=aarch64-apple-darwin RUSTUP_TOOLCHAIN=nightly-2025-06-16-aarch64-apple-darwin cargo test --test ios_integration_tests --features ios-bindings-test --no-default-features
+        run: CARGO_BUILD_TARGET=aarch64-apple-darwin RUSTUP_TOOLCHAIN=nightly-2025-02-17-aarch64-apple-darwin cargo test --test ios_integration_tests --features ios-bindings-test --no-default-features
 
   swift-package-tests:
     permissions:
@@ -876,15 +854,14 @@ jobs:
 
     env:
       EVM_VERIFIER_EZKL_TOKEN: ${{ secrets.EVM_VERIFIER_EZKL_TOKEN }}
-
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
         with:
           persist-credentials: false
 
-      - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
         with:
-          toolchain: nightly-2025-06-16
+          toolchain: nightly-2025-02-17
           override: true
           components: rustfmt, clippy
       - name: Build EzklCoreBindings

.github/workflows/static-analysis.yml

@@ -15,9 +15,9 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
         with:
           persist-credentials: false
-      - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48  #v1.0.6
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
         with:
-          toolchain: nightly-2025-06-16
+          toolchain: nightly-2025-02-17
           override: true
           components: rustfmt, clippy
 

rust-toolchain

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2025-06-16"
+channel = "nightly-2025-02-17"
 components = ["rustfmt", "clippy"]

src/bindings/python.rs

@@ -93,6 +93,16 @@ 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]
@@ -125,6 +135,15 @@ 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
 ///
@@ -865,7 +884,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>,
@@ -1082,7 +1101,7 @@ fn gen_witness(
             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()))
+    Python::with_gil(|py| Ok(output.to_object(py)))
 }
 
 /// Mocks the prover
@@ -1264,7 +1283,7 @@ fn prove(
         PyRuntimeError::new_err(err_str)
     })?;
 
-    Python::with_gil(|py| Ok(snark.into_pyobject(py).unwrap().into()))
+    Python::with_gil(|py| Ok(snark.to_object(py)))
 }
 
 /// Verifies a given proof
@@ -1630,7 +1649,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,7 +1710,7 @@ fn create_evm_verifier(
 ))]
 #[gen_stub_pyfunction]
 fn create_evm_vka(
-    py: Python<'_>,
+    py: Python,
     vk_path: PathBuf,
     settings_path: PathBuf,
     vka_path: PathBuf,
@@ -1721,7 +1740,7 @@ fn create_evm_vka(
 ))]
 #[gen_stub_pyfunction]
 fn deploy_evm(
-    py: Python<'_>,
+    py: Python,
     addr_path: PathBuf,
     rpc_url: String,
     sol_code_path: PathBuf,
@@ -1905,7 +1924,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,

src/circuit/ops/chip.rs

@@ -8,9 +8,8 @@ use halo2_proofs::{
 use log::debug;
 #[cfg(feature = "python-bindings")]
 use pyo3::{
-    conversion::FromPyObject,
+    conversion::{FromPyObject, IntoPy},
     exceptions::PyValueError,
-    IntoPyObject,
     prelude::*,
 };
 use serde::{Deserialize, Serialize};
@@ -87,17 +86,12 @@ impl CheckMode {
 
 #[cfg(feature = "python-bindings")]
 /// Converts CheckMode into a PyObject (Required for CheckMode to be compatible with Python)
-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())
+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),
+        }
     }
 }
 

src/circuit/ops/layouts.rs

@@ -4626,7 +4626,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());
+            rescaled_inputs.push(ri.clone().clone());
             continue;
         }
 
@@ -5709,13 +5709,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_equal(
+    let is_closest_to_0: ValTensor<F> = less(
         config,
         region,
         &[&abs_distance_to_claimed, &abs_distance_to_next_pow2],
     )?;
 
-    let is_closest_to_1 = less_equal(
+    let is_closest_to_1 = less(
         config,
         region,
         &[&abs_distance_to_claimed, &abs_distance_to_prior_pow2],

src/commands.rs

@@ -93,17 +93,12 @@ 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<'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())
+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),
+        }
     }
 }
 #[cfg(feature = "python-bindings")]
@@ -262,22 +257,17 @@ impl From<&str> for H160Flag {
 
 #[cfg(feature = "python-bindings")]
 /// Converts CalibrationTarget into a PyObject (Required for CalibrationTarget to be compatible with Python)
-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 {
+impl IntoPy<PyObject> for CalibrationTarget {
+    fn into_py(self, py: Python) -> PyObject {
+        match self {
             CalibrationTarget::Resources { col_overflow: true } => {
-                "resources/col-overflow"
+                "resources/col-overflow".to_object(py)
             }
             CalibrationTarget::Resources {
                 col_overflow: false,
-            } => "resources",
-            CalibrationTarget::Accuracy => "accuracy",
-        };
-        Ok(result.into_pyobject(py)?.into_any())
+            } => "resources".to_object(py),
+            CalibrationTarget::Accuracy => "accuracy".to_object(py),
+        }
     }
 }
 
@@ -299,17 +289,12 @@ impl<'source> FromPyObject<'source> for CalibrationTarget {
 
 #[cfg(feature = "python-bindings")]
 /// Converts ContractType into a PyObject (Required for ContractType to be compatible with Python)
-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())
+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),
+        }
     }
 }
 

src/execute.rs

@@ -1266,8 +1266,7 @@ pub(crate) fn calibrate(
                 num_rows: new_settings.num_rows,
                 total_assignments: new_settings.total_assignments,
                 total_const_size: new_settings.total_const_size,
-                dynamic_lookup_params: new_settings.dynamic_lookup_params,
-                shuffle_params: new_settings.shuffle_params,
+                total_dynamic_col_size: new_settings.total_dynamic_col_size,
                 ..settings.clone()
             };
 

src/graph/input.rs

@@ -7,7 +7,9 @@ use halo2curves::bn256::Fr as Fp;
 #[cfg(feature = "python-bindings")]
 use pyo3::prelude::*;
 #[cfg(feature = "python-bindings")]
-use pyo3::IntoPyObject;
+use pyo3::types::PyDict;
+#[cfg(feature = "python-bindings")]
+use pyo3::ToPyObject;
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use std::io::BufReader;
 use std::io::BufWriter;
@@ -427,29 +429,34 @@ mod tests {
     }
 }
 
+#[cfg(feature = "python-bindings")]
+impl ToPyObject for CallToAccount {
+    fn to_object(&self, py: Python) -> PyObject {
+        let dict = PyDict::new(py);
+        dict.set_item("account", &self.address).unwrap();
+        dict.set_item("call_data", &self.call_data).unwrap();
+        dict.set_item("decimals", &self.decimals).unwrap();
+        dict.to_object(py)
+    }
+}
 
+#[cfg(feature = "python-bindings")]
+impl ToPyObject for DataSource {
+    fn to_object(&self, py: Python) -> PyObject {
+        self.0.to_object(py)
+    }
+}
 
 #[cfg(feature = "python-bindings")]
 use crate::pfsys::field_to_string;
 
 #[cfg(feature = "python-bindings")]
-impl<'py> IntoPyObject<'py> for FileSourceInner {
-    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> {
+impl ToPyObject for FileSourceInner {
+    fn to_object(&self, py: Python) -> PyObject {
         match self {
-            FileSourceInner::Field(data) => {
-                let s = field_to_string(&data);
-                Ok(pyo3::types::PyString::new(py, &s).into_any())
-            },
-            FileSourceInner::Bool(data) => {
-                Ok(pyo3::types::PyBool::new(py, data).as_any().clone())
-            },
-            FileSourceInner::Float(data) => {
-                Ok(pyo3::types::PyFloat::new(py, data).into_any())
-            },
+            FileSourceInner::Field(data) => field_to_string(data).to_object(py),
+            FileSourceInner::Bool(data) => data.to_object(py),
+            FileSourceInner::Float(data) => data.to_object(py),
         }
     }
 }

src/graph/mod.rs

@@ -61,7 +61,7 @@ use pyo3::types::PyDict;
 #[cfg(feature = "python-bindings")]
 use pyo3::types::PyDictMethods;
 #[cfg(feature = "python-bindings")]
-use pyo3::IntoPyObject;
+use pyo3::ToPyObject;
 
 use serde::{Deserialize, Serialize};
 use std::ops::Deref;
@@ -319,12 +319,8 @@ impl GraphWitness {
 }
 
 #[cfg(feature = "python-bindings")]
-impl<'py> IntoPyObject<'py> for GraphWitness {
-    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> {
+impl ToPyObject for GraphWitness {
+    fn to_object(&self, py: Python) -> PyObject {
         // Create a Python dictionary
         let dict = PyDict::new(py);
         let dict_inputs = PyDict::new(py);
@@ -387,7 +383,7 @@ impl<'py> IntoPyObject<'py> for GraphWitness {
             dict.set_item("processed_outputs", dict_outputs).unwrap();
         }
 
-        Ok(dict.into_any())
+        dict.to_object(py)
     }
 }
 
@@ -417,29 +413,8 @@ fn insert_polycommit_pydict(
     Ok(())
 }
 
-#[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq)]
-/// Parameters for dynamic lookups
-/// serde should flatten this struct
-pub struct DynamicLookupParams {
-    /// total dynamic column size
-    pub total_dynamic_col_size: usize,
-    /// max dynamic column input length
-    pub max_dynamic_input_len: usize,
-    /// number of dynamic lookups
-    pub num_dynamic_lookups: usize,
-}
-
-#[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq)]
-/// Parameters for shuffle operations
-pub struct ShuffleParams {
-    /// number of shuffles
-    pub num_shuffles: usize,
-    /// total shuffle column size
-    pub total_shuffle_col_size: usize,
-}
-
 /// model parameters
-#[derive(Clone, Debug, Default, PartialEq)]
+#[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq)]
 pub struct GraphSettings {
     /// run args
     pub run_args: RunArgs,
@@ -449,10 +424,16 @@ pub struct GraphSettings {
     pub total_assignments: usize,
     /// total const size
     pub total_const_size: usize,
-    /// dynamic lookup parameters, flattened for backwards compatibility, serialize and deserialize flattened for backwards compatibility
-    pub dynamic_lookup_params: DynamicLookupParams,
-    /// shuffle parameters, flattened for backwards compatibility
-    pub shuffle_params: ShuffleParams,
+    /// total dynamic column size
+    pub total_dynamic_col_size: usize,
+    /// max dynamic column input length
+    pub max_dynamic_input_len: usize,
+    /// number of dynamic lookups
+    pub num_dynamic_lookups: usize,
+    /// number of shuffles
+    pub num_shuffles: usize,
+    /// total shuffle column size
+    pub total_shuffle_col_size: usize,
     /// the shape of public inputs to the model (in order of appearance)
     pub model_instance_shapes: Vec<Vec<usize>>,
     /// model output scales
@@ -479,434 +460,6 @@ pub struct GraphSettings {
     pub output_types: Option<Vec<InputType>>,
 }
 
-impl Serialize for GraphSettings {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        if serializer.is_human_readable() {
-            // JSON format - use flattened fields for backwards compatibility
-            use serde::ser::SerializeStruct;
-            let mut state = serializer.serialize_struct("GraphSettings", 21)?;
-            state.serialize_field("run_args", &self.run_args)?;
-            state.serialize_field("num_rows", &self.num_rows)?;
-            state.serialize_field("total_assignments", &self.total_assignments)?;
-            state.serialize_field("total_const_size", &self.total_const_size)?;
-
-            // Flatten DynamicLookupParams fields
-            state.serialize_field(
-                "total_dynamic_col_size",
-                &self.dynamic_lookup_params.total_dynamic_col_size,
-            )?;
-            state.serialize_field(
-                "max_dynamic_input_len",
-                &self.dynamic_lookup_params.max_dynamic_input_len,
-            )?;
-            state.serialize_field(
-                "num_dynamic_lookups",
-                &self.dynamic_lookup_params.num_dynamic_lookups,
-            )?;
-
-            // Flatten ShuffleParams fields
-            state.serialize_field("num_shuffles", &self.shuffle_params.num_shuffles)?;
-            state.serialize_field(
-                "total_shuffle_col_size",
-                &self.shuffle_params.total_shuffle_col_size,
-            )?;
-
-            state.serialize_field("model_instance_shapes", &self.model_instance_shapes)?;
-            state.serialize_field("model_output_scales", &self.model_output_scales)?;
-            state.serialize_field("model_input_scales", &self.model_input_scales)?;
-            state.serialize_field("module_sizes", &self.module_sizes)?;
-            state.serialize_field("required_lookups", &self.required_lookups)?;
-            state.serialize_field("required_range_checks", &self.required_range_checks)?;
-            state.serialize_field("check_mode", &self.check_mode)?;
-            state.serialize_field("version", &self.version)?;
-            state.serialize_field("num_blinding_factors", &self.num_blinding_factors)?;
-            state.serialize_field("timestamp", &self.timestamp)?;
-            state.serialize_field("input_types", &self.input_types)?;
-            state.serialize_field("output_types", &self.output_types)?;
-            state.end()
-        } else {
-            // Binary format (bincode) - use nested struct format
-            use serde::ser::SerializeTuple;
-            let mut state = serializer.serialize_tuple(18)?;
-            state.serialize_element(&self.run_args)?;
-            state.serialize_element(&self.num_rows)?;
-            state.serialize_element(&self.total_assignments)?;
-            state.serialize_element(&self.total_const_size)?;
-            state.serialize_element(&self.dynamic_lookup_params)?;
-            state.serialize_element(&self.shuffle_params)?;
-            state.serialize_element(&self.model_instance_shapes)?;
-            state.serialize_element(&self.model_output_scales)?;
-            state.serialize_element(&self.model_input_scales)?;
-            state.serialize_element(&self.module_sizes)?;
-            state.serialize_element(&self.required_lookups)?;
-            state.serialize_element(&self.required_range_checks)?;
-            state.serialize_element(&self.check_mode)?;
-            state.serialize_element(&self.version)?;
-            state.serialize_element(&self.num_blinding_factors)?;
-            state.serialize_element(&self.timestamp)?;
-            state.serialize_element(&self.input_types)?;
-            state.serialize_element(&self.output_types)?;
-            state.end()
-        }
-    }
-}
-
-impl<'de> Deserialize<'de> for GraphSettings {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        use serde::de::{self, MapAccess, Visitor};
-        use std::fmt;
-
-        #[derive(Deserialize)]
-        #[serde(field_identifier, rename_all = "snake_case")]
-        enum Field {
-            RunArgs,
-            NumRows,
-            TotalAssignments,
-            TotalConstSize,
-            // Flattened DynamicLookupParams fields
-            TotalDynamicColSize,
-            MaxDynamicInputLen,
-            NumDynamicLookups,
-            // Flattened ShuffleParams fields
-            NumShuffles,
-            TotalShuffleColSize,
-            ModelInstanceShapes,
-            ModelOutputScales,
-            ModelInputScales,
-            ModuleSizes,
-            RequiredLookups,
-            RequiredRangeChecks,
-            CheckMode,
-            Version,
-            NumBlindingFactors,
-            Timestamp,
-            InputTypes,
-            OutputTypes,
-            // Legacy nested struct fields for backwards compatibility
-            DynamicLookupParams,
-            ShuffleParams,
-        }
-
-        struct GraphSettingsVisitor;
-
-        impl<'de> Visitor<'de> for GraphSettingsVisitor {
-            type Value = GraphSettings;
-
-            fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-                formatter.write_str("struct GraphSettings")
-            }
-
-            fn visit_map<V>(self, mut map: V) -> Result<GraphSettings, V::Error>
-            where
-                V: MapAccess<'de>,
-            {
-                let mut run_args = None;
-                let mut num_rows = None;
-                let mut total_assignments = None;
-                let mut total_const_size = None;
-                let mut total_dynamic_col_size = None;
-                let mut max_dynamic_input_len = None;
-                let mut num_dynamic_lookups = None;
-                let mut num_shuffles = None;
-                let mut total_shuffle_col_size = None;
-                let mut model_instance_shapes = None;
-                let mut model_output_scales = None;
-                let mut model_input_scales = None;
-                let mut module_sizes = None;
-                let mut required_lookups = None;
-                let mut required_range_checks = None;
-                let mut check_mode = None;
-                let mut version = None;
-                let mut num_blinding_factors = None;
-                let mut timestamp = None;
-                let mut input_types = None;
-                let mut output_types = None;
-
-                while let Some(key) = map.next_key()? {
-                    match key {
-                        Field::RunArgs => {
-                            if run_args.is_some() {
-                                return Err(de::Error::duplicate_field("run_args"));
-                            }
-                            run_args = Some(map.next_value()?);
-                        }
-                        Field::NumRows => {
-                            if num_rows.is_some() {
-                                return Err(de::Error::duplicate_field("num_rows"));
-                            }
-                            num_rows = Some(map.next_value()?);
-                        }
-                        Field::TotalAssignments => {
-                            if total_assignments.is_some() {
-                                return Err(de::Error::duplicate_field("total_assignments"));
-                            }
-                            total_assignments = Some(map.next_value()?);
-                        }
-                        Field::TotalConstSize => {
-                            if total_const_size.is_some() {
-                                return Err(de::Error::duplicate_field("total_const_size"));
-                            }
-                            total_const_size = Some(map.next_value()?);
-                        }
-                        Field::TotalDynamicColSize => {
-                            if total_dynamic_col_size.is_some() {
-                                return Err(de::Error::duplicate_field("total_dynamic_col_size"));
-                            }
-                            total_dynamic_col_size = Some(map.next_value()?);
-                        }
-                        Field::MaxDynamicInputLen => {
-                            if max_dynamic_input_len.is_some() {
-                                return Err(de::Error::duplicate_field("max_dynamic_input_len"));
-                            }
-                            max_dynamic_input_len = Some(map.next_value()?);
-                        }
-                        Field::NumDynamicLookups => {
-                            if num_dynamic_lookups.is_some() {
-                                return Err(de::Error::duplicate_field("num_dynamic_lookups"));
-                            }
-                            num_dynamic_lookups = Some(map.next_value()?);
-                        }
-                        Field::NumShuffles => {
-                            if num_shuffles.is_some() {
-                                return Err(de::Error::duplicate_field("num_shuffles"));
-                            }
-                            num_shuffles = Some(map.next_value()?);
-                        }
-                        Field::TotalShuffleColSize => {
-                            if total_shuffle_col_size.is_some() {
-                                return Err(de::Error::duplicate_field("total_shuffle_col_size"));
-                            }
-                            total_shuffle_col_size = Some(map.next_value()?);
-                        }
-                        Field::ModelInstanceShapes => {
-                            if model_instance_shapes.is_some() {
-                                return Err(de::Error::duplicate_field("model_instance_shapes"));
-                            }
-                            model_instance_shapes = Some(map.next_value()?);
-                        }
-                        Field::ModelOutputScales => {
-                            if model_output_scales.is_some() {
-                                return Err(de::Error::duplicate_field("model_output_scales"));
-                            }
-                            model_output_scales = Some(map.next_value()?);
-                        }
-                        Field::ModelInputScales => {
-                            if model_input_scales.is_some() {
-                                return Err(de::Error::duplicate_field("model_input_scales"));
-                            }
-                            model_input_scales = Some(map.next_value()?);
-                        }
-                        Field::ModuleSizes => {
-                            if module_sizes.is_some() {
-                                return Err(de::Error::duplicate_field("module_sizes"));
-                            }
-                            module_sizes = Some(map.next_value()?);
-                        }
-                        Field::RequiredLookups => {
-                            if required_lookups.is_some() {
-                                return Err(de::Error::duplicate_field("required_lookups"));
-                            }
-                            required_lookups = Some(map.next_value()?);
-                        }
-                        Field::RequiredRangeChecks => {
-                            if required_range_checks.is_some() {
-                                return Err(de::Error::duplicate_field("required_range_checks"));
-                            }
-                            required_range_checks = Some(map.next_value()?);
-                        }
-                        Field::CheckMode => {
-                            if check_mode.is_some() {
-                                return Err(de::Error::duplicate_field("check_mode"));
-                            }
-                            check_mode = Some(map.next_value()?);
-                        }
-                        Field::Version => {
-                            if version.is_some() {
-                                return Err(de::Error::duplicate_field("version"));
-                            }
-                            version = Some(map.next_value()?);
-                        }
-                        Field::NumBlindingFactors => {
-                            if num_blinding_factors.is_some() {
-                                return Err(de::Error::duplicate_field("num_blinding_factors"));
-                            }
-                            num_blinding_factors = map.next_value()?;
-                        }
-                        Field::Timestamp => {
-                            if timestamp.is_some() {
-                                return Err(de::Error::duplicate_field("timestamp"));
-                            }
-                            timestamp = Some(map.next_value()?);
-                        }
-                        Field::InputTypes => {
-                            if input_types.is_some() {
-                                return Err(de::Error::duplicate_field("input_types"));
-                            }
-                            input_types = map.next_value()?;
-                        }
-                        Field::OutputTypes => {
-                            if output_types.is_some() {
-                                return Err(de::Error::duplicate_field("output_types"));
-                            }
-                            output_types = map.next_value()?;
-                        }
-                        // Handle legacy nested struct fields for backwards compatibility
-                        Field::DynamicLookupParams => {
-                            let legacy_params: DynamicLookupParams = map.next_value()?;
-                            if total_dynamic_col_size.is_none() {
-                                total_dynamic_col_size = Some(legacy_params.total_dynamic_col_size);
-                            }
-                            if max_dynamic_input_len.is_none() {
-                                max_dynamic_input_len = Some(legacy_params.max_dynamic_input_len);
-                            }
-                            if num_dynamic_lookups.is_none() {
-                                num_dynamic_lookups = Some(legacy_params.num_dynamic_lookups);
-                            }
-                        }
-                        Field::ShuffleParams => {
-                            let legacy_params: ShuffleParams = map.next_value()?;
-                            if num_shuffles.is_none() {
-                                num_shuffles = Some(legacy_params.num_shuffles);
-                            }
-                            if total_shuffle_col_size.is_none() {
-                                total_shuffle_col_size = Some(legacy_params.total_shuffle_col_size);
-                            }
-                        }
-                    }
-                }
-
-                let run_args = run_args.ok_or_else(|| de::Error::missing_field("run_args"))?;
-                let num_rows = num_rows.ok_or_else(|| de::Error::missing_field("num_rows"))?;
-                let total_assignments = total_assignments
-                    .ok_or_else(|| de::Error::missing_field("total_assignments"))?;
-                let total_const_size =
-                    total_const_size.ok_or_else(|| de::Error::missing_field("total_const_size"))?;
-                let model_instance_shapes = model_instance_shapes
-                    .ok_or_else(|| de::Error::missing_field("model_instance_shapes"))?;
-                let model_output_scales = model_output_scales
-                    .ok_or_else(|| de::Error::missing_field("model_output_scales"))?;
-                let model_input_scales = model_input_scales
-                    .ok_or_else(|| de::Error::missing_field("model_input_scales"))?;
-                let module_sizes =
-                    module_sizes.ok_or_else(|| de::Error::missing_field("module_sizes"))?;
-                let required_lookups =
-                    required_lookups.ok_or_else(|| de::Error::missing_field("required_lookups"))?;
-                let required_range_checks = required_range_checks
-                    .ok_or_else(|| de::Error::missing_field("required_range_checks"))?;
-                let check_mode =
-                    check_mode.ok_or_else(|| de::Error::missing_field("check_mode"))?;
-                let version = version.ok_or_else(|| de::Error::missing_field("version"))?;
-
-                // Build the nested structs from flattened fields, with defaults if missing
-                let dynamic_lookup_params = DynamicLookupParams {
-                    total_dynamic_col_size: total_dynamic_col_size.unwrap_or_default(),
-                    max_dynamic_input_len: max_dynamic_input_len.unwrap_or_default(),
-                    num_dynamic_lookups: num_dynamic_lookups.unwrap_or_default(),
-                };
-
-                let shuffle_params = ShuffleParams {
-                    num_shuffles: num_shuffles.unwrap_or_default(),
-                    total_shuffle_col_size: total_shuffle_col_size.unwrap_or_default(),
-                };
-
-                Ok(GraphSettings {
-                    run_args,
-                    num_rows,
-                    total_assignments,
-                    total_const_size,
-                    dynamic_lookup_params,
-                    shuffle_params,
-                    model_instance_shapes,
-                    model_output_scales,
-                    model_input_scales,
-                    module_sizes,
-                    required_lookups,
-                    required_range_checks,
-                    check_mode,
-                    version,
-                    num_blinding_factors,
-                    timestamp,
-                    input_types,
-                    output_types,
-                })
-            }
-
-            fn visit_seq<V>(self, mut seq: V) -> Result<GraphSettings, V::Error>
-            where
-                V: serde::de::SeqAccess<'de>,
-            {
-                use serde::de::Error;
-
-                // For bincode compatibility, deserialize in the same order as tuple serialization
-                let run_args = seq.next_element()?.ok_or_else(|| Error::invalid_length(0, &self))?;
-                let num_rows = seq.next_element()?.ok_or_else(|| Error::invalid_length(1, &self))?;
-                let total_assignments = seq.next_element()?.ok_or_else(|| Error::invalid_length(2, &self))?;
-                let total_const_size = seq.next_element()?.ok_or_else(|| Error::invalid_length(3, &self))?;
-                let dynamic_lookup_params = seq.next_element()?.ok_or_else(|| Error::invalid_length(4, &self))?;
-                let shuffle_params = seq.next_element()?.ok_or_else(|| Error::invalid_length(5, &self))?;
-                let model_instance_shapes = seq.next_element()?.ok_or_else(|| Error::invalid_length(6, &self))?;
-                let model_output_scales = seq.next_element()?.ok_or_else(|| Error::invalid_length(7, &self))?;
-                let model_input_scales = seq.next_element()?.ok_or_else(|| Error::invalid_length(8, &self))?;
-                let module_sizes = seq.next_element()?.ok_or_else(|| Error::invalid_length(9, &self))?;
-                let required_lookups = seq.next_element()?.ok_or_else(|| Error::invalid_length(10, &self))?;
-                let required_range_checks = seq.next_element()?.ok_or_else(|| Error::invalid_length(11, &self))?;
-                let check_mode = seq.next_element()?.ok_or_else(|| Error::invalid_length(12, &self))?;
-                let version = seq.next_element()?.ok_or_else(|| Error::invalid_length(13, &self))?;
-                let num_blinding_factors = seq.next_element()?.ok_or_else(|| Error::invalid_length(14, &self))?;
-                let timestamp = seq.next_element()?.ok_or_else(|| Error::invalid_length(15, &self))?;
-                let input_types = seq.next_element()?.ok_or_else(|| Error::invalid_length(16, &self))?;
-                let output_types = seq.next_element()?.ok_or_else(|| Error::invalid_length(17, &self))?;
-
-                Ok(GraphSettings {
-                    run_args,
-                    num_rows,
-                    total_assignments,
-                    total_const_size,
-                    dynamic_lookup_params,
-                    shuffle_params,
-                    model_instance_shapes,
-                    model_output_scales,
-                    model_input_scales,
-                    module_sizes,
-                    required_lookups,
-                    required_range_checks,
-                    check_mode,
-                    version,
-                    num_blinding_factors,
-                    timestamp,
-                    input_types,
-                    output_types,
-                })
-            }
-
-        }
-
-        // Universal deserializer that works with both JSON (map) and bincode (tuple)
-        if deserializer.is_human_readable() {
-            // JSON format - use struct/map deserialization with flattened fields
-            const FIELDS: &'static [&'static str] = &[
-                "run_args", "num_rows", "total_assignments", "total_const_size",
-                "total_dynamic_col_size", "max_dynamic_input_len", "num_dynamic_lookups",
-                "num_shuffles", "total_shuffle_col_size", "model_instance_shapes",
-                "model_output_scales", "model_input_scales", "module_sizes",
-                "required_lookups", "required_range_checks", "check_mode", "version",
-                "num_blinding_factors", "timestamp", "input_types", "output_types",
-                "dynamic_lookup_params", "shuffle_params",
-            ];
-            deserializer.deserialize_struct("GraphSettings", FIELDS, GraphSettingsVisitor)
-        } else {
-            // Binary format (bincode) - use tuple deserialization
-            deserializer.deserialize_tuple(18, GraphSettingsVisitor)
-        }
-    }
-}
-
 impl GraphSettings {
     /// Calc the number of rows required for lookup tables
     pub fn lookup_log_rows(&self) -> u32 {
@@ -942,16 +495,15 @@ impl GraphSettings {
     }
 
     fn dynamic_lookup_and_shuffle_logrows(&self) -> u32 {
-        (self.dynamic_lookup_params.total_dynamic_col_size as f64
-            + self.shuffle_params.total_shuffle_col_size as f64)
+        (self.total_dynamic_col_size as f64 + self.total_shuffle_col_size as f64)
             .log2()
             .ceil() as u32
     }
 
     /// calculate the number of rows required for the dynamic lookup and shuffle
     pub fn dynamic_lookup_and_shuffle_logrows_with_blinding(&self) -> u32 {
-        (self.dynamic_lookup_params.total_dynamic_col_size as f64
-            + self.shuffle_params.total_shuffle_col_size as f64
+        (self.total_dynamic_col_size as f64
+            + self.total_shuffle_col_size as f64
             + RESERVED_BLINDING_ROWS as f64)
             .log2()
             .ceil() as u32
@@ -959,14 +511,13 @@ impl GraphSettings {
 
     /// calculate the number of rows required for the dynamic lookup and shuffle
     pub fn min_dynamic_lookup_and_shuffle_logrows_with_blinding(&self) -> u32 {
-        (self.dynamic_lookup_params.max_dynamic_input_len as f64 + RESERVED_BLINDING_ROWS as f64)
+        (self.max_dynamic_input_len as f64 + RESERVED_BLINDING_ROWS as f64)
             .log2()
             .ceil() as u32
     }
 
     fn dynamic_lookup_and_shuffle_col_size(&self) -> usize {
-        self.dynamic_lookup_params.total_dynamic_col_size
-            + self.shuffle_params.total_shuffle_col_size
+        self.total_dynamic_col_size + self.total_shuffle_col_size
     }
 
     /// calculate the number of rows required for the module constraints
@@ -1102,12 +653,12 @@ impl GraphSettings {
 
     /// requires dynamic lookup
     pub fn requires_dynamic_lookup(&self) -> bool {
-        self.dynamic_lookup_params.num_dynamic_lookups > 0
+        self.num_dynamic_lookups > 0
     }
 
     /// requires dynamic shuffle
     pub fn requires_shuffle(&self) -> bool {
-        self.shuffle_params.num_shuffles > 0
+        self.num_shuffles > 0
     }
 
     /// any kzg visibility
@@ -2104,155 +1655,3 @@ impl Circuit<Fp> for GraphCircuit {
         Ok(())
     }
 }
-
-#[cfg(test)]
-/// Tests for the graph module
-pub mod tests {
-    use super::*;
-
-    #[test]
-    fn test_graph_settings_serialization_roundtrip() {
-        use crate::{CheckMode, RunArgs};
-
-        // Create a test GraphSettings with nested structs
-        let original = GraphSettings {
-            run_args: RunArgs::default(),
-            num_rows: 1000,
-            total_assignments: 500,
-            total_const_size: 100,
-            dynamic_lookup_params: DynamicLookupParams {
-                total_dynamic_col_size: 42,
-                max_dynamic_input_len: 128,
-                num_dynamic_lookups: 5,
-            },
-            shuffle_params: ShuffleParams {
-                num_shuffles: 3,
-                total_shuffle_col_size: 256,
-            },
-            model_instance_shapes: vec![vec![1, 2, 3]],
-            model_output_scales: vec![],
-            model_input_scales: vec![],
-            module_sizes: ModuleSizes::default(),
-            required_lookups: vec![],
-            required_range_checks: vec![],
-            check_mode: CheckMode::SAFE,
-            version: "1.0.0".to_string(),
-            num_blinding_factors: Some(5),
-            timestamp: Some(123456789),
-            input_types: None,
-            output_types: None,
-        };
-
-        // Test 1: JSON serialization roundtrip with flattened format
-        let json_str = serde_json::to_string_pretty(&original).unwrap();
-        println!("JSON serialized (flattened):\n{}", json_str);
-
-        // Verify the JSON contains flattened fields
-        assert!(json_str.contains("\"total_dynamic_col_size\": 42"));
-        assert!(json_str.contains("\"max_dynamic_input_len\": 128"));
-        assert!(json_str.contains("\"num_dynamic_lookups\": 5"));
-        assert!(json_str.contains("\"num_shuffles\": 3"));
-        assert!(json_str.contains("\"total_shuffle_col_size\": 256"));
-
-        // Verify the JSON does NOT contain nested structs
-        assert!(!json_str.contains("\"dynamic_lookup_params\""));
-        assert!(!json_str.contains("\"shuffle_params\""));
-
-        // Deserialize from JSON
-        let deserialized: GraphSettings = serde_json::from_str(&json_str).unwrap();
-        assert_eq!(original, deserialized);
-
-
-        // now do JSON bytes
-        let json_bytes = serde_json::to_vec(&original).unwrap();
-        let deserialized_from_bytes: GraphSettings = serde_json::from_slice(&json_bytes).unwrap();
-        assert_eq!(original, deserialized_from_bytes);
-
-        // Test 2: Bincode serialization roundtrip
-        let bincode_data = bincode::serialize(&original).unwrap();
-        let bincode_deserialized: GraphSettings = bincode::deserialize(&bincode_data).unwrap();
-        assert_eq!(original, bincode_deserialized);
-
-        // Test 3: Backwards compatibility - deserialize old nested format
-        let old_format_json = r#"{
-    "run_args": {
-        "tolerance": {
-            "val": 0.0,
-            "scale": 1.0
-        },
-        "input_scale": 0,
-        "param_scale": 0,
-        "scale_rebase_multiplier": 10,
-        "lookup_range": [
-            0,
-            0
-        ],
-        "logrows": 6,
-        "num_inner_cols": 2,
-        "variables": [
-            [
-                "batch_size",
-                1
-            ]
-        ],
-        "input_visibility": "Private",
-        "output_visibility": "Public",
-        "param_visibility": "Private",
-        "rebase_frac_zero_constants": false,
-        "check_mode": "UNSAFE",
-        "commitment": "KZG",
-        "decomp_base": 128,
-        "decomp_legs": 2,
-        "bounded_log_lookup": false,
-        "ignore_range_check_inputs_outputs": false
-    },
-    "num_rows": 236,
-    "total_assignments": 472,
-    "total_const_size": 4,
-    "total_dynamic_col_size": 0,
-    "max_dynamic_input_len": 0,
-    "num_dynamic_lookups": 0,
-    "num_shuffles": 0,
-    "total_shuffle_col_size": 0,
-    "model_instance_shapes": [
-        [
-            1,
-            4
-        ]
-    ],
-    "model_output_scales": [
-        0
-    ],
-    "model_input_scales": [
-        0
-    ],
-    "module_sizes": {
-        "polycommit": [],
-        "poseidon": [
-            0,
-            [
-                0
-            ]
-        ]
-    },
-    "required_lookups": [],
-    "required_range_checks": [
-        [
-            -1,
-            1
-        ],
-        [
-            0,
-            127
-        ]
-    ],
-    "check_mode": "UNSAFE",
-    "version": "0.0.0",
-    "num_blinding_factors": null,
-    "timestamp": 1741214578354
-}"#;
-
-        let _backwards_compatible: GraphSettings = serde_json::from_str(old_format_json).unwrap();
-
-    }
-}

src/graph/model.rs

@@ -12,8 +12,6 @@ use crate::circuit::Input;
 use crate::circuit::InputType;
 use crate::circuit::Unknown;
 use crate::fieldutils::IntegerRep;
-use crate::graph::DynamicLookupParams;
-use crate::graph::ShuffleParams;
 use crate::tensor::ValType;
 use crate::{
     circuit::{lookup::LookupOp, BaseConfig as PolyConfig, CheckMode, Op},
@@ -102,10 +100,12 @@ pub type NodeGraph = BTreeMap<usize, NodeType>;
 pub struct DummyPassRes {
     /// number of rows use
     pub num_rows: usize,
-    /// dynamic lookup parameters
-    pub dynamic_lookup_params: DynamicLookupParams,
-    /// shuffle parameters
-    pub shuffle_params: ShuffleParams,
+    /// num dynamic lookups
+    pub num_dynamic_lookups: usize,
+    /// max dynamic lookup input len
+    pub max_dynamic_input_len: usize,
+    /// dynamic lookup col size
+    pub dynamic_lookup_col_coord: usize,
     /// num shuffles
     pub num_shuffles: usize,
     /// shuffle
@@ -585,13 +585,16 @@ impl Model {
             num_rows: res.num_rows,
             total_assignments: res.linear_coord,
             required_lookups: res.lookup_ops.into_iter().collect(),
+            max_dynamic_input_len: res.max_dynamic_input_len,
             required_range_checks: res.range_checks.into_iter().collect(),
             model_output_scales: self.graph.get_output_scales()?,
             model_input_scales: self.graph.get_input_scales(),
             input_types: self.get_input_types().ok(),
             output_types: Some(self.get_output_types()),
-            dynamic_lookup_params: res.dynamic_lookup_params,
-            shuffle_params: res.shuffle_params,
+            num_dynamic_lookups: res.num_dynamic_lookups,
+            total_dynamic_col_size: res.dynamic_lookup_col_coord,
+            num_shuffles: res.num_shuffles,
+            total_shuffle_col_size: res.shuffle_col_coord,
             total_const_size: res.total_const_size,
             check_mode,
             version: env!("CARGO_PKG_VERSION").to_string(),
@@ -1520,21 +1523,15 @@ impl Model {
         let res = DummyPassRes {
             num_rows: region.row(),
             linear_coord: region.linear_coord(),
-            dynamic_lookup_params: DynamicLookupParams {
-                total_dynamic_col_size: region.dynamic_lookup_col_coord(),
-                max_dynamic_input_len: region.max_dynamic_input_len(),
-                num_dynamic_lookups: region.dynamic_lookup_index(),
-            },
-            shuffle_params: ShuffleParams {
-                num_shuffles: region.shuffle_index(),
-                total_shuffle_col_size: region.shuffle_col_coord(),
-            },
+            max_dynamic_input_len: region.max_dynamic_input_len(),
             total_const_size: region.total_constants(),
             lookup_ops: region.used_lookups(),
             range_checks: region.used_range_checks(),
             max_lookup_inputs: region.max_lookup_inputs(),
             min_lookup_inputs: region.min_lookup_inputs(),
             max_range_size: region.max_range_size(),
+            num_dynamic_lookups: region.dynamic_lookup_index(),
+            dynamic_lookup_col_coord: region.dynamic_lookup_col_coord(),
             num_shuffles: region.shuffle_index(),
             shuffle_col_coord: region.shuffle_col_coord(),
             outputs,

src/graph/vars.rs

@@ -9,7 +9,7 @@ use itertools::Itertools;
 use log::debug;
 #[cfg(feature = "python-bindings")]
 use pyo3::{
-    exceptions::PyValueError, FromPyObject, IntoPyObject, PyResult, Python,
+    exceptions::PyValueError, FromPyObject, IntoPy, PyObject, PyResult, Python, ToPyObject,
 };
 use serde::{Deserialize, Serialize};
 #[cfg(all(feature = "ezkl", not(target_arch = "wasm32")))]
@@ -107,31 +107,27 @@ impl<'a> From<&'a str> for Visibility {
 }
 
 #[cfg(feature = "python-bindings")]
-impl<'py> IntoPyObject<'py> for Visibility {
-    type Target = pyo3::PyAny;
-    type Output = pyo3::Bound<'py, Self::Target>;
-    type Error = pyo3::PyErr;
-
+impl IntoPy<PyObject> for Visibility {
     /// Converts Visibility to Python object
-    fn into_pyobject(self, py: Python<'py>) -> Result<Self::Output, Self::Error> {
+    fn into_py(self, py: Python) -> PyObject {
         match self {
-            Visibility::Private => Ok("private".into_pyobject(py)?.into_any()),
-            Visibility::Public => Ok("public".into_pyobject(py)?.into_any()),
-            Visibility::Fixed => Ok("fixed".into_pyobject(py)?.into_any()),
-            Visibility::KZGCommit => Ok("polycommit".into_pyobject(py)?.into_any()),
+            Visibility::Private => "private".to_object(py),
+            Visibility::Public => "public".to_object(py),
+            Visibility::Fixed => "fixed".to_object(py),
+            Visibility::KZGCommit => "polycommit".to_object(py),
             Visibility::Hashed {
                 hash_is_public,
                 outlets,
             } => {
                 if hash_is_public {
-                    Ok("hashed/public".into_pyobject(py)?.into_any())
+                    "hashed/public".to_object(py)
                 } else {
                     let outlets = outlets
                         .iter()
                         .map(|o| o.to_string())
                         .collect_vec()
                         .join(",");
-                    Ok(format!("hashed/private/{}", outlets).into_pyobject(py)?.into_any())
+                    format!("hashed/private/{}", outlets).to_object(py)
                 }
             }
         }

src/pfsys/mod.rs

@@ -187,17 +187,12 @@ impl From<ProofType> for StrategyType {
 }
 
 #[cfg(feature = "python-bindings")]
-impl<'py> pyo3::IntoPyObject<'py> for ProofType {
-    type Target = pyo3::PyAny;
-    type Output = pyo3::Bound<'py, Self::Target>;
-    type Error = pyo3::PyErr;
-
-    fn into_pyobject(self, py: pyo3::Python<'py>) -> Result<Self::Output, Self::Error> {
-        let result = match self {
-            ProofType::Single => "Single",
-            ProofType::ForAggr => "ForAggr",
-        };
-        Ok(result.into_pyobject(py)?.into_any())
+impl ToPyObject for ProofType {
+    fn to_object(&self, py: Python) -> PyObject {
+        match self {
+            ProofType::Single => "Single".to_object(py),
+            ProofType::ForAggr => "ForAggr".to_object(py),
+        }
     }
 }
 
@@ -250,17 +245,12 @@ impl std::fmt::Display for StrategyType {
 }
 #[cfg(feature = "python-bindings")]
 /// Converts StrategyType into a PyObject (Required for StrategyType to be compatible with Python)
-impl<'py> pyo3::IntoPyObject<'py> for StrategyType {
-    type Target = pyo3::PyAny;
-    type Output = pyo3::Bound<'py, Self::Target>;
-    type Error = pyo3::PyErr;
-
-    fn into_pyobject(self, py: pyo3::Python<'py>) -> Result<Self::Output, Self::Error> {
-        let result = match self {
-            StrategyType::Single => "single",
-            StrategyType::Accum => "accum",
-        };
-        Ok(result.into_pyobject(py)?.into_any())
+impl pyo3::IntoPy<PyObject> for StrategyType {
+    fn into_py(self, py: Python) -> PyObject {
+        match self {
+            StrategyType::Single => "single".to_object(py),
+            StrategyType::Accum => "accum".to_object(py),
+        }
     }
 }
 #[cfg(feature = "python-bindings")]
@@ -314,6 +304,15 @@ impl ToFlags for TranscriptType {
     }
 }
 
+#[cfg(feature = "python-bindings")]
+impl ToPyObject for TranscriptType {
+    fn to_object(&self, py: Python) -> PyObject {
+        match self {
+            TranscriptType::Poseidon => "Poseidon".to_object(py),
+            TranscriptType::EVM => "EVM".to_object(py),
+        }
+    }
+}
 
 #[cfg(feature = "python-bindings")]
 ///
@@ -402,18 +401,14 @@ where
 }
 
 #[cfg(feature = "python-bindings")]
-use pyo3::{types::PyDict, IntoPyObject, Python};
+use pyo3::{types::PyDict, PyObject, Python, ToPyObject};
 #[cfg(feature = "python-bindings")]
-impl<'py, F: PrimeField + SerdeObject + Serialize, C: CurveAffine + Serialize> IntoPyObject<'py> for Snark<F, C>
+impl<F: PrimeField + SerdeObject + Serialize, C: CurveAffine + Serialize> ToPyObject for Snark<F, C>
 where
     C::Scalar: Serialize + DeserializeOwned,
     C::ScalarExt: Serialize + DeserializeOwned,
 {
-    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> {
+    fn to_object(&self, py: Python) -> PyObject {
         let dict = PyDict::new(py);
         let field_elems: Vec<Vec<String>> = self
             .instances
@@ -423,9 +418,9 @@ where
         dict.set_item("instances", field_elems).unwrap();
         let hex_proof = hex::encode(&self.proof);
         dict.set_item("proof", format!("0x{}", hex_proof)).unwrap();
-        dict.set_item("transcript_type", self.transcript_type.into_pyobject(py)?)
+        dict.set_item("transcript_type", self.transcript_type.to_object(py))
             .unwrap();
-        Ok(dict.into_any())
+        dict.to_object(py)
     }
 }
 

tests/integration_tests.rs

@@ -163,12 +163,9 @@ mod native_tests {
             let data = GraphData::from_path(format!("{}/{}/input.json", test_dir, test).into())
                 .expect("failed to load input data");
 
-            let duplicated_input_data = data.input_data.into_iter().map(|input| {
-                (0..num_batches)
-                    .map(move |_| input.clone()).flatten().collect::<Vec<_>>()
-            }).collect::<Vec<_>>();
+            let duplicated_input_data = data.input_data;
 
-            let duplicated_data = GraphData::new(duplicated_input_data);
+            let duplicated_data = GraphData::new(duplicated_input_data.into());
 
             let res =
                 duplicated_data.save(format!("{}/{}/input.json", test_dir, output_dir).into());
@@ -2241,7 +2238,6 @@ mod native_tests {
         assert!(status.success());
     }
 
-    #[allow(unused_variables)]
     fn build_ezkl() {
         #[cfg(feature = "icicle")]
         let args = [