Add incoming block bill and chain action validation (#461)

* add incoming block bill action validation, add recourse reason to block data, add incoming chain validation

* review fixes

Author: zupzup

CHANGELOG.md

@@ -1,3 +1,12 @@
+# 0.3.3
+
+* Add block data validation
+* Add bill action validation for incoming blocks
+* Add signer verification for incoming blocks
+* Add recourse reason to `RequestRecourse` block data
+    * (breaks existing persisted bills, if they had a request recourse block)
+* Move bill validation logic to `bcr-ebill-core`
+
 # 0.3.2
 
 * Fixed `request_to_accept` calling the correct action

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

@@ -7,8 +7,8 @@ use bcr_ebill_core::{
             BillBlock, BillBlockchain,
             block::{
                 BillAcceptBlockData, BillEndorseBlockData, BillMintBlockData,
-                BillOfferToSellBlockData, BillRecourseBlockData, BillRejectBlockData,
-                BillRequestRecourseBlockData, BillRequestToAcceptBlockData,
+                BillOfferToSellBlockData, BillRecourseBlockData, BillRecourseReasonBlockData,
+                BillRejectBlockData, BillRequestRecourseBlockData, BillRequestToAcceptBlockData,
                 BillRequestToPayBlockData, BillSellBlockData,
             },
         },
@@ -98,15 +98,22 @@ impl BillService {
                 )?
             }
             BillAction::RequestRecourse(recoursee, recourse_reason) => {
-                let (sum, currency) = match *recourse_reason {
-                    RecourseReason::Accept => (bill.sum, bill.currency.clone()),
-                    RecourseReason::Pay(sum, ref currency) => (sum, currency.to_owned()),
+                let (sum, currency, reason) = match *recourse_reason {
+                    RecourseReason::Accept => (
+                        bill.sum,
+                        bill.currency.clone(),
+                        BillRecourseReasonBlockData::Accept,
+                    ),
+                    RecourseReason::Pay(sum, ref currency) => {
+                        (sum, currency.to_owned(), BillRecourseReasonBlockData::Pay)
+                    }
                 };
                 let block_data = BillRequestRecourseBlockData {
                     recourser: signer_public_data.clone().into(),
                     recoursee: recoursee.clone().into(),
                     sum,
                     currency: currency.to_owned(),
+                    recourse_reason: reason,
                     signatory: signing_keys.signatory_identity,
                     signing_timestamp: timestamp,
                     signing_address: signer_public_data.postal_address.clone(),

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

@@ -16,9 +16,7 @@ use bcr_ebill_core::{
         Blockchain,
         bill::{
             BillBlockchain, BillOpCode, OfferToSellWaitingForPayment, RecourseWaitingForPayment,
-            block::{
-                BillEndorseBlockData, BillMintBlockData, BillSellBlockData, BillSignatoryBlockData,
-            },
+            block::BillSignatoryBlockData,
         },
     },
     constants::{ACCEPT_DEADLINE_SECONDS, PAYMENT_DEADLINE_SECONDS},
@@ -45,108 +43,27 @@ impl BillService {
         contacts: &HashMap<String, Contact>,
     ) -> Result<BitcreditBill> {
         let bill_first_version = chain.get_first_version_bill(bill_keys)?;
+        let bill_parties = chain.get_bill_parties(bill_keys, &bill_first_version)?;
 
-        // check endorsing blocks
-        let last_version_block_endorse = if let Some(endorse_block_encrypted) =
-            chain.get_last_version_block_with_op_code(BillOpCode::Endorse)
-        {
-            Some((
-                endorse_block_encrypted
-                    .get_decrypted_block_bytes::<BillEndorseBlockData>(bill_keys)?,
-                endorse_block_encrypted.id,
-            ))
-        } else {
-            None
-        };
-        let last_version_block_mint = if let Some(mint_block_encrypted) =
-            chain.get_last_version_block_with_op_code(BillOpCode::Mint)
-        {
-            Some((
-                mint_block_encrypted.get_decrypted_block_bytes::<BillMintBlockData>(bill_keys)?,
-                mint_block_encrypted.id,
-            ))
-        } else {
-            None
-        };
-        let last_version_block_sell = if let Some(sell_block_encrypted) =
-            chain.get_last_version_block_with_op_code(BillOpCode::Sell)
-        {
-            Some((
-                sell_block_encrypted.get_decrypted_block_bytes::<BillSellBlockData>(bill_keys)?,
-                sell_block_encrypted.id,
-            ))
-        } else {
-            None
-        };
-
-        // If the last block is endorse, the endorsee is the holder
-        // If the last block is mint, the mint is the holder
-        // If the last block is sell, the buyer is the holder
-        let last_endorsee = match (
-            last_version_block_endorse,
-            last_version_block_mint,
-            last_version_block_sell,
-        ) {
-            (None, None, None) => None,
-            (Some((endorse_block, _)), None, None) => Some(endorse_block.endorsee),
-            (None, Some((mint_block, _)), None) => Some(mint_block.endorsee),
-            (None, None, Some((sell_block, _))) => Some(sell_block.buyer),
-            (Some((endorse_block, endorse_block_id)), Some((mint_block, mint_block_id)), None) => {
-                if endorse_block_id > mint_block_id {
-                    Some(endorse_block.endorsee)
-                } else {
-                    Some(mint_block.endorsee)
-                }
-            }
-            (Some((endorse_block, endorse_block_id)), None, Some((sell_block, sell_block_id))) => {
-                if endorse_block_id > sell_block_id {
-                    Some(endorse_block.endorsee)
-                } else {
-                    Some(sell_block.buyer)
-                }
-            }
-            (None, Some((mint_block, mint_block_id)), Some((sell_block, sell_block_id))) => {
-                if sell_block_id > mint_block_id {
-                    Some(sell_block.buyer)
-                } else {
-                    Some(mint_block.endorsee)
-                }
-            }
-            (
-                Some((endorse_block, endorse_block_id)),
-                Some((mint_block, mint_block_id)),
-                Some((sell_block, sell_block_id)),
-            ) => {
-                if endorse_block_id > mint_block_id && endorse_block_id > sell_block_id {
-                    Some(endorse_block.endorsee)
-                } else if mint_block_id > sell_block_id {
-                    Some(mint_block.endorsee)
-                } else {
-                    Some(sell_block.buyer)
-                }
-            }
-        };
-
-        let payee = bill_first_version.payee;
-
+        let payee = bill_parties.payee;
         let drawee_contact = self
             .extend_bill_chain_identity_data_from_contacts_or_identity(
-                bill_first_version.drawee,
+                bill_parties.drawee,
                 identity,
                 contacts,
             )
             .await;
         let drawer_contact = self
             .extend_bill_chain_identity_data_from_contacts_or_identity(
-                bill_first_version.drawer,
+                bill_parties.drawer,
                 identity,
                 contacts,
             )
             .await;
         let payee_contact = self
             .extend_bill_chain_identity_data_from_contacts_or_identity(payee, identity, contacts)
             .await;
-        let endorsee_contact = match last_endorsee {
+        let endorsee_contact = match bill_parties.endorsee {
             Some(endorsee) => {
                 let endorsee_contact = self
                     .extend_bill_chain_identity_data_from_contacts_or_identity(

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

@@ -183,7 +183,7 @@ pub mod tests {
                 BillBlock, BillOpCode,
                 block::{
                     BillEndorseBlockData, BillMintBlockData, BillOfferToSellBlockData,
-                    BillRejectBlockData, BillRequestRecourseBlockData,
+                    BillRecourseReasonBlockData, BillRejectBlockData, BillRequestRecourseBlockData,
                     BillRequestToAcceptBlockData, BillRequestToPayBlockData, BillSellBlockData,
                     BillSignatoryBlockData,
                 },
@@ -3588,6 +3588,7 @@ pub mod tests {
                             .into(),
                         currency: "sat".to_string(),
                         sum: 15000,
+                        recourse_reason: BillRecourseReasonBlockData::Pay,
                         signatory: None,
                         signing_timestamp: now,
                         signing_address: empty_address(),
@@ -3653,6 +3654,7 @@ pub mod tests {
                         recoursee: identity_public_data_only_node_id(recoursee.clone()).into(),
                         currency: "sat".to_string(),
                         sum: 15000,
+                        recourse_reason: BillRecourseReasonBlockData::Pay,
                         signatory: None,
                         signing_timestamp: now,
                         signing_address: empty_address(),
@@ -3717,6 +3719,7 @@ pub mod tests {
                         recoursee: identity_public_data_only_node_id(recoursee.clone()).into(),
                         currency: "sat".to_string(),
                         sum: 15000,
+                        recourse_reason: BillRecourseReasonBlockData::Pay,
                         signatory: Some(BillSignatoryBlockData {
                             node_id: get_baseline_identity().identity.node_id.clone(),
                             name: get_baseline_identity().identity.name.clone(),
@@ -3952,6 +3955,7 @@ pub mod tests {
                         recoursee: recoursee_clone.clone().into(),
                         sum: 15000,
                         currency: "sat".to_string(),
+                        recourse_reason: BillRecourseReasonBlockData::Pay,
                         signatory: None,
                         signing_timestamp: 1731593927,
                         signing_address: empty_address(),

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

@@ -562,14 +562,16 @@ impl BillServiceApi for BillService {
         // validate
         validate_bill_action(
             &blockchain,
-            &bill,
+            &bill.drawee.node_id,
+            &bill.payee.node_id,
+            bill.endorsee.clone().map(|e| e.node_id).as_deref(),
+            &bill.maturity_date,
             &bill_keys,
             timestamp,
             &signer_public_data.node_id,
             &bill_action,
             is_paid,
-        )
-        .await?;
+        )?;
 
         // create and sign blocks
         self.create_blocks_for_bill_action(

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

@@ -27,8 +27,9 @@ use bcr_ebill_core::{
             BillBlock,
             block::{
                 BillAcceptBlockData, BillIssueBlockData, BillOfferToSellBlockData,
-                BillRecourseBlockData, BillRejectBlockData, BillRequestRecourseBlockData,
-                BillRequestToAcceptBlockData, BillRequestToPayBlockData, BillSellBlockData,
+                BillRecourseBlockData, BillRecourseReasonBlockData, BillRejectBlockData,
+                BillRequestRecourseBlockData, BillRequestToAcceptBlockData,
+                BillRequestToPayBlockData, BillSellBlockData,
             },
         },
         identity::IdentityBlockchain,
@@ -280,6 +281,7 @@ pub fn request_to_recourse_block(
             recoursee: recoursee.to_owned().into(),
             sum: 15000,
             currency: "sat".to_string(),
+            recourse_reason: BillRecourseReasonBlockData::Pay,
             signatory: None,
             signing_timestamp: timestamp,
             signing_address: empty_address(),