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

Holocene: extensions to L1Block.sol #12096

Merged
merged 1 commit into from
Sep 30, 2024

Conversation

roberto-bayardo
Copy link
Collaborator

@roberto-bayardo roberto-bayardo commented Sep 24, 2024

Description

Holocene adds two new L1 attributes which need to be handled by the L1Block L1 contract.

Tests

Added unit and fuzz tests

Metadata

ethereum-optimism/specs#340

@roberto-bayardo roberto-bayardo force-pushed the l1block-holocene branch 3 times, most recently from 439e177 to e5a3240 Compare September 24, 2024 22:27
@roberto-bayardo roberto-bayardo marked this pull request as ready for review September 24, 2024 22:28
@roberto-bayardo roberto-bayardo requested a review from a team as a code owner September 24, 2024 22:28
@roberto-bayardo roberto-bayardo force-pushed the l1block-holocene branch 2 times, most recently from 911b476 to 693cf3b Compare September 24, 2024 22:40
Copy link

codecov bot commented Sep 24, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 74.97%. Comparing base (cd7e9d4) to head (8e7c9ca).
Report is 14 commits behind head on develop.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop   #12096      +/-   ##
===========================================
- Coverage    75.19%   74.97%   -0.22%     
===========================================
  Files           49       49              
  Lines         3656     3656              
===========================================
- Hits          2749     2741       -8     
- Misses         734      743       +9     
+ Partials       173      172       -1     
Flag Coverage Δ
cannon-go-tests 74.97% <ø> (-0.22%) ⬇️

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

see 1 file with indirect coverage changes

@roberto-bayardo
Copy link
Collaborator Author

the semver-diff-check is failing, I think just because it doesn't really handle inheritance properly?

@tynes
Copy link
Contributor

tynes commented Sep 27, 2024

Getting CI versioning checks failing

HEAD is now at e6cd14acb Holocene extensions to L1Block.sol
./scripts/checks/check-semver-diff.sh
✅ src/L2/L1Block.sol: version changed from 1.5.1-beta.2 to 1.5.1-beta.3
❌ Error: src/L2/L1BlockInterop.sol has changes in semver-lock.json but no version change
   Old version: +interop
   New version: +interop
error: Recipe `semver-diff-check-no-build` failed on line 158 with exit code 1

Exited with code exit status 1

cc @smartcontracts @mds1

I believe this issue happened before and the solution was to add -beta.1 to the +interop suffix?

@roberto-bayardo roberto-bayardo force-pushed the l1block-holocene branch 4 times, most recently from fe470bd to b50580e Compare September 29, 2024 16:43
@roberto-bayardo
Copy link
Collaborator Author

Getting CI versioning checks failing

HEAD is now at e6cd14acb Holocene extensions to L1Block.sol
./scripts/checks/check-semver-diff.sh
✅ src/L2/L1Block.sol: version changed from 1.5.1-beta.2 to 1.5.1-beta.3
❌ Error: src/L2/L1BlockInterop.sol has changes in semver-lock.json but no version change
   Old version: +interop
   New version: +interop
error: Recipe `semver-diff-check-no-build` failed on line 158 with exit code 1

Exited with code exit status 1

cc @smartcontracts @mds1

I believe this issue happened before and the solution was to add -beta.1 to the +interop suffix?

this works

@tynes tynes added this pull request to the merge queue Sep 30, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Sep 30, 2024
@tynes tynes added this pull request to the merge queue Sep 30, 2024
@tynes
Copy link
Contributor

tynes commented Sep 30, 2024

Perhaps a CI flake caused this to drop out of the merge queue

@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Sep 30, 2024
@tynes tynes added this pull request to the merge queue Sep 30, 2024
@tynes
Copy link
Contributor

tynes commented Sep 30, 2024

@roberto-bayardo looks like linting is blocking this

    packages/contracts-bedrock/src/libraries/Encoding.sol
    ❯❱ ethereum_optimism.sol-style-input-arg-fmt
          Inputs to functions must be prepended with an underscore (`_`)
          Details: https://sg.run/0jgW                                  
                                                                        
          229┆ function encodeSetL1BlockValuesHolocene(
          230┆     uint32 baseFeeScalar,
                            
  BLOCKING CODE RULES FIRED:
    ethereum_optimism.sol-style-input-arg-fmt

Merged via the queue into ethereum-optimism:develop with commit 5bd72f6 Sep 30, 2024
61 checks passed
roberto-bayardo added a commit to roberto-bayardo/optimism that referenced this pull request Oct 1, 2024
roberto-bayardo added a commit to roberto-bayardo/optimism that referenced this pull request Oct 1, 2024
github-merge-queue bot pushed a commit that referenced this pull request Oct 1, 2024
samlaf pushed a commit to samlaf/optimism that referenced this pull request Nov 10, 2024
samlaf pushed a commit to samlaf/optimism that referenced this pull request Nov 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

3 participants