feat: delete claim transfer param on payment (#88)

bengobeil · web-flow · commit d8d18e810ea9 · 2025-08-18T12:35:07.000-03:00
diff --git a/src/BullaClaimV2.sol b/src/BullaClaimV2.sol
@@ -159,7 +159,6 @@ contract BullaClaimV2 is ERC721, Ownable, BoringBatchable, IBullaClaimV2 {
             if (params.token != address(0)) claim.token = params.token;
             if (controller != address(0)) claim.controller = controller;
             if (params.binding != ClaimBinding.Unbound) claim.binding = params.binding;
-            if (params.payerReceivesClaimOnPayment) claim.payerReceivesClaimOnPayment = true;
             if (params.dueBy != 0) claim.dueBy = uint40(params.dueBy);
             if (params.impairmentGracePeriod != 0) claim.impairmentGracePeriod = uint40(params.impairmentGracePeriod);
         }
@@ -268,9 +267,6 @@ contract BullaClaimV2 is ERC721, Ownable, BoringBatchable, IBullaClaimV2 {
         claimStorage.status = claimPaid ? Status.Paid : Status.Repaying;
 
         emit ClaimPayment(claimId, from, paymentAmount, totalPaidAmount);
-
-        // transfer the ownership of the claim NFT to the payee as a receipt of their completed payment
-        if (claim.payerReceivesClaimOnPayment && claimPaid) _transfer(claim.creditor, from, claimId);
     }
 
     /**
@@ -465,7 +461,6 @@ contract BullaClaimV2 is ERC721, Ownable, BoringBatchable, IBullaClaimV2 {
             paidAmount: uint256(claimStorage.paidAmount),
             status: claimStorage.status,
             binding: claimStorage.binding,
-            payerReceivesClaimOnPayment: claimStorage.payerReceivesClaimOnPayment,
             debtor: claimStorage.debtor,
             creditor: _ownerOf(claimId),
             token: claimStorage.token,
diff --git a/src/BullaFrendLendV2.sol b/src/BullaFrendLendV2.sol
@@ -128,7 +128,6 @@ contract BullaFrendLendV2 is BullaClaimControllerBase, BoringBatchable, ERC165,
             paidAmount: claim.paidAmount,
             status: claim.status,
             binding: claim.binding,
-            payerReceivesClaimOnPayment: claim.payerReceivesClaimOnPayment,
             debtor: claim.debtor,
             creditor: claim.creditor,
             token: claim.token,
@@ -295,7 +294,6 @@ contract BullaFrendLendV2 is BullaClaimControllerBase, BoringBatchable, ERC165,
             description: offer.params.description,
             token: offer.params.token,
             binding: ClaimBinding.Bound, // Loans are bound claims, avoiding the 1 wei transfer used in V1
-            payerReceivesClaimOnPayment: true,
             dueBy: block.timestamp + offer.params.termLength,
             impairmentGracePeriod: offer.params.impairmentGracePeriod
         });
diff --git a/src/BullaInvoice.sol b/src/BullaInvoice.sol
@@ -89,7 +89,6 @@ contract BullaInvoice is BullaClaimControllerBase, BoringBatchable, ERC165, IBul
             paidAmount: claim.paidAmount,
             status: claim.status,
             binding: claim.binding,
-            payerReceivesClaimOnPayment: claim.payerReceivesClaimOnPayment,
             debtor: claim.debtor,
             creditor: claim.creditor,
             token: claim.token,
@@ -199,7 +198,6 @@ contract BullaInvoice is BullaClaimControllerBase, BoringBatchable, ERC165, IBul
             description: params.description,
             token: params.token,
             binding: params.binding,
-            payerReceivesClaimOnPayment: params.payerReceivesClaimOnPayment,
             dueBy: params.dueBy,
             impairmentGracePeriod: params.impairmentGracePeriod
         });
@@ -286,7 +284,7 @@ contract BullaInvoice is BullaClaimControllerBase, BoringBatchable, ERC165, IBul
             revert PayingZero();
         }
 
-        // need to check this because calling bulla claim since it might transfer the claim to the creditor if `payerReceivesClaimOnPayment` is true
+        // Store the creditor address before making the payment
         address creditor = _bullaClaim.ownerOf(claimId);
 
         // Calculate protocol fee from interest only
diff --git a/src/interfaces/IBullaFrendLendV2.sol b/src/interfaces/IBullaFrendLendV2.sol
@@ -36,7 +36,6 @@ struct Loan {
     uint256 paidAmount;
     Status status;
     ClaimBinding binding;
-    bool payerReceivesClaimOnPayment;
     address debtor;
     address creditor;
     address token;
diff --git a/src/interfaces/IBullaInvoice.sol b/src/interfaces/IBullaInvoice.sol
@@ -14,7 +14,6 @@ struct Invoice {
     address token;
     Status status;
     ClaimBinding binding;
-    bool payerReceivesClaimOnPayment;
     PurchaseOrderState purchaseOrder;
     InterestConfig lateFeeConfig;
     InterestComputationState interestComputationState;
@@ -44,7 +43,6 @@ struct CreateInvoiceParams {
     string description;
     address token;
     ClaimBinding binding;
-    bool payerReceivesClaimOnPayment;
     InterestConfig lateFeeConfig;
     uint256 impairmentGracePeriod;
     uint256 depositAmount;
diff --git a/src/types/Types.sol b/src/types/Types.sol
@@ -42,7 +42,6 @@ struct CreateClaimParams {
     string description;
     address token;
     ClaimBinding binding;
-    bool payerReceivesClaimOnPayment;
     uint256 dueBy;
     uint256 impairmentGracePeriod; // seconds after dueBy that claim cannot be impaired
 }
@@ -61,7 +60,6 @@ struct ClaimStorage {
     address controller;
     Status status;
     ClaimBinding binding; // the debtor can allow themselves to be bound to a claim, which makes a claim unrejectable
-    bool payerReceivesClaimOnPayment; // an optional flag which allows the token to be transferred to the payer, acting as a "receipt NFT"
     uint40 dueBy; // when the claim is due (0 means no due date)
     uint40 impairmentGracePeriod; // seconds after dueBy that claim cannot be impaired
 } // takes 5 storage slots
@@ -79,7 +77,6 @@ struct Claim {
     address controller;
     Status status;
     ClaimBinding binding;
-    bool payerReceivesClaimOnPayment;
 }
 
 ////// APPROVALS //////
diff --git a/test/foundry/BullaClaim/BatchFunctionality.t.sol b/test/foundry/BullaClaim/BatchFunctionality.t.sol
@@ -210,10 +210,10 @@ contract TestBatchFunctionality is BullaClaimTestHelper {
         assertEq(uint256(claim2.status), uint256(Status.Paid));
         assertEq(uint256(claim3.status), uint256(Status.Paid));
 
-        // Verify NFT ownership transferred to payer
-        assertEq(bullaClaim.ownerOf(claimId1), debtor);
-        assertEq(bullaClaim.ownerOf(claimId2), debtor);
-        assertEq(bullaClaim.ownerOf(claimId3), debtor);
+        // Verify NFT ownership remains with creditor
+        assertEq(bullaClaim.ownerOf(claimId1), creditor);
+        assertEq(bullaClaim.ownerOf(claimId2), creditor);
+        assertEq(bullaClaim.ownerOf(claimId3), creditor);
     }
 
     function testBatch_PayMultipleClaims_ETH() public {
diff --git a/test/foundry/BullaClaim/BullaClaimTestHelper.sol b/test/foundry/BullaClaim/BullaClaimTestHelper.sol
@@ -26,7 +26,6 @@ contract BullaClaimTestHelper is Test {
                 description: "",
                 binding: ClaimBinding.Unbound,
                 claimAmount: 1 ether,
-                payerReceivesClaimOnPayment: true,
                 dueBy: 0,
                 impairmentGracePeriod: 0
             })
@@ -44,7 +43,6 @@ contract BullaClaimTestHelper is Test {
                 description: "",
                 binding: ClaimBinding.Unbound,
                 claimAmount: 1 ether,
-                payerReceivesClaimOnPayment: true,
                 dueBy: 0,
                 impairmentGracePeriod: 0
             })
@@ -64,7 +62,6 @@ contract BullaClaimTestHelper is Test {
                 description: "",
                 binding: ClaimBinding.Unbound,
                 claimAmount: 1 ether,
-                payerReceivesClaimOnPayment: true,
                 dueBy: 0,
                 impairmentGracePeriod: 0
             }),
diff --git a/test/foundry/BullaClaim/CreateClaim/CreateClaim.t.sol b/test/foundry/BullaClaim/CreateClaim/CreateClaim.t.sol
@@ -232,8 +232,7 @@ contract TestCreateClaim is BullaClaimTestHelper {
         address _debtor,
         uint128 claimAmount,
         address token,
-        uint8 binding,
-        bool payerReceivesClaimOnPayment
+        uint8 binding
     ) public {
         vm.assume(_creditor != address(0));
         vm.assume(claimAmount > 0);
@@ -249,7 +248,7 @@ contract TestCreateClaim is BullaClaimTestHelper {
         CreateClaimParams memory params = new CreateClaimParamsBuilder().withCreditor(_creditor).withDebtor(_debtor)
             .withClaimAmount(claimAmount).withToken(token).withDescription("test description").withBinding(
             ClaimBinding(binding)
-        ).withPayerReceivesClaimOnPayment(payerReceivesClaimOnPayment).build();
+        ).build();
 
         vm.startPrank(creator);
         vm.expectEmit(true, true, true, true);
@@ -278,7 +277,7 @@ contract TestCreateClaim is BullaClaimTestHelper {
             assertTrue(claim.status == Status.Pending);
             assertEq(claim.claimAmount, claimAmount);
             assertEq(claim.debtor, _debtor);
-            assertEq(claim.payerReceivesClaimOnPayment, payerReceivesClaimOnPayment);
+
             assertTrue(claim.binding == ClaimBinding(binding));
             assertEq(claim.token, token);
             assertEq(bullaClaim.balanceOf(_creditor), creditorBalanceBefore + 1);
diff --git a/test/foundry/BullaClaim/CreateClaimParamsBuilder.sol b/test/foundry/BullaClaim/CreateClaimParamsBuilder.sol
@@ -10,7 +10,6 @@ contract CreateClaimParamsBuilder {
     string private _description;
     address private _token;
     ClaimBinding private _binding;
-    bool private _payerReceivesClaimOnPayment;
     uint256 private _dueBy;
     uint256 private _impairmentGracePeriod;
 
@@ -22,7 +21,6 @@ contract CreateClaimParamsBuilder {
         _description = "Test Claim";
         _token = address(0); // ETH by default
         _binding = ClaimBinding.Unbound;
-        _payerReceivesClaimOnPayment = true;
         _dueBy = 0; // No due date by default
         _impairmentGracePeriod = 7 days; // 7 days grace period by default
     }
@@ -57,11 +55,6 @@ contract CreateClaimParamsBuilder {
         return this;
     }
 
-    function withPayerReceivesClaimOnPayment(bool payerReceivesClaim) public returns (CreateClaimParamsBuilder) {
-        _payerReceivesClaimOnPayment = payerReceivesClaim;
-        return this;
-    }
-
     function withDueBy(uint256 dueBy) public returns (CreateClaimParamsBuilder) {
         _dueBy = dueBy;
         return this;
@@ -80,7 +73,6 @@ contract CreateClaimParamsBuilder {
             description: _description,
             token: _token,
             binding: _binding,
-            payerReceivesClaimOnPayment: _payerReceivesClaimOnPayment,
             dueBy: _dueBy,
             impairmentGracePeriod: _impairmentGracePeriod
         });
diff --git a/test/foundry/BullaClaim/PayClaim/PayClaim.t.sol b/test/foundry/BullaClaim/PayClaim/PayClaim.t.sol
@@ -81,28 +81,12 @@ contract TestPayClaimWithFee is BullaClaimTestHelper {
         // assert the creditor received the full payment amount
         assertEq(weth.balanceOf(creditor), creditorBalanceBefore + paymentAmount);
 
-        // assert the NFT is transferred to the payer
-        assertEq(bullaClaim.ownerOf(claimId), address(debtor));
+        // assert the NFT remains with the creditor after payment
+        assertEq(bullaClaim.ownerOf(claimId), address(creditor));
         // assert we change the status to paid
         assertEq(uint256(claim.status), uint256(Status.Paid));
     }
 
-    function testPayClaimWithNoTransferFlag() public {
-        vm.startPrank(creditor);
-        uint256 claimId = bullaClaim.createClaim(
-            new CreateClaimParamsBuilder().withCreditor(creditor).withDebtor(debtor).withPayerReceivesClaimOnPayment(
-                false
-            ).build()
-        );
-        vm.stopPrank();
-
-        vm.prank(debtor);
-        bullaClaim.payClaim{value: 1 ether}(claimId, 1 ether);
-
-        assertEq(bullaClaim.balanceOf(creditor), 1);
-        assertEq(bullaClaim.ownerOf(claimId), creditor);
-    }
-
     // same as above but payable for native token transfers
     function testPaymentNoFee_native() public {
         uint256 CLAIM_AMOUNT = 100 ether;
@@ -123,7 +107,7 @@ contract TestPayClaimWithFee is BullaClaimTestHelper {
         assertEq(debtor.balance, debtorBalanceBefore - paymentAmount);
         assertEq(creditor.balance, creditorBalanceBefore + paymentAmount);
 
-        assertEq(bullaClaim.ownerOf(claimId), address(debtor));
+        assertEq(bullaClaim.ownerOf(claimId), address(creditor));
         assertEq(uint256(claim.status), uint256(Status.Paid));
     }
 
@@ -142,10 +126,7 @@ contract TestPayClaimWithFee is BullaClaimTestHelper {
 
         vm.startPrank(controller);
         bullaClaim.createClaimFrom(
-            userAddress,
-            new CreateClaimParamsBuilder().withCreditor(userAddress).withDebtor(debtor).withPayerReceivesClaimOnPayment(
-                false
-            ).build()
+            userAddress, new CreateClaimParamsBuilder().withCreditor(userAddress).withDebtor(debtor).build()
         );
         vm.stopPrank();
 
@@ -257,8 +238,8 @@ contract TestPayClaimWithFee is BullaClaimTestHelper {
         bullaClaim.payClaim(claimId, 1 ether);
         vm.stopPrank();
 
-        // Check ownership transferred but originalCreditor preserved
-        assertEq(bullaClaim.ownerOf(claimId), debtor);
+        // Check ownership remains with creditor and originalCreditor preserved
+        assertEq(bullaClaim.ownerOf(claimId), creditor);
         Claim memory claim = bullaClaim.getClaim(claimId);
         assertEq(claim.originalCreditor, creditor);
         assertTrue(claim.status == Status.Paid);
diff --git a/test/foundry/BullaClaim/PayClaim/PayClaimFrom.t.sol b/test/foundry/BullaClaim/PayClaim/PayClaimFrom.t.sol
@@ -117,8 +117,7 @@ contract TestPayClaimFrom is BullaClaimTestHelper {
     function testPayClaimFromWithNativeToken() public {
         vm.deal(controller, 1 ether);
 
-        CreateClaimParams memory params = new CreateClaimParamsBuilder().withCreditor(user2).withDebtor(user)
-            .withPayerReceivesClaimOnPayment(true).build();
+        CreateClaimParams memory params = new CreateClaimParamsBuilder().withCreditor(user2).withDebtor(user).build();
 
         vm.prank(controller);
         uint256 claimId = bullaClaim.createClaimFrom(user2, params);
diff --git a/test/foundry/BullaClaim/PayClaim/PayClaimWithWeirdTokens.t.sol b/test/foundry/BullaClaim/PayClaim/PayClaimWithWeirdTokens.t.sol
@@ -154,7 +154,7 @@ contract TestPayClaimWithWeirdTokens is Test {
         assertEq(feeToken.balanceOf(debtor), debtorBalanceBefore - CLAIM_AMOUNT);
         assertEq(feeToken.balanceOf(creditor), creditorBalanceBefore + CLAIM_AMOUNT - tokenFeeAmount);
 
-        assertEq(bullaClaim.ownerOf(claimId_creditorFee), address(debtor));
+        assertEq(bullaClaim.ownerOf(claimId_creditorFee), address(creditor));
         assertEq(uint256(claim.status), uint256(Status.Paid));
 
         // ensure debtor fee
@@ -177,7 +177,7 @@ contract TestPayClaimWithWeirdTokens is Test {
         assertEq(feeToken.balanceOf(debtor), debtorBalanceBefore - CLAIM_AMOUNT);
         assertEq(feeToken.balanceOf(creditor), creditorBalanceBefore + CLAIM_AMOUNT - tokenFeeAmount);
 
-        assertEq(bullaClaim.ownerOf(claimId_debtorFee), address(debtor));
+        assertEq(bullaClaim.ownerOf(claimId_debtorFee), address(creditor));
         assertEq(uint256(claim.status), uint256(Status.Paid));
     }
 }
diff --git a/test/foundry/BullaClaim/TestInvariants.t.sol b/test/foundry/BullaClaim/TestInvariants.t.sol
@@ -222,8 +222,8 @@ contract TestInvariants is Test {
             assertEq(weth.balanceOf(charlie), creditorBalanceBefore + paymentAmount);
             assertEq(weth.balanceOf(debtor), debtorBalanceBefore - paymentAmount);
             assertEq(bullaClaim.balanceOf(alice), 0);
-            assertEq(bullaClaim.ownerOf(claimId), debtor);
-            assertEq(bullaClaim.balanceOf(debtor), 1);
+            assertEq(bullaClaim.ownerOf(claimId), charlie);
+            assertEq(bullaClaim.balanceOf(charlie), 1);
             assertEq(bullaClaim.currentClaimId(), claimId + 1);
         }
     }
diff --git a/test/foundry/BullaInvoice/BatchFunctionality.t.sol b/test/foundry/BullaInvoice/BatchFunctionality.t.sol
@@ -219,10 +219,10 @@ contract TestBullaInvoiceBatchFunctionality is BullaInvoiceTestHelper {
         assertEq(uint256(claim2.status), uint256(Status.Paid));
         assertEq(uint256(claim3.status), uint256(Status.Paid));
 
-        // Verify NFT ownership transferred to payer
-        assertEq(bullaClaim.ownerOf(invoiceId1), debtor);
-        assertEq(bullaClaim.ownerOf(invoiceId2), debtor);
-        assertEq(bullaClaim.ownerOf(invoiceId3), debtor);
+        // Verify NFT ownership remains with creditor
+        assertEq(bullaClaim.ownerOf(invoiceId1), creditor);
+        assertEq(bullaClaim.ownerOf(invoiceId2), creditor);
+        assertEq(bullaClaim.ownerOf(invoiceId3), creditor);
     }
 
     /*///////////////////// BATCH MANAGEMENT TESTS /////////////////////*/
diff --git a/test/foundry/BullaInvoice/CreateInvoiceParamsBuilder.sol b/test/foundry/BullaInvoice/CreateInvoiceParamsBuilder.sol
@@ -12,7 +12,6 @@ contract CreateInvoiceParamsBuilder {
     string private _description;
     address private _token;
     ClaimBinding private _binding;
-    bool private _payerReceivesClaimOnPayment;
     InterestConfig private _lateFeeConfig;
     uint256 private _impairmentGracePeriod;
     uint256 private _depositAmount;
@@ -27,7 +26,6 @@ contract CreateInvoiceParamsBuilder {
         _description = "Test Invoice";
         _token = address(0); // ETH by default
         _binding = ClaimBinding.BindingPending;
-        _payerReceivesClaimOnPayment = true;
         _lateFeeConfig = InterestConfig({interestRateBps: 0, numberOfPeriodsPerYear: 0});
         _impairmentGracePeriod = 7 days; // 7 days grace period by default
         _depositAmount = 0; // No deposit by default
@@ -73,11 +71,6 @@ contract CreateInvoiceParamsBuilder {
         return this;
     }
 
-    function withPayerReceivesClaimOnPayment(bool payerReceivesClaim) public returns (CreateInvoiceParamsBuilder) {
-        _payerReceivesClaimOnPayment = payerReceivesClaim;
-        return this;
-    }
-
     function withLateFeeConfig(InterestConfig memory lateFeeConfig) public returns (CreateInvoiceParamsBuilder) {
         _lateFeeConfig = lateFeeConfig;
         return this;
@@ -103,7 +96,6 @@ contract CreateInvoiceParamsBuilder {
             description: _description,
             token: _token,
             binding: _binding,
-            payerReceivesClaimOnPayment: _payerReceivesClaimOnPayment,
             lateFeeConfig: _lateFeeConfig,
             impairmentGracePeriod: _impairmentGracePeriod,
             depositAmount: _depositAmount
