change OFT token from bytes32 to address

Author: tbwebb22

contracts/periphery/counterfactual/CounterfactualDepositOFT.sol

@@ -19,7 +19,7 @@ interface ISponsoredOFTSrcPeriphery {
 struct OFTImmutables {
     uint32 dstEid;
     bytes32 destinationHandler;
-    bytes32 token;
+    address token;
     uint256 maxOftFeeBps;
     uint256 executionFee;
     uint256 lzReceiveGasLimit;
@@ -77,16 +77,14 @@ contract CounterfactualDepositOFT is CounterfactualDepositBase {
     ) external payable {
         _verifyParams(params);
 
-        address inputToken = address(uint160(uint256(params.token)));
-
         // transfer execution fee to execution fee recipient
         if (params.executionFee > 0) {
-            IERC20(inputToken).safeTransfer(executionFeeRecipient, params.executionFee);
+            IERC20(params.token).safeTransfer(executionFeeRecipient, params.executionFee);
         }
 
         uint256 depositAmount = amount - params.executionFee;
 
-        IERC20(inputToken).forceApprove(oftSrcPeriphery, depositAmount);
+        IERC20(params.token).forceApprove(oftSrcPeriphery, depositAmount);
 
         Quote memory quote = Quote({
             signedParams: SignedQuoteParams({

contracts/periphery/counterfactual/README.md

@@ -72,7 +72,7 @@ Signature verification, nonce tracking, and `cctpDeadline` enforcement are handl
 | `srcEid`                | Constructor immutable | OFT source endpoint ID for this chain                                   |
 | `dstEid`                | Route immutable       | OFT destination endpoint ID                                             |
 | `destinationHandler`    | Route immutable       | Composer contract on destination (OFT `to` param)                       |
-| `token`                 | Route immutable       | Local token address (the OFT token, as bytes32)                         |
+| `token`                 | Route immutable       | Local token address (the OFT token on source chain)                     |
 | `maxOftFeeBps`          | Route immutable       | Max OFT bridge fee in bps                                               |
 | `executionFee`          | Route immutable       | Fixed fee paid to relayer                                               |
 | `lzReceiveGasLimit`     | Route immutable       | Gas limit for `lzReceive` on destination                                |

test/evm/foundry/local/CounterfactualDepositOFT.t.sol

@@ -85,7 +85,7 @@ contract CounterfactualOFTDepositTest is Test {
         defaultParams = OFTImmutables({
             dstEid: DST_EID,
             destinationHandler: bytes32(uint256(uint160(makeAddr("composer")))),
-            token: bytes32(uint256(uint160(address(token)))),
+            token: address(token),
             maxOftFeeBps: 100,
             executionFee: 1e6,
             lzReceiveGasLimit: 200000,