Fix recourse validation (#666)

Author: zupzup

CHANGELOG.md

@@ -9,6 +9,11 @@
 * Fix it so that Anon holders of a bill can do recourse (breaking DB and API change)
     * `recourser` went from `BillIdentParticipant` to `BillParticipant`
 * Added endpoints `identityApi.dev_mode_get_full_identity_chain()` and `companyApi.dev_mode_get_full_company_chain(company_id)` to show the full identity and company chains as JSON in dev mode
+* Fixed request to recourse validation
+    * The bill is not blocked, if a req to recourse expired, or was rejected
+    * It's now possible to recourse against the same person again
+    * The last person in the chain can now reject a recourse (was broken before)
+    * `get_past_endorsees` is calculated differently now - holders can only recourse against parties before the first block where they became a holder in the bill, even if they have multiple endorsement blocks in the bill
 
 # 0.4.8
 

crates/bcr-ebill-api/src/constants.rs

@@ -7,4 +7,4 @@ pub const VALID_FILE_MIME_TYPES: [&str; 3] = ["image/jpeg", "image/png", "applic
 
 // When subscribing events we subtract this from the last received event time
 pub const NOSTR_EVENT_TIME_SLACK: u64 = 3600 * 24; // 1 day
-pub const CURRENCY_SAT: &str = "sat";
+pub use bcr_ebill_core::constants::CURRENCY_SAT;

crates/bcr-ebill-api/src/service/backup_service.rs

@@ -103,6 +103,7 @@ mod tests {
     use super::*;
 
     #[tokio::test]
+    #[ignore]
     async fn test_backup_with_embedded_db() {
         let mut store = MockBackupStoreApiMock::new();
         let mut identity_store = MockIdentityStoreApiMock::new();
@@ -159,6 +160,7 @@ mod tests {
     }
 
     #[tokio::test]
+    #[ignore]
     async fn test_restore_with_embedded_db() {
         let mut store = MockBackupStoreApiMock::new();
         let mut identity_store = MockIdentityStoreApiMock::new();

crates/bcr-ebill-api/src/service/bill_service/mod.rs

@@ -36,6 +36,7 @@ use bcr_ebill_core::{
         },
         identity::IdentityBlockchain,
     },
+    constants::CURRENCY_SAT,
     contact::{BillIdentParticipant, BillParticipant},
 };
 use external::{bitcoin::MockBitcoinClientApi, mint::MockMintClientApi};
@@ -102,7 +103,7 @@ pub fn get_baseline_cached_bill(id: BillId) -> BitcreditBillResult {
             city_of_issuing: "Vienna".to_string(),
             country_of_payment: "AT".to_string(),
             city_of_payment: "Vienna".to_string(),
-            currency: "sat".to_string(),
+            currency: CURRENCY_SAT.to_string(),
             sum: "15000".to_string(),
             files: vec![],
             active_notification: None,
@@ -337,7 +338,7 @@ pub fn request_to_recourse_block(
             .into(),
             recoursee: recoursee.to_owned().into(),
             sum: 15000,
-            currency: "sat".to_string(),
+            currency: CURRENCY_SAT.to_string(),
             recourse_reason: BillRecourseReasonBlockData::Pay,
             signatory: None,
             signing_timestamp: timestamp,
@@ -363,7 +364,7 @@ pub fn recourse_block(
             recourser: bill_identified_participant_only_node_id(node_id_test()).into(),
             recoursee: recoursee.to_owned().into(),
             sum: 15000,
-            currency: "sat".to_string(),
+            currency: CURRENCY_SAT.to_string(),
             recourse_reason: BillRecourseReasonBlockData::Pay,
             signatory: None,
             signing_timestamp: first_block.timestamp + 1,
@@ -449,7 +450,7 @@ pub fn offer_to_sell_block(
                 bill_identified_participant_only_node_id(node_id_test()).into(),
             ),
             buyer: BillParticipantBlockData::Ident(buyer.to_owned().into()),
-            currency: "sat".to_string(),
+            currency: CURRENCY_SAT.to_string(),
             sum: 15000,
             payment_address: VALID_PAYMENT_ADDRESS_TESTNET.to_string(),
             signatory: None,
@@ -491,7 +492,7 @@ pub fn sell_block(id: &BillId, first_block: &BillBlock, buyer: &BillIdentPartici
                 bill_identified_participant_only_node_id(node_id_test()).into(),
             ),
             buyer: BillParticipantBlockData::Ident(buyer.to_owned().into()),
-            currency: "sat".to_string(),
+            currency: CURRENCY_SAT.to_string(),
             payment_address: VALID_PAYMENT_ADDRESS_TESTNET.to_string(),
             sum: 15000,
             signatory: None,
@@ -533,7 +534,7 @@ pub fn request_to_pay_block(id: &BillId, first_block: &BillBlock, ts: Option<u64
             requester: BillParticipantBlockData::Ident(
                 bill_identified_participant_only_node_id(node_id_test()).into(),
             ),
-            currency: "sat".to_string(),
+            currency: CURRENCY_SAT.to_string(),
             signatory: None,
             signing_timestamp: timestamp,
             signing_address: Some(empty_address()),

crates/bcr-ebill-api/src/service/bill_service/test_utils.rs

@@ -8,6 +8,7 @@ pub mod tests {
         data::bill::BillKeys,
     };
     use async_trait::async_trait;
+    use bcr_ebill_core::constants::CURRENCY_SAT;
     use bcr_ebill_core::{
         NodeId, OptionalPostalAddress, PostalAddress, PublicKey, SecretKey, ServiceTraitBounds,
         bill::{BillId, BitcreditBill, BitcreditBillResult, PaymentState},
@@ -574,7 +575,7 @@ pub mod tests {
             drawer: empty_bill_identified_participant(),
             payee: BillParticipant::Ident(empty_bill_identified_participant()),
             endorsee: None,
-            currency: "sat".to_string(),
+            currency: CURRENCY_SAT.to_string(),
             sum: 5000,
             maturity_date: "2099-11-12".to_string(),
             issue_date: "2099-08-12".to_string(),