smeb_y/0g-storage-node
1
0
Fork 0
mirror of https://github.com/0glabs/0g-storage-node.git synced 2025-04-04 15:35:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix proof insertion.

Browse Source
This commit is contained in:
Peilun Li 2024-10-12 16:06:43 +08:00
parent dd8d23e1ea
commit a409689c40
4 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
common/append_merkle/src/lib.rs
View File

@ -226,18 +226,18 @@ impl<E: HashElement, A: Algorithm<E>> AppendMerkleTree<E, A> {
&mut self, &mut self,
proof: RangeProof<E>, proof: RangeProof<E>,
) -> Result<Vec<(usize, usize, E)>> { ) -> Result<Vec<(usize, usize, E)>> {
self.fill_with_proof( let mut updated_nodes = Vec::new();
proof let mut left_nodes = proof.left_proof.proof_nodes_in_tree();
.left_proof if left_nodes.len() >= self.leaf_height {
.proof_nodes_in_tree() updated_nodes
.split_off(self.leaf_height), .append(&mut self.fill_with_proof(left_nodes.split_off(self.leaf_height))?);
)?; }
self.fill_with_proof( let mut right_nodes = proof.right_proof.proof_nodes_in_tree();
proof if right_nodes.len() >= self.leaf_height {
.right_proof updated_nodes
.proof_nodes_in_tree() .append(&mut self.fill_with_proof(right_nodes.split_off(self.leaf_height))?);
.split_off(self.leaf_height), }
) Ok(updated_nodes)
} }
pub fn fill_with_file_proof( pub fn fill_with_file_proof(

2
common/task_executor/Cargo.toml
View File

@ -9,5 +9,5 @@ exit-future = "0.2.0"
futures = "0.3.21" futures = "0.3.21"
lazy_static = "1.4.0" lazy_static = "1.4.0"
lighthouse_metrics = { path = "../lighthouse_metrics" } lighthouse_metrics = { path = "../lighthouse_metrics" }
tokio = { version = "1.19.2", features = ["rt"] } tokio = { version = "1.38.0", features = ["full"] }
tracing = "0.1.35" tracing = "0.1.35"

2
node/storage/Cargo.toml
View File

@ -29,7 +29,7 @@ itertools = "0.13.0"
serde = { version = "1.0.197", features = ["derive"] } serde = { version = "1.0.197", features = ["derive"] }
parking_lot = "0.12.3" parking_lot = "0.12.3"
serde_json = "1.0.127" serde_json = "1.0.127"
tokio = { version = "1.10.0", features = ["sync"] } tokio = { version = "1.38.0", features = ["full"] }
task_executor = { path = "../../common/task_executor" } task_executor = { path = "../../common/task_executor" }
[dev-dependencies] [dev-dependencies]

6
node/storage/src/log_store/tx_store.rs
View File

@ -335,11 +335,7 @@ impl TransactionStore {
} }
let mut merkle = if last_chunk_start_index == 0 { let mut merkle = if last_chunk_start_index == 0 {
// The first entry hash is initialized as zero. // The first entry hash is initialized as zero.
AppendMerkleTree::<H256, Sha3Algorithm>::new_with_depth( AppendMerkleTree::<H256, Sha3Algorithm>::new_with_depth(vec![H256::zero()], 1, None)
vec![H256::zero()],
log2_pow2(PORA_CHUNK_SIZE) + 1,
None,
)
} else { } else {
AppendMerkleTree::<H256, Sha3Algorithm>::new_with_depth( AppendMerkleTree::<H256, Sha3Algorithm>::new_with_depth(
vec![], vec![],