Fail invalid nonce on validation

DeFiCh · Sep 18, 2023 · 07a50cf · 07a50cf
1 parent 27bb62c
commit 07a50cf
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 33 deletions.
diff --git a/lib/ain-evm/src/core.rs b/lib/ain-evm/src/core.rs
@@ -1,4 +1,3 @@
-use std::cmp::Ordering;
 use std::{path::PathBuf, sync::Arc};
 
 use crate::fee::calculate_prepay_gas_fee;
@@ -47,7 +46,6 @@ pub struct ValidateTxInfo {
     pub signed_tx: SignedTx,
     pub prepay_fee: U256,
     pub higher_nonce: bool,
-    pub lower_nonce: bool,
 }
 
 fn init_vsdb(path: PathBuf) {
@@ -279,36 +277,20 @@ impl EVMCoreService {
                     signed_tx.nonce()
                 )
                 .into());
+            } else if nonce < signed_tx.nonce() {
+                return Ok(ValidateTxInfo {
+                    signed_tx,
+                    prepay_fee,
+                    higher_nonce: true,
+                });
             }
 
             return Ok(ValidateTxInfo {
                 signed_tx,
                 prepay_fee,
                 higher_nonce: false,
-                lower_nonce: false,
             });
         } else {
-            // Should be queued for now and don't go through VM validation
-            match signed_tx.nonce().cmp(&nonce) {
-                Ordering::Greater => {
-                    return Ok(ValidateTxInfo {
-                        signed_tx,
-                        prepay_fee,
-                        higher_nonce: true,
-                        lower_nonce: false,
-                    });
-                }
-                Ordering::Less => {
-                    return Ok(ValidateTxInfo {
-                        signed_tx,
-                        prepay_fee,
-                        higher_nonce: false,
-                        lower_nonce: true,
-                    });
-                }
-                _ => {}
-            }
-
             // Validate tx prepay fees with account balance
             let balance = backend.get_balance(&signed_tx.sender);
             debug!("[validate_raw_tx] Account balance : {:x?}", balance);
@@ -341,7 +323,6 @@ impl EVMCoreService {
             signed_tx,
             prepay_fee,
             higher_nonce: false,
-            lower_nonce: false,
         })
     }
 

diff --git a/lib/ain-rs-exports/src/evm.rs b/lib/ain-rs-exports/src/evm.rs
@@ -474,7 +474,6 @@ pub fn evm_unsafe_try_prevalidate_raw_tx_in_q(
                 signed_tx,
                 prepay_fee,
                 higher_nonce,
-                lower_nonce,
             }) => {
                 let Ok(nonce) = u64::try_from(signed_tx.nonce()) else {
                     return cross_boundary_error_return(result, "nonce value overflow");
@@ -492,7 +491,6 @@ pub fn evm_unsafe_try_prevalidate_raw_tx_in_q(
                         tx_hash: format!("{:?}", signed_tx.hash()),
                         prepay_fee,
                         higher_nonce,
-                        lower_nonce,
                     },
                 )
             }
@@ -548,7 +546,6 @@ pub fn evm_unsafe_try_validate_raw_tx_in_q(
                 signed_tx,
                 prepay_fee,
                 higher_nonce,
-                lower_nonce,
             }) => {
                 let Ok(nonce) = u64::try_from(signed_tx.nonce()) else {
                     return cross_boundary_error_return(result, "nonce value overflow");
@@ -566,7 +563,6 @@ pub fn evm_unsafe_try_validate_raw_tx_in_q(
                         tx_hash: format!("{:?}", signed_tx.hash()),
                         prepay_fee,
                         higher_nonce,
-                        lower_nonce,
                     },
                 )
             }

diff --git a/lib/ain-rs-exports/src/lib.rs b/lib/ain-rs-exports/src/lib.rs
@@ -119,7 +119,6 @@ pub mod ffi {
         pub tx_hash: String,
         pub prepay_fee: u64,
         pub higher_nonce: bool,
-        pub lower_nonce: bool,
     }
 
     extern "Rust" {

diff --git a/src/masternodes/consensus/xvm.cpp b/src/masternodes/consensus/xvm.cpp
@@ -349,16 +349,16 @@ Res CXVMConsensus::operator()(const CEvmTxMessage &obj) const {
         return Res::Err("evm tx size too large");
 
     CrossBoundaryResult result;
-    ValidateTxCompletion validateResults;
     if (evmPreValidate) {
-        validateResults = evm_unsafe_try_prevalidate_raw_tx_in_q(result, evmQueueId, HexStr(obj.evmTx));
+        evm_unsafe_try_prevalidate_raw_tx_in_q(result, evmQueueId, HexStr(obj.evmTx));
         if (!result.ok) {
             LogPrintf("[evm_try_prevalidate_raw_tx] failed, reason : %s\n", result.reason);
             return Res::Err("evm tx failed to pre-validate %s", result.reason);
         }
         return Res::Ok();
     }
 
+    ValidateTxCompletion validateResults;
     validateResults = evm_unsafe_try_validate_raw_tx_in_q(result, evmQueueId, HexStr(obj.evmTx));
     if (validateResults.higher_nonce) {
         return Res::Ok();

diff --git a/src/miner.cpp b/src/miner.cpp
@@ -616,7 +616,7 @@ bool BlockAssembler::EvmTxPreapply(EvmTxPreApplyContext& ctx)
         const auto obj = std::get<CEvmTxMessage>(txMessage);
 
         ValidateTxCompletion txResult;
-        txResult = evm_unsafe_try_validate_raw_tx_in_q(result, evmQueueId, HexStr(obj.evmTx));
+        txResult = evm_unsafe_try_prevalidate_raw_tx_in_q(result, evmQueueId, HexStr(obj.evmTx));
         if (!result.ok) {
             return false;
         }