diff options
author | Péter Szilágyi <peterke@gmail.com> | 2017-02-11 23:02:00 +0800 |
---|---|---|
committer | Péter Szilágyi <peterke@gmail.com> | 2017-02-13 20:00:12 +0800 |
commit | e99c788155ddd754c73d2c81b6051dcbd42e6575 (patch) | |
tree | 1b219c22d8e288c8b12c9125adb709686664aa9e /cmd | |
parent | c7022c1a0c2aa4c0326129ef483b27bcd6c1262d (diff) | |
download | dexon-e99c788155ddd754c73d2c81b6051dcbd42e6575.tar dexon-e99c788155ddd754c73d2c81b6051dcbd42e6575.tar.gz dexon-e99c788155ddd754c73d2c81b6051dcbd42e6575.tar.bz2 dexon-e99c788155ddd754c73d2c81b6051dcbd42e6575.tar.lz dexon-e99c788155ddd754c73d2c81b6051dcbd42e6575.tar.xz dexon-e99c788155ddd754c73d2c81b6051dcbd42e6575.tar.zst dexon-e99c788155ddd754c73d2c81b6051dcbd42e6575.zip |
accounts: ledger and HD review fixes
- Handle a data race where a Ledger drops between list and open
- Prolong Ledger tx confirmation window to 30 days from 1 minute
- Simplify Ledger chainid-signature calculation and validation
- Simplify Ledger USB APDU request chunking algorithm
- Silence keystore account cache notifications for manual actions
- Only enable self derivations if wallet open succeeds
Diffstat (limited to 'cmd')
-rw-r--r-- | cmd/geth/main.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cmd/geth/main.go b/cmd/geth/main.go index cc597717e..c19770bfa 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -273,8 +273,9 @@ func startNode(ctx *cli.Context, stack *node.Node) { for _, wallet := range stack.AccountManager().Wallets() { if err := wallet.Open(""); err != nil { glog.V(logger.Warn).Infof("Failed to open wallet %s: %v", wallet.URL(), err) + } else { + wallet.SelfDerive(accounts.DefaultBaseDerivationPath, stateReader) } - wallet.SelfDerive(accounts.DefaultBaseDerivationPath, stateReader) } // Listen for wallet event till termination for event := range events { @@ -283,8 +284,8 @@ func startNode(ctx *cli.Context, stack *node.Node) { glog.V(logger.Info).Infof("New wallet appeared: %s, failed to open: %s", event.Wallet.URL(), err) } else { glog.V(logger.Info).Infof("New wallet appeared: %s, %s", event.Wallet.URL(), event.Wallet.Status()) + event.Wallet.SelfDerive(accounts.DefaultBaseDerivationPath, stateReader) } - event.Wallet.SelfDerive(accounts.DefaultBaseDerivationPath, stateReader) } else { glog.V(logger.Info).Infof("Old wallet dropped: %s", event.Wallet.URL()) event.Wallet.Close() |