diff options
| author | Ted Yin <[email protected]> | 2020-09-18 13:14:29 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-09-18 13:14:29 -0400 |
| commit | d048937c48753d9eaef771bf71820cf95d79df26 (patch) | |
| tree | 1a7f65fcd72e77092525ab01625b8b9d365e3e40 /accounts/accounts.go | |
| parent | 7d1388c743b4ec8f4a86bea95bfada785dee83f7 (diff) | |
| parent | 7d8c85cf8895b0f998d8eafb02f99d5b689fcd59 (diff) | |
Merge pull request #34 from ava-labs/devv0.3.0-rc.5
Dev
Diffstat (limited to 'accounts/accounts.go')
| -rw-r--r-- | accounts/accounts.go | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/accounts/accounts.go b/accounts/accounts.go index bca3223..17978d3 100644 --- a/accounts/accounts.go +++ b/accounts/accounts.go @@ -22,9 +22,10 @@ import ( "math/big" "github.com/ava-labs/coreth/core/types" - ethereum "github.com/ava-labs/go-ethereum" - "github.com/ava-labs/go-ethereum/common" - "github.com/ava-labs/go-ethereum/event" + ethereum "github.com/ethereum/go-ethereum" + gethaccounts "github.com/ethereum/go-ethereum/accounts" + "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/event" "golang.org/x/crypto/sha3" ) @@ -129,6 +130,8 @@ type Wallet interface { // about which fields or actions are needed. The user may retry by providing // the needed details via SignHashWithPassphrase, or by other means (e.g. unlock // the account in a keystore). + // + // This method should return the signature in 'canonical' format, with v 0 or 1 SignText(account Account, text []byte) ([]byte, error) // SignTextWithPassphrase is identical to Signtext, but also takes a password @@ -199,7 +202,7 @@ func TextAndHash(data []byte) ([]byte, string) { // WalletEventType represents the different event types that can be fired by // the wallet subscription subsystem. -type WalletEventType int +type WalletEventType = gethaccounts.WalletEventType const ( // WalletArrived is fired when a new wallet is detected either via USB or via |