ci: update version string in docs

BREAKING CHANGE: in python the order of arguments for evm related functions has changed

.github/workflows/pypi.yml

@@ -258,7 +258,7 @@ jobs:
 
       - name: Install built wheel
         if: matrix.target == 'x86_64-unknown-linux-musl'
-        uses: addnab/docker-run-action@v3
+        uses: addnab/docker-run-action@3e77f186b7a929ef010f183a9e24c0f9955ea609
         with:
           image: alpine:latest
           options: -v ${{ github.workspace }}:/io -w /io
@@ -380,7 +380,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Trigger RTDs build
-        uses: dfm/rtds-action@v1
+        uses: dfm/rtds-action@618148c547f4b56cdf4fa4dcf3a94c91ce025f2d
         with:
           webhook_url: ${{ secrets.RTDS_WEBHOOK_URL }}
           webhook_token: ${{ secrets.RTDS_WEBHOOK_TOKEN }}

.github/workflows/rust.yml

@@ -33,7 +33,7 @@ jobs:
           toolchain: nightly-2025-02-17
           override: true
           components: rustfmt, clippy
-      - uses: baptiste0928/cargo-install@v1
+      - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3
         with:
           crate: cargo-nextest
           locked: true
@@ -233,7 +233,7 @@ jobs:
         with:
           # Pin to version 0.12.1
           version: "v0.12.1"
-      - uses: nanasess/setup-chromedriver@e93e57b843c0c92788f22483f1a31af8ee48db25  #v2.3.0
+      - uses: nanasess/setup-chromedriver@affb1ea8848cbb080be372c1e8d7a5c173e9298f  #v2.3.0
         # with:
         #   chromedriver-version: "115.0.5790.102"
       - name: Install wasm32-unknown-unknown
@@ -256,10 +256,10 @@ jobs:
           submodules: recursive
 
       - name: Install Foundry
-        uses: foundry-rs/foundry-toolchain@v1
+        uses: foundry-rs/foundry-toolchain@3b74dacdda3c0b763089addb99ed86bc3800e68b
 
       - name: Run tests
-        run: | 
+        run: |
           cd tests/foundry
           forge install https://github.com/foundry-rs/forge-std --no-git --no-commit
           forge test -vvvv --fuzz-runs 64

docs/python/src/conf.py

@@ -1,7 +1,7 @@
 import ezkl
 
 project = 'ezkl'
-release = '0.0.0'
+release = '22.0.0'
 version = release
 
 

examples/notebooks/cat_and_dog.ipynb

@@ -1088,7 +1088,7 @@
                 "\n",
                 "res = await ezkl.deploy_evm(\n",
                 "    address_path,\n",
-                "    rpc_url='http://127.0.0.1:3030'\n",
+                "    'http://127.0.0.1:3030'\n",
                 ")\n",
                 "\n",
                 "assert res == True\n",

examples/notebooks/data_attest.ipynb

@@ -472,8 +472,8 @@
                 "\n",
                 "res = await ezkl.deploy_evm(\n",
                 "    addr_path_verifier,\n",
+                "    'http://127.0.0.1:3030',\n",
                 "    sol_code_path,\n",
-                "    'http://127.0.0.1:3030'\n",
                 ")\n",
                 "\n",
                 "assert res == True"
@@ -526,9 +526,9 @@
                 "res = await ezkl.deploy_da_evm(\n",
                 "        addr_path_da,\n",
                 "        input_path,\n",
+                "        RPC_URL,\n",
                 "        settings_path,\n",
                 "        sol_code_path,\n",
-                "        RPC_URL,\n",
                 "    )\n"
             ]
         },
@@ -557,8 +557,8 @@
                 "\n",
                 "res = await ezkl.verify_evm(\n",
                 "    addr,\n",
-                "    proof_path,\n",
                 "    RPC_URL,\n",
+                "    proof_path,\n",
                 "    addr_da,\n",
                 ")"
             ]
@@ -566,7 +566,7 @@
     ],
     "metadata": {
         "kernelspec": {
-            "display_name": "ezkl",
+            "display_name": ".env",
             "language": "python",
             "name": "python3"
         },
@@ -580,7 +580,7 @@
             "name": "python",
             "nbconvert_exporter": "python",
             "pygments_lexer": "ipython3",
-            "version": "3.12.5"
+            "version": "3.12.9"
         },
         "orig_nbformat": 4
     },

examples/notebooks/data_attest_hashed.ipynb

@@ -543,8 +543,8 @@
                 "\n",
                 "res = await ezkl.deploy_evm(\n",
                 "    addr_path_verifier,\n",
+                "    'http://127.0.0.1:3030',\n",
                 "    sol_code_path,\n",
-                "    'http://127.0.0.1:3030'\n",
                 ")\n",
                 "\n",
                 "assert res == True"
@@ -597,9 +597,9 @@
                 "res = await ezkl.deploy_da_evm(\n",
                 "        addr_path_da,\n",
                 "        input_path,\n",
+                "        RPC_URL,\n",
                 "        settings_path,\n",
                 "        sol_code_path,\n",
-                "        RPC_URL,\n",
                 "    )\n"
             ]
         },
@@ -628,8 +628,8 @@
                 "\n",
                 "res = await ezkl.verify_evm(\n",
                 "    addr,\n",
-                "    proof_path,\n",
                 "    RPC_URL,\n",
+                "    proof_path,\n",
                 "    addr_da,\n",
                 ")"
             ]
@@ -651,7 +651,7 @@
             "name": "python",
             "nbconvert_exporter": "python",
             "pygments_lexer": "ipython3",
-            "version": "3.11.5"
+            "version": "3.12.9"
         },
         "orig_nbformat": 4
     },

examples/notebooks/data_attest_kzg_vis.ipynb

@@ -474,8 +474,8 @@
                 "\n",
                 "res = await ezkl.deploy_evm(\n",
                 "    addr_path_verifier,\n",
+                "    'http://127.0.0.1:3030',\n",
                 "    sol_code_path,\n",
-                "    'http://127.0.0.1:3030'\n",
                 ")\n",
                 "\n",
                 "assert res == True"
@@ -529,9 +529,9 @@
                 "res = await ezkl.deploy_da_evm(\n",
                 "        addr_path_da,\n",
                 "        input_path,\n",
+                "        RPC_URL,\n",
                 "        settings_path,\n",
                 "        sol_code_path,\n",
-                "        RPC_URL,\n",
                 "    )\n"
             ]
         },
@@ -560,8 +560,8 @@
                 "\n",
                 "res = await ezkl.verify_evm(\n",
                 "    addr,\n",
-                "    proof_path,\n",
                 "    RPC_URL,\n",
+                "    proof_path,\n",
                 "    addr_da,\n",
                 ")"
             ]

examples/notebooks/hashed_vis.ipynb

@@ -453,8 +453,8 @@
                 "\n",
                 "res = await ezkl.deploy_evm(\n",
                 "    address_path,\n",
+                "    'http://127.0.0.1:3030',\n",
                 "    sol_code_path,\n",
-                "    'http://127.0.0.1:3030'\n",
                 ")\n",
                 "\n",
                 "assert res == True\n",
@@ -474,8 +474,8 @@
                 "\n",
                 "res = await ezkl.verify_evm(\n",
                 "    addr,\n",
+                "    \"http://127.0.0.1:3030\",\n",
                 "    proof_path,\n",
-                "    \"http://127.0.0.1:3030\"\n",
                 ")\n",
                 "assert res == True"
             ]
@@ -510,4 +510,4 @@
     },
     "nbformat": 4,
     "nbformat_minor": 2
-}
+}

examples/notebooks/kzg_vis.ipynb

@@ -462,8 +462,8 @@
                 "\n",
                 "res = await ezkl.deploy_evm(\n",
                 "    address_path,\n",
+                "    'http://127.0.0.1:3030',\n",
                 "    sol_code_path,\n",
-                "    'http://127.0.0.1:3030'\n",
                 ")\n",
                 "\n",
                 "assert res == True\n",
@@ -483,8 +483,8 @@
                 "\n",
                 "res = await ezkl.verify_evm(\n",
                 "    addr,\n",
+                "    \"http://127.0.0.1:3030\",\n",
                 "    proof_path,\n",
-                "    \"http://127.0.0.1:3030\"\n",
                 ")\n",
                 "assert res == True"
             ]
@@ -512,4 +512,4 @@
     },
     "nbformat": 4,
     "nbformat_minor": 2
-}
+}

examples/notebooks/mnist_classifier.ipynb

@@ -504,8 +504,8 @@
         "\n",
         "res = await ezkl.deploy_evm(\n",
         "    address_path,\n",
+        "    'http://127.0.0.1:3030',\n",
         "    sol_code_path,\n",
-        "    'http://127.0.0.1:3030'\n",
         ")\n",
         "\n",
         "assert res == True\n",
@@ -527,8 +527,8 @@
         "\n",
         "res = await ezkl.verify_evm(\n",
         "    addr,\n",
-        "    proof_path,\n",
-        "    \"http://127.0.0.1:3030\"\n",
+        "    \"http://127.0.0.1:3030\",\n",
+        "    proof_path\n",
         ")\n",
         "assert res == True"
       ]
@@ -558,4 +558,4 @@
   },
   "nbformat": 4,
   "nbformat_minor": 0
-}
+}

examples/notebooks/reusable_verifier.ipynb

@@ -261,8 +261,8 @@
     "\n",
     "res = await ezkl.deploy_evm(\n",
     "    addr_path_verifier,\n",
-    "    sol_code_path,\n",
     "    'http://127.0.0.1:3030',\n",
+    "    sol_code_path,\n",
     "    \"verifier/reusable\"\n",
     ")\n",
     "\n",
@@ -288,7 +288,7 @@
     "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, sol_key_code_path, 'http://127.0.0.1:3030', \"vka\")\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",
@@ -298,8 +298,8 @@
     "    sol_code_path = os.path.join(name, 'vk.sol')\n",
     "    res = await ezkl.verify_evm(\n",
     "        addr,\n",
-    "        proof_path,\n",
     "        \"http://127.0.0.1:3030\",\n",
+    "        proof_path,\n",
     "        addr_vk = addr_vk\n",
     "    )\n",
     "    assert res == True"

examples/notebooks/univ3-da.ipynb

@@ -562,8 +562,8 @@
                 "\n",
                 "res = await ezkl.deploy_evm(\n",
                 "    addr_path_verifier,\n",
+                "    'http://127.0.0.1:3030',\n",
                 "    sol_code_path,\n",
-                "    'http://127.0.0.1:3030'\n",
                 ")\n",
                 "\n",
                 "assert res == True"
@@ -616,9 +616,9 @@
                 "res = await ezkl.deploy_da_evm(\n",
                 "        addr_path_da,\n",
                 "        input_path,\n",
+                "        RPC_URL,\n",
                 "        settings_path,\n",
                 "        sol_code_path,\n",
-                "        RPC_URL,\n",
                 "    )\n"
             ]
         },
@@ -653,8 +653,8 @@
                 "\n",
                 "res = await ezkl.verify_evm(\n",
                 "    addr,\n",
-                "    proof_path,\n",
                 "    RPC_URL,\n",
+                "    proof_path,\n",
                 "    addr_da,\n",
                 ")"
             ]

examples/notebooks/variance.ipynb

@@ -666,7 +666,7 @@
     },
     {
       "cell_type": "code",
-      "execution_count": 11,
+      "execution_count": null,
       "metadata": {},
       "outputs": [
         {
@@ -689,8 +689,8 @@
         "# await\n",
         "res = await ezkl.deploy_evm(\n",
         "    address_path,\n",
+        "    'http://127.0.0.1:3030',\n",
         "    sol_code_path,\n",
-        "    'http://127.0.0.1:3030'\n",
         ")\n",
         "\n",
         "assert res == True\n",
@@ -701,7 +701,7 @@
     },
     {
       "cell_type": "code",
-      "execution_count": 12,
+      "execution_count": null,
       "metadata": {},
       "outputs": [
         {
@@ -722,8 +722,8 @@
         "\n",
         "res = await ezkl.verify_evm(\n",
         "    addr,\n",
+        "    \"http://127.0.0.1:3030\",\n",
         "    proof_path,\n",
-        "    \"http://127.0.0.1:3030\"\n",
         ")\n",
         "assert res == True"
       ]
@@ -743,7 +743,8 @@
       "provenance": []
     },
     "kernelspec": {
-      "display_name": "Python 3",
+      "display_name": ".env",
+      "language": "python",
       "name": "python3"
     },
     "language_info": {
@@ -756,7 +757,7 @@
       "name": "python",
       "nbconvert_exporter": "python",
       "pygments_lexer": "ipython3",
-      "version": "3.12.2"
+      "version": "3.12.9"
     }
   },
   "nbformat": 4,

examples/notebooks/voice_judge.ipynb

@@ -849,8 +849,8 @@
                 "\n",
                 "res = await ezkl.deploy_evm(\n",
                 "    address_path,\n",
+                "    'http://127.0.0.1:3030',\n",
                 "    sol_code_path,\n",
-                "    'http://127.0.0.1:3030'\n",
                 ")\n",
                 "\n",
                 "assert res == True\n",
@@ -870,8 +870,8 @@
                 "\n",
                 "res = await ezkl.verify_evm(\n",
                 "    addr,\n",
-                "    proof_path,\n",
-                "    \"http://127.0.0.1:3030\"\n",
+                "    \"http://127.0.0.1:3030\",\n",
+                "    proof_path\n",
                 ")\n",
                 "assert res == True"
             ]
@@ -905,4 +905,4 @@
     },
     "nbformat": 4,
     "nbformat_minor": 2
-}
+}

examples/notebooks/world_rotation.ipynb

@@ -358,8 +358,8 @@
     "\n",
     "res = await ezkl.deploy_evm(\n",
     "    addr_path_verifier,\n",
+    "    'http://127.0.0.1:3030',\n",
     "    sol_code_path,\n",
-    "    'http://127.0.0.1:3030'\n",
     ")\n",
     "\n",
     "assert res == True"
@@ -405,9 +405,9 @@
     "res = await ezkl.deploy_da_evm(\n",
     "        addr_path_da,\n",
     "        input_path,\n",
+    "        RPC_URL,\n",
     "        settings_path,\n",
     "        sol_code_path,\n",
-    "        RPC_URL,\n",
     "    )"
    ]
   },
@@ -470,8 +470,8 @@
     "\n",
     "res = ezkl.verify_evm(\n",
     "    addr,\n",
-    "    proof_path,\n",
     "    RPC_URL,\n",
+    "    proof_path,\n",
     "    addr_da,\n",
     ")"
    ]
@@ -531,7 +531,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.5"
+   "version": "3.12.9"
   }
  },
  "nbformat": 4,

src/bindings/python.rs

@@ -962,7 +962,7 @@ fn gen_settings(
     output=PathBuf::from(DEFAULT_SETTINGS),
     variables=Vec::from([("batch_size".to_string(), 1)]),
     seed=DEFAULT_SEED.parse().unwrap(),
-    min=None, 
+    min=None,
     max=None
 ))]
 #[gen_stub_pyfunction]
@@ -1823,7 +1823,7 @@ fn create_evm_data_attestation(
     test_data,
     input_source,
     output_source,
-    rpc_url=None
+    rpc_url,
 ))]
 #[gen_stub_pyfunction]
 fn setup_test_evm_data(
@@ -1833,7 +1833,7 @@ fn setup_test_evm_data(
     test_data: PathBuf,
     input_source: PyTestDataSource,
     output_source: PyTestDataSource,
-    rpc_url: Option<String>,
+    rpc_url: String,
 ) -> PyResult<Bound<'_, PyAny>> {
     pyo3_async_runtimes::tokio::future_into_py(py, async move {
         crate::execute::setup_test_evm_data(
@@ -1857,8 +1857,8 @@ fn setup_test_evm_data(
 /// deploys the solidity verifier
 #[pyfunction(signature = (
     addr_path,
+    rpc_url,
     sol_code_path=PathBuf::from(DEFAULT_SOL_CODE),
-    rpc_url=None,
     contract_type=ContractType::default(),
     optimizer_runs=DEFAULT_OPTIMIZER_RUNS.parse().unwrap(),
     private_key=None,
@@ -1867,8 +1867,8 @@ fn setup_test_evm_data(
 fn deploy_evm(
     py: Python,
     addr_path: PathBuf,
+    rpc_url: String,
     sol_code_path: PathBuf,
-    rpc_url: Option<String>,
     contract_type: ContractType,
     optimizer_runs: usize,
     private_key: Option<String>,
@@ -1896,9 +1896,9 @@ fn deploy_evm(
 #[pyfunction(signature = (
     addr_path,
     input_data,
+    rpc_url,
     settings_path=PathBuf::from(DEFAULT_SETTINGS),
     sol_code_path=PathBuf::from(DEFAULT_SOL_CODE_DA),
-    rpc_url=None,
     optimizer_runs=DEFAULT_OPTIMIZER_RUNS.parse().unwrap(),
     private_key=None
 ))]
@@ -1907,9 +1907,9 @@ fn deploy_da_evm(
     py: Python,
     addr_path: PathBuf,
     input_data: String,
+    rpc_url: String,
     settings_path: PathBuf,
     sol_code_path: PathBuf,
-    rpc_url: Option<String>,
     optimizer_runs: usize,
     private_key: Option<String>,
 ) -> PyResult<Bound<'_, PyAny>> {
@@ -1956,8 +1956,8 @@ fn deploy_da_evm(
 ///
 #[pyfunction(signature = (
     addr_verifier,
+    rpc_url,
     proof_path=PathBuf::from(DEFAULT_PROOF),
-    rpc_url=None,
     addr_da = None,
     addr_vk = None,
 ))]
@@ -1965,8 +1965,8 @@ fn deploy_da_evm(
 fn verify_evm<'a>(
     py: Python<'a>,
     addr_verifier: &'a str,
+    rpc_url: String,
     proof_path: PathBuf,
-    rpc_url: Option<String>,
     addr_da: Option<&'a str>,
     addr_vk: Option<&'a str>,
 ) -> PyResult<Bound<'a, PyAny>> {

src/commands.rs

@@ -382,6 +382,44 @@ pub struct Cli {
     pub command: Option<Commands>,
 }
 
+/// Custom parser for data field that handles both direct JSON strings and file paths with '@' prefix
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, PartialOrd)]
+pub struct DataField(pub String);
+
+impl FromStr for DataField {
+    type Err = String;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        // Check if the input starts with '@'
+        if s.starts_with('@') {
+            // Extract the file path (remove the '@' prefix)
+            let file_path = &s[1..];
+
+            // Read the file content
+            let content = std::fs::read_to_string(file_path)
+                .map_err(|e| format!("Failed to read data file '{}': {}", file_path, e))?;
+
+            // Return the file content as the data field value
+            Ok(DataField(content))
+        } else {
+            // Use the input string directly
+            Ok(DataField(s.to_string()))
+        }
+    }
+}
+
+impl ToFlags for DataField {
+    fn to_flags(&self) -> Vec<String> {
+        vec![self.0.clone()]
+    }
+}
+
+impl std::fmt::Display for DataField {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
 #[allow(missing_docs)]
 #[derive(Debug, Subcommand, Clone, Deserialize, Serialize, PartialEq, PartialOrd, ToSubcommand)]
 pub enum Commands {
@@ -400,9 +438,9 @@ pub enum Commands {
 
     /// Generates the witness from an input file.
     GenWitness {
-        /// The path to the .json data file
-        #[arg(short = 'D', long, default_value = DEFAULT_DATA, value_hint = clap::ValueHint::FilePath)]
-        data: Option<String>,
+        /// The path to the .json data file (with @ prefix) or a raw data string of the form '{"input_data": [[1, 2, 3]]}'
+        #[arg(short = 'D', long, default_value = DEFAULT_DATA, value_parser = DataField::from_str)]
+        data: Option<DataField>,
         /// The path to the compiled model file (generated using the compile-circuit command)
         #[arg(short = 'M', long, default_value = DEFAULT_COMPILED_CIRCUIT, value_hint = clap::ValueHint::FilePath)]
         compiled_circuit: Option<PathBuf>,
@@ -647,9 +685,9 @@ pub enum Commands {
         /// 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, if None will use Anvil but WON'T persist state
+        /// RPC URL for an Ethereum node
         #[arg(short = 'U', long, value_hint = clap::ValueHint::Url)]
-        rpc_url: Option<String>,
+        rpc_url: String,
         /// where the input data come from
         #[arg(long, default_value = "on-chain", value_hint = clap::ValueHint::Other)]
         input_source: TestDataSource,
@@ -844,9 +882,9 @@ pub enum Commands {
         /// 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)]
         sol_code_path: Option<PathBuf>,
-        /// RPC URL for an Ethereum node, if None will use Anvil but WON'T persist state
-        #[arg(short = 'U', long, value_hint = clap::ValueHint::Url)]
-        rpc_url: Option<String>,
+        /// RPC URL for an Ethereum node
+        #[arg(short = 'U', long,  default_value = DEFAULT_CONTRACT_ADDRESS, value_hint = clap::ValueHint::Url)]
+        rpc_url: String,
         #[arg(long, default_value = DEFAULT_CONTRACT_ADDRESS, value_hint = clap::ValueHint::Other)]
         /// The path to output the contract address
         addr_path: Option<PathBuf>,
@@ -872,9 +910,9 @@ pub enum Commands {
         /// 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, if None will use Anvil but WON'T persist state
+        /// RPC URL for an Ethereum node
         #[arg(short = 'U', long, value_hint = clap::ValueHint::Url)]
-        rpc_url: Option<String>,
+        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>,
@@ -894,9 +932,9 @@ pub enum Commands {
         /// The path to verifier contract's address
         #[arg(long, default_value = DEFAULT_CONTRACT_ADDRESS, value_hint = clap::ValueHint::Other)]
         addr_verifier: H160Flag,
-        /// RPC URL for an Ethereum node, if None will use Anvil but WON'T persist state
+        /// RPC URL for an Ethereum node
         #[arg(short = 'U', long, value_hint = clap::ValueHint::Url)]
-        rpc_url: Option<String>,
+        rpc_url: String,
         /// does the verifier use data attestation ?
         #[arg(long, value_hint = clap::ValueHint::Other)]
         addr_da: Option<H160Flag>,

src/eth.rs

@@ -12,7 +12,6 @@ use alloy::dyn_abi::abi::TokenSeq;
 use alloy::dyn_abi::abi::token::{DynSeqToken, PackedSeqToken, WordToken};
 // use alloy::providers::Middleware;
 use alloy::json_abi::JsonAbi;
-use alloy::node_bindings::Anvil;
 use alloy::primitives::ruint::ParseError;
 use alloy::primitives::{B256, I256, ParseSignedError};
 use alloy::providers::ProviderBuilder;
@@ -313,25 +312,12 @@ pub type ContractFactory<M> = CallBuilder<Http<Client>, Arc<M>, ()>;
 
 /// Return an instance of Anvil and a client for the given RPC URL. If none is provided, a local client is used.
 pub async fn setup_eth_backend(
-    rpc_url: Option<&str>,
+    rpc_url: &str,
     private_key: Option<&str>,
 ) -> Result<(EthersClient, alloy::primitives::Address), EthError> {
     // Launch anvil
 
-    let endpoint: String;
-    if let Some(rpc_url) = rpc_url {
-        endpoint = rpc_url.to_string();
-    } else {
-        let anvil = Anvil::new()
-            .args([
-                "--code-size-limit=41943040",
-                "--disable-block-gas-limit",
-                "-p",
-                "8545",
-            ])
-            .spawn();
-        endpoint = anvil.endpoint();
-    }
+    let endpoint = rpc_url.to_string();
 
     // Instantiate the wallet
     let wallet: LocalWallet;
@@ -365,7 +351,7 @@ pub async fn setup_eth_backend(
 ///
 pub async fn deploy_contract_via_solidity(
     sol_code_path: PathBuf,
-    rpc_url: Option<&str>,
+    rpc_url: &str,
     runs: usize,
     private_key: Option<&str>,
     contract_name: &str,
@@ -387,7 +373,7 @@ pub async fn deploy_da_verifier_via_solidity(
     settings_path: PathBuf,
     input: String,
     sol_code_path: PathBuf,
-    rpc_url: Option<&str>,
+    rpc_url: &str,
     runs: usize,
     private_key: Option<&str>,
 ) -> Result<H160, EthError> {
@@ -574,7 +560,7 @@ pub async fn verify_proof_via_solidity(
     proof: Snark<Fr, G1Affine>,
     addr: H160,
     addr_vk: Option<H160>,
-    rpc_url: Option<&str>,
+    rpc_url: &str,
 ) -> Result<bool, EthError> {
     let flattened_instances = proof.instances.into_iter().flatten();
 
@@ -676,7 +662,7 @@ pub async fn verify_proof_with_data_attestation(
     addr_verifier: H160,
     addr_da: H160,
     addr_vk: Option<H160>,
-    rpc_url: Option<&str>,
+    rpc_url: &str,
 ) -> Result<bool, EthError> {
     use ethabi::{Function, Param, ParamType, StateMutability, Token};
 
@@ -1015,7 +1001,7 @@ pub fn fix_da_sol(commitment_bytes: Option<Vec<u8>>, only_kzg: bool) -> Result<S
                     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 {

src/execute.rs

@@ -176,7 +176,7 @@ pub async fn run(command: Commands) -> Result<String, EZKLError> {
             srs_path,
         } => gen_witness(
             compiled_circuit.unwrap_or(DEFAULT_COMPILED_CIRCUIT.into()),
-            data.unwrap_or(DEFAULT_DATA.into()),
+            data.unwrap_or(DataField(DEFAULT_DATA.into())).to_string(),
             Some(output.unwrap_or(DEFAULT_WITNESS.into())),
             vk_path,
             srs_path,
@@ -1608,7 +1608,7 @@ pub(crate) async fn deploy_da_evm(
     data: String,
     settings_path: PathBuf,
     sol_code_path: PathBuf,
-    rpc_url: Option<String>,
+    rpc_url: String,
     addr_path: PathBuf,
     runs: usize,
     private_key: Option<String>,
@@ -1617,7 +1617,7 @@ pub(crate) async fn deploy_da_evm(
         settings_path,
         data,
         sol_code_path,
-        rpc_url.as_deref(),
+        &rpc_url,
         runs,
         private_key.as_deref(),
     )
@@ -1632,7 +1632,7 @@ pub(crate) async fn deploy_da_evm(
 
 pub(crate) async fn deploy_evm(
     sol_code_path: PathBuf,
-    rpc_url: Option<String>,
+    rpc_url: String,
     addr_path: PathBuf,
     runs: usize,
     private_key: Option<String>,
@@ -1645,7 +1645,7 @@ pub(crate) async fn deploy_evm(
     };
     let contract_address = deploy_contract_via_solidity(
         sol_code_path,
-        rpc_url.as_deref(),
+        &rpc_url,
         runs,
         private_key.as_deref(),
         contract_name,
@@ -1688,7 +1688,7 @@ pub(crate) fn encode_evm_calldata(
 pub(crate) async fn verify_evm(
     proof_path: PathBuf,
     addr_verifier: H160Flag,
-    rpc_url: Option<String>,
+    rpc_url: String,
     addr_da: Option<H160Flag>,
     addr_vk: Option<H160Flag>,
 ) -> Result<String, EZKLError> {
@@ -1702,7 +1702,7 @@ pub(crate) async fn verify_evm(
             addr_verifier.into(),
             addr_da.into(),
             addr_vk.map(|s| s.into()),
-            rpc_url.as_deref(),
+            &rpc_url,
         )
         .await?
     } else {
@@ -1710,7 +1710,7 @@ pub(crate) async fn verify_evm(
             proof.clone(),
             addr_verifier.into(),
             addr_vk.map(|s| s.into()),
-            rpc_url.as_deref(),
+            &rpc_url,
         )
         .await?
     };
@@ -1851,7 +1851,7 @@ pub(crate) async fn setup_test_evm_data(
     data_path: String,
     compiled_circuit_path: PathBuf,
     test_data: PathBuf,
-    rpc_url: Option<String>,
+    rpc_url: String,
     input_source: TestDataSource,
     output_source: TestDataSource,
 ) -> Result<String, EZKLError> {

src/graph/input.rs

@@ -1,17 +1,17 @@
 use super::errors::GraphError;
 use super::quantize_float;
+use crate::EZKL_BUF_CAPACITY;
 use crate::circuit::InputType;
 use crate::fieldutils::integer_rep_to_felt;
 #[cfg(all(feature = "ezkl", not(target_arch = "wasm32")))]
 use crate::graph::postgres::Client;
-use crate::EZKL_BUF_CAPACITY;
 use halo2curves::bn256::Fr as Fp;
 #[cfg(feature = "python-bindings")]
+use pyo3::ToPyObject;
+#[cfg(feature = "python-bindings")]
 use pyo3::prelude::*;
 #[cfg(feature = "python-bindings")]
 use pyo3::types::PyDict;
-#[cfg(feature = "python-bindings")]
-use pyo3::ToPyObject;
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use std::io::BufReader;
 use std::io::BufWriter;
@@ -19,7 +19,7 @@ use std::io::Read;
 use std::panic::UnwindSafe;
 #[cfg(all(feature = "ezkl", not(target_arch = "wasm32")))]
 use tract_onnx::tract_core::{
-    tract_data::{prelude::Tensor as TractTensor, TVec},
+    tract_data::{TVec, prelude::Tensor as TractTensor},
     value::TValue,
 };
 
@@ -201,9 +201,9 @@ impl OnChainSource {
         data: &FileSource,
         scales: Vec<crate::Scale>,
         mut shapes: Vec<Vec<usize>>,
-        rpc: Option<&str>,
+        rpc: &str,
     ) -> Result<Self, GraphError> {
-        use crate::eth::{read_on_chain_inputs, test_on_chain_data, DEFAULT_ANVIL_ENDPOINT};
+        use crate::eth::{read_on_chain_inputs, test_on_chain_data};
         use log::debug;
 
         // Set up local anvil instance for reading on-chain data
@@ -217,7 +217,7 @@ impl OnChainSource {
                 shapes[idx] = vec![i.len()];
             }
         }
-        let used_rpc = rpc.unwrap_or(DEFAULT_ANVIL_ENDPOINT).to_string();
+        let used_rpc = rpc.to_string();
 
         let call_to_account = test_on_chain_data(client.clone(), data).await?;
         debug!("Call to account: {:?}", call_to_account);
@@ -381,7 +381,7 @@ impl GraphData {
                 return Err(GraphError::InvalidDims(
                     0,
                     "non file data cannot be split into batches".to_string(),
-                ))
+                ));
             }
         }
         Ok(inputs)
@@ -434,13 +434,13 @@ impl GraphData {
     /// Loads graph input data from a string, first seeing if it is a file path or JSON data
     /// If it is a file path, it will load the data from the file
     /// Otherwise, it will attempt to parse the string as JSON data
-    /// 
+    ///
     /// # Arguments
     /// * `data` - String containing the input data
     /// # Returns
     /// A new GraphData instance containing the loaded data
     pub fn from_str(data: &str) -> Result<Self, GraphError> {
-        let graph_input = serde_json::from_str(data); 
+        let graph_input = serde_json::from_str(data);
         match graph_input {
             Ok(graph_input) => {
                 return Ok(graph_input);
@@ -515,7 +515,7 @@ impl GraphData {
                 return Err(GraphError::InvalidDims(
                     0,
                     "on-chain data cannot be split into batches".to_string(),
-                ))
+                ));
             }
             #[cfg(all(feature = "ezkl", not(target_arch = "wasm32")))]
             GraphData {
@@ -538,7 +538,6 @@ impl GraphData {
                         input.len(),
                         input_size
                     ),
-                    
                 ));
             }
 

src/graph/mod.rs

@@ -36,12 +36,12 @@ use self::modules::{GraphModules, ModuleConfigs, ModuleForwardResult, ModuleSize
 use crate::circuit::lookup::LookupOp;
 use crate::circuit::modules::ModulePlanner;
 use crate::circuit::region::{ConstantsMap, RegionSettings};
-use crate::circuit::table::{num_cols_required, Range, Table, RESERVED_BLINDING_ROWS_PAD};
+use crate::circuit::table::{RESERVED_BLINDING_ROWS_PAD, Range, Table, num_cols_required};
 use crate::circuit::{CheckMode, InputType};
-use crate::fieldutils::{felt_to_f64, IntegerRep};
+use crate::fieldutils::{IntegerRep, felt_to_f64};
 use crate::pfsys::PrettyElements;
 use crate::tensor::{Tensor, ValTensor};
-use crate::{RunArgs, EZKL_BUF_CAPACITY};
+use crate::{EZKL_BUF_CAPACITY, RunArgs};
 
 use halo2_proofs::{
     circuit::Layouter,
@@ -56,13 +56,13 @@ use maybe_rayon::prelude::{IntoParallelRefIterator, ParallelIterator};
 pub use model::*;
 pub use node::*;
 #[cfg(feature = "python-bindings")]
+use pyo3::ToPyObject;
+#[cfg(feature = "python-bindings")]
 use pyo3::prelude::*;
 #[cfg(feature = "python-bindings")]
 use pyo3::types::PyDict;
 #[cfg(feature = "python-bindings")]
 use pyo3::types::PyDictMethods;
-#[cfg(feature = "python-bindings")]
-use pyo3::ToPyObject;
 
 use serde::{Deserialize, Serialize};
 use std::ops::Deref;
@@ -764,7 +764,7 @@ pub struct TestOnChainData {
     /// The path to the test witness
     pub data: std::path::PathBuf,
     /// rpc endpoint
-    pub rpc: Option<String>,
+    pub rpc: String,
     /// data sources for the on chain data
     pub data_sources: TestSources,
 }
@@ -1027,7 +1027,7 @@ impl GraphCircuit {
         scales: Vec<crate::Scale>,
     ) -> Result<Vec<Tensor<Fp>>, GraphError> {
         use crate::eth::{evm_quantize, read_on_chain_inputs, setup_eth_backend};
-        let (client, client_address) = setup_eth_backend(Some(&source.rpc), None).await?;
+        let (client, client_address) = setup_eth_backend(&source.rpc, None).await?;
         let input = read_on_chain_inputs(client.clone(), client_address, &source.call).await?;
         let quantized_evm_inputs =
             evm_quantize(client, scales, &input, &source.call.decimals).await?;
@@ -1481,13 +1481,9 @@ impl GraphCircuit {
         // print file data
         debug!("file data: {:?}", file_data);
 
-        let on_chain_data: OnChainSource = OnChainSource::test_from_file_data(
-            &file_data,
-            scales,
-            shapes,
-            test_on_chain_data.rpc.as_deref(),
-        )
-        .await?;
+        let on_chain_data: OnChainSource =
+            OnChainSource::test_from_file_data(&file_data, scales, shapes, &test_on_chain_data.rpc)
+                .await?;
         // Here we update the GraphData struct with the on-chain data
         if input_data.is_some() {
             data.input_data = on_chain_data.clone().into();

tests/python/binding_tests.py

@@ -479,15 +479,15 @@ async def test_deploy_evm_reusable_and_vka():
 
     res = await ezkl.deploy_evm(
         addr_path_verifier,
-        sol_code_path,
         anvil_url,
+        sol_code_path,
         "verifier/reusable",
     )
 
     res = await ezkl.deploy_evm(
         addr_path_vk,
-        vk_code_path,
         anvil_url,
+        vk_code_path,
         "vka",
     )
 
@@ -506,8 +506,8 @@ async def test_deploy_evm():
 
     res = await ezkl.deploy_evm(
         addr_path,
-        sol_code_path,
         anvil_url,
+        sol_code_path,
     )
 
     assert res == True
@@ -528,8 +528,8 @@ async def test_deploy_evm_with_private_key():
 
     res = await ezkl.deploy_evm(
         addr_path,
+        anvil_url,
         sol_code_path,
-        rpc_url=anvil_url,
         private_key=anvil_default_private_key
     )
 
@@ -540,8 +540,8 @@ async def test_deploy_evm_with_private_key():
     with pytest.raises(RuntimeError, match="Failed to run deploy_evm"):
         res = await ezkl.deploy_evm(
             addr_path,
+            anvil_url,
             sol_code_path,
-            rpc_url=anvil_url,
             private_key=custom_zero_balance_private_key
         )
 
@@ -564,8 +564,8 @@ async def test_verify_evm():
 
     res = await ezkl.verify_evm(
         addr,
+        anvil_url,
         proof_path,
-        rpc_url=anvil_url,
         # sol_code_path
         # optimizer_runs
     )
@@ -604,8 +604,8 @@ async def test_verify_evm_separate_vk():
 
     res = await ezkl.verify_evm(
         addr_verifier,
+        anvil_url,
         proof_path,
-        rpc_url=anvil_url,
         addr_vk=addr_vk,
         # sol_code_path
         # optimizer_runs
@@ -831,8 +831,8 @@ async def test_evm_aggregate_and_verify_aggr():
 
     res = await ezkl.deploy_evm(
         addr_path,
+        anvil_url,
         sol_code_path,
-        rpc_url=anvil_url,
     )
 
     # as a sanity check