Merge pull request #468 from Buildwithlevo/feature/required-memo-hash-for-invoices

feat: payment memo validation and invoice tag registry (#451, #452)

Author: Kingsman-99

contracts/split/src/error.rs

@@ -45,6 +45,8 @@ pub enum ContractError {
     DuplicatePayment = 29,
     /// Issue #434: Invoice group member expired unfunded; group rollback triggered.
     GroupMemberExpired = 30,
+    /// Issue #451: payer-provided memo does not match the required memo hash.
+    MemoMismatch = 31,
     /// Issue #439: Creator is in cooldown after cancelling an invoice.
     CreatorCooldownActive = 31,
 }

contracts/split/src/lib.rs

@@ -592,6 +592,16 @@ fn payer_payment_timestamps_key(invoice_id: u64, payer: &Address) -> (Symbol, u6
     (symbol_short!("pay_ts"), invoice_id, payer.clone())
 }
 
+/// Issue #451: per-invoice required memo hash.
+fn required_memo_hash_key(invoice_id: u64) -> (Symbol, u64) {
+    (symbol_short!("req_memo"), invoice_id)
+}
+
+/// Issue #452: per-invoice tags.
+fn invoice_tags_key(invoice_id: u64) -> (Symbol, u64) {
+    (symbol_short!("inv_tags"), invoice_id)
+}
+
 fn invoice_rate_limit_window_key() -> Symbol {
     symbol_short!("inv_rl_w")
 }
@@ -6548,6 +6558,50 @@ impl SplitContract {
         events::payment_matched(&env, memo, memo, &payer);
     }
 
+    /// Issue #451: Creator sets a required payment memo hash on an invoice.
+    pub fn set_invoice_memo(env: Env, creator: Address, invoice_id: u64, memo_hash: BytesN<32>) {
+        require_not_paused(&env);
+        creator.require_auth();
+        let invoice = load_invoice(&env, invoice_id);
+        assert!(invoice.creator == creator, "only creator can set memo");
+        assert!(invoice.status == InvoiceStatus::Pending, "invoice is not pending");
+        env.storage().persistent().set(&required_memo_hash_key(invoice_id), &memo_hash);
+    }
+
+    /// Issue #451: Pay an invoice with memo validation.
+    pub fn pay_with_validated_memo(
+        env: Env,
+        payer: Address,
+        invoice_id: u64,
+        payment_memo: BytesN<32>,
+        amount: i128,
+        nonce: u64,
+        auto_convert: bool,
+        via: Option<Address>,
+    ) {
+        require_not_paused(&env);
+        payer.require_auth();
+        if let Some(required) = env.storage().persistent().get::<_, BytesN<32>>(&required_memo_hash_key(invoice_id)) {
+            assert!(payment_memo == required, "MemoMismatch");
+        }
+        Self::_pay(&env, &payer, invoice_id, amount, nonce, auto_convert, via, None, false);
+        events::payment_matched(&env, invoice_id, invoice_id, &payer);
+    }
+
+    /// Issue #452: Set tags on an invoice for searchable categorisation.
+    pub fn set_invoice_tags(env: Env, creator: Address, invoice_id: u64, tags: Vec<String>) {
+        require_not_paused(&env);
+        creator.require_auth();
+        let invoice = load_invoice(&env, invoice_id);
+        assert!(invoice.creator == creator, "only creator can set tags");
+        env.storage().persistent().set(&invoice_tags_key(invoice_id), &tags);
+    }
+
+    /// Issue #452: Get tags for an invoice.
+    pub fn get_invoice_tags(env: Env, invoice_id: u64) -> Vec<String> {
+        env.storage().persistent().get(&invoice_tags_key(invoice_id)).unwrap_or_else(|| Vec::new(&env))
+    }
+
     /// Claim vesting cliff share after cliff timestamp has passed (issue #27).
     ///
     /// Requires that the invoice status is Released and the cliff (if set) has passed.

contracts/split/src/storage_keys.rs

@@ -275,3 +275,8 @@ pub fn upgrade_freeze_key() -> Symbol { symbol_short!("upg_frz") }
 
 /// Contract upgrade checkpoint hash — instance storage.
 pub fn upgrade_checkpoint_key() -> Symbol { symbol_short!("upg_ckpt") }
+
+/// Issue #451: per-invoice required memo hash — persistent storage.
+pub fn required_memo_hash_key(invoice_id: u64) -> (Symbol, u64) { (symbol_short!("req_memo"), invoice_id) }
+/// Issue #452: per-invoice tags — persistent storage.
+pub fn invoice_tags_key(invoice_id: u64) -> (Symbol, u64) { (symbol_short!("inv_tags"), invoice_id) }