gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[release/1.4.17] core, eth, miner: only retain 1 tx/nonce, remove bad ones

Browse Source 
(cherry picked from commit 795b70423e)
This commit is contained in:
Péter Szilágyi
2016-06-27 18:28:34 +03:00
committed by Felix Lange
parent 4fced0972d
commit df64a9f5ef
4 changed files with 268 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
eth/api.go
View File

@ -324,22 +324,18 @@ func (s *PublicTxPoolAPI) Content() map[string]map[string]map[string][]*RPCTrans
// Flatten the pending transactions
for account, batches := range pending {
dump := make(map[string][]*RPCTransaction)
for nonce, txs := range batches {
nonce := fmt.Sprintf("%d", nonce)
for _, tx := range txs {
dump[nonce] = append(dump[nonce], newRPCPendingTransaction(tx))
}
for _, tx := range batches {
nonce := fmt.Sprintf("%d", tx.Nonce())
dump[nonce] = []*RPCTransaction{newRPCPendingTransaction(tx)}
}
content["pending"][account.Hex()] = dump
}
// Flatten the queued transactions
for account, batches := range queue {
dump := make(map[string][]*RPCTransaction)
for nonce, txs := range batches {
nonce := fmt.Sprintf("%d", nonce)
for _, tx := range txs {
dump[nonce] = append(dump[nonce], newRPCPendingTransaction(tx))
}
for _, tx := range batches {
nonce := fmt.Sprintf("%d", tx.Nonce())
dump[nonce] = []*RPCTransaction{newRPCPendingTransaction(tx)}
}
content["queued"][account.Hex()] = dump
}
@ -374,22 +370,18 @@ func (s *PublicTxPoolAPI) Inspect() map[string]map[string]map[string][]string {
// Flatten the pending transactions
for account, batches := range pending {
dump := make(map[string][]string)
for nonce, txs := range batches {
nonce := fmt.Sprintf("%d", nonce)
for _, tx := range txs {
dump[nonce] = append(dump[nonce], format(tx))
}
for _, tx := range batches {
nonce := fmt.Sprintf("%d", tx.Nonce())
dump[nonce] = []string{format(tx)}
}
content["pending"][account.Hex()] = dump
}
// Flatten the queued transactions
for account, batches := range queue {
dump := make(map[string][]string)
for nonce, txs := range batches {
nonce := fmt.Sprintf("%d", nonce)
for _, tx := range txs {
dump[nonce] = append(dump[nonce], format(tx))
}
for _, tx := range batches {
nonce := fmt.Sprintf("%d", tx.Nonce())
dump[nonce] = []string{format(tx)}
}
content["queued"][account.Hex()] = dump
}