diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-06-05 01:47:23 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-06-05 01:47:23 +0800 |
| commit | 45152dead5c6bc144f8ed51ed85d5ef64f783735 (patch) | |
| tree | 48aa51432821a0d49ffa6d2a015c16f4867a1c63 /crypto | |
| parent | 10fc73376789b1b016fbbd86df3b378df0238a0c (diff) | |
| parent | 912cf7ba049e4bcd5e497c62bb7cb96e7502f1b9 (diff) | |
| download | go-tangerine-45152dead5c6bc144f8ed51ed85d5ef64f783735.tar go-tangerine-45152dead5c6bc144f8ed51ed85d5ef64f783735.tar.gz go-tangerine-45152dead5c6bc144f8ed51ed85d5ef64f783735.tar.bz2 go-tangerine-45152dead5c6bc144f8ed51ed85d5ef64f783735.tar.lz go-tangerine-45152dead5c6bc144f8ed51ed85d5ef64f783735.tar.xz go-tangerine-45152dead5c6bc144f8ed51ed85d5ef64f783735.tar.zst go-tangerine-45152dead5c6bc144f8ed51ed85d5ef64f783735.zip | |
Merge pull request #1181 from obscuren/txpool_fixes
cmd: transaction pool fixes and improvements
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/crypto.go | 8 | ||||
| -rw-r--r-- | crypto/key.go | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/crypto/crypto.go b/crypto/crypto.go index 9aef44863..8f5597b09 100644 --- a/crypto/crypto.go +++ b/crypto/crypto.go @@ -201,7 +201,7 @@ func ImportBlockTestKey(privKeyBytes []byte) error { ecKey := ToECDSA(privKeyBytes) key := &Key{ Id: uuid.NewRandom(), - Address: common.BytesToAddress(PubkeyToAddress(ecKey.PublicKey)), + Address: PubkeyToAddress(ecKey.PublicKey), PrivateKey: ecKey, } err := ks.StoreKey(key, "") @@ -247,7 +247,7 @@ func decryptPreSaleKey(fileContent []byte, password string) (key *Key, err error ecKey := ToECDSA(ethPriv) key = &Key{ Id: nil, - Address: common.BytesToAddress(PubkeyToAddress(ecKey.PublicKey)), + Address: PubkeyToAddress(ecKey.PublicKey), PrivateKey: ecKey, } derivedAddr := hex.EncodeToString(key.Address.Bytes()) // needed because .Hex() gives leading "0x" @@ -305,7 +305,7 @@ func PKCS7Unpad(in []byte) []byte { return in[:len(in)-int(padding)] } -func PubkeyToAddress(p ecdsa.PublicKey) []byte { +func PubkeyToAddress(p ecdsa.PublicKey) common.Address { pubBytes := FromECDSAPub(&p) - return Sha3(pubBytes[1:])[12:] + return common.BytesToAddress(Sha3(pubBytes[1:])[12:]) } diff --git a/crypto/key.go b/crypto/key.go index 0c5ce4254..0b76c43ff 100644 --- a/crypto/key.go +++ b/crypto/key.go @@ -124,7 +124,7 @@ func NewKeyFromECDSA(privateKeyECDSA *ecdsa.PrivateKey) *Key { id := uuid.NewRandom() key := &Key{ Id: id, - Address: common.BytesToAddress(PubkeyToAddress(privateKeyECDSA.PublicKey)), + Address: PubkeyToAddress(privateKeyECDSA.PublicKey), PrivateKey: privateKeyECDSA, } return key |