analyzer/consensus: Do not bump nonce for consensus.Meta txs

oasisprotocol · Mar 1, 2024 · 477b49a · 477b49a
1 parent b102297
commit 477b49a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/analyzer/consensus/consensus.go b/analyzer/consensus/consensus.go
@@ -425,12 +425,14 @@ func (m *processor) queueTransactionInserts(batch *storage.QueryBatch, data *con
 			result.Error.Code,
 			message,
 		)
-		if m.mode != analyzer.FastSyncMode {
-			// Skip during fast sync; will be provided by the genesis.
-			batch.Queue(queries.ConsensusAccountNonceUpsert,
-				sender,
-				tx.Nonce+1,
-			)
+		// Bump the nonce.
+		if m.mode != analyzer.FastSyncMode { // Skip during fast sync; nonce will be provided by the genesis.
+			if tx.Method != "consensus.Meta" { // consensus.Meta is a special internal tx that doesn't affect the nonce.
+				batch.Queue(queries.ConsensusAccountNonceUpsert,
+					sender,
+					tx.Nonce+1,
+				)
+			}
 		}
 
 		// TODO: Use event when available

diff --git a/api/spec/v1.yaml b/api/spec/v1.yaml
@@ -1948,7 +1948,7 @@ components:
         nonce:
           type: integer
           format: int64
-          description: A nonce used to prevent replay.
+          description: The expected nonce for the next transaction (= last used nonce + 1)
           example: 0
         available:
           allOf: [$ref: '#/components/schemas/TextBigInt']

diff --git a/storage/migrations/00_consensus.up.sql b/storage/migrations/00_consensus.up.sql
@@ -178,7 +178,7 @@ CREATE TABLE chain.accounts
 
   -- General Account
   general_balance UINT_NUMERIC DEFAULT 0,
-  nonce           UINT63 NOT NULL DEFAULT 0,
+  nonce           UINT63 NOT NULL DEFAULT 0, -- expected nonce for the next transaction (= last used nonce + 1)
 
   -- Escrow Account
   -- TODO: Use UINT_NUMERIC for the next four columns. Their values should always be >=0;