chore: flag to overwrite CREATE2 address for EVM

Author: douglasgalico

sh/deployNttManagerWithExecutor.sh

@@ -24,10 +24,19 @@ if [ "${EVM_CHAIN_ID}X" == "X" ]; then
   EVM_CHAIN_ID=1337
 fi
 
+if [ -n "${CREATE2_ADDRESS}" ]; then
+  CREATE2_FLAG="--create2-deployer ${CREATE2_ADDRESS}"
+  echo "Using custom CREATE2 deployer at: ${CREATE2_ADDRESS}"
+else
+  CREATE2_FLAG=""
+  echo "Using default CREATE2 deployer"
+fi
+
 forge script ./script/DeployNttManagerWithExecutor.s.sol:DeployNttManagerWithExecutor \
 	--sig "run(uint16,address)" $OUR_CHAIN_ID $EXECUTOR \
 	--rpc-url "$RPC_URL" \
 	--private-key "$MNEMONIC" \
+  $CREATE2_FLAG \
 	--broadcast ${FORGE_ARGS}
 
 returnInfo=$(cat ./broadcast/DeployNttManagerWithExecutor.s.sol/$EVM_CHAIN_ID/run-latest.json)

src/NttManagerWithExecutor.sol

@@ -57,12 +57,14 @@ contract NttManagerWithExecutor is INttManagerWithExecutor {
 
         // Initiate the transfer.
         SafeERC20.safeApprove(IERC20(token), nttManager, amount);
-        msgId = nttm.transfer{value: msg.value - executorArgs.value}(
-            amount, recipientChain, recipientAddress, refundAddress, false, encodedInstructions
-        );
+        msgId = nttm.transfer{
+            value: msg.value - executorArgs.value
+        }(amount, recipientChain, recipientAddress, refundAddress, false, encodedInstructions);
 
         // Generate the executor event.
-        executor.requestExecution{value: executorArgs.value}(
+        executor.requestExecution{
+            value: executorArgs.value
+        }(
             recipientChain,
             nttm.getPeer(recipientChain).peerAddress,
             executorArgs.refundAddress,

test/NttManagerWithExecutor.t.sol

@@ -48,11 +48,7 @@ contract MockExecutor is Executor {
     }
 
     // NOTE: This was copied from the tests in the executor repo.
-    function encodeSignedQuoteHeader(Executor.SignedQuoteHeader memory signedQuote)
-        public
-        pure
-        returns (bytes memory)
-    {
+    function encodeSignedQuoteHeader(Executor.SignedQuoteHeader memory signedQuote) public pure returns (bytes memory) {
         return abi.encodePacked(
             signedQuote.prefix,
             signedQuote.quoterAddress,
@@ -118,7 +114,12 @@ contract MockTransceiver is Transceiver {
     function _quoteDeliveryPrice(
         uint16, /* recipientChain */
         TransceiverStructs.TransceiverInstruction memory /* transceiverInstruction */
-    ) internal pure override returns (uint256) {
+    )
+        internal
+        pure
+        override
+        returns (uint256)
+    {
         return 0;
     }
 
@@ -217,9 +218,9 @@ contract TestNttManagerWithExecutor is Test {
         vm.startPrank(user_A);
         token.approve(address(nttManager), 3 * 10 ** decimals);
 
-        uint64 s1 = nttManager.transfer{value: 10000}(
-            1 * 10 ** decimals, chainId2, toWormholeFormat(user_B), toWormholeFormat(user_A), false, new bytes(1)
-        );
+        uint64 s1 = nttManager.transfer{
+            value: 10000
+        }(1 * 10 ** decimals, chainId2, toWormholeFormat(user_B), toWormholeFormat(user_A), false, new bytes(1));
 
         assertEq(s1, 0);
     }
@@ -248,7 +249,9 @@ contract TestNttManagerWithExecutor is Test {
 
         ExecutorArgs memory executorArgs = executor.createArgs(chainId2, 100);
         FeeArgs memory feeArgs = FeeArgs({dbps: dbps, payee: referrer});
-        uint64 s1 = nttManagerWithExecutor.transfer{value: 10000}(
+        uint64 s1 = nttManagerWithExecutor.transfer{
+            value: 10000
+        }(
             address(nttManager),
             amount,
             chainId2,
@@ -286,7 +289,9 @@ contract TestNttManagerWithExecutor is Test {
 
         ExecutorArgs memory executorArgs = executor.createArgs(chainId2, 100);
         FeeArgs memory feeArgs = FeeArgs({dbps: 1, payee: referrer});
-        uint64 s1 = nttManagerWithExecutor.transfer{value: 10000}(
+        uint64 s1 = nttManagerWithExecutor.transfer{
+            value: 10000
+        }(
             address(nttManagerNoRateLimiting),
             amount,
             chainId2,