Fix checks

Author: dastansam

wormhole/example/src/main.rs

@@ -23,11 +23,9 @@ use wormhole_circuit::inputs::{
     BlockHeaderInputs, CircuitInputs, PrivateCircuitInputs, PublicCircuitInputs, DIGEST_LOGS_SIZE,
 };
 use wormhole_circuit::nullifier::Nullifier;
-use wormhole_circuit::storage_proof::ProcessedStorageProof;
 use wormhole_prover::WormholeProver;
 use zk_circuits_common::utils::{BytesDigest, Digest};
 
-mod proof_processing;
 mod utils;
 
 #[tokio::main]
@@ -131,8 +129,8 @@ async fn main() -> anyhow::Result<()> {
         wormhole_circuit::unspendable_account::UnspendableAccount::from_secret(&secret).account_id;
 
     println!("Processing storage proof to generate ordered path and indices...");
-        let processed_storage_proof = proof_processing::process_storage_proof::
-            <qp_poseidon::PoseidonHasher>(header.state_root, &final_key, read_proof.proof)?;
+    let processed_storage_proof =
+        utils::prepare_proof_for_circuit(read_proof.proof, header.state_root, 0)?;
     let inputs = CircuitInputs {
         private: PrivateCircuitInputs {
             secret,

wormhole/example/src/utils.rs

@@ -2,16 +2,16 @@
 use anyhow::anyhow;
 use hex;
 use sp_core::{Hasher, H256};
+use subxt::backend::legacy::rpc_methods::Bytes;
 use wormhole_circuit::storage_proof::ProcessedStorageProof;
 
-// Assuming PoseidonHasher is brought into scope from main.rs or lib.rs
-use crate::PoseidonHasher;
+use qp_poseidon::PoseidonHasher;
 
 /// Prepares the storage proof for circuit consumption.
 /// This function attempts to order the proof nodes based on finding child hashes
 /// within parent nodes using a string search.
 pub fn prepare_proof_for_circuit(
-    proof: Vec<Vec<u8>>,
+    proof: Vec<Bytes>,
     state_root: H256,
     last_idx: usize,
 ) -> anyhow::Result<ProcessedStorageProof> {
@@ -20,12 +20,12 @@ pub fn prepare_proof_for_circuit(
     let mut storage_proof_hex = vec![];
 
     for node_data in proof.iter() {
-        let hash = <PoseidonHasher as Hasher>::hash(node_data);
+        let hash = <PoseidonHasher as Hasher>::hash(&node_data.0);
         if hash == state_root {
-            storage_proof_hex.push(hex::encode(node_data));
+            storage_proof_hex.push(hex::encode(&node_data.0));
         } else {
             hashes.push(hash);
-            bytes_hex.push(hex::encode(node_data));
+            bytes_hex.push(hex::encode(&node_data.0));
         }
     }
 
@@ -66,5 +66,5 @@ pub fn prepare_proof_for_circuit(
         .map(hex::decode)
         .collect::<Result<_, _>>()?;
 
-    Ok(ProcessedStorageProof::new(final_storage_proof, indices))
+    ProcessedStorageProof::new(final_storage_proof, indices)
 }

wormhole/tests/test-helpers/src/lib.rs

@@ -63,7 +63,7 @@ impl TestInputs for CircuitInputs {
                     block_number: 1,
                     state_root: BytesDigest::try_from(root_hash).unwrap(),
                     extrinsics_root: BytesDigest::try_from(root_hash).unwrap(), // TODO: use more sensible value
-                    digest_logs: [0u8; 110],
+                    digest_logs: [0u8; 72],
                 },
             },
         }