Merge pull request #2579 from dusk-network/fix-key-representation

rusk-wallet: Fix Phoenix key representation
dusk-network · Oct 3, 2024 · d252836 · d252836
2 parents 8f7bd68 + 1752b16
commit d252836
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 14 deletions.
diff --git a/rusk-wallet/src/cache.rs b/rusk-wallet/src/cache.rs
@@ -7,7 +7,7 @@
 use std::collections::BTreeSet;
 use std::path::Path;
 
-use dusk_bytes::DeserializableSlice;
+use dusk_bytes::{DeserializableSlice, Serializable};
 use execution_core::transfer::phoenix::NoteLeaf;
 use rocksdb::{DBWithThreadMode, MultiThreaded, Options};
 
@@ -50,15 +50,15 @@ impl Cache {
     // representation of the tuple (NoteHeight, Note)
     pub(crate) fn insert(
         &self,
-        pk: &PhoenixPublicKey,
+        pk_bs58: &str,
         block_height: u64,
         note_data: (Note, BlsScalar),
     ) -> Result<(), Error> {
-        let cf_name = format!("{:?}", pk);
+        let cf_name = pk_bs58;
 
         let cf = self
             .db
-            .cf_handle(&cf_name)
+            .cf_handle(cf_name)
             .ok_or(Error::CacheDatabaseCorrupted)?;
 
         let (note, nullifier) = note_data;
@@ -80,11 +80,11 @@ impl Cache {
     // representation of the tuple (NoteHeight, Note)
     pub(crate) fn insert_spent(
         &self,
-        pk: &PhoenixPublicKey,
+        pk_bs58: &str,
         block_height: u64,
         note_data: (Note, BlsScalar),
     ) -> Result<(), Error> {
-        let cf_name = format!("spent_{:?}", pk);
+        let cf_name = format!("spent_{pk_bs58}");
 
         let cf = self
             .db
@@ -111,8 +111,11 @@ impl Cache {
         if nullifiers.is_empty() {
             return Ok(());
         }
-        let cf_name = format!("{:?}", pk);
-        let spent_cf_name = format!("spent_{:?}", pk);
+
+        let pk_bs58 = bs58::encode(pk.to_bytes()).into_string();
+
+        let spent_cf_name = format!("spent_{pk_bs58}");
+        let cf_name = pk_bs58;
 
         let cf = self
             .db
@@ -157,7 +160,7 @@ impl Cache {
         &self,
         pk: &PhoenixPublicKey,
     ) -> Result<Vec<BlsScalar>, Error> {
-        let cf_name = format!("{:?}", pk);
+        let cf_name = bs58::encode(pk.to_bytes()).into_string();
         let mut notes = vec![];
 
         if let Some(cf) = self.db.cf_handle(&cf_name) {
@@ -181,7 +184,7 @@ impl Cache {
         &self,
         pk: &PhoenixPublicKey,
     ) -> Result<BTreeSet<NoteLeaf>, Error> {
-        let cf_name = format!("{:?}", pk);
+        let cf_name = bs58::encode(pk.to_bytes()).into_string();
         let mut notes = BTreeSet::<NoteLeaf>::new();
 
         if let Some(cf) = self.db.cf_handle(&cf_name) {
@@ -207,7 +210,8 @@ impl Cache {
         &self,
         pk: &PhoenixPublicKey,
     ) -> Result<Vec<(BlsScalar, NoteLeaf)>, Error> {
-        let cf_name = format!("spent_{:?}", pk);
+        let pk_bs58 = bs58::encode(pk.to_bytes()).into_string();
+        let cf_name = format!("spent_{pk_bs58}");
         let mut notes = vec![];
 
         if let Some(cf) = self.db.cf_handle(&cf_name) {

diff --git a/rusk-wallet/src/clients.rs b/rusk-wallet/src/clients.rs
@@ -95,7 +95,9 @@ impl State {
                 let pk: PhoenixPublicKey =
                     derive_phoenix_pk(store.get_seed(), i as u8);
 
-                [format!("{:?}", pk), format!("spent_{:?}", pk)]
+                let pk = bs58::encode(pk.to_bytes()).into_string();
+
+                [pk.clone(), format!("spent_{pk}")]
             })
             .collect();
 

diff --git a/rusk-wallet/src/clients/sync.rs b/rusk-wallet/src/clients/sync.rs
@@ -84,6 +84,7 @@ pub(crate) async fn sync_db(
     }
 
     for (sk, vk, pk) in keys.iter() {
+        let pk_bs58 = bs58::encode(pk.to_bytes()).into_string();
         for (block_height, note) in note_data.iter() {
             if vk.owns(note.stealth_address()) {
                 let nullifier = note.gen_nullifier(sk);
@@ -95,8 +96,8 @@ pub(crate) async fn sync_db(
                 let note = (note.clone(), nullifier);
 
                 match spent {
-                    true => cache.insert_spent(pk, *block_height, note),
-                    false => cache.insert(pk, *block_height, note),
+                    true => cache.insert_spent(&pk_bs58, *block_height, note),
+                    false => cache.insert(&pk_bs58, *block_height, note),
                 }?;
             }
         }