Be explicit about where to get next nonce from when performing extra

check on pre-verified transaction.
Concordium · Nov 17, 2023 · e5fb993 · e5fb993
1 parent 7c3f13c
commit e5fb993
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/concordium-consensus/src/Concordium/GlobalState/Persistent/TreeState.hs b/concordium-consensus/src/Concordium/GlobalState/Persistent/TreeState.hs
@@ -898,12 +898,14 @@ instance
                 oldCredential <- case wmdData of
                     CredentialDeployment{} -> memberTransactionTable wmdHash
                     _ -> return False
-                -- We need to check here that the nonce is still ok, because it could be
-                -- that a block was finalized thus the next account nonce being incremented
+                -- We need to check here that the nonce is still ok with respect to the last finalized block,
+                -- because it could be that a block was finalized thus the next account nonce being incremented
                 -- after this transaction was received and pre-verified.
                 isNonceOk <- case wmdData of
                     NormalTransaction tr -> do
-                        (nonce, _) <- getNextAccountNonce $ accountAddressEmbed (transactionSender tr)
+                        lfbState <- use (skovPersistentData . lastFinalized . to _bpState)
+                        mAcc <- getAccount lfbState $ transactionSender tr
+                        nonce <- maybe (pure minNonce) getAccountNonce (snd <$> mAcc)
                         return $! nonce <= transactionNonce tr
                     -- the sequence number will be checked by @Impl.addTransaction@.
                     _ -> return False

diff --git a/concordium-consensus/src/Concordium/KonsensusV1/Transactions.hs b/concordium-consensus/src/Concordium/KonsensusV1/Transactions.hs
@@ -233,12 +233,14 @@ addPreverifiedTransaction ::
     TVer.OkResult ->
     m AddTransactionResult
 addPreverifiedTransaction bi okRes = do
-    -- We need to check here that the nonce is still ok, because it could be
-    -- that a block was finalized thus the next account nonce being incremented
+    -- We need to check here that the nonce is still ok with respect to the last finalized block,
+    -- because it could be that a block was finalized thus the next account nonce being incremented
     -- after this transaction was received and pre-verified.
     isNonceOk <- case wmdData bi of
         NormalTransaction tr -> do
-            (nonce, _) <- runAccountNonceQueryT $ getNextAccountNonce $ accountAddressEmbed (transactionSender tr)
+            lfbState <- use (Impl.lastFinalized . to bpState)
+            mAcc <- getAccount lfbState $ transactionSender tr
+            nonce <- maybe (pure minNonce) getAccountNonce (snd <$> mAcc)
             return $! nonce <= transactionNonce tr
         -- the sequence number will be checked by @Impl.addTransaction@.
         _ -> return True