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.

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

feat(contracts): 4844 support #1179

Merged
merged 13 commits into from
Mar 22, 2024
Merged

feat(contracts): 4844 support #1179

merged 13 commits into from
Mar 22, 2024

Conversation

zimpha
Copy link
Member

@zimpha zimpha commented Mar 6, 2024

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

@zimpha zimpha self-assigned this Mar 6, 2024
@zimpha zimpha requested a review from Thegaram March 13, 2024 16:37
contracts/src/libraries/codec/ChunkCodecV1.sol Outdated Show resolved Hide resolved
contracts/src/libraries/codec/ChunkCodecV1.sol Outdated Show resolved Hide resolved
contracts/src/libraries/codec/BatchHeaderV0Codec.sol Outdated Show resolved Hide resolved
contracts/src/libraries/codec/BatchHeaderV0Codec.sol Outdated Show resolved Hide resolved
contracts/src/libraries/codec/BatchHeaderV1Codec.sol Outdated Show resolved Hide resolved
contracts/src/libraries/codec/BatchHeaderV1Codec.sol Outdated Show resolved Hide resolved
contracts/src/L1/rollup/ScrollChain.sol Show resolved Hide resolved
contracts/src/L1/rollup/ScrollChain.sol Outdated Show resolved Hide resolved
contracts/src/L1/rollup/ScrollChain.sol Outdated Show resolved Hide resolved
@zimpha zimpha force-pushed the feat/4844_contract_v1_codec branch from 027a607 to 25f32b5 Compare March 15, 2024 07:24
contracts/src/libraries/codec/BatchHeaderV0Codec.sol Outdated Show resolved Hide resolved
contracts/src/L1/rollup/ScrollChain.sol Outdated Show resolved Hide resolved
contracts/src/L1/rollup/ScrollChain.sol Outdated Show resolved Hide resolved
contracts/src/L1/rollup/ScrollChain.sol Outdated Show resolved Hide resolved
contracts/src/L1/rollup/ScrollChain.sol Outdated Show resolved Hide resolved
contracts/src/L1/rollup/ScrollChain.sol Outdated Show resolved Hide resolved
contracts/src/L1/rollup/ScrollChain.sol Show resolved Hide resolved
contracts/src/L1/rollup/ScrollChain.sol Outdated Show resolved Hide resolved
contracts/src/L1/rollup/ScrollChain.sol Outdated Show resolved Hide resolved
contracts/src/L1/rollup/ScrollChain.sol Show resolved Hide resolved
@zimpha zimpha marked this pull request as ready for review March 19, 2024 04:20
Copy link

codecov bot commented Mar 19, 2024

Codecov Report

Attention: Patch coverage is 57.82609% with 97 lines in your changes are missing coverage. Please review.

Project coverage is 56.40%. Comparing base (02415a6) to head (cccec61).

Files Patch % Lines
contracts/src/L1/rollup/ScrollChain.sol 55.80% 80 Missing ⚠️
...ntracts/src/libraries/codec/BatchHeaderV1Codec.sol 47.05% 9 Missing ⚠️
contracts/src/libraries/codec/ChunkCodecV1.sol 0.00% 7 Missing ⚠️
...ntracts/src/libraries/codec/BatchHeaderV0Codec.sol 83.33% 1 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #1179      +/-   ##
===========================================
- Coverage    56.79%   56.40%   -0.40%     
===========================================
  Files          155      157       +2     
  Lines        11848    11968     +120     
===========================================
+ Hits          6729     6750      +21     
- Misses        4613     4712      +99     
  Partials       506      506              
Flag Coverage Δ
common 62.07% <ø> (ø)
contracts 55.25% <57.82%> (-2.29%) ⬇️
coordinator 19.88% <ø> (ø)
database 42.85% <ø> (ø)
rollup 63.56% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@zimpha zimpha marked this pull request as draft March 19, 2024 04:31
@zimpha zimpha marked this pull request as ready for review March 19, 2024 09:08
@colinlyguo
Copy link
Member

Do we need a finalizeBatch4844 (without proof) in Sepolia?

@zimpha
Copy link
Member Author

zimpha commented Mar 20, 2024

Do we need a finalizeBatch4844 (without proof) in Sepolia?

we can add one after this PR merged

@Thegaram
Copy link
Contributor

Do we need a finalizeBatch4844 (without proof) in Sepolia?

Fyi I added this on https://github.com/scroll-tech/scroll/tree/feat/4844-skip-proof-for-local-testing for local testing. But eventually we'll need to push this code to the sepolia branch.

@colinlyguo
Copy link
Member

Do we need a finalizeBatch4844 (without proof) in Sepolia?

Fyi I added this on https://github.com/scroll-tech/scroll/tree/feat/4844-skip-proof-for-local-testing for local testing. But eventually we'll need to push this code to the sepolia branch.

Cool. FYI, the rollup-relayer has supported and tested finalizeBatch4844 (when timeout, without proof) in your commit, too.

@zimpha zimpha merged commit 8bd4277 into develop Mar 22, 2024
39 checks passed
@zimpha zimpha deleted the feat/4844_contract_v1_codec branch March 22, 2024 10:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants