diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-22 01:18:19 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-22 01:18:19 +0800 |
| commit | 7f85608f30a2e34005c8d15566849229c758c2f1 (patch) | |
| tree | 7aeb9d8bdfda7ec10ea38688a96ed245028764ad /crypto/crypto.go | |
| parent | 09766d1729f7530093aec7e9acd3e5339b2c2028 (diff) | |
| parent | fcacfabe1959c4aff6a63cb4e275f65328660601 (diff) | |
| download | dexon-7f85608f30a2e34005c8d15566849229c758c2f1.tar dexon-7f85608f30a2e34005c8d15566849229c758c2f1.tar.gz dexon-7f85608f30a2e34005c8d15566849229c758c2f1.tar.bz2 dexon-7f85608f30a2e34005c8d15566849229c758c2f1.tar.lz dexon-7f85608f30a2e34005c8d15566849229c758c2f1.tar.xz dexon-7f85608f30a2e34005c8d15566849229c758c2f1.tar.zst dexon-7f85608f30a2e34005c8d15566849229c758c2f1.zip | |
Merge branch 'conversion' into develop
Diffstat (limited to 'crypto/crypto.go')
| -rw-r--r-- | crypto/crypto.go | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/crypto/crypto.go b/crypto/crypto.go index bc72928ac..c3d47b629 100644 --- a/crypto/crypto.go +++ b/crypto/crypto.go @@ -16,10 +16,11 @@ import ( "errors" "code.google.com/p/go-uuid/uuid" + "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto/ecies" "github.com/ethereum/go-ethereum/crypto/secp256k1" "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/rlp" "golang.org/x/crypto/pbkdf2" "golang.org/x/crypto/ripemd160" ) @@ -37,9 +38,20 @@ func Sha3(data ...[]byte) []byte { return d.Sum(nil) } +func Sha3Hash(data ...[]byte) (h common.Hash) { + d := sha3.NewKeccak256() + for _, b := range data { + d.Write(b) + } + d.Sum(h[:0]) + return h +} + // Creates an ethereum address given the bytes and the nonce -func CreateAddress(b []byte, nonce uint64) []byte { - return Sha3(common.NewValue([]interface{}{b, nonce}).Encode())[12:] +func CreateAddress(b common.Address, nonce uint64) common.Address { + data, _ := rlp.EncodeToBytes([]interface{}{b, nonce}) + return common.BytesToAddress(Sha3(data)[12:]) + //return Sha3(common.NewValue([]interface{}{b, nonce}).Encode())[12:] } func Sha256(data []byte) []byte { |