2. change(rpc): Add some transaction fields to the getblocktemplate RPC

zebra-chain/src/amount.rs

@@ -7,7 +7,6 @@
 
 use std::{
     cmp::Ordering,
-    convert::{TryFrom, TryInto},
     hash::{Hash, Hasher},
     marker::PhantomData,
     ops::RangeInclusive,
@@ -28,7 +27,8 @@ pub type Result<T, E = Error> = std::result::Result<T, E>;
 /// A runtime validated type for representing amounts of zatoshis
 #[derive(Clone, Copy, Serialize, Deserialize)]
 #[serde(try_from = "i64")]
-#[serde(bound = "C: Constraint")]
+#[serde(into = "i64")]
+#[serde(bound = "C: Constraint + Clone")]
 pub struct Amount<C = NegativeAllowed>(
     /// The inner amount value.
     i64,
@@ -498,6 +498,26 @@ impl Constraint for NonNegative {
     }
 }
 
+/// Marker type for `Amount` that requires negative or zero values.
+///
+/// Used for coinbase transactions in `getblocktemplate` RPCs.
+///
+/// ```
+/// # use zebra_chain::amount::{Constraint, MAX_MONEY, NegativeOrZero};
+/// assert_eq!(
+///     NegativeOrZero::valid_range(),
+///     -MAX_MONEY..=0,
+/// );
+/// ```
+#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+pub struct NegativeOrZero;
+
+impl Constraint for NegativeOrZero {
+    fn valid_range() -> RangeInclusive<i64> {
+        -MAX_MONEY..=0
+    }
+}
+
 /// Number of zatoshis in 1 ZEC
 pub const COIN: i64 = 100_000_000;
 

zebra-chain/src/block/commitment.rs

@@ -1,5 +1,6 @@
 //! The Commitment enum, used for the corresponding block header field.
 
+use hex::{FromHex, ToHex};
 use thiserror::Error;
 
 use crate::{
@@ -159,6 +160,62 @@ impl From<ChainHistoryMmrRootHash> for [u8; 32] {
     }
 }
 
+impl ChainHistoryMmrRootHash {
+    /// Return the hash bytes in big-endian byte-order suitable for printing out byte by byte.
+    ///
+    /// Zebra displays transaction and block hashes in big-endian byte-order,
+    /// following the u256 convention set by Bitcoin and zcashd.
+    pub fn bytes_in_display_order(&self) -> [u8; 32] {
+        let mut reversed_bytes = self.0;
+        reversed_bytes.reverse();
+        reversed_bytes
+    }
+
+    /// Convert bytes in big-endian byte-order into a `ChainHistoryMmrRootHash`.
+    ///
+    /// Zebra displays transaction and block hashes in big-endian byte-order,
+    /// following the u256 convention set by Bitcoin and zcashd.
+    pub fn from_bytes_in_display_order(
+        bytes_in_display_order: &[u8; 32],
+    ) -> ChainHistoryMmrRootHash {
+        let mut internal_byte_order = *bytes_in_display_order;
+        internal_byte_order.reverse();
+
+        ChainHistoryMmrRootHash(internal_byte_order)
+    }
+}
+
+impl ToHex for &ChainHistoryMmrRootHash {
+    fn encode_hex<T: FromIterator<char>>(&self) -> T {
+        self.bytes_in_display_order().encode_hex()
+    }
+
+    fn encode_hex_upper<T: FromIterator<char>>(&self) -> T {
+        self.bytes_in_display_order().encode_hex_upper()
+    }
+}
+
+impl ToHex for ChainHistoryMmrRootHash {
+    fn encode_hex<T: FromIterator<char>>(&self) -> T {
+        (&self).encode_hex()
+    }
+
+    fn encode_hex_upper<T: FromIterator<char>>(&self) -> T {
+        (&self).encode_hex_upper()
+    }
+}
+
+impl FromHex for ChainHistoryMmrRootHash {
+    type Error = <[u8; 32] as FromHex>::Error;
+
+    fn from_hex<T: AsRef<[u8]>>(hex: T) -> Result<Self, Self::Error> {
+        let mut hash = <[u8; 32]>::from_hex(hex)?;
+        hash.reverse();
+
+        Ok(hash.into())
+    }
+}
+
 /// A block commitment to chain history and transaction auth.
 /// - the chain history tree for all ancestors in the current network upgrade,
 ///   and
@@ -212,6 +269,60 @@ impl ChainHistoryBlockTxAuthCommitmentHash {
             .expect("32 byte array");
         Self(hash_block_commitments)
     }
+
+    /// Return the hash bytes in big-endian byte-order suitable for printing out byte by byte.
+    ///
+    /// Zebra displays transaction and block hashes in big-endian byte-order,
+    /// following the u256 convention set by Bitcoin and zcashd.
+    pub fn bytes_in_display_order(&self) -> [u8; 32] {
+        let mut reversed_bytes = self.0;
+        reversed_bytes.reverse();
+        reversed_bytes
+    }
+
+    /// Convert bytes in big-endian byte-order into a `ChainHistoryBlockTxAuthCommitmentHash`.
+    ///
+    /// Zebra displays transaction and block hashes in big-endian byte-order,
+    /// following the u256 convention set by Bitcoin and zcashd.
+    pub fn from_bytes_in_display_order(
+        bytes_in_display_order: &[u8; 32],
+    ) -> ChainHistoryBlockTxAuthCommitmentHash {
+        let mut internal_byte_order = *bytes_in_display_order;
+        internal_byte_order.reverse();
+
+        ChainHistoryBlockTxAuthCommitmentHash(internal_byte_order)
+    }
+}
+
+impl ToHex for &ChainHistoryBlockTxAuthCommitmentHash {
+    fn encode_hex<T: FromIterator<char>>(&self) -> T {
+        self.bytes_in_display_order().encode_hex()
+    }
+
+    fn encode_hex_upper<T: FromIterator<char>>(&self) -> T {
+        self.bytes_in_display_order().encode_hex_upper()
+    }
+}
+
+impl ToHex for ChainHistoryBlockTxAuthCommitmentHash {
+    fn encode_hex<T: FromIterator<char>>(&self) -> T {
+        (&self).encode_hex()
+    }
+
+    fn encode_hex_upper<T: FromIterator<char>>(&self) -> T {
+        (&self).encode_hex_upper()
+    }
+}
+
+impl FromHex for ChainHistoryBlockTxAuthCommitmentHash {
+    type Error = <[u8; 32] as FromHex>::Error;
+
+    fn from_hex<T: AsRef<[u8]>>(hex: T) -> Result<Self, Self::Error> {
+        let mut hash = <[u8; 32]>::from_hex(hex)?;
+        hash.reverse();
+
+        Ok(hash.into())
+    }
 }
 
 /// Errors that can occur when checking RootHash consensus rules.