✅ contracts: add polygon hyperlane bridge test

Author: itofarina

contracts/.gas-snapshot

@@ -1,11 +1,11 @@
-ExaAccountFactoryTest:testFuzz_createAccount_EOAOwners(uint256,address[63]) (runs: 256, μ: 5913944, ~: 5447138)
+ExaAccountFactoryTest:testFuzz_createAccount_EOAOwners(uint256,address[63]) (runs: 256, μ: 5915523, ~: 5447138)
 ExaAccountFactoryTest:test_deploy_deploysToSameAddress() (gas: 15338064)
-ExaPluginTest:testFork_claimAndVestEscrowedEXA_claimsAndVests() (gas: 38616338)
-ExaPluginTest:testFork_collectCollateral_collects() (gas: 32117511)
-ExaPluginTest:testFork_crossRepay_repays() (gas: 33939665)
-ExaPluginTest:testFork_repay_whenFlashLoanerHasFees() (gas: 25572520)
-ExaPluginTest:testFork_stakeEXA_stakes() (gas: 32695581)
-ExaPluginTest:testFork_swap_swaps() (gas: 28060506)
+ExaPluginTest:testFork_claimAndVestEscrowedEXA_claimsAndVests() (gas: 38619453)
+ExaPluginTest:testFork_collectCollateral_collects() (gas: 32120425)
+ExaPluginTest:testFork_crossRepay_repays() (gas: 33942579)
+ExaPluginTest:testFork_repay_whenFlashLoanerHasFees() (gas: 25573719)
+ExaPluginTest:testFork_stakeEXA_stakes() (gas: 32698581)
+ExaPluginTest:testFork_swap_swaps() (gas: 28063154)
 ExaPluginTest:test_allowPlugin_emitsPluginAllowed() (gas: 58464)
 ExaPluginTest:test_allowPlugin_reverts_whenAddressZero() (gas: 32411)
 ExaPluginTest:test_allowPlugin_reverts_whenNotAdmin() (gas: 40964)
@@ -32,12 +32,12 @@ ExaPluginTest:test_collectCredit_collects_whenHealthFactorHigherThanOne() (gas:
 ExaPluginTest:test_collectCredit_collects_whenProposalCausesInsufficientLiquidity() (gas: 1064982)
 ExaPluginTest:test_collectCredit_collects_whenProposalLeavesHealthFactorLowerThanOne() (gas: 1055379)
 ExaPluginTest:test_collectCredit_collects_withEnoughSlippage() (gas: 782246)
-ExaPluginTest:test_collectCredit_collects_withPrevIssuerSignature() (gas: 986135)
+ExaPluginTest:test_collectCredit_collects_withPrevIssuerSignature() (gas: 986192)
 ExaPluginTest:test_collectCredit_passes_whenProposalLeavesEnoughLiquidity() (gas: 1082579)
 ExaPluginTest:test_collectCredit_reverts_asNotKeeper() (gas: 342148)
 ExaPluginTest:test_collectCredit_reverts_whenDisagreement() (gas: 538817)
 ExaPluginTest:test_collectCredit_reverts_whenExpired() (gas: 352767)
-ExaPluginTest:test_collectCredit_reverts_whenPrevSignatureNotValidAnymore() (gas: 483048)
+ExaPluginTest:test_collectCredit_reverts_whenPrevSignatureNotValidAnymore() (gas: 483105)
 ExaPluginTest:test_collectCredit_reverts_whenReplay() (gas: 825827)
 ExaPluginTest:test_collectCredit_reverts_whenTimelocked() (gas: 334568)
 ExaPluginTest:test_collectCredit_toleratesTimeDrift() (gas: 798846)
@@ -58,7 +58,7 @@ ExaPluginTest:test_collectInstallments_reverts_whenTimelocked() (gas: 336703)
 ExaPluginTest:test_collectInstallments_toleratesTimeDrift() (gas: 1161587)
 ExaPluginTest:test_collect_collects_whenProposalsLeaveNoLiquidity() (gas: 1783636)
 ExaPluginTest:test_collect_collects_whenTooMuchProposedDebt() (gas: 1923835)
-ExaPluginTest:test_crossRepay_avoidsFrozenDeposit() (gas: 980223)
+ExaPluginTest:test_crossRepay_avoidsFrozenDeposit() (gas: 980280)
 ExaPluginTest:test_crossRepay_avoidsZeroSharesDeposit() (gas: 1392815)
 ExaPluginTest:test_crossRepay_consumesProposal() (gas: 2204416)
 ExaPluginTest:test_crossRepay_repays() (gas: 2268206)
@@ -202,8 +202,9 @@ ExaPreviewerTest:test_collect_reverts_whenProposalsLeaveNoLiquidity() (gas: 1437
 ExaPreviewerTest:test_markets_returnsMarkets() (gas: 150447)
 ExaPreviewerTest:test_pendingProposals_returnsPendingProposals() (gas: 1984093)
 ExaPreviewerTest:test_utilizations_returns() (gas: 134922)
-HypEXATest:test_handle_reverts_withoutBridgeRole() (gas: 122474)
+HypEXATest:test_handle_reverts_withoutBridgeRole() (gas: 122511)
 HypEXATest:test_roundTrip_opToBaseToOp() (gas: 1046501)
+HypEXATest:test_roundTrip_opToPolygonToBaseToOp() (gas: 1549147)
 HypEXATest:test_transferRemote_reverts_withoutBridgeRole() (gas: 230258)
 IssuerCheckerTest:test_setIssuer_emits_IssuerSet() (gas: 82935)
 IssuerCheckerTest:test_setIssuer_reverts_whenNotAdmin() (gas: 43708)
@@ -215,20 +216,20 @@ IssuerCheckerTest:test_setPrevIssuerWindow_emits_PrevIssuerWindowSet() (gas: 526
 IssuerCheckerTest:test_setPrevIssuerWindow_reverts_whenNotAdmin() (gas: 45548)
 MockSwapperTest:test_swapExactAmountIn_swaps() (gas: 269414)
 MockSwapperTest:test_swapExactAmountOut_swaps() (gas: 269410)
-RedeployerTest:test_deployEXA_deploysAtSameAddress_onBase() (gas: 58408778)
+RedeployerTest:test_deployEXA_deploysAtSameAddress_onBase() (gas: 58409415)
 RedeployerTest:test_deployExaFactoryWithProxy_reverts_whenNotPrepared() (gas: 18987692)
-RedeployerTest:test_deployExaFactoryWithProxy_succeeds_whenAlreadyUpgraded() (gas: 34219432)
-RedeployerTest:test_deployExaFactory_deploysAtSameAddress_onEthereum() (gas: 263256673)
-RedeployerTest:test_deployExaFactory_deploysAtSameAddress_onPolygon() (gas: 358967582)
-RedeployerTest:test_deployExaFactory_deploysViaCreate3AtSameAddress_onPolygon() (gas: 37411130)
-RedeployerTest:test_deployExaFactory_reverts_whenNotPrepared() (gas: 19011050)
-RedeployerTest:test_deployExaFactory_succeeds_whenVersionAlreadyDeployed() (gas: 34766180)
-RedeployerTest:test_prepare_reusesExistingDeps_onBase() (gas: 22489460)
-RedeployerTest:test_prepare_reverts_whenAdminIsDeployer() (gas: 19014585)
-RedeployerTest:test_prepare_succeeds_whenCalledTwice() (gas: 33709577)
-RedeployerTest:test_recoversNativeETHOnPolygon() (gas: 37582370)
-RedeployerTest:test_serialProxies_reverts_whenAttackerUpgradesProxy() (gas: 41758713)
-RedeployerTest:test_serialProxies_reverts_whenTargetNonceTooLow() (gas: 49844667)
+RedeployerTest:test_deployExaFactoryWithProxy_succeeds_whenAlreadyUpgraded() (gas: 34220440)
+RedeployerTest:test_deployExaFactory_deploysAtSameAddress_onEthereum() (gas: 263257728)
+RedeployerTest:test_deployExaFactory_deploysAtSameAddress_onPolygon() (gas: 358968688)
+RedeployerTest:test_deployExaFactory_deploysViaCreate3AtSameAddress_onPolygon() (gas: 37412129)
+RedeployerTest:test_deployExaFactory_reverts_whenNotPrepared() (gas: 19011107)
+RedeployerTest:test_deployExaFactory_succeeds_whenVersionAlreadyDeployed() (gas: 34767236)
+RedeployerTest:test_prepare_reusesExistingDeps_onBase() (gas: 22490914)
+RedeployerTest:test_prepare_reverts_whenAdminIsDeployer() (gas: 19014704)
+RedeployerTest:test_prepare_succeeds_whenCalledTwice() (gas: 33710642)
+RedeployerTest:test_recoversNativeETHOnPolygon() (gas: 37583393)
+RedeployerTest:test_serialProxies_reverts_whenAttackerUpgradesProxy() (gas: 41759285)
+RedeployerTest:test_serialProxies_reverts_whenTargetNonceTooLow() (gas: 49845179)
 RefunderTest:test_refund_refunds() (gas: 263363)
 RefunderTest:test_refund_reverts_whenExpired() (gas: 88359)
 RefunderTest:test_refund_reverts_whenNotKeeper() (gas: 68861)

contracts/deploy.json

@@ -41,6 +41,7 @@
     },
     "mailbox": {
       "10": "0xd4C1905BB1D26BC93DAC913e13CaCC278CdCC80D",
+      "137": "0x5d934f4e2f797775e53561bB72aca21ba36B96BB",
       "8453": "0xeA87ae93Fa0019a82A727bfd3eBd1cFCa8f64f1D"
     }
   },

contracts/test/HypEXA.t.sol

@@ -13,18 +13,33 @@ contract HypEXATest is ForkTest {
 
   uint256 internal opFork;
   uint256 internal baseFork;
+  uint256 internal polygonFork;
   HypXERC20 internal opRouter;
   HypXERC20 internal baseRouter;
+  HypXERC20 internal polygonRouter;
   address internal admin;
   address internal opMailbox;
   address internal baseMailbox;
+  address internal polygonMailbox;
   EXA internal exa = EXA(0x1e925De1c68ef83bD98eE3E130eF14a50309C01B);
   address internal exaHolder = 0x92024C4bDa9DA602b711B9AbB610d072018eb58b;
 
   uint32 internal constant OP_DOMAIN = 10;
   uint32 internal constant BASE_DOMAIN = 8453;
+  uint32 internal constant POLYGON_DOMAIN = 137;
 
   function setUp() external {
+    polygonFork = vm.createSelectFork("polygon", 83_700_000);
+    polygonMailbox = acct("mailbox");
+    Redeployer polygonRedeployer = new Redeployer();
+    polygonRedeployer.setUp();
+    if (address(polygonRedeployer.proxyAdmin()).code.length == 0) polygonRedeployer.prepare();
+    polygonRedeployer.proxyThrough(polygonRedeployer.findNonce(acct("deployer"), address(exa), 1000) + 1);
+    polygonRedeployer.deployEXA(address(exa));
+    polygonRouter = polygonRedeployer.deployRouter(address(exa));
+    polygonRedeployer.setupRouter(address(exa), OP_DOMAIN);
+    polygonRedeployer.setupRouter(address(exa), BASE_DOMAIN);
+
     baseFork = vm.createSelectFork("base", 42_380_000);
     baseMailbox = acct("mailbox");
     Redeployer baseRedeployer = new Redeployer();
@@ -34,6 +49,7 @@ contract HypEXATest is ForkTest {
     baseRedeployer.deployEXA(address(exa));
     baseRouter = baseRedeployer.deployRouter(address(exa));
     baseRedeployer.setupRouter(address(exa), OP_DOMAIN);
+    baseRedeployer.setupRouter(address(exa), POLYGON_DOMAIN);
 
     opFork = vm.createSelectFork("optimism", 147_967_000);
     opMailbox = acct("mailbox");
@@ -45,6 +61,7 @@ contract HypEXATest is ForkTest {
     opRedeployer.upgradeEXA(address(exa));
     opRouter = opRedeployer.deployRouter(address(exa));
     opRedeployer.setupRouter(address(exa), BASE_DOMAIN);
+    opRedeployer.setupRouter(address(exa), POLYGON_DOMAIN);
   }
 
   // solhint-disable func-name-mixedcase
@@ -83,6 +100,52 @@ contract HypEXATest is ForkTest {
     assertEq(exa.totalSupply(), opSupply, "op didn't restore supply");
   }
 
+  function test_roundTrip_opToPolygonToBaseToOp() external {
+    uint256 amount = 100e18;
+    uint256 opSupply = exa.totalSupply();
+
+    uint256 fee = opRouter.quoteGasPayment(POLYGON_DOMAIN);
+    vm.deal(exaHolder, fee);
+    vm.prank(exaHolder);
+    opRouter.transferRemote{ value: fee }(POLYGON_DOMAIN, exaHolder.addressToBytes32(), amount);
+    assertEq(exa.totalSupply(), opSupply - amount, "op didn't burn");
+
+    vm.selectFork(polygonFork);
+    uint256 polygonSupply = exa.totalSupply();
+    vm.prank(polygonMailbox);
+    polygonRouter.handle(
+      OP_DOMAIN, address(opRouter).addressToBytes32(), abi.encodePacked(exaHolder.addressToBytes32(), amount)
+    );
+    assertEq(exa.totalSupply(), polygonSupply + amount, "polygon didn't mint");
+
+    fee = polygonRouter.quoteGasPayment(BASE_DOMAIN);
+    vm.deal(exaHolder, fee);
+    vm.prank(exaHolder);
+    polygonRouter.transferRemote{ value: fee }(BASE_DOMAIN, exaHolder.addressToBytes32(), amount);
+    assertEq(exa.totalSupply(), polygonSupply, "polygon didn't burn");
+
+    vm.selectFork(baseFork);
+    uint256 baseSupply = exa.totalSupply();
+    vm.prank(baseMailbox);
+    baseRouter.handle(
+      POLYGON_DOMAIN, address(polygonRouter).addressToBytes32(), abi.encodePacked(exaHolder.addressToBytes32(), amount)
+    );
+    assertEq(exa.totalSupply(), baseSupply + amount, "base didn't mint");
+
+    fee = baseRouter.quoteGasPayment(OP_DOMAIN);
+    vm.deal(exaHolder, fee);
+    vm.prank(exaHolder);
+    baseRouter.transferRemote{ value: fee }(OP_DOMAIN, exaHolder.addressToBytes32(), amount);
+    assertEq(exa.totalSupply(), baseSupply, "base didn't burn");
+
+    vm.selectFork(opFork);
+    vm.prank(opMailbox);
+    opRouter.handle(
+      BASE_DOMAIN, address(baseRouter).addressToBytes32(), abi.encodePacked(exaHolder.addressToBytes32(), amount)
+    );
+    assertEq(exa.totalSupply(), opSupply, "op didn't restore supply");
+  }
+
   function test_transferRemote_reverts_withoutBridgeRole() external {
     vm.prank(admin);
     exa.revokeRole(keccak256("BRIDGE_ROLE"), address(opRouter));