rewrite for new A5 testnest

taikoxyz · Aug 31, 2023 · 4f8d2c0 · 4f8d2c0
1 parent e723a84
commit 4f8d2c0
Show file tree

Hide file tree

Showing 3 changed files with 408 additions and 1 deletion.
diff --git a/zkevm-circuits/src/lib.rs b/zkevm-circuits/src/lib.rs
@@ -29,6 +29,8 @@ pub mod super_circuit;
 pub mod table;
 #[macro_use]
 pub mod taiko_pi_circuit;
+#[macro_use]
+pub mod taiko_pi_circuit_;
 pub mod taiko_super_circuit;
 
 #[cfg(any(feature = "test", test))]

diff --git a/zkevm-circuits/src/taiko_pi_circuit.rs b/zkevm-circuits/src/taiko_pi_circuit.rs
@@ -51,6 +51,8 @@ pub struct PublicData {
     pub l2_signal_service: Word,
     /// l2 contract address
     pub l2_contract: Word,
+
+
     /// meta hash
     pub meta_hash: Word,
     /// block hash value
@@ -99,6 +101,7 @@ impl PublicData {
                 self.l2_signal_service.to_be_bytes().to_vec(),
             ),
             ("l2_contract", None, self.l2_contract.to_be_bytes().to_vec()),
+
             ("meta_hash", None, self.meta_hash.to_be_bytes().to_vec()),
             (
                 "parent_hash",
@@ -125,6 +128,10 @@ impl PublicData {
         ]
     }
 
+    // pub fn abi_encode(&self) -> Vec<u8> {
+
+    // }
+
     /// get rpi bytes
     pub fn rpi_bytes(&self) -> Vec<u8> {
         self.assignments().iter().flat_map(|v| v.2.clone()).collect()
@@ -778,11 +785,16 @@ mod taiko_pi_circuit_test {
         block.context.history_hashes = vec![OMMERS_HASH.to_word()];
         block.context.block_hash = OMMERS_HASH.to_word();
         block.context.number = 300.into();
+
+        println!("{:?}\n{:?}", 
+            block.protocol_instance.meta_hash.hash(), 
+            block.protocol_instance.meta_hash.hash().to_word());
 
         let public_data = PublicData::new(&block);
+        println!("public_data: {:?}\n{:?}", public_data.meta_hash, public_data.meta_hash.to_be_bytes());
 
         let k = 17;
 
-        assert_eq!(run::<Fr>(k, public_data, None), Ok(()));
+        // assert_eq!(run::<Fr>(k, public_data, None), Ok(()));
     }
 }