Short term fee model + 1.4.1 #159
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…nto v1-4-1-integration
* Zero ptr keccak test * Update contracts/test-contracts/KeccakTest.sol Co-authored-by: Vlad Bochok <[email protected]> --------- Co-authored-by: Stanislav Bezkorovainyi <[email protected]> Co-authored-by: Vlad Bochok <[email protected]>
AntonD3
reviewed
Jan 11, 2024
AntonD3
reviewed
Jan 12, 2024
vladbochok
reviewed
Jan 12, 2024
| /// @dev It is expected of the operator to set the "fair L2 gas price" appropriately to ensure that it is | ||
| /// compensated enough in case the batch might be prematurely sealed because of the transaction slots being filled up. | ||
| function TX_SLOT_OVERHEAD_GAS() -> ret { | ||
| ret := 10000 |
There was a problem hiding this comment.
Why it is not 8000 as described in the doc?
There was a problem hiding this comment.
In the doc it used to be 80k, but this PR also included the increase in the number of transactions in batch (1024 -> 10k) and so we overhead got reduced 10x (I decided to not go below 10k to take into account that the transaction's information will eventually be stored in the DB, etc, so the overhead per transaction should not become much lower than Ethereum's 21k)
Co-authored-by: Vlad Bochok <[email protected]>
Co-authored-by: Vlad Bochok <[email protected]>
Co-authored-by: Vlad Bochok <[email protected]>
…o sb-short-term-fee-model-dev
vladbochok
reviewed
Jan 12, 2024
vladbochok
approved these changes
Jan 12, 2024
Co-authored-by: Vlad Bochok <[email protected]>
…o sb-short-term-fee-model-dev
github-merge-queue bot
pushed a commit
to matter-labs/zksync-era
that referenced
this pull request
Jan 18, 2024
## What ❔ Adds a new VM version `VM_1_4_1` that will work with `[email protected]` and the [following contracts](matter-labs/era-contracts#159). Generally, it contains the following features (on the server side): - The new fee model - 1.4.1 integration - The Increase of the maximal number of transactions per batch to 10 thousand. ❗ Requires DB migration and new config params before being deployed❗ ## Why ❔ <!-- Why are these changes done? What goal do they contribute to? What are the principles behind them? --> <!-- Example: PR templates ensure PR reviewers, observers, and future iterators are in context about the evolution of repos. --> ## Checklist <!-- Check your PR fulfills the following items. --> <!-- For draft PRs check the boxes as you complete them. --> - [ ] 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 `cargo spellcheck --cfg=./spellcheck/era.cfg --code 1`. --------- Co-authored-by: AntonD3 <[email protected]> Co-authored-by: AntonD3 <[email protected]> Co-authored-by: Emil <[email protected]> Co-authored-by: Fedor Sakharov <[email protected]> Co-authored-by: perekopskiy <[email protected]> Co-authored-by: zksync-admin-bot2 <[email protected]> Co-authored-by: perekopskiy <[email protected]>
github-merge-queue bot
pushed a commit
to matter-labs/zksync-era
that referenced
this pull request
Jan 18, 2024
## What ❔ Adds a new VM version `VM_1_4_1` that will work with `[email protected]` and the [following contracts](matter-labs/era-contracts#159). Generally, it contains the following features (on the server side): - The new fee model - 1.4.1 integration - The Increase of the maximal number of transactions per batch to 10 thousand. ❗ Requires DB migration and new config params before being deployed❗ ## Why ❔ <!-- Why are these changes done? What goal do they contribute to? What are the principles behind them? --> <!-- Example: PR templates ensure PR reviewers, observers, and future iterators are in context about the evolution of repos. --> ## Checklist <!-- Check your PR fulfills the following items. --> <!-- For draft PRs check the boxes as you complete them. --> - [ ] 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 `cargo spellcheck --cfg=./spellcheck/era.cfg --code 1`. --------- Co-authored-by: AntonD3 <[email protected]> Co-authored-by: AntonD3 <[email protected]> Co-authored-by: Emil <[email protected]> Co-authored-by: Fedor Sakharov <[email protected]> Co-authored-by: perekopskiy <[email protected]> Co-authored-by: zksync-admin-bot2 <[email protected]> Co-authored-by: perekopskiy <[email protected]>
github-merge-queue bot
pushed a commit
to matter-labs/zksync-era
that referenced
this pull request
Jan 18, 2024
## What ❔ Adds a new VM version `VM_1_4_1` that will work with `[email protected]` and the [following contracts](matter-labs/era-contracts#159). Generally, it contains the following features (on the server side): - The new fee model - 1.4.1 integration - The Increase of the maximal number of transactions per batch to 10 thousand. ❗ Requires DB migration and new config params before being deployed❗ ## Why ❔ <!-- Why are these changes done? What goal do they contribute to? What are the principles behind them? --> <!-- Example: PR templates ensure PR reviewers, observers, and future iterators are in context about the evolution of repos. --> ## Checklist <!-- Check your PR fulfills the following items. --> <!-- For draft PRs check the boxes as you complete them. --> - [ ] 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 `cargo spellcheck --cfg=./spellcheck/era.cfg --code 1`. --------- Co-authored-by: AntonD3 <[email protected]> Co-authored-by: AntonD3 <[email protected]> Co-authored-by: Emil <[email protected]> Co-authored-by: Fedor Sakharov <[email protected]> Co-authored-by: perekopskiy <[email protected]> Co-authored-by: zksync-admin-bot2 <[email protected]> Co-authored-by: perekopskiy <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What ❔
This PR introduces the following features:
Note, that with the increase of the number of txs per batch, we also increased the bootloader memory size. This means that the new version of the VM had to be used for the bootloader tests and so once merged, the PRs to the
devof system contracts that introduce any additional changes will have to be built on top of the following server PR: matter-labs/zksync-era#791Why ❔
Checklist