diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-17 18:19:23 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-17 18:19:23 +0800 |
| commit | 515d9432fcef8c574627049d437d6898b56c2829 (patch) | |
| tree | 40322c532a38b8f563d452bd75dab69729e55d92 /crypto | |
| parent | 8ce6a3647821706cf5e9bb1a9dc13f23c84f6585 (diff) | |
| download | go-tangerine-515d9432fcef8c574627049d437d6898b56c2829.tar go-tangerine-515d9432fcef8c574627049d437d6898b56c2829.tar.gz go-tangerine-515d9432fcef8c574627049d437d6898b56c2829.tar.bz2 go-tangerine-515d9432fcef8c574627049d437d6898b56c2829.tar.lz go-tangerine-515d9432fcef8c574627049d437d6898b56c2829.tar.xz go-tangerine-515d9432fcef8c574627049d437d6898b56c2829.tar.zst go-tangerine-515d9432fcef8c574627049d437d6898b56c2829.zip | |
converted vm
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/crypto.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/crypto/crypto.go b/crypto/crypto.go index 1f8dfcf32..e9582ac77 100644 --- a/crypto/crypto.go +++ b/crypto/crypto.go @@ -20,6 +20,7 @@ import ( "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/rlp" "golang.org/x/crypto/pbkdf2" "golang.org/x/crypto/ripemd160" ) @@ -47,8 +48,10 @@ func Sha3Hash(data ...[]byte) (h common.Hash) { } // 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 { |