fix: wrong vault address paid for in vault payments

maidsafe · Jan 2, 2025 · 63ccf06 · 63ccf06
1 parent 6d57f27
commit 63ccf06
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 14 deletions.
diff --git a/ant-evm/src/data_payments.rs b/ant-evm/src/data_payments.rs
@@ -89,6 +89,9 @@ impl ProofOfPayment {
     pub fn verify_for(&self, peer_id: PeerId) -> bool {
         // make sure I am in the list of payees
         if !self.payees().contains(&peer_id) {
+            warn!("Payment does not contain node peer id");
+            debug!("Payment contains peer ids: {:?}", self.payees());
+            debug!("Node peer id: {:?}", peer_id);
             return false;
         }
 
@@ -102,6 +105,7 @@ impl ProofOfPayment {
                 }
             };
             if !quote.check_is_signed_by_claimed_peer(peer_id) {
+                warn!("Payment is not signed by claimed peer");
                 return false;
             }
         }
@@ -186,7 +190,7 @@ impl PaymentQuote {
         if let Ok(pub_key) = libp2p::identity::PublicKey::try_decode_protobuf(&self.pub_key) {
             Ok(PeerId::from(pub_key.clone()))
         } else {
-            error!("Cann't parse PublicKey from protobuf");
+            error!("Can't parse PublicKey from protobuf");
             Err(EvmError::InvalidQuotePublicKey)
         }
     }
@@ -196,7 +200,7 @@ impl PaymentQuote {
         let pub_key = if let Ok(pub_key) = PublicKey::try_decode_protobuf(&self.pub_key) {
             pub_key
         } else {
-            error!("Cann't parse PublicKey from protobuf");
+            error!("Can't parse PublicKey from protobuf");
             return false;
         };
 

diff --git a/ant-protocol/src/storage/scratchpad.rs b/ant-protocol/src/storage/scratchpad.rs
@@ -131,16 +131,8 @@ impl Scratchpad {
         NetworkAddress::ScratchpadAddress(self.address)
     }
 
-    /// Returns a VEC with the XOR name.
-    pub fn to_xor_name_vec(&self) -> Vec<XorName> {
-        [self.network_address()]
-            .iter()
-            .map(|f| XorName::from_content(f.as_bytes().as_ref()))
-            .collect::<Vec<XorName>>()
-    }
-
-    /// Returns the name.
-    pub fn name(&self) -> XorName {
+    /// Returns the xorname.
+    pub fn xorname(&self) -> XorName {
         self.address.xorname()
     }
 

diff --git a/autonomi/src/client/vault.rs b/autonomi/src/client/vault.rs
@@ -193,7 +193,7 @@ impl Client {
 
         let record = if is_new {
             let receipt = self
-                .pay_for_content_addrs(scratch.to_xor_name_vec().into_iter(), payment_option)
+                .pay_for_content_addrs(std::iter::once(scratch.xorname()), payment_option)
                 .await
                 .inspect_err(|err| {
                     error!("Failed to pay for new vault at addr: {scratch_address:?} : {err}");

diff --git a/autonomi/tests/external_signer.rs b/autonomi/tests/external_signer.rs
@@ -147,7 +147,7 @@ async fn external_signer_put() -> eyre::Result<()> {
     assert!(is_new, "Scratchpad is not new");
 
     let scratch_addresses = if is_new {
-        scratch.to_xor_name_vec()
+        vec![scratch.xorname()]
     } else {
         vec![]
     };