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

Base Token Bridge #1

Merged
merged 40 commits into from
Nov 20, 2024
Merged

Base Token Bridge #1

merged 40 commits into from
Nov 20, 2024

Conversation

telome
Copy link
Contributor

@telome telome commented Jul 9, 2024

No description provided.

src/L1TokenBridge.sol Outdated Show resolved Hide resolved
src/L1TokenBridge.sol Outdated Show resolved Hide resolved
/// @param _extraData Extra data to be sent with the transaction. Note that the recipient will
/// not be triggered with this data, but it will be emitted and can be used
/// to identify the transaction.
function bridgeERC20(
Copy link
Contributor

Choose a reason for hiding this comment

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

I see we define different interfaces on the dai bridge, for example - https://github.com/makerdao/optimism-dai-bridge/blob/master/contracts/l1/L1DAITokenBridge.sol#L102

This was a design decision right?
The standard bridge interface was as it is now at the time?

Copy link
Contributor Author

@telome telome Jul 15, 2024

Choose a reason for hiding this comment

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

This is the new interface. The dai bridge was using the old interface, pre-bedrock. We might need to also support the old interface as the standard bridge does, but not 100% sure yet, so for now I've only included the methods for the new interface.

src/Escrow.sol Outdated Show resolved Hide resolved
src/L1TokenBridge.sol Outdated Show resolved Hide resolved
src/L1TokenBridge.sol Outdated Show resolved Hide resolved
src/L1TokenBridge.sol Outdated Show resolved Hide resolved
src/L2TokenBridge.sol Outdated Show resolved Hide resolved
src/L2TokenBridge.sol Outdated Show resolved Hide resolved
src/L2TokenBridge.sol Outdated Show resolved Hide resolved
src/L2GovernanceRelay.sol Outdated Show resolved Hide resolved
@telome telome changed the title [Draft] Base Token Bridge Base Token Bridge Aug 6, 2024
script/Deploy.s.sol Outdated Show resolved Hide resolved
Copy link
Contributor

@sunbreak1211 sunbreak1211 left a comment

Choose a reason for hiding this comment

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

Assuming the old interface won't be needed, this looks good to me.

README.md Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
Copy link
Contributor

@oldchili oldchili left a comment

Choose a reason for hiding this comment

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

LGTM, also assuming we decide not support the old interface.

telome and others added 11 commits September 2, 2024 19:38
Co-authored-by: telome <>
* Add Cantina Report

* Rename Cantina report

---------

Co-authored-by: telome <>
Co-authored-by: telome <>
* Make bridges upgradable

* Fix spacing

* Add missing internal calls

* Address review comments

* Fix alignment

* Import only necessary types

* Remove extra space

---------

Co-authored-by: telome <>
Co-authored-by: telome <>
* Add Certora specs

* Add spec for L2GovernanceRelay.relay

* Minor changes

* Use no optimization for mocks and aux

* use mathint

* Minor change

* More rules

* Fix typo

* Fix typo

* Improve PATH compatibility
@sunbreak1211 sunbreak1211 self-requested a review November 19, 2024 17:48
@sunbreak1211
Copy link
Contributor

@oldchili let's give a final approval so @telome can merge it. Should be done with regular merge commit type.

@telome telome merged commit 6188f37 into master Nov 20, 2024
12 of 13 checks passed
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.

4 participants