Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kzg repro [don't merge] #176

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
+52 −42
Draft

kzg repro [don't merge] #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c8b9bbb
kzg repro
Brechtpd May 9, 2024
c3bdb79
Merge branch 'taiko/unstable' into kzg-fun
Brechtpd May 10, 2024
589515b
Merge branch 'taiko/unstable' into kzg-fun
Brechtpd May 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions host/src/raiko.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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;
// }
// }
}
32 changes: 16 additions & 16 deletions lib/src/protocol_instance.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,22 +94,22 @@ pub fn assemble_protocol_instance(
) -> Result<ProtocolInstance> {
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()))
};
Expand Down
7 changes: 6 additions & 1 deletion provers/risc0/builder/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
7 changes: 6 additions & 1 deletion provers/sp1/builder/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"])
}

Expand Down
Loading