diff options
| author | Jeffrey Wilcke <obscuren@users.noreply.github.com> | 2014-07-01 22:16:05 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <obscuren@users.noreply.github.com> | 2014-07-01 22:16:05 +0800 |
| commit | 29f613ef84ed39ccc1929dd1069f3576ade889f1 (patch) | |
| tree | 0c12e6fe9e0214989401bb47a6d4503081fd47bc /ethchain/vm.go | |
| parent | 550407b0ec78b7026737d1abe28127da8c0c9063 (diff) | |
| parent | ff5703fd9b089de67811af61de05637c62dc7a2c (diff) | |
| download | dexon-29f613ef84ed39ccc1929dd1069f3576ade889f1.tar dexon-29f613ef84ed39ccc1929dd1069f3576ade889f1.tar.gz dexon-29f613ef84ed39ccc1929dd1069f3576ade889f1.tar.bz2 dexon-29f613ef84ed39ccc1929dd1069f3576ade889f1.tar.lz dexon-29f613ef84ed39ccc1929dd1069f3576ade889f1.tar.xz dexon-29f613ef84ed39ccc1929dd1069f3576ade889f1.tar.zst dexon-29f613ef84ed39ccc1929dd1069f3576ade889f1.zip | |
Merge pull request #28 from ethersphere/feature/keys
Feature/keys
Diffstat (limited to 'ethchain/vm.go')
| -rw-r--r-- | ethchain/vm.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ethchain/vm.go b/ethchain/vm.go index 3851d0d70..c5ccb3420 100644 --- a/ethchain/vm.go +++ b/ethchain/vm.go @@ -2,6 +2,7 @@ package ethchain import ( "fmt" + "github.com/ethereum/eth-go/ethcrypto" "github.com/ethereum/eth-go/ethlog" "github.com/ethereum/eth-go/ethutil" "math" @@ -421,7 +422,7 @@ func (vm *Vm) RunClosure(closure *Closure, hook DebugHook) (ret []byte, err erro case SHA3: require(2) size, offset := stack.Popn() - data := ethutil.Sha3Bin(mem.Get(offset.Int64(), size.Int64())) + data := ethcrypto.Sha3Bin(mem.Get(offset.Int64(), size.Int64())) stack.Push(ethutil.BigD(data)) // 0x30 range @@ -617,7 +618,7 @@ func (vm *Vm) RunClosure(closure *Closure, hook DebugHook) (ret []byte, err erro snapshot := vm.state.Copy() // Generate a new address - addr := ethutil.CreateAddress(closure.caller.Address(), closure.caller.N()) + addr := ethcrypto.CreateAddress(closure.caller.Address(), closure.caller.N()) vm.Printf(" (*) %x", addr).Endl() |