[STABLE-8092] [Cont.]: Update implementation deployment script to use CREATE2 more effectively (circlefin#60)

### Summary 

Follow-up to:
circlefin/evm-cctp-contracts-private@8cf3673,
this correct an oversight where the TokenMinterV2 via Create2 was being
passed the tokenController as a constructor arg. Since this affects the
bytecode, it affects the address.

### Testing

The tests actually already assert that the tokenController is rotated
correctly; it's done atomically in both ways, only this way ensures a
consistent address.

Edit: added a test to ensure that the script is deploying via CREATE2 in
an expected way.

Author: ams9198

scripts/v2/DeployImplementationsV2.s.sol

@@ -21,7 +21,7 @@ pragma abicoder v2;
 import {Script} from "forge-std/Script.sol";
 import {AdminUpgradableProxy} from "../../src/proxy/AdminUpgradableProxy.sol";
 import {TokenMessengerV2} from "../../src/v2/TokenMessengerV2.sol";
-import {TokenMinterV2} from "../../src/v2/TokenMinterV2.sol";
+import {TokenMinter, TokenMinterV2} from "../../src/v2/TokenMinterV2.sol";
 import {MessageTransmitterV2} from "../../src/v2/MessageTransmitterV2.sol";
 import {Create2Factory} from "../../src/v2/Create2Factory.sol";
 import {Ownable2Step} from "../../src/roles/Ownable2Step.sol";
@@ -93,12 +93,19 @@ contract DeployImplementationsV2Script is Script {
 
         // Since the TokenMinter sets the msg.sender of the deployment to be
         // the Owner, we'll need to rotate it from the Create2Factory atomically.
+        // But first we rotate the tokenController, since only the Owner can do that
+        bytes memory tokenMinterTokenControllerRotation = abi
+            .encodeWithSelector(
+                TokenMinter.setTokenController.selector,
+                tokenControllerAddress
+            );
         bytes memory tokenMinterOwnershipRotation = abi.encodeWithSelector(
             Ownable2Step.transferOwnership.selector,
             tokenMinterOwnerAddress
         );
-        bytes[] memory tokenMinterMultiCallData = new bytes[](1);
-        tokenMinterMultiCallData[0] = tokenMinterOwnershipRotation;
+        bytes[] memory tokenMinterMultiCallData = new bytes[](2);
+        tokenMinterMultiCallData[0] = tokenMinterTokenControllerRotation;
+        tokenMinterMultiCallData[1] = tokenMinterOwnershipRotation;
 
         // Deploy TokenMinter
         tokenMinterV2 = TokenMinterV2(
@@ -107,7 +114,7 @@ contract DeployImplementationsV2Script is Script {
                 SALT_TOKEN_MINTER,
                 abi.encodePacked(
                     type(TokenMinterV2).creationCode,
-                    abi.encode(tokenControllerAddress)
+                    abi.encode(address(factory))
                 ),
                 tokenMinterMultiCallData
             )

test/scripts/v2/DeployImplementationsV2.t.sol

@@ -20,6 +20,8 @@ import {ScriptV2TestUtils} from "./ScriptV2TestUtils.sol";
 import {DeployImplementationsV2Script} from "../../../scripts/v2/DeployImplementationsV2.s.sol";
 import {MessageTransmitterV2} from "../../../src/v2/MessageTransmitterV2.sol";
 import {TokenMessengerV2} from "../../../src/v2/TokenMessengerV2.sol";
+import {SALT_TOKEN_MINTER} from "../../../scripts/v2/Salts.sol";
+import {TokenMinterV2} from "../../../src/v2/TokenMinterV2.sol";
 
 contract DeployImplementationsV2Test is ScriptV2TestUtils {
     DeployImplementationsV2Script deployImplementationsV2Script;
@@ -36,6 +38,16 @@ contract DeployImplementationsV2Test is ScriptV2TestUtils {
         assertEq(messageTransmitterV2Impl.version(), uint256(_version));
 
         // TokenMinterV2
+        address predictedTokenMinterAddress = create2Factory.computeAddress(
+            SALT_TOKEN_MINTER,
+            keccak256(
+                abi.encodePacked(
+                    type(TokenMinterV2).creationCode,
+                    abi.encode(create2Factory)
+                )
+            )
+        );
+        assertEq(address(tokenMinterV2), predictedTokenMinterAddress);
         assertEq(tokenMinterV2.tokenController(), deployer);
         assertEq(tokenMinterV2.owner(), deployer);