Fix/audit fixes round 4 (#28)

* fix: AST-2793 and bump forge-std pointer * fix: AST-2792 * fix: bump starport version to latest
AstariaXYZ · Jan 10, 2024 · 081c785 · 081c785
1 parent e494dae
commit 081c785
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 10 deletions.
diff --git a/lib/forge-std b/lib/forge-std
diff --git a/lib/starport b/lib/starport
diff --git a/src/enforcers/AstariaV1BorrowerEnforcer.sol b/src/enforcers/AstariaV1BorrowerEnforcer.sol
@@ -76,7 +76,7 @@ contract AstariaV1BorrowerEnforcer is BorrowerEnforcer {
         AstariaV1Lib.validateCompoundInterest(
             loanAmount,
             loanRate,
-            AstariaV1Lib.getBaseRecallRecallMax(loanTerms.statusData), // recallMax
+            AstariaV1Lib.getBaseRecallMax(loanTerms.statusData), // recallMax
             AstariaV1Lib.getBasePricingDecimals(loanTerms.pricingData) // decimals
         );
 

diff --git a/src/enforcers/AstariaV1LenderEnforcer.sol b/src/enforcers/AstariaV1LenderEnforcer.sol
@@ -68,7 +68,7 @@ contract AstariaV1LenderEnforcer is LenderEnforcer {
         AstariaV1Lib.validateCompoundInterest(
             loanAmount,
             loanRate,
-            AstariaV1Lib.getBaseRecallRecallMax(loanTerms.statusData),
+            AstariaV1Lib.getBaseRecallMax(loanTerms.statusData),
             AstariaV1Lib.getBasePricingDecimals(loanTerms.pricingData)
         );
 

diff --git a/src/lib/AstariaV1Lib.sol b/src/lib/AstariaV1Lib.sol
@@ -90,7 +90,7 @@ library AstariaV1Lib {
         }
     }
 
-    function getBaseRecallRecallMax(bytes memory statusData) internal pure returns (uint256 recallMax) {
+    function getBaseRecallMax(bytes memory statusData) internal pure returns (uint256 recallMax) {
         assembly ("memory-safe") {
             recallMax := mload(add(0x80, statusData))
         }

diff --git a/src/pricing/AstariaV1Pricing.sol b/src/pricing/AstariaV1Pricing.sol
@@ -99,7 +99,7 @@ contract AstariaV1Pricing is CompoundInterestPricing {
         if (msg.sender == address(this)) {
             uint256 loanRate = abi.decode(loan.terms.pricingData, (BasePricing.Details)).rate;
             uint256 loanAmount = loan.debt[0].amount;
-            uint256 recallMax = AstariaV1Lib.getBaseRecallRecallMax(loan.terms.statusData);
+            uint256 recallMax = AstariaV1Lib.getBaseRecallMax(loan.terms.statusData);
             uint256 decimals = AstariaV1Lib.getBasePricingDecimals(loan.terms.pricingData);
 
             AstariaV1Lib.validateCompoundInterest(loanAmount, loanRate, recallMax, decimals);

diff --git a/src/status/BaseRecall.sol b/src/status/BaseRecall.sol
@@ -101,13 +101,10 @@ abstract contract BaseRecall {
      */
     function getRecallRate(Starport.Loan calldata loan) external view returns (uint256) {
         Details memory details = abi.decode(loan.terms.statusData, (Details));
-        BasePricing.Details memory pricingDetails = abi.decode(loan.terms.pricingData, (BasePricing.Details));
         uint256 loanId = loan.getId();
 
         // Calculates the porportion of time elapsed, then multiplies times the max rate
-        uint256 baseAdjustment = 10 ** pricingDetails.decimals;
-        uint256 ratio = (((block.timestamp - recalls[loanId].start) * baseAdjustment) / details.recallWindow);
-        return (details.recallMax * ratio) / baseAdjustment;
+        return details.recallMax * (block.timestamp - recalls[loanId].start) / details.recallWindow;
     }
 
     /**
+0 −1		.gitattributes
+1 −1		package.json
+0 −666		scripts/vm.py
+3 −11		src/StdChains.sol
+2 −2		src/StdCheats.sol
+33 −61		src/StdUtils.sol
+451 −797		src/Vm.sol
+0 −216		src/mocks/MockERC20.sol
+0 −221		src/mocks/MockERC721.sol
+6 −2		test/StdChains.t.sol
+1 −1		test/StdCheats.t.sol
+1 −3		test/StdError.t.sol
+2 −2		test/Vm.t.sol
+0 −441		test/mocks/MockERC20.t.sol
+0 −721		test/mocks/MockERC721.t.sol
+19 −18		.gas-snapshot
+1 −1		src/Starport.sol
+0 −0		src/interfaces/TokenReceiverInterface.sol
+39 −0		src/lib/StarportLib.sol
+39 −3		src/originators/StrategistOriginator.sol
+2 −0		src/settlement/DutchAuctionSettlement.sol
+1 −1		test/StarportTest.sol
+1 −29		test/unit-testing/TestStarport.sol
+35 −1		test/unit-testing/TestStrategistOriginator.sol