Merge branch 'develop' into SOD-12

pods-finance · Aug 4, 2021 · 12193b8 · 12193b8
2 parents 87a7932 + 0ef28a1
commit 12193b8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/abi/FeePool.json b/abi/FeePool.json
@@ -290,7 +290,7 @@
       },
       {
         "internalType": "uint8",
-        "name": "decimals",
+        "name": "feeDecimals",
         "type": "uint8"
       }
     ],

diff --git a/contracts/amm/FeePool.sol b/contracts/amm/FeePool.sol
@@ -49,11 +49,12 @@ contract FeePool is IFeePool, Ownable {
      * @notice Sets fee and the decimals
      *
      * @param feeBaseValue Fee value
-     * @param decimals Fee decimals
+     * @param feeDecimals Fee decimals
      */
-    function setFee(uint256 feeBaseValue, uint8 decimals) external override onlyOwner {
+    function setFee(uint256 feeBaseValue, uint8 feeDecimals) external override onlyOwner {
+        require(feeDecimals <= 77 && feeBaseValue <= uint256(10)**feeDecimals, "FeePool: Invalid Fee data");
         _feeBaseValue = feeBaseValue;
-        _feeDecimals = decimals;
+        _feeDecimals = feeDecimals;
         emit FeeUpdated(_token, _feeBaseValue, _feeDecimals);
     }
 

diff --git a/test/amm/FeePool.test.js b/test/amm/FeePool.test.js
@@ -61,10 +61,15 @@ describe('FeePool', () => {
         .to.emit(pool, 'FeeUpdated')
         .withArgs(usdc.address, newBaseFeeValue, newFeeDecimals)
 
-      const feeValue = await pool.feeValue()
       expect(await pool.feeValue()).to.equal(newBaseFeeValue)
       expect(await pool.feeDecimals()).to.equal(newFeeDecimals)
     })
+
+    it('cannot charge more than 100% base fees', async () => {
+      const decimals = await usdc.decimals()
+      const tx = pool.setFee(10 ** decimals + 1, decimals)
+      await expect(tx).to.be.revertedWith('FeePool: Invalid Fee data')
+    })
   })
 
   describe('Fee collection', () => {