merge-queue: embarking main (eb98b7a) and [#3501 + #3499 + #3498 + #3507] together

zebra-chain/src/orchard/shielded_data.rs

@@ -26,16 +26,22 @@ use crate::{
 #[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
 pub struct ShieldedData {
     /// The orchard flags for this transaction.
+    /// Denoted as `flagsOrchard` in the spec.
     pub flags: Flags,
     /// The net value of Orchard spends minus outputs.
+    /// Denoted as `valueBalanceOrchard` in the spec.
     pub value_balance: Amount,
     /// The shared anchor for all `Spend`s in this transaction.
+    /// Denoted as `anchorOrchard` in the spec.
     pub shared_anchor: tree::Root,
     /// The aggregated zk-SNARK proof for all the actions in this transaction.
+    /// Denoted as `proofsOrchard` in the spec.
     pub proof: Halo2Proof,
     /// The Orchard Actions, in the order they appear in the transaction.
+    /// Denoted as `vActionsOrchard` and `vSpendAuthSigsOrchard` in the spec.
     pub actions: AtLeastOne<AuthorizedAction>,
     /// A signature on the transaction `sighash`.
+    /// Denoted as `bindingSigOrchard` in the spec.
     pub binding_sig: Signature<Binding>,
 }
 

zebra-chain/src/sapling/shielded_data.rs

@@ -90,6 +90,7 @@ where
     AnchorV: AnchorVariant + Clone,
 {
     /// The net value of Sapling spend transfers minus output transfers.
+    /// Denoted as `valueBalanceSapling` in the spec.
     pub value_balance: Amount,
 
     /// A bundle of spends and outputs, containing at least one spend or
@@ -100,6 +101,7 @@ where
     pub transfers: TransferData<AnchorV>,
 
     /// A signature on the transaction hash.
+    /// Denoted as `bindingSigSapling` in the spec.
     pub binding_sig: Signature<Binding>,
 }
 

zebra-chain/src/transaction/joinsplit.rs

@@ -42,9 +42,9 @@ pub struct JoinSplitData<P: ZkSnarkProof> {
         deserialize = "JoinSplit<P>: Deserialize<'de>"
     ))]
     pub rest: Vec<JoinSplit<P>>,
-    /// The public key for the JoinSplit signature.
+    /// The public key for the JoinSplit signature, denoted as `joinSplitPubKey` in the spec.
     pub pub_key: ed25519::VerificationKeyBytes,
-    /// The JoinSplit signature.
+    /// The JoinSplit signature, denoted as `joinSplitSig` in the spec.
     pub sig: ed25519::Signature,
 }