Show all endorsements in the endorsement list (#638)

Author: zupzup

CHANGELOG.md

@@ -2,7 +2,9 @@
 
 * Add basic logic for implementing (social) identity proofs
 * Add persistence, basic service layer and WASM API for identity proofs
+* Fix block propagation inconsistencies with company identities
 * Changed default relay to `wss://bcr-relay-dev.minibill.tech`
+* Change `endorsements` endpoint, making sure all endorsees (also anon) are displayed (breaking for API because of the return type)
 
 # 0.4.5
 

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

@@ -3475,7 +3475,7 @@ pub mod tests {
         assert_eq!(
             endorsements.as_ref().unwrap()[0]
                 .pay_to_the_order_of
-                .node_id,
+                .node_id(),
             identity.identity.node_id
         );
     }
@@ -4130,15 +4130,15 @@ pub mod tests {
             .get_endorsements(&bill_id_test(), &identity.identity.node_id)
             .await;
         assert!(res.is_ok());
-        // with duplicates
-        assert_eq!(res.as_ref().unwrap().len(), 2);
+        // with duplicates, anon are also counted
+        assert_eq!(res.as_ref().unwrap().len(), 3);
         // mint was last, so it's first
         assert_eq!(
-            res.as_ref().unwrap()[0].pay_to_the_order_of.node_id,
+            res.as_ref().unwrap()[0].pay_to_the_order_of.node_id(),
             mint_endorsee_clone.node_id
         );
         assert_eq!(
-            res.as_ref().unwrap()[1].pay_to_the_order_of.node_id,
+            res.as_ref().unwrap()[1].pay_to_the_order_of.node_id(),
             sell_endorsee_clone.node_id
         );
         // endorsee is not in the list, since they're anon
@@ -4266,15 +4266,15 @@ pub mod tests {
         assert_eq!(res.as_ref().unwrap().len(), 3);
         // mint was last, so it's first
         assert_eq!(
-            res.as_ref().unwrap()[0].pay_to_the_order_of.node_id,
+            res.as_ref().unwrap()[0].pay_to_the_order_of.node_id(),
             mint_endorsee_clone.node_id
         );
         assert_eq!(
-            res.as_ref().unwrap()[1].pay_to_the_order_of.node_id,
+            res.as_ref().unwrap()[1].pay_to_the_order_of.node_id(),
             sell_endorsee_clone.node_id
         );
         assert_eq!(
-            res.as_ref().unwrap()[2].pay_to_the_order_of.node_id,
+            res.as_ref().unwrap()[2].pay_to_the_order_of.node_id(),
             endorse_endorsee_clone.node_id
         );
     }

crates/bcr-ebill-core/src/bill/mod.rs

@@ -2,9 +2,7 @@ use std::str::FromStr;
 
 use super::{
     File, PostalAddress,
-    contact::{
-        BillIdentParticipant, LightBillIdentParticipant, LightBillIdentParticipantWithAddress,
-    },
+    contact::{BillIdentParticipant, LightBillIdentParticipant},
     notification::Notification,
 };
 use crate::{
@@ -539,7 +537,7 @@ pub struct PastEndorsee {
 
 #[derive(Debug)]
 pub struct Endorsement {
-    pub pay_to_the_order_of: LightBillIdentParticipantWithAddress,
+    pub pay_to_the_order_of: LightBillParticipant,
     pub signed: LightSignedBy,
     pub signing_timestamp: u64,
     pub signing_address: Option<PostalAddress>,

crates/bcr-ebill-core/src/blockchain/bill/chain.rs

@@ -674,6 +674,7 @@ impl BillBlockchain {
         Ok(nodes)
     }
 
+    /// Returns all endorsements for the bill (including anonymous holders)
     pub fn get_endorsements_for_bill(&self, bill_keys: &BillKeys) -> Vec<Endorsement> {
         let mut result: Vec<Endorsement> = vec![];
         // iterate from the back to the front, collecting all endorsement blocks
@@ -683,28 +684,26 @@ impl BillBlockchain {
                 continue;
             }
             if let Ok(Some(holder_from_block)) = block.get_holder_from_block(bill_keys) {
-                // we ignore blocks with an anonymous holder
-                if let BillParticipantBlockData::Ident(holder_data) = holder_from_block.holder {
-                    result.push(Endorsement {
-                        pay_to_the_order_of: holder_data.clone().into(),
-                        signed: LightSignedBy {
-                            data: holder_from_block.signer.clone().into(),
-                            signatory: holder_from_block.signatory.map(|s| {
-                                LightBillIdentParticipant {
-                                    // signatories are always identified people
-                                    t: ContactType::Person,
-                                    name: s.name,
-                                    node_id: s.node_id,
-                                }
-                            }),
-                        },
-                        signing_timestamp: block.timestamp,
-                        signing_address: match holder_from_block.signer {
-                            BillParticipantBlockData::Anon(_) => None,
-                            BillParticipantBlockData::Ident(data) => Some(data.postal_address),
-                        },
-                    });
-                }
+                let holder_data = holder_from_block.holder;
+                result.push(Endorsement {
+                    pay_to_the_order_of: holder_data.clone().into(),
+                    signed: LightSignedBy {
+                        data: holder_from_block.signer.clone().into(),
+                        signatory: holder_from_block.signatory.map(|s| {
+                            LightBillIdentParticipant {
+                                // signatories are always identified people
+                                t: ContactType::Person,
+                                name: s.name,
+                                node_id: s.node_id,
+                            }
+                        }),
+                    },
+                    signing_timestamp: block.timestamp,
+                    signing_address: match holder_from_block.signer {
+                        BillParticipantBlockData::Anon(_) => None,
+                        BillParticipantBlockData::Ident(data) => Some(data.postal_address),
+                    },
+                });
             }
         }
 
@@ -729,6 +728,7 @@ impl BillBlockchain {
         result
     }
 
+    /// Returns past endorsees, which can be recoursed against (no recourse blocks, no anon)
     pub fn get_past_endorsees_for_bill(
         &self,
         bill_keys: &BillKeys,

crates/bcr-ebill-core/src/contact/mod.rs

@@ -164,6 +164,15 @@ pub enum LightBillParticipant {
     Ident(LightBillIdentParticipantWithAddress),
 }
 
+impl LightBillParticipant {
+    pub fn node_id(&self) -> NodeId {
+        match self {
+            LightBillParticipant::Ident(data) => data.node_id.clone(),
+            LightBillParticipant::Anon(data) => data.node_id.clone(),
+        }
+    }
+}
+
 #[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct LightBillAnonParticipant {
     pub node_id: NodeId,

crates/bcr-ebill-wasm/src/api/notification.rs

@@ -29,7 +29,7 @@ impl Notification {
     #[wasm_bindgen(unchecked_return_type = "NotificationStatusWeb[]")]
     pub async fn active_notifications_for_node_ids(
         &self,
-        #[wasm_bindgen(unchecked_param_type = "Vec<String>")] node_ids: JsValue,
+        #[wasm_bindgen(unchecked_param_type = "string[]")] node_ids: JsValue,
     ) -> Result<JsValue> {
         let node_ids_parsed: Vec<NodeId> = serde_wasm_bindgen::from_value(node_ids)?;
         let notification_status = get_ctx()

crates/bcr-ebill-wasm/src/data/bill.rs

@@ -207,7 +207,7 @@ impl From<LightSignedBy> for LightSignedByWeb {
 #[derive(Tsify, Debug, Clone, Serialize)]
 #[tsify(into_wasm_abi)]
 pub struct EndorsementWeb {
-    pub pay_to_the_order_of: LightBillIdentParticipantWithAddressWeb,
+    pub pay_to_the_order_of: LightBillParticipantWeb,
     pub signed: LightSignedByWeb,
     pub signing_timestamp: u64,
     pub signing_address: Option<PostalAddressWeb>,