Merge branch 'fix/sidecar/same-nonce' of github.com:chainbound/bolt-v…

…0 into fix/sidecar/same-nonce

bolt-sidecar/src/common.rs

@@ -47,11 +47,17 @@ pub fn validate_transaction(
 ) -> Result<(), ValidationError> {
     // Check if the nonce is correct (should be the same as the transaction count)
     if transaction.nonce() < account_state.transaction_count {
-        return Err(ValidationError::NonceTooLow);
+        return Err(ValidationError::NonceTooLow(
+            account_state.transaction_count,
+            transaction.nonce(),
+        ));
     }
 
     if transaction.nonce() > account_state.transaction_count {
-        return Err(ValidationError::NonceTooHigh);
+        return Err(ValidationError::NonceTooHigh(
+            account_state.transaction_count,
+            transaction.nonce(),
+        ));
     }
 
     // Check if the balance is enough

bolt-sidecar/src/state/execution.rs

@@ -31,11 +31,11 @@ pub enum ValidationError {
     #[error("Invalid max basefee calculation: overflow")]
     MaxBaseFeeCalcOverflow,
     /// The transaction nonce is too low.
-    #[error("Transaction nonce too low")]
-    NonceTooLow,
+    #[error("Transaction nonce too low. Expected {0}, got {1}")]
+    NonceTooLow(u64, u64),
     /// The transaction nonce is too high.
     #[error("Transaction nonce too high")]
-    NonceTooHigh,
+    NonceTooHigh(u64, u64),
     /// The sender account is a smart contract and has code.
     #[error("Account has code")]
     AccountHasCode,

bolt-sidecar/src/state/mod.rs

@@ -152,7 +152,7 @@ mod tests {
 
         assert!(matches!(
             state.validate_commitment_request(&request).await,
-            Err(ValidationError::NonceTooHigh)
+            Err(ValidationError::NonceTooHigh(_, _))
         ));
 
         Ok(())