From 512ffa2bf4308b44aa6f43f25238b375b58d7dbc Mon Sep 17 00:00:00 2001 From: Gustav Simonsson Date: Sun, 25 Jan 2015 02:07:20 +0100 Subject: Add accounts package and refactor key stores * Add initial UserAccount and AccountManager structs * Add NewAccount, Sign and Accounts functions * Refactor key stores to use key address as main identifier while keeping the UUID. * Use key address as file/dir names instead of UUID --- accounts/account_manager.go | 99 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 accounts/account_manager.go (limited to 'accounts/account_manager.go') diff --git a/accounts/account_manager.go b/accounts/account_manager.go new file mode 100644 index 000000000..b5a0c4f87 --- /dev/null +++ b/accounts/account_manager.go @@ -0,0 +1,99 @@ +/* + This file is part of go-ethereum + + go-ethereum is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + go-ethereum is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with go-ethereum. If not, see . +*/ +/** + * @authors + * Gustav Simonsson + * @date 2015 + * + */ +/* + +This abstracts part of a user's interaction with an account she controls. +It's not an abstraction of core Ethereum accounts data type / logic - +for that see the core processing code of blocks / txs. + +Currently this is pretty much a passthrough to the KeyStore2 interface, +and accounts persistence is derived from stored keys' addresses + +*/ +package accounts + +import ( + crand "crypto/rand" + "github.com/ethereum/go-ethereum/crypto" + "github.com/ethereum/go-ethereum/crypto/secp256k1" +) + +// TODO: better name for this struct? +type UserAccount struct { + Addr []byte +} + +type AccountManager struct { + keyStore crypto.KeyStore2 +} + +// TODO: get key by addr - modify KeyStore2 GetKey to work with addr + +// TODO: pass through passphrase for APIs which require access to private key? +func NewAccountManager(keyStore crypto.KeyStore2) AccountManager { + am := &AccountManager{ + keyStore: keyStore, + } + return *am +} + +func (am *AccountManager) Sign(fromAddr []byte, keyAuth string, toSign []byte) (signature []byte, err error) { + key, err := am.keyStore.GetKey(fromAddr, keyAuth) + if err != nil { + return nil, err + } + privKey := crypto.FromECDSA(key.PrivateKey) + // TODO: what is second value? + signature, err = secp256k1.Sign(toSign, privKey) + return signature, err +} + +func (am AccountManager) NewAccount(auth string) (*UserAccount, error) { + key, err := am.keyStore.GenerateNewKey(crand.Reader, auth) + if err != nil { + return nil, err + } + ua := &UserAccount{ + Addr: key.Address, + } + return ua, err +} + +// set of accounts == set of keys in given key store +// TODO: do we need persistence of accounts as well? +func (am *AccountManager) Accounts() ([]UserAccount, error) { + addresses, err := am.keyStore.GetKeyAddresses() + if err != nil { + return nil, err + } + + accounts := make([]UserAccount, len(addresses)) + + for i, addr := range addresses { + ua := &UserAccount{ + Addr: addr, + } + accounts[i] = *ua + } + return accounts, err +} -- cgit v1.2.3 From 8d9752a557e33341a5fb73239dbae664b2f8aaa0 Mon Sep 17 00:00:00 2001 From: Gustav Simonsson Date: Wed, 28 Jan 2015 05:12:57 +0100 Subject: Address pull request comments * Use crypto.Sign instead of directly calling secp256k1 lib * Rename UserAccount to Account and Addr to Address (for consistency) * Change AccountManager.Sign to take ptr to Account instead of address byte array * Simplify copying of Accounts in Accounts() * PubkeyToAddress and GetEntropyCSPRNG now exported --- accounts/account_manager.go | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) (limited to 'accounts/account_manager.go') diff --git a/accounts/account_manager.go b/accounts/account_manager.go index b5a0c4f87..da0bd8900 100644 --- a/accounts/account_manager.go +++ b/accounts/account_manager.go @@ -35,12 +35,11 @@ package accounts import ( crand "crypto/rand" "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/secp256k1" ) // TODO: better name for this struct? -type UserAccount struct { - Addr []byte +type Account struct { + Address []byte } type AccountManager struct { @@ -57,43 +56,40 @@ func NewAccountManager(keyStore crypto.KeyStore2) AccountManager { return *am } -func (am *AccountManager) Sign(fromAddr []byte, keyAuth string, toSign []byte) (signature []byte, err error) { - key, err := am.keyStore.GetKey(fromAddr, keyAuth) +func (am *AccountManager) Sign(fromAccount *Account, keyAuth string, toSign []byte) (signature []byte, err error) { + key, err := am.keyStore.GetKey(fromAccount.Address, keyAuth) if err != nil { return nil, err } - privKey := crypto.FromECDSA(key.PrivateKey) - // TODO: what is second value? - signature, err = secp256k1.Sign(toSign, privKey) + signature, err = crypto.Sign(toSign, key.PrivateKey) return signature, err } -func (am AccountManager) NewAccount(auth string) (*UserAccount, error) { +func (am AccountManager) NewAccount(auth string) (*Account, error) { key, err := am.keyStore.GenerateNewKey(crand.Reader, auth) if err != nil { return nil, err } - ua := &UserAccount{ - Addr: key.Address, + ua := &Account{ + Address: key.Address, } return ua, err } // set of accounts == set of keys in given key store // TODO: do we need persistence of accounts as well? -func (am *AccountManager) Accounts() ([]UserAccount, error) { +func (am *AccountManager) Accounts() ([]Account, error) { addresses, err := am.keyStore.GetKeyAddresses() if err != nil { return nil, err } - accounts := make([]UserAccount, len(addresses)) + accounts := make([]Account, len(addresses)) for i, addr := range addresses { - ua := &UserAccount{ - Addr: addr, + accounts[i] = Account{ + Address: addr, } - accounts[i] = *ua } return accounts, err } -- cgit v1.2.3