Prevent BlockRewardTransactable to be used in sigonly

mintlayer · Jul 11, 2024 · a059999 · a059999
1 parent 8282283
commit a059999
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 12 deletions.
diff --git a/chainstate/tx-verifier/src/transaction_verifier/input_check/signature_only_check.rs b/chainstate/tx-verifier/src/transaction_verifier/input_check/signature_only_check.rs
@@ -16,9 +16,10 @@
 use std::convert::Infallible;
 
 use common::chain::{
+    partially_signed_transaction::PartiallySignedTransaction,
     signature::{inputsig::InputWitness, DestinationSigError, Transactable},
     tokens::TokenId,
-    ChainConfig, DelegationId, Destination, PoolId, TxInput, TxOutput,
+    ChainConfig, DelegationId, Destination, PoolId, SignedTransaction, TxInput, TxOutput,
 };
 use mintscript::{
     script::ScriptError, translate::InputInfoProvider, InputInfo, SignatureContext, TranslateInput,
@@ -98,7 +99,12 @@ impl<T: Transactable> InputInfoProvider for InputVerifyContextSignature<'_, T> {
     }
 }
 
-pub fn verify_signature<T: Transactable>(
+// Prevent BlockRewardTransactable from being used here
+pub trait SignatureOnlyVerifiable {}
+impl SignatureOnlyVerifiable for SignedTransaction {}
+impl SignatureOnlyVerifiable for PartiallySignedTransaction {}
+
+pub fn verify_tx_signature<T: Transactable + SignatureOnlyVerifiable>(
     chain_config: &ChainConfig,
     outpoint_destination: &Destination,
     tx: &T,
@@ -163,7 +169,7 @@ pub fn verify_signature<T: Transactable>(
         input_num,
         input_data,
     };
-    let script = mintscript::translate::SignatureOnly::translate_input(&context)
+    let script = mintscript::translate::SignatureOnlyTx::translate_input(&context)
         .map_err(|e| InputCheckError::new(input_num, e))?;
     let mut checker = mintscript::ScriptChecker::signature_only(context);
     script.verify(&mut checker).map_err(|e| InputCheckError::new(input_num, e))?;

diff --git a/mintscript/src/tests/translate/mod.rs b/mintscript/src/tests/translate/mod.rs
@@ -291,7 +291,7 @@ impl TranslationMode<'_> for TimelockOnly {
     type Mode = Self;
 }
 
-impl TranslationMode<'_> for SignatureOnly {
+impl TranslationMode<'_> for SignatureOnlyTx {
     const NAME: &'static str = "sigonly";
     type Mode = Self;
 }
@@ -367,7 +367,7 @@ fn mode_name<'a, T: TranslationMode<'a>>(_: &T) -> &'static str {
 #[case("fillorder_01", fill_order(fake_id(0x77)), nosig())]
 #[case("fillorder_00", fill_order(order0().0), stdsig(0x45))]
 fn translate_snap(
-    #[values(TxnMode, RewardMode, TimelockOnly, SignatureOnly)] mode: impl for<'a> TranslationMode<'a>,
+    #[values(TxnMode, RewardMode, TimelockOnly, SignatureOnlyTx)] mode: impl for<'a> TranslationMode<'a>,
     #[case] name: &str,
     #[case] test_input_info: TestInputInfo,
     #[case] witness: InputWitness,

diff --git a/mintscript/src/translate.rs b/mintscript/src/translate.rs
@@ -342,10 +342,9 @@ impl<C: InputInfoProvider> TranslateInput<C> for TimelockOnly {
     }
 }
 
-// FIXME: prevent from using with block reward
-pub struct SignatureOnly;
+pub struct SignatureOnlyTx;
 
-impl<C: SignatureInfoProvider> TranslateInput<C> for SignatureOnly {
+impl<C: SignatureInfoProvider> TranslateInput<C> for SignatureOnlyTx {
     fn translate_input(ctx: &C) -> Result<WitnessScript, TranslationError> {
         let checksig =
             |dest: &Destination| WitnessScript::signature(dest.clone(), ctx.witness().clone());
@@ -442,3 +441,14 @@ impl<C: SignatureInfoProvider> TranslateInput<C> for SignatureOnly {
         }
     }
 }
+
+pub struct SignatureOnlyReward;
+
+impl<C: SignatureInfoProvider> TranslateInput<C> for SignatureOnlyReward {
+    fn translate_input(_ctx: &C) -> Result<WitnessScript, TranslationError> {
+        // Not used anywhere.
+        // But it's important to outline that if needed the reward implementation must be different
+        // because staking/decommissioning destinations are not the same.
+        unimplemented!()
+    }
+}
diff --git a/wallet/src/signer/software_signer/mod.rs b/wallet/src/signer/software_signer/mod.rs
@@ -246,7 +246,7 @@ impl<'a, T: WalletStorageReadUnlocked> Signer for SoftwareSigner<'a, T> {
                     InputWitness::Standard(sig) => match destination {
                         Some(destination) => {
                             let sig_verified =
-                                tx_verifier::input_check::signature_only_check::verify_signature(
+                                tx_verifier::input_check::signature_only_check::verify_tx_signature(
                                     &self.chain_config,
                                     destination,
                                     &ptx,

diff --git a/wallet/wallet-controller/src/lib.rs b/wallet/wallet-controller/src/lib.rs
@@ -25,7 +25,9 @@ const NORMAL_DELAY: Duration = Duration::from_secs(1);
 const ERROR_DELAY: Duration = Duration::from_secs(10);
 
 use blockprod::BlockProductionError;
-use chainstate::tx_verifier::{self, error::ScriptError};
+use chainstate::tx_verifier::{
+    self, error::ScriptError, input_check::signature_only_check::SignatureOnlyVerifiable,
+};
 use futures::{
     never::Never,
     stream::{FuturesOrdered, FuturesUnordered},
@@ -855,12 +857,12 @@ impl<T: NodeInterface + Clone + Send + Sync + 'static, W: WalletEvents> Controll
 
     fn verify_tx_signature(
         &self,
-        tx: &impl Transactable,
+        tx: &(impl Transactable + SignatureOnlyVerifiable),
         inputs_utxos_refs: &[Option<&TxOutput>],
         input_num: usize,
         dest: &Destination,
     ) -> SignatureStatus {
-        let valid = tx_verifier::input_check::signature_only_check::verify_signature(
+        let valid = tx_verifier::input_check::signature_only_check::verify_tx_signature(
             &self.chain_config,
             dest,
             tx,