HerodotusDev · Okm165 · Mar 27, 2024 · Mar 18, 2024 · Mar 18, 2024 · Mar 18, 2024
diff --git a/.github/workflows/proof_verification_tests.yml b/.github/workflows/proof_verification_tests.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        layout: ["dex", "recursive", "recursive_with_poseidon", "small", "starknet"]
+        layout: ["dex", "recursive", "recursive_with_poseidon", "small", "starknet", "starknet_with_keccak"]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3

diff --git a/.tool-versions b/.tool-versions
@@ -1,2 +1,2 @@
 scarb nightly-2024-03-16 
-starknet-foundry 0.20.0
+starknet-foundry 0.20.1
diff --git a/README.md b/README.md
@@ -2,6 +2,10 @@
 
 ![Cairo Verifier](https://github.com/HerodotusDev/cairo-verifier/assets/46165861/8692dfc1-f267-4c7e-9af0-4ceaeec84207)
 
+[![Continuous Integration - tests](https://github.com/HerodotusDev/cairo-verifier/actions/workflows/tests.yml/badge.svg)](https://github.com/HerodotusDev/cairo-verifier/actions/workflows/tests.yml)
+
+[![Continuous Integration - proof verification tests](https://github.com/HerodotusDev/cairo-verifier/actions/workflows/proof_verification_tests.yml/badge.svg)](https://github.com/HerodotusDev/cairo-verifier/actions/workflows/proof_verification_tests.yml)
+
 ## Building the Verifier
 
 To build the Cairo Verifier, follow these steps:
@@ -44,7 +48,7 @@ cargo run --release --bin snfoundry_proof_serializer < examples/proofs/recursive
 
 ```bash
 cd examples/starknet
-./1-verify-proof.sh 0x069df5a99fa42c37c946c58da0953d721b928078e740fef14da44e0f8c01f0f6 calldata
+./1-verify-proof.sh 0x487810706cc0dfdba0c82403d98e9d32dc36793ed2b731231e5ea19f00c5861 calldata
 ```
 
 [List of deployed Verifier Contracts](deployed_contracts.md)
@@ -57,7 +61,7 @@ By default, the verifier is configured for recursive layout and keccak hash for
 python configure.py -l recursive -s keccak
 ```
 
-layout types: [dex, recursive, recursive_with_poseidon, small, starknet]
+layout types: [dex, recursive, recursive_with_poseidon, small, starknet, starknet_with_keccak]  
 hash types: [keccak, blake2s]
 
 ## Creating a Proof

diff --git a/configure.py b/configure.py
@@ -4,7 +4,7 @@
 from pathlib import Path
 from utils import process_file
 
-LAYOUT_TYPES = ("dex", "recursive", "recursive_with_poseidon", "small", "starknet")
+LAYOUT_TYPES = ("dex", "recursive", "recursive_with_poseidon", "small", "starknet", "starknet_with_keccak")
 HASH_TYPES = ("keccak", "blake2s")
 
 

diff --git a/deployed_contracts.md b/deployed_contracts.md
@@ -7,7 +7,7 @@
 |                                                                                                     | **Mainnet**           | **starknet**                   |
 |                                                                                                     | **Mainnet**           | **starknet_with_keccak**       |
 |                                                                                                     | **Sepolia Testnet**   | **dex**                        |
-|[0x069df5a99fa42c37c946c58da0953d721b928078e740fef14da44e0f8c01f0f6](https://sepolia.starkscan.co/contract/0x069df5a99fa42c37c946c58da0953d721b928078e740fef14da44e0f8c01f0f6)                                   | **Sepolia Testnet**   | **recursive**                  |
+|[0x487810706cc0dfdba0c82403d98e9d32dc36793ed2b731231e5ea19f00c5861](https://sepolia.starkscan.co/contract/0x487810706cc0dfdba0c82403d98e9d32dc36793ed2b731231e5ea19f00c5861)                                    | **Sepolia Testnet**   | **recursive**                  |
 |                                                                                                     | **Sepolia Testnet**   | **recursive_with_poseidon**    |
 |                                                                                                     | **Sepolia Testnet**   | **small**                      |
 |                                                                                                     | **Sepolia Testnet**   | **starknet**                   |

diff --git a/examples/proofs/starknet_with_keccak/example_proof.json b/examples/proofs/starknet_with_keccak/example_proof.json
diff --git a/examples/starknet/.tool-versions b/examples/starknet/.tool-versions
diff --git a/examples/starknet/Scarb.toml b/examples/starknet/Scarb.toml
@@ -7,13 +7,7 @@ edition = "2023_10"
 
 [dependencies]
 cairo_verifier = { path = ".." }
-snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry", tag = "v0.16.0" }
-starknet = "2.4.4"
+snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry", tag = "v0.20.1" }
 
 [[target.starknet-contract]]
-casm = true
-
-[tool.sncast.testnet]
-account = "testnet-sepolia"
-accounts-file = "~/.starknet_accounts/starknet_open_zeppelin_accounts.json"
-url = "https://free-rpc.nethermind.io/sepolia-juno/v0_6"
+casm = true
diff --git a/examples/starknet/snfoundry.toml b/examples/starknet/snfoundry.toml
@@ -1,4 +1,4 @@
 [sncast.testnet]
 account = "testnet-sepolia"
 accounts-file = "~/.starknet_accounts/starknet_open_zeppelin_accounts.json"
-url = "https://free-rpc.nethermind.io/sepolia-juno/v0_6"
+url = "https://free-rpc.nethermind.io/sepolia-juno/v0_7"
diff --git a/examples/starknet/src/main.rs b/examples/starknet/src/main.rs
@@ -16,10 +16,10 @@ fn main() -> anyhow::Result<()> {
     let witness: VecFelt252 = serde_json::from_str(&parsed.witness.to_string()).unwrap();
 
     let proof = chain!(
-        config.to_vec(),
-        public_input.to_vec(),
-        unsent_commitment.to_vec(),
-        witness.to_vec()
+        config.into_iter(),
+        public_input.into_iter(),
+        unsent_commitment.into_iter(),
+        witness.into_iter()
     )
     .collect_vec();
 

diff --git a/fact_registry/.tool-versions b/fact_registry/.tool-versions
diff --git a/fact_registry/Scarb.toml b/fact_registry/Scarb.toml
@@ -7,13 +7,7 @@ edition = "2023_10"
 
 [dependencies]
 cairo_verifier = { path = ".." }
-snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry", tag = "v0.16.0" }
-starknet = "2.4.4"
+snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry", tag = "v0.20.1" }
 
 [[target.starknet-contract]]
-casm = true
-
-[tool.sncast.testnet]
-account = "testnet-sepolia"
-accounts-file = "~/.starknet_accounts/starknet_open_zeppelin_accounts.json"
-url = "https://free-rpc.nethermind.io/sepolia-juno/v0_6"
+casm = true
diff --git a/fact_registry/snfoundry.toml b/fact_registry/snfoundry.toml
@@ -1,4 +1,4 @@
 [sncast.testnet]
 account = "testnet-sepolia"
 accounts-file = "~/.starknet_accounts/starknet_open_zeppelin_accounts.json"
-url = "https://free-rpc.nethermind.io/sepolia-juno/v0_6"
+url = "https://free-rpc.nethermind.io/sepolia-juno/v0_7"
diff --git a/runner/src/main.rs b/runner/src/main.rs
@@ -35,10 +35,10 @@ fn main() -> anyhow::Result<()> {
     let witness: VecFelt252 = serde_json::from_str(&parsed.witness.to_string()).unwrap();
 
     let proof = chain!(
-        config.to_vec(),
-        public_input.to_vec(),
-        unsent_commitment.to_vec(),
-        witness.to_vec()
+        config.into_iter(),
+        public_input.into_iter(),
+        unsent_commitment.into_iter(),
+        witness.into_iter()
     )
     .collect_vec();
 

diff --git a/runner/src/vec252.rs b/runner/src/vec252.rs
@@ -38,6 +38,15 @@ impl VecFelt252 {
     }
 }
 
+impl IntoIterator for VecFelt252 {
+    type Item = Felt252;
+    type IntoIter = std::vec::IntoIter<Self::Item>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        self.0.into_iter()
+    }
+}
+
 impl Deref for VecFelt252 {
     type Target = Vec<Felt252>;
     fn deref(&self) -> &Self::Target {

diff --git a/src/air/layouts.cairo b/src/air/layouts.cairo
@@ -13,5 +13,8 @@ mod recursive;
 // === STARKNET BEGIN ===
 // mod starknet;
 // === STARKNET END ===
+// === STARKNET_WITH_KECCAK BEGIN ===
+// mod starknet_with_keccak;
+// === STARKNET_WITH_KECCAK END ===