prevent distributor configuration to RToken/RSR contracts directly (#…

…1191)
reserve-protocol · Sep 10, 2024 · f8e5f5c · f8e5f5c
1 parent f90e0e0
commit f8e5f5c
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 4 deletions.
diff --git a/contracts/p0/Distributor.sol b/contracts/p0/Distributor.sol
@@ -139,7 +139,11 @@ contract DistributorP0 is ComponentP0, IDistributor {
         require(dest != address(0), "dest cannot be zero");
         require(
             dest != address(main.furnace()) && dest != address(main.stRSR()),
-            "destination can not be furnace or strsr directly"
+            "destination cannot be furnace or strsr directly"
+        );
+        require(
+            dest != address(main.rsr()) && dest != address(main.rToken()),
+            "destination cannot be rsr or rToken"
         );
         require(dest != address(main.daoFeeRegistry()), "destination cannot be daoFeeRegistry");
         if (dest == FURNACE) require(share.rsrDist == 0, "Furnace must get 0% of RSR");

diff --git a/contracts/p1/Distributor.sol b/contracts/p1/Distributor.sol
@@ -241,7 +241,11 @@ contract DistributorP1 is ComponentP1, IDistributor {
         require(dest != address(0), "dest cannot be zero");
         require(
             dest != address(furnace) && dest != address(stRSR),
-            "destination can not be furnace or strsr directly"
+            "destination cannot be furnace or strsr directly"
+        );
+        require(
+            dest != address(rsr) && dest != address(rToken),
+            "destination cannot be rsr or rToken"
         );
         require(dest != address(main.daoFeeRegistry()), "destination cannot be daoFeeRegistry");
         if (dest == FURNACE) require(share.rsrDist == 0, "Furnace must get 0% of RSR");

diff --git a/test/Revenues.test.ts b/test/Revenues.test.ts
@@ -361,14 +361,28 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => {
         distributor
           .connect(owner)
           .setDistribution(furnace.address, { rTokenDist: bn(5), rsrDist: bn(5) })
-      ).to.be.revertedWith('destination can not be furnace or strsr directly')
+      ).to.be.revertedWith('destination cannot be furnace or strsr directly')
 
       // Cannot set StRSR as beneficiary
       await expect(
         distributor
           .connect(owner)
           .setDistribution(stRSR.address, { rTokenDist: bn(5), rsrDist: bn(5) })
-      ).to.be.revertedWith('destination can not be furnace or strsr directly')
+      ).to.be.revertedWith('destination cannot be furnace or strsr directly')
+
+      // Cannot set RSR as beneficiary
+      await expect(
+        distributor
+          .connect(owner)
+          .setDistribution(rsr.address, { rTokenDist: bn(5), rsrDist: bn(5) })
+      ).to.be.revertedWith('destination cannot be rsr or rToken')
+
+      // Cannot set RToken as beneficiary
+      await expect(
+        distributor
+          .connect(owner)
+          .setDistribution(rToken.address, { rTokenDist: bn(5), rsrDist: bn(5) })
+      ).to.be.revertedWith('destination cannot be rsr or rToken')
     })
 
     itP1('Should not allow to set Dao fee explicitly', async () => {