diff --git a/host/src/raiko.rs b/host/src/raiko.rs index c388a1793..5d79c3f7a 100644 --- a/host/src/raiko.rs +++ b/host/src/raiko.rs @@ -280,7 +280,7 @@ mod tests { async fn test_prove_block_taiko_a7() { let proof_type = get_proof_type_from_env(); let network = Network::TaikoA7; - let block_number = 105987; + let block_number = 101368; let chain_spec = get_network_spec(network); let proof_request = ProofRequest { block_number, @@ -297,27 +297,27 @@ mod tests { prove_block(chain_spec, proof_request).await; } - #[tokio::test(flavor = "multi_thread")] - async fn test_prove_block_ethereum() { - let proof_type = get_proof_type_from_env(); - // Skip test on SP1 for now because it's too slow on CI - if proof_type != ProofType::Sp1 { - let network = Network::Ethereum; - let block_number = 19707175; - let chain_spec = get_network_spec(network); - let proof_request = ProofRequest { - block_number, - rpc: "https://rpc.ankr.com/eth".to_string(), - l1_rpc: String::new(), - beacon_rpc: String::new(), - network, - graffiti: B256::ZERO, - prover: Address::ZERO, - l1_network: Network::Ethereum.to_string(), - proof_type, - prover_args: test_proof_params(), - }; - prove_block(chain_spec, proof_request).await; - } - } + // #[tokio::test(flavor = "multi_thread")] + // async fn test_prove_block_ethereum() { + // let proof_type = get_proof_type_from_env(); + // // Skip test on SP1 for now because it's too slow on CI + // if proof_type != ProofType::Sp1 { + // let network = Network::Ethereum; + // let block_number = 19707175; + // let chain_spec = get_network_spec(network); + // let proof_request = ProofRequest { + // block_number, + // rpc: "https://rpc.ankr.com/eth".to_string(), + // l1_rpc: String::new(), + // beacon_rpc: String::new(), + // network, + // graffiti: B256::ZERO, + // prover: Address::ZERO, + // l1_network: Network::Ethereum.to_string(), + // proof_type, + // prover_args: test_proof_params(), + // }; + // prove_block(chain_spec, proof_request).await; + // } + // } } diff --git a/lib/src/protocol_instance.rs b/lib/src/protocol_instance.rs index a63a2b201..8da057d72 100644 --- a/lib/src/protocol_instance.rs +++ b/lib/src/protocol_instance.rs @@ -94,22 +94,22 @@ pub fn assemble_protocol_instance( ) -> Result { let blob_used = input.taiko.block_proposed.meta.blobUsed; let tx_list_hash = if blob_used { - if !input.taiko.skip_verify_blob { - 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() - } + //if !input.taiko.skip_verify_blob { + 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() + //} } else { TxHash::from(keccak(input.taiko.tx_data.as_slice())) }; diff --git a/provers/risc0/builder/src/main.rs b/provers/risc0/builder/src/main.rs index b6439dd41..ec97086d4 100644 --- a/provers/risc0/builder/src/main.rs +++ b/provers/risc0/builder/src/main.rs @@ -32,7 +32,12 @@ impl Pipeline for Risc0Pipeline { "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", + "-march=rv32im", + "-falign-functions=2", + ]) .custom_args(&["--ignore-rust-version"]); // Cannot use /.rustup/toolchains/risc0/bin/cargo, use regular cargo builder.unset_cargo(); diff --git a/provers/sp1/builder/src/main.rs b/provers/sp1/builder/src/main.rs index adfa53e43..4739d1a26 100644 --- a/provers/sp1/builder/src/main.rs +++ b/provers/sp1/builder/src/main.rs @@ -32,7 +32,12 @@ impl Pipeline for Sp1Pipeline { "panic=abort", ]) .cc_compiler("gcc".into()) - .c_flags(&["/opt/riscv/bin/riscv32-unknown-elf-gcc", "-mstrict-align"]) + .c_flags(&[ + "/opt/riscv/bin/riscv32-unknown-elf-gcc", + "-mstrict-align", + "-march=rv32im", + "-falign-functions=2", + ]) .custom_args(&["--ignore-rust-version"]) }