🔨 contracts: setup new deployer address

co-authored-by: Gerardo Nardelli <patitonardelli@gmail.com>

Author: cruzdanilo

contracts/.gas-snapshot

@@ -1,11 +1,11 @@
-ExaAccountFactoryTest:testFuzz_createAccount_EOAOwners(uint256,address[63]) (runs: 256, μ: 5888117, ~: 5393451)
+ExaAccountFactoryTest:testFuzz_createAccount_EOAOwners(uint256,address[63]) (runs: 256, μ: 5861692, ~: 5360703)
 ExaAccountFactoryTest:test_deploy_deploysToSameAddress() (gas: 15501257)
-ExaPluginTest:testFork_claimAndVestEscrowedEXA_claimsAndVests() (gas: 38980399)
-ExaPluginTest:testFork_collectCollateral_collects() (gas: 32196281)
-ExaPluginTest:testFork_crossRepay_repays() (gas: 34018435)
-ExaPluginTest:testFork_repay_whenFlashLoanerHasFees() (gas: 25604908)
-ExaPluginTest:testFork_stakeEXA_stakes() (gas: 33046103)
-ExaPluginTest:testFork_swap_swaps() (gas: 28132102)
+ExaPluginTest:testFork_claimAndVestEscrowedEXA_claimsAndVests() (gas: 38991407)
+ExaPluginTest:testFork_collectCollateral_collects() (gas: 32206505)
+ExaPluginTest:testFork_crossRepay_repays() (gas: 34028659)
+ExaPluginTest:testFork_repay_whenFlashLoanerHasFees() (gas: 25609109)
+ExaPluginTest:testFork_stakeEXA_stakes() (gas: 33056706)
+ExaPluginTest:testFork_swap_swaps() (gas: 28141397)
 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: 1064907)
 ExaPluginTest:test_collectCredit_collects_whenProposalLeavesHealthFactorLowerThanOne() (gas: 1055304)
 ExaPluginTest:test_collectCredit_collects_withEnoughSlippage() (gas: 782171)
-ExaPluginTest:test_collectCredit_collects_withPrevIssuerSignature() (gas: 987650)
+ExaPluginTest:test_collectCredit_collects_withPrevIssuerSignature() (gas: 987863)
 ExaPluginTest:test_collectCredit_passes_whenProposalLeavesEnoughLiquidity() (gas: 1082504)
 ExaPluginTest:test_collectCredit_reverts_asNotKeeper() (gas: 342073)
 ExaPluginTest:test_collectCredit_reverts_whenDisagreement() (gas: 538742)
 ExaPluginTest:test_collectCredit_reverts_whenExpired() (gas: 352692)
-ExaPluginTest:test_collectCredit_reverts_whenPrevSignatureNotValidAnymore() (gas: 484563)
+ExaPluginTest:test_collectCredit_reverts_whenPrevSignatureNotValidAnymore() (gas: 484776)
 ExaPluginTest:test_collectCredit_reverts_whenReplay() (gas: 825752)
 ExaPluginTest:test_collectCredit_reverts_whenTimelocked() (gas: 334493)
 ExaPluginTest:test_collectCredit_toleratesTimeDrift() (gas: 798771)
@@ -58,7 +58,7 @@ ExaPluginTest:test_collectInstallments_reverts_whenTimelocked() (gas: 336628)
 ExaPluginTest:test_collectInstallments_toleratesTimeDrift() (gas: 1161512)
 ExaPluginTest:test_collect_collects_whenProposalsLeaveNoLiquidity() (gas: 1783561)
 ExaPluginTest:test_collect_collects_whenTooMuchProposedDebt() (gas: 1923760)
-ExaPluginTest:test_crossRepay_avoidsFrozenDeposit() (gas: 981727)
+ExaPluginTest:test_crossRepay_avoidsFrozenDeposit() (gas: 981939)
 ExaPluginTest:test_crossRepay_avoidsZeroSharesDeposit() (gas: 1392740)
 ExaPluginTest:test_crossRepay_consumesProposal() (gas: 2204191)
 ExaPluginTest:test_crossRepay_repays() (gas: 2267981)
@@ -202,22 +202,22 @@ ExaPreviewerTest:test_collect_reverts_whenProposalsLeaveNoLiquidity() (gas: 1437
 ExaPreviewerTest:test_markets_returnsMarkets() (gas: 150447)
 ExaPreviewerTest:test_pendingProposals_returnsPendingProposals() (gas: 1983943)
 ExaPreviewerTest:test_utilizations_returns() (gas: 134922)
-HypEXATest:test_deployRouter_enrollsBase_whenNoRemotesOnOptimism() (gas: 30706283)
-HypEXATest:test_deployRouter_enrollsOptimism_whenNoRemotesOnBase() (gas: 30811917)
-HypEXATest:test_deployRouter_reverts_whenNoRemotesOnUnsupportedChain() (gas: 20627783)
-HypEXATest:test_deployRouter_setsHookAndIsm() (gas: 270936)
+HypEXATest:test_deployRouter_enrollsBase_whenNoRemotesOnOptimism() (gas: 30768019)
+HypEXATest:test_deployRouter_enrollsOptimism_whenNoRemotesOnBase() (gas: 30874426)
+HypEXATest:test_deployRouter_reverts_whenNoRemotesOnUnsupportedChain() (gas: 20663714)
+HypEXATest:test_deployRouter_setsHookAndIsm() (gas: 272092)
 HypEXATest:test_handle_reverts_withoutBridgeRole() (gas: 578581)
 HypEXATest:test_hookAndIsm_trackMailboxDefaults_withoutRedeploy() (gas: 154299)
-HypEXATest:test_pause_pausesHookAndIsmViaPauser() (gas: 144877)
+HypEXATest:test_pause_pausesHookAndIsmViaPauser() (gas: 145089)
 HypEXATest:test_process_reverts_whenIsmPaused() (gas: 712859)
-HypEXATest:test_proposeBridgeRole_reverts_whenAlreadyGranted() (gas: 273918)
-HypEXATest:test_proposeBridgeRole_reverts_whenRouterNotDeployed() (gas: 20387421)
-HypEXATest:test_proposeBridgeRole_schedulesGrantOnTimelock() (gas: 2303697)
-HypEXATest:test_rotateRouterPausable_restoresProcessAfterPauserIsmPaused() (gas: 22139948)
-HypEXATest:test_rotateRouterPausable_restoresTransferRemoteAfterPauserHookPaused() (gas: 2126569)
+HypEXATest:test_proposeBridgeRole_reverts_whenAlreadyGranted() (gas: 275205)
+HypEXATest:test_proposeBridgeRole_reverts_whenRouterNotDeployed() (gas: 20423566)
+HypEXATest:test_proposeBridgeRole_schedulesGrantOnTimelock() (gas: 2306945)
+HypEXATest:test_rotateRouterPausable_restoresProcessAfterPauserIsmPaused() (gas: 22179901)
+HypEXATest:test_rotateRouterPausable_restoresTransferRemoteAfterPauserHookPaused() (gas: 2131395)
 HypEXATest:test_roundTrip_opToBaseToOp() (gas: 1312360)
 HypEXATest:test_roundTrip_opToPolygonToBaseToOp() (gas: 1960009)
-HypEXATest:test_transferRemote_reverts_whenHookPaused() (gas: 1106969)
+HypEXATest:test_transferRemote_reverts_whenHookPaused() (gas: 1108255)
 HypEXATest:test_transferRemote_reverts_withoutBridgeRole() (gas: 754963)
 IssuerCheckerTest:test_setIssuer_emits_IssuerSet() (gas: 82935)
 IssuerCheckerTest:test_setIssuer_reverts_whenNotAdmin() (gas: 43708)
@@ -229,24 +229,24 @@ 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_allowsProxyAdminV4Upgrade_onBase() (gas: 26863755)
-RedeployerTest:test_deployEXA_deploysAtSameAddress_onBase() (gas: 56738230)
-RedeployerTest:test_deployEXA_migratesProxyAdmin_onBase() (gas: 24115062)
-RedeployerTest:test_deployEXA_preservesERC20_onBase() (gas: 24089790)
-RedeployerTest:test_deployEXA_revokesOldProxyAdmin_onBase() (gas: 25716596)
-RedeployerTest:test_deployExaFactoryWithProxy_reverts_whenNotPrepared() (gas: 16339201)
-RedeployerTest:test_deployExaFactoryWithProxy_succeeds_whenAlreadyUpgraded() (gas: 31625336)
-RedeployerTest:test_deployExaFactory_deploysAtSameAddress_onEthereum() (gas: 260785642)
-RedeployerTest:test_deployExaFactory_deploysAtSameAddress_onPolygon() (gas: 356377284)
-RedeployerTest:test_deployExaFactory_deploysViaCreate3AtSameAddress_onPolygon() (gas: 34816837)
-RedeployerTest:test_deployExaFactory_reverts_whenNotPrepared() (gas: 16364144)
-RedeployerTest:test_deployExaFactory_succeeds_whenVersionAlreadyDeployed() (gas: 32173472)
-RedeployerTest:test_prepare_reusesExistingDeps_onBase() (gas: 19880501)
-RedeployerTest:test_prepare_reverts_whenAdminIsDeployer() (gas: 16369486)
-RedeployerTest:test_prepare_succeeds_whenCalledTwice() (gas: 31117178)
-RedeployerTest:test_recoversNativeETHOnPolygon() (gas: 34988681)
-RedeployerTest:test_serialProxies_reverts_whenAttackerUpgradesProxy() (gas: 40085030)
-RedeployerTest:test_serialProxies_reverts_whenTargetNonceTooLow() (gas: 44565432)
+RedeployerTest:test_deployEXA_allowsProxyAdminV4Upgrade_onBase() (gas: 27523407)
+RedeployerTest:test_deployEXA_deploysAtSameAddress_onBase() (gas: 57396366)
+RedeployerTest:test_deployEXA_migratesProxyAdmin_onBase() (gas: 24774630)
+RedeployerTest:test_deployEXA_preservesERC20_onBase() (gas: 24749358)
+RedeployerTest:test_deployEXA_revokesOldProxyAdmin_onBase() (gas: 26376248)
+RedeployerTest:test_deployExaFactoryWithProxy_reverts_whenNotPrepared() (gas: 16538703)
+RedeployerTest:test_deployExaFactoryWithProxy_succeeds_whenAlreadyUpgraded() (gas: 31829057)
+RedeployerTest:test_deployExaFactory_deploysAtSameAddress_onEthereum() (gas: 260989714)
+RedeployerTest:test_deployExaFactory_deploysAtSameAddress_onPolygon() (gas: 356581568)
+RedeployerTest:test_deployExaFactory_deploysViaCreate3AtSameAddress_onPolygon() (gas: 35020186)
+RedeployerTest:test_deployExaFactory_reverts_whenNotPrepared() (gas: 16563859)
+RedeployerTest:test_deployExaFactory_succeeds_whenVersionAlreadyDeployed() (gas: 32377034)
+RedeployerTest:test_prepare_reusesExistingDeps_onBase() (gas: 20085218)
+RedeployerTest:test_prepare_reverts_whenAdminIsDeployer() (gas: 16569617)
+RedeployerTest:test_prepare_succeeds_whenCalledTwice() (gas: 31320932)
+RedeployerTest:test_recoversNativeETHOnPolygon() (gas: 35192114)
+RedeployerTest:test_serialProxies_reverts_whenAttackerUpgradesProxy() (gas: 60042487)
+RedeployerTest:test_serialProxies_reverts_whenTargetNonceTooLow() (gas: 44966347)
 RefunderTest:test_refund_refunds() (gas: 263288)
 RefunderTest:test_refund_reverts_whenExpired() (gas: 88359)
 RefunderTest:test_refund_reverts_whenNotKeeper() (gas: 68861)

contracts/deploy.json

@@ -8,6 +8,11 @@
     },
     "deployer": {
       "31337": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
+      "84532": "0xDb90CDB64CfF03f254e4015C4F705C3F3C834400",
+      "11155420": "0xDb90CDB64CfF03f254e4015C4F705C3F3C834400",
+      "default": "0xa48B91Ac2A2DdD690EC2Ad3185489E49af186fb7"
+    },
+    "redeployer": {
       "84532": "0xDb90CDB64CfF03f254e4015C4F705C3F3C834400",
       "11155420": "0xDb90CDB64CfF03f254e4015C4F705C3F3C834400",
       "default": "0xe61Bdef3FFF4C3CF7A07996DCB8802b5C85B665a"

contracts/script/Redeployer.s.sol

@@ -64,7 +64,7 @@ contract Redeployer is BaseScript {
   /// @notice Deploys all reusable contracts via CREATE3, skipping any already deployed.
   function prepare() external {
     address admin = acct("admin");
-    if (admin == acct("deployer")) revert AdminIsDeployer();
+    if (admin == acct("redeployer")) revert AdminIsDeployer();
     vm.startBroadcast(admin);
     if (address(dummy).code.length == 0) {
       dummy = Dummy(CREATE3_FACTORY.deploy(keccak256(abi.encode("Dummy")), vm.getCode("Redeployer.s.sol:Dummy")));
@@ -169,7 +169,7 @@ contract Redeployer is BaseScript {
     if (address(dummy).code.length == 0) revert DummyNotDeployed();
     if (address(proxyAdmin).code.length == 0) revert ProxyAdminNotDeployed();
 
-    address deployer = acct("deployer");
+    address deployer = acct("redeployer");
 
     start = vm.getNonce(deployer);
     if (targetNonce < start) revert TargetNonceTooLow();

contracts/test/HypEXA.t.sol

@@ -57,7 +57,7 @@ contract HypEXATest is ForkTest {
     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.proxyThrough(polygonRedeployer.findNonce(acct("redeployer"), address(exa), 1000) + 1);
     set("exactly", makeAddr("exactly")); // no exactly on polygon — test-only chain
     set("TimelockController", makeAddr("exactly"));
     set("pauser", makeAddr("pauser"));
@@ -79,7 +79,7 @@ contract HypEXATest is ForkTest {
     Redeployer baseRedeployer = new Redeployer();
     baseRedeployer.setUp();
     if (address(baseRedeployer.proxyAdmin()).code.length == 0) baseRedeployer.prepare();
-    baseRedeployer.proxyThrough(baseRedeployer.findNonce(acct("deployer"), address(exa), 1000) + 1);
+    baseRedeployer.proxyThrough(baseRedeployer.findNonce(acct("redeployer"), address(exa), 1000) + 1);
     baseRedeployer.deployEXA();
     uint32[] memory baseRemotes = new uint32[](2);
     baseRemotes[0] = uint32(getChain("optimism").chainId);
@@ -88,7 +88,7 @@ contract HypEXATest is ForkTest {
     vm.prank(protocol("TimelockController"));
     exa.grantRole(keccak256("BRIDGE_ROLE"), address(baseRouter));
 
-    opFork = vm.createSelectFork("optimism", 147_967_000);
+    opFork = vm.createSelectFork("optimism", 153_448_100);
     opMailbox = acct("hyperlaneMailbox");
     opRedeployer = new Redeployer();
     opRedeployer.setUp();
@@ -234,16 +234,17 @@ contract HypEXATest is ForkTest {
     HypEXA hypEXA = new HypEXA();
 
     vm.expectRevert(RouterNotDeployed.selector);
-    hypEXA.proposeBridgeRole(keccak256("HypEXA.BRIDGE_ROLE"));
+    hypEXA.proposeBridgeRole("HypEXA.BRIDGE_ROLE");
   }
 
   function test_proposeBridgeRole_schedulesGrantOnTimelock() external {
     vm.selectFork(opFork);
     vm.prank(protocol("TimelockController"));
     exa.revokeRole(keccak256("BRIDGE_ROLE"), address(opRouter));
 
-    bytes32 salt = keccak256("HypEXA.BRIDGE_ROLE");
-    opHypEXA.proposeBridgeRole(salt);
+    string memory saltString = "HypEXA.BRIDGE_ROLE";
+    bytes32 salt = keccak256(abi.encode(saltString));
+    opHypEXA.proposeBridgeRole(saltString);
 
     TimelockController timelock = TimelockController(payable(protocol("TimelockController")));
     bytes32 id = timelock.hashOperation(
@@ -259,7 +260,7 @@ contract HypEXATest is ForkTest {
   function test_proposeBridgeRole_reverts_whenAlreadyGranted() external {
     vm.selectFork(opFork);
     vm.expectRevert(AlreadyGranted.selector);
-    opHypEXA.proposeBridgeRole(keccak256("HypEXA.BRIDGE_ROLE"));
+    opHypEXA.proposeBridgeRole("HypEXA.BRIDGE_ROLE");
   }
 
   function test_deployRouter_setsHookAndIsm() external {

contracts/test/Redeployer.t.sol

@@ -32,7 +32,7 @@ contract RedeployerTest is ForkTest {
 
     redeployer = new Redeployer();
 
-    address deployer = acct("deployer");
+    address deployer = acct("redeployer");
     address exaOP = protocol("EXA", true, 10);
     uint256 targetNonce = redeployer.findNonce(deployer, exaOP, 1_000_000);
     uint256 currentNonce = vm.getNonce(deployer);
@@ -55,13 +55,16 @@ contract RedeployerTest is ForkTest {
   function test_serialProxies_reverts_whenAttackerUpgradesProxy() external {
     vm.createSelectFork("base", 41_053_217);
 
-    address deployer = acct("deployer");
-    uint256 target = vm.getNonce(deployer) + 10;
     redeployer = new Redeployer();
+
+    address deployer = acct("redeployer");
+    address exaOP = protocol("EXA", true, 10);
+    uint256 target = redeployer.findNonce(deployer, exaOP, 1_000_000);
+
     redeployer.prepare();
     redeployer.proxyThrough(target);
 
-    address proxy = vm.computeCreateAddress(deployer, target - 1);
+    address proxy = vm.computeCreateAddress(deployer, target);
     assertTrue(proxy.code.length > 0, "proxy not deployed");
 
     ProxyAdmin proxyAdmin = redeployer.proxyAdmin();
@@ -139,7 +142,7 @@ contract RedeployerTest is ForkTest {
 
     redeployer = new Redeployer();
 
-    address deployer = acct("deployer");
+    address deployer = acct("redeployer");
     uint256 targetNonce = redeployer.findNonce(deployer, factoryOP, 1_000_000);
     uint256 currentNonce = vm.getNonce(deployer);
     assertGt(targetNonce, currentNonce, "target nonce <= current nonce");
@@ -186,7 +189,7 @@ contract RedeployerTest is ForkTest {
 
     redeployer = new Redeployer();
 
-    address deployer = acct("deployer");
+    address deployer = acct("redeployer");
     uint256 targetNonce = redeployer.findNonce(deployer, factoryOP, 1_000_000);
     uint256 currentNonce = vm.getNonce(deployer);
     assertGt(targetNonce, currentNonce, "target nonce <= current nonce");
@@ -240,7 +243,7 @@ contract RedeployerTest is ForkTest {
     vm.createSelectFork("polygon", 82_000_000);
     redeployer = new Redeployer();
     redeployer.prepare();
-    address deployer = acct("deployer");
+    address deployer = acct("redeployer");
     uint256 nonce = vm.getNonce(deployer);
     redeployer.proxyThrough(nonce);
     address proxy = vm.computeCreateAddress(deployer, nonce);