[lock/unlock] OP L1 finalization in bridge adapter #606
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
LCOV of commit
|
matYang
reviewed
Mar 14, 2024
contracts/src/v0.8/rebalancer/bridge-adapters/OptimismL1BridgeAdapter.sol
Outdated
Show resolved
Hide resolved
contracts/src/v0.8/rebalancer/bridge-adapters/OptimismL1BridgeAdapter.sol
Outdated
Show resolved
Hide resolved
contracts/src/v0.8/rebalancer/bridge-adapters/OptimismL1BridgeAdapter.sol
Show resolved
Hide resolved
contracts/src/v0.8/rebalancer/bridge-adapters/OptimismL1BridgeAdapter.sol
Outdated
Show resolved
Hide resolved
contracts/src/v0.8/rebalancer/bridge-adapters/OptimismL1BridgeAdapter.sol
Outdated
Show resolved
Hide resolved
| @@ -45,7 +72,12 @@ contract OptimismL2BridgeAdapter is IBridgeAdapter { | |||
| // If the token is the wrapped native, we unwrap it and deposit native | |||
| if (localToken == address(i_wrappedNative)) { | |||
| i_wrappedNative.withdraw(amount); | |||
| i_L2Bridge.withdrawTo(Lib_PredeployAddresses.OVM_ETH, recipient, amount, 0, extraData); | |||
| // XXX: Lib_PredeployAddresses.OVM_ETH is actually 0xDeadDeAddeAddEAddeadDEaDDEAdDeaDDeAD0000. | |||
| // This code path still works because the L2 bridge is hardcoded to handle this specific address. | ||
| // The better approach might be to use the bridgeEthTo function, which is on the StandardBridge | ||
| // abstract contract, inherited by both L1StandardBridge and L2StandardBridge. | ||
| // This is also marked as legacy, so it might mean that this will be deprecated soon. |
There was a problem hiding this comment.
curious why not use bridgeEthTo if it's better supported?
There was a problem hiding this comment.
I'm actually not sure what the difference is, it'd require a whole investigation. I should reach out to Optimism and ask them what's the dealio. I think changing this is better in another PR to keep this PR self-contained. The finalization process is the same either way.
There was a problem hiding this comment.
sounds good, please do confirm with them, OP team is kinda known for not being the best with compatibility
contracts/src/v0.8/rebalancer/bridge-adapters/OptimismL1BridgeAdapter.sol
Show resolved
Hide resolved
tests encoding and if logic
LCOV of commit
|
matYang
approved these changes
Mar 16, 2024
makramkd
added a commit
that referenced
this pull request
Apr 24, 2024
#613) ## Motivation PR #606 implements multi-stage finalization in the Optimism L1 bridge adapter, however this is not functional end-to-end because the Rebalancer assumes that finalization happens in a single step. ## Solution Change the bridge adapter interface to return a boolean from `finalizeWithdrawERC20` that indicates whether the funds are available for use by the rebalancer. The rest of the changes are to get test coverage for this new interface change.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation
The Optimism L1 bridge adapter needs to be able to both prove withdrawals and finalize them on L1.
Solution
withdrawon the WETH contract prior to bridging.withdrawTowithout actually sending the ETH along with the call. The Optimism contracts dependency we're using isn't bedrock so thewithdrawTofunction signature did not havepayable. Instead we copy/paste thewithdrawTofunction signature directly fromL2StandardBridge.sol, since we can't import it directly due to the exact 0.8.15 version specified in the contract's pragma.Follow ups
finalizeWithdrawERC20will give it access to funds, however this is not the case for Optimism. This will be implemented in an upcoming PR to keep diffs small and manageable.bridgeETHToandbridgeERC20To, which are onStandardBridge.sol, vs.depositERC20ToandwithdrawTowhich are on L1StandardBridge.sol and L2StandardBridge.sol respectively.