From 469d5bdad96272e28ae251f74beac4c0d10a3094 Mon Sep 17 00:00:00 2001 From: jonesmarvin8 <83104039+jonesmarvin8@users.noreply.github.com> Date: Mon, 27 Apr 2026 18:51:57 -0400 Subject: [PATCH] CI fixes --- common/src/block.rs | 10 +++++++--- nssa/src/privacy_preserving_transaction/message.rs | 12 ++++++++---- nssa/src/public_transaction/message.rs | 12 ++++++++---- nssa/src/signature/bip340_test_vectors.rs | 6 +++--- nssa/src/signature/mod.rs | 3 ++- 5 files changed, 28 insertions(+), 15 deletions(-) diff --git a/common/src/block.rs b/common/src/block.rs index 4e6949bd..3f354c2d 100644 --- a/common/src/block.rs +++ b/common/src/block.rs @@ -85,11 +85,15 @@ impl HashableBlockData { signing_key: &nssa::PrivateKey, bedrock_parent_id: MantleMsgId, ) -> Block { - const PREFIX: &[u8; 32] = - b"/LEE/v0.3/Message/Block/\x00\x00\x00\x00\x00\x00\x00\x00"; + const PREFIX: &[u8; 32] = b"/LEE/v0.3/Message/Block/\x00\x00\x00\x00\x00\x00\x00\x00"; let data_bytes = borsh::to_vec(&self).unwrap(); - let mut bytes = Vec::with_capacity(PREFIX.len() + data_bytes.len()); + let mut bytes = Vec::with_capacity( + PREFIX + .len() + .checked_add(data_bytes.len()) + .expect("length overflow"), + ); bytes.extend_from_slice(PREFIX); bytes.extend_from_slice(&data_bytes); diff --git a/nssa/src/privacy_preserving_transaction/message.rs b/nssa/src/privacy_preserving_transaction/message.rs index 6325dd05..5e03a26d 100644 --- a/nssa/src/privacy_preserving_transaction/message.rs +++ b/nssa/src/privacy_preserving_transaction/message.rs @@ -121,13 +121,17 @@ impl Message { #[must_use] pub fn hash_message(&self) -> [u8; 32] { - const PREFIX: &[u8; 32] = - b"/LEE/v0.3/Message/Privacy/\x00\x00\x00\x00\x00\x00"; + const PREFIX: &[u8; 32] = b"/LEE/v0.3/Message/Privacy/\x00\x00\x00\x00\x00\x00"; - let mut bytes = Vec::with_capacity(PREFIX.len() + self.to_bytes().len()); + let mut bytes = Vec::with_capacity( + PREFIX + .len() + .checked_add(self.to_bytes().len()) + .expect("length overflow"), + ); bytes.extend_from_slice(PREFIX); bytes.extend_from_slice(&self.to_bytes()); - + Sha256::digest(bytes).into() } } diff --git a/nssa/src/public_transaction/message.rs b/nssa/src/public_transaction/message.rs index be8b0ed3..03e790af 100644 --- a/nssa/src/public_transaction/message.rs +++ b/nssa/src/public_transaction/message.rs @@ -67,13 +67,17 @@ impl Message { #[must_use] pub fn hash_message(&self) -> [u8; 32] { - const PREFIX: &[u8; 32] = - b"/LEE/v0.3/Message/Public/\x00\x00\x00\x00\x00\x00\x00"; + const PREFIX: &[u8; 32] = b"/LEE/v0.3/Message/Public/\x00\x00\x00\x00\x00\x00\x00"; - let mut bytes = Vec::with_capacity(PREFIX.len() + self.to_bytes().len()); + let mut bytes = Vec::with_capacity( + PREFIX + .len() + .checked_add(self.to_bytes().len()) + .expect("length overflow"), + ); bytes.extend_from_slice(PREFIX); bytes.extend_from_slice(&self.to_bytes()); - + Sha256::digest(bytes).into() } } diff --git a/nssa/src/signature/bip340_test_vectors.rs b/nssa/src/signature/bip340_test_vectors.rs index ed93e8a9..ac3eb044 100644 --- a/nssa/src/signature/bip340_test_vectors.rs +++ b/nssa/src/signature/bip340_test_vectors.rs @@ -134,7 +134,7 @@ pub fn test_vectors() -> Vec { // "EEFDEA4CDB677750A420FEE807EACF21EB9898AE79B9768766E4FAA04A2D4A34", // )).unwrap(), // aux_rand: None, - // message: + // message: // // hex::decode("243F6A8885A308D313198A2E03707344A4093822299F31D0082EFA98EC4E6C89"). // unwrap(), ), @@ -289,7 +289,7 @@ pub fn test_vectors() -> Vec { // "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC30", // )).unwrap(), // aux_rand: None, - // message: + // message: // // hex::decode("243F6A8885A308D313198A2E03707344A4093822299F31D0082EFA98EC4E6C89"). // unwrap(), ), @@ -369,7 +369,7 @@ pub fn test_vectors() -> Vec { // aux_rand: hex_to_bytes::<32>( // "0000000000000000000000000000000000000000000000000000000000000000", // )), - // message: + // message: // hex::decode("99999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999").unwrap(), // ), // signature: Signature { diff --git a/nssa/src/signature/mod.rs b/nssa/src/signature/mod.rs index 0701f318..19daca2e 100644 --- a/nssa/src/signature/mod.rs +++ b/nssa/src/signature/mod.rs @@ -37,7 +37,8 @@ impl FromStr for Signature { impl Signature { #[must_use] - /// This function expects the incoming message to be prehashed to be pre-2022 BIP-340/Keycard compatible. + /// This function expects the incoming message to be prehashed to be pre-2022 BIP-340/Keycard + /// compatible. pub fn new(key: &PrivateKey, message: &[u8; 32]) -> Self { let mut aux_random = [0_u8; 32]; OsRng.fill_bytes(&mut aux_random);