From 9c1ed86c5aa8ae3b6d6dcc1478f2d6ba1264488f Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Wed, 23 Mar 2022 00:35:20 +0000 Subject: [PATCH] Update NU5 consensus branch ID and remove testnet activation height Part of zcash/librustzcash#456. --- zcash_primitives/src/consensus.rs | 6 +- .../src/transaction/tests/data.rs | 380 +++++++++--------- 2 files changed, 193 insertions(+), 193 deletions(-) diff --git a/zcash_primitives/src/consensus.rs b/zcash_primitives/src/consensus.rs index f66f568bf..0400f0705 100644 --- a/zcash_primitives/src/consensus.rs +++ b/zcash_primitives/src/consensus.rs @@ -240,7 +240,7 @@ impl Parameters for TestNetwork { NetworkUpgrade::Blossom => Some(BlockHeight(584_000)), NetworkUpgrade::Heartwood => Some(BlockHeight(903_800)), NetworkUpgrade::Canopy => Some(BlockHeight(1_028_500)), - NetworkUpgrade::Nu5 => Some(BlockHeight(1_599_200)), + NetworkUpgrade::Nu5 => None, #[cfg(feature = "zfuture")] NetworkUpgrade::ZFuture => None, } @@ -458,7 +458,7 @@ impl TryFrom for BranchId { 0x2bb4_0e60 => Ok(BranchId::Blossom), 0xf5b9_230b => Ok(BranchId::Heartwood), 0xe9ff_75a6 => Ok(BranchId::Canopy), - 0x3751_9621 => Ok(BranchId::Nu5), + 0xc2d6_d0b4 => Ok(BranchId::Nu5), #[cfg(feature = "zfuture")] 0xffff_ffff => Ok(BranchId::ZFuture), _ => Err("Unknown consensus branch ID"), @@ -475,7 +475,7 @@ impl From for u32 { BranchId::Blossom => 0x2bb4_0e60, BranchId::Heartwood => 0xf5b9_230b, BranchId::Canopy => 0xe9ff_75a6, - BranchId::Nu5 => 0x3751_9621, + BranchId::Nu5 => 0xc2d6_d0b4, #[cfg(feature = "zfuture")] BranchId::ZFuture => 0xffff_ffff, } diff --git a/zcash_primitives/src/transaction/tests/data.rs b/zcash_primitives/src/transaction/tests/data.rs index 7ef758ebc..5b73779fe 100644 --- a/zcash_primitives/src/transaction/tests/data.rs +++ b/zcash_primitives/src/transaction/tests/data.rs @@ -5707,7 +5707,7 @@ pub mod zip_0244 { vec![ TestVector { tx: vec![ - 0x05, 0x00, 0x00, 0x80, 0x0a, 0x27, 0xa7, 0x26, 0x21, 0x96, 0x51, 0x37, 0x7a, + 0x05, 0x00, 0x00, 0x80, 0x0a, 0x27, 0xa7, 0x26, 0xb4, 0xd0, 0xd6, 0xc2, 0x7a, 0x8f, 0x73, 0x9a, 0x2d, 0x6f, 0x2c, 0x02, 0x01, 0xe1, 0x52, 0xa8, 0x04, 0x9e, 0x29, 0x4c, 0x4d, 0x6e, 0x66, 0xb1, 0x64, 0x93, 0x9d, 0xaf, 0xfa, 0x2e, 0xf6, 0xee, 0x69, 0x21, 0x48, 0x1c, 0xdd, 0x86, 0xb3, 0xcc, 0x43, 0x18, 0xd9, 0x61, @@ -5977,49 +5977,49 @@ pub mod zip_0244 { 0x7f, 0x6b, 0x4f, 0xe1, 0x2d, 0xad, 0x9a, 0x17, 0xf5, 0xdb, 0x70, 0x31, ], txid: [ - 0x3c, 0x7c, 0xe9, 0x2a, 0x10, 0x59, 0xc0, 0xf6, 0x3f, 0x14, 0x0f, 0x1c, 0xb9, - 0xac, 0x5e, 0x38, 0x90, 0x0a, 0x68, 0x45, 0x95, 0x63, 0x8f, 0xce, 0xf7, 0x73, - 0x18, 0x5d, 0xcf, 0x2f, 0x7f, 0x91, + 0x55, 0x2c, 0x96, 0xbd, 0x33, 0x83, 0x4b, 0xa1, 0xa8, 0xa3, 0xec, 0xd8, 0x0a, + 0x2c, 0x9c, 0xb4, 0x11, 0x87, 0x55, 0x3a, 0x3d, 0xcf, 0xe7, 0x92, 0x83, 0x16, + 0xbb, 0x70, 0x70, 0x4b, 0x85, 0xd0, ], auth_digest: [ - 0x1b, 0x60, 0x46, 0xb6, 0x82, 0xf6, 0x9d, 0xb1, 0x66, 0x65, 0x63, 0x2d, 0x21, - 0xdc, 0x7f, 0x83, 0x46, 0xb2, 0x82, 0xec, 0x04, 0xb8, 0x40, 0xf2, 0x45, 0x1d, - 0x09, 0xc0, 0x86, 0x3c, 0xda, 0x6b, + 0x12, 0x76, 0x7e, 0x5f, 0x67, 0x85, 0x67, 0x36, 0x0f, 0xb3, 0xa1, 0xcb, 0x9c, + 0xf8, 0x58, 0x61, 0x3f, 0xfe, 0x22, 0x63, 0xb6, 0x53, 0xc6, 0xa3, 0x70, 0xee, + 0x1f, 0x68, 0x20, 0xab, 0xdc, 0x57, ], amounts: vec![1800841178198868], script_pubkeys: vec![vec![0x65, 0x00, 0x51]], transparent_input: Some(0), sighash_shielded: [ - 0xab, 0xbd, 0x63, 0xf1, 0xea, 0x2c, 0x3a, 0x0e, 0x96, 0xc9, 0xde, 0x99, 0x63, - 0xa5, 0x16, 0xbf, 0xd4, 0xe3, 0x7c, 0x88, 0x4d, 0x43, 0x8a, 0x3b, 0x01, 0x80, - 0x4d, 0xb5, 0xca, 0xdf, 0x82, 0xfd, + 0x88, 0xda, 0x64, 0xb9, 0x5b, 0x56, 0xd8, 0x29, 0x6a, 0xb1, 0xf7, 0x21, 0xeb, + 0x5b, 0xe6, 0x6d, 0x0f, 0xd4, 0x78, 0xf2, 0xb9, 0x6b, 0x93, 0xd5, 0xdc, 0xee, + 0x8f, 0x7a, 0x10, 0x00, 0xb0, 0xff, ], sighash_all: Some([ - 0xaf, 0x89, 0x5b, 0x8e, 0xd3, 0x7b, 0x11, 0x30, 0xef, 0x93, 0x7d, 0x39, 0x2d, - 0xce, 0xc4, 0xd2, 0xe2, 0x82, 0x5e, 0x09, 0x8d, 0x42, 0x69, 0xdb, 0x62, 0xba, - 0x37, 0x12, 0xd9, 0x4a, 0x3a, 0x16, + 0x2d, 0x4e, 0xbf, 0x4d, 0x42, 0x42, 0x38, 0xad, 0x0b, 0xc2, 0x46, 0x99, 0x70, + 0x34, 0x7e, 0xaf, 0x76, 0x7f, 0xf9, 0x06, 0x95, 0x8e, 0x35, 0x10, 0x7f, 0xd2, + 0x2c, 0x1d, 0xc5, 0x36, 0xe4, 0x59, ]), sighash_none: Some([ - 0xac, 0x54, 0x74, 0xf4, 0x90, 0x8f, 0x69, 0x9a, 0x6f, 0x0b, 0xa3, 0x20, 0x4e, - 0x5e, 0x41, 0xe6, 0x65, 0x14, 0xee, 0x11, 0x46, 0x97, 0xda, 0x06, 0xd5, 0x4b, - 0x6b, 0x96, 0xa0, 0x11, 0x85, 0x1d, + 0x68, 0x3e, 0xca, 0xa5, 0x64, 0x00, 0x2c, 0xa5, 0xa8, 0x0b, 0xea, 0x04, 0x37, + 0x0c, 0x78, 0x85, 0x5b, 0x8d, 0x9c, 0x9c, 0x38, 0x23, 0x09, 0xc7, 0x0b, 0x29, + 0xbd, 0xd9, 0x8d, 0x75, 0xb0, 0x66, ]), sighash_single: None, sighash_all_anyone: Some([ - 0x28, 0xd1, 0xfc, 0xf5, 0xd0, 0xe9, 0x32, 0xd8, 0xfc, 0xb9, 0xd7, 0x3d, 0x39, - 0xae, 0x0f, 0xf2, 0x5c, 0x99, 0xf1, 0x83, 0xc5, 0x79, 0x6e, 0xec, 0x9f, 0x59, - 0x1e, 0xa9, 0x16, 0x74, 0x5b, 0x49, + 0x9c, 0x9e, 0x75, 0xee, 0x15, 0xf4, 0xed, 0xa1, 0x5d, 0x77, 0x79, 0x39, 0x52, + 0x9f, 0xa3, 0xa4, 0xf6, 0x4b, 0x93, 0x5c, 0x7d, 0x21, 0x83, 0x5f, 0x79, 0x39, + 0x3e, 0x7a, 0xa2, 0x3e, 0x28, 0x79, ]), sighash_none_anyone: Some([ - 0xae, 0xd4, 0xe2, 0x1a, 0xac, 0x2e, 0x51, 0x22, 0x92, 0x76, 0xa9, 0x2c, 0x1f, - 0x24, 0x1f, 0x83, 0x53, 0x9d, 0x0c, 0x75, 0xb8, 0xdf, 0x41, 0x1c, 0x23, 0x97, - 0x70, 0xdf, 0xe0, 0x56, 0x8b, 0xd9, + 0xa7, 0xdf, 0xf0, 0x0a, 0x96, 0xfd, 0x2b, 0x41, 0xc5, 0x80, 0x8d, 0x35, 0xe4, + 0xa6, 0xa2, 0xaa, 0x7b, 0x40, 0xee, 0xeb, 0xb6, 0xdc, 0xf3, 0xb9, 0xf2, 0x81, + 0xeb, 0x6c, 0x17, 0xe4, 0x3a, 0xf4, ]), sighash_single_anyone: None, }, TestVector { tx: vec![ - 0x05, 0x00, 0x00, 0x80, 0x0a, 0x27, 0xa7, 0x26, 0x21, 0x96, 0x51, 0x37, 0x1f, + 0x05, 0x00, 0x00, 0x80, 0x0a, 0x27, 0xa7, 0x26, 0xb4, 0xd0, 0xd6, 0xc2, 0x1f, 0xc9, 0x98, 0xc3, 0x1f, 0x4d, 0xd2, 0x08, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -6107,22 +6107,22 @@ pub mod zip_0244 { 0xfa, 0x0c, 0x00, ], txid: [ - 0x13, 0x60, 0x15, 0x2a, 0x19, 0xea, 0x9e, 0x00, 0x44, 0x77, 0x3c, 0x91, 0xf9, - 0xd5, 0x1f, 0xa6, 0xb4, 0x52, 0x50, 0x2f, 0xb6, 0xdf, 0xcd, 0x43, 0xfd, 0xd3, - 0x0c, 0xa6, 0xfa, 0xde, 0x90, 0xf6, + 0xa3, 0xcb, 0xad, 0xd7, 0xa5, 0x8d, 0x80, 0xa4, 0xc2, 0xf6, 0x18, 0x09, 0xc2, + 0x4a, 0x2f, 0x08, 0x6c, 0x58, 0xce, 0xec, 0xaf, 0x7a, 0xf9, 0x41, 0x4c, 0x38, + 0xbd, 0xbd, 0xc4, 0xe4, 0x6e, 0x98, ], auth_digest: [ - 0x4d, 0xc1, 0x4e, 0x8d, 0x17, 0xaf, 0x72, 0x82, 0x7f, 0x09, 0x8b, 0xa6, 0xaa, - 0x82, 0x0e, 0x34, 0xdf, 0x1f, 0xbb, 0x60, 0xd3, 0x54, 0x96, 0x12, 0x0e, 0xfc, - 0x03, 0x89, 0x77, 0xe6, 0x86, 0x76, + 0xad, 0x64, 0x58, 0x0e, 0xd3, 0xa2, 0x8a, 0x3b, 0xa4, 0x1e, 0x2d, 0x32, 0x0b, + 0x5f, 0xf2, 0xa0, 0x7f, 0xa1, 0x9d, 0xb0, 0x74, 0xaf, 0xc4, 0x55, 0xe9, 0x2e, + 0x0f, 0x32, 0x6b, 0xe0, 0x8a, 0x6a, ], amounts: vec![], script_pubkeys: vec![], transparent_input: None, sighash_shielded: [ - 0x13, 0x60, 0x15, 0x2a, 0x19, 0xea, 0x9e, 0x00, 0x44, 0x77, 0x3c, 0x91, 0xf9, - 0xd5, 0x1f, 0xa6, 0xb4, 0x52, 0x50, 0x2f, 0xb6, 0xdf, 0xcd, 0x43, 0xfd, 0xd3, - 0x0c, 0xa6, 0xfa, 0xde, 0x90, 0xf6, + 0xa3, 0xcb, 0xad, 0xd7, 0xa5, 0x8d, 0x80, 0xa4, 0xc2, 0xf6, 0x18, 0x09, 0xc2, + 0x4a, 0x2f, 0x08, 0x6c, 0x58, 0xce, 0xec, 0xaf, 0x7a, 0xf9, 0x41, 0x4c, 0x38, + 0xbd, 0xbd, 0xc4, 0xe4, 0x6e, 0x98, ], sighash_all: None, sighash_none: None, @@ -6133,7 +6133,7 @@ pub mod zip_0244 { }, TestVector { tx: vec![ - 0x05, 0x00, 0x00, 0x80, 0x0a, 0x27, 0xa7, 0x26, 0x21, 0x96, 0x51, 0x37, 0xc2, + 0x05, 0x00, 0x00, 0x80, 0x0a, 0x27, 0xa7, 0x26, 0xb4, 0xd0, 0xd6, 0xc2, 0xc2, 0xeb, 0x51, 0x8f, 0x68, 0x98, 0x4d, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -6141,22 +6141,22 @@ pub mod zip_0244 { 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, ], txid: [ - 0x0f, 0xa0, 0x5d, 0x3f, 0x16, 0xf3, 0xe4, 0xde, 0xdf, 0x75, 0x42, 0xaa, 0xf4, - 0xdd, 0x8a, 0x69, 0x9a, 0xd7, 0x2f, 0x1d, 0x71, 0xbc, 0x51, 0x2d, 0x65, 0xa1, - 0xd5, 0x91, 0x00, 0xdb, 0xdb, 0x24, + 0x28, 0xd1, 0x6c, 0x3c, 0xd7, 0x8a, 0x6b, 0x7a, 0x50, 0xb1, 0x1a, 0x1b, 0x84, + 0x17, 0x76, 0x4c, 0x4e, 0x63, 0xc6, 0xe3, 0xd8, 0xaa, 0x28, 0x9f, 0x7e, 0x87, + 0xe3, 0x98, 0x45, 0x87, 0x27, 0x64, ], auth_digest: [ - 0xef, 0x06, 0x0b, 0x12, 0x13, 0xa9, 0xef, 0x93, 0x13, 0x1a, 0x8e, 0x1f, 0x15, - 0x6e, 0x0c, 0xf6, 0xe4, 0x03, 0xc3, 0x62, 0x82, 0x7c, 0x6e, 0x8d, 0x9d, 0x60, - 0x30, 0x33, 0xd0, 0xfe, 0x13, 0xbe, + 0x33, 0x21, 0x55, 0xb1, 0xcc, 0x23, 0xa2, 0x57, 0x1e, 0x86, 0xe4, 0x9e, 0x06, + 0x01, 0x0c, 0xd2, 0x53, 0x21, 0xdc, 0xfc, 0xca, 0x34, 0xae, 0x14, 0xe8, 0xb3, + 0xf4, 0xf0, 0x02, 0x70, 0xd2, 0x87, ], amounts: vec![], script_pubkeys: vec![], transparent_input: None, sighash_shielded: [ - 0x0f, 0xa0, 0x5d, 0x3f, 0x16, 0xf3, 0xe4, 0xde, 0xdf, 0x75, 0x42, 0xaa, 0xf4, - 0xdd, 0x8a, 0x69, 0x9a, 0xd7, 0x2f, 0x1d, 0x71, 0xbc, 0x51, 0x2d, 0x65, 0xa1, - 0xd5, 0x91, 0x00, 0xdb, 0xdb, 0x24, + 0x28, 0xd1, 0x6c, 0x3c, 0xd7, 0x8a, 0x6b, 0x7a, 0x50, 0xb1, 0x1a, 0x1b, 0x84, + 0x17, 0x76, 0x4c, 0x4e, 0x63, 0xc6, 0xe3, 0xd8, 0xaa, 0x28, 0x9f, 0x7e, 0x87, + 0xe3, 0x98, 0x45, 0x87, 0x27, 0x64, ], sighash_all: None, sighash_none: None, @@ -6167,7 +6167,7 @@ pub mod zip_0244 { }, TestVector { tx: vec![ - 0x05, 0x00, 0x00, 0x80, 0x0a, 0x27, 0xa7, 0x26, 0x21, 0x96, 0x51, 0x37, 0x5e, + 0x05, 0x00, 0x00, 0x80, 0x0a, 0x27, 0xa7, 0x26, 0xb4, 0xd0, 0xd6, 0xc2, 0x5e, 0x3d, 0xba, 0xf7, 0xae, 0x12, 0x67, 0x0d, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -6176,22 +6176,22 @@ pub mod zip_0244 { 0x65, 0x65, 0x00, 0x00, 0x00, 0x00, ], txid: [ - 0x64, 0x44, 0x12, 0x8a, 0xd4, 0x2a, 0x3d, 0x73, 0x18, 0xb0, 0x6b, 0x2b, 0x94, - 0x27, 0x66, 0x29, 0x63, 0x2f, 0x8b, 0xb7, 0xc0, 0x50, 0xe5, 0x02, 0xe4, 0xa8, - 0x73, 0x02, 0x4e, 0xba, 0x3b, 0x79, + 0x6b, 0xf4, 0xef, 0xe7, 0x7a, 0xf6, 0x9b, 0x72, 0x19, 0x47, 0x5f, 0x60, 0xa0, + 0xf7, 0x92, 0xdb, 0x02, 0x63, 0xe4, 0xe1, 0x2f, 0xa1, 0xd9, 0xee, 0x1a, 0x1b, + 0x9a, 0x68, 0x54, 0x05, 0x90, 0xda, ], auth_digest: [ - 0x91, 0xaa, 0xa9, 0x7f, 0xfe, 0x5d, 0x24, 0xf9, 0xa3, 0x54, 0xf9, 0x40, 0xfe, - 0x9d, 0x1a, 0xe5, 0xb6, 0xd4, 0x59, 0x47, 0xb2, 0xc2, 0x0b, 0x00, 0x2d, 0xc2, - 0x00, 0x42, 0xa1, 0x16, 0xad, 0xc7, + 0x99, 0x3b, 0xfc, 0xa6, 0x14, 0x99, 0x75, 0xa4, 0x01, 0x37, 0x97, 0xea, 0xd5, + 0x58, 0x39, 0xa1, 0x3a, 0x0f, 0xb1, 0x52, 0xf6, 0x83, 0x72, 0xbb, 0x0e, 0x0f, + 0xd9, 0x49, 0x94, 0x77, 0xf9, 0x03, ], amounts: vec![], script_pubkeys: vec![], transparent_input: None, sighash_shielded: [ - 0x64, 0x44, 0x12, 0x8a, 0xd4, 0x2a, 0x3d, 0x73, 0x18, 0xb0, 0x6b, 0x2b, 0x94, - 0x27, 0x66, 0x29, 0x63, 0x2f, 0x8b, 0xb7, 0xc0, 0x50, 0xe5, 0x02, 0xe4, 0xa8, - 0x73, 0x02, 0x4e, 0xba, 0x3b, 0x79, + 0x6b, 0xf4, 0xef, 0xe7, 0x7a, 0xf6, 0x9b, 0x72, 0x19, 0x47, 0x5f, 0x60, 0xa0, + 0xf7, 0x92, 0xdb, 0x02, 0x63, 0xe4, 0xe1, 0x2f, 0xa1, 0xd9, 0xee, 0x1a, 0x1b, + 0x9a, 0x68, 0x54, 0x05, 0x90, 0xda, ], sighash_all: None, sighash_none: None, @@ -6202,7 +6202,7 @@ pub mod zip_0244 { }, TestVector { tx: vec![ - 0x05, 0x00, 0x00, 0x80, 0x0a, 0x27, 0xa7, 0x26, 0x21, 0x96, 0x51, 0x37, 0xff, + 0x05, 0x00, 0x00, 0x80, 0x0a, 0x27, 0xa7, 0x26, 0xb4, 0xd0, 0xd6, 0xc2, 0xff, 0x6a, 0xcc, 0x0f, 0xfc, 0x2e, 0x49, 0x0d, 0x03, 0x14, 0x6b, 0x9d, 0x49, 0xdd, 0x8c, 0x78, 0x35, 0xf4, 0x3a, 0x37, 0xdc, 0xa0, 0x78, 0x7e, 0x3e, 0xc9, 0xf6, 0x60, 0x52, 0x23, 0xd5, 0xba, 0x7a, 0xe0, 0xab, 0x90, 0x25, 0xb7, 0x3b, 0xc0, @@ -6220,57 +6220,57 @@ pub mod zip_0244 { 0x00, ], txid: [ - 0x42, 0xf4, 0x80, 0xd6, 0x10, 0xe0, 0xcd, 0xb6, 0xc8, 0x9c, 0xeb, 0xe9, 0x7a, - 0xf4, 0x0e, 0xd9, 0x8a, 0xb9, 0x0e, 0x43, 0x73, 0xfd, 0xd2, 0x46, 0xb1, 0x01, - 0xe4, 0x30, 0x21, 0xe7, 0x26, 0x2b, + 0xbc, 0x34, 0xe5, 0xca, 0x58, 0x1c, 0x5c, 0x65, 0x44, 0xaa, 0xfb, 0x3e, 0x58, + 0x65, 0x34, 0x8f, 0x71, 0xb8, 0xaa, 0x2a, 0x78, 0x2d, 0xf8, 0xb6, 0xbf, 0xa1, + 0x79, 0x1b, 0xf5, 0xa7, 0x37, 0x58, ], auth_digest: [ - 0x4b, 0x58, 0x88, 0x55, 0x8d, 0x0e, 0xa2, 0x9a, 0x24, 0x27, 0x28, 0x16, 0xb4, - 0x14, 0x2b, 0x9d, 0xc6, 0x82, 0x56, 0x81, 0xc0, 0xd6, 0xed, 0x99, 0x09, 0x76, - 0x35, 0x55, 0x40, 0xed, 0x45, 0xf7, + 0x6c, 0x36, 0xbc, 0x25, 0xfc, 0x48, 0x56, 0xe5, 0x09, 0x8e, 0x5d, 0x33, 0x03, + 0x3c, 0x5b, 0x38, 0x75, 0x21, 0x7f, 0xcb, 0x45, 0x52, 0x61, 0x18, 0xbb, 0x05, + 0x8a, 0x2d, 0xd7, 0xb6, 0xea, 0x5e, ], amounts: vec![1848924248978091, 447389782351145, 620151782842275], script_pubkeys: vec![vec![0xac, 0x00, 0x00], vec![0x65, 0x65], vec![]], transparent_input: Some(0), sighash_shielded: [ - 0xc4, 0xfc, 0x9e, 0x3c, 0x5d, 0x71, 0xfe, 0x25, 0x89, 0xb9, 0x4a, 0x47, 0xed, - 0xe1, 0xbe, 0xe1, 0xe6, 0x20, 0xf3, 0xb2, 0xf5, 0x8e, 0x3f, 0x48, 0x81, 0xa8, - 0xcc, 0xb6, 0x2d, 0x60, 0xf9, 0x83, + 0xa9, 0x60, 0xf4, 0xba, 0xa5, 0xf4, 0x33, 0x1f, 0x4d, 0xad, 0xc3, 0x74, 0x56, + 0x6b, 0xc0, 0x47, 0xe7, 0xc0, 0x71, 0x53, 0xb0, 0x38, 0x5a, 0x58, 0x7a, 0x2b, + 0xe8, 0x6a, 0x51, 0x8a, 0xb5, 0xd3, ], sighash_all: Some([ - 0xb0, 0xe0, 0xa4, 0x31, 0x7e, 0x49, 0x0a, 0x99, 0xa9, 0x67, 0xa8, 0x87, 0xbf, - 0x31, 0xde, 0xe1, 0x7d, 0x39, 0x72, 0xc7, 0x3e, 0x45, 0x29, 0x51, 0x46, 0x04, - 0x65, 0xd2, 0xa9, 0x71, 0x3e, 0x75, + 0x8f, 0x60, 0x76, 0x56, 0xc5, 0x2d, 0x9a, 0xd2, 0x23, 0x11, 0x20, 0xc2, 0x4f, + 0xaa, 0x7b, 0x68, 0x55, 0xae, 0x57, 0x1b, 0xee, 0x46, 0xe6, 0x1d, 0x76, 0xa2, + 0x5c, 0xff, 0xb2, 0xbb, 0x4f, 0xcb, ]), sighash_none: Some([ - 0x99, 0xff, 0xf5, 0x6e, 0x49, 0x83, 0x68, 0xf7, 0x9e, 0xf4, 0xf3, 0x83, 0xc1, - 0xa4, 0x9c, 0x5f, 0x64, 0x7e, 0xd6, 0xee, 0xd5, 0x14, 0xa5, 0xe3, 0x60, 0x19, - 0xa9, 0xe5, 0xa3, 0x0e, 0xf4, 0x2f, + 0xfd, 0xcf, 0x8a, 0x04, 0x69, 0x0d, 0xc2, 0x76, 0x9d, 0x93, 0x43, 0x37, 0xfe, + 0x8b, 0x47, 0x24, 0x2a, 0x6e, 0xd7, 0xc9, 0xd8, 0x6d, 0x3e, 0x01, 0x33, 0x24, + 0x84, 0xd3, 0x8d, 0x71, 0xe7, 0x85, ]), sighash_single: Some([ - 0x24, 0x9c, 0xed, 0x8c, 0xa7, 0xce, 0x32, 0x69, 0xe5, 0xc8, 0xfd, 0xb7, 0xd7, - 0x8d, 0x02, 0x42, 0x34, 0x5a, 0xe5, 0xf0, 0x61, 0x27, 0xc7, 0xcf, 0x80, 0x24, - 0x1d, 0xc1, 0xf1, 0xd4, 0x08, 0xd5, + 0xb3, 0xa2, 0x8e, 0xbd, 0x7c, 0xf3, 0x7a, 0x44, 0x3a, 0x40, 0x90, 0x9f, 0x51, + 0x3f, 0x08, 0x1f, 0xbe, 0x0f, 0xd7, 0x8c, 0x67, 0xf7, 0xc4, 0xf0, 0x1b, 0x5f, + 0xb1, 0x15, 0x97, 0x89, 0x86, 0x1a, ]), sighash_all_anyone: Some([ - 0x53, 0xc8, 0x4d, 0x8b, 0xa6, 0xdf, 0x23, 0x50, 0x8f, 0x6d, 0x26, 0xcb, 0x90, - 0x2c, 0xe0, 0xbb, 0xf3, 0x18, 0x93, 0xab, 0xf6, 0xd8, 0x57, 0x26, 0xc6, 0x33, - 0x54, 0x58, 0xc8, 0x68, 0x4c, 0xfd, + 0x62, 0xea, 0xda, 0x92, 0xbb, 0xc5, 0xaf, 0x09, 0xab, 0x7b, 0x95, 0x83, 0x4a, + 0xe6, 0xba, 0x41, 0x3b, 0x17, 0xcd, 0xf1, 0x96, 0xa6, 0xf9, 0x9c, 0x54, 0x1b, + 0x71, 0x0d, 0xda, 0xcf, 0xa5, 0x45, ]), sighash_none_anyone: Some([ - 0x38, 0x32, 0x36, 0x14, 0xc6, 0xe5, 0x90, 0x0a, 0xde, 0x02, 0xbb, 0x45, 0x14, - 0x9a, 0xbd, 0x54, 0x23, 0xe9, 0x0b, 0xd2, 0x22, 0x93, 0x57, 0x1d, 0xc5, 0x3a, - 0x0b, 0x2c, 0x42, 0xd9, 0x48, 0x55, + 0xdf, 0xf0, 0xeb, 0x1e, 0x03, 0xb9, 0xc2, 0xfe, 0x30, 0x1d, 0xb9, 0xb0, 0x18, + 0x35, 0x83, 0x61, 0x88, 0x93, 0xc8, 0x47, 0x4e, 0xf5, 0x65, 0x92, 0x1d, 0x5f, + 0x28, 0x32, 0xed, 0xe3, 0xbf, 0x49, ]), sighash_single_anyone: Some([ - 0x02, 0x40, 0x5b, 0x3a, 0xe2, 0x8c, 0xa7, 0xc0, 0x75, 0x66, 0x6c, 0x8a, 0xe5, - 0x8e, 0xc9, 0x21, 0x79, 0x49, 0x1e, 0xd7, 0x71, 0xe7, 0xfb, 0x34, 0xa1, 0x96, - 0x2d, 0xb4, 0x43, 0x99, 0x87, 0x5f, + 0x1d, 0xe6, 0x07, 0xf1, 0x88, 0xa4, 0x0b, 0x5c, 0x15, 0x22, 0x26, 0xd9, 0x4e, + 0x44, 0x41, 0x1b, 0x69, 0x02, 0x94, 0x7d, 0x42, 0xfb, 0xb2, 0x5f, 0xb8, 0x6c, + 0x9a, 0x4e, 0x77, 0xa4, 0xf3, 0x5b, ]), }, TestVector { tx: vec![ - 0x05, 0x00, 0x00, 0x80, 0x0a, 0x27, 0xa7, 0x26, 0x21, 0x96, 0x51, 0x37, 0x23, + 0x05, 0x00, 0x00, 0x80, 0x0a, 0x27, 0xa7, 0x26, 0xb4, 0xd0, 0xd6, 0xc2, 0x23, 0xe1, 0x19, 0xf6, 0x35, 0xef, 0x1d, 0x05, 0x02, 0x4b, 0x21, 0x6b, 0x70, 0x23, 0xfa, 0xdc, 0x2d, 0x25, 0x94, 0x9c, 0x90, 0x03, 0x7e, 0x71, 0xe3, 0xe5, 0x50, 0x72, 0x6d, 0x21, 0x0a, 0x2c, 0x68, 0x83, 0x42, 0xe5, 0x24, 0x40, 0x63, 0x5e, @@ -6284,14 +6284,14 @@ pub mod zip_0244 { 0x51, 0x63, 0x65, 0xac, 0xac, 0x00, 0x00, 0x00, ], txid: [ - 0x02, 0x38, 0x86, 0x35, 0x5f, 0xbe, 0x3f, 0xa9, 0xd8, 0xe9, 0xa0, 0x6a, 0x29, - 0x33, 0x11, 0x4d, 0xe0, 0xcd, 0xd4, 0x7a, 0x47, 0x5e, 0x49, 0x26, 0xf3, 0x41, - 0x52, 0xc0, 0xd0, 0x17, 0x36, 0x7e, + 0x90, 0xd2, 0x88, 0x6c, 0xb6, 0x28, 0x81, 0x33, 0x71, 0xc7, 0xd1, 0xbd, 0x02, + 0x03, 0x1b, 0x6c, 0xa6, 0x6b, 0x42, 0xd1, 0xdb, 0x4e, 0x11, 0x8d, 0x65, 0xf3, + 0x1b, 0x2d, 0xcc, 0xb6, 0x32, 0x35, ], auth_digest: [ - 0xd9, 0xb3, 0xc9, 0x6f, 0xb0, 0xdd, 0xe3, 0xc7, 0x9d, 0xeb, 0x95, 0x59, 0x29, - 0x8f, 0x74, 0x89, 0x29, 0x71, 0x12, 0x7e, 0xae, 0x2f, 0x4b, 0x02, 0x83, 0x91, - 0x95, 0xb0, 0xe4, 0x05, 0x3b, 0x4b, + 0x9c, 0x05, 0x32, 0xe6, 0x78, 0x8f, 0xe9, 0xe2, 0x8b, 0x3b, 0x67, 0xf5, 0x71, + 0x98, 0x9b, 0xe7, 0x7a, 0xe7, 0x61, 0xdf, 0xd3, 0x75, 0xc7, 0x4b, 0xbf, 0x5d, + 0xb3, 0xca, 0xfa, 0xa1, 0xf9, 0xa5, ], amounts: vec![1561051182746413, 1535468271734483], script_pubkeys: vec![ @@ -6300,44 +6300,44 @@ pub mod zip_0244 { ], transparent_input: Some(1), sighash_shielded: [ - 0x53, 0x0b, 0x55, 0x9b, 0x1f, 0x07, 0xc3, 0x6b, 0x77, 0xed, 0x3f, 0xb9, 0x90, - 0xe7, 0x81, 0xd1, 0x36, 0xb1, 0x46, 0xd5, 0x39, 0x7c, 0x99, 0xcf, 0x9d, 0xfd, - 0xd8, 0x64, 0xbe, 0x6f, 0xb0, 0x11, + 0x24, 0xa9, 0x1d, 0x01, 0x7e, 0x69, 0x1f, 0xe7, 0xd5, 0x80, 0xe3, 0xfc, 0x16, + 0x87, 0x2d, 0x61, 0x2c, 0x14, 0xbf, 0xcb, 0xe5, 0xe2, 0x72, 0x5e, 0x16, 0xd0, + 0x9e, 0xc0, 0xc1, 0xc9, 0x13, 0x05, ], sighash_all: Some([ - 0xc5, 0x27, 0xd4, 0x8d, 0x1b, 0xa1, 0x56, 0xe2, 0x8d, 0x28, 0xc5, 0x4b, 0xce, - 0x6a, 0x8a, 0x72, 0x43, 0x92, 0xdc, 0xd8, 0xcb, 0x95, 0x72, 0x3e, 0x02, 0xf5, - 0x16, 0xa2, 0x81, 0xfc, 0xfe, 0x5f, + 0x2b, 0xea, 0x7c, 0x00, 0xcf, 0x77, 0xfa, 0x59, 0xa6, 0x3a, 0xb0, 0xbd, 0x3e, + 0xb7, 0xb1, 0x06, 0x59, 0xf8, 0xfc, 0x9e, 0x4c, 0x48, 0x94, 0xba, 0xfc, 0x37, + 0x64, 0x0e, 0x86, 0x55, 0xf5, 0x62, ]), sighash_none: Some([ - 0xb3, 0x4a, 0x07, 0x7b, 0x59, 0x6b, 0xe3, 0x8e, 0x48, 0x55, 0xf5, 0xd0, 0x98, - 0xad, 0x16, 0x66, 0x62, 0xcd, 0x81, 0x21, 0x19, 0x5a, 0x95, 0x64, 0x88, 0xb8, - 0xe8, 0xfe, 0x0f, 0xb1, 0x6f, 0x50, + 0xe6, 0x36, 0x03, 0xea, 0xde, 0x7d, 0xde, 0x98, 0xef, 0x0e, 0xd6, 0x8d, 0xe6, + 0x40, 0x70, 0x7d, 0xf6, 0xcc, 0x9c, 0x33, 0x78, 0x37, 0xbc, 0xbd, 0xcd, 0xe0, + 0x5a, 0x07, 0xff, 0x7d, 0x87, 0x3b, ]), sighash_single: Some([ - 0xe4, 0x94, 0xda, 0xc4, 0xe9, 0x47, 0xce, 0x8e, 0xaa, 0x9b, 0x6c, 0x76, 0x6e, - 0x3c, 0x86, 0x1c, 0x52, 0x18, 0xf3, 0xf4, 0x44, 0xb4, 0x28, 0xb9, 0x1d, 0x77, - 0xdc, 0xfd, 0x34, 0x10, 0x94, 0x53, + 0xe4, 0xb2, 0xf9, 0x8a, 0xd7, 0xb5, 0x5f, 0xb2, 0x56, 0xa1, 0x29, 0x23, 0x30, + 0x3a, 0xbc, 0xae, 0xee, 0x38, 0x35, 0x10, 0x90, 0xe9, 0x76, 0xb0, 0x19, 0x5d, + 0xd7, 0x5b, 0xdc, 0xf9, 0x4a, 0xd9, ]), sighash_all_anyone: Some([ - 0x4e, 0x8a, 0xae, 0xe6, 0x2b, 0xcb, 0x73, 0xc2, 0x1c, 0x05, 0xa0, 0x59, 0xb0, - 0xc8, 0x8e, 0x2a, 0xb7, 0xc5, 0xfa, 0x7e, 0xe8, 0xb3, 0xc7, 0x81, 0x13, 0x46, - 0xe0, 0x19, 0x80, 0xb6, 0x43, 0xab, + 0x61, 0xc7, 0x05, 0xd5, 0x50, 0x5f, 0x0d, 0x5c, 0xfb, 0x3a, 0x28, 0x51, 0x9d, + 0x79, 0x1f, 0x14, 0x57, 0x70, 0x4f, 0x7b, 0x38, 0x39, 0x2e, 0xff, 0x88, 0x5a, + 0x82, 0x07, 0xfa, 0x68, 0x3c, 0x57, ]), sighash_none_anyone: Some([ - 0xa0, 0x9f, 0x2d, 0x3f, 0x12, 0x39, 0x2e, 0x11, 0x3f, 0xaf, 0xc2, 0x4c, 0xe6, - 0x4c, 0x1e, 0x16, 0xb3, 0x34, 0x3c, 0xac, 0x3c, 0x14, 0xfc, 0x51, 0xb7, 0x38, - 0x5e, 0x39, 0x38, 0xf4, 0x18, 0xbd, + 0xf3, 0x5e, 0xa9, 0xbe, 0xb0, 0xb7, 0xed, 0x68, 0x2d, 0x27, 0xef, 0x78, 0xdd, + 0xe1, 0x17, 0x8d, 0x6a, 0x55, 0xf3, 0x07, 0xc8, 0x51, 0x21, 0xcd, 0x83, 0x02, + 0x58, 0xd8, 0x9d, 0x33, 0xcd, 0xd1, ]), sighash_single_anyone: Some([ - 0x11, 0xcb, 0xf5, 0x7d, 0xe6, 0x9e, 0xea, 0x28, 0xf1, 0x83, 0x07, 0x7c, 0xa9, - 0x32, 0x60, 0x5d, 0x8d, 0x34, 0x78, 0xc2, 0x16, 0xb0, 0x62, 0x5c, 0xa9, 0x89, - 0x0e, 0x37, 0xb2, 0xd6, 0x54, 0xcf, + 0xae, 0xce, 0x3f, 0x45, 0x76, 0x98, 0x76, 0xd8, 0x7b, 0x50, 0x47, 0x8b, 0x90, + 0xcd, 0x5e, 0x3b, 0x37, 0xb7, 0xf4, 0xc5, 0x5b, 0x38, 0xf7, 0x56, 0xa5, 0x74, + 0x86, 0xa3, 0x10, 0x61, 0xdf, 0xa8, ]), }, TestVector { tx: vec![ - 0x05, 0x00, 0x00, 0x80, 0x0a, 0x27, 0xa7, 0x26, 0x21, 0x96, 0x51, 0x37, 0x47, + 0x05, 0x00, 0x00, 0x80, 0x0a, 0x27, 0xa7, 0x26, 0xb4, 0xd0, 0xd6, 0xc2, 0x47, 0x23, 0x62, 0x29, 0x87, 0xd8, 0xd7, 0x04, 0x00, 0x00, 0x02, 0xac, 0xa3, 0xc4, 0xc6, 0x43, 0x3b, 0x1d, 0xa6, 0x05, 0x95, 0xc2, 0xba, 0xfc, 0x72, 0x2b, 0x38, 0xe7, 0x91, 0x0f, 0x63, 0x61, 0x6b, 0x22, 0xc9, 0xd6, 0x77, 0xb1, 0x79, 0x79, @@ -6712,22 +6712,22 @@ pub mod zip_0244 { 0x8b, 0x51, 0x3b, 0xad, 0xb0, 0x10, ], txid: [ - 0xaa, 0x65, 0x33, 0xbf, 0xd6, 0xb0, 0xa2, 0xd7, 0x17, 0x27, 0x33, 0x36, 0x38, - 0x38, 0x23, 0xd8, 0xde, 0xf2, 0x05, 0x8c, 0xb4, 0x38, 0xfe, 0x46, 0xf7, 0x39, - 0x35, 0x07, 0x40, 0x40, 0x80, 0x2f, + 0x3f, 0x1b, 0x9f, 0xaa, 0x40, 0x5d, 0x82, 0x70, 0xe2, 0xd9, 0x53, 0x8e, 0x33, + 0x9f, 0x91, 0x97, 0x93, 0x84, 0x16, 0x91, 0xab, 0x03, 0x3d, 0x18, 0x30, 0xa8, + 0xdc, 0xbe, 0xed, 0x4a, 0xfc, 0x4d, ], auth_digest: [ - 0xb7, 0xac, 0x05, 0x72, 0x8f, 0x3c, 0xbb, 0xf8, 0xf8, 0xa6, 0x03, 0xcc, 0xaf, - 0xe4, 0x84, 0x5f, 0x4a, 0x45, 0x75, 0x73, 0xf9, 0x72, 0xcc, 0xdf, 0x4b, 0x62, - 0xa6, 0xbf, 0x82, 0x20, 0xe0, 0x23, + 0xc9, 0x0c, 0x05, 0x9f, 0xeb, 0x7c, 0x80, 0x7a, 0x6b, 0x34, 0x77, 0x7c, 0x14, + 0xa6, 0xc0, 0x28, 0xb0, 0x92, 0xd8, 0x2c, 0xd5, 0x85, 0x5e, 0xd5, 0xfe, 0x8d, + 0xef, 0xae, 0x87, 0xd2, 0x89, 0xf7, ], amounts: vec![], script_pubkeys: vec![], transparent_input: None, sighash_shielded: [ - 0xaa, 0x65, 0x33, 0xbf, 0xd6, 0xb0, 0xa2, 0xd7, 0x17, 0x27, 0x33, 0x36, 0x38, - 0x38, 0x23, 0xd8, 0xde, 0xf2, 0x05, 0x8c, 0xb4, 0x38, 0xfe, 0x46, 0xf7, 0x39, - 0x35, 0x07, 0x40, 0x40, 0x80, 0x2f, + 0x3f, 0x1b, 0x9f, 0xaa, 0x40, 0x5d, 0x82, 0x70, 0xe2, 0xd9, 0x53, 0x8e, 0x33, + 0x9f, 0x91, 0x97, 0x93, 0x84, 0x16, 0x91, 0xab, 0x03, 0x3d, 0x18, 0x30, 0xa8, + 0xdc, 0xbe, 0xed, 0x4a, 0xfc, 0x4d, ], sighash_all: None, sighash_none: None, @@ -6738,7 +6738,7 @@ pub mod zip_0244 { }, TestVector { tx: vec![ - 0x05, 0x00, 0x00, 0x80, 0x0a, 0x27, 0xa7, 0x26, 0x21, 0x96, 0x51, 0x37, 0x1b, + 0x05, 0x00, 0x00, 0x80, 0x0a, 0x27, 0xa7, 0x26, 0xb4, 0xd0, 0xd6, 0xc2, 0x1b, 0xfe, 0xb9, 0x1b, 0x0b, 0x31, 0x69, 0x1c, 0x03, 0xc2, 0xe8, 0x25, 0xa5, 0x97, 0xb8, 0xfb, 0x75, 0xbc, 0x56, 0x2d, 0x65, 0x4d, 0x62, 0x10, 0x46, 0x40, 0xdd, 0x74, 0xe5, 0x6c, 0xd1, 0x4b, 0xaa, 0xba, 0x56, 0x5b, 0x84, 0xb8, 0x45, 0xe1, @@ -6972,14 +6972,14 @@ pub mod zip_0244 { 0x68, 0xb2, 0x0e, 0xa4, 0x11, 0x8c, 0xa5, 0x69, 0x2e, ], txid: [ - 0x04, 0x40, 0x00, 0xfa, 0xa1, 0x5d, 0x5a, 0x3e, 0x63, 0xbc, 0x62, 0x94, 0xfe, - 0x1c, 0xcf, 0x73, 0x13, 0x1e, 0x64, 0xa6, 0xd3, 0xf2, 0x5d, 0xb4, 0x09, 0x6d, - 0xe5, 0xb6, 0xea, 0xbe, 0xac, 0x77, + 0x67, 0x62, 0xf9, 0xc5, 0x72, 0x30, 0xa5, 0x8d, 0xca, 0x6d, 0x44, 0x45, 0x47, + 0xb2, 0xf6, 0xe0, 0xe2, 0x13, 0x49, 0x2d, 0xbb, 0x40, 0x56, 0x4a, 0xe1, 0x01, + 0xdf, 0x13, 0x94, 0x1c, 0x61, 0x52, ], auth_digest: [ - 0xd0, 0x4b, 0x70, 0xd2, 0xc7, 0x5c, 0x3b, 0x46, 0x1f, 0xbc, 0x57, 0xc3, 0x20, - 0xe4, 0x4a, 0xb8, 0x6c, 0x40, 0x94, 0x27, 0xfb, 0x74, 0x21, 0x84, 0x38, 0x9c, - 0xff, 0xdd, 0x3d, 0x5f, 0x3d, 0x91, + 0x1c, 0x3e, 0xc5, 0x10, 0x4d, 0x96, 0xb6, 0x68, 0x37, 0xb6, 0xe3, 0x81, 0xf7, + 0x02, 0xc7, 0xe4, 0x8a, 0x09, 0x7a, 0xaf, 0x12, 0x5c, 0x9b, 0x82, 0x89, 0x5b, + 0x57, 0x8b, 0x92, 0xea, 0xfd, 0x14, ], amounts: vec![787459282010655, 1685382316228727, 1715663111103469], script_pubkeys: vec![ @@ -6989,36 +6989,36 @@ pub mod zip_0244 { ], transparent_input: Some(2), sighash_shielded: [ - 0x0d, 0x38, 0x75, 0xa8, 0xfa, 0x87, 0xa7, 0x32, 0xe4, 0x35, 0x98, 0xf8, 0x10, - 0xb9, 0xa7, 0x8b, 0xf7, 0x65, 0xd2, 0x0c, 0x61, 0x1f, 0x22, 0xff, 0xc2, 0x59, - 0x8f, 0xa1, 0x29, 0x0e, 0x5f, 0x83, + 0xa7, 0xe2, 0x72, 0xca, 0x04, 0x40, 0x87, 0xc4, 0xd3, 0x56, 0x61, 0x88, 0x8b, + 0x34, 0x8c, 0x57, 0xe9, 0x8b, 0x79, 0x81, 0xa1, 0x6f, 0xe5, 0xe8, 0x81, 0x81, + 0xc8, 0xe1, 0x5a, 0xae, 0x58, 0x1c, ], sighash_all: Some([ - 0xeb, 0xfb, 0xa9, 0x69, 0xc9, 0x58, 0xa8, 0x69, 0x95, 0x48, 0x82, 0x7c, 0x05, - 0x09, 0x49, 0xe2, 0xfc, 0xf6, 0x6b, 0x2f, 0x52, 0xb5, 0xb6, 0x63, 0xb7, 0xc1, - 0xcf, 0x60, 0x88, 0x9d, 0x7c, 0xe8, + 0xda, 0x3e, 0xdd, 0x81, 0xf4, 0xfa, 0x79, 0xe4, 0x7f, 0xb6, 0x76, 0xca, 0x0b, + 0x56, 0xb1, 0x29, 0x9f, 0xf5, 0xb5, 0xec, 0x58, 0x23, 0xec, 0x87, 0x1e, 0x3d, + 0x7c, 0x12, 0x88, 0x4f, 0xe5, 0x77, ]), sighash_none: Some([ - 0x46, 0xd8, 0x03, 0xd6, 0x68, 0x8a, 0x0a, 0x49, 0x9f, 0xa3, 0x91, 0xd8, 0x75, - 0x5e, 0x57, 0x1a, 0x6f, 0xff, 0xc5, 0x96, 0xdc, 0x78, 0x32, 0x29, 0x0e, 0xea, - 0xb0, 0xf0, 0x4f, 0xc7, 0x09, 0x75, + 0xdd, 0xe8, 0x6c, 0x69, 0x61, 0xd0, 0x2d, 0x65, 0x51, 0x03, 0xc9, 0xd1, 0x9c, + 0x89, 0x62, 0x3f, 0xde, 0x4e, 0xc6, 0xb5, 0x28, 0x2b, 0xb8, 0xfb, 0xc7, 0xe8, + 0xba, 0x46, 0x91, 0x1e, 0x9a, 0x3e, ]), sighash_single: None, sighash_all_anyone: Some([ - 0x08, 0xeb, 0xb1, 0x2d, 0xbb, 0x66, 0xe0, 0x57, 0x1a, 0x92, 0x14, 0x63, 0xe1, - 0xfd, 0x68, 0xe3, 0x50, 0x45, 0xf1, 0x98, 0xdb, 0xdd, 0xd4, 0x7d, 0xd8, 0x57, - 0x32, 0x2e, 0xe0, 0x57, 0x82, 0xfc, + 0x41, 0x15, 0x08, 0xbb, 0x7b, 0x21, 0x94, 0xf6, 0x17, 0xad, 0xc6, 0xc7, 0x82, + 0xbb, 0x77, 0x20, 0xc8, 0xdf, 0xc2, 0x5f, 0xef, 0x3b, 0xc4, 0x8e, 0xc7, 0x31, + 0xa2, 0x4a, 0xa2, 0xc1, 0xc1, 0x05, ]), sighash_none_anyone: Some([ - 0x0a, 0xda, 0xbc, 0x93, 0xe7, 0x7d, 0x16, 0xe0, 0xe5, 0xb0, 0x33, 0x41, 0xc6, - 0x06, 0x5c, 0xe0, 0x92, 0x9f, 0x03, 0xaf, 0x3b, 0xa1, 0x1d, 0xc6, 0x6a, 0x6a, - 0xf3, 0x8e, 0x8e, 0xca, 0xb7, 0x33, + 0xb4, 0x25, 0x3a, 0x25, 0xbf, 0x7e, 0xe6, 0xcd, 0x20, 0x9c, 0x5f, 0x07, 0x66, + 0x6f, 0xea, 0x85, 0x3e, 0x4b, 0x80, 0x08, 0x62, 0xa2, 0x9a, 0xa5, 0xa8, 0x96, + 0x1f, 0x95, 0x32, 0x03, 0xa3, 0xb0, ]), sighash_single_anyone: None, }, TestVector { tx: vec![ - 0x05, 0x00, 0x00, 0x80, 0x0a, 0x27, 0xa7, 0x26, 0x21, 0x96, 0x51, 0x37, 0x81, + 0x05, 0x00, 0x00, 0x80, 0x0a, 0x27, 0xa7, 0x26, 0xb4, 0xd0, 0xd6, 0xc2, 0x81, 0x83, 0x6c, 0x3b, 0xe9, 0x9a, 0x08, 0x17, 0x03, 0xa4, 0x60, 0xe9, 0x68, 0xaa, 0x71, 0x09, 0x87, 0x0b, 0xbe, 0xd1, 0x7d, 0xf5, 0xf8, 0x88, 0xc8, 0xca, 0x14, 0x67, 0xae, 0x17, 0xdb, 0xbc, 0xde, 0x31, 0xc1, 0x10, 0x5c, 0xb5, 0xbd, 0xa8, @@ -7033,14 +7033,14 @@ pub mod zip_0244 { 0x51, 0xac, 0x53, 0x53, 0xac, 0xea, 0xa5, 0xff, 0x12, 0x00, 0x00, 0x00, 0x00, ], txid: [ - 0x72, 0xd3, 0x2b, 0x62, 0xee, 0xb6, 0xfb, 0x73, 0x07, 0xd0, 0xf8, 0xe5, 0x8e, - 0xd1, 0x1c, 0xcc, 0x0a, 0x95, 0x53, 0x6c, 0xf1, 0x04, 0x26, 0xd6, 0xd7, 0x00, - 0x9e, 0x42, 0xd0, 0x92, 0xd3, 0x3c, + 0x22, 0x1d, 0x40, 0x59, 0x7b, 0x56, 0x3f, 0x20, 0x64, 0x58, 0xf9, 0x73, 0x6b, + 0x85, 0x49, 0x23, 0x7c, 0x55, 0x54, 0x24, 0x2c, 0x41, 0x90, 0x22, 0x43, 0x5a, + 0x33, 0x50, 0xa0, 0x70, 0x8e, 0xa1, ], auth_digest: [ - 0x2d, 0x10, 0xd0, 0x39, 0x98, 0x21, 0x71, 0xf9, 0xd2, 0xa7, 0x63, 0xe6, 0x5d, - 0xf1, 0x29, 0x91, 0xae, 0xd0, 0x55, 0x6c, 0x00, 0x35, 0x1d, 0xc4, 0x03, 0xb7, - 0xcc, 0x8b, 0x4c, 0x91, 0xe2, 0x78, + 0x6a, 0x75, 0xe4, 0x93, 0x24, 0xe8, 0x53, 0x20, 0xfe, 0x2f, 0x22, 0x46, 0x66, + 0x18, 0xb7, 0x0b, 0x4b, 0xbe, 0xfe, 0xa2, 0x48, 0xe5, 0xd3, 0x67, 0x3f, 0x18, + 0xf2, 0xe4, 0x87, 0xa2, 0xb2, 0x0a, ], amounts: vec![1076763594431866, 316847576141144, 1780844721475339], script_pubkeys: vec![ @@ -7050,36 +7050,36 @@ pub mod zip_0244 { ], transparent_input: Some(2), sighash_shielded: [ - 0xbf, 0x85, 0x12, 0xd5, 0x9a, 0xef, 0x12, 0xe6, 0xcf, 0x4f, 0x8e, 0x80, 0xcf, - 0x33, 0x9b, 0x27, 0x19, 0x04, 0x04, 0xd8, 0xb9, 0xf5, 0x8d, 0x28, 0x05, 0x6a, - 0x98, 0xe6, 0x97, 0xbe, 0x57, 0xc5, + 0xb5, 0xa1, 0x8f, 0xf6, 0x57, 0x83, 0x9c, 0x69, 0x79, 0xc2, 0xf2, 0xaf, 0xae, + 0xea, 0xf2, 0xf5, 0xc1, 0xcf, 0x43, 0xdf, 0x92, 0xf4, 0xa6, 0x57, 0x55, 0xfa, + 0x42, 0xae, 0x2b, 0x77, 0x06, 0xab, ], sighash_all: Some([ - 0x83, 0x66, 0xf5, 0x95, 0x19, 0x4e, 0xdf, 0x8c, 0x6b, 0x77, 0x6a, 0x27, 0x97, - 0x39, 0x03, 0x88, 0x99, 0x28, 0x68, 0x2e, 0xe9, 0xca, 0xca, 0xb2, 0xa3, 0xa6, - 0xc0, 0x15, 0xf5, 0x3c, 0x29, 0xf9, + 0x9d, 0x80, 0x2c, 0x8a, 0xce, 0x5b, 0xc5, 0xf5, 0xb0, 0x3c, 0x7d, 0xac, 0x8a, + 0x29, 0xef, 0x33, 0x42, 0x4d, 0xef, 0x82, 0xcb, 0xc4, 0xfc, 0x84, 0x00, 0xc0, + 0xbb, 0x9d, 0x5e, 0x08, 0x41, 0x47, ]), sighash_none: Some([ - 0x81, 0xdb, 0xd7, 0x28, 0x94, 0xdf, 0x2b, 0x11, 0x91, 0x23, 0xa6, 0x05, 0x46, - 0xe0, 0xdd, 0x70, 0x29, 0xad, 0x10, 0xba, 0x06, 0x14, 0x67, 0x21, 0xb6, 0xbe, - 0x35, 0x79, 0x61, 0x65, 0x0a, 0xd6, + 0xae, 0x2d, 0xb1, 0x4c, 0x57, 0x78, 0x1f, 0xb5, 0x5c, 0x2f, 0x66, 0x58, 0xf6, + 0x14, 0x18, 0x83, 0xf7, 0xeb, 0xe0, 0xd3, 0x9f, 0x43, 0x9c, 0xf5, 0x66, 0xdc, + 0x55, 0x0f, 0xb9, 0xda, 0x71, 0x68, ]), sighash_single: None, sighash_all_anyone: Some([ - 0xe4, 0xa3, 0xd0, 0x4a, 0xc6, 0x4d, 0x93, 0x5d, 0x49, 0xd1, 0xb5, 0x60, 0x63, - 0x87, 0xde, 0x25, 0x06, 0xbd, 0xa6, 0xfa, 0xba, 0xf5, 0x61, 0x36, 0x8d, 0x78, - 0xba, 0xd1, 0xa7, 0xd9, 0x6e, 0x4f, + 0xe7, 0x11, 0x83, 0x4b, 0x5a, 0x4e, 0xb8, 0x4a, 0xa2, 0x98, 0x6a, 0x53, 0xc2, + 0xb2, 0xba, 0x2f, 0xd6, 0x37, 0x4e, 0x66, 0x6f, 0x03, 0x11, 0xbf, 0xca, 0x8c, + 0xbc, 0xee, 0xfd, 0xde, 0x1e, 0x38, ]), sighash_none_anyone: Some([ - 0x52, 0xc9, 0xc7, 0x97, 0x74, 0xf6, 0x3e, 0xb6, 0xcc, 0xec, 0x16, 0xc5, 0x47, - 0x8a, 0x98, 0x77, 0x6b, 0xfa, 0x94, 0x3d, 0x4d, 0x6b, 0x38, 0x3d, 0xb9, 0x61, - 0x76, 0x54, 0x78, 0xb0, 0xe6, 0xf5, + 0x5c, 0x3a, 0x08, 0x39, 0xfd, 0xc7, 0x34, 0x17, 0xae, 0x7d, 0x5f, 0x15, 0xdc, + 0xee, 0xd6, 0xc1, 0xa4, 0xcb, 0xe8, 0x0c, 0x6c, 0x25, 0xce, 0x03, 0x86, 0xfe, + 0xf7, 0xc0, 0x58, 0xa8, 0xb9, 0x43, ]), sighash_single_anyone: None, }, TestVector { tx: vec![ - 0x05, 0x00, 0x00, 0x80, 0x0a, 0x27, 0xa7, 0x26, 0x21, 0x96, 0x51, 0x37, 0x57, + 0x05, 0x00, 0x00, 0x80, 0x0a, 0x27, 0xa7, 0x26, 0xb4, 0xd0, 0xd6, 0xc2, 0x57, 0xb8, 0x57, 0x51, 0x23, 0x5d, 0xbc, 0x10, 0x02, 0x52, 0xe4, 0x1e, 0x00, 0x29, 0x31, 0xb4, 0x57, 0x46, 0x19, 0x8e, 0x5d, 0xd9, 0x57, 0x1a, 0x56, 0xa7, 0xe0, 0xd4, 0x23, 0xff, 0x27, 0x98, 0x9d, 0x3e, 0xb4, 0x17, 0xec, 0xd3, 0xc3, 0x09, @@ -7319,14 +7319,14 @@ pub mod zip_0244 { 0x27, 0xe9, 0xd7, 0xf4, 0x88, 0x4e, 0x6e, 0xd3, 0xfd, 0x5e, 0x4b, 0x7c, 0x38, ], txid: [ - 0xbe, 0x79, 0xe9, 0x18, 0xa6, 0xd9, 0x96, 0xf7, 0xa1, 0xa9, 0xd6, 0xb8, 0xc0, - 0x48, 0xa5, 0x99, 0x44, 0x37, 0x78, 0x7b, 0x6f, 0x73, 0x20, 0xa9, 0x74, 0xed, - 0x04, 0xfe, 0x6f, 0x93, 0xc2, 0x04, + 0x5b, 0xb4, 0x4e, 0xbf, 0x80, 0x30, 0xac, 0x2f, 0xb7, 0x4d, 0x82, 0xb4, 0x32, + 0xd4, 0x80, 0x21, 0x8a, 0x3d, 0x16, 0x48, 0xe3, 0x27, 0x0b, 0x89, 0xff, 0xb3, + 0xcf, 0x73, 0x5c, 0x2c, 0xe7, 0xa0, ], auth_digest: [ - 0xe9, 0x69, 0x9a, 0xbf, 0xb3, 0x96, 0x41, 0xc4, 0xc0, 0x4b, 0x49, 0xd7, 0x02, - 0xfc, 0x35, 0xa0, 0xe9, 0x1c, 0xe8, 0xb6, 0x53, 0xf5, 0xbf, 0xb4, 0x91, 0x14, - 0xab, 0xec, 0xc1, 0x64, 0x19, 0x5c, + 0xb3, 0xd8, 0xef, 0x97, 0x5a, 0x6a, 0xfa, 0x72, 0x00, 0x92, 0x3c, 0x11, 0x60, + 0xb7, 0xeb, 0xcf, 0xce, 0x43, 0xb5, 0xb9, 0x1e, 0xe3, 0xb3, 0xdd, 0x91, 0x78, + 0x49, 0x38, 0xbf, 0xa6, 0x8e, 0xa6, ], amounts: vec![1399781968202734, 1999413718097392], script_pubkeys: vec![ @@ -7335,39 +7335,39 @@ pub mod zip_0244 { ], transparent_input: Some(1), sighash_shielded: [ - 0x7d, 0x54, 0xfe, 0x5b, 0x0e, 0x6d, 0xec, 0xd2, 0x48, 0x4d, 0x32, 0x02, 0x1b, - 0x50, 0x02, 0x19, 0xd9, 0x18, 0xa5, 0xe8, 0xbb, 0xf6, 0x5c, 0xba, 0x01, 0xfd, - 0xd2, 0xfb, 0x47, 0xda, 0x56, 0xe0, + 0xa8, 0x19, 0x23, 0x45, 0x81, 0x21, 0xcd, 0xb5, 0x64, 0x75, 0xf9, 0x6e, 0xd2, + 0xd9, 0x20, 0x80, 0xf5, 0x6e, 0xd3, 0x06, 0xe4, 0x1f, 0x45, 0x01, 0x2a, 0xf5, + 0x7c, 0xfb, 0x34, 0x8a, 0xcd, 0xa1, ], sighash_all: Some([ - 0x39, 0x6f, 0x1c, 0x6c, 0x42, 0x87, 0x8b, 0x0a, 0xb7, 0xf9, 0x0b, 0x3b, 0x45, - 0xf1, 0x36, 0x92, 0x6e, 0xa6, 0xde, 0x63, 0x9b, 0x95, 0x59, 0x6f, 0xea, 0x97, - 0x4b, 0x8b, 0x47, 0xf6, 0x53, 0x03, + 0x0b, 0x75, 0x2d, 0xe9, 0x48, 0x55, 0x2d, 0x11, 0x70, 0xc1, 0xc9, 0x38, 0x2d, + 0xb1, 0x4e, 0xb4, 0x6a, 0xda, 0x2d, 0xb1, 0x64, 0xda, 0x90, 0x14, 0x1a, 0x62, + 0x6a, 0x03, 0x5d, 0xf3, 0xb4, 0xd5, ]), sighash_none: Some([ - 0xa5, 0x7f, 0x86, 0x98, 0xcd, 0x50, 0xaf, 0x85, 0x27, 0xdf, 0x35, 0xfb, 0xff, - 0x3b, 0xf6, 0x5a, 0xba, 0x5c, 0xa1, 0x4d, 0x1a, 0xe0, 0x25, 0xb3, 0x86, 0xb2, - 0x31, 0x98, 0x58, 0x25, 0xac, 0xfe, + 0xef, 0x8a, 0xf0, 0x6f, 0x6a, 0xec, 0x49, 0x39, 0x4f, 0x46, 0x6d, 0xdd, 0x5a, + 0x6c, 0x11, 0x2f, 0x80, 0xde, 0xd7, 0x68, 0x7c, 0xa2, 0x1c, 0x10, 0x78, 0x2f, + 0xda, 0x26, 0x1b, 0xe5, 0xf6, 0x87, ]), sighash_single: Some([ - 0xd5, 0x83, 0x0b, 0x0e, 0x2a, 0x9c, 0x44, 0x28, 0xae, 0xe0, 0xca, 0x2d, 0x2f, - 0x4b, 0xc8, 0x97, 0x37, 0xc3, 0xeb, 0x02, 0x3e, 0x45, 0xce, 0xa6, 0x9a, 0xfc, - 0x46, 0x16, 0x49, 0x15, 0xbb, 0xd8, + 0x9b, 0xa5, 0x4f, 0xf9, 0xf5, 0xda, 0x79, 0xfb, 0xa5, 0x1c, 0xdf, 0x48, 0x91, + 0xc0, 0x21, 0xd8, 0xdb, 0xe8, 0x88, 0xbf, 0x21, 0x5f, 0x7c, 0x2f, 0xd7, 0x9e, + 0x43, 0xba, 0x5d, 0xd1, 0xcc, 0x76, ]), sighash_all_anyone: Some([ - 0xd9, 0xe4, 0x96, 0x4c, 0xe1, 0xb9, 0xcf, 0x33, 0xb2, 0xbe, 0x0f, 0x45, 0x08, - 0xb6, 0x66, 0xed, 0xc0, 0xce, 0x6f, 0x92, 0x79, 0xfc, 0x58, 0x44, 0x76, 0xaa, - 0x28, 0x25, 0x9c, 0x39, 0x01, 0x71, + 0x22, 0x54, 0x83, 0x9a, 0x4e, 0xd2, 0x5a, 0x96, 0x54, 0x8d, 0xd8, 0x04, 0xdc, + 0x33, 0x38, 0x29, 0xba, 0xa4, 0xda, 0x26, 0x77, 0xe9, 0xc8, 0x3d, 0xf8, 0xab, + 0x2d, 0x5a, 0x57, 0xcd, 0x66, 0x6a, ]), sighash_none_anyone: Some([ - 0x8c, 0xe8, 0x25, 0xb9, 0xc7, 0x97, 0x2f, 0x30, 0xa4, 0x63, 0x26, 0x0a, 0x55, - 0x9d, 0xc1, 0x83, 0x6c, 0x90, 0x91, 0xb6, 0x47, 0x36, 0x8c, 0x35, 0x6a, 0xcd, - 0x3c, 0xda, 0xaf, 0xf1, 0xfa, 0x71, + 0x14, 0x97, 0xbf, 0x31, 0xdf, 0x9b, 0x0f, 0x6e, 0x77, 0xe1, 0x17, 0x3a, 0x9e, + 0xb4, 0x08, 0xef, 0x5e, 0x19, 0xd8, 0x44, 0xaa, 0x9a, 0x85, 0xb6, 0xe7, 0x54, + 0x6f, 0x30, 0xde, 0x1f, 0x0b, 0xe2, ]), sighash_single_anyone: Some([ - 0x8f, 0x7e, 0xaa, 0x64, 0xdc, 0x52, 0x5a, 0x29, 0x20, 0xf2, 0x32, 0x99, 0x9f, - 0xe3, 0xfb, 0x30, 0xb5, 0x6d, 0x34, 0x71, 0x0c, 0xac, 0x3d, 0xde, 0x49, 0x87, - 0x52, 0xad, 0x00, 0x1b, 0xd1, 0x78, + 0x39, 0xac, 0xb5, 0xfd, 0x91, 0xa1, 0x2d, 0xd4, 0x07, 0x36, 0xfc, 0x6a, 0xba, + 0x53, 0xfd, 0xf5, 0x2f, 0x05, 0x83, 0x80, 0x94, 0xc3, 0xaa, 0x6e, 0xf3, 0x45, + 0xd9, 0x4a, 0x1a, 0x07, 0x24, 0xbf, ]), }, ]