Skip to content

fix(batcher): Update Lambdaworks Merkle Trees + Update merkle leaves length check in batcher#1067

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

Merged
entropidelic merged 15 commits into from
Oct 7, 2024
Merged

fix(batcher): Update Lambdaworks Merkle Trees + Update merkle leaves length check in batcher #1067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
65170c1
update lambdaworks v0.7.0 -> v0.10.0 + update batch length condition.
PatStiles Sep 24, 2024
56fcbd4
replace comment
PatStiles Sep 24, 2024
6c73373
update log + add back in comment
PatStiles Sep 25, 2024
6ff7d68
remove match in operator merkle_root
PatStiles Sep 25, 2024
1b6252d
rm comment and remove batch_len
PatStiles Sep 25, 2024
ccbe26d
update merkle batch test files
PatStiles Sep 25, 2024
1a28f98
shorten batcher error
PatStiles Sep 25, 2024
7686a6b
Merge branch 'staging' into 970-update-empty-batch-condition
entropidelic Sep 25, 2024
6e9ba78
fix: point LW lib to their latest commit, containing merkle trees of …
uri-99 Sep 30, 2024
cae39a1
Merge remote-tracking branch 'origin/970-update-empty-batch-condition…
entropidelic Oct 2, 2024
6b87d16
Merge branch 'staging' into 970-update-empty-batch-condition
entropidelic Oct 2, 2024
83d05d8
Merge branch 'staging' into 970-update-empty-batch-condition
entropidelic Oct 2, 2024
4e57e7a
Merge remote-tracking branch 'origin/staging' into 970-update-empty-b…
entropidelic Oct 2, 2024
4a0bad2
fix: merkle_root.bin
uri-99 Oct 2, 2024
b2a81ec
Merge branch 'staging' into 970-update-empty-batch-condition
entropidelic Oct 7, 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
886 changes: 445 additions & 441 deletions batcher/Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion batcher/aligned-batcher/Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ ethers = { tag = "v2.0.15-fix-reconnections", features = [
"ws",
"rustls",
], git = "https://github.com/yetanotherco/ethers-rs.git" }
lambdaworks-crypto = { version = "0.7.0", features = ["serde"] }
lambdaworks-crypto = { git = "https://github.com/lambdaclass/lambdaworks.git", rev = "efd46f0b0aea3aa95d94bba7de86cb96611b40d3", features = ["serde"] }
serde_yaml = "0.9.34"
sp1-sdk = { git = "https://github.com/succinctlabs/sp1.git", rev = "v1.0.1" }
risc0-zkvm = { git = "https://github.com/risc0/risc0", tag = "v1.0.1" }
Expand Down
16 changes: 9 additions & 7 deletions batcher/aligned-batcher/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -754,19 +754,17 @@ impl Batcher {
let current_batch_len = batch_state_lock.batch_queue.len();
let last_uploaded_batch_block_lock = self.last_uploaded_batch_block.lock().await;

// FIXME(marian): This condition should be changed to current_batch_size == 0
// once the bug in Lambdaworks merkle tree is fixed.
if current_batch_len < 2 {
info!("Current batch is empty or length 1. Waiting for more proofs...");
if current_batch_len == 0 {
info!("Current batch is empty. Waiting for more proofs...");
return None;
}

if current_batch_len < self.min_batch_len
if batch_state_lock.batch_queue.len() < self.min_batch_len
&& block_number < *last_uploaded_batch_block_lock + self.max_block_interval
{
info!(
"Current batch not ready to be posted. Current block: {} - Last uploaded block: {}. Current batch length: {} - Minimum batch length: {}",
block_number, *last_uploaded_batch_block_lock, current_batch_len, self.min_batch_len
block_number, *last_uploaded_batch_block_lock, batch_state_lock.batch_queue.len(), self.min_batch_len
);
return None;
}
Expand DownExpand Up@@ -853,7 +851,11 @@ impl Batcher {
.collect();

let batch_merkle_tree: MerkleTree<VerificationCommitmentBatch> =
MerkleTree::build(&batch_data_comm);
MerkleTree::build(&batch_data_comm).ok_or_else(|| {
BatcherError::TaskCreationError(
"Failed to Build Merkle Tree: Empty Batch".to_string(),
)
})?;

{
let mut last_uploaded_batch_block = self.last_uploaded_batch_block.lock().await;
Expand Down
2 changes: 1 addition & 1 deletion batcher/aligned-sdk/Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ tokio = { version = "1.37.0", features = [
"rt-multi-thread",
"sync",
] }
lambdaworks-crypto = { version = "0.7.0", features = ["serde"] }
lambdaworks-crypto = { git = "https://github.com/lambdaclass/lambdaworks.git", rev = "efd46f0b0aea3aa95d94bba7de86cb96611b40d3", features = ["serde"] }
serde = { version = "1.0.201", features = ["derive"] }
sha3 = { version = "0.10.8" }
url = "2.5.0"
Expand Down
25 changes: 19 additions & 6 deletions batcher/aligned/Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,27 @@ edition = "2021"
serde = { version = "1.0.201", features = ["derive"] }
serde_json = "1.0.117"
futures-util = "0.3.30"
tokio = { version = "1.37.0", features = ["io-std", "time", "macros", "rt", "rt-multi-thread", "sync"] }
tokio-tungstenite = { version = "0.23.1", features = ["rustls-tls-webpki-roots", "native-tls"] }
tokio = { version = "1.37.0", features = [
"io-std",
"time",
"macros",
"rt",
"rt-multi-thread",
"sync",
] }
tokio-tungstenite = { version = "0.23.1", features = [
"rustls-tls-webpki-roots",
"native-tls",
] }
url = "2.5.0"
log = "0.4.21"
env_logger = "0.11.3"
clap = { version = "4.5.4", features = ["derive"] }
lambdaworks-crypto = { version = "0.7.0", features = ["serde"] }
ethers = { tag = "v2.0.15-fix-reconnections", features = ["ws", "rustls"], git = "https://github.com/yetanotherco/ethers-rs.git" }
aligned-sdk = { path = "../aligned-sdk"}
lambdaworks-crypto = { git = "https://github.com/lambdaclass/lambdaworks.git", rev = "efd46f0b0aea3aa95d94bba7de86cb96611b40d3", features = ["serde"] }
ethers = { tag = "v2.0.15-fix-reconnections", features = [
"ws",
"rustls",
], git = "https://github.com/yetanotherco/ethers-rs.git" }
aligned-sdk = { path = "../aligned-sdk" }
rpassword = "7.3.1"
sha3 = { version = "0.10.8"}
sha3 = { version = "0.10.8"}
55 changes: 49 additions & 6 deletions operator/merkle_tree/lib/Cargo.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion operator/merkle_tree/lib/Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ edition = "2021"
serde = { version = "1.0.201", features = ["derive"] }
serde_json = "1.0.117"
bincode = "1.3.3"
lambdaworks-crypto = { version = "0.7.0", features = ["serde"] }
lambdaworks-crypto = { git = "https://github.com/lambdaclass/lambdaworks.git", rev = "efd46f0b0aea3aa95d94bba7de86cb96611b40d3", features = ["serde"] }
hex = "0.4.3"
sha3 = "0.10.8"
aligned-sdk = { path = "../../../batcher/aligned-sdk" }
Expand Down
23 changes: 9 additions & 14 deletions operator/merkle_tree/lib/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,8 +43,12 @@ pub extern "C" fn verify_merkle_tree_batch_ffi(
let batch_data_comm: Vec<VerificationDataCommitment> =
batch.into_iter().map(|v| v.into()).collect();

let computed_batch_merkle_tree: MerkleTree<VerificationCommitmentBatch> =
MerkleTree::build(&batch_data_comm);
let Some(computed_batch_merkle_tree) =
MerkleTree::<VerificationCommitmentBatch>::build(&batch_data_comm)
else {
error!("Failed to build merkle tree, batch data commitment is empty");
return false;
};

computed_batch_merkle_tree.root == *merkle_root
}
Expand All@@ -66,10 +70,7 @@ mod tests {
merkle_root_file.read_to_end(&mut root_vec).unwrap();

let mut merkle_root = [0; 32];
merkle_root.copy_from_slice(
&hex::decode(&root_vec)
.unwrap(),
);
merkle_root.copy_from_slice(&hex::decode(&root_vec).unwrap());
Comment thread
PatStiles marked this conversation as resolved.

let result =
verify_merkle_tree_batch_ffi(bytes_vec.as_ptr(), bytes_vec.len(), &merkle_root);
Expand All@@ -86,10 +87,7 @@ mod tests {
merkle_root_file.read_to_end(&mut root_vec).unwrap();

let mut merkle_root = [0; 32];
merkle_root.copy_from_slice(
&hex::decode(&root_vec)
.unwrap(),
);
merkle_root.copy_from_slice(&hex::decode(&root_vec).unwrap());
Comment thread
PatStiles marked this conversation as resolved.

let result =
verify_merkle_tree_batch_ffi(bytes_vec.as_ptr(), bytes_vec.len(), &merkle_root);
Expand All@@ -106,10 +104,7 @@ mod tests {
merkle_root_file.read_to_end(&mut root_vec).unwrap();

let mut merkle_root = [0; 32];
merkle_root.copy_from_slice(
&hex::decode(&root_vec)
.unwrap(),
);
merkle_root.copy_from_slice(&hex::decode(&root_vec).unwrap());

let result =
verify_merkle_tree_batch_ffi(bytes_vec.as_ptr(), bytes_vec.len(), &merkle_root);
Expand Down
2 changes: 1 addition & 1 deletion operator/merkle_tree/lib/test_files/merkle_root.bin
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
715181f01c095618472a72cd06e384d92f02eadc4ea28bf097181b17fdc57f28
d8f7329e4f522a871373c6251aa3c39be8b89766e54174c9e6457fcd491cd86d
Binary file modifiedoperator/merkle_tree/lib/test_files/merkle_tree_batch.bin
View file
Open in desktop
Binary file not shown.