Add QR Orchard note version support

src/builder.rs

@@ -16,7 +16,10 @@ use crate::{
         FullViewingKey, OutgoingViewingKey, Scope, SpendAuthorizingKey, SpendValidatingKey,
         SpendingKey,
     },
-    note::{ExtractedNoteCommitment, Note, Nullifier, Rho, TransmittedNoteCiphertext},
+    note::{
+        ExtractedNoteCommitment, Note, NoteVersion, Nullifier, Rho, TransmittedNoteCiphertext,
+        DEFAULT_NOTE_VERSION,
+    },
     note_encryption::OrchardNoteEncryption,
     primitives::redpallas::{self, Binding, SpendAuth},
     tree::{Anchor, MerklePath},
@@ -335,10 +338,13 @@ pub struct OutputInfo {
     recipient: Address,
     value: NoteValue,
     memo: [u8; 512],
+    note_version: NoteVersion,
 }
 
 impl OutputInfo {
     /// Constructs a new OutputInfo from its constituent parts.
+    ///
+    /// This uses [`DEFAULT_NOTE_VERSION`].
     pub fn new(
         ovk: Option<OutgoingViewingKey>,
         recipient: Address,
@@ -350,6 +356,24 @@ impl OutputInfo {
             recipient,
             value,
             memo,
+            note_version: DEFAULT_NOTE_VERSION,
+        }
+    }
+
+    /// Constructs a new OutputInfo with a specified [`NoteVersion`].
+    pub fn new_with_version(
+        ovk: Option<OutgoingViewingKey>,
+        recipient: Address,
+        value: NoteValue,
+        memo: [u8; 512],
+        note_version: NoteVersion,
+    ) -> Self {
+        Self {
+            ovk,
+            recipient,
+            value,
+            memo,
+            note_version,
         }
     }
 
@@ -375,7 +399,8 @@ impl OutputInfo {
         mut rng: impl RngCore,
     ) -> (Note, ExtractedNoteCommitment, TransmittedNoteCiphertext) {
         let rho = Rho::from_nf_old(nf_old);
-        let note = Note::new(self.recipient, self.value, rho, &mut rng);
+        let note =
+            Note::new_with_version(self.recipient, self.value, rho, &mut rng, self.note_version);
         let cm_new = note.commitment();
         let cmx = cm_new.into();
 
@@ -595,20 +620,40 @@ impl Builder {
     }
 
     /// Adds an address which will receive funds in this transaction.
+    ///
+    /// This uses [`DEFAULT_NOTE_VERSION`].
     pub fn add_output(
         &mut self,
         ovk: Option<OutgoingViewingKey>,
         recipient: Address,
         value: NoteValue,
         memo: [u8; 512],
+    ) -> Result<(), OutputError> {
+        self.add_output_with_version(ovk, recipient, value, memo, DEFAULT_NOTE_VERSION)
+    }
+
+    /// Adds an address which will receive funds in this transaction,
+    /// using the specified [`NoteVersion`].
+    pub fn add_output_with_version(
+        &mut self,
+        ovk: Option<OutgoingViewingKey>,
+        recipient: Address,
+        value: NoteValue,
+        memo: [u8; 512],
+        note_version: NoteVersion,
     ) -> Result<(), OutputError> {
         let flags = self.bundle_type.flags();
         if !flags.outputs_enabled() {
             return Err(OutputError::OutputsDisabled);
         }
 
-        self.outputs
-            .push(OutputInfo::new(ovk, recipient, value, memo));
+        self.outputs.push(OutputInfo::new_with_version(
+            ovk,
+            recipient,
+            value,
+            memo,
+            note_version,
+        ));
 
         Ok(())
     }

src/lib.rs

@@ -56,7 +56,7 @@ pub use address::Address;
 pub use bundle::Bundle;
 pub use constants::MERKLE_DEPTH_ORCHARD as NOTE_COMMITMENT_TREE_DEPTH;
 pub use constants::{L_ORCHARD_BASE, L_ORCHARD_SCALAR, L_VALUE};
-pub use note::Note;
+pub use note::{Note, NoteVersion};
 pub use tree::Anchor;
 
 /// A proof of the validity of an Orchard [`Bundle`].