diff --git a/common/append_merkle/src/lib.rs b/common/append_merkle/src/lib.rs index 6568661..52ded90 100644 --- a/common/append_merkle/src/lib.rs +++ b/common/append_merkle/src/lib.rs @@ -7,7 +7,7 @@ use std::cmp::Ordering; use std::collections::HashMap; use std::fmt::Debug; use std::marker::PhantomData; -use tracing::{debug, warn}; +use tracing::warn; pub use crate::merkle_tree::{Algorithm, HashElement, MerkleTreeInitialData, MerkleTreeRead}; pub use proof::{Proof, RangeProof}; @@ -217,7 +217,7 @@ impl> AppendMerkleTree { tx_merkle_nodes = tx_merkle_nodes .into_iter() .filter_map(|(height, data)| { - if height >= self.leaf_height + 1 { + if height > self.leaf_height { Some((height - self.leaf_height - 1, data)) } else { None diff --git a/common/append_merkle/src/proof.rs b/common/append_merkle/src/proof.rs index 4ebd1f2..cc53941 100644 --- a/common/append_merkle/src/proof.rs +++ b/common/append_merkle/src/proof.rs @@ -112,12 +112,10 @@ impl Proof { if !in_subtree { if *is_left { in_subtree = true; + } else if i < tx_merkle_nodes.len() { + root_pos += 1 << tx_merkle_nodes[i].0; } else { - if i < tx_merkle_nodes.len() { - root_pos += 1 << tx_merkle_nodes[i].0; - } else { - break; - } + break; } } else { subtree_pos <<= 1; diff --git a/tests/config/node_config.py b/tests/config/node_config.py index 4e02373..dea655b 100644 --- a/tests/config/node_config.py +++ b/tests/config/node_config.py @@ -35,7 +35,6 @@ TX_PARAMS = { "gasPrice": 10_000_000_000, "gas": 10_000_000, "from": GENESIS_ACCOUNT.address, - "gas": 2_000_000, } GENESIS_PRIV_KEY1 = "9a6d3ba2b0c7514b16a006ee605055d71b9edfad183aeb2d9790e9d4ccced471" diff --git a/tests/test_framework/blockchain_node.py b/tests/test_framework/blockchain_node.py index 684213c..09cf50c 100644 --- a/tests/test_framework/blockchain_node.py +++ b/tests/test_framework/blockchain_node.py @@ -282,12 +282,12 @@ class BlockchainNode(TestNode): token_contract, _ = deploy_contract(self.token_contract_path) self.log.debug("ERC20 deployed") flow_contract, flow_contract_hash = deploy_contract( - self.contract_path, [token_contract.address] + self.contract_path, ["0x0000000000000000000000000000000000000000", 100, 0] ) self.log.debug("Flow deployed") mine_contract, _ = deploy_contract( self.mine_contract_path, - [flow_contract.address, 0], + [flow_contract.address, "0x0000000000000000000000000000000000000000", 7], ) self.log.debug("Mine deployed") self.log.info("All contracts deployed") diff --git a/zerog-storage-contracts b/zerog-storage-contracts index aa642b6..951c029 160000 --- a/zerog-storage-contracts +++ b/zerog-storage-contracts @@ -1 +1 @@ -Subproject commit aa642b673c5571586a9d57e70c09c774601db6fb +Subproject commit 951c02992e2a03eb47e41eb840392ec824639640