Add expires_at field to invoices and reject payments on expired invoices

contracts/account/src/tests/test_invoice_signed.rs

@@ -116,6 +116,7 @@ fn test_create_invoice_signed_by_manager_success() {
         &description,
         &amount,
         &token,
+        &None,
         &nonce,
         &signature,
     );
@@ -152,6 +153,7 @@ fn test_create_invoice_signed_by_admin_success() {
         &description,
         &amount,
         &token,
+        &None,
         &nonce,
         &signature,
     );
@@ -189,6 +191,7 @@ fn test_create_invoice_signed_nonce_replay_fails() {
         &description,
         &amount,
         &token,
+        &None,
         &nonce,
         &signature,
     );
@@ -200,6 +203,7 @@ fn test_create_invoice_signed_nonce_replay_fails() {
         &description,
         &amount,
         &token,
+        &None,
         &nonce,
         &signature,
     );
@@ -225,6 +229,7 @@ fn test_create_invoice_signed_different_nonces_succeed() {
         &description,
         &amount,
         &token,
+        &None,
         &generate_nonce(&env),
         &generate_signature(&env),
     );
@@ -235,6 +240,7 @@ fn test_create_invoice_signed_different_nonces_succeed() {
         &description,
         &amount,
         &token,
+        &None,
         &generate_nonce_2(&env),
         &generate_signature(&env),
     );
@@ -261,6 +267,7 @@ fn test_create_invoice_signed_unauthorized_caller_fails() {
         &description,
         &500,
         &token,
+        &None,
         &generate_nonce(&env),
         &generate_signature(&env),
     );
@@ -286,6 +293,7 @@ fn test_create_invoice_signed_unregistered_merchant_fails() {
         &description,
         &500,
         &token,
+        &None,
         &generate_nonce(&env),
         &generate_signature(&env),
     );
@@ -311,6 +319,7 @@ fn test_create_invoice_signed_invalid_amount_fails() {
         &description,
         &0,
         &token,
+        &None,
         &generate_nonce(&env),
         &generate_signature(&env),
     );
@@ -338,6 +347,7 @@ fn test_create_invoice_signed_when_paused_fails() {
         &description,
         &500,
         &token,
+        &None,
         &generate_nonce(&env),
         &generate_signature(&env),
     );

contracts/shade/src/components/invoice.rs

@@ -17,6 +17,7 @@ pub fn create_invoice(
     description: &String,
     amount: i128,
     token: &Address,
+    expires_at: &Option<u64>,
 ) -> u64 {
     merchant_address.require_auth();
     if amount <= 0 {
@@ -46,6 +47,7 @@ pub fn create_invoice(
         payer: None,
         date_created: env.ledger().timestamp(),
         date_paid: None,
+        expires_at: *expires_at,
         amount_refunded: 0,
     };
     env.storage()
@@ -72,6 +74,7 @@ pub fn create_invoice_signed(
     description: &String,
     amount: i128,
     token: &Address,
+    expires_at: &Option<u64>,
     nonce: &BytesN<32>,
     signature: &BytesN<64>,
 ) -> u64 {
@@ -100,6 +103,7 @@ pub fn create_invoice_signed(
         description,
         amount,
         token,
+        expires_at,
         nonce,
         signature,
     );
@@ -132,6 +136,7 @@ pub fn create_invoice_signed(
         payer: None,
         date_created: env.ledger().timestamp(),
         date_paid: None,
+        expires_at: *expires_at,
         amount_refunded: 0,
     };
 
@@ -315,6 +320,12 @@ pub fn pay_invoice(env: &Env, payer: &Address, invoice_id: u64) -> i128 {
         panic_with_error!(env, ContractError::InvalidInvoiceStatus);
     }
 
+    if let Some(expires_at) = invoice.expires_at {
+        if env.ledger().timestamp() > expires_at {
+            panic_with_error!(env, ContractError::InvoiceExpired);
+        }
+    }
+
     // Validate that the invoice token is accepted
     if !admin::is_accepted_token(env, &invoice.token) {
         panic_with_error!(env, ContractError::TokenNotAccepted);

contracts/shade/src/components/signature_util.rs

@@ -13,6 +13,7 @@ fn build_message(
     description: &String,
     amount: i128,
     token: &Address,
+    expires_at: &Option<u64>,
     nonce: &BytesN<32>,
 ) -> Bytes {
     let mut msg = Bytes::new(env);
@@ -22,6 +23,7 @@ fn build_message(
     msg.append(&Bytes::from_slice(env, &amount.to_be_bytes()));
     msg.append(&token.clone().to_xdr(env));
     msg.append(&description.clone().to_xdr(env));
+    msg.append(&Bytes::from_slice(env, &expires_at.unwrap_or(0).to_be_bytes()));
     msg
 }
 
@@ -36,6 +38,7 @@ pub fn verify_invoice_signature(
     description: &String,
     amount: i128,
     token: &Address,
+    expires_at: &Option<u64>,
     nonce: &BytesN<32>,
     signature: &BytesN<64>,
 ) {
@@ -45,7 +48,7 @@ pub fn verify_invoice_signature(
         .get(&DataKey::MerchantKey(merchant.clone()))
         .unwrap_or_else(|| panic_with_error!(env, ContractError::MerchantKeyNotFound));
 
-    let message = build_message(env, merchant, description, amount, token, nonce);
+    let message = build_message(env, merchant, description, amount, token, expires_at, nonce);
 
     env.crypto().ed25519_verify(&key, &message, signature);
 }

contracts/shade/src/errors.rs

@@ -24,4 +24,5 @@ pub enum ContractError {
     WasmHashNotSet = 18,
     InvoiceAlreadyPaid = 19,
     MerchantAccountNotSet = 20,
+    InvoiceExpired = 21,
 }

contracts/shade/src/interface.rs

@@ -26,6 +26,7 @@ pub trait ShadeTrait {
         description: String,
         amount: i128,
         token: Address,
+        expires_at: Option<u64>,
     ) -> u64;
     #[allow(clippy::too_many_arguments)]
     fn create_invoice_signed(
@@ -35,6 +36,7 @@ pub trait ShadeTrait {
         description: String,
         amount: i128,
         token: Address,
+        expires_at: Option<u64>,
         nonce: BytesN<32>,
         signature: BytesN<64>,
     ) -> u64;

contracts/shade/src/shade.rs

@@ -104,9 +104,10 @@ impl ShadeTrait for Shade {
         description: String,
         amount: i128,
         token: Address,
+        expires_at: Option<u64>,
     ) -> u64 {
         pausable_component::assert_not_paused(&env);
-        invoice_component::create_invoice(&env, &merchant, &description, amount, &token)
+        invoice_component::create_invoice(&env, &merchant, &description, amount, &token, &expires_at)
     }
 
     #[allow(clippy::too_many_arguments)]
@@ -117,6 +118,7 @@ impl ShadeTrait for Shade {
         description: String,
         amount: i128,
         token: Address,
+        expires_at: Option<u64>,
         nonce: BytesN<32>,
         signature: BytesN<64>,
     ) -> u64 {
@@ -128,6 +130,7 @@ impl ShadeTrait for Shade {
             &description,
             amount,
             &token,
+            &expires_at,
             &nonce,
             &signature,
         )

contracts/shade/src/tests/mod.rs

@@ -4,6 +4,7 @@ pub mod test_access_control;
 pub mod test_admin_payment;
 pub mod test_fees;
 pub mod test_invoice;
+pub mod test_invoice_expiry;
 pub mod test_invoice_signed;
 pub mod test_invoice_void;
 pub mod test_merchant;

contracts/shade/src/tests/test_admin_payment.rs

@@ -55,6 +55,7 @@ fn test_invoice_state_validation() {
         &String::from_str(&env, "Test Invoice"),
         &1000,
         &token,
+        &None,
     );
 
     // Verify initial state
@@ -77,12 +78,14 @@ fn test_multiple_invoices_independent() {
         &String::from_str(&env, "Invoice 1"),
         &1000,
         &token,
+        &None,
     );
     let id_2 = client.create_invoice(
         &merchant,
         &String::from_str(&env, "Invoice 2"),
         &2000,
         &token,
+        &None,
     );
 
     // Set second to Paid via storage manipulation
@@ -117,6 +120,7 @@ fn test_fee_preservation() {
         &String::from_str(&env, "Test Invoice"),
         &1000,
         &token,
+        &None,
     );
 
     // Verify fee and invoice data
@@ -159,6 +163,7 @@ fn test_contract_pause_and_unpause() {
         &String::from_str(&env, "Post-unpause invoice"),
         &500,
         &token,
+        &None,
     );
     assert!(invoice_id > 0);
 }