diff options
author | Péter Szilágyi <peterke@gmail.com> | 2018-06-12 18:40:16 +0800 |
---|---|---|
committer | Péter Szilágyi <peterke@gmail.com> | 2018-06-12 18:49:43 +0800 |
commit | 90829a04bfe7a1c73e6fe01699b5bbae31e3c3b2 (patch) | |
tree | dbc9f8700f6a08aef902151c9223431983be3a7e /internal/ethapi | |
parent | f991995918899c48cc89c4d4ec4329bb4a7ce108 (diff) | |
download | dexon-90829a04bfe7a1c73e6fe01699b5bbae31e3c3b2.tar dexon-90829a04bfe7a1c73e6fe01699b5bbae31e3c3b2.tar.gz dexon-90829a04bfe7a1c73e6fe01699b5bbae31e3c3b2.tar.bz2 dexon-90829a04bfe7a1c73e6fe01699b5bbae31e3c3b2.tar.lz dexon-90829a04bfe7a1c73e6fe01699b5bbae31e3c3b2.tar.xz dexon-90829a04bfe7a1c73e6fe01699b5bbae31e3c3b2.tar.zst dexon-90829a04bfe7a1c73e6fe01699b5bbae31e3c3b2.zip |
internal/ethapi: reduce pendingTransactions to O(txs+accs) from O(txs*accs)
Diffstat (limited to 'internal/ethapi')
-rw-r--r-- | internal/ethapi/api.go | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go index f95388d65..f5753da22 100644 --- a/internal/ethapi/api.go +++ b/internal/ethapi/api.go @@ -1301,14 +1301,19 @@ func (s *PublicTransactionPoolAPI) SignTransaction(ctx context.Context, args Sen return &SignTransactionResult{data, tx}, nil } -// PendingTransactions returns the transactions that are in the transaction pool and have a from address that is one of -// the accounts this node manages. +// PendingTransactions returns the transactions that are in the transaction pool +// and have a from address that is one of the accounts this node manages. func (s *PublicTransactionPoolAPI) PendingTransactions() ([]*RPCTransaction, error) { pending, err := s.b.GetPoolTransactions() if err != nil { return nil, err } - + accounts := make(map[common.Address]struct{}) + for _, wallet := range s.b.AccountManager().Wallets() { + for _, account := range wallet.Accounts() { + accounts[account.Address] = struct{}{} + } + } transactions := make([]*RPCTransaction, 0, len(pending)) for _, tx := range pending { var signer types.Signer = types.HomesteadSigner{} @@ -1316,7 +1321,7 @@ func (s *PublicTransactionPoolAPI) PendingTransactions() ([]*RPCTransaction, err signer = types.NewEIP155Signer(tx.ChainId()) } from, _ := types.Sender(signer, tx) - if _, err := s.b.AccountManager().Find(accounts.Account{Address: from}); err == nil { + if _, exists := accounts[from]; exists { transactions = append(transactions, newRPCPendingTransaction(tx)) } } |