Skip to content

G
Geth-Modification
Unverified Commit 673c92db authored by Péter Szilágyi's avatar Péter Szilágyi
Browse files
Options

internal/ethapi: fix tx nonces in pool inspect/content

parent cb809c03
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
internal/ethapi/api.go
View file @ 673c92db
...@@ -118,16 +118,16 @@ func (s *PublicTxPoolAPI) Content() map[string]map[string]map[string]*RPCTransac ...@@ -118,16 +118,16 @@ func (s *PublicTxPoolAPI) Content() map[string]map[string]map[string]*RPCTransac
// Flatten the pending transactions // Flatten the pending transactions
for account, txs := range pending { for account, txs := range pending {
dump := make(map[string]*RPCTransaction) dump := make(map[string]*RPCTransaction)
for nonce, tx := range txs { for _, tx := range txs {
dump[fmt.Sprintf("%d", nonce)] = newRPCPendingTransaction(tx) dump[fmt.Sprintf("%d", tx.Nonce())] = newRPCPendingTransaction(tx)
} }
content["pending"][account.Hex()] = dump content["pending"][account.Hex()] = dump
} }
// Flatten the queued transactions // Flatten the queued transactions
for account, txs := range queue { for account, txs := range queue {
dump := make(map[string]*RPCTransaction) dump := make(map[string]*RPCTransaction)
for nonce, tx := range txs { for _, tx := range txs {
dump[fmt.Sprintf("%d", nonce)] = newRPCPendingTransaction(tx) dump[fmt.Sprintf("%d", tx.Nonce())] = newRPCPendingTransaction(tx)
} }
content["queued"][account.Hex()] = dump content["queued"][account.Hex()] = dump
} }
...@@ -162,16 +162,16 @@ func (s *PublicTxPoolAPI) Inspect() map[string]map[string]map[string]string { ...@@ -162,16 +162,16 @@ func (s *PublicTxPoolAPI) Inspect() map[string]map[string]map[string]string {
// Flatten the pending transactions // Flatten the pending transactions
for account, txs := range pending { for account, txs := range pending {
dump := make(map[string]string) dump := make(map[string]string)
for nonce, tx := range txs { for _, tx := range txs {
dump[fmt.Sprintf("%d", nonce)] = format(tx) dump[fmt.Sprintf("%d", tx.Nonce())] = format(tx)
} }
content["pending"][account.Hex()] = dump content["pending"][account.Hex()] = dump
} }
// Flatten the queued transactions // Flatten the queued transactions
for account, txs := range queue { for account, txs := range queue {
dump := make(map[string]string) dump := make(map[string]string)
for nonce, tx := range txs { for _, tx := range txs {
dump[fmt.Sprintf("%d", nonce)] = format(tx) dump[fmt.Sprintf("%d", tx.Nonce())] = format(tx)
} }
content["queued"][account.Hex()] = dump content["queued"][account.Hex()] = dump
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment