add revert upon invalid stalkIssuedPerBdv

BeanstalkFarms · Apr 10, 2024 · f5bda85 · f5bda85
1 parent 380ca41
commit f5bda85
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 9 deletions.
diff --git a/protocol/contracts/libraries/Silo/LibWhitelist.sol b/protocol/contracts/libraries/Silo/LibWhitelist.sol
@@ -100,8 +100,8 @@ library LibWhitelist {
         verifyLiquidityWeightSelector(liquidityWeightSelector);
 
         // verify whitelist status of token. 
-        // Updates stalkIssuedPerBdv in the case of an previously whitelisted token.
-        stalkIssuedPerBdv = verifyWhitelistStatus(token, selector, stalkIssuedPerBdv);       
+        // reverts on an invalid stalkIssuedPerBdv if previously whitelisted.
+        verifyWhitelistStatus(token, selector, stalkIssuedPerBdv);       
 
         // If an LP token, initialize oracle storage variables.
         if (token != address(C.bean()) && !LibUnripe.isUnripe(token)) {
@@ -252,7 +252,7 @@ library LibWhitelist {
         address token,
         bytes4 selector,
         uint32 stalkIssuedPerBdv
-    ) internal returns (uint32) { 
+    ) internal { 
         AppStorage storage s = LibAppStorage.diamondStorage();
 
         (bool isWhitelisted, bool previouslyWhitelisted) = LibWhitelistedTokens.checkWhitelisted(token);
@@ -280,9 +280,7 @@ library LibWhitelist {
         // cannot be updated, as previous deposits would have been made with the
         // previous value. 
         if (previouslyWhitelisted) { 
-            return s.ss[token].stalkIssuedPerBdv;
-        } else {
-            return stalkIssuedPerBdv;
+            require(s.ss[token].stalkIssuedPerBdv == stalkIssuedPerBdv, "Whitelist: Cannot update stalkIssuedPerBdv");
         }
     }
 

diff --git a/protocol/test/Whitelist.test.js b/protocol/test/Whitelist.test.js
@@ -262,7 +262,7 @@ describe('Whitelist', function () {
   })
 
   describe('rewhitelist', async function () {
-    it('rewhitelists a dewhitelisted token', async function () {
+    beforeEach(async function () {
       this.whitelist.connect(owner).whitelistTokenWithEncodeType(
         this.well.address,
         this.bdv.interface.getSighash('wellBdv'),
@@ -274,11 +274,13 @@ describe('Whitelist', function () {
         '0',
         '0'
       )
-
       await this.whitelist.connect(owner).dewhitelistToken(this.well.address)
+
       let settings = await this.siloGetters.tokenSettings(this.well.address);
       expect(settings[0]).to.equal('0x00000000')
+    });
 
+    it('rewhitelists a dewhitelisted token', async function () {
       this.result = this.whitelist.connect(owner).whitelistTokenWithEncodeType(
         this.well.address,
         this.bdv.interface.getSighash('wellBdv'),
@@ -289,7 +291,7 @@ describe('Whitelist', function () {
         this.liquidityWeight.interface.getSighash("maxWeight()"),
         '0',
         '0')
-      settings = await this.siloGetters.tokenSettings(this.well.address)
+      let settings = await this.siloGetters.tokenSettings(this.well.address)
 
       expect(settings[0]).to.equal(this.bdv.interface.getSighash('wellBdv'))
       expect(settings[1]).to.equal(1)
@@ -305,7 +307,20 @@ describe('Whitelist', function () {
         '0',
         '0'
       );
+    })
 
+    it('reverts on an invalid stalkIssuedPerBdv upon rewhitelisting', async function () {
+      await expect(this.whitelist.connect(owner).whitelistTokenWithEncodeType(
+        this.well.address,
+        this.bdv.interface.getSighash('wellBdv'),
+        '1',
+        '1',
+        1,
+        this.gaugePoint.interface.getSighash("defaultGaugePointFunction(uint256,uint256,uint256)"),
+        this.liquidityWeight.interface.getSighash("maxWeight()"),
+        '0',
+        '0'
+      )).to.be.revertedWith('Whitelist: Cannot update stalkIssuedPerBdv')
     })
   })
 });