feat: forwarders for AVM and OVM networks #625

bmzig · 2024-09-27T19:06:49Z

This implements the newer version of ForwarderBase and does not make any refactors to the adapters, since the forwarders now assume that the appropriate adapters have been deployed to LX.

Signed-off-by: bennett <[email protected]>

bmzig · 2024-09-27T19:10:09Z

contracts/chain-adapters/Arbitrum_Forwarder.sol

+        address target
+    ) external payable override onlyAdmin {
+        address remoteToken = remoteTokens[target][currentLayerToken] == address(0)
+            ? arbitrumGatewayRouter.calculateL2TokenAddress(currentLayerToken)


The gateway router should return the correct address if the token in question is actually routed through an Arbitrum gateway. The most notable exception we know of now is USDC and CCTP, which is an example of when we would instead need to set remoteTokens. I think if we go with this, we will need to be careful and ensure that the remote token we are attempting to bridge to is indeed created through a bridgeMint call.

how would cctp work? cctp from L1 to L2, and then canonical bridge from there? can we support that?

For reference, there was this comment #610 (comment) on the previous PR which inherited the adapter code, and the idea was that there may be a CCTP bridge from L2-L3 which bridges native to native. This should work fine if we use CCTP for L1 -> L2, have a native on L2, and then bridge native on L2 -> bridged on L3 via the canonical bridge, since that uses an Arbitrum gateway. TLDR CCTP is just speculation. It's mainly an example if there was another non-arbitrum bridge from L2-L3, and also calculateL2TokenAddress should return the remote token which is minted on L2 given the input L1 token.

contracts/chain-adapters/Arbitrum_Forwarder.sol

nicholaspai · 2024-09-27T19:15:26Z

contracts/Arbitrum_SpokePool.sol

@@ -54,7 +55,7 @@ contract Arbitrum_SpokePool is SpokePool, CircleCCTPAdapter {
    }

    modifier onlyFromCrossDomainAdmin() {
-        require(msg.sender == _applyL1ToL2Alias(crossDomainAdmin), "ONLY_COUNTERPART_GATEWAY");
+        require(msg.sender == AddressUtils._applyL1ToL2Alias(crossDomainAdmin), "ONLY_COUNTERPART_GATEWAY");


I think this library should be called CrossDomainAddressUtils as AddressUtils overlaps with the openzeppelin utility file that has utilities for any arbitrary EVM. This aliasing is very OVM/AVM specific

nicholaspai

I know its in draft mode so just left some comments upon first pass

Signed-off-by: bennett <[email protected]>

Co-authored-by: Matt Rice <[email protected]>

Signed-off-by: bennett <[email protected]>

nicholaspai · 2024-10-02T14:55:12Z

contracts/libraries/CrossDomainAddressUtils.sol

+    // L1 addresses are transformed during l1->l2 calls.
+    // This cannot be pulled directly from Arbitrum contracts because their contracts are not 0.8.X compatible and
+    // this operation takes advantage of overflows, whose behavior changed in 0.8.0.
+    function _applyL1ToL2Alias(address l1Address) internal pure returns (address l2Address) {


nit: I prefer not having an underscore prefix on library functions even if they are internal

Done here dfee0a1

nicholaspai

https://github.com/across-protocol/contracts/pull/625/files#r1784701027

Signed-off-by: bennett <[email protected]>

mrice32

LGTM!

mrice32 · 2024-10-03T17:09:59Z

contracts/ZkSync_SpokePool.sol

-    // L1 addresses are transformed during l1->l2 calls.
-    // See https://github.com/matter-labs/era-contracts/blob/main/docs/Overview.md#mailboxfacet for more information.
-    // Another source: https://github.com/matter-labs/era-contracts/blob/41c25aa16d182f757c3fed1463c78a81896f65e6/ethereum/contracts/vendor/AddressAliasHelper.sol#L28
-    function _applyL1ToL2Alias(address l1Address) internal pure returns (address l2Address) {


Just to triple check, arbitrum and zksync do this the exact same way, right? Code looks the same, but just want to sanity check that I read this right.

Yeah. (Just to enumerate) Arbitrum and ZkSync both have the same aliasing method, and all other chains query the messenger contract.

bmzig added 20 commits September 17, 2024 14:37

feat: add L2 forwarder interface

f9c0d62

Signed-off-by: bennett <[email protected]>

sync with upstream changes

cea0337

Signed-off-by: bennett <[email protected]>

refactor and rename

0de9303

Signed-off-by: bennett <[email protected]>

Merge branch 'master' into bz/l2ForwarderInterface

0371348

Signed-off-by: bennett <[email protected]>

clean up interfaces

fd94012

Signed-off-by: bennett <[email protected]>

simplify forwarder base and make it a proxy

f2e3c41

Signed-off-by: bennett <[email protected]>

disable implementation initialization

f251354

Signed-off-by: bennett <[email protected]>

remove EIP 712

fe66b78

Signed-off-by: bennett <[email protected]>

add/improve comments

814498b

Signed-off-by: bennett <[email protected]>

update comments

a9cf8b1

Signed-off-by: bennett <[email protected]>

comments

110a8e9

Signed-off-by: bennett <[email protected]>

update forwarder base

19813c6

Signed-off-by: bennett <[email protected]>

extend AdapterInterface

d78ad6f

Signed-off-by: bennett <[email protected]>

Merge branch 'master' into bz/l2ForwarderInterface

2c97c2a

refactor: move all Arbitrum interfaces to a single location

8ee13c0

Signed-off-by: bennett <[email protected]>

Merge branch 'bz/refactorArbInterfaces' into bz/l2ForwarderInterface

9544a96

new recursive format

c3950ac

Signed-off-by: bennett <[email protected]>

use events

2aac0f7

Signed-off-by: bennett <[email protected]>

add remote token mapping and update comments

06c8877

Signed-off-by: bennett <[email protected]>

Add forwarders for AVM and OVM networks

dc454bc

Signed-off-by: bennett <[email protected]>

bmzig mentioned this pull request Sep 27, 2024

feat: add Arbitrum forwarder contracts #610

Closed

bmzig commented Sep 27, 2024

View reviewed changes

contracts/chain-adapters/Arbitrum_Forwarder.sol Show resolved Hide resolved

nicholaspai reviewed Sep 27, 2024

View reviewed changes

bmzig added 5 commits September 27, 2024 14:55

rename AddressUtils to CrossDomainAddressUtils

24c1836

Signed-off-by: bennett <[email protected]>

Merge branch 'master' into bz/l2ForwarderInterface

01b1a38

Signed-off-by: bennett <[email protected]>

remove unused file

77bc3d5

Signed-off-by: bennett <[email protected]>

add more checks and improve comments

64d3503

Signed-off-by: bennett <[email protected]>

naming

d330993

Signed-off-by: bennett <[email protected]>

bmzig and others added 9 commits September 30, 2024 13:19

comments

7aa7d11

Signed-off-by: bennett <[email protected]>

Update ForwarderBase.sol

e8590d4

Update ForwarderBase.sol

cbe2953

Update contracts/chain-adapters/ForwarderBase.sol

14c5c41

Co-authored-by: Matt Rice <[email protected]>

Update ForwarderBase.sol

242775d

reduce scope so that we only accomodate L3s. Use chain IDs as keys.

41b4856

Signed-off-by: bennett <[email protected]>

change function name

6298cc6

Signed-off-by: bennett <[email protected]>

Merge bz/l2ForwarderInterface and update forwarders

5a14224

Signed-off-by: bennett <[email protected]>

remove unused function

f2bd54b

Signed-off-by: bennett <[email protected]>

bmzig marked this pull request as ready for review October 1, 2024 17:50

pxrl approved these changes Oct 1, 2024

View reviewed changes

Base automatically changed from bz/l2ForwarderInterface to master October 2, 2024 13:24

Merge branch 'master' into bz/customForwarders

7b060d8

Signed-off-by: bennett <[email protected]>

nicholaspai reviewed Oct 2, 2024

View reviewed changes

nicholaspai approved these changes Oct 2, 2024

View reviewed changes

change alias function signature

dfee0a1

Signed-off-by: bennett <[email protected]>

bmzig requested review from nicholaspai and pxrl October 2, 2024 18:40

mrice32 approved these changes Oct 3, 2024

View reviewed changes

bmzig merged commit 3d61c1b into master Oct 3, 2024
9 checks passed

bmzig deleted the bz/customForwarders branch October 3, 2024 18:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

feat: forwarders for AVM and OVM networks #625

feat: forwarders for AVM and OVM networks #625

Uh oh!

bmzig commented Sep 27, 2024 •

edited

Loading

Uh oh!

bmzig Sep 27, 2024

Uh oh!

nicholaspai Sep 27, 2024

Uh oh!

bmzig Sep 27, 2024

Uh oh!

Uh oh!

nicholaspai Sep 27, 2024

Uh oh!

bmzig Sep 27, 2024

Uh oh!

nicholaspai left a comment

Uh oh!

nicholaspai Oct 2, 2024

Uh oh!

bmzig Oct 2, 2024

Uh oh!

nicholaspai left a comment

Uh oh!

mrice32 left a comment

Uh oh!

mrice32 Oct 3, 2024

Uh oh!

bmzig Oct 3, 2024

Uh oh!

mrice32 Oct 3, 2024

Uh oh!

Uh oh!

Uh oh!

feat: forwarders for AVM and OVM networks #625

feat: forwarders for AVM and OVM networks #625

Uh oh!

Conversation

bmzig commented Sep 27, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

nicholaspai left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

nicholaspai left a comment

Choose a reason for hiding this comment

Uh oh!

mrice32 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

bmzig commented Sep 27, 2024 •

edited

Loading