Skip to content

Commit

Permalink
correct data, more logging
Browse files Browse the repository at this point in the history
  • Loading branch information
@roynalnaruto
roynalnaruto committed Jul 18, 2024
1 parent 5c53d86 commit 6366e8a
Show file tree
Hide file tree
Showing 13 changed files with 102 additions and 54 deletions.
84 changes: 50 additions & 34 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ serde_json = "1.0"
tokio = { version = "1.32", features = ["full"] }

halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "v1.1" }
prover = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "release/v0.12.0", default-features = false, features = ["parallel_syn", "scroll"] }
prover = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "dbg/proving-time", default-features = false, features = ["parallel_syn", "scroll"] }
integration = { path = "integration" }

[patch.crates-io]
Expand Down
50 changes: 41 additions & 9 deletions integration/tests/e2e_tests.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,15 +95,47 @@ fn test_batch_bundle_verify() -> anyhow::Result<()> {
.map(|batch_task| prove_and_verify_batch(&output_dir, &mut prover, batch_task))
.collect::<Vec<_>>();

let n = batch_proofs.len();
for i in 1..n {
log::info!("bundle {i} batches");
let bundle_task = BundleProvingTask {
batch_proofs: batch_proofs[0..i].to_vec(),
};
prove_and_verify_bundle(&output_dir, &mut prover, bundle_task);
log::info!("bundle {i} batches OK");
}
assert_eq!(batch_proofs.len(), 10, "expecting 10 batches");

log::info!("bundle 1 batch");
prove_and_verify_bundle(
&output_dir,
&mut prover,
BundleProvingTask {
batch_proofs: batch_proofs[0..1].to_vec(),
},
);
log::info!("bundle 1 batches OK");

log::info!("bundle 2 batches");
prove_and_verify_bundle(
&output_dir,
&mut prover,
BundleProvingTask {
batch_proofs: batch_proofs[1..3].to_vec(),
},
);
log::info!("bundle 2 batches OK");

log::info!("bundle 3 batches");
prove_and_verify_bundle(
&output_dir,
&mut prover,
BundleProvingTask {
batch_proofs: batch_proofs[3..6].to_vec(),
},
);
log::info!("bundle 3 batches OK");

log::info!("bundle 4 batches");
prove_and_verify_bundle(
&output_dir,
&mut prover,
BundleProvingTask {
batch_proofs: batch_proofs[6..10].to_vec(),
},
);
log::info!("bundle 4 batches OK");

Ok(())
}
Expand Down
2 changes: 1 addition & 1 deletion integration/tests/test_data/batch_tasks/batch_task_293206.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2620,7 +2620,7 @@
"total_l1_message_popped": 904739,
"data_hash": "0xb0dcb9e73d4350cd3c27ab0d65e7f4ebf7d15d1e73b7fdb3a773d4809262642b",
"blob_versioned_hash": "0x019c082270631344493a4243c6483ded5a9f1565302450b735bd6d6fcff73446",
"parent_batch_hash": "0x85158ce546759ab417e2226677fc357f2482c2eed272952228283a4a6e5c1a3f",
"parent_batch_hash": "0xe86e067f78b1c29c1cc297f6d9fe670c7beea1eebb226d1b8eeb9616a2bcac7e",
"last_block_timestamp": 1721129689,
"blob_data_proof": [
"0x0f2c9918c6633a04d37c01dc275ec0963ed3093ff7bfc487d7108155ab22a774",
Expand Down
2 changes: 1 addition & 1 deletion integration/tests/test_data/batch_tasks/batch_task_293207.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2359,7 +2359,7 @@
"total_l1_message_popped": 904739,
"data_hash": "0x330b9e71ddfdb3a10550a13d09235b11cb93583eaffae0975b7bf44a05a9a740",
"blob_versioned_hash": "0x01d900dd6a1d5a1cd09cc6ecaa917bcb27aadc90ee80506d59ea82717d266327",
"parent_batch_hash": "0xed8b5ef2643e4aa4b6e83c7325603a14857a617f266b5d7e2757e35b3602aae6",
"parent_batch_hash": "0x32ada91732cac1da9a014fada1618d78ecaee3f3200d05d3171b5ecc767ad6ff",
"last_block_timestamp": 1721129815,
"blob_data_proof": [
"0x0f5fa5e4a69dcab81255ff91eb793120cf72469c36948b8e073afe660fa4b845",
Expand Down
2 changes: 1 addition & 1 deletion integration/tests/test_data/batch_tasks/batch_task_293208.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2881,7 +2881,7 @@
"total_l1_message_popped": 904739,
"data_hash": "0xcddbdd82bc33e21c6fabac0c3ef1056c40c5bd829ab278db38903587dbf0d47b",
"blob_versioned_hash": "0x01d702f4ef77de262ed6400e6fed166571faa05ec5d5bb61e864d99571044103",
"parent_batch_hash": "0x0f0be6b3ebea686e7e345ea6fb5f8fa8fc8395dbee396cb48107aa411242683b",
"parent_batch_hash": "0x3b5c78b2bb265218574ee8a694689e6e37fb5486213d2909e6bc195a8c6014d0",
"last_block_timestamp": 1721129977,
"blob_data_proof": [
"0x0a43eb071975b8fac0dc42052a056393457dddeccb1de08ee6e1ef54d5a26ae2",
Expand Down
2 changes: 1 addition & 1 deletion integration/tests/test_data/batch_tasks/batch_task_293209.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2272,7 +2272,7 @@
"total_l1_message_popped": 904743,
"data_hash": "0x2f18c811c3118e767c23b16c504b778dded65ee87f9908a61df3224d3218ecd0",
"blob_versioned_hash": "0x01a7e2aba314f3d09ca1f2929ebe7d6e2c5a7f2a6e3f131b00fb13bf6352fb3d",
"parent_batch_hash": "0xf68e98a5c4f2a49c52bebea8b0a735c84b7407c9d6235cb57fa3c28a7915ca85",
"parent_batch_hash": "0x99a25999c6f85e8657484641686b4ce801b1e8bfda58aa6731452ca0884f3921",
"last_block_timestamp": 1721130107,
"blob_data_proof": [
"0x28a2f4b33e2f2524af639347969ff9fa35c72d6da4d0a833e6e9f1301b6699f8",
Expand Down
2 changes: 1 addition & 1 deletion integration/tests/test_data/batch_tasks/batch_task_293210.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2533,7 +2533,7 @@
"total_l1_message_popped": 904743,
"data_hash": "0x161169f38c8df29416a8ee61e911984a381c506a7c2bf0a623aff886ff7313d3",
"blob_versioned_hash": "0x01c34775f05f034c2f908f1a0e0276fdd3ef90b722c06dacaaeb9604c37b519a",
"parent_batch_hash": "0x7de8b8a5a98823e9f93c79226916e06b79d0e66fcde4b270825a606ffd04aa4b",
"parent_batch_hash": "0x11e0acd7e42a2540214a34840a26b357f97dfa2190e82ed5495743d1e259fd53",
"last_block_timestamp": 1721130250,
"blob_data_proof": [
"0x687584066aa267266b940fa324f4e5c00f62ef53e1b5ea21b116e0efa439e0cf",
Expand Down
2 changes: 1 addition & 1 deletion integration/tests/test_data/batch_tasks/batch_task_293211.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2620,7 +2620,7 @@
"total_l1_message_popped": 904743,
"data_hash": "0x86985d8686281b2071abcd7c97bcb0b708613ddb18bae95458149417f5e85784",
"blob_versioned_hash": "0x0117d864076c7f72b5610c6121e159f834ab2d04606d87b13e063bd3e4ea4f90",
"parent_batch_hash": "0x1ddb51d1d031f2195bc924a3644158dbae5a4ce9e7ca1b4c5bd9c1f837e2403d",
"parent_batch_hash": "0x21b6d26b485e9517318c64538589ad737b8143a358df069d610fc483b7f10dde",
"last_block_timestamp": 1721130375,
"blob_data_proof": [
"0x370709c96c3df83a3bc0c27b395538bf8e5901a52f8090eb2719a5217810c00e",
Expand Down
2 changes: 1 addition & 1 deletion integration/tests/test_data/batch_tasks/batch_task_293212.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2359,7 +2359,7 @@
"total_l1_message_popped": 904750,
"data_hash": "0xa261ff31f8f78c19f65d14d6394eb911d53a3a3add9a9691b211caa5809be450",
"blob_versioned_hash": "0x0120096572a3007f75c2a3ff82fa652976eae1c9428ec87ec258a8dcc84f488e",
"parent_batch_hash": "0xc37d3f6881f0ca6b02b1dc071483e02d0fe88cf2ff3663bb1ba9aa0dc034faee",
"parent_batch_hash": "0xd5dbbdab30c1d4f315bca3c0734ae46de7fea1d68e149a9479a69caa25c52cb2",
"last_block_timestamp": 1721130505,
"blob_data_proof": [
"0x496b144866cffedfd71423639984bf0d9ad4309ff7e35693f1baef3cdaf1471e",
Expand Down
Loading

0 comments on commit 6366e8a

Please sign in to comment.