Skip to content

feat: ban deposits interop#11451

Merged
skeletor-spaceman merged 20 commits intoethereum-optimism:feat/ban-deposits-interopfrom
defi-wonderland:feat/ban-deposits-interop
Aug 12, 2024
Merged

feat: ban deposits interop#11451
skeletor-spaceman merged 20 commits intoethereum-optimism:feat/ban-deposits-interopfrom
defi-wonderland:feat/ban-deposits-interop

Conversation

@0xDiscotech
Copy link
Copy Markdown
Contributor

Description

  • Set again setValuesEcotone() from external to public.
  • Created _setValuesEcotone() function and used it on the public one.
  • Moved the Isthmus logic to the L1BlockInterop contract.

Tests

  • Moved the logic the Isthmus logic to the L1BlockInterop.t.sol contract

Additional context

#11362 (comment)

@0xDiscotech 0xDiscotech requested a review from a team as a code owner August 12, 2024 18:31
@0xDiscotech 0xDiscotech requested review from maurelian and removed request for a team August 12, 2024 18:31
Comment on lines +124 to +135
/// @notice Updates the L1 block values for an Ecotone upgraded chain.
/// Params are packed and passed in as raw msg.data instead of ABI to reduce calldata size.
/// Params are expected to be in the following order:
/// 1. _baseFeeScalar L1 base fee scalar
/// 2. _blobBaseFeeScalar L1 blob base fee scalar
/// 3. _sequenceNumber Number of L2 blocks since epoch start.
/// 4. _timestamp L1 timestamp.
/// 5. _number L1 blocknumber.
/// 6. _basefee L1 base fee.
/// 7. _blobBaseFee L1 blob base fee.
/// 8. _hash L1 blockhash.
/// 9. _batcherHash Versioned hash to authenticate batcher by.
Copy link
Copy Markdown
Contributor Author

@0xDiscotech 0xDiscotech Aug 12, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I opted to duplicate the NATSPEC on the public and the internal functions here. Lmk what do you think @skeletor-spaceman

}
}

contract L1BlockInteropIsDeposit_Test is L1BlockInteropTest {
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I chose to create the test contract for each function just as other test files, even though they are not following that styling on this one. Lmk wdyt as well @skeletor-spaceman

@skeletor-spaceman skeletor-spaceman merged commit 5e0d64c into ethereum-optimism:feat/ban-deposits-interop Aug 12, 2024
@skeletor-spaceman skeletor-spaceman deleted the feat/ban-deposits-interop branch August 12, 2024 19:20
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.

2 participants