Skip to content

Commit

Permalink
(frozen) v0.3: default DEGREE=20 (#121)
Browse files Browse the repository at this point in the history
* 1220

* fixed

* upgrade circuits

* mock prove super circuit done

* pass test 4in1

* lint

* clean codes

* lint

* better test_vk_same

* scroll-table circuit works with onephase feature

* upgrade halo2

* upgrade halo2 to timing assignment; speedup zkevm assign

* add zkevm/release.sh

* better row estimation

* prove with multi blocks

* fix mpt circuit row limit

* upgrade zkevm circuits

* done

* fix: get chain_id

* use latest scroll-stable

* pretty print prover erro

* return err when mpt overflow

* tested with release.sh; +tx circuit

* load_block_traces_for_test support PACK

* add zktrie; but tests failed

* super circuit(+zktrie) pass real proving with "multi"

* almost fix mpt<->state

* try!

* lint

* upgrade halo2

* fix zero coinbase(author) field

* upgrade rust; improve packing test

* pin zkevm-circuits to scroll-dev-1220

* upgrade circuits

* clean codes

* AUTO_TRUNCATE

* fix vk

* upgrade halo2

* fixing

* update agg circuit

* update deps

* greeter can pass

* Update mpt and poseidon circuit (#103)

* upgrade deps

update deps for clean circuits

for dynamic codehash feat

some trivial fixings

* reset dep to 'scroll-stable'

* update poseidon circuit with phase issue fixing

* update dep

* trivial fix and fmt

* fix missed dep

* Increase the max number of txs (#104)

* print witness block metric

* Update Makefile

* Update Cargo.toml

* towards goerli

* update dep, fix wrong spec in poseidon codehash

* purge redundant mpt.rs (#107)

* pass all traces

* Replace `actions/checkout@v2` with `actions/checkout@v3` in CI.

* Try to update with `git config --system` in CI.

* Fix lint.

* done

* Update .gitignore

* match goerli-0215-dual-hash of zkevm-circuit

* bump dependencies

* bump zkevm-circuit

* feat: add ffi for scroll; add auto-release for tag (#109)

* add ffi for scroll

* add release.sh

* fix

* rename zip

* add workflow release.yml

* fix action

* add sha256sum

* format

* fix

* modify

* fix

* fix

---------

Co-authored-by: HAOYUatHZ <[email protected]>

* bump zkevm-circuits

* fix trace_code when tx.to = None

* fix difficulty lookup

* bumpt zkevm circuit to stable-maintained

* l1 fee

* upgrade

* bump zkevm-circuit dep, incude deletion proof

* feat: add bin `mock_testnet` (#99)

* Add `mock_testnet` to bin.

* Fix params.

* Update to request block traces with Rollupscan API.

* Fix lint.

* Upgrade mpt circuit (#120)

upgrade mpt circuit

* degree = 20

* fix ffi cargo

* update Cargo.lock and zkevm/release.sh

* lint

* fix params len

* support print rows of mock testnet

* add load_params bench

* [Fix] sanity check for codehash updating (#122)

fix sanity check for codehash

* upgrade poseidon circuit

* use block chain id

* fix block chain id

* commit serde changes

* update download_params.sh

* update traces/erc20/multiple.json

* set version to 0.3

---------

Co-authored-by: kunxian xia <[email protected]>
Co-authored-by: Ho Vei <[email protected]>
Co-authored-by: Haichen Shen <[email protected]>
Co-authored-by: Steven Gu <[email protected]>
Co-authored-by: Lawliet-Chan <[email protected]>
Co-authored-by: HAOYUatHZ <[email protected]>
  • Loading branch information
7 people authored Apr 9, 2023
1 parent fbfd52a commit 78ab7a7
Show file tree
Hide file tree
Showing 30 changed files with 2,328,946 additions and 70,005 deletions.
9 changes: 8 additions & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1,2 +1,9 @@
RUST_LOG=info
RUST_BACKTRACE=1
RUST_BACKTRACE=1

# Used for `mock-testnet`
PROVE_TYPE=block # batch or block, block as default.
PROVE_BEGIN_BATCH=
PROVE_END_BATCH=
L2GETH_API_URL=
ROLLUPSCAN_API_URL=
55 changes: 55 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
name: Release libraries

on:
push:
tags:
- '*'

env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
CARGO_INCREMENTAL: false

jobs:
release:
name: Release libs
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: nightly-2022-12-10
override: true
- uses: Swatinem/rust-cache@v2
- name: Build libs
run: |
sh ./release.sh
- name: Create a release
id: create_release
uses: actions/create-release@latest
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ github.ref }}
release_name: ${{ github.ref }}
draft: false
prerelease: false
- name: Upload release libs.zip
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ./libs.zip
asset_name: libs.zip
asset_content_type: application/zip
- name: Upload zip.sha256
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ./zip.sha256
asset_name: zip.sha256
asset_content_type: application/text
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@ target/
# for testing
zkevm/tests/traces/bridge/*.proof

# ignore local logs
*.log
Loading

0 comments on commit 78ab7a7

Please sign in to comment.