-
Notifications
You must be signed in to change notification settings - Fork 108
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Implement a WtxId struct, and use it in Zebra's external network prot…
…ocol (#2618) * Make the `AuthDigest` display order match transaction IDs And derive `Hash`, just like transaction IDs. Don't derive `serde` for now, because it's not needed. * Move transaction::Hash test to tests module * Add a simple AuthDigest display order test * Add a WtxId type for wide transaction IDs * Add conversions between transaction IDs and bytes * Use the WtxId type in external network protocol messages
- Loading branch information
Showing
9 changed files
with
472 additions
and
68 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,20 +1,108 @@ | ||
use crate::primitives::zcash_primitives::auth_digest; | ||
use std::fmt; | ||
|
||
#[cfg(any(test, feature = "proptest-impl"))] | ||
use proptest_derive::Arbitrary; | ||
|
||
use crate::{ | ||
primitives::zcash_primitives::auth_digest, | ||
serialization::{ | ||
ReadZcashExt, SerializationError, WriteZcashExt, ZcashDeserialize, ZcashSerialize, | ||
}, | ||
}; | ||
|
||
use super::Transaction; | ||
|
||
/// An authorizing data commitment hash as specified in [ZIP-244]. | ||
/// | ||
/// [ZIP-244]: https://zips.z.cash/zip-0244.. | ||
#[derive(Copy, Clone, Eq, PartialEq, Debug)] | ||
/// Note: Zebra displays transaction and block hashes in big-endian byte-order, | ||
/// following the u256 convention set by Bitcoin and zcashd. | ||
/// | ||
/// [ZIP-244]: https://zips.z.cash/zip-0244 | ||
#[derive(Copy, Clone, Eq, PartialEq, Hash)] | ||
#[cfg_attr(any(test, feature = "proptest-impl"), derive(Arbitrary))] | ||
pub struct AuthDigest(pub(crate) [u8; 32]); | ||
|
||
impl<'a> From<&'a Transaction> for AuthDigest { | ||
impl From<Transaction> for AuthDigest { | ||
/// Computes the authorizing data commitment for a transaction. | ||
/// | ||
/// # Panics | ||
/// | ||
/// If passed a pre-v5 transaction. | ||
fn from(transaction: Transaction) -> Self { | ||
// use the ref implementation, to avoid cloning the transaction | ||
AuthDigest::from(&transaction) | ||
} | ||
} | ||
|
||
impl From<&Transaction> for AuthDigest { | ||
/// Computes the authorizing data commitment for a transaction. | ||
/// | ||
/// # Panics | ||
/// | ||
/// If passed a pre-v5 transaction. | ||
fn from(transaction: &'a Transaction) -> Self { | ||
fn from(transaction: &Transaction) -> Self { | ||
auth_digest(transaction) | ||
} | ||
} | ||
|
||
impl From<[u8; 32]> for AuthDigest { | ||
fn from(bytes: [u8; 32]) -> Self { | ||
Self(bytes) | ||
} | ||
} | ||
|
||
impl From<AuthDigest> for [u8; 32] { | ||
fn from(auth_digest: AuthDigest) -> Self { | ||
auth_digest.0 | ||
} | ||
} | ||
|
||
impl From<&AuthDigest> for [u8; 32] { | ||
fn from(auth_digest: &AuthDigest) -> Self { | ||
(*auth_digest).into() | ||
} | ||
} | ||
|
||
impl fmt::Display for AuthDigest { | ||
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { | ||
let mut reversed_bytes = self.0; | ||
reversed_bytes.reverse(); | ||
f.write_str(&hex::encode(&reversed_bytes)) | ||
} | ||
} | ||
|
||
impl fmt::Debug for AuthDigest { | ||
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { | ||
let mut reversed_bytes = self.0; | ||
reversed_bytes.reverse(); | ||
f.debug_tuple("AuthDigest") | ||
.field(&hex::encode(reversed_bytes)) | ||
.finish() | ||
} | ||
} | ||
|
||
impl std::str::FromStr for AuthDigest { | ||
type Err = SerializationError; | ||
|
||
fn from_str(s: &str) -> Result<Self, Self::Err> { | ||
let mut bytes = [0; 32]; | ||
if hex::decode_to_slice(s, &mut bytes[..]).is_err() { | ||
Err(SerializationError::Parse("hex decoding error")) | ||
} else { | ||
bytes.reverse(); | ||
Ok(AuthDigest(bytes)) | ||
} | ||
} | ||
} | ||
|
||
impl ZcashSerialize for AuthDigest { | ||
fn zcash_serialize<W: std::io::Write>(&self, mut writer: W) -> Result<(), std::io::Error> { | ||
writer.write_32_bytes(&self.into()) | ||
} | ||
} | ||
|
||
impl ZcashDeserialize for AuthDigest { | ||
fn zcash_deserialize<R: std::io::Read>(mut reader: R) -> Result<Self, SerializationError> { | ||
Ok(reader.read_32_bytes()?.into()) | ||
} | ||
} |
Oops, something went wrong.