Merge pull request #52 from KevinMB0220/feat/transfer-lock-escrow-lifecycle-27

feat: connect invoice-token transfer lock to escrow settlement/refund

Author: Jayrodri088

contracts/invoice-escrow/src/integration_test.rs

@@ -72,6 +72,9 @@ fn test_integration_escrow_lifecycle_happy_path() {
     assert_eq!(payment_token_client.balance(&buyer), 0);
     assert_eq!(payment_token_client.balance(&escrow_id), amount);
 
+    // Verify invoice token is locked while escrow is active
+    assert!(inv_token_client.transfer_locked());
+
     // 9. Record Payment (Payer settles the invoice)
     escrow_client.record_payment(&invoice_id, &payer, &amount);
 
@@ -88,6 +91,15 @@ fn test_integration_escrow_lifecycle_happy_path() {
         escrow_client.get_escrow_status(&invoice_id),
         EscrowStatus::Settled
     );
+
+    // Invoice token transfers must be unlocked after settlement
+    assert!(!inv_token_client.transfer_locked());
+
+    // Buyer can now transfer their invoice tokens freely
+    let recipient = Address::generate(&env);
+    inv_token_client.transfer(&buyer, &recipient, &amount);
+    assert_eq!(inv_token_client.balance(&buyer), 0);
+    assert_eq!(inv_token_client.balance(&recipient), amount);
 }
 
 #[test]
@@ -155,4 +167,74 @@ fn test_integration_refund_lifecycle() {
         escrow_client.get_escrow_status(&invoice_id),
         EscrowStatus::Refunded
     );
+
+    // Invoice token transfers must be unlocked after refund
+    assert!(!inv_token_client.transfer_locked());
+}
+
+#[test]
+fn test_integration_token_locked_during_active_escrow() {
+    let env = Env::default();
+    env.mock_all_auths();
+
+    let admin = Address::generate(&env);
+    let seller = Address::generate(&env);
+    let buyer = Address::generate(&env);
+
+    let escrow_id = env.register_contract(None, InvoiceEscrow);
+    let escrow_client = InvoiceEscrowClient::new(&env, &escrow_id);
+
+    let inv_token_id = env.register_contract(None, InvoiceToken);
+    let inv_token_client = InvoiceTokenClient::new(&env, &inv_token_id);
+
+    let payment_token_admin = Address::generate(&env);
+    let payment_token_id = env.register_stellar_asset_contract_v2(payment_token_admin.clone());
+    let payment_token_asset = AssetClient::new(&env, &payment_token_id.address());
+
+    let invoice_id = Symbol::new(&env, "INVLOCK");
+    inv_token_client.initialize(
+        &admin,
+        &SorobanString::from_str(&env, "Lock Test Invoice"),
+        &SorobanString::from_str(&env, "INVLCK"),
+        &18,
+        &invoice_id,
+        &escrow_id,
+    );
+
+    escrow_client.initialize(&admin, &300);
+
+    let amount = 500i128;
+    payment_token_asset.mint(&buyer, &amount);
+
+    let due_date = 20000u64;
+    escrow_client.create_escrow(
+        &invoice_id,
+        &seller,
+        &amount,
+        &due_date,
+        &payment_token_id.address(),
+        &inv_token_id,
+    );
+
+    // Token is locked even before funding (initialized locked)
+    assert!(inv_token_client.transfer_locked());
+
+    escrow_client.fund_escrow(&invoice_id, &buyer);
+
+    // Token is still locked after funding — transfers are blocked while invoice is active
+    assert!(inv_token_client.transfer_locked());
+    let other = Address::generate(&env);
+    let result = inv_token_client.try_transfer(&buyer, &other, &100);
+    assert!(result.is_err());
+
+    // After settlement, token unlocks
+    let payer = Address::generate(&env);
+    payment_token_asset.mint(&payer, &amount);
+    escrow_client.record_payment(&invoice_id, &payer, &amount);
+
+    assert!(!inv_token_client.transfer_locked());
+    // Buyer can now freely transfer invoice tokens
+    inv_token_client.transfer(&buyer, &other, &100);
+    assert_eq!(inv_token_client.balance(&buyer), amount - 100);
+    assert_eq!(inv_token_client.balance(&other), 100);
 }

contracts/invoice-escrow/src/lib.rs

@@ -147,6 +147,14 @@ impl InvoiceEscrow {
         token.transfer(&contract, &config.admin, &platform_fee);
         data.status = EscrowStatus::Settled;
         storage::set_escrow(&env, invoice_id.clone(), &data);
+
+        // Unlock invoice token transfers now that the invoice is settled
+        env.invoke_contract::<()>(
+            &data.inv_token,
+            &Symbol::new(&env, "set_transfer_locked"),
+            soroban_sdk::vec![&env, contract.to_val(), false.into_val(&env)],
+        );
+
         events::payment_settled(&env, invoice_id, amount, platform_fee, investor_amount);
         Ok(())
     }
@@ -169,6 +177,14 @@ impl InvoiceEscrow {
         token.transfer(&contract, funder, &amount);
         data.status = EscrowStatus::Refunded;
         storage::set_escrow(&env, invoice_id.clone(), &data);
+
+        // Unlock invoice token transfers now that the invoice is refunded
+        env.invoke_contract::<()>(
+            &data.inv_token,
+            &Symbol::new(&env, "set_transfer_locked"),
+            soroban_sdk::vec![&env, contract.to_val(), false.into_val(&env)],
+        );
+
         events::escrow_refunded(&env, invoice_id, funder, amount);
         Ok(())
     }

contracts/invoice-escrow/src/test.rs

@@ -16,6 +16,10 @@ impl MockInvoiceToken {
         // Just mock the mint call
         env.storage().instance().set(&to, &amount);
     }
+
+    pub fn set_transfer_locked(_env: Env, _caller: Address, _locked: bool) {
+        // Mock the set_transfer_locked call — no-op for unit tests
+    }
 }
 
 #[test]

contracts/invoice-escrow/test_snapshots/integration_test/test_integration_escrow_lifecycle_happy_path.1.json

@@ -1,6 +1,6 @@
 {
   "generators": {
-    "address": 8,
+    "address": 9,
     "nonce": 0
   },
   "auth": [
@@ -163,6 +163,7 @@
     [],
     [],
     [],
+    [],
     [
       [
         "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4",
@@ -219,6 +220,37 @@
     [],
     [],
     [],
+    [],
+    [],
+    [
+      [
+        "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M",
+        {
+          "function": {
+            "contract_fn": {
+              "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4",
+              "function_name": "transfer",
+              "args": [
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
+                },
+                {
+                  "i128": {
+                    "hi": 0,
+                    "lo": 1000
+                  }
+                }
+              ]
+            }
+          },
+          "sub_invocations": []
+        }
+      ]
+    ],
+    [],
     []
   ],
   "ledger": {
@@ -358,6 +390,39 @@
           6311999
         ]
       ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M",
+            "key": {
+              "ledger_key_nonce": {
+                "nonce": 8370022561469687789
+              }
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M",
+                "key": {
+                  "ledger_key_nonce": {
+                    "nonce": 8370022561469687789
+                  }
+                },
+                "durability": "temporary",
+                "val": "void"
+              }
+            },
+            "ext": "v0"
+          },
+          6311999
+        ]
+      ],
       [
         {
           "contract_data": {
@@ -576,7 +641,7 @@
                   "symbol": "Balance"
                 },
                 {
-                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
                 }
               ]
             },
@@ -596,7 +661,7 @@
                       "symbol": "Balance"
                     },
                     {
-                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
                     }
                   ]
                 },
@@ -700,7 +765,7 @@
                                 "symbol": "transfer_locked"
                               },
                               "val": {
-                                "bool": true
+                                "bool": false
                               }
                             }
                           ]

contracts/invoice-escrow/test_snapshots/integration_test/test_integration_refund_lifecycle.1.json

@@ -138,6 +138,7 @@
     [],
     [],
     [],
+    [],
     []
   ],
   "ledger": {
@@ -586,7 +587,7 @@
                                 "symbol": "transfer_locked"
                               },
                               "val": {
-                                "bool": true
+                                "bool": false
                               }
                             }
                           ]