rusk-wallet: Aclimate to new phoenix_balance method

dusk-network · Sep 5, 2024 · 00df9aa · 00df9aa
1 parent 2b4e884
commit 00df9aa
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 6 deletions.
diff --git a/rusk-wallet/src/wallet.rs b/rusk-wallet/src/wallet.rs
@@ -356,15 +356,21 @@ impl<F: SecureWalletFile + Debug> Wallet<F> {
         }
 
         let index = addr.index()?;
-        let notes: Vec<Note> = state
+        let notes: Vec<NoteLeaf> = state
             .fetch_notes(addr.pk())?
             .into_iter()
-            .map(|data| data.note)
+            .map(|data| NoteLeaf {
+                note: data.note,
+                block_height: data.height,
+            })
             .collect();
 
         let seed = self.store.get_seed();
 
-        Ok(phoenix_balance(&derive_phoenix_vk(seed, index), notes))
+        Ok(phoenix_balance(
+            &derive_phoenix_vk(seed, index),
+            notes.into_iter(),
+        ))
     }
 
     /// Creates a new public address.
@@ -679,7 +685,7 @@ impl<F: SecureWalletFile + Debug> Wallet<F> {
         let tx = state.prove_and_propagate(withdraw);
 
         sender_sk.zeroize();
-        stake_sk.zerorize();
+        stake_sk.zeroize();
 
         tx
     }

diff --git a/wallet-core/Cargo.toml b/wallet-core/Cargo.toml
@@ -15,7 +15,7 @@ sha2 = { version = "0.10", default-features = false }
 rand = { version = "0.8", default-features = false }
 ff = { version = "0.13", default-features = false }
 poseidon-merkle = { version = "0.7", features = ["rkyv-impl"] }
-execution-core = { version = "0.1", path = "../execution-core/", default-features = false }
+execution-core = { version = "0.1", path = "../execution-core/" }
 
 [target.'cfg(target_family = "wasm")'.dependencies]
 dlmalloc = { version = "0.2", features = ["global"] }

diff --git a/wallet-core/tests/notes.rs b/wallet-core/tests/notes.rs
@@ -73,7 +73,7 @@ fn test_map_owned() {
         PhoenixPublicKey::from(&PhoenixSecretKey::random(&mut rng));
 
     let value = 42;
-    let note_leaves = vec![
+    let note_leaves: Vec<Note> = vec![
         gen_note(&mut rng, true, &owner_1_pks[0], value), // owner 1
         gen_note(&mut rng, true, &owner_1_pks[1], value), // owner 1
         gen_note(&mut rng, true, &owner_2_pks[0], value), // owner 2
@@ -82,6 +82,14 @@ fn test_map_owned() {
         gen_note(&mut rng, true, &owner_3_pk, value),     // owner 3
     ];
 
+    let note_leaves: Vec<NoteLeaf> = note_leaves
+        .into_iter()
+        .map(|note| NoteLeaf {
+            note,
+            block_height: 0,
+        })
+        .collect();
+
     // notes with idx 0, 1 and 4 are owned by owner_1
     let notes_by_1 = map_owned(&owner_1_sks, &note_leaves);
     assert_eq!(notes_by_1.len(), 3);
@@ -143,6 +151,14 @@ fn test_balance() {
         spendable: 34,
     };
 
+    let notes: Vec<NoteLeaf> = notes
+        .into_iter()
+        .map(|note| NoteLeaf {
+            note,
+            block_height: 0,
+        })
+        .collect();
+
     assert_eq!(
         phoenix_balance(&(&owner_sk).into(), notes.iter()),
         expected_balance