Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Review #2

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+1,745 −73
Open

Fix Review #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions ...enderCommitmentForwarder/extensions/LenderCommitmentGroup/LenderCommitmentGroupShares.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,13 @@ contract LenderCommitmentGroupShares is ERC20, Ownable {
uint256 amount
) internal override {

if (amount > 0) {
//reset prepared
poolSharesPreparedToWithdrawForLender[from] = 0;
poolSharesPreparedTimestamp[from] = block.timestamp;

}

//reset prepared
poolSharesPreparedToWithdrawForLender[from] = 0;
poolSharesPreparedTimestamp[from] = block.timestamp;

}

Expand Down
143 changes: 110 additions & 33 deletions ...enderCommitmentForwarder/extensions/LenderCommitmentGroup/LenderCommitmentGroup_Smart.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.0;


// Contracts
import "@openzeppelin/contracts-upgradeable/utils/AddressUpgradeable.sol";
import "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";
Expand Down Expand Up @@ -123,6 +124,7 @@ contract LenderCommitmentGroup_Smart is

uint256 public totalPrincipalTokensLended;
uint256 public totalPrincipalTokensRepaid; //subtract this and the above to find total principal tokens outstanding for loans
uint256 public excessivePrincipalTokensRepaid;

uint256 public totalInterestCollected;

Expand All @@ -142,6 +144,7 @@ contract LenderCommitmentGroup_Smart is

//mapping(address => uint256) public principalTokensCommittedByLender;
mapping(uint256 => bool) public activeBids;
mapping(uint256 => uint256) public activeBidsAmountDueRemaining;

//this excludes interest
// maybe it is possible to get rid of this storage slot and calculate it from totalPrincipalTokensRepaid, totalPrincipalTokensLended
Expand Down Expand Up @@ -434,8 +437,15 @@ contract LenderCommitmentGroup_Smart is
{

int256 poolTotalEstimatedValueSigned = int256(totalPrincipalTokensCommitted)
//+ int256( totalPrincipalTokensRepaid ) //cant really incorporate because needs totalPrincipalTokensLended to help balance it

+ int256(totalInterestCollected) + int256(tokenDifferenceFromLiquidations)
- int256(totalPrincipalTokensWithdrawn);
+ int256( excessivePrincipalTokensRepaid )
- int256( totalPrincipalTokensWithdrawn )
//- int256( totalPrincipalTokensLended ) //amount borrowed -- should not be incorporated as it does not really affect net value
;



//if the poolTotalEstimatedValue_ is less than 0, we treat it as 0.
poolTotalEstimatedValue_ = poolTotalEstimatedValueSigned > int256(0)
Expand Down Expand Up @@ -553,14 +563,15 @@ contract LenderCommitmentGroup_Smart is
"Insufficient Borrower Collateral"
);

principalToken.approve(address(TELLER_V2), _principalAmount);
principalToken.safeApprove(address(TELLER_V2), _principalAmount);

//do not have to override msg.sender as this contract is the lender !
_acceptBidWithRepaymentListener(_bidId);

totalPrincipalTokensLended += _principalAmount;

activeBids[_bidId] = true; //bool for now
activeBidsAmountDueRemaining[_bidId] = _principalAmount;


emit BorrowerAcceptedFunds(
Expand Down Expand Up @@ -661,7 +672,11 @@ contract LenderCommitmentGroup_Smart is

//use original principal amount as amountDue

uint256 amountDue = _getAmountOwedForBid(_bidId);
uint256 loanTotalPrincipalAmount = _getLoanTotalPrincipalAmount(_bidId); //only used for the auction delta amount

(uint256 principalDue,uint256 interestDue) = _getAmountOwedForBid(_bidId); //this is the base amount that must be repaid by the liquidator

// uint256 principalAmountAlreadyRepaid = loanTotalPrincipalAmount - principalDue;


uint256 loanDefaultedTimeStamp = ITellerV2(TELLER_V2)
Expand All @@ -673,10 +688,11 @@ contract LenderCommitmentGroup_Smart is
);

int256 minAmountDifference = getMinimumAmountDifferenceToCloseDefaultedLoan(
amountDue,
loanTotalPrincipalAmount,
loanDefaultedOrUnpausedAtTimeStamp
);


require(
_tokenAmountDifference >= minAmountDifference,
"Insufficient tokenAmountDifference"
Expand All @@ -687,7 +703,8 @@ contract LenderCommitmentGroup_Smart is
//this is used when the collateral value is higher than the principal (rare)
//the loan will be completely made whole and our contract gets extra funds too
uint256 tokensToTakeFromSender = abs(minAmountDifference);




uint256 liquidationProtocolFee = Math.mulDiv(
tokensToTakeFromSender ,
Expand All @@ -699,18 +716,22 @@ contract LenderCommitmentGroup_Smart is
IERC20(principalToken).safeTransferFrom(
msg.sender,
address(this),
amountDue + tokensToTakeFromSender - liquidationProtocolFee
principalDue + tokensToTakeFromSender - liquidationProtocolFee
);

address protocolFeeRecipient = ITellerV2(address(TELLER_V2)).getProtocolFeeRecipient();

IERC20(principalToken).safeTransferFrom(
msg.sender,
address(protocolFeeRecipient),
liquidationProtocolFee
);
if (liquidationProtocolFee > 0) {
IERC20(principalToken).safeTransferFrom(
msg.sender,
address(protocolFeeRecipient),
liquidationProtocolFee
);
}

totalPrincipalTokensRepaid += principalDue;

totalPrincipalTokensRepaid += amountDue;
// tokenDifferenceFromLiquidations += int256(principalAmountAlreadyRepaid); //this helps us more correctly calculate the shortfall
tokenDifferenceFromLiquidations += int256(tokensToTakeFromSender - liquidationProtocolFee );


Expand All @@ -719,34 +740,57 @@ contract LenderCommitmentGroup_Smart is

uint256 tokensToGiveToSender = abs(minAmountDifference);


IERC20(principalToken).safeTransferFrom(
msg.sender,
address(this),
amountDue - tokensToGiveToSender
);

totalPrincipalTokensRepaid += amountDue;

//dont stipend/refund more than principalDue base
if (tokensToGiveToSender > principalDue) {
tokensToGiveToSender = principalDue;
}

uint256 netAmountDue = principalDue - tokensToGiveToSender ;


if (netAmountDue > 0) {
IERC20(principalToken).safeTransferFrom(
msg.sender,
address(this),
netAmountDue //principalDue - tokensToGiveToSender
);
}

totalPrincipalTokensRepaid += principalDue;

//this will make tokenDifference go more negative
tokenDifferenceFromLiquidations -= int256(tokensToGiveToSender);

//this is the shortfall
// tokenDifferenceFromLiquidations += int256(principalAmountAlreadyRepaid);//this helps us more correctly calculate the shortfall
// tokenDifferenceFromLiquidations -= int256(tokensToGiveToSender);

// uint256 shortfallNet = principalDue < tokensToGiveToSender ? tokensToGiveToSender - principalDue : 0;

tokenDifferenceFromLiquidations -= int256(tokensToGiveToSender);



}

//this will effectively 'forfeit' tokens from this contract equal to ... the amount (principal) that has not been repaid ! principalDue


//this will give collateral to the caller
ITellerV2(TELLER_V2).lenderCloseLoanWithRecipient(_bidId, msg.sender);


emit DefaultedLoanLiquidated(
_bidId,
msg.sender,
amountDue,
principalDue,
_tokenAmountDifference
);
}



function getLastUnpausedAt()
public view
returns (uint256) {
Expand All @@ -766,18 +810,29 @@ contract LenderCommitmentGroup_Smart is
lastUnpausedAt = block.timestamp;
}

function _getLoanTotalPrincipalAmount(uint256 _bidId )
internal
view
virtual
returns (uint256 principalAmount)
{
(,,,, principalAmount, , , )
= ITellerV2(TELLER_V2).getLoanSummary(_bidId);


}



function _getAmountOwedForBid(uint256 _bidId )
internal
view
virtual
returns (uint256 amountDue)
returns (uint256 principal,uint256 interest)
{
(,,,, amountDue, , , )
= ITellerV2(TELLER_V2).getLoanSummary(_bidId);
Payment memory owed = ITellerV2(TELLER_V2).calculateAmountOwed(_bidId, block.timestamp );


return (owed.principal, owed.interest) ;
}


Expand Down Expand Up @@ -919,21 +974,39 @@ contract LenderCommitmentGroup_Smart is


/*
This callback occurs when a TellerV2 repayment happens or when a TellerV2 liquidate happens

lenderCloseLoan does not trigger a repayLoanCallback

It is important that only teller loans FOR THIS POOL can call this !
*/
@dev This callback occurs when a TellerV2 repayment happens or when a TellerV2 liquidate happens
@dev lenderCloseLoan does not trigger a repayLoanCallback
@dev It is important that only teller loans for this specific pool can call this
@dev It is important that this function does not revert even if paused since repayments can occur in this case
*/
function repayLoanCallback(
uint256 _bidId,
address repayer,
uint256 principalAmount,
uint256 interestAmount
) external onlyTellerV2 whenForwarderNotPaused whenNotPaused bidIsActiveForGroup(_bidId) {
totalPrincipalTokensRepaid += principalAmount;
) external onlyTellerV2 bidIsActiveForGroup(_bidId) {

uint256 amountDueRemaining = activeBidsAmountDueRemaining[_bidId];


uint256 principalAmountAppliedToAmountDueRemaining = principalAmount < amountDueRemaining ?
principalAmount : amountDueRemaining;


//should never fail due to the above .
activeBidsAmountDueRemaining[_bidId] -= principalAmountAppliedToAmountDueRemaining;


totalPrincipalTokensRepaid += principalAmountAppliedToAmountDueRemaining;
totalInterestCollected += interestAmount;


uint256 excessiveRepaymentAmount = principalAmount < amountDueRemaining ?
0 : (principalAmount - amountDueRemaining);

excessivePrincipalTokensRepaid += excessiveRepaymentAmount;


emit LoanRepaid(
_bidId,
repayer,
Expand Down Expand Up @@ -967,6 +1040,10 @@ contract LenderCommitmentGroup_Smart is
view
returns (uint256)
{
if (totalPrincipalTokensRepaid > totalPrincipalTokensLended) {
return 0;
}

return totalPrincipalTokensLended - totalPrincipalTokensRepaid;
}

Expand Down
22 changes: 7 additions & 15 deletions teller-protocol-v2-audit-2024/packages/contracts/contracts/MarketRegistry.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ contract MarketRegistry is
* @notice Removes a borrower from a market via delegated revocation.
* @dev See {_revokeStakeholderViaDelegation}.
*/
function revokeLender(
/* function revokeLender(
uint256 _marketId,
address _lenderAddress,
uint8 _v,
Expand All @@ -344,7 +344,7 @@ contract MarketRegistry is
_r,
_s
);
}
} */

/**
* @notice Allows a lender to voluntarily leave a market.
Expand Down Expand Up @@ -409,7 +409,7 @@ contract MarketRegistry is
* @notice Removes a borrower from a market via delegated revocation.
* @dev See {_revokeStakeholderViaDelegation}.
*/
function revokeBorrower(
/* function revokeBorrower(
uint256 _marketId,
address _borrowerAddress,
uint8 _v,
Expand All @@ -424,7 +424,7 @@ contract MarketRegistry is
_r,
_s
);
}
}*/

/**
* @notice Allows a borrower to voluntarily leave a market.
Expand Down Expand Up @@ -1180,16 +1180,8 @@ contract MarketRegistry is
// tellerAS.revoke(uuid);
}

/**
* @notice Removes a stakeholder from an market via delegated revocation.
* @param _marketId The market ID to remove the borrower from.
* @param _stakeholderAddress The address of the borrower to remove from the market.
* @param _isLender Boolean indicating if the stakeholder is a lender. Otherwise it is a borrower.
* @param _v Signature value
* @param _r Signature value
* @param _s Signature value
*/
function _revokeStakeholderViaDelegation(

/* function _revokeStakeholderViaDelegation(
uint256 _marketId,
address _stakeholderAddress,
bool _isLender,
Expand All @@ -1205,7 +1197,7 @@ contract MarketRegistry is
// NOTE: Disabling the call to revoke the attestation on EAS contracts
// address attestor = markets[_marketId].owner;
// tellerAS.revokeByDelegation(uuid, attestor, _v, _r, _s);
}
} */

/**
* @notice Removes a stakeholder (borrower/lender) from a market.
Expand Down
Loading