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(vm)!: fee model updates + 1.4.1 #791

Merged
merged 212 commits into from
Jan 18, 2024
Merged

feat(vm)!: fee model updates + 1.4.1 #791

merged 212 commits into from
Jan 18, 2024

Conversation

StanislavBreadless
Copy link
Contributor

@StanislavBreadless StanislavBreadless commented Jan 1, 2024 •
edited
Loading

What ❔

Adds a new VM version VM_1_4_1 that will work with zk_evm@1.4.1 and the following contracts.

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 ❔

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 cargo spellcheck --cfg=./spellcheck/era.cfg --code 1.

@StanislavBreadless
unit tests pass
f7d2f4d
@StanislavBreadless
migrate core also
72d05df
@StanislavBreadless
short term fee model iteration
d70499b
@StanislavBreadless
use new contracts
f1fd94e
@StanislavBreadless
new migration
4f6ce4d
@StanislavBreadless
adding field to the db
e92f55a
@StanislavBreadless
include proving costs in the sk
8bf8fb7
@StanislavBreadless
more correct estimations on the server
50189d2
@StanislavBreadless
system tests are now passing
9e46b7e
@StanislavBreadless
fix web3 test
d613edb
@StanislavBreadless
all integration tests pass
5bd96f7
@StanislavBreadless
correct refunds
97f9730
@StanislavBreadless
use 80k for slot overhead
63f786e
@StanislavBreadless
use better system contracts
e85d0d1
@StanislavBreadless
use newest contracts
863bea1
@StanislavBreadless
upd contracts
10eee93
@StanislavBreadless
update contracts
b9fa50a
@StanislavBreadless
restore fee test
babd2a4
@StanislavBreadless
use latest contracts
5856724
@StanislavBreadless
remove unneeded println
e8462c4
@StanislavBreadless
use latest contracts
0bfa007
@StanislavBreadless
use latest system contracts
a6a615f
@StanislavBreadless
add tests for contracts
f685e72
@StanislavBreadless
correct trusted gas limit for l1->l2 transactions
aee9ccf
@StanislavBreadless
add 1.4.1 contracts
0f9961d
@StanislavBreadless
porting v1.4.1 on top of main branch
7e20f34
@StanislavBreadless
minimize cargo lock changes
2c08969
@StanislavBreadless
fmt
f6c1b33
@StanislavBreadless
sync with 1.4.1
17da757
@StanislavBreadless
use new contracts
073b28b
perekopskiy
perekopskiy previously approved these changes Jan 18, 2024
View reviewed changes
@perekopskiy perekopskiy added this pull request to the merge queue Jan 18, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jan 18, 2024
@StanislavBreadless StanislavBreadless added this pull request to the merge queue Jan 18, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jan 18, 2024
@github-actions GitHub Actions
Copy link
Contributor

Detected VM performance changes

Benchmark name Difference in runtime
slot_hash_collision +22.2%
access_memory +22.2%
decode_shl_sub +23.0%
finish_eventful_frames +24.2%
call_far +17.2%
event_spam +24.9%
write_and_decode +22.3%

@StanislavBreadless StanislavBreadless added this pull request to the merge queue Jan 18, 2024
Merged via the queue into main with commit 3564aff Jan 18, 2024
34 checks passed
@StanislavBreadless StanislavBreadless deleted the sb-short-term-fee-model-1-4-1 branch January 18, 2024 17:26
This was referenced Jan 18, 2024
Merged
Merged
github-merge-queue bot pushed a commit that referenced this pull request Jan 19, 2024
@zksync-era-bot
chore(main): release core 20.0.0 (#899)
dec608d 
🤖 I have created a release *beep* *boop*
---


##
[20.0.0](core-v19.2.0...core-v20.0.0)
(2024-01-19)


### ⚠ BREAKING CHANGES

* **vm:** fee model updates + 1.4.1
([#791](#791))

### Features

* **api:** Consider State keeper fee model input in the API
([#901](#901))
([3211687](3211687))
* **api:** Make Web3 API server work with pruned data
([#838](#838))
([0b7cd0b](0b7cd0b))
* **vm:** fee model updates + 1.4.1
([#791](#791))
([3564aff](3564aff))


### Bug Fixes

* addresses broken links in preparation for ci link check
([#869](#869))
([a78d03c](a78d03c))
* Incorrect exposing of log indexes
([#896](#896))
([12974fc](12974fc))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).
@koloz193 koloz193 restored the sb-short-term-fee-model-1-4-1 branch January 19, 2024 16:28
@koloz193 koloz193 deleted the sb-short-term-fee-model-1-4-1 branch January 19, 2024 16:36
github-merge-queue bot pushed a commit that referenced this pull request Jan 29, 2024
@zksync-era-bot
chore(main): release prover 11.0.0 (#824)
8f55cae 
🤖 I have created a release *beep* *boop*
---


##
[11.0.0](prover-v10.1.0...prover-v11.0.0)
(2024-01-29)


### ⚠ BREAKING CHANGES

* **vm:** fee model updates + 1.4.1
([#791](#791))

### Features

* **api:** Make Web3 API server work with pruned data
([#838](#838))
([0b7cd0b](0b7cd0b))
* consensus component config for main node and external node
([#881](#881))
([1aed8de](1aed8de))
* **en:** Restore state keeper storage from snapshot
([#885](#885))
([a9553b5](a9553b5))
* fee model updates + 1.4.1 stage upgrade
([#897](#897))
([fa48c13](fa48c13))
* protobuf-generated json configs for the main node (BFT-371)
([#458](#458))
([f938314](f938314))
* Remove zkevm_test_harness public reexport from zksync_types
([#929](#929))
([dd1a35e](dd1a35e))
* **state-keeper:** circuits seal criterion
([#729](#729))
([c4a86bb](c4a86bb))
* **vm:** fee model updates + 1.4.1
([#791](#791))
([3564aff](3564aff))


### Bug Fixes

* address issue with spellchecker not checking against prover workspace
([#855](#855))
([4f55926](4f55926))
* addresses broken links in preparation for ci link check
([#869](#869))
([a78d03c](a78d03c))
* **prover:** Update shivini
([#915](#915))
([f141a00](f141a00))
* **witness-generator:** Update era-zkevm_test_harness
([#912](#912))
([c03c2e3](c03c2e3))
* **witness-generator:** Update zkevm_test_harness
([#930](#930))
([16fdcff](16fdcff))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).
@SuccinctPaul SuccinctPaul mentioned this pull request Feb 19, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@perekopskiy perekopskiy perekopskiy approved these changes

@mm-zk mm-zk mm-zk left review comments

@Deniallugo Deniallugo Deniallugo left review comments

@RomanBrodetski RomanBrodetski Awaiting requested review from RomanBrodetski

@koloz193 koloz193 Awaiting requested review from koloz193

@popzxc popzxc Awaiting requested review from popzxc

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

Successfully merging this pull request may close these issues.