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

feat: store event bloom filter in DB #473

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

feat: store event bloom filter in DB #473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f5ef319
feat: store event bloom filter in DB
jbcaron Jan 21, 2025
3320801
feat: store event bloom filter in DB
jbcaron Jan 21, 2025
cff833c
Merge commit 'HEAD@{5}' into feat/bloom-filter
jbcaron Feb 3, 2025
7d8af48
chore: bump db version
github-actions[bot] Feb 3, 2025
793316d
refactor(get_events): made code more readable
Trantorian1 Feb 3, 2025
56a51cc
chore: fix comment
jbcaron Feb 3, 2025
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
4 changes: 3 additions & 1 deletion .db-versions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
current_version: 1
current_version: 2
versions:
- version: 2
pr: 473
- version: 1
pr: 450
- version: 0
Expand Down
153 changes: 153 additions & 0 deletions Cargo.lock
View file
Open in desktop

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

8 changes: 8 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ members = [
"crates/madara/client/block_import",
"crates/madara/node",
"crates/madara/primitives/block",
"crates/madara/primitives/bloom_filter",
"crates/madara/primitives/bloom_filter",
"crates/madara/primitives/convert",
"crates/madara/primitives/transactions",
"crates/madara/primitives/class",
Expand Down Expand Up @@ -46,6 +48,8 @@ default-members = [
"crates/madara/client/analytics",
"crates/madara/node",
"crates/madara/primitives/block",
"crates/madara/primitives/bloom_filter",
"crates/madara/primitives/bloom_filter",
"crates/madara/primitives/convert",
"crates/madara/primitives/transactions",
"crates/madara/primitives/class",
Expand Down Expand Up @@ -110,6 +114,7 @@ m-proc-macros = { path = "crates/madara/proc-macros", default-features = false }

# Madara primtitives
mp-block = { path = "crates/madara/primitives/block", default-features = false }
mp-bloom-filter = { path = "crates/madara/primitives/bloom_filter", default-features = false }
mp-convert = { path = "crates/madara/primitives/convert", default-features = false }
mp-transactions = { path = "crates/madara/primitives/transactions", default-features = false }
mp-class = { path = "crates/madara/primitives/class", default-features = false }
Expand Down Expand Up @@ -227,6 +232,8 @@ num-bigint = "0.4"
primitive-types = "0.12"
rand = "0.8"
crypto-bigint = "0.5.5"
ahash = "0.8"
twox-hash = "2.1"

# Std extensions
lazy_static = { version = "1.4", default-features = false }
Expand All @@ -249,6 +256,7 @@ httpmock = "0.7.0"
mockall = "0.13.0"
fdlimit = "0.3.0"
assert_matches = "1.5"
criterion = { version = "0.5", features = ["html_reports"] }

# Macros
indoc = "2"
Expand Down
1 change: 1 addition & 0 deletions crates/madara/client/block_import/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ tokio.workspace = true
mc-analytics.workspace = true
mc-db.workspace = true
mp-block.workspace = true
mp-bloom-filter.workspace = true
mp-chain-config.workspace = true
mp-class.workspace = true
mp-convert.workspace = true
Expand Down
23 changes: 18 additions & 5 deletions crates/madara/client/block_import/src/verify_apply.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ use mp_block::{
header::PendingHeader, BlockId, Header, MadaraBlockInfo, MadaraBlockInner, MadaraMaybePendingBlock,
MadaraMaybePendingBlockInfo, MadaraPendingBlockInfo,
};
use mp_bloom_filter::EventBloomWriter;
use mp_convert::{FeltHexDisplay, ToFelt};
use starknet_api::core::ChainId;
use starknet_types_core::felt::Felt;
Expand Down Expand Up @@ -82,6 +83,16 @@ pub fn verify_apply_inner(
// Update contract and its storage tries
let global_state_root = update_tries(backend, &block, &validation, block_number)?;

// Event bloom filter
let event_bloom = {
let mut events_iter = block.receipts.iter().flat_map(|tx| tx.events().iter()).peekable();
if events_iter.peek().is_none() {
None
} else {
Some(EventBloomWriter::from_events(events_iter))
}
};

// Block hash
let (block_hash, header) = block_hash(&block, &validation, block_number, parent_block_hash, global_state_root)?;

Expand All @@ -101,6 +112,7 @@ pub fn verify_apply_inner(
},
block.state_diff,
block.converted_classes,
event_bloom,
block.visited_segments,
None,
)
Expand Down Expand Up @@ -146,6 +158,7 @@ pub fn verify_apply_pending_inner(
},
block.state_diff,
block.converted_classes,
None,
block.visited_segments,
None,
)
Expand Down Expand Up @@ -411,7 +424,7 @@ mod verify_apply_tests {
if populate_db {
let header = create_dummy_header();
let pending_block = finalized_block_zero(header);
backend.store_block(pending_block.clone(), finalized_state_diff_zero(), vec![], None, None).unwrap();
backend.store_block(pending_block.clone(), finalized_state_diff_zero(), vec![], None, None, None).unwrap();
}

// Create a validation context with the specified ignore_block_order flag
Expand Down Expand Up @@ -665,7 +678,7 @@ mod verify_apply_tests {
let mut header = create_dummy_header();
header.block_number = 0;
let pending_block = finalized_block_zero(header);
backend.store_block(pending_block.clone(), finalized_state_diff_zero(), vec![], None, None).unwrap();
backend.store_block(pending_block.clone(), finalized_state_diff_zero(), vec![], None, None, None).unwrap();

assert_eq!(backend.get_latest_block_n().unwrap(), Some(0));

Expand All @@ -691,7 +704,7 @@ mod verify_apply_tests {
let mut header = create_dummy_header();
header.block_number = 0;
let pending_block = finalized_block_zero(header);
backend.store_block(pending_block.clone(), finalized_state_diff_zero(), vec![], None, None).unwrap();
backend.store_block(pending_block.clone(), finalized_state_diff_zero(), vec![], None, None, None).unwrap();

assert_eq!(backend.get_latest_block_n().unwrap(), Some(0));

Expand Down Expand Up @@ -727,7 +740,7 @@ mod verify_apply_tests {
let mut genesis_header = create_dummy_header();
genesis_header.block_number = 0;
let genesis_block = finalized_block_zero(genesis_header.clone());
backend.store_block(genesis_block, finalized_state_diff_zero(), vec![], None, None).unwrap();
backend.store_block(genesis_block, finalized_state_diff_zero(), vec![], None, None, None).unwrap();

assert_eq!(backend.get_latest_block_n().unwrap(), Some(0));

Expand Down Expand Up @@ -773,7 +786,7 @@ mod verify_apply_tests {
let mut genesis_header = create_dummy_header();
genesis_header.block_number = 0;
let genesis_block = finalized_block_zero(genesis_header.clone());
backend.store_block(genesis_block, finalized_state_diff_zero(), vec![], None, None).unwrap();
backend.store_block(genesis_block, finalized_state_diff_zero(), vec![], None, None, None).unwrap();

assert_eq!(backend.get_latest_block_n().unwrap(), Some(0));

Expand Down
Loading
Loading