From 6bd3a61e13d92d29b7c2da342461c29380fe06d2 Mon Sep 17 00:00:00 2001 From: Jeff Bencin Date: Mon, 29 Apr 2024 09:43:06 -0400 Subject: [PATCH] chore: Address PR comments from Jude --- stackslib/src/chainstate/stacks/auth.rs | 14 +++++++------- stackslib/src/chainstate/stacks/block.rs | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/stackslib/src/chainstate/stacks/auth.rs b/stackslib/src/chainstate/stacks/auth.rs index c83eedf0ff..06cf64d037 100644 --- a/stackslib/src/chainstate/stacks/auth.rs +++ b/stackslib/src/chainstate/stacks/auth.rs @@ -710,11 +710,11 @@ impl TransactionSpendingCondition { Some(TransactionSpendingCondition::Singlesig( SinglesigSpendingCondition { - signer: signer_addr.bytes.clone(), + signer: signer_addr.bytes, nonce: 0, tx_fee: 0, hash_mode: SinglesigHashMode::P2PKH, - key_encoding: key_encoding, + key_encoding, signature: MessageSignature::empty(), }, )) @@ -730,7 +730,7 @@ impl TransactionSpendingCondition { Some(TransactionSpendingCondition::Singlesig( SinglesigSpendingCondition { - signer: signer_addr.bytes.clone(), + signer: signer_addr.bytes, nonce: 0, tx_fee: 0, hash_mode: SinglesigHashMode::P2WPKH, @@ -753,7 +753,7 @@ impl TransactionSpendingCondition { Some(TransactionSpendingCondition::Multisig( MultisigSpendingCondition { - signer: signer_addr.bytes.clone(), + signer: signer_addr.bytes, nonce: 0, tx_fee: 0, hash_mode: MultisigHashMode::P2SH, @@ -776,7 +776,7 @@ impl TransactionSpendingCondition { Some(TransactionSpendingCondition::OrderIndependentMultisig( OrderIndependentMultisigSpendingCondition { - signer: signer_addr.bytes.clone(), + signer: signer_addr.bytes, nonce: 0, tx_fee: 0, hash_mode: OrderIndependentMultisigHashMode::P2SH, @@ -799,7 +799,7 @@ impl TransactionSpendingCondition { Some(TransactionSpendingCondition::OrderIndependentMultisig( OrderIndependentMultisigSpendingCondition { - signer: signer_addr.bytes.clone(), + signer: signer_addr.bytes, nonce: 0, tx_fee: 0, hash_mode: OrderIndependentMultisigHashMode::P2WSH, @@ -822,7 +822,7 @@ impl TransactionSpendingCondition { Some(TransactionSpendingCondition::Multisig( MultisigSpendingCondition { - signer: signer_addr.bytes.clone(), + signer: signer_addr.bytes, nonce: 0, tx_fee: 0, hash_mode: MultisigHashMode::P2WSH, diff --git a/stackslib/src/chainstate/stacks/block.rs b/stackslib/src/chainstate/stacks/block.rs index 97c64f35f8..1a155ad673 100644 --- a/stackslib/src/chainstate/stacks/block.rs +++ b/stackslib/src/chainstate/stacks/block.rs @@ -601,7 +601,7 @@ impl StacksBlock { } } if !tx.auth.is_supported_in_epoch(epoch_id) { - error!("Order independent multisig transactions not supported before Stacks 3.0"); + error!("Authentication mode not supported in Epoch {epoch_id}"); return false; } }