diff options
| author | obscuren <geffobscura@gmail.com> | 2014-10-31 19:37:43 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-10-31 19:37:43 +0800 |
| commit | fd9da72536b73351bbcdc1e9dbbbb8c0e4bfb21b (patch) | |
| tree | 5f60296ff025ec08962cdd2b4f6bbcfd1479cfdb /vm | |
| parent | 3ee0461cb5b6e4a5e2d287180afbdb681805a662 (diff) | |
| download | dexon-fd9da72536b73351bbcdc1e9dbbbb8c0e4bfb21b.tar dexon-fd9da72536b73351bbcdc1e9dbbbb8c0e4bfb21b.tar.gz dexon-fd9da72536b73351bbcdc1e9dbbbb8c0e4bfb21b.tar.bz2 dexon-fd9da72536b73351bbcdc1e9dbbbb8c0e4bfb21b.tar.lz dexon-fd9da72536b73351bbcdc1e9dbbbb8c0e4bfb21b.tar.xz dexon-fd9da72536b73351bbcdc1e9dbbbb8c0e4bfb21b.tar.zst dexon-fd9da72536b73351bbcdc1e9dbbbb8c0e4bfb21b.zip | |
ethcrypto => crypto
Diffstat (limited to 'vm')
| -rw-r--r-- | vm/address.go | 8 | ||||
| -rw-r--r-- | vm/vm.go | 6 | ||||
| -rw-r--r-- | vm/vm_debug.go | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/vm/address.go b/vm/address.go index c4aa1eb7c..235143b34 100644 --- a/vm/address.go +++ b/vm/address.go @@ -3,7 +3,7 @@ package vm import ( "math/big" - "github.com/ethereum/go-ethereum/ethcrypto" + "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/ethutil" ) @@ -27,16 +27,16 @@ var Precompiled = map[uint64]*PrecompiledAddress{ } func sha256Func(in []byte) []byte { - return ethcrypto.Sha256(in) + return crypto.Sha256(in) } func ripemd160Func(in []byte) []byte { - return ethutil.RightPadBytes(ethcrypto.Ripemd160(in), 32) + return ethutil.RightPadBytes(crypto.Ripemd160(in), 32) } func ecrecoverFunc(in []byte) []byte { // In case of an invalid sig. Defaults to return nil defer func() { recover() }() - return ethcrypto.Ecrecover(in) + return crypto.Ecrecover(in) } @@ -4,7 +4,7 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/ethcrypto" + "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/ethutil" ) @@ -391,7 +391,7 @@ func (self *Vm) RunClosure(closure *Closure) (ret []byte, err error) { case SHA3: require(2) size, offset := stack.Popn() - data := ethcrypto.Sha3(mem.Get(offset.Int64(), size.Int64())) + data := crypto.Sha3(mem.Get(offset.Int64(), size.Int64())) stack.Push(ethutil.BigD(data)) @@ -627,7 +627,7 @@ func (self *Vm) RunClosure(closure *Closure) (ret []byte, err error) { ) // Generate a new address - addr := ethcrypto.CreateAddress(closure.Address(), closure.object.Nonce) + addr := crypto.CreateAddress(closure.Address(), closure.object.Nonce) closure.object.Nonce++ closure.UseGas(closure.Gas) diff --git a/vm/vm_debug.go b/vm/vm_debug.go index 7afc7e79a..1cf243e16 100644 --- a/vm/vm_debug.go +++ b/vm/vm_debug.go @@ -4,7 +4,7 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/ethcrypto" + "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/ethstate" "github.com/ethereum/go-ethereum/ethutil" ) @@ -519,7 +519,7 @@ func (self *DebugVm) RunClosure(closure *Closure) (ret []byte, err error) { // 0x20 range case SHA3: size, offset := stack.Popn() - data := ethcrypto.Sha3(mem.Get(offset.Int64(), size.Int64())) + data := crypto.Sha3(mem.Get(offset.Int64(), size.Int64())) stack.Push(ethutil.BigD(data)) @@ -785,7 +785,7 @@ func (self *DebugVm) RunClosure(closure *Closure) (ret []byte, err error) { // Generate a new address n := state.GetNonce(closure.Address()) - addr := ethcrypto.CreateAddress(closure.Address(), n) + addr := crypto.CreateAddress(closure.Address(), n) state.SetNonce(closure.Address(), n+1) self.Printf(" (*) %x", addr).Endl() |