Merge pull request #171 from mysofinance/peer-to-pool-zero-amount-fixes

fixed zero input amounts
mysofinance · Apr 13, 2023 · 7755e69 · 7755e69
2 parents 3b9b9fc + 3080fd9
commit 7755e69
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/contracts/Errors.sol b/contracts/Errors.sol
@@ -19,6 +19,7 @@ library Errors {
     error InvalidOffChainSignature();
     error InvalidOffChainMerkleProof();
     error InvalidCollUnlock();
+    error InvalidAmount();
     error UnknownOnChainQuote();
     error NeitherTokenIsGOHM();
     error NoLpTokens();

diff --git a/contracts/peer-to-pool/DataTypesPeerToPool.sol b/contracts/peer-to-pool/DataTypesPeerToPool.sol
@@ -11,8 +11,6 @@ library DataTypesPeerToPool {
         uint128 collTokenDueIfConverted;
         // Timestamp when repayment is due
         uint40 dueTimestamp;
-        // Flag whether given period is considered repaid
-        bool repaid;
     }
 
     struct LoanTerms {

diff --git a/contracts/peer-to-pool/FundingPool.sol b/contracts/peer-to-pool/FundingPool.sol
@@ -30,6 +30,9 @@ contract FundingPool is IFundingPool {
     }
 
     function deposit(uint256 amount, uint256 transferFee) external {
+        if (amount == 0) {
+            revert Errors.InvalidSendAmount();
+        }
         uint256 preBal = IERC20Metadata(depositToken).balanceOf(address(this));
         IERC20Metadata(depositToken).safeTransferFrom(
             msg.sender,
@@ -44,14 +47,17 @@ contract FundingPool is IFundingPool {
     }
 
     function withdraw(uint256 amount) external {
-        if (amount > balanceOf[msg.sender]) {
+        if (amount == 0 || amount > balanceOf[msg.sender]) {
             revert Errors.InvalidWithdrawAmount();
         }
         balanceOf[msg.sender] -= amount;
         IERC20Metadata(depositToken).safeTransfer(msg.sender, amount);
     }
 
     function subscribe(address loanProposal, uint256 amount) external {
+        if (amount == 0) {
+            revert Errors.InvalidAmount();
+        }
         if (
             !ILoanProposalFactory(loanProposalFactory).isLoanProposal(
                 loanProposal
@@ -82,6 +88,9 @@ contract FundingPool is IFundingPool {
     }
 
     function unsubscribe(address loanProposal, uint256 amount) external {
+        if (amount == 0) {
+            revert Errors.InvalidAmount();
+        }
         if (
             !ILoanProposalFactory(loanProposalFactory).isLoanProposal(
                 loanProposal

diff --git a/test/peer-to-pool/local-tests.ts b/test/peer-to-pool/local-tests.ts
@@ -1739,10 +1739,6 @@ describe('Peer-to-Pool: Local Tests', function () {
     dynamicData = await loanProposal.dynamicData()
     expect(dynamicData.currentRepaymentIdx).to.be.equal(0)
 
-    // check that repayment is not marked as repaid
-    const preRepayLoanTermsState = await loanProposal.loanTerms()
-    expect(preRepayLoanTermsState.repaymentSchedule[0].repaid).to.be.false
-
     // approve and repay
     let totalConvertedSubscriptionsOfPeriod = await loanProposal.totalConvertedSubscriptionsPerIdx(0)
     let originalRepaymentAmountDue = finalLoanTerms.repaymentSchedule[0].loanTokenDue