fixed todos

bcnmy · Nov 21, 2024 · ec065de · ec065de
1 parent 9871c6d
commit ec065de
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/test/base/TestBase.sol b/test/base/TestBase.sol
@@ -37,6 +37,8 @@ abstract contract TestBase is CheatCodes, TestHelper, BaseEventsAndErrors {
     // Review address kept
     address constant SWAP_ROUTER_ADDRESS = address(0x2626664c2603336E57B271c5C0b26F421741e481);
 
+    uint32 internal constant _PRICE_MARKUP_DENOMINATOR = 1e6;
+
     Vm.Wallet internal PAYMASTER_OWNER;
     Vm.Wallet internal PAYMASTER_SIGNER;
     Vm.Wallet internal PAYMASTER_FEE_COLLECTOR;
@@ -489,7 +491,7 @@ abstract contract TestBase is CheatCodes, TestHelper, BaseEventsAndErrors {
         // Ensure that max 2% difference between what is should have been charged and what was charged
         // this difference comes from difference of postop gas and estimated postop gas (paymaster.unaccountedGas)
         // and from estimation of real penalty which is not emitted by EP :(
-        assertApproxEqRel(totalGasFeePaid + maxPenalty - realPenalty, gasPaidBySAInNativeTokens, 0.02e18);
+        assertApproxEqRel((totalGasFeePaid + maxPenalty - realPenalty) * priceMarkup / _PRICE_MARKUP_DENOMINATOR, gasPaidBySAInNativeTokens, 0.02e18);
     }
 
     function _toSingletonArray(address addr) internal pure returns (address[] memory) {

diff --git a/test/unit/concrete/TestTokenPaymaster.Base.t.sol b/test/unit/concrete/TestTokenPaymaster.Base.t.sol
@@ -134,8 +134,9 @@ contract TestTokenPaymasterBase is TestBase {
             initialPaymasterEpBalance, 
             initialUserTokenBalance, 
             initialPaymasterTokenBalance,
-            2624042830,
-            100000,
+            // IF THIS CASE FAILS ON 2% TOLERANCE => PUT THE FRESH PRICE FROM ORACLE HERE
+            3344583445,
+            _PRICE_MARKUP_DENOMINATOR,
             this.getMaxPenalty(ops[0]),
             this.getRealPenalty(ops[0], gasValue, customGasPrice));
     }

diff --git a/test/unit/concrete/TestTokenPaymaster.t.sol b/test/unit/concrete/TestTokenPaymaster.t.sol
@@ -467,7 +467,7 @@ contract TestTokenPaymaster is TestBase {
             initialUserTokenBalance, 
             initialPaymasterTokenBalance,
             1e18, // tokenPrice
-            100000,
+            _PRICE_MARKUP_DENOMINATOR,
             this.getMaxPenalty(ops[0]),
             this.getRealPenalty(ops[0], gasValue, customGasPrice));
     }
@@ -525,7 +525,7 @@ contract TestTokenPaymaster is TestBase {
             initialUserTokenBalance, 
             initialPaymasterTokenBalance,
             1e18, // tokenPrice
-            100000,
+            _PRICE_MARKUP_DENOMINATOR,
             this.getMaxPenalty(ops[0]),
             this.getRealPenalty(ops[0], gasValue, customGasPrice));
     }