diff --git a/Cargo.toml b/Cargo.toml index dc7ee048d9..9e6581ece1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,4 +23,4 @@ zcash_encoding = { path = "components/zcash_encoding" } zcash_note_encryption = { path = "components/zcash_note_encryption" } schemer = { git = "https://github.com/aschampion/schemer.git", rev = "6726b60f43f72c6e24a18d31be0ec7d42829e5e1" } schemer-rusqlite = { git = "https://github.com/aschampion/schemer.git", rev = "6726b60f43f72c6e24a18d31be0ec7d42829e5e1" } -orchard = { version = "0.3", git = "https://github.com/QED-it/orchard", rev = "35da288c7867c5b0fb0ae84e444915689e49084c" } +orchard = { version = "0.3", git = "https://github.com/QED-it/orchard", rev = "65c9f1817c55e05319dc8e0e118f647f29ffd178" } diff --git a/zcash_history/Cargo.toml b/zcash_history/Cargo.toml index 2cec07fdbe..940a28595e 100644 --- a/zcash_history/Cargo.toml +++ b/zcash_history/Cargo.toml @@ -14,6 +14,10 @@ assert_matches = "1.3.0" quickcheck = "0.9" [dependencies] +# TODO: Pined until we move to rust v1.64.0 or above to support winnow > 0.4.1 +winnow = "=0.4.1" +# TODO: Pined until we move to rust v1.64.0 or above to support toml_datetime > 0.6.1 +toml_datetime = "=0.6.1" primitive-types = "0.11" byteorder = "1" blake2 = { package = "blake2b_simd", version = "1" } diff --git a/zcash_primitives/src/transaction/components/orchard.rs b/zcash_primitives/src/transaction/components/orchard.rs index 4bd1aa7809..32077d56cc 100644 --- a/zcash_primitives/src/transaction/components/orchard.rs +++ b/zcash_primitives/src/transaction/components/orchard.rs @@ -16,6 +16,11 @@ use zcash_encoding::{Array, CompactSize, Vector}; use super::Amount; use crate::transaction::Transaction; +mod burn_serialization; +mod burn_validation; + +use burn_serialization::{read_bundle_burn, write_bundle_burn}; + pub const FLAG_SPENDS_ENABLED: u8 = 0b0000_0001; pub const FLAG_OUTPUTS_ENABLED: u8 = 0b0000_0010; pub const FLAGS_EXPECTED_UNSET: u8 = !(FLAG_SPENDS_ENABLED | FLAG_OUTPUTS_ENABLED); @@ -44,6 +49,7 @@ pub fn read_v5_bundle( } else { let flags = read_flags(&mut reader)?; let value_balance = Transaction::read_amount(&mut reader)?; + let burn = read_bundle_burn(&mut reader)?; let anchor = read_anchor(&mut reader)?; let proof_bytes = Vector::read(&mut reader, |r| r.read_u8())?; let actions = NonEmpty::from_vec( @@ -64,7 +70,7 @@ pub fn read_v5_bundle( actions, flags, value_balance, - vec![], // TODO implement "burn" reading and writing + burn, anchor, authorization, ))) @@ -194,6 +200,7 @@ pub fn write_v5_bundle( writer.write_all(&[bundle.flags().to_byte()])?; writer.write_all(&bundle.value_balance().to_i64_le_bytes())?; + write_bundle_burn(&mut writer, bundle.burn())?; writer.write_all(&bundle.anchor().to_bytes())?; Vector::write( &mut writer, diff --git a/zcash_primitives/src/transaction/components/orchard/burn_serialization.rs b/zcash_primitives/src/transaction/components/orchard/burn_serialization.rs new file mode 100644 index 0000000000..12198ca92f --- /dev/null +++ b/zcash_primitives/src/transaction/components/orchard/burn_serialization.rs @@ -0,0 +1,114 @@ +use std::io::{self, Read, Write}; + +use orchard::note::AssetBase; + +use zcash_encoding::Vector; + +use crate::transaction::Transaction; + +use super::{burn_validation::validate_bundle_burn, Amount}; + +fn read_asset_base(mut reader: R) -> io::Result { + let mut bytes = [0u8; 32]; + + reader.read_exact(&mut bytes)?; + + Option::from(AssetBase::from_bytes(&bytes)) + .ok_or_else(|| io::Error::new(io::ErrorKind::InvalidData, "Invalid AssetBase!")) +} + +fn read_asset_burn(mut reader: R) -> io::Result<(AssetBase, Amount)> { + let asset_base = read_asset_base(&mut reader)?; + let amount = Transaction::read_amount(&mut reader)?; + + Ok((asset_base, amount)) +} + +pub fn read_bundle_burn(mut reader: R) -> io::Result> { + let burn = Vector::read(&mut reader, |r| read_asset_burn(r))?; + validate_bundle_burn(&burn) + .map_err(|err| io::Error::new(io::ErrorKind::InvalidData, err.to_string()))?; + Ok(burn) +} + +fn write_amount(mut writer: W, amount: &Amount) -> io::Result<()> { + writer.write_all(&amount.to_i64_le_bytes()) +} + +fn write_asset_base(mut writer: W, asset_base: &AssetBase) -> io::Result<()> { + writer.write_all(&asset_base.to_bytes()) +} + +fn write_asset_burn( + mut writer: W, + (asset_base, amount): &(AssetBase, Amount), +) -> io::Result<()> { + write_asset_base(&mut writer, asset_base)?; + write_amount(&mut writer, amount)?; + + Ok(()) +} + +pub fn write_bundle_burn( + mut writer: W, + bundle_burn: &[(AssetBase, Amount)], +) -> io::Result<()> { + Vector::write(&mut writer, bundle_burn, |w, b| write_asset_burn(w, b)) +} + +#[cfg(test)] +mod tests { + use super::*; + + use std::io::Cursor; + + use crate::transaction::tests::create_test_asset; + + use super::super::burn_validation::BurnError; + + #[test] + fn test_read_write_bundle_burn_success() { + let bundle_burn = (1..10) + .map(|i| { + ( + create_test_asset(&format!("Asset {i}")), + Amount::from_u64(i * 10).unwrap(), + ) + }) + .collect::>(); + + let mut buffer = Vec::new(); + let mut cursor = Cursor::new(&mut buffer); + write_bundle_burn(&mut cursor, &bundle_burn).unwrap(); + + cursor.set_position(0); + let result = read_bundle_burn(&mut cursor).unwrap(); + + assert_eq!(result, bundle_burn); + } + + // This test implementation covers only one failure case intentionally, + // as the other cases are already covered in the validate_bundle_burn tests. + #[test] + fn test_read_bundle_burn_duplicate_asset() { + let bundle_burn = vec![ + (create_test_asset("Asset 1"), Amount::from_u64(10).unwrap()), + (create_test_asset("Asset 1"), Amount::from_u64(20).unwrap()), + (create_test_asset("Asset 3"), Amount::from_u64(10).unwrap()), + ]; + + let mut buffer = Vec::new(); + let mut cursor = Cursor::new(&mut buffer); + + write_bundle_burn(&mut cursor, &bundle_burn).unwrap(); + + cursor.set_position(0); + + let result = read_bundle_burn(&mut cursor); + + assert!( + matches!(result, Err(ref err) if err.kind() == io::ErrorKind::InvalidData && + err.to_string() == BurnError::DuplicateAsset.to_string()) + ); + } +} diff --git a/zcash_primitives/src/transaction/components/orchard/burn_validation.rs b/zcash_primitives/src/transaction/components/orchard/burn_validation.rs new file mode 100644 index 0000000000..bc2d7ab303 --- /dev/null +++ b/zcash_primitives/src/transaction/components/orchard/burn_validation.rs @@ -0,0 +1,118 @@ +use std::fmt; + +use orchard::note::AssetBase; + +use super::Amount; + +// FIXME: Consider making tuple (AssetBase, Amount) a new type. + +#[derive(Debug)] +#[cfg_attr(test, derive(PartialEq))] +pub enum BurnError { + DuplicateAsset, + NativeAsset, + ZeroAmount, +} + +impl fmt::Display for BurnError { + fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + match *self { + BurnError::DuplicateAsset => write!(f, "Encountered a duplicate asset to burn."), + BurnError::NativeAsset => write!(f, "Cannot burn a native asset."), + BurnError::ZeroAmount => write!(f, "Cannot burn an asset with a zero amount."), + } + } +} + +/// Validates burns for a bundle by ensuring each asset is unique, non-native, and has a non-zero value. +/// +/// Each burn element is represented as a tuple of `AssetBase` and `Amount`, where `AssetBase` identifies +/// the asset to be burned and `Amount` is the quantity to burn. +/// +/// # Arguments +/// +/// * `burns` - A vector of burns, where each burn is represented as a tuple of `AssetBase` and `Amount`. +/// +/// # Errors +/// +/// Returns a `BurnError` if: +/// * Any asset in the list of burns is not unique (`BurnError::DuplicateAsset`). +/// * Any asset in the list of burns is native (`BurnError::NativeAsset`). +/// * Any asset in the list of burns has a zero amount (`BurnError::ZeroAmount`). +pub fn validate_bundle_burn(bundle_burn: &Vec<(AssetBase, Amount)>) -> Result<(), BurnError> { + let mut asset_set = std::collections::HashSet::::new(); + + for (asset, amount) in bundle_burn { + if !asset_set.insert(*asset) { + return Err(BurnError::DuplicateAsset); + } + if asset.is_native().into() { + return Err(BurnError::NativeAsset); + } + // FIXME: check for negative amounts? + if i64::from(amount) == 0 { + return Err(BurnError::ZeroAmount); + } + } + + Ok(()) +} + +#[cfg(test)] +mod tests { + use super::*; + + use crate::transaction::tests::create_test_asset; + + #[test] + fn test_validate_bundle_burn_success() { + let bundle_burn = vec![ + (create_test_asset("Asset 1"), Amount::from_u64(10).unwrap()), + (create_test_asset("Asset 2"), Amount::from_u64(20).unwrap()), + (create_test_asset("Asset 3"), Amount::from_u64(10).unwrap()), + ]; + + let result = validate_bundle_burn(&bundle_burn); + + assert!(result.is_ok()); + } + + #[test] + fn test_validate_bundle_burn_duplicate_asset() { + let bundle_burn = vec![ + (create_test_asset("Asset 1"), Amount::from_u64(10).unwrap()), + (create_test_asset("Asset 1"), Amount::from_u64(20).unwrap()), + (create_test_asset("Asset 3"), Amount::from_u64(10).unwrap()), + ]; + + let result = validate_bundle_burn(&bundle_burn); + + assert_eq!(result, Err(BurnError::DuplicateAsset)); + } + + #[test] + fn test_validate_bundle_burn_native_asset() { + let bundle_burn = vec![ + (create_test_asset("Asset 1"), Amount::from_u64(10).unwrap()), + (AssetBase::native(), Amount::from_u64(20).unwrap()), + (create_test_asset("Asset 3"), Amount::from_u64(10).unwrap()), + ]; + + let result = validate_bundle_burn(&bundle_burn); + + assert_eq!(result, Err(BurnError::NativeAsset)); + } + + #[test] + fn test_validate_bundle_burn_zero_amount() { + let bundle_burn = vec![ + (create_test_asset("Asset 1"), Amount::from_u64(10).unwrap()), + (create_test_asset("Asset 2"), Amount::from_u64(0).unwrap()), + (create_test_asset("Asset 3"), Amount::from_u64(10).unwrap()), + ]; + + let result = validate_bundle_burn(&bundle_burn); + + assert_eq!(result, Err(BurnError::ZeroAmount)); + } +} diff --git a/zcash_primitives/src/transaction/tests.rs b/zcash_primitives/src/transaction/tests.rs index 9335d89840..bddf82f466 100644 --- a/zcash_primitives/src/transaction/tests.rs +++ b/zcash_primitives/src/transaction/tests.rs @@ -23,6 +23,18 @@ use super::{ #[cfg(feature = "zfuture")] use super::components::tze; +pub fn create_test_asset(asset_desc: &str) -> orchard::note::AssetBase { + use orchard::{ + keys::{IssuanceAuthorizingKey, IssuanceValidatingKey, SpendingKey}, + note::AssetBase, + }; + + let sk = SpendingKey::from_bytes([0u8; 32]).unwrap(); + let isk: IssuanceAuthorizingKey = (&sk).into(); + + AssetBase::derive(&IssuanceValidatingKey::from(&isk), asset_desc) +} + #[test] fn tx_read_write() { let data = &self::data::tx_read_write::TX_READ_WRITE; diff --git a/zcash_primitives/src/transaction/tests/data.rs b/zcash_primitives/src/transaction/tests/data.rs index 0d95e28451..d8b57a1bfe 100644 --- a/zcash_primitives/src/transaction/tests/data.rs +++ b/zcash_primitives/src/transaction/tests/data.rs @@ -5952,29 +5952,29 @@ pub mod zip_0244 { 0x6a, 0x3c, 0xd9, 0xb6, 0xfb, 0xbf, 0xa4, 0xd7, 0x92, 0xf3, 0x4d, 0x7f, 0xd6, 0xe7, 0x63, 0xcd, 0x58, 0x59, 0xdd, 0x26, 0x83, 0x3d, 0x21, 0xd9, 0xbc, 0x54, 0x52, 0xbd, 0x19, 0x51, 0x5d, 0xff, 0x01, 0x6d, 0x0d, 0x4c, 0x07, 0xfb, 0x38, - 0x03, 0x00, 0x19, 0x3b, 0xed, 0xb9, 0xf0, 0x9a, 0x7f, 0x86, 0xcb, 0xbd, 0xf6, - 0x54, 0x18, 0xe0, 0x80, 0x0c, 0x70, 0x89, 0xd0, 0x29, 0xe7, 0xfb, 0xba, 0xf3, - 0xcf, 0x37, 0xe9, 0xb9, 0xa6, 0xb7, 0x76, 0x39, 0x3e, 0x4c, 0x5e, 0x6f, 0xda, - 0x57, 0xe8, 0xd5, 0xf1, 0x4c, 0x8c, 0x35, 0xa2, 0xd2, 0x70, 0x84, 0x6b, 0x9d, - 0xbe, 0x00, 0x5c, 0xda, 0x16, 0xaf, 0x44, 0x08, 0xf3, 0xab, 0x06, 0xa9, 0x16, - 0xee, 0xeb, 0x9c, 0x95, 0x94, 0xb7, 0x04, 0x24, 0xa4, 0xc1, 0xd1, 0x71, 0x29, - 0x5b, 0x67, 0x63, 0xb2, 0x2f, 0x47, 0xf8, 0x0b, 0x53, 0xcc, 0xbb, 0x90, 0x4b, - 0xd6, 0x8f, 0xd6, 0x5f, 0xbd, 0x3f, 0x74, 0x4e, 0x66, 0x78, 0x71, 0xba, 0xae, - 0x70, 0xde, 0x4b, 0xc9, 0x4b, 0x15, 0x0d, 0xa4, 0x16, 0xec, 0x5e, 0x70, 0x7f, - 0x3e, 0x48, 0x68, 0xa8, 0x53, 0x5e, 0xb7, 0x5b, 0xb8, 0x3e, 0x80, 0xb1, 0x6e, - 0x6a, 0x90, 0xe2, 0xd5, 0x07, 0xcd, 0xfe, 0x6f, 0xbd, 0xaa, 0x86, 0x16, 0x3e, - 0x9c, 0xf5, 0xde, 0x31, 0x00, 0xfb, 0xca, 0x7e, 0x8d, 0xa0, 0x47, 0xb0, 0x90, - 0xdb, 0x9f, 0x37, 0x95, 0x2f, 0xd3, 0x46, 0xb7, 0xf1, 0x68, 0xeb, 0xc5, 0xfc, - 0x8f, 0xe2, 0x53, 0xdd, 0x29, 0x27, 0x85, 0xd8, 0x9f, 0x82, 0xa6, 0xc6, 0x59, - 0xbb, 0x40, 0x3d, 0xc7, 0x32, 0xe5, 0x0b, 0xe6, 0x68, 0x4c, 0xba, 0xbd, 0x6b, - 0xbf, 0xfb, 0x43, 0xb6, 0x3a, 0x3b, 0x1b, 0x67, 0x1e, 0x40, 0xfe, 0xb0, 0xdb, - 0x00, 0x29, 0x74, 0xa3, 0xc3, 0xb1, 0xa7, 0x88, 0x56, 0x72, 0x31, 0xbf, 0x63, - 0x99, 0xff, 0x89, 0x23, 0x55, 0xe0, 0xbb, 0xde, 0xbe, 0xeb, 0xae, 0x2e, 0xdb, - 0x02, 0x5d, 0xe2, 0xf8, 0x68, 0x65, 0x8b, 0x38, 0x0c, 0x6f, 0xcf, 0xa2, 0x4c, - 0x07, 0x08, 0x25, 0xfc, 0x45, 0xed, 0xfc, 0xbd, 0x65, 0x91, 0x60, 0xb7, 0x08, - 0xe8, 0x08, 0x9f, 0x84, 0xd6, 0x37, 0xa8, 0xb0, 0x0b, 0x5e, 0x50, 0x19, 0xe8, - 0x1c, 0x15, 0x01, 0x03, 0x47, 0x53, 0x14, 0x6e, 0x22, 0xd0, 0x5f, 0x58, 0x6d, - 0x7f, 0x6b, 0x0f, + 0x03, 0x00, 0x00, 0x19, 0x3b, 0xed, 0xb9, 0xf0, 0x9a, 0x7f, 0x86, 0xcb, 0xbd, + 0xf6, 0x54, 0x18, 0xe0, 0x80, 0x0c, 0x70, 0x89, 0xd0, 0x29, 0xe7, 0xfb, 0xba, + 0xf3, 0xcf, 0x37, 0xe9, 0xb9, 0xa6, 0xb7, 0x76, 0x39, 0x3e, 0x4c, 0x5e, 0x6f, + 0xda, 0x57, 0xe8, 0xd5, 0xf1, 0x4c, 0x8c, 0x35, 0xa2, 0xd2, 0x70, 0x84, 0x6b, + 0x9d, 0xbe, 0x00, 0x5c, 0xda, 0x16, 0xaf, 0x44, 0x08, 0xf3, 0xab, 0x06, 0xa9, + 0x16, 0xee, 0xeb, 0x9c, 0x95, 0x94, 0xb7, 0x04, 0x24, 0xa4, 0xc1, 0xd1, 0x71, + 0x29, 0x5b, 0x67, 0x63, 0xb2, 0x2f, 0x47, 0xf8, 0x0b, 0x53, 0xcc, 0xbb, 0x90, + 0x4b, 0xd6, 0x8f, 0xd6, 0x5f, 0xbd, 0x3f, 0x74, 0x4e, 0x66, 0x78, 0x71, 0xba, + 0xae, 0x70, 0xde, 0x4b, 0xc9, 0x4b, 0x15, 0x0d, 0xa4, 0x16, 0xec, 0x5e, 0x70, + 0x7f, 0x3e, 0x48, 0x68, 0xa8, 0x53, 0x5e, 0xb7, 0x5b, 0xb8, 0x3e, 0x80, 0xb1, + 0x6e, 0x6a, 0x90, 0xe2, 0xd5, 0x07, 0xcd, 0xfe, 0x6f, 0xbd, 0xaa, 0x86, 0x16, + 0x3e, 0x9c, 0xf5, 0xde, 0x31, 0x00, 0xfb, 0xca, 0x7e, 0x8d, 0xa0, 0x47, 0xb0, + 0x90, 0xdb, 0x9f, 0x37, 0x95, 0x2f, 0xd3, 0x46, 0xb7, 0xf1, 0x68, 0xeb, 0xc5, + 0xfc, 0x8f, 0xe2, 0x53, 0xdd, 0x29, 0x27, 0x85, 0xd8, 0x9f, 0x82, 0xa6, 0xc6, + 0x59, 0xbb, 0x40, 0x3d, 0xc7, 0x32, 0xe5, 0x0b, 0xe6, 0x68, 0x4c, 0xba, 0xbd, + 0x6b, 0xbf, 0xfb, 0x43, 0xb6, 0x3a, 0x3b, 0x1b, 0x67, 0x1e, 0x40, 0xfe, 0xb0, + 0xdb, 0x00, 0x29, 0x74, 0xa3, 0xc3, 0xb1, 0xa7, 0x88, 0x56, 0x72, 0x31, 0xbf, + 0x63, 0x99, 0xff, 0x89, 0x23, 0x55, 0xe0, 0xbb, 0xde, 0xbe, 0xeb, 0xae, 0x2e, + 0xdb, 0x02, 0x5d, 0xe2, 0xf8, 0x68, 0x65, 0x8b, 0x38, 0x0c, 0x6f, 0xcf, 0xa2, + 0x4c, 0x07, 0x08, 0x25, 0xfc, 0x45, 0xed, 0xfc, 0xbd, 0x65, 0x91, 0x60, 0xb7, + 0x08, 0xe8, 0x08, 0x9f, 0x84, 0xd6, 0x37, 0xa8, 0xb0, 0x0b, 0x5e, 0x50, 0x19, + 0xe8, 0x1c, 0x15, 0x01, 0x03, 0x47, 0x53, 0x14, 0x6e, 0x22, 0xd0, 0x5f, 0x58, + 0x6d, 0x7f, 0x6b, 0x0f, ], txid: [ 0xbb, 0x52, 0xff, 0x82, 0xd9, 0xa4, 0xf0, 0x95, 0x8e, 0x2f, 0xb5, 0xfd, 0xb3, @@ -6156,31 +6156,31 @@ pub mod zip_0244 { 0x24, 0xae, 0x7b, 0xed, 0x65, 0xb4, 0xaf, 0xdc, 0x8f, 0x12, 0x78, 0xc3, 0x0e, 0x2d, 0xb9, 0x8f, 0xd1, 0x72, 0x73, 0x0a, 0xc6, 0xbb, 0xed, 0x4f, 0x11, 0x27, 0xcd, 0x32, 0xb0, 0x4a, 0x95, 0xb2, 0x05, 0x52, 0x6c, 0xfc, 0xb4, 0x01, 0xc4, - 0xd8, 0x1d, 0xba, 0x04, 0xa7, 0x02, 0x00, 0xfd, 0x6a, 0xcc, 0x0f, 0x22, 0x97, - 0x89, 0x16, 0x07, 0x22, 0xd1, 0x8a, 0x51, 0xab, 0xff, 0x33, 0x35, 0xf4, 0x3a, - 0x37, 0xdc, 0xa0, 0x78, 0x7e, 0x3e, 0xc9, 0xf6, 0x60, 0x52, 0x23, 0xd5, 0x3a, - 0x9a, 0xe0, 0xab, 0x90, 0x25, 0xb7, 0x3b, 0xc0, 0x3f, 0x7f, 0xac, 0x36, 0xc0, - 0x09, 0xa5, 0x6d, 0x4d, 0x95, 0xd1, 0xe8, 0x1d, 0x3b, 0x3e, 0xbc, 0xa7, 0xe5, - 0x4c, 0xc1, 0xa1, 0x2d, 0x12, 0x7b, 0x57, 0xc8, 0x13, 0x89, 0x76, 0xe7, 0x91, - 0x01, 0x3b, 0x01, 0x5f, 0x06, 0xa6, 0x24, 0xf5, 0x21, 0xb6, 0xee, 0x04, 0xec, - 0x98, 0x08, 0x93, 0xc7, 0xe5, 0xe0, 0x1a, 0x33, 0x62, 0x03, 0x59, 0x40, 0x94, - 0xf8, 0x28, 0x33, 0xd7, 0x44, 0x5f, 0xe2, 0xd0, 0x91, 0x30, 0xf6, 0x35, 0x11, - 0xda, 0x54, 0x83, 0x2d, 0xe9, 0x13, 0x6b, 0x39, 0xf4, 0x59, 0x9f, 0x5a, 0xa5, - 0xdf, 0xbb, 0x45, 0xda, 0x60, 0xcd, 0xce, 0xab, 0x7e, 0xef, 0xde, 0x89, 0xbe, - 0x63, 0xf3, 0xf7, 0xc0, 0xd2, 0x32, 0x48, 0x47, 0xcc, 0xe1, 0x40, 0x5d, 0xef, - 0x7c, 0x46, 0x9b, 0x0e, 0x27, 0x24, 0x94, 0xe5, 0xdf, 0x54, 0xf5, 0x68, 0x65, - 0x6c, 0xb9, 0xc8, 0x81, 0x8d, 0x92, 0xb7, 0x2b, 0x8b, 0xc3, 0x4d, 0xb7, 0xbb, - 0x31, 0x12, 0x48, 0x7e, 0x74, 0x6e, 0xef, 0xe4, 0xe8, 0x08, 0xbb, 0xb2, 0xc8, - 0x01, 0x67, 0x26, 0x4a, 0x28, 0x35, 0x95, 0xd8, 0x26, 0x29, 0xa5, 0x4d, 0x1b, - 0x5f, 0x57, 0x5e, 0x3e, 0x35, 0x60, 0x70, 0x2e, 0x4e, 0x0a, 0x11, 0x4a, 0xc7, - 0x17, 0xa7, 0xc5, 0x7f, 0x37, 0x80, 0xb3, 0x2f, 0xb1, 0xa6, 0xbe, 0x8d, 0x35, - 0x3f, 0xb6, 0x04, 0xcf, 0x5d, 0xc4, 0x94, 0xfb, 0xe7, 0x3d, 0xb2, 0x5e, 0x3d, - 0xba, 0xf7, 0xae, 0xd5, 0x04, 0xde, 0x93, 0x2a, 0xcb, 0x99, 0x17, 0xc2, 0x9b, - 0xe8, 0x2d, 0x7b, 0xcf, 0xbf, 0xc3, 0xf5, 0xef, 0xd9, 0xb8, 0x98, 0x8a, 0x53, - 0x93, 0xc4, 0xde, 0xda, 0xe6, 0xde, 0x88, 0x42, 0xc3, 0xc6, 0xe2, 0x97, 0x94, - 0xda, 0xc2, 0xee, 0x25, 0x32, 0xe8, 0x20, 0x9a, 0xa4, 0x89, 0x4c, 0xc6, 0xd7, - 0x28, 0x3c, 0xc0, 0x39, 0x5a, 0xc0, 0x35, 0x90, 0x03, 0x7e, 0x71, 0xe3, 0xe5, - 0x50, 0x72, 0x6d, 0x21, 0x0a, 0x2c, 0x68, 0x83, 0x42, 0x25, + 0xd8, 0x1d, 0xba, 0x04, 0xa7, 0x02, 0x00, 0x00, 0xfd, 0x6a, 0xcc, 0x0f, 0x22, + 0x97, 0x89, 0x16, 0x07, 0x22, 0xd1, 0x8a, 0x51, 0xab, 0xff, 0x33, 0x35, 0xf4, + 0x3a, 0x37, 0xdc, 0xa0, 0x78, 0x7e, 0x3e, 0xc9, 0xf6, 0x60, 0x52, 0x23, 0xd5, + 0x3a, 0x9a, 0xe0, 0xab, 0x90, 0x25, 0xb7, 0x3b, 0xc0, 0x3f, 0x7f, 0xac, 0x36, + 0xc0, 0x09, 0xa5, 0x6d, 0x4d, 0x95, 0xd1, 0xe8, 0x1d, 0x3b, 0x3e, 0xbc, 0xa7, + 0xe5, 0x4c, 0xc1, 0xa1, 0x2d, 0x12, 0x7b, 0x57, 0xc8, 0x13, 0x89, 0x76, 0xe7, + 0x91, 0x01, 0x3b, 0x01, 0x5f, 0x06, 0xa6, 0x24, 0xf5, 0x21, 0xb6, 0xee, 0x04, + 0xec, 0x98, 0x08, 0x93, 0xc7, 0xe5, 0xe0, 0x1a, 0x33, 0x62, 0x03, 0x59, 0x40, + 0x94, 0xf8, 0x28, 0x33, 0xd7, 0x44, 0x5f, 0xe2, 0xd0, 0x91, 0x30, 0xf6, 0x35, + 0x11, 0xda, 0x54, 0x83, 0x2d, 0xe9, 0x13, 0x6b, 0x39, 0xf4, 0x59, 0x9f, 0x5a, + 0xa5, 0xdf, 0xbb, 0x45, 0xda, 0x60, 0xcd, 0xce, 0xab, 0x7e, 0xef, 0xde, 0x89, + 0xbe, 0x63, 0xf3, 0xf7, 0xc0, 0xd2, 0x32, 0x48, 0x47, 0xcc, 0xe1, 0x40, 0x5d, + 0xef, 0x7c, 0x46, 0x9b, 0x0e, 0x27, 0x24, 0x94, 0xe5, 0xdf, 0x54, 0xf5, 0x68, + 0x65, 0x6c, 0xb9, 0xc8, 0x81, 0x8d, 0x92, 0xb7, 0x2b, 0x8b, 0xc3, 0x4d, 0xb7, + 0xbb, 0x31, 0x12, 0x48, 0x7e, 0x74, 0x6e, 0xef, 0xe4, 0xe8, 0x08, 0xbb, 0xb2, + 0xc8, 0x01, 0x67, 0x26, 0x4a, 0x28, 0x35, 0x95, 0xd8, 0x26, 0x29, 0xa5, 0x4d, + 0x1b, 0x5f, 0x57, 0x5e, 0x3e, 0x35, 0x60, 0x70, 0x2e, 0x4e, 0x0a, 0x11, 0x4a, + 0xc7, 0x17, 0xa7, 0xc5, 0x7f, 0x37, 0x80, 0xb3, 0x2f, 0xb1, 0xa6, 0xbe, 0x8d, + 0x35, 0x3f, 0xb6, 0x04, 0xcf, 0x5d, 0xc4, 0x94, 0xfb, 0xe7, 0x3d, 0xb2, 0x5e, + 0x3d, 0xba, 0xf7, 0xae, 0xd5, 0x04, 0xde, 0x93, 0x2a, 0xcb, 0x99, 0x17, 0xc2, + 0x9b, 0xe8, 0x2d, 0x7b, 0xcf, 0xbf, 0xc3, 0xf5, 0xef, 0xd9, 0xb8, 0x98, 0x8a, + 0x53, 0x93, 0xc4, 0xde, 0xda, 0xe6, 0xde, 0x88, 0x42, 0xc3, 0xc6, 0xe2, 0x97, + 0x94, 0xda, 0xc2, 0xee, 0x25, 0x32, 0xe8, 0x20, 0x9a, 0xa4, 0x89, 0x4c, 0xc6, + 0xd7, 0x28, 0x3c, 0xc0, 0x39, 0x5a, 0xc0, 0x35, 0x90, 0x03, 0x7e, 0x71, 0xe3, + 0xe5, 0x50, 0x72, 0x6d, 0x21, 0x0a, 0x2c, 0x68, 0x83, 0x42, 0x25, ], txid: [ 0x48, 0x9c, 0xea, 0x9c, 0x06, 0x30, 0x4d, 0x7d, 0x54, 0x8f, 0x7b, 0xc5, 0xb5, @@ -6342,23 +6342,23 @@ pub mod zip_0244 { 0x29, 0xf8, 0x62, 0x9d, 0x68, 0xf6, 0x96, 0x49, 0x24, 0x48, 0xdd, 0x52, 0x66, 0x97, 0x47, 0x6d, 0xc0, 0x61, 0x34, 0x6e, 0xbe, 0x3f, 0x67, 0x72, 0x17, 0xff, 0x9c, 0x60, 0xef, 0xce, 0x94, 0x3a, 0x00, 0x2e, 0xb9, 0xea, 0x07, 0xff, 0xce, - 0x04, 0x00, 0xc4, 0x9c, 0x60, 0x7f, 0xae, 0x20, 0xcb, 0x37, 0x80, 0xe3, 0x60, - 0x1f, 0xc0, 0x62, 0x58, 0x3b, 0x27, 0x44, 0xea, 0x88, 0x48, 0xb2, 0x62, 0x3a, - 0xc0, 0x7f, 0x8e, 0xf6, 0x1a, 0x81, 0xa3, 0x19, 0x30, 0xb8, 0xa1, 0xba, 0xf3, - 0x9a, 0x91, 0x9a, 0x7b, 0x60, 0xbc, 0x60, 0x4d, 0x63, 0x18, 0x5f, 0x75, 0x92, - 0x21, 0xd8, 0x47, 0xcc, 0x54, 0xa2, 0x27, 0x65, 0xa4, 0xc3, 0x34, 0x75, 0xb5, - 0x79, 0x1e, 0x9a, 0xf3, 0x27, 0x1f, 0xc8, 0xd9, 0x35, 0x06, 0x67, 0x09, 0x0d, - 0x81, 0x84, 0xec, 0x50, 0x52, 0x7d, 0x33, 0xa3, 0xa8, 0x40, 0x72, 0xb4, 0x73, - 0x7b, 0x32, 0xc7, 0x9a, 0x46, 0x40, 0x6c, 0x16, 0x9d, 0xf8, 0x59, 0xfb, 0x28, - 0x15, 0x4b, 0x01, 0x4c, 0xaf, 0xb7, 0xa3, 0xea, 0x7a, 0x21, 0x2e, 0x40, 0x17, - 0x2a, 0xf2, 0x18, 0xd7, 0xa1, 0xec, 0xfe, 0x65, 0xb4, 0xf7, 0x51, 0x00, 0x63, - 0x89, 0x83, 0xc1, 0x4d, 0xe4, 0x97, 0x47, 0x55, 0xda, 0xde, 0x80, 0x18, 0xc9, - 0xb8, 0xf4, 0x54, 0x3f, 0xf3, 0xc3, 0xfd, 0x86, 0x70, 0xc0, 0xbf, 0xbb, 0x3b, - 0x2c, 0x5d, 0xb8, 0x82, 0x3a, 0x6c, 0x8a, 0xe8, 0x2c, 0x45, 0xd1, 0x00, 0xbf, - 0x1c, 0xda, 0xdc, 0xb1, 0x11, 0x6e, 0xae, 0x3d, 0xb1, 0x00, 0x82, 0xd9, 0x3f, - 0xd2, 0x48, 0x04, 0x0d, 0xa9, 0x7d, 0x35, 0x43, 0x84, 0x3b, 0x86, 0xbf, 0x26, - 0x02, 0x1a, 0xfa, 0x92, 0x23, 0x9b, 0x87, 0x3d, 0xc6, 0xc3, 0x57, 0xea, 0xa8, - 0xaf, 0x4e, 0x26, + 0x04, 0x00, 0x00, 0xc4, 0x9c, 0x60, 0x7f, 0xae, 0x20, 0xcb, 0x37, 0x80, 0xe3, + 0x60, 0x1f, 0xc0, 0x62, 0x58, 0x3b, 0x27, 0x44, 0xea, 0x88, 0x48, 0xb2, 0x62, + 0x3a, 0xc0, 0x7f, 0x8e, 0xf6, 0x1a, 0x81, 0xa3, 0x19, 0x30, 0xb8, 0xa1, 0xba, + 0xf3, 0x9a, 0x91, 0x9a, 0x7b, 0x60, 0xbc, 0x60, 0x4d, 0x63, 0x18, 0x5f, 0x75, + 0x92, 0x21, 0xd8, 0x47, 0xcc, 0x54, 0xa2, 0x27, 0x65, 0xa4, 0xc3, 0x34, 0x75, + 0xb5, 0x79, 0x1e, 0x9a, 0xf3, 0x27, 0x1f, 0xc8, 0xd9, 0x35, 0x06, 0x67, 0x09, + 0x0d, 0x81, 0x84, 0xec, 0x50, 0x52, 0x7d, 0x33, 0xa3, 0xa8, 0x40, 0x72, 0xb4, + 0x73, 0x7b, 0x32, 0xc7, 0x9a, 0x46, 0x40, 0x6c, 0x16, 0x9d, 0xf8, 0x59, 0xfb, + 0x28, 0x15, 0x4b, 0x01, 0x4c, 0xaf, 0xb7, 0xa3, 0xea, 0x7a, 0x21, 0x2e, 0x40, + 0x17, 0x2a, 0xf2, 0x18, 0xd7, 0xa1, 0xec, 0xfe, 0x65, 0xb4, 0xf7, 0x51, 0x00, + 0x63, 0x89, 0x83, 0xc1, 0x4d, 0xe4, 0x97, 0x47, 0x55, 0xda, 0xde, 0x80, 0x18, + 0xc9, 0xb8, 0xf4, 0x54, 0x3f, 0xf3, 0xc3, 0xfd, 0x86, 0x70, 0xc0, 0xbf, 0xbb, + 0x3b, 0x2c, 0x5d, 0xb8, 0x82, 0x3a, 0x6c, 0x8a, 0xe8, 0x2c, 0x45, 0xd1, 0x00, + 0xbf, 0x1c, 0xda, 0xdc, 0xb1, 0x11, 0x6e, 0xae, 0x3d, 0xb1, 0x00, 0x82, 0xd9, + 0x3f, 0xd2, 0x48, 0x04, 0x0d, 0xa9, 0x7d, 0x35, 0x43, 0x84, 0x3b, 0x86, 0xbf, + 0x26, 0x02, 0x1a, 0xfa, 0x92, 0x23, 0x9b, 0x87, 0x3d, 0xc6, 0xc3, 0x57, 0xea, + 0xa8, 0xaf, 0x4e, 0x26, ], txid: [ 0xa3, 0x54, 0xb0, 0x9c, 0x01, 0x97, 0x84, 0x78, 0x0a, 0x7f, 0xd7, 0xa1, 0xb5, @@ -6692,42 +6692,42 @@ pub mod zip_0244 { 0x78, 0x2f, 0x45, 0xac, 0x1d, 0x07, 0xf6, 0xf6, 0xf5, 0xed, 0x73, 0x74, 0x1d, 0x57, 0x85, 0x83, 0x7a, 0x6b, 0x84, 0x4b, 0x47, 0x47, 0x75, 0x71, 0x8c, 0x29, 0xdd, 0x99, 0x08, 0x4e, 0x9f, 0x88, 0x03, 0xc9, 0x3a, 0xfc, 0xed, 0x83, 0x39, - 0x00, 0x00, 0xbf, 0x83, 0xfc, 0x07, 0x34, 0x96, 0x4c, 0xcd, 0x41, 0x1d, 0x1c, - 0x93, 0x57, 0x14, 0xe2, 0x4a, 0xab, 0x56, 0x6f, 0x4f, 0x08, 0x42, 0x40, 0x14, - 0xc4, 0xec, 0xa9, 0x1b, 0x59, 0x0f, 0x08, 0x2b, 0x67, 0x3f, 0x36, 0x1c, 0x87, - 0x41, 0x5d, 0x37, 0xbd, 0x20, 0xd7, 0x0f, 0xd0, 0xb5, 0x2b, 0x6d, 0xdf, 0x18, - 0x65, 0xf7, 0x66, 0x70, 0x2e, 0x32, 0xb0, 0x5b, 0x3c, 0xf1, 0x63, 0x0e, 0xe8, - 0x59, 0x7a, 0xae, 0x19, 0x63, 0x3f, 0x35, 0x16, 0xa8, 0x55, 0x5a, 0xc5, 0xbe, - 0x32, 0xc6, 0x75, 0xbe, 0x18, 0x17, 0xef, 0xbf, 0xfd, 0x93, 0x69, 0x04, 0x1a, - 0x08, 0x9c, 0x28, 0x3f, 0x19, 0x64, 0x99, 0x68, 0xc2, 0x49, 0x8c, 0xde, 0x56, - 0xf5, 0x00, 0x43, 0x4f, 0x28, 0x0d, 0x77, 0xa9, 0xc6, 0x2e, 0x43, 0xcb, 0xd3, - 0xf1, 0x36, 0xa4, 0xc6, 0xa0, 0x0a, 0x43, 0xe6, 0xed, 0x53, 0x0c, 0xb2, 0xe8, - 0xae, 0x83, 0x88, 0x60, 0xad, 0xc8, 0x8a, 0xac, 0x1c, 0xe6, 0x13, 0x81, 0x64, - 0x3e, 0xec, 0xd2, 0xcf, 0x72, 0x24, 0x8f, 0x78, 0x6f, 0x43, 0xd3, 0x0d, 0x78, - 0x37, 0xd0, 0x48, 0xe2, 0x60, 0x12, 0xcb, 0xaa, 0x6c, 0xe7, 0xbb, 0x57, 0x8a, - 0x1f, 0x85, 0xf2, 0x7d, 0xc3, 0xe9, 0x3c, 0xe4, 0x5e, 0x25, 0x3a, 0xc5, 0x8c, - 0xf7, 0x2e, 0xe2, 0x42, 0x02, 0x60, 0x57, 0x72, 0x5d, 0x63, 0xea, 0xd2, 0xc0, - 0xc0, 0xff, 0x1f, 0xe2, 0x6a, 0xc1, 0x27, 0x0a, 0x67, 0xdf, 0xb3, 0x63, 0x47, - 0xc9, 0xcf, 0x6a, 0xe0, 0x61, 0xee, 0x62, 0xf6, 0x17, 0x69, 0xba, 0x38, 0x9d, - 0xc0, 0xa9, 0x6b, 0x8b, 0x04, 0x7a, 0xe3, 0xb4, 0x2b, 0x89, 0x6b, 0xb4, 0x1d, - 0xdb, 0x82, 0xf8, 0x78, 0xd9, 0xac, 0x7f, 0xfb, 0x0b, 0xd4, 0x39, 0x1d, 0xf1, - 0xd8, 0x79, 0x89, 0x9a, 0x3e, 0xf5, 0x7b, 0xfd, 0x0d, 0x1f, 0x77, 0x55, 0x64, - 0x8e, 0xdd, 0x85, 0xbb, 0x05, 0x2a, 0x4f, 0xa9, 0xe5, 0x1c, 0x2f, 0x35, 0xa4, - 0x81, 0x5d, 0xf9, 0x6d, 0xac, 0xac, 0x29, 0x0e, 0xdf, 0x16, 0x18, 0xa2, 0x5b, - 0xdd, 0x25, 0xc6, 0x73, 0x92, 0xb7, 0x96, 0x4d, 0x90, 0x3b, 0x92, 0x07, 0x50, - 0x38, 0x70, 0x59, 0x7b, 0x9a, 0x95, 0x58, 0x92, 0xc7, 0x38, 0x96, 0x50, 0xa2, - 0xd4, 0x2e, 0xc9, 0x2b, 0xe7, 0x23, 0xfe, 0xdf, 0x2f, 0x2e, 0xde, 0x5a, 0x47, - 0x2a, 0xa1, 0xe7, 0x4f, 0x33, 0xf7, 0xc0, 0x97, 0x12, 0x26, 0xac, 0xcf, 0x7c, - 0x90, 0x37, 0xa5, 0x36, 0x84, 0x86, 0x77, 0x51, 0x68, 0x90, 0x90, 0x1c, 0xb6, - 0x1a, 0x9f, 0x09, 0x8b, 0x15, 0xd1, 0x5c, 0x9d, 0x32, 0x7a, 0x32, 0xb9, 0x30, - 0xa7, 0xcb, 0x12, 0x24, 0x78, 0xf8, 0x5a, 0x1c, 0x6c, 0x31, 0x1a, 0xee, 0x72, - 0x1c, 0x0b, 0xd2, 0xaa, 0xcb, 0xd8, 0x23, 0x25, 0xa5, 0x9b, 0x95, 0x15, 0x4e, - 0xcd, 0x82, 0xc8, 0x0d, 0x36, 0x7e, 0x2e, 0xac, 0xcb, 0x1e, 0x6e, 0x63, 0x0d, - 0x9a, 0x6f, 0x44, 0x23, 0x59, 0xb5, 0x57, 0xf4, 0xa7, 0x77, 0xab, 0x1b, 0x15, - 0xea, 0xa1, 0x29, 0x47, 0x50, 0xd4, 0x06, 0x3a, 0x0c, 0x1e, 0x45, 0x9f, 0x1b, - 0xdc, 0xbf, 0x95, 0x25, 0x74, 0x7e, 0x8c, 0x95, 0x08, 0xa5, 0x55, 0xfa, 0xcb, - 0x79, 0x87, 0x40, 0xe0, 0xbd, 0xf9, 0x94, 0xd9, 0x73, 0x9b, 0xbe, 0x55, 0x38, - 0xa0, 0xae, 0x0f, + 0x00, 0x00, 0x00, 0xbf, 0x83, 0xfc, 0x07, 0x34, 0x96, 0x4c, 0xcd, 0x41, 0x1d, + 0x1c, 0x93, 0x57, 0x14, 0xe2, 0x4a, 0xab, 0x56, 0x6f, 0x4f, 0x08, 0x42, 0x40, + 0x14, 0xc4, 0xec, 0xa9, 0x1b, 0x59, 0x0f, 0x08, 0x2b, 0x67, 0x3f, 0x36, 0x1c, + 0x87, 0x41, 0x5d, 0x37, 0xbd, 0x20, 0xd7, 0x0f, 0xd0, 0xb5, 0x2b, 0x6d, 0xdf, + 0x18, 0x65, 0xf7, 0x66, 0x70, 0x2e, 0x32, 0xb0, 0x5b, 0x3c, 0xf1, 0x63, 0x0e, + 0xe8, 0x59, 0x7a, 0xae, 0x19, 0x63, 0x3f, 0x35, 0x16, 0xa8, 0x55, 0x5a, 0xc5, + 0xbe, 0x32, 0xc6, 0x75, 0xbe, 0x18, 0x17, 0xef, 0xbf, 0xfd, 0x93, 0x69, 0x04, + 0x1a, 0x08, 0x9c, 0x28, 0x3f, 0x19, 0x64, 0x99, 0x68, 0xc2, 0x49, 0x8c, 0xde, + 0x56, 0xf5, 0x00, 0x43, 0x4f, 0x28, 0x0d, 0x77, 0xa9, 0xc6, 0x2e, 0x43, 0xcb, + 0xd3, 0xf1, 0x36, 0xa4, 0xc6, 0xa0, 0x0a, 0x43, 0xe6, 0xed, 0x53, 0x0c, 0xb2, + 0xe8, 0xae, 0x83, 0x88, 0x60, 0xad, 0xc8, 0x8a, 0xac, 0x1c, 0xe6, 0x13, 0x81, + 0x64, 0x3e, 0xec, 0xd2, 0xcf, 0x72, 0x24, 0x8f, 0x78, 0x6f, 0x43, 0xd3, 0x0d, + 0x78, 0x37, 0xd0, 0x48, 0xe2, 0x60, 0x12, 0xcb, 0xaa, 0x6c, 0xe7, 0xbb, 0x57, + 0x8a, 0x1f, 0x85, 0xf2, 0x7d, 0xc3, 0xe9, 0x3c, 0xe4, 0x5e, 0x25, 0x3a, 0xc5, + 0x8c, 0xf7, 0x2e, 0xe2, 0x42, 0x02, 0x60, 0x57, 0x72, 0x5d, 0x63, 0xea, 0xd2, + 0xc0, 0xc0, 0xff, 0x1f, 0xe2, 0x6a, 0xc1, 0x27, 0x0a, 0x67, 0xdf, 0xb3, 0x63, + 0x47, 0xc9, 0xcf, 0x6a, 0xe0, 0x61, 0xee, 0x62, 0xf6, 0x17, 0x69, 0xba, 0x38, + 0x9d, 0xc0, 0xa9, 0x6b, 0x8b, 0x04, 0x7a, 0xe3, 0xb4, 0x2b, 0x89, 0x6b, 0xb4, + 0x1d, 0xdb, 0x82, 0xf8, 0x78, 0xd9, 0xac, 0x7f, 0xfb, 0x0b, 0xd4, 0x39, 0x1d, + 0xf1, 0xd8, 0x79, 0x89, 0x9a, 0x3e, 0xf5, 0x7b, 0xfd, 0x0d, 0x1f, 0x77, 0x55, + 0x64, 0x8e, 0xdd, 0x85, 0xbb, 0x05, 0x2a, 0x4f, 0xa9, 0xe5, 0x1c, 0x2f, 0x35, + 0xa4, 0x81, 0x5d, 0xf9, 0x6d, 0xac, 0xac, 0x29, 0x0e, 0xdf, 0x16, 0x18, 0xa2, + 0x5b, 0xdd, 0x25, 0xc6, 0x73, 0x92, 0xb7, 0x96, 0x4d, 0x90, 0x3b, 0x92, 0x07, + 0x50, 0x38, 0x70, 0x59, 0x7b, 0x9a, 0x95, 0x58, 0x92, 0xc7, 0x38, 0x96, 0x50, + 0xa2, 0xd4, 0x2e, 0xc9, 0x2b, 0xe7, 0x23, 0xfe, 0xdf, 0x2f, 0x2e, 0xde, 0x5a, + 0x47, 0x2a, 0xa1, 0xe7, 0x4f, 0x33, 0xf7, 0xc0, 0x97, 0x12, 0x26, 0xac, 0xcf, + 0x7c, 0x90, 0x37, 0xa5, 0x36, 0x84, 0x86, 0x77, 0x51, 0x68, 0x90, 0x90, 0x1c, + 0xb6, 0x1a, 0x9f, 0x09, 0x8b, 0x15, 0xd1, 0x5c, 0x9d, 0x32, 0x7a, 0x32, 0xb9, + 0x30, 0xa7, 0xcb, 0x12, 0x24, 0x78, 0xf8, 0x5a, 0x1c, 0x6c, 0x31, 0x1a, 0xee, + 0x72, 0x1c, 0x0b, 0xd2, 0xaa, 0xcb, 0xd8, 0x23, 0x25, 0xa5, 0x9b, 0x95, 0x15, + 0x4e, 0xcd, 0x82, 0xc8, 0x0d, 0x36, 0x7e, 0x2e, 0xac, 0xcb, 0x1e, 0x6e, 0x63, + 0x0d, 0x9a, 0x6f, 0x44, 0x23, 0x59, 0xb5, 0x57, 0xf4, 0xa7, 0x77, 0xab, 0x1b, + 0x15, 0xea, 0xa1, 0x29, 0x47, 0x50, 0xd4, 0x06, 0x3a, 0x0c, 0x1e, 0x45, 0x9f, + 0x1b, 0xdc, 0xbf, 0x95, 0x25, 0x74, 0x7e, 0x8c, 0x95, 0x08, 0xa5, 0x55, 0xfa, + 0xcb, 0x79, 0x87, 0x40, 0xe0, 0xbd, 0xf9, 0x94, 0xd9, 0x73, 0x9b, 0xbe, 0x55, + 0x38, 0xa0, 0xae, 0x0f, ], txid: [ 0x8c, 0x23, 0xea, 0xeb, 0x8f, 0x61, 0x22, 0x8c, 0x8b, 0x2f, 0x63, 0x3a, 0x7d, @@ -7179,39 +7179,39 @@ pub mod zip_0244 { 0xaf, 0xde, 0x5c, 0x42, 0x36, 0x40, 0xb8, 0x1e, 0x4f, 0x63, 0x1c, 0x98, 0x1c, 0x11, 0xa2, 0xe1, 0xd1, 0x84, 0xc6, 0x7c, 0x52, 0x8d, 0xf9, 0x2d, 0x53, 0xae, 0xc4, 0x4a, 0x40, 0xa4, 0xea, 0x2a, 0x13, 0x1b, 0x47, 0x33, 0xcf, 0xe4, 0x5c, - 0x6b, 0x00, 0x00, 0xe3, 0xb9, 0x7e, 0x98, 0xc3, 0x2a, 0x07, 0x00, 0x5c, 0xc0, - 0x2f, 0x35, 0xcd, 0x64, 0xf1, 0x4a, 0x9e, 0xa8, 0xd8, 0xc7, 0x08, 0x42, 0xd6, - 0x09, 0x01, 0xd2, 0xab, 0xf3, 0x63, 0x7a, 0xdd, 0x77, 0xc7, 0x35, 0x0f, 0x12, - 0xb0, 0x11, 0xb2, 0x14, 0x36, 0x8e, 0xc7, 0x55, 0x76, 0xe4, 0x7d, 0x16, 0x9e, - 0x39, 0x38, 0xbf, 0x6a, 0xe2, 0xaa, 0x8f, 0xf7, 0xcf, 0xba, 0x7c, 0xac, 0xb1, - 0xf9, 0x2b, 0x6e, 0x4c, 0x24, 0x97, 0xbf, 0xfa, 0x9f, 0x17, 0xca, 0xd2, 0x42, - 0xfa, 0x9c, 0x31, 0x79, 0xc1, 0xa3, 0xaa, 0x81, 0xf7, 0x36, 0x16, 0x49, 0x57, - 0x2c, 0x71, 0x5c, 0x25, 0xa1, 0xf6, 0xcd, 0xf4, 0xef, 0xdb, 0x31, 0xf9, 0x7a, - 0x12, 0x2b, 0x0e, 0x34, 0x9e, 0x8d, 0x1e, 0x89, 0xb1, 0x7a, 0xa0, 0x58, 0xd2, - 0x11, 0xac, 0x1c, 0x36, 0x40, 0xfe, 0xa6, 0xcd, 0x73, 0x13, 0xff, 0xd5, 0x1d, - 0x18, 0x56, 0xa7, 0xe0, 0x92, 0x4d, 0x71, 0x0f, 0xdd, 0x4b, 0x15, 0xa1, 0x1f, - 0xba, 0x46, 0x7f, 0x09, 0x3f, 0xb8, 0x2c, 0x56, 0x58, 0xe2, 0x96, 0x24, 0xc5, - 0x32, 0x19, 0xa6, 0x0c, 0xd0, 0x28, 0x8b, 0x81, 0x5d, 0xb3, 0x0e, 0x1b, 0x29, - 0x6e, 0x0c, 0xfd, 0x02, 0x7e, 0xc8, 0xf6, 0x30, 0x0d, 0x2e, 0x48, 0x29, 0x32, - 0x29, 0x99, 0x95, 0xcb, 0x84, 0x99, 0x66, 0x21, 0x47, 0x99, 0xee, 0x90, 0xc7, - 0xd5, 0x79, 0x2d, 0x22, 0xd9, 0x10, 0x49, 0x01, 0xee, 0xbd, 0x30, 0x57, 0x3d, - 0x21, 0xca, 0x5c, 0x4e, 0xf9, 0xd5, 0x02, 0xa1, 0x6f, 0x15, 0x22, 0x47, 0x58, - 0x96, 0xd7, 0x9b, 0xc5, 0x38, 0xf7, 0x52, 0xcc, 0x29, 0x5b, 0x3e, 0x4c, 0x94, - 0x0f, 0x99, 0xc3, 0xca, 0xf4, 0xa5, 0xb9, 0xb5, 0x2e, 0x74, 0xc4, 0xe8, 0xd9, - 0x86, 0x4e, 0x64, 0xd0, 0x17, 0xcd, 0x37, 0x12, 0x91, 0xf0, 0xbe, 0xeb, 0x22, - 0x13, 0xfc, 0x4a, 0xf1, 0xe4, 0x50, 0xe4, 0xd5, 0x21, 0x7c, 0x66, 0x17, 0x00, - 0x8c, 0x78, 0xf4, 0xfb, 0x11, 0x12, 0xf4, 0x02, 0x8a, 0x70, 0x4f, 0xc5, 0xa9, - 0x38, 0x2c, 0x6b, 0x03, 0xb5, 0x34, 0x96, 0x84, 0x08, 0x3e, 0xc9, 0x48, 0x26, - 0x41, 0x61, 0xda, 0x8f, 0x7b, 0xce, 0xb5, 0x96, 0x0e, 0xdf, 0xd4, 0xc1, 0xfd, - 0x08, 0xc5, 0xb2, 0x46, 0xe0, 0xa2, 0x86, 0xac, 0x1a, 0x38, 0x87, 0x8d, 0xf7, - 0xfc, 0x90, 0xd7, 0x17, 0x7f, 0x6c, 0x18, 0x0c, 0x81, 0x6d, 0x58, 0x24, 0x53, - 0xd8, 0x17, 0x85, 0x60, 0xda, 0xf9, 0x75, 0x11, 0x19, 0x55, 0xa2, 0xbc, 0xa3, - 0x42, 0x3e, 0x2e, 0xae, 0xa6, 0xc8, 0x44, 0xc3, 0x28, 0x53, 0x4b, 0xc6, 0x91, - 0x39, 0x07, 0x03, 0x24, 0x7c, 0x89, 0xe2, 0x92, 0xa3, 0xae, 0x09, 0xe5, 0x35, - 0x61, 0x16, 0x62, 0x38, 0x3e, 0x14, 0x1a, 0x54, 0x2a, 0xf9, 0xe4, 0x62, 0xa7, - 0x38, 0xf8, 0x94, 0xe9, 0x89, 0xce, 0x99, 0xa8, 0x9c, 0xdc, 0x7f, 0x40, 0x6b, - 0x87, 0xe0, 0x09, 0x12, 0x1e, 0x06, 0xf6, 0xa1, 0xbf, 0x62, 0xa0, 0x8b, 0xf4, - 0x35, 0x19, + 0x6b, 0x00, 0x00, 0xe3, 0xb9, 0x7e, 0x98, 0xc3, 0x2a, 0x07, 0x00, 0x00, 0x5c, + 0xc0, 0x2f, 0x35, 0xcd, 0x64, 0xf1, 0x4a, 0x9e, 0xa8, 0xd8, 0xc7, 0x08, 0x42, + 0xd6, 0x09, 0x01, 0xd2, 0xab, 0xf3, 0x63, 0x7a, 0xdd, 0x77, 0xc7, 0x35, 0x0f, + 0x12, 0xb0, 0x11, 0xb2, 0x14, 0x36, 0x8e, 0xc7, 0x55, 0x76, 0xe4, 0x7d, 0x16, + 0x9e, 0x39, 0x38, 0xbf, 0x6a, 0xe2, 0xaa, 0x8f, 0xf7, 0xcf, 0xba, 0x7c, 0xac, + 0xb1, 0xf9, 0x2b, 0x6e, 0x4c, 0x24, 0x97, 0xbf, 0xfa, 0x9f, 0x17, 0xca, 0xd2, + 0x42, 0xfa, 0x9c, 0x31, 0x79, 0xc1, 0xa3, 0xaa, 0x81, 0xf7, 0x36, 0x16, 0x49, + 0x57, 0x2c, 0x71, 0x5c, 0x25, 0xa1, 0xf6, 0xcd, 0xf4, 0xef, 0xdb, 0x31, 0xf9, + 0x7a, 0x12, 0x2b, 0x0e, 0x34, 0x9e, 0x8d, 0x1e, 0x89, 0xb1, 0x7a, 0xa0, 0x58, + 0xd2, 0x11, 0xac, 0x1c, 0x36, 0x40, 0xfe, 0xa6, 0xcd, 0x73, 0x13, 0xff, 0xd5, + 0x1d, 0x18, 0x56, 0xa7, 0xe0, 0x92, 0x4d, 0x71, 0x0f, 0xdd, 0x4b, 0x15, 0xa1, + 0x1f, 0xba, 0x46, 0x7f, 0x09, 0x3f, 0xb8, 0x2c, 0x56, 0x58, 0xe2, 0x96, 0x24, + 0xc5, 0x32, 0x19, 0xa6, 0x0c, 0xd0, 0x28, 0x8b, 0x81, 0x5d, 0xb3, 0x0e, 0x1b, + 0x29, 0x6e, 0x0c, 0xfd, 0x02, 0x7e, 0xc8, 0xf6, 0x30, 0x0d, 0x2e, 0x48, 0x29, + 0x32, 0x29, 0x99, 0x95, 0xcb, 0x84, 0x99, 0x66, 0x21, 0x47, 0x99, 0xee, 0x90, + 0xc7, 0xd5, 0x79, 0x2d, 0x22, 0xd9, 0x10, 0x49, 0x01, 0xee, 0xbd, 0x30, 0x57, + 0x3d, 0x21, 0xca, 0x5c, 0x4e, 0xf9, 0xd5, 0x02, 0xa1, 0x6f, 0x15, 0x22, 0x47, + 0x58, 0x96, 0xd7, 0x9b, 0xc5, 0x38, 0xf7, 0x52, 0xcc, 0x29, 0x5b, 0x3e, 0x4c, + 0x94, 0x0f, 0x99, 0xc3, 0xca, 0xf4, 0xa5, 0xb9, 0xb5, 0x2e, 0x74, 0xc4, 0xe8, + 0xd9, 0x86, 0x4e, 0x64, 0xd0, 0x17, 0xcd, 0x37, 0x12, 0x91, 0xf0, 0xbe, 0xeb, + 0x22, 0x13, 0xfc, 0x4a, 0xf1, 0xe4, 0x50, 0xe4, 0xd5, 0x21, 0x7c, 0x66, 0x17, + 0x00, 0x8c, 0x78, 0xf4, 0xfb, 0x11, 0x12, 0xf4, 0x02, 0x8a, 0x70, 0x4f, 0xc5, + 0xa9, 0x38, 0x2c, 0x6b, 0x03, 0xb5, 0x34, 0x96, 0x84, 0x08, 0x3e, 0xc9, 0x48, + 0x26, 0x41, 0x61, 0xda, 0x8f, 0x7b, 0xce, 0xb5, 0x96, 0x0e, 0xdf, 0xd4, 0xc1, + 0xfd, 0x08, 0xc5, 0xb2, 0x46, 0xe0, 0xa2, 0x86, 0xac, 0x1a, 0x38, 0x87, 0x8d, + 0xf7, 0xfc, 0x90, 0xd7, 0x17, 0x7f, 0x6c, 0x18, 0x0c, 0x81, 0x6d, 0x58, 0x24, + 0x53, 0xd8, 0x17, 0x85, 0x60, 0xda, 0xf9, 0x75, 0x11, 0x19, 0x55, 0xa2, 0xbc, + 0xa3, 0x42, 0x3e, 0x2e, 0xae, 0xa6, 0xc8, 0x44, 0xc3, 0x28, 0x53, 0x4b, 0xc6, + 0x91, 0x39, 0x07, 0x03, 0x24, 0x7c, 0x89, 0xe2, 0x92, 0xa3, 0xae, 0x09, 0xe5, + 0x35, 0x61, 0x16, 0x62, 0x38, 0x3e, 0x14, 0x1a, 0x54, 0x2a, 0xf9, 0xe4, 0x62, + 0xa7, 0x38, 0xf8, 0x94, 0xe9, 0x89, 0xce, 0x99, 0xa8, 0x9c, 0xdc, 0x7f, 0x40, + 0x6b, 0x87, 0xe0, 0x09, 0x12, 0x1e, 0x06, 0xf6, 0xa1, 0xbf, 0x62, 0xa0, 0x8b, + 0xf4, 0x35, 0x19, ], txid: [ 0xa3, 0xa2, 0x20, 0x42, 0xd0, 0x60, 0x1b, 0xa1, 0xaf, 0xe7, 0x87, 0x17, 0x25, diff --git a/zcash_proofs/Cargo.toml b/zcash_proofs/Cargo.toml index 5302cabbf9..6a7920b8b0 100644 --- a/zcash_proofs/Cargo.toml +++ b/zcash_proofs/Cargo.toml @@ -37,6 +37,8 @@ criterion = "0.3" rand_xorshift = "0.3" [target.'cfg(unix)'.dev-dependencies] +# TODO: Pined until inferno 0.11.15 is fixed from compilation errors +inferno = "=0.11.14" pprof = { version = "0.9", features = ["criterion", "flamegraph"] } # MSRV 1.56 [features]