Skip to content

Commit f8f428c

Browse files
authored
Merge pull request ethereum#3592 from karalabe/hw-wallets
accounts: initial support for Ledger hardware wallets
2 parents e23e869 + e99c788 commit f8f428c

File tree

122 files changed

+36084
-909
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+36084
-909
lines changed

accounts/abi/bind/auth.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"io"
2323
"io/ioutil"
2424

25-
"github.com/ethereum/go-ethereum/accounts"
25+
"github.com/ethereum/go-ethereum/accounts/keystore"
2626
"github.com/ethereum/go-ethereum/common"
2727
"github.com/ethereum/go-ethereum/core/types"
2828
"github.com/ethereum/go-ethereum/crypto"
@@ -35,7 +35,7 @@ func NewTransactor(keyin io.Reader, passphrase string) (*TransactOpts, error) {
3535
if err != nil {
3636
return nil, err
3737
}
38-
key, err := accounts.DecryptKey(json, passphrase)
38+
key, err := keystore.DecryptKey(json, passphrase)
3939
if err != nil {
4040
return nil, err
4141
}

accounts/account_manager.go

Lines changed: 0 additions & 350 deletions
This file was deleted.

0 commit comments

Comments
 (0)