modify

Author: Esau

starter-token/reference/contract/Nargo.toml

@@ -6,4 +6,4 @@ type = "contract"
 
 [dependencies]
 aztec = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v1.2.1", directory = "noir-projects/aztec-nr/aztec" }
-uint_note = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v1.2.1", directory = "noir-projects/aztec-nr/uint-note" }
+easy_private_state = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v1.2.1", directory = "noir-projects/aztec-nr/easy-easy_private-state" }

starter-token/reference/contract/src/main.nr

@@ -13,12 +13,14 @@ pub contract StarterToken {
         protocol_types::address::AztecAddress,
     };
 
+    use easy_private_state::EasyPrivateUint;
+
     #[storage]
     struct Storage<Context> {
         balances: Map<AztecAddress, PublicMutable<u128, Context>, Context>,
         owner: PublicMutable<AztecAddress, Context>,
         // ===============
-        private_balances: Map<AztecAddress, PrivateSet<UintNote, Context>, Context>,
+        private_balances: Map<AztecAddress, EasyPrivateUint<Context>, Context>,
     }
 
     #[initializer]
@@ -67,38 +69,16 @@ pub contract StarterToken {
     fn mint_private(to: AztecAddress, amount: u128) {
         GettingStarted::at(context.this_address())._assert_is_owner(context.msg_sender()).enqueue(&mut context);
 
-        storage.private_balances.at(to)
-            .insert(UintNote::new(value, to))
-            .emit(encode_and_encrypt_note(&mut context, to));
+        storage.private_balances.at(to).add(value, to);
     }
 
     #[private]
     fn transfer_private(to: AztecAddress, amount: u128) {
         let sender = context.msg_sender();
 
-        // This can be optimized with a preprocessor
-        // This will fail in a case where the accumulated note value < amount, but we have more notes than what can be read in one iteration.
-        let notes = storage.private_balances.at(sender).pop_notes(NoteGetterOptions::new());
-
-        // This is a very naive approach that just consolidates all the user's notes into one change note.
-        let mut subtracted = 0 as u128;
-        for i in 0..notes.len() {
-            let note = notes.get_unchecked(i);
-            subtracted = subtracted + note.get_value();
-        }
-
-        assert(subtracted >= amount);
-
-        storage.private_balances.at(to)
-            .insert(UintNote::new(amount, to))
-            .emit(encode_and_encrypt_note(&mut context, to));
-
-        let change = subtracted - amount;
+        storage.private_balances.at(sender).sub(amount, sender);
 
-        // This possibly creates a change note of 0, but that is okay in our case because we will be consolidating via this method
-        storage.private_balances.at(sender)
-            .insert(UintNote::new(change, sender))
-            .emit(encode_and_encrypt_note(&mut context, sender, sender));
+        storage.private_balances.at(to).add(amount, to);
     }
 
     #[public]