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.

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

fix: Cursor not moving correctly after poll in get_filter_changes #546

Merged
merged 21 commits into from
Dec 6, 2023
Merged
Changes from 2 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
f67b91f
add 1 to from_block after poll
Artemka374 Nov 27, 2023
05aa216
increase from_block only if logs are not empty
Artemka374 Nov 27, 2023
21804c8
set from_block to minimum from to_block and current latest block poll…
Artemka374 Nov 28, 2023
da0f697
Merge branch 'main' into afo-fix-get_filter_changes
montekki Nov 30, 2023
cea32d5
Merge branch 'main' into afo-fix-get_filter_changes
Artemka374 Nov 30, 2023
5df7727
update cursor to be inclusive in all types of filters
Artemka374 Nov 30, 2023
f06b79d
remove multiple imports
Artemka374 Nov 30, 2023
91cdf89
refactor get_logs to accept definite range of blocks
Artemka374 Dec 1, 2023
f5b5a2c
fix tests
Artemka374 Dec 1, 2023
22891c7
Merge branch 'main' into afo-fix-get_filter_changes
Artemka374 Dec 1, 2023
c3ed7ef
Merge remote-tracking branch 'origin/afo-fix-get_filter_changes' into…
Artemka374 Dec 1, 2023
0f293e8
update basic filter changes
Artemka374 Dec 1, 2023
2894e8c
Merge branch 'main' into afo-fix-get_filter_changes
Artemka374 Dec 4, 2023
2aa73df
apply suggestions
Artemka374 Dec 4, 2023
1d952e4
apply suggestions
Artemka374 Dec 4, 2023
3ffec67
remove redundant import
Artemka374 Dec 4, 2023
8d17764
Merge branch 'main' into afo-fix-get_filter_changes
Artemka374 Dec 4, 2023
7074c15
Merge branch 'main' into afo-fix-get_filter_changes
Artemka374 Dec 5, 2023
8df660a
apply suggestions
Artemka374 Dec 6, 2023
5eab9f7
Merge branch 'main' into afo-fix-get_filter_changes
Artemka374 Dec 6, 2023
ec0b9c0
Merge branch 'main' into afo-fix-get_filter_changes
Artemka374 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
3 changes: 1 addition & 2 deletions core/lib/zksync_core/src/api_server/web3/namespaces/eth.rs
Original file line number Diff line number Diff line change
Expand Up @@ -861,9 +861,8 @@ impl<G: L1GasPriceProvider> EthNamespace<G> {
.map_err(|err| internal_error(METHOD_NAME, err))?;
*from_block = logs
Artemka374 marked this conversation as resolved.
Show resolved Hide resolved
.last()
.map(|log| MiniblockNumber(log.block_number.unwrap().as_u32()))
.map(|log| MiniblockNumber(log.block_number.unwrap().as_u32() + 1))
.unwrap_or(*from_block);
Artemka374 marked this conversation as resolved.
Show resolved Hide resolved
// FIXME: why is `from_block` not updated?
FilterChanges::Logs(logs)
}
};
Expand Down