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

(WIP): upgrad4 test #1435

Closed
wants to merge 59 commits into from
Closed

(WIP): upgrad4 test #1435

wants to merge 59 commits into from

Conversation

georgehao
Copy link
Member

Purpose or design rationale of this PR

Describe your change. Make sure to answer these three questions: What does this PR do? Why does it do it? How does it do it?

PR title

Your PR title must follow conventional commits (as we are doing squash merge for each PR), so it must start with one of the following types:

  • build: Changes that affect the build system or external dependencies (example scopes: yarn, eslint, typescript)
  • ci: Changes to our CI configuration files and scripts (example scopes: vercel, github, cypress)
  • docs: Documentation-only changes
  • feat: A new feature
  • fix: A bug fix
  • perf: A code change that improves performance
  • refactor: A code change that doesn't fix a bug, or add a feature, or improves performance
  • style: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)
  • test: Adding missing tests or correcting existing tests

Deployment tag versioning

Has tag in common/version.go been updated or have you added bump-version label to this PR?

  • No, this PR doesn't involve a new deployment, git tag, docker image tag
  • Yes

Breaking change label

Does this PR have the breaking-change label?

  • No, this PR is not a breaking change
  • Yes

georgehao and others added 30 commits June 24, 2024 09:21
@georgehao
init
1b6886b
@colinlyguo @georgehao
faet(db): add bundle table (#1395)
1a739cd 
Co-authored-by: georgehao <haohongfan@gmail.com>
@georgehao
Merge branch 'develop' into feat/upgrade4
664c042
@colinlyguo
feat(common): add hardfork util functions supporting both height and …
54adbb3 
…timestamp (#1400)
@colinlyguo
feat(rollup-db): add bundle hash (#1401)
fb43e87
@colinlyguo
feat(rollup-relayer): support commitBatchWithBlobProof (#1397)
229809a
@roynalnaruto @colinlyguo
feat(common): update types as per upgrade4 (#1409)
e679052 
Co-authored-by: colinlyguo <colinlyguo@scroll.io>
@colinlyguo
Merge branch 'develop' into feat/upgrade4
0b32509
@colinlyguo @amoylan2
feat(coordinator): enhance batch proof sanity check (#1408)
beee0c2 
Co-authored-by: colinlyguo <colinlyguo@users.noreply.github.com>
Co-authored-by: Mengran Lan <mengran@scroll.io>
Co-authored-by: amoylan2 <amoylan2@users.noreply.github.com>
@colinlyguo
feat(rollup-relayer): finalize bundle (#1411)
bc9bc5d
@georgehao @colinlyguo @amoylan2
feat(coordinator): upgrade 4 (#1399)
380dbba 
Co-authored-by: colinlyguo <colinlyguo@scroll.io>
Co-authored-by: Mengran Lan <lanmengran@qq.com>
Co-authored-by: colin <102356659+colinlyguo@users.noreply.github.com>
@colinlyguo
Merge branch 'develop' into feat/upgrade4
7196c5c
@amoylan2 @colinlyguo
feat(prover): supporting upgrade4 (#1412)
abe66c6 
Co-authored-by: colin <102356659+colinlyguo@users.noreply.github.com>
@colinlyguo
fix: build coordinator and bridge-history images (#1421)
c758aa6
@georgehao
enable push tag to build docker
61a3af5
@amoylan2
feat(prover): upgrade zkevm-circuits version (#1424)
3567f5b
@roynalnaruto @georgehao
libzkp and coordinator updates (preparation for Upgrade4) (#1419)
a2e8b6a 
Co-authored-by: georgehao <haohongfan@gmail.com>
@georgehao
enable chunk proof verify (#1432)
2392d34
@amoylan2
feat(prover): upgrade zkevm-circuits to same as coordinator's with ch…
622ce7b 
…anges of BatchProvingTask & BundleProvingTask (#1434)
@georgehao
upgrad4-test
fc47cef
@georgehao @colinlyguo
feat: enable process pending bundles (#1433)
04a893a 
Co-authored-by: colin <102356659+colinlyguo@users.noreply.github.com>
@georgehao
Merge branch 'feat/upgrade4' of github.com:scroll-tech/scroll into fe…
deeafc9 
…at/upgrade4_mock
@georgehao
mock the first genesis batch
f530448
@georgehao
fix
eec19fa
@georgehao
add log
793983c
@georgehao
add GetL2BlocksInRange log
a0b1295
@georgehao
add blob log
0c539d4
@georgehao
add log BlobVersionedHash
f19f00f
@roynalnaruto
bump prover (upgrade #4) (#1437)
3716c5a
@georgehao
fix init genesis bug
aca5cba
georgehao and others added 26 commits July 18, 2024 18:48
@georgehao
Merge branch 'feat/upgrade4' of github.com:scroll-tech/scroll into fe…
527954e 
…at/upgrade4_mock
@georgehao
fix init bundle vk map (#1447)
76a9d6f
@georgehao
Merge branch 'feat/upgrade4' of github.com:scroll-tech/scroll into fe…
31dfd46 
…at/upgrade4_mock
@amoylan2
fix(prover): fix panic issue when trying to get curie's bundle vk (#1449
8960d0f 
)
@amoylan2
fix lint issue (#1450)
c34883e
@amoylan2
feat(prover): upgrade darwin's zkevm-circuits branch (#1451)
f95eaec
@georgehao @colinlyguo
@FredPhilipy @sbaizet-ledger @caseylove @nishuzumi @0xmountaintop
update codec version (#1448)
74c197e 
Co-authored-by: colin <102356659+colinlyguo@users.noreply.github.com>
Co-authored-by: Suuuuuuperrrrr fred <FredrikaPhililip@proton.me>
Co-authored-by: colinlyguo <colinlyguo@users.noreply.github.com>
Co-authored-by: sbaizet <74511063+sbaizet-ledger@users.noreply.github.com>
Co-authored-by: caseylove <casey4love@foxmail.com>
Co-authored-by: BoxChen <13927203+nishuzumi@users.noreply.github.com>
Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
Co-authored-by: colinlyguo <colinlyguo@scroll.io>
@georgehao
Merge branch 'feat/upgrade4' of github.com:scroll-tech/scroll into fe…
72f724b 
…at/upgrade4_mock
@georgehao
update
37af5ef
@colinlyguo
Merge branch 'develop' into feat/upgrade4
768226c
@colinlyguo
Merge branch 'develop' into feat/upgrade4
07dc2c9
@amoylan2
Feat/upgrade4 prover print more error (#1454)
17b7e5c
@georgehao
Merge branch 'feat/upgrade4' of github.com:scroll-tech/scroll into fe…
1d5a2b8 
…at/upgrade4_mock
@georgehao
fix coordinator bug (#1455)
8f273f7
@georgehao
Merge branch 'feat/upgrade4' of github.com:scroll-tech/scroll into fe…
16813f8 
…at/upgrade4_mock
@georgehao
fix typo (#1456)
c87c356
@georgehao
update zkcircuit (#1457)
0c10663
@georgehao
fix bundle task detail bug (#1460)
82f39aa
@georgehao
Merge branch 'feat/upgrade4' of github.com:scroll-tech/scroll into fe…
580dc01 
…at/upgrade4_mock
@georgehao
update
55a0a86
@georgehao
init genesis 274314&0
f7a9587
@georgehao
dynamic batches of a bundle
f6499be
@roynalnaruto @georgehao
feat(libzkp): different paths for assets of lower and higher versions (…
f1fae1f 
…#1461)

Co-authored-by: georgehao <haohongfan@gmail.com>
@georgehao
fix config typo
f76fa41
@georgehao
Merge branch 'feat/upgrade4' of github.com:scroll-tech/scroll into fe…
f3f990e 
…at/upgrade4_mock
@georgehao
make a settled number
5dc4434
Base automatically changed from feat/upgrade4 to develop July 31, 2024 09:30
@georgehao georgehao closed this Aug 6, 2024
@georgehao georgehao reopened this Aug 26, 2024
@georgehao georgehao closed this Aug 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@georgehao @colinlyguo @roynalnaruto @amoylan2