ethereum-optimism / optimism

Optimism is Ethereum, scaled.
https://optimism.io
MIT License
5.65k stars 3.28k forks source link

Holocene: extensions to L1Block.sol #12096

Closed roberto-bayardo closed 1 month ago

roberto-bayardo commented 1 month ago

Description

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

Tests

Added unit and fuzz tests

Metadata

https://github.com/ethereum-optimism/specs/issues/340

codecov[bot] commented 1 month ago

Codecov Report

All modified and coverable lines are covered by tests :white_check_mark:

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

Additional details and impacted files ```diff @@ 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](https://app.codecov.io/gh/ethereum-optimism/optimism/pull/12096/flags?src=pr&el=flags&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=ethereum-optimism) | Coverage Δ | | |---|---|---| | [cannon-go-tests](https://app.codecov.io/gh/ethereum-optimism/optimism/pull/12096/flags?src=pr&el=flag&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=ethereum-optimism) | `74.97% <ø> (-0.22%)` | :arrow_down: | Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=ethereum-optimism#carryforward-flags-in-the-pull-request-comment) to find out more. [see 1 file with indirect coverage changes](https://app.codecov.io/gh/ethereum-optimism/optimism/pull/12096/indirect-changes?src=pr&el=tree-more&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=ethereum-optimism)
roberto-bayardo commented 1 month ago

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

tynes commented 1 month ago

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 commented 1 month ago

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 commented 1 month ago

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

tynes commented 1 month ago

@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