From 47a535bb3b5829c6d015fcdf8ccdc1357520a2c1 Mon Sep 17 00:00:00 2001
From: DhairyaSethi <55102840+DhairyaSethi@users.noreply.github.com>
Date: Tue, 22 Oct 2024 22:24:14 +0530
Subject: [PATCH] fix: add proxyPool whitelist to onlyOffRamp modifier

---
 .../v0.8/ccip/pools/GHO/UpgradeableTokenPool.sol  |  4 +++-
 .../pools/GHO/diffs/UpgradeableTokenPool_diff.md  | 15 +++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/contracts/src/v0.8/ccip/pools/GHO/UpgradeableTokenPool.sol b/contracts/src/v0.8/ccip/pools/GHO/UpgradeableTokenPool.sol
index aa86725ef6..7cae344a2e 100644
--- a/contracts/src/v0.8/ccip/pools/GHO/UpgradeableTokenPool.sol
+++ b/contracts/src/v0.8/ccip/pools/GHO/UpgradeableTokenPool.sol
@@ -269,7 +269,9 @@ abstract contract UpgradeableTokenPool is IPool, OwnerIsCreator, IERC165 {
   /// is a permissioned offRamp for the given chain on the Router.
   modifier onlyOffRamp(uint64 remoteChainSelector) {
     if (!isSupportedChain(remoteChainSelector)) revert ChainNotAllowed(remoteChainSelector);
-    if (!s_router.isOffRamp(remoteChainSelector, msg.sender)) revert CallerIsNotARampOnRouter(msg.sender);
+    if (!(msg.sender == getProxyPool() || s_router.isOffRamp(remoteChainSelector, msg.sender))) {
+      revert CallerIsNotARampOnRouter(msg.sender);
+    }
     _;
   }
 
diff --git a/contracts/src/v0.8/ccip/pools/GHO/diffs/UpgradeableTokenPool_diff.md b/contracts/src/v0.8/ccip/pools/GHO/diffs/UpgradeableTokenPool_diff.md
index 9b6aa6e0e1..741af46c1d 100644
--- a/contracts/src/v0.8/ccip/pools/GHO/diffs/UpgradeableTokenPool_diff.md
+++ b/contracts/src/v0.8/ccip/pools/GHO/diffs/UpgradeableTokenPool_diff.md
@@ -1,6 +1,6 @@
 ```diff
 diff --git a/src/v0.8/ccip/pools/TokenPool.sol b/src/v0.8/ccip/pools/GHO/UpgradeableTokenPool.sol
-index b3571bb449..aa86725ef6 100644
+index b3571bb449..7cae344a2e 100644
 --- a/src/v0.8/ccip/pools/TokenPool.sol
 +++ b/src/v0.8/ccip/pools/GHO/UpgradeableTokenPool.sol
 @@ -1,21 +1,24 @@
@@ -94,7 +94,18 @@ index b3571bb449..aa86725ef6 100644
      _;
    }
 
-@@ -323,4 +328,21 @@ abstract contract TokenPool is IPool, OwnerIsCreator, IERC165 {
+@@ -264,7 +269,9 @@ abstract contract TokenPool is IPool, OwnerIsCreator, IERC165 {
+   /// is a permissioned offRamp for the given chain on the Router.
+   modifier onlyOffRamp(uint64 remoteChainSelector) {
+     if (!isSupportedChain(remoteChainSelector)) revert ChainNotAllowed(remoteChainSelector);
+-    if (!s_router.isOffRamp(remoteChainSelector, msg.sender)) revert CallerIsNotARampOnRouter(msg.sender);
++    if (!(msg.sender == getProxyPool() || s_router.isOffRamp(remoteChainSelector, msg.sender))) {
++      revert CallerIsNotARampOnRouter(msg.sender);
++    }
+     _;
+   }
+
+@@ -323,4 +330,21 @@ abstract contract TokenPool is IPool, OwnerIsCreator, IERC165 {
      if (IARM(i_armProxy).isCursed()) revert BadARMSignal();
      _;
    }