VERGRTH16 changed to print input byte blob

Author: nkaskov

src/executor/crypto.rs

@@ -33,9 +33,9 @@ use ton_block::GlobalCapabilities;
 use sha2::Digest;
 use ed25519::signature::{Signature, Verifier};
 use std::sync::Arc;
-use ton_types::{BuilderData, error, GasConsumer, ExceptionCode, UInt256};
+use ton_types::{BuilderData, Cell, error, GasConsumer, ExceptionCode, UInt256};
 
-use crusty3_zk::{groth16::{verify_proof, prepare_verifying_key, Parameters},
+use crusty3_zk::{groth16::{verify_proof, prepare_verifying_key, Parameters, verify_groth16_proof_from_byteblob},
                  bls::{Bls12, Fr}
                 };
 
@@ -89,25 +89,38 @@ pub(super) fn execute_sha256u(engine: &mut Engine) -> Status {
     }
 }
 
+pub fn obtain_cells_data(cl: Cell) -> Result<Vec<u8>, Failure> {
+	let mut byte_blob = Vec::new();
+    let mut queue = vec!(cl.clone());
+    while let Some(cell) = queue.pop() {
+        let this_reference_data = cell.data();
+
+        byte_blob.extend(this_reference_data[0..this_reference_data.len()-1].iter().copied());
+
+        let count = cell.references_count();
+        for i in 0..count {
+            queue.push(cell.reference(i)?);
+        }
+    }
+
+    Ok(byte_blob)
+}
+
 pub(super) fn execute_vergrth16(engine: &mut Engine) -> Failure {
     engine.load_instruction(Instruction::new("VERGRTH16"))
         .and_then(|ctx| fetch_stack(ctx, 1))
         .and_then(|ctx| {
             let builder = BuilderData::from(ctx.engine.cmd.var(0).as_cell()?);
             let cell_proof_data_length = builder.length_in_bits();
-            //let data = builder.data();
+
             let cell_proof = ctx.engine.finalize_cell(builder)?;
-            let cell_proof_data = cell_proof.data();
-            if cell_proof_data_length % 8 == 0 {
 
-                let de_params = Parameters::read(&cell_proof_data[..], true).unwrap();
+            let mut cell_proof_data = obtain_cells_data(cell_proof).unwrap();
 
-                let pvk = prepare_verifying_key::<Bls12>(&de_params.vk);
+            if cell_proof_data_length % 8 == 0 {
 
-                //let de_proof = Proof::read(&v[..]).unwrap();
+                let result = verify_groth16_proof_from_byteblob::<Bls12>(&cell_proof_data[..]).unwrap();
 
-                //let result = verify_proof();
-                let result = true;
                 ctx.engine.cc.stack.push(boolean!(result));
                 Ok(ctx)
             } else {