diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2017-02-13 21:03:16 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-13 21:03:16 +0800 |
| commit | f8f428cc18c5f70814d7b3937128781bac14bffd (patch) | |
| tree | d93d285d2ec22bd8ed646695c3db116c69fa3329 /miner | |
| parent | e23e86921b55cb1ee2fca6b6fb9ed91f5532f9fd (diff) | |
| parent | e99c788155ddd754c73d2c81b6051dcbd42e6575 (diff) | |
| download | dexon-f8f428cc18c5f70814d7b3937128781bac14bffd.tar dexon-f8f428cc18c5f70814d7b3937128781bac14bffd.tar.gz dexon-f8f428cc18c5f70814d7b3937128781bac14bffd.tar.bz2 dexon-f8f428cc18c5f70814d7b3937128781bac14bffd.tar.lz dexon-f8f428cc18c5f70814d7b3937128781bac14bffd.tar.xz dexon-f8f428cc18c5f70814d7b3937128781bac14bffd.tar.zst dexon-f8f428cc18c5f70814d7b3937128781bac14bffd.zip | |
Merge pull request #3592 from karalabe/hw-wallets
accounts: initial support for Ledger hardware wallets
Diffstat (limited to 'miner')
| -rw-r--r-- | miner/worker.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/miner/worker.go b/miner/worker.go index 49ac60253..ef64c8fc9 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -386,8 +386,11 @@ func (self *worker) makeCurrent(parent *types.Block, header *types.Header) error work.family.Add(ancestor.Hash()) work.ancestors.Add(ancestor.Hash()) } - accounts := self.eth.AccountManager().Accounts() - + wallets := self.eth.AccountManager().Wallets() + accounts := make([]accounts.Account, 0, len(wallets)) + for _, wallet := range wallets { + accounts = append(accounts, wallet.Accounts()...) + } // Keep track of transactions which return errors so they can be removed work.tcount = 0 work.ownedAccounts = accountAddressesSet(accounts) |