Gas optimization of governance fee calc

mstable · Mar 3, 2021 · 529529d · 529529d
1 parent 3c4dddc
commit 529529d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 11 deletions.
diff --git a/contracts/feeders/FeederPool.sol b/contracts/feeders/FeederPool.sol
@@ -325,8 +325,10 @@ contract FeederPool is
             _recipient
         );
 
-        if(data.govFee > 0){
-            data.pendingFees += localFee * data.govFee / 1e18;
+        uint256 govFee = data.govFee;
+        if(govFee > 0) {
+            uint256 pendingFees = data.pendingFees;
+            data.pendingFees = pendingFees + (localFee * govFee / 1e18);
         }
 
         emit Swapped(msg.sender, input.addr, output.addr, swapOutput, localFee, _recipient);
@@ -451,8 +453,10 @@ contract FeederPool is
             _recipient
         );
 
-        if(data.govFee > 0){
-            data.pendingFees += localFee * data.govFee / 1e18;
+        uint256 govFee = data.govFee;
+        if(govFee > 0) {
+            uint256 pendingFees = data.pendingFees;
+            data.pendingFees = pendingFees + (localFee * govFee / 1e18);
         }
 
         emit Redeemed(
@@ -495,8 +499,10 @@ contract FeederPool is
             _recipient
         );
 
-        if(data.govFee > 0){
-            data.pendingFees += scaledFee * data.govFee / 1e18;
+        uint256 govFee = data.govFee;
+        if(govFee > 0) {
+            uint256 pendingFees = data.pendingFees;
+            data.pendingFees = pendingFees + (scaledFee * govFee / 1e18);
         }
 
         emit RedeemedMulti(
@@ -542,8 +548,10 @@ contract FeederPool is
         );
 
         _burn(msg.sender, fpTokenQuantity);
-        if(data.govFee > 0){
-            data.pendingFees += localFee * data.govFee / 1e18;
+        uint256 govFee = data.govFee;
+        if(govFee > 0) {
+            uint256 pendingFees = data.pendingFees;
+            data.pendingFees = pendingFees + (localFee * govFee / 1e18);
         }
 
         emit RedeemedMulti(
@@ -760,8 +768,10 @@ contract FeederPool is
         newSupply = totalSupply() + mintAmount;
         require(mintAmount > 0, "Must collect something");
 
-        if(data.govFee > 0){
-            data.pendingFees += mintAmount * data.govFee / 1e18;
+        uint256 govFee = data.govFee;
+        if(govFee > 0) {
+            uint256 pendingFees = data.pendingFees;
+            data.pendingFees = pendingFees + (mintAmount * govFee / 1e18);
         }
 
         // Dummy mint event to catch the collections here

diff --git a/test/feeders/basic-fns.spec.ts b/test/feeders/basic-fns.spec.ts
@@ -144,7 +144,7 @@ describe("Feeder Pools", () => {
             )
         })
     })
-    describe.only("testing some swaps", () => {
+    describe("testing some swaps", () => {
         before(async () => {
             await runSetup()
         })