Merge main #65
Merged
Merge main #65
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
…ee (matter-labs#551) ## What ❔ Since enumeration indices are now fully stored in Postgres, it makes sense to not duplicate their assignment in the Merkle tree. Instead, the tree could take enum indices as inputs. ## Why ❔ This allows simplifying tree logic and unify "normal" L1 batch processing and tree recovery. (This unification is not a part of this PR; it'll be implemented separately.) ## Checklist - [x] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [x] Tests for the changes have been added / updated. - [x] Documentation comments have been added / updated. - [x] Code has been formatted via `zk fmt` and `zk lint`.
…labs#537) ## What ❔ Support non-zero genesis block specified in executor configuration. Check whether this block exists on initialization; validate its correspondence if it does, and persist consensus fields if it doesn't. ## Why ❔ This is necessary to support gossip-based syncing in practice; we likely won't back-sign all blocks in all envs. ## Checklist - [x] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [x] Tests for the changes have been added / updated. - [x] Documentation comments have been added / updated. - [x] Code has been formatted via `zk fmt` and `zk lint`.
This revert is done to facilitate boojum upgrade on mainnet2. Without this, old provers would be halt and boojum upgrade could take longer than anticipated. `waiting_for_artifacts` forced witness to wait on BWIP run. `queued` makes them run instantly. - [x] 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. - [x] Code has been formatted via `zk fmt` and `zk lint`. - [ ] Spellcheck has been run via `cargo spellcheck --cfg=./spellcheck/era.cfg --code 1`. --------- Signed-off-by: Danil <deniallugo@gmail.com> Co-authored-by: Danil <deniallugo@gmail.com>
🤖 I have created a release *beep* *boop* --- ## [18.4.0](matter-labs/zksync-era@core-v18.3.1...core-v18.4.0) (2023-12-01) ### Features * adds spellchecker workflow, and corrects misspelled words ([matter-labs#559](matter-labs#559)) ([beac0a8](matter-labs@beac0a8)) * **en:** Support arbitrary genesis block for external nodes ([matter-labs#537](matter-labs#537)) ([15d7eaf](matter-labs@15d7eaf)) * **merkle tree:** Remove enumeration index assignment from Merkle tree ([matter-labs#551](matter-labs#551)) ([e2c1b20](matter-labs@e2c1b20)) * Restore commitment test in Boojum integration ([matter-labs#539](matter-labs#539)) ([06f510d](matter-labs@06f510d)) ### Bug Fixes * Change no pending batches 404 error into a success response ([#279](matter-labs#279)) ([e8fd805](matter-labs@e8fd805)) * **vm:** Expose additional types and traits ([matter-labs#563](matter-labs#563)) ([bd268ac](matter-labs@bd268ac)) * **witness_generator:** Disable BWIP dependency ([matter-labs#573](matter-labs#573)) ([e05d955](matter-labs@e05d955)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
## What ❔ Runs spellcheck in merge queue. <!-- What are the changes this PR brings about? --> <!-- Example: This PR adds a PR template to the repo. --> <!-- (For bigger PRs adding more context is appreciated) --> ## 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. --> - [x] 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. - [x] Code has been formatted via `zk fmt` and `zk lint`. - [ ] Spellcheck has been run via `cargo spellcheck --cfg=./spellcheck/era.cfg --code 1`.
## What ❔ - fix typo ## Why ❔ - fix typo ## Checklist <!-- Check your PR fulfills the following items. --> <!-- For draft PRs check the boxes as you complete them. --> - [x] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [x] Tests for the changes have been added / updated. - [x] Documentation comments have been added / updated. - [x] Code has been formatted via `zk fmt` and `zk lint`. - [x] Spellcheck has been run via `cargo spellcheck --cfg=./spellcheck/era.cfg --code 1`. --------- Co-authored-by: Igor Aleksanov <popzxc@yandex.ru>
## What ❔ - fixed typo ## Why ❔ fix typos in document ## Checklist <!-- Check your PR fulfills the following items. --> <!-- For draft PRs check the boxes as you complete them. --> - [x] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [x] Tests for the changes have been added / updated. - [x] Documentation comments have been added / updated. - [x] Code has been formatted via `zk fmt` and `zk lint`. - [x] Spellcheck has been run via `cargo spellcheck --cfg=./spellcheck/era.cfg --code 1`. --------- Co-authored-by: Igor Aleksanov <popzxc@yandex.ru>
Hi, I have just resolve conflict matter-labs#432 Co-authored-by: Igor Aleksanov <popzxc@yandex.ru>
…alls (matter-labs#535) ## What ❔ Add metric to CallTracer for calculating maximum depth of the calls ## Why ❔ We need to know what our limits are. ## Checklist - [x] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [ ] Tests for the changes have been added / updated. - [x] Documentation comments have been added / updated. - [x] Code has been formatted via `zk fmt` and `zk lint`.
## What ❔ 1. Add various metrics to the Prover subsystems, especially: * oldest block, that wasn't sent to prover(`fri_prover.oldest_unprocessed_block`) * oldest block, that didn't go through basic/leaf/node aggregation levels (`fri_prover.oldest_unprocessed_block_by_round`) * how much time is spent on waiting for available prover to send data to (`prover_fri_witness_vector_generator.prover_waiting_time) * count for attempts to send data to prover (`prover_fri_witness_vector_generator.prover_attempts_count`) 2. Refactor metrics in prover to use vise. ## Why ❔ We have some metric coverage on the prover subsystem, but it's incomplete. ## Checklist - [x] 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. - [x] Code has been formatted via `zk fmt` and `zk lint`.
## What ❔ fix wrong line ## Checklist <!-- Check your PR fulfills the following items. --> <!-- For draft PRs check the boxes as you complete them. --> - [x] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [x] Tests for the changes have been added / updated. - [x] Documentation comments have been added / updated. - [x] Code has been formatted via `zk fmt` and `zk lint`. - [x] Spellcheck has been run via `cargo spellcheck --cfg=./spellcheck/era.cfg --code 1`.
## What ❔ - Hello, fixed typo ## Why ❔ - fixed typo ## Checklist <!-- Check your PR fulfills the following items. --> <!-- For draft PRs check the boxes as you complete them. --> - [x] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [x] Tests for the changes have been added / updated. - [x] Documentation comments have been added / updated. - [x] Code has been formatted via `zk fmt` and `zk lint`. - [x] Spellcheck has been run via `cargo spellcheck --cfg=./spellcheck/era.cfg --code 1`. --------- Co-authored-by: Roman Brodetski <Roman.Brodetski@gmail.com>
## What ❔ Hello, I corrected the typo. ## Why ❔ - fixed typo ## Checklist <!-- Check your PR fulfills the following items. --> <!-- For draft PRs check the boxes as you complete them. --> - [x] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [x] Tests for the changes have been added / updated. - [x] Documentation comments have been added / updated. - [x] Code has been formatted via `zk fmt` and `zk lint`. - [x] Spellcheck has been run via `cargo spellcheck --cfg=./spellcheck/era.cfg --code 1`. --------- Co-authored-by: Igor Aleksanov <popzxc@yandex.ru>
## What ❔ fixed typos ## Why ❔ fixed typos ## Checklist <!-- Check your PR fulfills the following items. --> <!-- For draft PRs check the boxes as you complete them. --> - [x] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [x] Tests for the changes have been added / updated. - [x] Documentation comments have been added / updated. - [x] Code has been formatted via `zk fmt` and `zk lint`. - [x] Spellcheck has been run via `cargo spellcheck --cfg=./spellcheck/era.cfg --code 1`. --------- Co-authored-by: Igor Aleksanov <popzxc@yandex.ru>
## What ❔ fixed broken link ## Checklist <!-- Check your PR fulfills the following items. --> <!-- For draft PRs check the boxes as you complete them. --> - [x] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [x] Tests for the changes have been added / updated. - [x] Documentation comments have been added / updated. - [x] Code has been formatted via `zk fmt` and `zk lint`. - [x] Spellcheck has been run via `cargo spellcheck --cfg=./spellcheck/era.cfg --code 1`. --------- Co-authored-by: Igor Aleksanov <popzxc@yandex.ru>
## What ❔ I've added caching to prettier and changed so that noisy output about changed files is redirected to /dev/null. `zk fmt` is 3 times faster after those changes ## Why ❔ `zk fmt` output was too verbose and we didn't use cache ## Checklist - [X] 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. - [X] Code has been formatted via `zk fmt` and `zk lint`.
## What ❔ the errors in the document have been correct ## Why ❔ the errors in the document have been correct ## Checklist <!-- Check your PR fulfills the following items. --> <!-- For draft PRs check the boxes as you complete them. --> - [x] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [x] Tests for the changes have been added / updated. - [x] Documentation comments have been added / updated. - [x] Code has been formatted via `zk fmt` and `zk lint`. - [x] Spellcheck has been run via `cargo spellcheck --cfg=./spellcheck/era.cfg --code 1`. --------- Co-authored-by: Igor Aleksanov <popzxc@yandex.ru>
…labs#461) ## What ❔ - the errors in the document have been corrected. ## Why ❔ - the errors in the document have been corrected. ## Checklist <!-- Check your PR fulfills the following items. --> <!-- For draft PRs check the boxes as you complete them. --> - [x] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [x] Tests for the changes have been added / updated. - [x] Documentation comments have been added / updated. - [x] Code has been formatted via `zk fmt` and `zk lint`. --------- Co-authored-by: perekopskiy <53865202+perekopskiy@users.noreply.github.com>
## What ❔ - update document ## Checklist <!-- Check your PR fulfills the following items. --> <!-- For draft PRs check the boxes as you complete them. --> - [x] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [x] Tests for the changes have been added / updated. - [x] Documentation comments have been added / updated. - [x] Code has been formatted via `zk fmt` and `zk lint`. - [x] Spellcheck has been run via `cargo spellcheck --cfg=./spellcheck/era.cfg --code 1`. --------- Co-authored-by: Igor Aleksanov <popzxc@yandex.ru> Co-authored-by: perekopskiy <53865202+perekopskiy@users.noreply.github.com>
## What ❔ - fixed typos in documentation ## Checklist <!-- Check your PR fulfills the following items. --> <!-- For draft PRs check the boxes as you complete them. --> - [x] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [x] Tests for the changes have been added / updated. - [x] Documentation comments have been added / updated. - [x] Code has been formatted via `zk fmt` and `zk lint`. - [x] Spellcheck has been run via `cargo spellcheck --cfg=./spellcheck/era.cfg --code 1`. --------- Co-authored-by: perekopskiy <53865202+perekopskiy@users.noreply.github.com>
## What ❔ remove incorrect branch prompts ## Checklist <!-- Check your PR fulfills the following items. --> <!-- For draft PRs check the boxes as you complete them. --> - [x] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [x] Tests for the changes have been added / updated. - [x] Documentation comments have been added / updated. - [x] Code has been formatted via `zk fmt` and `zk lint`. - [x] Spellcheck has been run via `cargo spellcheck --cfg=./spellcheck/era.cfg --code 1`. --------- Co-authored-by: Igor Aleksanov <popzxc@yandex.ru>
…r-labs#568) ## What ❔ Aligns the protocol version for consensus blocks with that of `SyncBlock`s. ## Why ❔ Required for gossip-based block syncing to work correctly. ## Checklist - [x] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [x] Tests for the changes have been added / updated. - [x] Documentation comments have been added / updated. - [x] Code has been formatted via `zk fmt` and `zk lint`. - [x] Spellcheck has been run via `cargo spellcheck --cfg=./spellcheck/era.cfg --code 1`.
🤖 I have created a release *beep* *boop* --- ## [18.5.0](matter-labs/zksync-era@core-v18.4.0...core-v18.5.0) (2023-12-05) ### Features * Add metric to CallTracer for calculating maximum depth of the calls ([matter-labs#535](matter-labs#535)) ([19c84ce](matter-labs@19c84ce)) * Add various metrics to the Prover subsystems ([matter-labs#541](matter-labs#541)) ([58a4e6c](matter-labs@58a4e6c)) ### Bug Fixes * Sync protocol version between consensus and server blocks ([matter-labs#568](matter-labs#568)) ([56776f9](matter-labs@56776f9)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
## What ❔ fix link ## Why ❔ - fix link ## Checklist <!-- Check your PR fulfills the following items. --> <!-- For draft PRs check the boxes as you complete them. --> - [x] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [x] Tests for the changes have been added / updated. - [x] Documentation comments have been added / updated. - [x] Code has been formatted via `zk fmt` and `zk lint`. - [x] Spellcheck has been run via `cargo spellcheck --cfg=./spellcheck/era.cfg --code 1`. --------- Co-authored-by: Igor Aleksanov <popzxc@yandex.ru> Co-authored-by: perekopskiy <53865202+perekopskiy@users.noreply.github.com>
🤖 I have created a release *beep* *boop* --- ## [9.1.0](matter-labs/zksync-era@prover-v9.0.0...prover-v9.1.0) (2023-12-05) ### Features * Add various metrics to the Prover subsystems ([matter-labs#541](matter-labs#541)) ([58a4e6c](matter-labs@58a4e6c)) * adds spellchecker workflow, and corrects misspelled words ([matter-labs#559](matter-labs#559)) ([beac0a8](matter-labs@beac0a8)) * **dal:** Do not load config from env in DAL crate ([matter-labs#444](matter-labs#444)) ([3fe1bb2](matter-labs@3fe1bb2)) * **en:** Implement gossip fetcher ([#371](matter-labs#371)) ([a49b61d](matter-labs@a49b61d)) * **hyperchain:** Adding prover related commands to zk stack ([matter-labs#440](matter-labs#440)) ([580cada](matter-labs@580cada)) * **job-processor:** report attempts metrics ([matter-labs#448](matter-labs#448)) ([ab31f03](matter-labs@ab31f03)) * **merkle tree:** Allow random-order tree recovery ([matter-labs#485](matter-labs#485)) ([146e4cf](matter-labs@146e4cf)) * **witness-generator:** add logs to leaf aggregation job ([matter-labs#542](matter-labs#542)) ([7e95a3a](matter-labs@7e95a3a)) ### Bug Fixes * Change no pending batches 404 error into a success response ([#279](matter-labs#279)) ([e8fd805](matter-labs@e8fd805)) * **ci:** Use the same nightly rust ([matter-labs#530](matter-labs#530)) ([67ef133](matter-labs@67ef133)) * **crypto:** update shivini to switch to era-cuda ([matter-labs#469](matter-labs#469)) ([38bb482](matter-labs@38bb482)) * Sync protocol version between consensus and server blocks ([matter-labs#568](matter-labs#568)) ([56776f9](matter-labs@56776f9)) --- 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: Artem Makhortov <13339874+artmakh@users.noreply.github.com>
🤖 I have created a release *beep* *boop* --- ## [10.0.0](matter-labs/zksync-era@prover-v9.1.0...prover-v10.0.0) (2023-12-05) ### ⚠ BREAKING CHANGES * boojum integration ([#112](matter-labs#112)) * Update to protocol version 17 ([matter-labs#384](matter-labs#384)) ### Features * Add various metrics to the Prover subsystems ([matter-labs#541](matter-labs#541)) ([58a4e6c](matter-labs@58a4e6c)) * adds spellchecker workflow, and corrects misspelled words ([matter-labs#559](matter-labs#559)) ([beac0a8](matter-labs@beac0a8)) * boojum integration ([#112](matter-labs#112)) ([e76d346](matter-labs@e76d346)) * **boojum:** Adding README to prover directory ([#189](matter-labs#189)) ([c175033](matter-labs@c175033)) * **config:** Extract everything not related to the env config from zksync_config crate ([#245](matter-labs#245)) ([42c64e9](matter-labs@42c64e9)) * **core:** Split config definitions and deserialization ([matter-labs#414](matter-labs#414)) ([c7c6b32](matter-labs@c7c6b32)) * **dal:** Do not load config from env in DAL crate ([matter-labs#444](matter-labs#444)) ([3fe1bb2](matter-labs@3fe1bb2)) * **en:** Implement gossip fetcher ([#371](matter-labs#371)) ([a49b61d](matter-labs@a49b61d)) * **fri-prover:** In witness - panic if protocol version is not available ([#192](matter-labs#192)) ([0403749](matter-labs@0403749)) * **hyperchain:** Adding prover related commands to zk stack ([matter-labs#440](matter-labs#440)) ([580cada](matter-labs@580cada)) * **job-processor:** report attempts metrics ([matter-labs#448](matter-labs#448)) ([ab31f03](matter-labs@ab31f03)) * **merkle tree:** Allow random-order tree recovery ([matter-labs#485](matter-labs#485)) ([146e4cf](matter-labs@146e4cf)) * **merkle tree:** Snapshot recovery for Merkle tree ([#163](matter-labs#163)) ([9e20703](matter-labs@9e20703)) * Rewrite server binary to use `vise` metrics ([#120](matter-labs#120)) ([26ee1fb](matter-labs@26ee1fb)) * Update to protocol version 17 ([matter-labs#384](matter-labs#384)) ([ba271a5](matter-labs@ba271a5)) * **vm:** Move all vm versions to the one crate ([#249](matter-labs#249)) ([e3fb489](matter-labs@e3fb489)) * **witness-generator:** add logs to leaf aggregation job ([matter-labs#542](matter-labs#542)) ([7e95a3a](matter-labs@7e95a3a)) ### Bug Fixes * Change no pending batches 404 error into a success response ([#279](matter-labs#279)) ([e8fd805](matter-labs@e8fd805)) * **ci:** Use the same nightly rust ([matter-labs#530](matter-labs#530)) ([67ef133](matter-labs@67ef133)) * **crypto:** update deps to include circuit fixes ([matter-labs#402](matter-labs#402)) ([4c82015](matter-labs@4c82015)) * **crypto:** update shivini to switch to era-cuda ([matter-labs#469](matter-labs#469)) ([38bb482](matter-labs@38bb482)) * **crypto:** update snark-vk to be used in server and update args for proof wrapping ([#240](matter-labs#240)) ([4a5c54c](matter-labs@4a5c54c)) * **docs:** Add links to setup-data keys ([#360](matter-labs#360)) ([1d4fe69](matter-labs@1d4fe69)) * **path:** update gpu prover setup data path to remove extra gpu suffix ([matter-labs#454](matter-labs#454)) ([2e145c1](matter-labs@2e145c1)) * **prover-fri:** Update setup loading for node agg circuit ([#323](matter-labs#323)) ([d1034b0](matter-labs@d1034b0)) * **prover-logging:** tasks_allowed_to_finish set to true for 1 off jobs ([#227](matter-labs#227)) ([0fac66f](matter-labs@0fac66f)) * Sync protocol version between consensus and server blocks ([matter-labs#568](matter-labs#568)) ([56776f9](matter-labs@56776f9)) * Update prover to use the correct storage oracle ([matter-labs#446](matter-labs#446)) ([835dd82](matter-labs@835dd82)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
## What ❔ Removed protobuf encoding from zksync_types. ## Why ❔ To make zksync_types have less dependencies.
## What ❔ This PR modifies the `plonkSetup` function in `run.ts` to use the `powers` array when downloading key files. ## Why ❔ Previously, the function forget to use the argument values `powers`. Now, it will download keys for any powers specified in the `powers` array. ## Checklist <!-- Check your PR fulfills the following items. --> <!-- For draft PRs check the boxes as you complete them. --> - [x] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [NA] Tests for the changes have been added / updated. - [x] Documentation comments have been added / updated. - [x] Code has been formatted via `zk fmt` and `zk lint`. --------- Co-authored-by: Igor Aleksanov <popzxc@yandex.ru>
## What ❔ Use correct connections for databases in house keeper. ## Why ❔ Databases are divided in 2 on mainnet and testnet ## Checklist - [x] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [x] Tests for the changes have been added / updated. - [ ] Documentation comments have been added / updated. - [x] Code has been formatted via `zk fmt` and `zk lint`. - [x] Spellcheck has been run via `cargo spellcheck --cfg=./spellcheck/era.cfg --code 1`.
…ter-labs#606) ## What ❔ Adds support for zksolc v1.3.17 to contract-verifier. ## Why ❔ Contract-verifier should support latest version ## Checklist <!-- Check your PR fulfills the following items. --> <!-- For draft PRs check the boxes as you complete them. --> - [x] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [x] Tests for the changes have been added / updated. - [x] Documentation comments have been added / updated. - [x] Code has been formatted via `zk fmt` and `zk lint`. - [x] Spellcheck has been run via `cargo spellcheck --cfg=./spellcheck/era.cfg --code 1`.
…bs#872) ## What ❔ Currently the run of [local-node](https://github.com/matter-labs/local-node) fails in the logs with: ``` 2024-01-15 07:36:06 Deploying TransparentUpgradeableProxy 2024-01-15 07:36:09 TransparentUpgradeableProxy deployed, gasUsed: 678557 2024-01-15 07:36:09 CONTRACTS_L1_ERC20_BRIDGE_PROXY_ADDR=0x1242f30c5c146ed47194BF6D56013A70D9B7C1A0 2024-01-15 07:36:09 Error: TypeError: Cannot read properties of undefined (reading 'address') 2024-01-15 07:36:09 at Deployer.<anonymous> (/contracts/ethereum/src.ts/deploy.ts:318:92) 2024-01-15 07:36:09 at step (/contracts/ethereum/src.ts/deploy.ts:33:23) 2024-01-15 07:36:09 at Object.next (/contracts/ethereum/src.ts/deploy.ts:14:53) 2024-01-15 07:36:09 at /contracts/ethereum/src.ts/deploy.ts:8:71 2024-01-15 07:36:09 at new Promise (<anonymous>) 2024-01-15 07:36:09 at __awaiter (/contracts/ethereum/src.ts/deploy.ts:4:12) 2024-01-15 07:36:09 at Deployer.deployWethBridgeImplementation (/contracts/ethereum/src.ts/deploy.ts:390:16) 2024-01-15 07:36:09 at Deployer.<anonymous> (/contracts/ethereum/src.ts/deploy.ts:439:16) 2024-01-15 07:36:09 at step (/contracts/ethereum/src.ts/deploy.ts:33:23) 2024-01-15 07:36:09 at Object.next (/contracts/ethereum/src.ts/deploy.ts:14:53) error Command failed with exit code 1. 2024-01-15 07:36:09 info Visit https://yarnpkg.com/en/docs/cli/run for documentation about this command. 2024-01-15 07:36:09 Skip contract verification on localhost ``` However the overall run of the setup doesn't fail weirdly after this. What this failure does is that prevents the further steps in the L1 contract deployment and important stuff such as `VERIFIER_TIMELOCK` does not get deployed. Further down the road the environment variables get populated from the two files: https://github.com/matter-labs/zksync-era/blob/3af4644f428af0328cdea0fbae8a8f965489c6c4/docker/local-node/entrypoint.sh#L44-L45 However the `.init.dev` file does not contain the `CONTRACT_VERIFIER_TIMELOCK_ADDR` variable so it gets populated with `0xFC073319977e314F251EAE6ae6bE76B0B3BAeeCF` address from `/etc/env/dev.env` and all transactions such as `commitBlocks` go to this address which breaks block commit/verify/execution. The reason of the failure above is that the WETH bridge deployment needs to search for WETH token in `/etc/env/localhost.json` and because the ERC20 deployment step has been empty this file is also empty. So this fix adds a step of ERC20 deployment to fix this. ## 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 - [ ] 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`.
…heck` ci usage (matter-labs#868) Related PRs: - matter-labs#869 - matter-labs#870 ## What ❔ - Adds `zk linkcheck` to zk tool - Adds required dependencies to make use of `zk linkcheck` in zk env - Adds `zk linkcheck` docs - Updates `spellcheck` dir to be general `checks-config` dir to include spellcheck and link configuration files - Fixes issue with `zk spellcheck` exit code <!-- What are the changes this PR brings about? --> <!-- Example: This PR adds a PR template to the repo. --> <!-- (For bigger PRs adding more context is appreciated) --> ## Why ❔ - `zk linkcheck` will ensure no dead links exist in repo and prevent unnecessary PRs - Required to install dependencies, similar to `zk spellcheck` - Relevant docs to outline `zk linkcheck` usage <!-- 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. --> - [x] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [ ] Tests for the changes have been added / updated. - [x] Documentation comments have been added / updated. - [x] Code has been formatted via `zk fmt` and `zk lint`. - [x] Spellcheck has been run via `zk spellcheck`.
## What ❔ Fixes zk stack cli when spinning up a hyperchain without WETH bridge ## Why ❔ Because it was broken. Some changes over the last month removed a param that used to exist ## Checklist - [X] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [X] Tests for the changes have been added / updated. - [X] Documentation comments have been added / updated. - [X] Code has been formatted via `zk fmt` and `zk lint`. - [X] Spellcheck has been run via `zk spellcheck`.
…r-labs#883) ## What ❔ Job for copy witness-vector-generator between GAR registries ## Why ❔ For have access to image from different registries ## Checklist <!-- Check your PR fulfills the following items. --> <!-- For draft PRs check the boxes as you complete them. --> - [x] 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. - [x] Code has been formatted via `zk fmt` and `zk lint`. - [x] Spellcheck has been run via `zk spellcheck`.
…s#863) ## What ❔ Modifies batch status updater so that it works with pruned node data during snapshot recovery. ## Why ❔ Part of preparations of EN code to support snapshot recovery. ## Checklist - [x] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [x] Tests for the changes have been added / updated. - [x] Documentation comments have been added / updated. - [x] Code has been formatted via `zk fmt` and `zk lint`. - [x] Spellcheck has been run via `zk spellcheck`.
…ter-labs#854) ## What ❔ - Downloads zkVM solc binaries in verifier image - Adds support for new zksolc version support ## Why ❔ Support zkVM solc contract verification ## Checklist <!-- Check your PR fulfills the following items. --> <!-- For draft PRs check the boxes as you complete them. --> - [x] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [x] Tests for the changes have been added / updated. - [x] Documentation comments have been added / updated. - [x] Code has been formatted via `zk fmt` and `zk lint`. - [x] Spellcheck has been run via `zk spellcheck`.
🤖 I have created a release *beep* *boop* --- ## [19.2.0](matter-labs/zksync-era@core-v19.1.1...core-v19.2.0) (2024-01-17) ### Features * adds `zk linkcheck` to zk tool and updates zk env for `zk linkcheck` ci usage ([matter-labs#868](matter-labs#868)) ([d64f584](matter-labs@d64f584)) * **contract-verifier:** Support zkVM solc contract verification ([matter-labs#854](matter-labs#854)) ([1ed5a95](matter-labs@1ed5a95)) * **en:** Make batch status updater work with pruned data ([matter-labs#863](matter-labs#863)) ([3a07890](matter-labs@3a07890)) * rewritten gossip sync to be async from block processing ([matter-labs#711](matter-labs#711)) ([3af4644](matter-labs@3af4644)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
## What ❔ <!-- What are the changes this PR brings about? --> <!-- Example: This PR adds a PR template to the repo. --> <!-- (For bigger PRs adding more context is appreciated) --> ## 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 `zk spellcheck`.
…labs#869) Related PRs: - matter-labs#868 - matter-labs#870 ## What ❔ - Addresses broken links in the repo <!-- What are the changes this PR brings about? --> <!-- Example: This PR adds a PR template to the repo. --> <!-- (For bigger PRs adding more context is appreciated) --> ## Why ❔ - Should not have dead links in the repo - Addressing issues with links prior to `zk linkcheck` usage in ci <!-- 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. --> - [x] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [ ] Tests for the changes have been added / updated. - [x] Documentation comments have been added / updated. - [x] Code has been formatted via `zk fmt` and `zk lint`. - [x] Spellcheck has been run via `zk spellcheck`.
## What ❔ Make log indexes in transaction exposed correctly ## Why ❔ To behave correctly ## Checklist - [x] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [x] Tests for the changes have been added / updated. - [x] Documentation comments have been added / updated. - [x] Code has been formatted via `zk fmt` and `zk lint`. - [x] Spellcheck has been run via `zk spellcheck`.
## What ❔ Modifies the Web3 API server so that it works with pruned node data during snapshot recovery. ## Why ❔ Part of preparations of EN code to support snapshot recovery. ## Checklist - [x] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [x] Tests for the changes have been added / updated. - [x] Documentation comments have been added / updated. - [x] Code has been formatted via `zk fmt` and `zk lint`. - [x] Spellcheck has been run via `cargo spellcheck --cfg=./spellcheck/era.cfg --code 1`.
## What ❔ Adds a new VM version `VM_1_4_1` that will work with `zk_evm@1.4.1` 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 <antonv.dyadyuk@gmail.com> Co-authored-by: AntonD3 <74021421+AntonD3@users.noreply.github.com> Co-authored-by: Emil <evl@matterlabs.dev> Co-authored-by: Fedor Sakharov <fedor.sakharov@gmail.com> Co-authored-by: perekopskiy <mikeson.dp@gmail.com> Co-authored-by: zksync-admin-bot2 <temp-bot@matterlabs.dev> Co-authored-by: perekopskiy <53865202+perekopskiy@users.noreply.github.com>
jrchatruc
requested review from
mationorato,
ilitteri,
juanbono and
IAvecilla
as code owners
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 ❔
Why ❔
Checklist
zk fmtandzk lint.zk spellcheck.