Adding protocol_version to intrinsic tx verification

Author: ii-cruz

blockchain-interface/src/abstract_blockchain.rs

@@ -46,6 +46,8 @@ pub trait AbstractBlockchain {
         self.election_head().hash()
     }
 
+    fn protocol_version(&self) -> u16;
+
     /// Returns the block number at the head of the main chain.
     fn block_number(&self) -> u32 {
         self.head().block_number()

blockchain-proxy/src/blockchain_proxy.rs

@@ -115,6 +115,10 @@ impl AbstractBlockchain for BlockchainReadProxy<'_> {
         gen_blockchain_match!(self, BlockchainReadProxy, election_head)
     }
 
+    fn protocol_version(&self) -> u16 {
+        gen_blockchain_match!(self, BlockchainReadProxy, protocol_version)
+    }
+
     fn accounts_complete(&self) -> bool {
         gen_blockchain_match!(self, BlockchainReadProxy, accounts_complete)
     }

blockchain/src/blockchain/abstract_blockchain.rs

@@ -50,6 +50,10 @@ impl AbstractBlockchain for Blockchain {
         self.state.accounts.is_complete(None)
     }
 
+    fn protocol_version(&self) -> u16 {
+        self.state.current_version()
+    }
+
     fn can_enforce_validity_window(&self) -> bool {
         // If we are at the genesis block, we can enforce the validity window
         if self.block_number() == Policy::genesis_block_number() {

blockchain/src/blockchain/verify.rs

@@ -102,11 +102,12 @@ impl Blockchain {
     }
 
     fn verify_transactions(&self, block: &Block) -> Result<(), BlockError> {
+        let version = block.version();
         if let Some(transactions) = block.transactions() {
             for transaction in transactions {
                 let transaction = transaction.get_raw_transaction();
                 if !self.tx_verification_cache.is_known(&transaction.hash()) {
-                    transaction.verify(self.network_id)?;
+                    transaction.verify(self.network_id, version)?;
                 }
             }
         }

lib/src/client.rs

@@ -738,6 +738,11 @@ impl Client {
         self.inner.blockchain.read().head().clone()
     }
 
+    /// Returns the blockchain protocol version
+    pub fn protocol_version(&self) -> u16 {
+        self.inner.blockchain.read().protocol_version()
+    }
+
     #[cfg(feature = "wallet")]
     pub fn wallet_store(&self) -> Arc<WalletStore> {
         Arc::clone(&self.inner.wallet_store)

light-blockchain/src/abstract_blockchain.rs

@@ -39,6 +39,9 @@ impl AbstractBlockchain for LightBlockchain {
     fn accounts_complete(&self) -> bool {
         false
     }
+    fn protocol_version(&self) -> u16 {
+        self.head.version()
+    }
 
     fn current_validators(&self) -> Option<&Validators> {
         self.current_validators.as_ref()

mempool/src/verify.rs

@@ -39,12 +39,12 @@ pub(crate) fn verify_tx(
     filter: Arc<RwLock<MempoolFilter>>,
     priority: TxPriority,
 ) -> Result<(), VerifyErr> {
-    // 1. Verify transaction signature (and other stuff)
-    transaction.verify_mut(network_id)?;
-
-    // 2. Acquire blockchain read lock
+    // 1. Acquire blockchain read lock
     let blockchain = blockchain.read();
 
+    // 2. Verify transaction signature (and other stuff)
+    transaction.verify_mut(network_id, blockchain.state.current_version())?;
+
     // 3. Check validity window and already included
     let block_number = blockchain.block_number() + 1;
     if !transaction.is_valid_at(block_number) {

pow-migration/src/history.rs

@@ -666,7 +666,7 @@ mod test {
 
             let web_transaction: WebTransaction = pos_transaction.into();
             // Convert with the genesis block number and timestamp of mainnet.
-            web_transaction.to_plain_transaction(Some(3456000), Some(1732034720000));
+            web_transaction.to_plain_transaction(Some(3456000), Some(1732034720000), 0);
         }
     }
 }

primitives/account/tests/accounts.rs

@@ -987,7 +987,11 @@ fn can_revert_transactions() {
                         fail_recipient,
                         "Testing transaction"
                     );
-                    assert_eq!(tx.verify(NetworkId::UnitAlbatross), Ok(()));
+                    assert_eq!(tx.verify(NetworkId::UnitAlbatross, 0), Ok(()));
+                    assert_eq!(
+                        tx.verify(NetworkId::UnitAlbatross, Policy::max_supported_version()),
+                        Ok(())
+                    );
 
                     let receipts = accounts.test(&[tx], &[], &block_state);
                     if fail_sender || fail_recipient {

primitives/account/tests/staking_contract/add_stake_policy.rs

@@ -590,8 +590,9 @@ fn add_stake_enforces_minimum_stake_works() {
         Policy::MINIMUM_STAKE - 1,
         &staker_keypair,
     );
+    assert_eq!(tx.verify(NetworkId::UnitAlbatross, 0), Ok(()));
     assert_eq!(
-        tx.verify(NetworkId::UnitAlbatross),
+        tx.verify(NetworkId::UnitAlbatross, Policy::max_supported_version()),
         Err(TransactionError::InvalidValue)
     );
 
@@ -835,8 +836,9 @@ fn add_stake_enforces_minimum_stake_legacy_works() {
         Policy::MINIMUM_STAKE - 1,
         &staker_keypair,
     );
+    assert_eq!(tx.verify(NetworkId::UnitAlbatross, 0), Ok(()));
     assert_eq!(
-        tx.verify(NetworkId::UnitAlbatross),
+        tx.verify(NetworkId::UnitAlbatross, Policy::max_supported_version()),
         Err(TransactionError::InvalidValue)
     );