Merge pull request #170 from taikoxyz/fix-kzg-sp1

fix(sp1): kzg compilation fix for sp1
taikoxyz · May 8, 2024 · a9fd25f · a9fd25f
2 parents ef08765 + d17977b
commit a9fd25f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 18 deletions.
diff --git a/lib/src/protocol_instance.rs b/lib/src/protocol_instance.rs
@@ -94,22 +94,16 @@ pub fn assemble_protocol_instance(
 ) -> Result<ProtocolInstance> {
     let blob_used = input.taiko.block_proposed.meta.blobUsed;
     let tx_list_hash = if blob_used {
-        if cfg!(not(feature = "sp1")) {
-            println!("kzg check enabled!");
-            let mut data = Vec::from(KZG_TRUST_SETUP_DATA);
-            let kzg_settings = KzgSettings::from_u8_slice(&mut data);
-            let kzg_commit = KzgCommitment::blob_to_kzg_commitment(
-                &Blob::from_bytes(&input.taiko.tx_data.as_slice()).unwrap(),
-                &kzg_settings,
-            )
-            .unwrap();
-            let versioned_hash = kzg_to_versioned_hash(kzg_commit);
-            assert_eq!(versioned_hash, input.taiko.tx_blob_hash.unwrap());
-            versioned_hash
-        } else {
-            println!("kzg check disabled!");
-            input.taiko.tx_blob_hash.unwrap()
-        }
+        let mut data = Vec::from(KZG_TRUST_SETUP_DATA);
+        let kzg_settings = KzgSettings::from_u8_slice(&mut data);
+        let kzg_commit = KzgCommitment::blob_to_kzg_commitment(
+            &Blob::from_bytes(&input.taiko.tx_data.as_slice()).unwrap(),
+            &kzg_settings,
+        )
+        .unwrap();
+        let versioned_hash = kzg_to_versioned_hash(kzg_commit);
+        assert_eq!(versioned_hash, input.taiko.tx_blob_hash.unwrap());
+        versioned_hash
     } else {
         TxHash::from(keccak(input.taiko.tx_data.as_slice()))
     };

diff --git a/provers/sp1/builder/src/main.rs b/provers/sp1/builder/src/main.rs
@@ -32,7 +32,7 @@ impl Pipeline for Sp1Pipeline {
                 "panic=abort",
             ])
             .cc_compiler("gcc".into())
-            .c_flags(&["/opt/riscv/bin/riscv32-unknown-elf-gcc"])
+            .c_flags(&["/opt/riscv/bin/riscv32-unknown-elf-gcc", "-mstrict-align"])
             .custom_args(&["--ignore-rust-version"])
     }
 

diff --git a/provers/sp1/driver/src/lib.rs b/provers/sp1/driver/src/lib.rs
@@ -80,7 +80,6 @@ fn test_example() {
 
     // // Still need to write the same input requried by main binary
     // // Even though test itself desn't use it.
-    // let mut stdin = SP1Stdin::new();
     // stdin.write(&GuestInput::default());
 
     // let (pk, vk) = client.setup(TEST_ELF);