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

EVM: Revamp and fix filters system #2736

Merged
merged 14 commits into from
Dec 6, 2023
Merged

EVM: Revamp and fix filters system #2736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3d37f36
Initial fixes to filters service and filter RPC pipelines
sieniven Dec 4, 2023
4f565e5
Fix rust lint
sieniven Dec 4, 2023
a08de0c
Fix lint
sieniven Dec 4, 2023
43a063f
Fix lint
sieniven Dec 4, 2023
6abb4d0
Resolve bugs, fix tests
sieniven Dec 4, 2023
dd8e2bb
Fix tests
sieniven Dec 4, 2023
51dcb9c
Fix RPC handling, revamp filters tests
sieniven Dec 4, 2023
bffb29b
Allow future block numbers to be specified in new log filters
sieniven Dec 5, 2023
9bfd81e
Fmt py
sieniven Dec 5, 2023
f784304
Fmt rs
sieniven Dec 5, 2023
32dbbf8
Add invalid RPC tests
sieniven Dec 5, 2023
4152c26
Fmt py
sieniven Dec 5, 2023
3246f44
Merge branch 'master' into niven/fix-evm-filters
sieniven Dec 5, 2023
e7ae914
Refactor topics pipeline
sieniven Dec 6, 2023
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
10 changes: 2 additions & 8 deletions lib/ain-evm/src/evm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ impl EVMServices {
block: BlockService::new(Arc::clone(&storage))?,
receipt: ReceiptService::new(Arc::clone(&storage)),
logs: LogService::new(Arc::clone(&storage)),
filters: FilterService::new(),
filters: FilterService::new(Arc::clone(&storage)),
storage,
channel: NotificationChannel {
sender,
Expand All @@ -127,7 +127,7 @@ impl EVMServices {
block: BlockService::new(Arc::clone(&storage))?,
receipt: ReceiptService::new(Arc::clone(&storage)),
logs: LogService::new(Arc::clone(&storage)),
filters: FilterService::new(),
filters: FilterService::new(Arc::clone(&storage)),
storage,
channel: NotificationChannel {
sender,
Expand Down Expand Up @@ -260,8 +260,6 @@ impl EVMServices {
self.logs
.generate_logs_from_receipts(&receipts, block.header.number)?;
self.receipt.put_receipts(receipts)?;
self.filters.add_block_to_filters(block.header.hash());

self.channel
.sender
.send(Notification::Block(block.header.hash()))
Expand Down Expand Up @@ -567,11 +565,7 @@ impl EVMServices {

self.verify_tx_fees(template.get_block_base_fee_per_gas(), &tx)?;
let tx_update = self.update_block_template_state_from_tx(template, tx.clone())?;
let tx_hash = tx_update.tx.hash();

template.add_tx(tx_update, hash)?;
self.filters.add_tx_to_filters(tx_hash);

Ok(())
}

Expand Down
Loading
Loading