Merge Train R2

packages/contracts/contracts/CollateralManager.sol

@@ -70,6 +70,14 @@ contract CollateralManager is OwnableUpgradeable, ICollateralManager {
         _;
     }
 
+     modifier onlyProtocolOwner() {
+
+        address protocolOwner = OwnableUpgradeable(address(tellerV2)).owner();
+
+        require(_msgSender() == protocolOwner, "Sender not authorized");
+        _;
+    }
+
     /* External Functions */
 
     /**
@@ -264,6 +272,20 @@ contract CollateralManager is OwnableUpgradeable, ICollateralManager {
         emit CollateralClaimed(_bidId);
     }
 
+     function withdrawDustTokens(
+        uint256 _bidId,  
+        address _tokenAddress, 
+        uint256 _amount,
+        address _recipientAddress
+        ) external onlyProtocolOwner {
+
+            ICollateralEscrowV1(_escrows[_bidId]).withdrawDustTokens(
+                    _tokenAddress,
+                    _amount,
+                    _recipientAddress
+                );
+        }
+
     /**
      * @notice Withdraws deposited collateral from the created escrow of a bid that has been CLOSED after being defaulted.
      * @param _bidId The id of the bid to withdraw collateral for.
@@ -282,6 +304,24 @@ contract CollateralManager is OwnableUpgradeable, ICollateralManager {
         }
     }
 
+        /**
+     * @notice Withdraws deposited collateral from the created escrow of a bid that has been CLOSED after being defaulted.
+     * @param _bidId The id of the bid to withdraw collateral for.
+     */
+      function lenderClaimCollateralWithRecipient(uint256 _bidId, address _collateralRecipient) external onlyTellerV2 {
+        if (isBidCollateralBacked(_bidId)) {
+            BidState bidState = tellerV2.getBidState(_bidId);
+
+            require(
+                bidState == BidState.CLOSED,
+                "Loan has not been liquidated"
+            );
+
+            _withdraw(_bidId, _collateralRecipient);
+            emit CollateralClaimed(_bidId);
+        }
+    }
+
     /**
      * @notice Sends the deposited collateral to a liquidator of a bid.
      * @notice Can only be called by the protocol.

packages/contracts/contracts/LenderCommitmentForwarder/LenderCommitmentForwarder_G2.sol

@@ -477,7 +477,7 @@ contract LenderCommitmentForwarder_G2 is
         );
 
         require(
-            commitmentPrincipalAccepted[bidId] <= commitment.maxPrincipal,
+            commitmentPrincipalAccepted[_commitmentId] <= commitment.maxPrincipal,
             "Invalid loan max principal"
         );
 

packages/contracts/contracts/LenderCommitmentForwarder/LenderCommitmentForwarder_U1.sol

@@ -521,7 +521,7 @@ contract LenderCommitmentForwarder_U1 is
         );
 
         require(
-            commitmentPrincipalAccepted[bidId] <= commitment.maxPrincipal,
+            commitmentPrincipalAccepted[_commitmentId] <= commitment.maxPrincipal,
             "Invalid loan max principal"
         );
 

packages/contracts/contracts/LenderCommitmentForwarder/SmartCommitmentForwarder.sol

@@ -2,13 +2,19 @@
 pragma solidity ^0.8.0;
 
 import "../TellerV2MarketForwarder_G3.sol";
-
+import "./extensions/ExtensionsContextUpgradeable.sol";
 import "../interfaces/ILenderCommitmentForwarder.sol";
+import "../interfaces/ISmartCommitmentForwarder.sol";
 import "./LenderCommitmentForwarder_G1.sol";
 
 import { CommitmentCollateralType, ISmartCommitment } from "../interfaces/ISmartCommitment.sol";
 
-contract SmartCommitmentForwarder is TellerV2MarketForwarder_G3 {
+
+contract SmartCommitmentForwarder is
+   ExtensionsContextUpgradeable, //this should always be first for upgradeability
+    TellerV2MarketForwarder_G3,
+    ISmartCommitmentForwarder
+     {
     event ExercisedSmartCommitment(
         address indexed smartCommitmentAddress,
         address borrower,
@@ -35,7 +41,7 @@ contract SmartCommitmentForwarder is TellerV2MarketForwarder_G3 {
      * @param _loanDuration The overall duration for the loan.  Must be longer than market payment cycle duration.
      * @return bidId The ID of the loan that was created on TellerV2
      */
-    function acceptCommitmentWithRecipient(
+    function acceptSmartCommitmentWithRecipient(
         address _smartCommitmentAddress,
         uint256 _principalAmount,
         uint256 _collateralAmount,
@@ -153,4 +159,18 @@ contract SmartCommitmentForwarder is TellerV2MarketForwarder_G3 {
 
         revert("Unknown Collateral Type");
     }
+
+
+
+        //Overrides
+    function _msgSender()
+        internal
+        view
+        virtual
+        override(ContextUpgradeable, ExtensionsContextUpgradeable)
+        returns (address sender)
+    {
+        return ExtensionsContextUpgradeable._msgSender();
+    }
+
 }

packages/contracts/contracts/LenderCommitmentForwarder/extensions/FlashRolloverLoan_G5.sol

@@ -115,6 +115,7 @@ contract FlashRolloverLoan_G5 is IFlashLoanSimpleReceiver, IFlashRolloverLoan_G4
             );
         }
 
+
         // Call 'Flash' on the vault to borrow funds and call tellerV2FlashCallback
         // This ultimately calls executeOperation
         IPool(POOL()).flashLoanSimple(
@@ -132,6 +133,14 @@ contract FlashRolloverLoan_G5 is IFlashLoanSimpleReceiver, IFlashRolloverLoan_G4
             ),
             0 //referral code
         );
+
+
+        ///have to set approval to zero AFTER we repay the flash loan to aave 
+        IERC20Upgradeable(lendingToken).approve(
+            address(POOL()),
+            0
+        );
+
     }
 
     /**
@@ -246,6 +255,11 @@ contract FlashRolloverLoan_G5 is IFlashLoanSimpleReceiver, IFlashRolloverLoan_G4
         );
         TELLER_V2.repayLoanFull(_bidId);
 
+        IERC20Upgradeable(_principalToken).approve(
+            address(TELLER_V2),
+            0
+        );
+
         uint256 fundsAfterRepayment = IERC20Upgradeable(_principalToken)
             .balanceOf(address(this));