fix: address audit comments

Author: georgeroman

src/v3/RelayApprovalProxyV3.sol

@@ -2,9 +2,13 @@
 pragma solidity ^0.8.23;
 
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
+import {
+    SafeERC20
+} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import {IPermit2} from "permit2-relay/src/interfaces/IPermit2.sol";
-import {ISignatureTransfer} from "permit2-relay/src/interfaces/ISignatureTransfer.sol";
+import {
+    ISignatureTransfer
+} from "permit2-relay/src/interfaces/ISignatureTransfer.sol";
 import {Ownable} from "solady/src/auth/Ownable.sol";
 import {SignatureCheckerLib} from "solady/src/utils/SignatureCheckerLib.sol";
 import {TrustlessPermit} from "trustlessPermit/TrustlessPermit.sol";
@@ -63,8 +67,15 @@ contract RelayApprovalProxyV3 is Ownable {
     }
 
     /// @notice Withdraw function in case funds get stuck in contract
-    function withdraw() external onlyOwner {
-        _send(msg.sender, address(this).balance);
+    function withdraw(address token) external onlyOwner {
+        if (token == address(0)) {
+            _send(msg.sender, address(this).balance);
+        } else {
+            IERC20(token).safeTransfer(
+                msg.sender,
+                IERC20(token).balanceOf(address(this))
+            );
+        }
     }
 
     /// @notice Transfer tokens to RelayRouter and perform multicall in a single tx

src/v3/RelayRouterV3.sol

@@ -15,9 +15,6 @@ contract RelayRouterV3 is Multicall3, ReentrancyGuardMsgSender {
     /// @notice Revert if this contract is set as the recipient
     error InvalidRecipient(address recipient);
 
-    /// @notice Revert if the target is invalid
-    error InvalidTarget(address target);
-
     /// @notice Revert if the native transfer failed
     error NativeTransferFailed();
 
@@ -42,7 +39,7 @@ contract RelayRouterV3 is Multicall3, ReentrancyGuardMsgSender {
         bytes metadata
     );
 
-    uint256 RECIPIENT_STORAGE_SLOT =
+    uint256 private constant RECIPIENT_STORAGE_SLOT =
         uint256(keccak256("RelayRouter.recipient")) - 1;
 
     constructor() {}
@@ -102,7 +99,7 @@ contract RelayRouterV3 is Multicall3, ReentrancyGuardMsgSender {
         address[] calldata recipients,
         uint256[] calldata amounts,
         bytes calldata metadata
-    ) public {
+    ) public nonReentrant {
         // Revert if array lengths do not match
         if (
             tokens.length != amounts.length ||
@@ -147,7 +144,7 @@ contract RelayRouterV3 is Multicall3, ReentrancyGuardMsgSender {
         address[] calldata tos,
         bytes[] calldata datas,
         uint256[] calldata amounts
-    ) public {
+    ) public nonReentrant {
         // Revert if array lengths do not match
         if (
             tokens.length != amounts.length ||
@@ -189,7 +186,7 @@ contract RelayRouterV3 is Multicall3, ReentrancyGuardMsgSender {
         uint256 amount,
         address recipient,
         bytes calldata metadata
-    ) public {
+    ) public nonReentrant {
         // If recipient is address(0), set to msg.sender
         address recipientAddr = recipient == address(0)
             ? msg.sender
@@ -220,7 +217,7 @@ contract RelayRouterV3 is Multicall3, ReentrancyGuardMsgSender {
         uint256 amount,
         address to,
         bytes calldata data
-    ) public {
+    ) public nonReentrant {
         uint256 amountToTransfer = amount == 0 ? address(this).balance : amount;
 
         if (amountToTransfer > 0) {

src/v3/RelayRouterV3_NonTstore.sol

@@ -7,7 +7,9 @@ import {IERC1155} from "@openzeppelin/contracts/token/ERC1155/IERC1155.sol";
 import {SafeTransferLib} from "solady/src/utils/SafeTransferLib.sol";
 
 import {Call3Value, Multicall3, Result} from "../common/Multicall3.sol";
-import {ReentrancyGuardMsgSender_NonTstore} from "../common/ReentrancyGuardMsgSender_NonTstore.sol";
+import {
+    ReentrancyGuardMsgSender_NonTstore
+} from "../common/ReentrancyGuardMsgSender_NonTstore.sol";
 
 contract RelayRouterV3_NonTstore is
     Multicall3,
@@ -18,9 +20,6 @@ contract RelayRouterV3_NonTstore is
     /// @notice Revert if this contract is set as the recipient
     error InvalidRecipient(address recipient);
 
-    /// @notice Revert if the target is invalid
-    error InvalidTarget(address target);
-
     /// @notice Revert if the native transfer failed
     error NativeTransferFailed();
 
@@ -45,7 +44,7 @@ contract RelayRouterV3_NonTstore is
         bytes metadata
     );
 
-    uint256 RECIPIENT_STORAGE_SLOT =
+    uint256 private constant RECIPIENT_STORAGE_SLOT =
         uint256(keccak256("RelayRouter.recipient")) - 1;
 
     constructor() {}
@@ -105,7 +104,7 @@ contract RelayRouterV3_NonTstore is
         address[] calldata recipients,
         uint256[] calldata amounts,
         bytes calldata metadata
-    ) public {
+    ) public nonReentrant {
         // Revert if array lengths do not match
         if (
             tokens.length != amounts.length ||
@@ -150,7 +149,7 @@ contract RelayRouterV3_NonTstore is
         address[] calldata tos,
         bytes[] calldata datas,
         uint256[] calldata amounts
-    ) public {
+    ) public nonReentrant {
         // Revert if array lengths do not match
         if (
             tokens.length != amounts.length ||
@@ -192,7 +191,7 @@ contract RelayRouterV3_NonTstore is
         uint256 amount,
         address recipient,
         bytes calldata metadata
-    ) public {
+    ) public nonReentrant {
         // If recipient is address(0), set to msg.sender
         address recipientAddr = recipient == address(0)
             ? msg.sender
@@ -223,7 +222,7 @@ contract RelayRouterV3_NonTstore is
         uint256 amount,
         address to,
         bytes calldata data
-    ) public {
+    ) public nonReentrant {
         uint256 amountToTransfer = amount == 0 ? address(this).balance : amount;
 
         if (amountToTransfer > 0) {