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

Jump to bottom

feat(en): Rate-limit L2 client requests #1500

Merged
merged 30 commits into from Apr 3, 2024
Merged

feat(en): Rate-limit L2 client requests #1500

merged 30 commits into from Apr 3, 2024

Conversation

slowli
Copy link
Contributor

@slowli slowli commented Mar 26, 2024 •
edited

What ❔

Implements rate-limiting for HttpClient (HTTP-based JSON-RPC client that we use in ENs to access main node Web3 APIs).

Why ❔

Some request patterns made by ENs can be rate-limited (e.g., downloading L2 blocks during initial syncing).

Checklist

  • PR title corresponds to the body of PR (we generate changelog entries from PRs).
  • Tests for the changes have been added / updated.
  • Documentation comments have been added / updated.
  • Code has been formatted via zk fmt and zk lint.
  • Spellcheck has been run via zk spellcheck.
  • Linkcheck has been run via zk linkcheck.

@slowli slowli mentioned this pull request Mar 26, 2024
Merged
6 tasks
slowli
slowli commented Mar 27, 2024
View reviewed changes
core/lib/web3_decl/src/client.rs Outdated Show resolved Hide resolved
core/lib/web3_decl/src/client.rs Outdated Show resolved Hide resolved
core/node/node_framework/src/implementations/layers/web3_api/tx_sink.rs Show resolved Hide resolved
core/bin/external_node/src/main.rs Outdated Show resolved Hide resolved
@slowli slowli marked this pull request as ready for review March 27, 2024 09:39
tomg10
tomg10 requested changes Mar 27, 2024
View reviewed changes
Copy link
Contributor

@tomg10 tomg10 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Imo this implementation doesn't solve the problem that we were trying to solve, i.e. that some components may starve other components of requests.

core/bin/external_node/src/config/mod.rs Outdated Show resolved Hide resolved
core/bin/external_node/src/config/mod.rs Outdated Show resolved Hide resolved
etc/env/ext-node.toml Outdated Show resolved Hide resolved
core/bin/external_node/src/main.rs Outdated Show resolved Hide resolved
core/lib/web3_decl/src/client.rs Outdated Show resolved Hide resolved
core/lib/web3_decl/src/client.rs Outdated Show resolved Hide resolved
core/lib/web3_decl/src/client.rs Outdated Show resolved Hide resolved
core/lib/web3_decl/src/client.rs Outdated Show resolved Hide resolved
core/lib/web3_decl/src/client.rs Outdated Show resolved Hide resolved
core/lib/web3_decl/src/client.rs Outdated Show resolved Hide resolved
popzxc
popzxc reviewed Mar 28, 2024
View reviewed changes
core/bin/external_node/src/config/mod.rs Outdated Show resolved Hide resolved
core/lib/web3_decl/src/client/mod.rs Outdated Show resolved Hide resolved
@slowli slowli requested review from tomg10 and popzxc March 29, 2024 08:43
tomg10
tomg10 previously approved these changes Mar 29, 2024
View reviewed changes
@slowli slowli requested a review from tomg10 April 2, 2024 10:53
RomanBrodetski
RomanBrodetski previously approved these changes Apr 3, 2024
View reviewed changes
@slowli slowli added this pull request to the merge queue Apr 3, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Apr 3, 2024
@slowli slowli added this pull request to the merge queue Apr 3, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Apr 3, 2024
@slowli slowli added this pull request to the merge queue Apr 3, 2024
Merged via the queue into main with commit 3f55f1e Apr 3, 2024
40 checks passed
@slowli slowli deleted the aov-pla-838-rate-limit-httpclient-requests branch April 3, 2024 14:12
@zksync-era-bot zksync-era-bot mentioned this pull request Apr 3, 2024
Merged
github-merge-queue bot pushed a commit that referenced this pull request Apr 16, 2024
@zksync-era-bot @RomanBrodetski
chore(main): release core 23.0.0 (#1519)
ce10c2f 
🤖 I have created a release *beep* *boop*
---


##
[23.0.0](core-v22.1.0...core-v23.0.0)
(2024-04-16)


### ⚠ BREAKING CHANGES

* **vm:** 1 5 0 support
([#1508](#1508))

### Features

* **api:** Add `tokens_whitelisted_for_paymaster`
([#1545](#1545))
([6da89cd](6da89cd))
* **api:** Log info about estimated fee
([#1611](#1611))
([daed58c](daed58c))
* Archive old prover jobs
([#1516](#1516))
([201476c](201476c))
* Archiving of prover in gpu_prover_queue
([#1537](#1537))
([a970629](a970629))
* **block-reverter:** only require private key for sending revert
transactions
([#1579](#1579))
([27de6b7](27de6b7))
* **config:** Initialize log config from files as well
([#1566](#1566))
([9e7db59](9e7db59))
* **configs:** Implement new format of configs and implement protobuf
for it ([#1501](#1501))
([086ba5b](086ba5b))
* **db:** Wrap sqlx errors in DAL
([#1522](#1522))
([6e9ed8c](6e9ed8c))
* EN Pruning
([#1418](#1418))
([cea6578](cea6578))
* **en:** add consistency checker condition in db pruner
([#1653](#1653))
([5ed92b9](5ed92b9))
* **en:** add manual vacuum step in db pruning
([#1652](#1652))
([c818be3](c818be3))
* **en:** Rate-limit L2 client requests
([#1500](#1500))
([3f55f1e](3f55f1e))
* **en:** Rework storing and using protective reads
([#1515](#1515))
([13c0c45](13c0c45))
* **en:** support for snapshots recovery in version_sync_task.rs
([#1585](#1585))
([f911276](f911276))
* **eth-watch:** Brush up Ethereum watcher component
([#1596](#1596))
([b0b8f89](b0b8f89))
* Expose component configs as info metrics
([#1584](#1584))
([7c8ae40](7c8ae40))
* **external-node:** external node distributed operation mode
([#1457](#1457))
([777ffca](777ffca))
* Extract commitment generator into a separate crate
([#1636](#1636))
([f763d1f](f763d1f))
* Extract eth_watch and shared metrics into separate crates
([#1572](#1572))
([4013771](4013771))
* Finalize fee address migration
([#1617](#1617))
([713f56b](713f56b))
* fix availability checker
([#1574](#1574))
([b2f21fb](b2f21fb))
* **genesis:** Add genesis config generator
([#1671](#1671))
([45164fa](45164fa))
* **genesis:** mark system contracts bytecodes as known
([#1554](#1554))
([5ffec51](5ffec51))
* Migrate gas limit to u64
([#1538](#1538))
([56dc049](56dc049))
* **node-framework:** Add consensus support
([#1546](#1546))
([27fe475](27fe475))
* **node-framework:** Add consistency checker
([#1527](#1527))
([3c28c25](3c28c25))
* remove unused variables in prover configs
([#1564](#1564))
([d32a019](d32a019))
* Remove zksync-rs SDK
([#1559](#1559))
([cc78e1d](cc78e1d))
* soft removal of `events_queue` table
([#1504](#1504))
([5899bc6](5899bc6))
* **sqlx:** Use offline mode by default
([#1539](#1539))
([af01edd](af01edd))
* Use config for max number of circuits
([#1573](#1573))
([9fcb87e](9fcb87e))
* Validium
([#1461](#1461))
([132a169](132a169))
* **vm:** 1 5 0 support
([#1508](#1508))
([a6ccd25](a6ccd25))


### Bug Fixes

* **api:** Change error code for Web3Error::NotImplemented
([#1521](#1521))
([0a13602](0a13602))
* **cache:** use factory deps cache correctly
([#1547](#1547))
([a923e11](a923e11))
* **CI:** Less flaky CI
([#1536](#1536))
([2444b53](2444b53))
* **configs:** Make genesis fields optional
([#1555](#1555))
([2d0ef46](2d0ef46))
* contract verifier config test
([#1583](#1583))
([030d447](030d447))
* **contract-verifier-api:** permissive cors for contract verifier api
server ([#1525](#1525))
([423f4a7](423f4a7))
* **db:** Fix "values cache update task failed" panics
([#1561](#1561))
([f7c5c14](f7c5c14))
* **en:** do not log error when whitelisted_tokens_for_aa is not
supported
([#1600](#1600))
([06c87f5](06c87f5))
* **en:** Fix DB pool for Postgres metrics on EN
([#1675](#1675))
([c51ca91](c51ca91))
* **en:** improved tree recovery logs
([#1619](#1619))
([ef12df7](ef12df7))
* **en:** Reduce amount of data in snapshot header
([#1528](#1528))
([afa1cf1](afa1cf1))
* **eth-client:** Use local FeeHistory type
([#1552](#1552))
([5a512e8](5a512e8))
* instruction count diff always N/A in VM perf comparison
([#1608](#1608))
([c0f3104](c0f3104))
* **vm:** Fix storage oracle and estimation
([#1634](#1634))
([932b14b](932b14b))
* **vm:** Increase log demuxer cycles on far calls
([#1575](#1575))
([90eb9d8](90eb9d8))


### Performance Improvements

* **db:** rework "finalized" block SQL query
([#1524](#1524))
([2b27290](2b27290))
* **merkle tree:** Manage indices / filters in RocksDB
([#1550](#1550))
([6bbfa06](6bbfa06))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

---------

Co-authored-by: romanbrodetskiy <rb@matterlabs.dev>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@popzxc popzxc popzxc approved these changes

@tomg10 tomg10 Awaiting requested review from tomg10

@RomanBrodetski RomanBrodetski Awaiting requested review from RomanBrodetski

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@slowli @RomanBrodetski @popzxc @tomg10