graphql: fix nonce for pending accounts (#24443)

ethereum · Feb 22, 2022 · 862f8e9 · 862f8e9
1 parent d6f49bf
commit 862f8e9
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/graphql/graphql.go b/graphql/graphql.go
@@ -100,6 +100,14 @@ func (a *Account) Balance(ctx context.Context) (hexutil.Big, error) {
 }
 
 func (a *Account) TransactionCount(ctx context.Context) (hexutil.Uint64, error) {
+	// Ask transaction pool for the nonce which includes pending transactions
+	if blockNr, ok := a.blockNrOrHash.Number(); ok && blockNr == rpc.PendingBlockNumber {
+		nonce, err := a.backend.GetPoolNonce(ctx, a.address)
+		if err != nil {
+			return 0, err
+		}
+		return hexutil.Uint64(nonce), nil
+	}
 	state, err := a.getState(ctx)
 	if err != nil {
 		return 0, err