Merge pull request #5972 from oasisprotocol/peternose/trivial/reset-n…

…once

go/consensus/api/submission: Always clear nonce on error

go/consensus/api/submission.go

@@ -176,14 +176,18 @@ func (m *submissionManager) signAndSubmitTx(ctx context.Context, signer signatur
 		err = m.backend.SubmitTx(ctx, sigTx)
 	}
 	if err != nil {
+		// If the transaction check fails (which cannot be determined from
+		// the error), the nonce in the cache should be either decremented
+		// or cleared to ensure consistency.
+		m.clearSignerNonce(signerAddr)
+
 		switch {
 		case errors.Is(err, transaction.ErrUpgradePending):
 			// Pending upgrade, retry submission.
 			m.logger.Debug("retrying transaction submission due to pending upgrade")
 			return nil, nil, err
 		case errors.Is(err, transaction.ErrInvalidNonce):
 			// Invalid nonce, retry submission.
-			m.clearSignerNonce(signerAddr)
 			m.logger.Debug("retrying transaction submission due to invalid nonce",
 				"account_address", signerAddr,
 				"nonce", tx.Nonce,