add tests for incremeneting caveatNonces, re add settlement test

.gas-snapshot

@@ -1,11 +1,11 @@
-DiffFuzzTestStarPortLib:testSpentToReceived((uint8,address,uint256,uint256)[]) (runs: 256, μ: 880523, ~: 883225)
-DiffFuzzTestStarPortLib:testUnboundSpentToReceived((uint8,address,uint256,uint256)[]) (runs: 256, μ: 232893, ~: 237832)
+DiffFuzzTestStarPortLib:testSpentToReceived((uint8,address,uint256,uint256)[]) (runs: 256, μ: 880457, ~: 882299)
+DiffFuzzTestStarPortLib:testUnboundSpentToReceived((uint8,address,uint256,uint256)[]) (runs: 256, μ: 232905, ~: 237832)
 IntegrationTestCaveats:testOriginateUnapprovedFulfiller() (gas: 341266)
 IntegrationTestCaveats:testOriginateWBorrowerApproval() (gas: 296157)
 IntegrationTestCaveats:testOriginateWCaveats() (gas: 272197)
-IntegrationTestCaveats:testOriginateWCaveatsIncrementedNonce() (gas: 198548)
+IntegrationTestCaveats:testOriginateWCaveatsIncrementedNonce() (gas: 200191)
 IntegrationTestCaveats:testOriginateWCaveatsInvalidSalt() (gas: 257806)
-IntegrationTestCaveats:testOriginateWCaveatsInvalidSaltManual() (gas: 174782)
+IntegrationTestCaveats:testOriginateWCaveatsInvalidSaltManual() (gas: 175868)
 IntegrationTestCaveats:testOriginateWLenderApproval() (gas: 296276)
 IntegrationTestCaveats:testRefinanceAsLender() (gas: 1056340)
 IntegrationTestCaveats:testRefinanceCaveatFailure() (gas: 422075)
@@ -36,30 +36,30 @@ TestAstariaV1Hook:testIsRecalledOutsideWindow() (gas: 560827)
 TestAstariaV1Hook:testRecallRateActiveRecall() (gas: 548487)
 TestAstariaV1Hook:testRecallRateEmptyRecall() (gas: 424392)
 TestAstariaV1Loan:testNewLoanERC721CollateralDefaultTermsRecallBase() (gas: 1016002)
-TestAstariaV1Loan:testNewLoanERC721CollateralDefaultTermsRecallLender() (gas: 719784)
-TestAstariaV1Loan:testNewLoanERC721CollateralDefaultTermsRecallLiquidation() (gas: 744900)
+TestAstariaV1Loan:testNewLoanERC721CollateralDefaultTermsRecallLender() (gas: 719993)
+TestAstariaV1Loan:testNewLoanERC721CollateralDefaultTermsRecallLiquidation() (gas: 747659)
 TestBorrowerEnforcer:testBERevertAdditionalTransfers() (gas: 73195)
 TestBorrowerEnforcer:testBERevertInvalidLoanTerms() (gas: 78316)
 TestBorrowerEnforcer:testBEValidLoanTerms() (gas: 69518)
 TestBorrowerEnforcer:testBEValidLoanTermsAnyIssuer() (gas: 69581)
 TestCustodian:testCannotLazyMintTwice() (gas: 76589)
 TestCustodian:testCannotMintInvalidLoanInvalidCustodian() (gas: 66861)
 TestCustodian:testCannotMintInvalidLoanValidCustodian() (gas: 72392)
-TestCustodian:testCustodySelector() (gas: 2625577)
+TestCustodian:testCustodySelector() (gas: 2718590)
 TestCustodian:testDefaultCustodySelectorRevert() (gas: 70083)
-TestCustodian:testGenerateOrderInvalidHandlerExecution() (gas: 132813)
+TestCustodian:testGenerateOrderInvalidHandlerExecution() (gas: 133022)
 TestCustodian:testGenerateOrderRepay() (gas: 173924)
 TestCustodian:testGenerateOrderRepayAsRepayApprovedBorrower() (gas: 199549)
 TestCustodian:testGenerateOrderRepayERC1155AndERC20AndNative() (gas: 868168)
-TestCustodian:testGenerateOrderRepayERC1155AndERC20AndNativeHandlerAuthorized() (gas: 793329)
+TestCustodian:testGenerateOrderRepayERC1155AndERC20AndNativeHandlerAuthorized() (gas: 793746)
 TestCustodian:testGenerateOrderRepayERC1155WithRevert() (gas: 532529)
 TestCustodian:testGenerateOrderRepayInvalidHookAddress() (gas: 90307)
 TestCustodian:testGenerateOrderRepayInvalidHookReturnType() (gas: 84624)
 TestCustodian:testGenerateOrderRepayNotBorrower() (gas: 96398)
-TestCustodian:testGenerateOrderSettlement() (gas: 151490)
-TestCustodian:testGenerateOrderSettlementHandlerAuthorized() (gas: 160486)
-TestCustodian:testGenerateOrderSettlementNoActiveLoan() (gas: 155707)
-TestCustodian:testGenerateOrderSettlementUnauthorized() (gas: 94177)
+TestCustodian:testGenerateOrderSettlement() (gas: 151699)
+TestCustodian:testGenerateOrderSettlementHandlerAuthorized() (gas: 160694)
+TestCustodian:testGenerateOrderSettlementNoActiveLoan() (gas: 155916)
+TestCustodian:testGenerateOrderSettlementUnauthorized() (gas: 94382)
 TestCustodian:testGetBorrower() (gas: 76322)
 TestCustodian:testInvalidAction() (gas: 114312)
 TestCustodian:testInvalidActionRepayInActiveLoan() (gas: 117261)
@@ -70,8 +70,8 @@ TestCustodian:testOnlySeaport() (gas: 17895)
 TestCustodian:testPayableFunctions() (gas: 41667)
 TestCustodian:testPreviewOrderNoActiveLoan() (gas: 98628)
 TestCustodian:testPreviewOrderRepay() (gas: 225769)
-TestCustodian:testPreviewOrderSettlement() (gas: 182722)
-TestCustodian:testPreviewOrderSettlementInvalidFufliller() (gas: 100546)
+TestCustodian:testPreviewOrderSettlement() (gas: 183136)
+TestCustodian:testPreviewOrderSettlementInvalidFufliller() (gas: 100751)
 TestCustodian:testPreviewOrderSettlementInvalidRepayer() (gas: 106676)
 TestCustodian:testRatifyOrder() (gas: 180093)
 TestCustodian:testSeaportMetadata() (gas: 8567)
@@ -91,44 +91,46 @@ TestLoanCombinations:testLoan721for20SimpleInterestDutchFixedRepay() (gas: 57304
 TestLoanCombinations:testLoanAstariaSettlementRepay() (gas: 562881)
 TestLoanCombinations:testLoanSimpleInterestEnglishFixed() (gas: 568355)
 TestLoanManager:testActive() (gas: 67048)
-TestLoanManager:testAdditionalTransfers() (gas: 295721)
-TestLoanManager:testCannotIssueSameLoanTwice() (gas: 337073)
-TestLoanManager:testCannotOriginateWhilePaused() (gas: 70886)
+TestLoanManager:testAdditionalTransfers() (gas: 295623)
+TestLoanManager:testCannotIssueSameLoanTwice() (gas: 336855)
+TestLoanManager:testCannotOriginateWhilePaused() (gas: 70834)
 TestLoanManager:testCannotSettleInvalidLoan() (gas: 72745)
 TestLoanManager:testCannotSettleUnlessValidCustodian() (gas: 68816)
-TestLoanManager:testCaveatEnforcerRevert() (gas: 124147)
-TestLoanManager:testDefaultFeeRake() (gas: 355182)
-TestLoanManager:testExoticDebtWithNoCaveatsNotAsBorrower() (gas: 345427)
+TestLoanManager:testCaveatEnforcerRevert() (gas: 124049)
+TestLoanManager:testDefaultFeeRake() (gas: 355038)
+TestLoanManager:testExoticDebtWithNoCaveatsNotAsBorrower() (gas: 371270)
+TestLoanManager:testIncrementCaveatNonce() (gas: 34560)
 TestLoanManager:testInitializedFlagSetProperly() (gas: 65344)
-TestLoanManager:testInvalidAmountCollateral() (gas: 157882)
-TestLoanManager:testInvalidAmountCollateral721() (gas: 158025)
-TestLoanManager:testInvalidAmountDebt() (gas: 182237)
-TestLoanManager:testInvalidIdentifierDebt() (gas: 202231)
-TestLoanManager:testInvalidItemType() (gas: 143930)
-TestLoanManager:testInvalidTransferLengthCollateral() (gas: 166116)
-TestLoanManager:testInvalidTransferLengthDebt() (gas: 170615)
+TestLoanManager:testInvalidAmountCollateral() (gas: 157784)
+TestLoanManager:testInvalidAmountCollateral721() (gas: 157949)
+TestLoanManager:testInvalidAmountDebt() (gas: 182139)
+TestLoanManager:testInvalidIdentifierDebt() (gas: 202133)
+TestLoanManager:testInvalidItemType() (gas: 143832)
+TestLoanManager:testInvalidTransferLengthCollateral() (gas: 166018)
+TestLoanManager:testInvalidTransferLengthDebt() (gas: 170605)
+TestLoanManager:testInvalidateCaveatSalt() (gas: 32830)
 TestLoanManager:testIssued() (gas: 67216)
 TestLoanManager:testName() (gas: 7206)
-TestLoanManager:testNonDefaultCustodianCustodyCallFails() (gas: 195345)
-TestLoanManager:testNonDefaultCustodianCustodyCallSuccess() (gas: 261108)
-TestLoanManager:testNonPayableFunctions() (gas: 180447)
-TestLoanManager:testOverrideFeeRake() (gas: 348943)
+TestLoanManager:testNonDefaultCustodianCustodyCallFails() (gas: 195269)
+TestLoanManager:testNonDefaultCustodianCustodyCallSuccess() (gas: 261010)
+TestLoanManager:testNonPayableFunctions() (gas: 180369)
+TestLoanManager:testOverrideFeeRake() (gas: 348799)
 TestLoanManager:testPause() (gas: 17164)
 TestLoanManager:testSupportsInterface() (gas: 9181)
 TestLoanManager:testSymbol() (gas: 7257)
-TestLoanManager:testTokenNoCodeCollateral() (gas: 142746)
-TestLoanManager:testTokenNoCodeDebt() (gas: 175846)
+TestLoanManager:testTokenNoCodeCollateral() (gas: 142648)
+TestLoanManager:testTokenNoCodeDebt() (gas: 175748)
 TestLoanManager:testTokenURI() (gas: 64879)
 TestLoanManager:testTokenURIInvalidLoan() (gas: 13296)
 TestLoanManager:testTransferFromFail() (gas: 80110)
-TestLoanManager:testUnpause() (gas: 16177)
-TestNewLoan:testBuyNowPayLater() (gas: 2832648)
+TestLoanManager:testUnpause() (gas: 16199)
+TestNewLoan:testBuyNowPayLater() (gas: 2832660)
 TestNewLoan:testNewLoanERC721CollateralDefaultTerms2() (gas: 394514)
 TestNewLoan:testNewLoanERC721CollateralLessDebtThanOffered() (gas: 2348)
 TestNewLoan:testNewLoanRefinanceNew() (gas: 207)
-TestNewLoan:testNewLoanViaOriginatorBorrowerApprovalAndLenderApproval() (gas: 301842)
-TestNewLoan:testNewLoanViaOriginatorLenderApproval() (gas: 356502)
-TestNewLoan:testSettleLoan() (gas: 252)
+TestNewLoan:testNewLoanViaOriginatorBorrowerApprovalAndLenderApproval() (gas: 301900)
+TestNewLoan:testNewLoanViaOriginatorLenderApproval() (gas: 356531)
+TestNewLoan:testSettleLoan() (gas: 630607)
 TestPausableNonReentrant:testNotOwner() (gas: 21254)
 TestPausableNonReentrant:testPauseAndUnpause() (gas: 22555)
 TestPausableNonReentrant:testReentrancy() (gas: 15360)
@@ -138,7 +140,7 @@ TestRefStarPortLib:testValidateSalt(address,bytes32) (runs: 256, μ: 33865, ~: 3
 TestRepayLoan:testRepayLoanApprovedRepayer() (gas: 646307)
 TestRepayLoan:testRepayLoanBase() (gas: 582601)
 TestRepayLoan:testRepayLoanGenerateOrderNotSeaport() (gas: 402435)
-TestRepayLoan:testRepayLoanInSettlement() (gas: 543343)
+TestRepayLoan:testRepayLoanInSettlement() (gas: 545252)
 TestRepayLoan:testRepayLoanInvalidRepayer() (gas: 562730)
 TestRepayLoan:testRepayLoanThatDoesNotExist() (gas: 851564)
 TestStarPortLib:testSpentToReceived() (gas: 13315)

src/Custodian.sol

@@ -226,6 +226,7 @@ contract Custodian is ERC721, ContractOffererInterface {
 
             _beforeGetSettlement(loan);
             (consideration, authorized) = SettlementHandler(loan.terms.handler).getSettlement(loan);
+            consideration = StarPortLib.removeZeroAmountItems(consideration);
             _afterGetSettlement(loan);
             if (authorized == address(0) || fulfiller == authorized) {
                 offer = loan.collateral;
@@ -315,7 +316,7 @@ contract Custodian is ERC721, ContractOffererInterface {
         } else if (action == Actions.Settlement && !loanActive) {
             address authorized;
             (consideration, authorized) = SettlementHandler(loan.terms.handler).getSettlement(loan);
-
+            consideration = StarPortLib.removeZeroAmountItems(consideration);
             if (authorized == address(0) || fulfiller == authorized) {
                 offer = loan.collateral;
             } else if (authorized == loan.terms.handler || authorized == loan.issuer) {} else {

src/LoanManager.sol

@@ -27,17 +27,10 @@ import {ItemType, OfferItem, Schema, SpentItem, ReceivedItem} from "seaport-type
 
 import {ConsiderationInterface} from "seaport-types/src/interfaces/ConsiderationInterface.sol";
 import {FixedPointMathLib} from "solady/src/utils/FixedPointMathLib.sol";
-import {Originator} from "starport-core/originators/Originator.sol";
-import {SettlementHook} from "starport-core/hooks/SettlementHook.sol";
-import {SettlementHandler} from "starport-core/handlers/SettlementHandler.sol";
 import {Pricing} from "starport-core/pricing/Pricing.sol";
-
 import {StarPortLib, Actions} from "starport-core/lib/StarPortLib.sol";
 import {AdditionalTransfer} from "starport-core/lib/StarPortLib.sol";
-import {ConduitControllerInterface} from "seaport-types/src/interfaces/ConduitControllerInterface.sol";
-import {ConduitInterface} from "seaport-types/src/interfaces/ConduitInterface.sol";
 import {Custodian} from "starport-core/Custodian.sol";
-import {ECDSA} from "solady/src/utils/ECDSA.sol";
 import {SignatureCheckerLib} from "solady/src/utils/SignatureCheckerLib.sol";
 import {CaveatEnforcer} from "starport-core/enforcers/CaveatEnforcer.sol";
 import {Ownable} from "solady/src/auth/Ownable.sol";
@@ -118,6 +111,8 @@ contract LoanManager is ERC721, PausableNonReentrant {
 
     event Close(uint256 loanId);
     event Open(uint256 loanId, LoanManager.Loan loan);
+    event CaveatNonceIncremented(uint256 newNonce);
+    event CaveatSaltInvalidated(bytes32 invalidatedSalt);
 
     error InvalidRefinance();
     error InvalidCustodian();
@@ -454,11 +449,14 @@ contract LoanManager is ERC721, PausableNonReentrant {
     }
 
     function incrementCaveatNonce() external {
-        ++caveatNonces[msg.sender];
+        uint256 newNonce = caveatNonces[msg.sender] + uint256(blockhash(block.number - 1) << 0x80);
+        caveatNonces[msg.sender] = newNonce;
+        emit CaveatNonceIncremented(newNonce);
     }
 
     function invalidateCaveatSalt(bytes32 salt) external {
         invalidHashes[msg.sender][salt] = true;
+        emit CaveatSaltInvalidated(salt);
     }
 
     /**

src/lib/StarPortLib.sol

@@ -213,6 +213,36 @@ library StarPortLib {
         }
     }
 
+    function removeZeroAmountItems(ReceivedItem[] memory consideration)
+        internal
+        view
+        returns (ReceivedItem[] memory newConsideration)
+    {
+        uint256 j = 0;
+        newConsideration = new ReceivedItem[](consideration.length);
+        for (uint256 i = 0; i < consideration.length;) {
+            if (consideration[i].amount > 0) {
+                newConsideration[j] = ReceivedItem({
+                    itemType: consideration[i].itemType,
+                    identifier: consideration[i].identifier,
+                    amount: consideration[i].amount,
+                    token: consideration[i].token,
+                    recipient: consideration[i].recipient
+                });
+
+                unchecked {
+                    j++;
+                }
+            }
+            unchecked {
+                ++i;
+            }
+        }
+        assembly {
+            mstore(newConsideration, j)
+        }
+    }
+
     function transferAdditionalTransfers(AdditionalTransfer[] memory transfers) internal {
         uint256 i = 0;
         uint256 amount = 0;

test/integration-testing/TestCaveats.sol

@@ -87,6 +87,7 @@ contract IntegrationTestCaveats is StarPortTest, DeepEq, MockCall {
 
         _setApprovalsForSpentItems(lender.addr, loan.debt);
 
+        vm.roll(5);
         vm.prank(borrower.addr);
         LM.incrementCaveatNonce();