Add KIP-10 Mutual Transaction Opcodes and Hard Fork Support

consensus/core/src/config/params.rs

@@ -83,6 +83,9 @@ pub struct Params {
     /// DAA score from which storage mass calculation and transaction mass field are activated as a consensus rule
     pub storage_mass_activation_daa_score: u64,
 
+    /// DAA score from which tx engine supports kip10 opcodes: OpInputAmount, OpInputSpk, OpOutputAmount, OpOutputSpk
+    pub kip10_activation_daa_score: u64,
+
     /// DAA score after which the pre-deflationary period switches to the deflationary period
     pub deflationary_phase_daa_score: u64,
 
@@ -353,6 +356,7 @@ pub const MAINNET_PARAMS: Params = Params {
 
     storage_mass_parameter: STORAGE_MASS_PARAMETER,
     storage_mass_activation_daa_score: u64::MAX,
+    kip10_activation_daa_score: u64::MAX,
 
     // deflationary_phase_daa_score is the DAA score after which the pre-deflationary period
     // switches to the deflationary period. This number is calculated as follows:
@@ -416,7 +420,7 @@ pub const TESTNET_PARAMS: Params = Params {
 
     storage_mass_parameter: STORAGE_MASS_PARAMETER,
     storage_mass_activation_daa_score: u64::MAX,
-
+    kip10_activation_daa_score: u64::MAX,
     // deflationary_phase_daa_score is the DAA score after which the pre-deflationary period
     // switches to the deflationary period. This number is calculated as follows:
     // We define a year as 365.25 days
@@ -486,6 +490,7 @@ pub const TESTNET11_PARAMS: Params = Params {
 
     storage_mass_parameter: STORAGE_MASS_PARAMETER,
     storage_mass_activation_daa_score: 0,
+    kip10_activation_daa_score: u64::MAX,
 
     skip_proof_of_work: false,
     max_block_level: 250,
@@ -539,6 +544,7 @@ pub const SIMNET_PARAMS: Params = Params {
 
     storage_mass_parameter: STORAGE_MASS_PARAMETER,
     storage_mass_activation_daa_score: 0,
+    kip10_activation_daa_score: u64::MAX,
 
     skip_proof_of_work: true, // For simnet only, PoW can be simulated by default
     max_block_level: 250,
@@ -585,6 +591,7 @@ pub const DEVNET_PARAMS: Params = Params {
 
     storage_mass_parameter: STORAGE_MASS_PARAMETER,
     storage_mass_activation_daa_score: u64::MAX,
+    kip10_activation_daa_score: u64::MAX,
 
     // deflationary_phase_daa_score is the DAA score after which the pre-deflationary period
     // switches to the deflationary period. This number is calculated as follows:

consensus/src/consensus/services.rs

@@ -158,6 +158,7 @@ impl ConsensusServices {
             tx_script_cache_counters,
             mass_calculator.clone(),
             params.storage_mass_activation_daa_score,
+            params.kip10_activation_daa_score,
         );
 
         let pruning_point_manager = PruningPointManager::new(

consensus/src/processes/transaction_validator/mod.rs

@@ -28,9 +28,12 @@ pub struct TransactionValidator {
 
     /// Storage mass hardfork DAA score
     storage_mass_activation_daa_score: u64,
+    /// KIP-10 hardfork DAA score
+    kip10_activation_daa_score: u64,
 }
 
 impl TransactionValidator {
+    #[allow(clippy::too_many_arguments)]
     pub fn new(
         max_tx_inputs: usize,
         max_tx_outputs: usize,
@@ -42,6 +45,7 @@ impl TransactionValidator {
         counters: Arc<TxScriptCacheCounters>,
         mass_calculator: MassCalculator,
         storage_mass_activation_daa_score: u64,
+        kip10_activation_daa_score: u64,
     ) -> Self {
         Self {
             max_tx_inputs,
@@ -54,6 +58,7 @@ impl TransactionValidator {
             sig_cache: Cache::with_counters(10_000, counters),
             mass_calculator,
             storage_mass_activation_daa_score,
+            kip10_activation_daa_score,
         }
     }
 
@@ -78,6 +83,7 @@ impl TransactionValidator {
             sig_cache: Cache::with_counters(10_000, counters),
             mass_calculator: MassCalculator::new(0, 0, 0, 0),
             storage_mass_activation_daa_score: u64::MAX,
+            kip10_activation_daa_score: u64::MAX,
         }
     }
 }

consensus/src/processes/transaction_validator/transaction_validator_populated.rs

@@ -55,7 +55,7 @@ impl TransactionValidator {
         match flags {
             TxValidationFlags::Full | TxValidationFlags::SkipMassCheck => {
                 Self::check_sig_op_counts(tx)?;
-                self.check_scripts(tx)?;
+                self.check_scripts(tx, pov_daa_score)?;
             }
             TxValidationFlags::SkipScriptChecks => {}
         }
@@ -166,11 +166,19 @@ impl TransactionValidator {
         Ok(())
     }
 
-    pub fn check_scripts(&self, tx: &impl VerifiableTransaction) -> TxResult<()> {
+    pub fn check_scripts(&self, tx: &impl VerifiableTransaction, pov_daa_score: u64) -> TxResult<()> {
         let mut reused_values = SigHashReusedValues::new();
         for (i, (input, entry)) in tx.populated_inputs().enumerate() {
-            let mut engine = TxScriptEngine::from_transaction_input(tx, input, i, entry, &mut reused_values, &self.sig_cache)
-                .map_err(|err| map_script_err(err, input))?;
+            let mut engine = TxScriptEngine::from_transaction_input(
+                tx,
+                input,
+                i,
+                entry,
+                &mut reused_values,
+                &self.sig_cache,
+                pov_daa_score > self.kip10_activation_daa_score,
+            )
+            .map_err(|err| map_script_err(err, input))?;
             engine.execute().map_err(|err| map_script_err(err, input))?;
         }
 
@@ -260,7 +268,7 @@ mod tests {
             }],
         );
 
-        tv.check_scripts(&populated_tx).expect("Signature check failed");
+        tv.check_scripts(&populated_tx, u64::MAX).expect("Signature check failed");
     }
 
     #[test]
@@ -322,7 +330,7 @@ mod tests {
             }],
         );
 
-        assert!(tv.check_scripts(&populated_tx).is_err(), "Failing Signature Test Failed");
+        assert!(tv.check_scripts(&populated_tx, u64::MAX).is_err(), "Failing Signature Test Failed");
     }
 
     #[test]
@@ -384,7 +392,7 @@ mod tests {
                 is_coinbase: false,
             }],
         );
-        tv.check_scripts(&populated_tx).expect("Signature check failed");
+        tv.check_scripts(&populated_tx, u64::MAX).expect("Signature check failed");
     }
 
     #[test]
@@ -447,7 +455,7 @@ mod tests {
             }],
         );
 
-        assert!(tv.check_scripts(&populated_tx) == Err(TxRuleError::SignatureInvalid(TxScriptError::NullFail)));
+        assert!(tv.check_scripts(&populated_tx, u64::MAX) == Err(TxRuleError::SignatureInvalid(TxScriptError::NullFail)));
     }
 
     #[test]
@@ -510,7 +518,7 @@ mod tests {
             }],
         );
 
-        assert!(tv.check_scripts(&populated_tx) == Err(TxRuleError::SignatureInvalid(TxScriptError::NullFail)));
+        assert!(tv.check_scripts(&populated_tx, u64::MAX) == Err(TxRuleError::SignatureInvalid(TxScriptError::NullFail)));
     }
 
     #[test]
@@ -573,7 +581,7 @@ mod tests {
             }],
         );
 
-        let result = tv.check_scripts(&populated_tx);
+        let result = tv.check_scripts(&populated_tx, u64::MAX);
         assert!(result == Err(TxRuleError::SignatureInvalid(TxScriptError::EvalFalse)));
     }
 
@@ -628,7 +636,7 @@ mod tests {
             }],
         );
 
-        let result = tv.check_scripts(&populated_tx);
+        let result = tv.check_scripts(&populated_tx, u64::MAX);
         assert!(result == Err(TxRuleError::SignatureInvalid(TxScriptError::SignatureScriptNotPushOnly)));
     }
 
@@ -708,7 +716,7 @@ mod tests {
         let schnorr_key = secp256k1::Keypair::from_seckey_slice(secp256k1::SECP256K1, &secret_key.secret_bytes()).unwrap();
         let signed_tx = sign(MutableTransaction::with_entries(unsigned_tx, entries), schnorr_key);
         let populated_tx = signed_tx.as_verifiable();
-        assert_eq!(tv.check_scripts(&populated_tx), Ok(()));
+        assert_eq!(tv.check_scripts(&populated_tx, u64::MAX), Ok(()));
         assert_eq!(TransactionValidator::check_sig_op_counts(&populated_tx), Ok(()));
     }
 }

crypto/txscript/Cargo.toml

@@ -9,6 +9,9 @@ include.workspace = true
 license.workspace = true
 repository.workspace = true
 
+[[example]]
+name = "kip-10"
+
 [features]
 wasm32-core = []
 wasm32-sdk = []