make verifyParams a modifier

Author: tbwebb22

contracts/periphery/counterfactual/CounterfactualDepositCCTP.sol

@@ -67,6 +67,12 @@ contract CounterfactualDepositCCTP is CounterfactualDepositBase {
     /// @notice CCTP source domain ID for this chain
     uint32 public immutable sourceDomain;
 
+    /// @dev Hashes caller-supplied params and checks against the clone's stored hash.
+    modifier verifyParams(CCTPImmutables memory params) {
+        _verifyParamsHash(keccak256(abi.encode(params)));
+        _;
+    }
+
     constructor(address _srcPeriphery, uint32 _sourceDomain) {
         srcPeriphery = _srcPeriphery;
         sourceDomain = _sourceDomain;
@@ -88,9 +94,7 @@ contract CounterfactualDepositCCTP is CounterfactualDepositBase {
         bytes32 nonce,
         uint256 cctpDeadline,
         bytes calldata signature
-    ) external {
-        _verifyParams(params);
-
+    ) external verifyParams(params) {
         address inputToken = address(uint160(uint256(params.depositParams.burnToken)));
 
         // transfer execution fee to execution fee recipient
@@ -136,8 +140,12 @@ contract CounterfactualDepositCCTP is CounterfactualDepositBase {
      * @param to Recipient of the withdrawn tokens.
      * @param amount Amount to withdraw.
      */
-    function adminWithdraw(CCTPImmutables memory params, address token, address to, uint256 amount) external {
-        _verifyParams(params);
+    function adminWithdraw(
+        CCTPImmutables memory params,
+        address token,
+        address to,
+        uint256 amount
+    ) external verifyParams(params) {
         _adminWithdraw(params.executionParams.adminWithdrawAddress, token, to, amount);
     }
 
@@ -148,14 +156,12 @@ contract CounterfactualDepositCCTP is CounterfactualDepositBase {
      * @param to Recipient of the withdrawn tokens.
      * @param amount Amount to withdraw.
      */
-    function userWithdraw(CCTPImmutables memory params, address token, address to, uint256 amount) external {
-        _verifyParams(params);
+    function userWithdraw(
+        CCTPImmutables memory params,
+        address token,
+        address to,
+        uint256 amount
+    ) external verifyParams(params) {
         _userWithdraw(params.executionParams.userWithdrawAddress, token, to, amount);
     }
-
-    /// @dev Hashes caller-supplied params and checks against the clone's stored hash.
-    /// @param params Route parameters to verify.
-    function _verifyParams(CCTPImmutables memory params) internal view {
-        _verifyParamsHash(keccak256(abi.encode(params)));
-    }
 }

contracts/periphery/counterfactual/CounterfactualDepositOFT.sol

@@ -67,6 +67,12 @@ contract CounterfactualDepositOFT is CounterfactualDepositBase {
     /// @notice OFT source endpoint ID for this chain
     uint32 public immutable srcEid;
 
+    /// @dev Hashes caller-supplied params and checks against the clone's stored hash.
+    modifier verifyParams(OFTImmutables memory params) {
+        _verifyParamsHash(keccak256(abi.encode(params)));
+        _;
+    }
+
     constructor(address _oftSrcPeriphery, uint32 _srcEid) {
         oftSrcPeriphery = _oftSrcPeriphery;
         srcEid = _srcEid;
@@ -88,9 +94,7 @@ contract CounterfactualDepositOFT is CounterfactualDepositBase {
         bytes32 nonce,
         uint256 oftDeadline,
         bytes calldata signature
-    ) external payable {
-        _verifyParams(params);
-
+    ) external payable verifyParams(params) {
         // transfer execution fee to execution fee recipient
         if (params.executionParams.executionFee > 0) {
             IERC20(params.depositParams.token).safeTransfer(executionFeeRecipient, params.executionParams.executionFee);
@@ -135,8 +139,12 @@ contract CounterfactualDepositOFT is CounterfactualDepositBase {
      * @param to Recipient of the withdrawn tokens.
      * @param amount Amount to withdraw.
      */
-    function adminWithdraw(OFTImmutables memory params, address token, address to, uint256 amount) external {
-        _verifyParams(params);
+    function adminWithdraw(
+        OFTImmutables memory params,
+        address token,
+        address to,
+        uint256 amount
+    ) external verifyParams(params) {
         _adminWithdraw(params.executionParams.adminWithdrawAddress, token, to, amount);
     }
 
@@ -147,14 +155,12 @@ contract CounterfactualDepositOFT is CounterfactualDepositBase {
      * @param to Recipient of the withdrawn tokens.
      * @param amount Amount to withdraw.
      */
-    function userWithdraw(OFTImmutables memory params, address token, address to, uint256 amount) external {
-        _verifyParams(params);
+    function userWithdraw(
+        OFTImmutables memory params,
+        address token,
+        address to,
+        uint256 amount
+    ) external verifyParams(params) {
         _userWithdraw(params.executionParams.userWithdrawAddress, token, to, amount);
     }
-
-    /// @dev Hashes caller-supplied params and checks against the clone's stored hash.
-    /// @param params Route parameters to verify.
-    function _verifyParams(OFTImmutables memory params) internal view {
-        _verifyParamsHash(keccak256(abi.encode(params)));
-    }
 }

contracts/periphery/counterfactual/CounterfactualDepositSpokePool.sol

@@ -60,6 +60,12 @@ contract CounterfactualDepositSpokePool is CounterfactualDepositBase, EIP712 {
     /// @notice Signer that authorizes execution parameters
     address public immutable signer;
 
+    /// @dev Hashes caller-supplied params and checks against the clone's stored hash.
+    modifier verifyParams(SpokePoolImmutables memory params) {
+        _verifyParamsHash(keccak256(abi.encode(params)));
+        _;
+    }
+
     constructor(address _spokePool, address _signer) EIP712("CounterfactualDepositSpokePool", "v1.0.0") {
         spokePool = _spokePool;
         signer = _signer;
@@ -87,8 +93,7 @@ contract CounterfactualDepositSpokePool is CounterfactualDepositBase, EIP712 {
         uint32 quoteTimestamp,
         uint32 fillDeadline,
         bytes calldata signature
-    ) external {
-        _verifyParams(params);
+    ) external verifyParams(params) {
         _verifySignature(inputAmount, outputAmount, exclusiveRelayer, exclusivityDeadline, fillDeadline, signature);
 
         address inputToken = address(uint160(uint256(params.depositParams.inputToken)));
@@ -135,8 +140,12 @@ contract CounterfactualDepositSpokePool is CounterfactualDepositBase, EIP712 {
      * @param to Recipient of the withdrawn tokens.
      * @param amount Amount to withdraw.
      */
-    function adminWithdraw(SpokePoolImmutables memory params, address token, address to, uint256 amount) external {
-        _verifyParams(params);
+    function adminWithdraw(
+        SpokePoolImmutables memory params,
+        address token,
+        address to,
+        uint256 amount
+    ) external verifyParams(params) {
         _adminWithdraw(params.executionParams.adminWithdrawAddress, token, to, amount);
     }
 
@@ -147,8 +156,12 @@ contract CounterfactualDepositSpokePool is CounterfactualDepositBase, EIP712 {
      * @param to Recipient of the withdrawn tokens.
      * @param amount Amount to withdraw.
      */
-    function userWithdraw(SpokePoolImmutables memory params, address token, address to, uint256 amount) external {
-        _verifyParams(params);
+    function userWithdraw(
+        SpokePoolImmutables memory params,
+        address token,
+        address to,
+        uint256 amount
+    ) external verifyParams(params) {
         _userWithdraw(params.executionParams.userWithdrawAddress, token, to, amount);
     }
 
@@ -182,10 +195,4 @@ contract CounterfactualDepositSpokePool is CounterfactualDepositBase, EIP712 {
         );
         if (ECDSA.recover(_hashTypedDataV4(structHash), signature) != signer) revert InvalidSignature();
     }
-
-    /// @dev Hashes caller-supplied params and checks against the clone's stored hash.
-    /// @param params Route parameters to verify.
-    function _verifyParams(SpokePoolImmutables memory params) internal view {
-        _verifyParamsHash(keccak256(abi.encode(params)));
-    }
 }