interesting
/
go-ethereum
mirror of https://github.com/ethereum/go-ethereum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ethcrypto => crypto

This commit is contained in:
obscuren 2014-10-31 12:37:43 +01:00
parent 3ee0461cb5
commit fd9da72536
27 changed files with 69 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
chain/block.go
View File

@ -7,7 +7,7 @@ import (
"sort" "sort"
"time" "time"
"github.com/ethereum/go-ethereum/ethcrypto" "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/ethstate" "github.com/ethereum/go-ethereum/ethstate"
"github.com/ethereum/go-ethereum/ethtrie" "github.com/ethereum/go-ethereum/ethtrie"
"github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/ethutil"
@ -144,12 +144,12 @@ func CreateBlock(root interface{},
// Returns a hash of the block // Returns a hash of the block
func (block *Block) Hash() ethutil.Bytes { func (block *Block) Hash() ethutil.Bytes {
return ethcrypto.Sha3(ethutil.NewValue(block.header()).Encode()) return crypto.Sha3(ethutil.NewValue(block.header()).Encode())
//return ethcrypto.Sha3(block.Value().Encode()) //return crypto.Sha3(block.Value().Encode())
} }
func (block *Block) HashNoNonce() []byte { func (block *Block) HashNoNonce() []byte {
return ethcrypto.Sha3(ethutil.Encode(block.miningHeader())) return crypto.Sha3(ethutil.Encode(block.miningHeader()))
} }
func (block *Block) State() *ethstate.State { func (block *Block) State() *ethstate.State {
@ -232,7 +232,7 @@ func (block *Block) rlpUncles() interface{} {
func (block *Block) SetUncles(uncles []*Block) { func (block *Block) SetUncles(uncles []*Block) {
block.Uncles = uncles block.Uncles = uncles
block.UncleSha = ethcrypto.Sha3(ethutil.Encode(block.rlpUncles())) block.UncleSha = crypto.Sha3(ethutil.Encode(block.rlpUncles()))
} }
func (self *Block) SetReceipts(receipts Receipts) { func (self *Block) SetReceipts(receipts Receipts) {

4
chain/dagger.go
View File

@ -6,7 +6,7 @@ import (
"math/rand" "math/rand"
"time" "time"
"github.com/ethereum/go-ethereum/ethcrypto" "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/ethlog" "github.com/ethereum/go-ethereum/ethlog"
"github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/ethutil"
"github.com/obscuren/sha3" "github.com/obscuren/sha3"
@ -60,7 +60,7 @@ func (pow *EasyPow) Search(block *Block, stop <-chan struct{}) []byte {
t = time.Now() t = time.Now()
} }
sha := ethcrypto.Sha3(big.NewInt(r.Int63()).Bytes()) sha := crypto.Sha3(big.NewInt(r.Int63()).Bytes())
if pow.Verify(hash, diff, sha) { if pow.Verify(hash, diff, sha) {
return sha return sha
} }

6
chain/genesis.go
View File

@ -3,7 +3,7 @@ package chain
import ( import (
"math/big" "math/big"
"github.com/ethereum/go-ethereum/ethcrypto" "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/ethutil"
) )
@ -14,7 +14,7 @@ import (
var ZeroHash256 = make([]byte, 32) var ZeroHash256 = make([]byte, 32)
var ZeroHash160 = make([]byte, 20) var ZeroHash160 = make([]byte, 20)
var ZeroHash512 = make([]byte, 64) var ZeroHash512 = make([]byte, 64)
var EmptyShaList = ethcrypto.Sha3(ethutil.Encode([]interface{}{})) var EmptyShaList = crypto.Sha3(ethutil.Encode([]interface{}{}))
var GenesisHeader = []interface{}{ var GenesisHeader = []interface{}{
// Previous hash (none) // Previous hash (none)
@ -47,7 +47,7 @@ var GenesisHeader = []interface{}{
// Extra // Extra
nil, nil,
// Nonce // Nonce
ethcrypto.Sha3(big.NewInt(42).Bytes()), crypto.Sha3(big.NewInt(42).Bytes()),
} }
var Genesis = []interface{}{GenesisHeader, []interface{}{}, []interface{}{}} var Genesis = []interface{}{GenesisHeader, []interface{}{}, []interface{}{}}

4
chain/state_manager.go
View File

@ -9,7 +9,7 @@ import (
"sync" "sync"
"time" "time"
"github.com/ethereum/go-ethereum/ethcrypto" "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/ethlog" "github.com/ethereum/go-ethereum/ethlog"
"github.com/ethereum/go-ethereum/ethstate" "github.com/ethereum/go-ethereum/ethstate"
"github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/ethutil"
@ -40,7 +40,7 @@ type EthManager interface {
IsMining() bool IsMining() bool
IsListening() bool IsListening() bool
Peers() *list.List Peers() *list.List
KeyManager() *ethcrypto.KeyManager KeyManager() *crypto.KeyManager
ClientIdentity() ethwire.ClientIdentity ClientIdentity() ethwire.ClientIdentity
Db() ethutil.Database Db() ethutil.Database
EventMux() *event.TypeMux EventMux() *event.TypeMux

12
chain/transaction.go
View File

@ -5,7 +5,7 @@ import (
"fmt" "fmt"
"math/big" "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/ethstate"
"github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/ethutil"
"github.com/obscuren/secp256k1-go" "github.com/obscuren/secp256k1-go"
@ -66,7 +66,7 @@ func (self *Transaction) TotalValue() *big.Int {
func (tx *Transaction) Hash() []byte { func (tx *Transaction) Hash() []byte {
data := []interface{}{tx.Nonce, tx.GasPrice, tx.Gas, tx.Recipient, tx.Value, tx.Data} data := []interface{}{tx.Nonce, tx.GasPrice, tx.Gas, tx.Recipient, tx.Value, tx.Data}
return ethcrypto.Sha3(ethutil.NewValue(data).Encode()) return crypto.Sha3(ethutil.NewValue(data).Encode())
} }
func (tx *Transaction) CreatesContract() bool { func (tx *Transaction) CreatesContract() bool {
@ -80,9 +80,9 @@ func (tx *Transaction) IsContract() bool {
func (tx *Transaction) CreationAddress(state *ethstate.State) []byte { func (tx *Transaction) CreationAddress(state *ethstate.State) []byte {
// Generate a new address // Generate a new address
addr := ethcrypto.Sha3(ethutil.NewValue([]interface{}{tx.Sender(), tx.Nonce}).Encode())[12:] addr := crypto.Sha3(ethutil.NewValue([]interface{}{tx.Sender(), tx.Nonce}).Encode())[12:]
//for i := uint64(0); state.GetStateObject(addr) != nil; i++ { //for i := uint64(0); state.GetStateObject(addr) != nil; i++ {
// addr = ethcrypto.Sha3(ethutil.NewValue([]interface{}{tx.Sender(), tx.Nonce + i}).Encode())[12:] // addr = crypto.Sha3(ethutil.NewValue([]interface{}{tx.Sender(), tx.Nonce + i}).Encode())[12:]
//} //}
return addr return addr
@ -106,7 +106,7 @@ func (tx *Transaction) PublicKey() []byte {
sig := append(r, s...) sig := append(r, s...)
sig = append(sig, tx.v-27) sig = append(sig, tx.v-27)
pubkey := ethcrypto.Ecrecover(append(hash, sig...)) pubkey := crypto.Ecrecover(append(hash, sig...))
//pubkey, _ := secp256k1.RecoverPubkey(hash, sig) //pubkey, _ := secp256k1.RecoverPubkey(hash, sig)
return pubkey return pubkey
@ -121,7 +121,7 @@ func (tx *Transaction) Sender() []byte {
return nil return nil
} }
return ethcrypto.Sha3(pubkey[1:])[12:] return crypto.Sha3(pubkey[1:])[12:]
} }
func (tx *Transaction) Sign(privk []byte) error { func (tx *Transaction) Sign(privk []byte) error {

4
cmd/ethereum/main.go
View File

@ -22,7 +22,7 @@ import (
"os" "os"
"runtime" "runtime"
"github.com/ethereum/go-ethereum/ethchain" "github.com/ethereum/go-ethereum/chain"
"github.com/ethereum/go-ethereum/ethlog" "github.com/ethereum/go-ethereum/ethlog"
"github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/ethutil"
"github.com/ethereum/go-ethereum/utils" "github.com/ethereum/go-ethereum/utils"
@ -74,7 +74,7 @@ func main() {
ethereum := utils.NewEthereum(db, clientIdentity, keyManager, UseUPnP, OutboundPort, MaxPeer) ethereum := utils.NewEthereum(db, clientIdentity, keyManager, UseUPnP, OutboundPort, MaxPeer)
if Dump { if Dump {
var block *ethchain.Block var block *chain.Block
if len(DumpHash) == 0 && DumpNumber == -1 { if len(DumpHash) == 0 && DumpNumber == -1 {
block = ethereum.ChainManager().CurrentBlock block = ethereum.ChainManager().CurrentBlock

4
cmd/mist/ui_lib.go
View File

@ -26,7 +26,7 @@ import (
"github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum"
"github.com/ethereum/go-ethereum/chain" "github.com/ethereum/go-ethereum/chain"
"github.com/ethereum/go-ethereum/ethcrypto" "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/ethpipe" "github.com/ethereum/go-ethereum/ethpipe"
"github.com/ethereum/go-ethereum/ethstate" "github.com/ethereum/go-ethereum/ethstate"
"github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/ethutil"
@ -69,7 +69,7 @@ func (self *UiLib) LookupDomain(domain string) string {
world := self.World() world := self.World()
if len(domain) > 32 { if len(domain) > 32 {
domain = string(ethcrypto.Sha3([]byte(domain))) domain = string(crypto.Sha3([]byte(domain)))
} }
data := world.Config().Get("DnsReg").StorageString(domain).Bytes() data := world.Config().Get("DnsReg").StorageString(domain).Bytes()

2
ethcrypto/crypto.go → crypto/crypto.go
View File

@ -1,4 +1,4 @@
package ethcrypto package crypto
import ( import (
"crypto/sha256" "crypto/sha256"

2
ethcrypto/crypto_test.go → crypto/crypto_test.go
View File

@ -1,4 +1,4 @@
package ethcrypto package crypto
import ( import (
"bytes" "bytes"

2
ethcrypto/key_manager.go → crypto/key_manager.go
View File

@ -1,4 +1,4 @@
package ethcrypto package crypto
import ( import (
"fmt" "fmt"

2
ethcrypto/key_store.go → crypto/key_store.go
View File

@ -1,4 +1,4 @@
package ethcrypto package crypto
import ( import (
"fmt" "fmt"

2
ethcrypto/keypair.go → crypto/keypair.go
View File

@ -1,4 +1,4 @@
package ethcrypto package crypto
import ( import (
"strings" "strings"

2
ethcrypto/keyring.go → crypto/keyring.go
View File

@ -1,4 +1,4 @@
package ethcrypto package crypto
import ( import (
"fmt" "fmt"

2
ethcrypto/keys_test.go → crypto/keys_test.go
View File

@ -1,4 +1,4 @@
package ethcrypto package crypto
import ( import (
"github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/ethdb"

2
ethcrypto/mnemonic.go → crypto/mnemonic.go
View File

@ -1,4 +1,4 @@
package ethcrypto package crypto
import ( import (
"fmt" "fmt"

2
ethcrypto/mnemonic_test.go → crypto/mnemonic_test.go
View File

@ -1,4 +1,4 @@
package ethcrypto package crypto
import ( import (
"testing" "testing"

2
ethcrypto/mnemonic_words.go → crypto/mnemonic_words.go
View File

@ -1,4 +1,4 @@
package ethcrypto package crypto
var MnemonicWords []string = []string{ var MnemonicWords []string = []string{
"like", "like",

8
ethereum.go
View File

@ -15,7 +15,7 @@ import (
"time" "time"
"github.com/ethereum/go-ethereum/chain" "github.com/ethereum/go-ethereum/chain"
"github.com/ethereum/go-ethereum/ethcrypto" "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/ethlog" "github.com/ethereum/go-ethereum/ethlog"
"github.com/ethereum/go-ethereum/ethstate" "github.com/ethereum/go-ethereum/ethstate"
"github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/ethutil"
@ -86,7 +86,7 @@ type Ethereum struct {
RpcServer *rpc.JsonRpcServer RpcServer *rpc.JsonRpcServer
keyManager *ethcrypto.KeyManager keyManager *crypto.KeyManager
clientIdentity ethwire.ClientIdentity clientIdentity ethwire.ClientIdentity
@ -97,7 +97,7 @@ type Ethereum struct {
filters map[int]*chain.Filter filters map[int]*chain.Filter
} }
func New(db ethutil.Database, clientIdentity ethwire.ClientIdentity, keyManager *ethcrypto.KeyManager, caps Caps, usePnp bool) (*Ethereum, error) { func New(db ethutil.Database, clientIdentity ethwire.ClientIdentity, keyManager *crypto.KeyManager, caps Caps, usePnp bool) (*Ethereum, error) {
var err error var err error
var nat NAT var nat NAT
@ -138,7 +138,7 @@ func New(db ethutil.Database, clientIdentity ethwire.ClientIdentity, keyManager
return ethereum, nil return ethereum, nil
} }
func (s *Ethereum) KeyManager() *ethcrypto.KeyManager { func (s *Ethereum) KeyManager() *crypto.KeyManager {
return s.keyManager return s.keyManager
} }

10
ethpipe/js_pipe.go
View File

@ -6,7 +6,7 @@ import (
"sync/atomic" "sync/atomic"
"github.com/ethereum/go-ethereum/chain" "github.com/ethereum/go-ethereum/chain"
"github.com/ethereum/go-ethereum/ethcrypto" "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/ethstate" "github.com/ethereum/go-ethereum/ethstate"
"github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/ethutil"
) )
@ -114,7 +114,7 @@ func (self *JSPipe) IsContract(address string) bool {
} }
func (self *JSPipe) SecretToAddress(key string) string { func (self *JSPipe) SecretToAddress(key string) string {
pair, err := ethcrypto.NewKeyPairFromSec(ethutil.Hex2Bytes(key)) pair, err := crypto.NewKeyPairFromSec(ethutil.Hex2Bytes(key))
if err != nil { if err != nil {
return "" return ""
} }
@ -192,12 +192,12 @@ func (self *JSPipe) Transact(key, toStr, valueStr, gasStr, gasPriceStr, codeStr
} }
} }
var keyPair *ethcrypto.KeyPair var keyPair *crypto.KeyPair
var err error var err error
if ethutil.IsHex(key) { if ethutil.IsHex(key) {
keyPair, err = ethcrypto.NewKeyPairFromSec([]byte(ethutil.Hex2Bytes(key[2:]))) keyPair, err = crypto.NewKeyPairFromSec([]byte(ethutil.Hex2Bytes(key[2:])))
} else { } else {
keyPair, err = ethcrypto.NewKeyPairFromSec([]byte(ethutil.Hex2Bytes(key))) keyPair, err = crypto.NewKeyPairFromSec([]byte(ethutil.Hex2Bytes(key)))
} }
if err != nil { if err != nil {

4
ethpipe/js_types.go
View File

@ -6,7 +6,7 @@ import (
"strings" "strings"
"github.com/ethereum/go-ethereum/chain" "github.com/ethereum/go-ethereum/chain"
"github.com/ethereum/go-ethereum/ethcrypto" "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/ethstate" "github.com/ethereum/go-ethereum/ethstate"
"github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/ethutil"
) )
@ -119,7 +119,7 @@ type JSKey struct {
PublicKey string `json:"publicKey"` PublicKey string `json:"publicKey"`
} }
func NewJSKey(key *ethcrypto.KeyPair) *JSKey { func NewJSKey(key *crypto.KeyPair) *JSKey {
return &JSKey{ethutil.Bytes2Hex(key.Address()), ethutil.Bytes2Hex(key.PrivateKey), ethutil.Bytes2Hex(key.PublicKey)} return &JSKey{ethutil.Bytes2Hex(key.Address()), ethutil.Bytes2Hex(key.PrivateKey), ethutil.Bytes2Hex(key.PublicKey)}
} }

8
ethpipe/pipe.go
View File

@ -5,7 +5,7 @@ import (
"strings" "strings"
"github.com/ethereum/go-ethereum/chain" "github.com/ethereum/go-ethereum/chain"
"github.com/ethereum/go-ethereum/ethcrypto" "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/ethlog" "github.com/ethereum/go-ethereum/ethlog"
"github.com/ethereum/go-ethereum/ethstate" "github.com/ethereum/go-ethereum/ethstate"
"github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/ethutil"
@ -77,7 +77,7 @@ func (self *Pipe) Storage(addr, storageAddr []byte) *ethutil.Value {
} }
func (self *Pipe) ToAddress(priv []byte) []byte { func (self *Pipe) ToAddress(priv []byte) []byte {
pair, err := ethcrypto.NewKeyPairFromSec(priv) pair, err := crypto.NewKeyPairFromSec(priv)
if err != nil { if err != nil {
return nil return nil
} }
@ -89,7 +89,7 @@ func (self *Pipe) Exists(addr []byte) bool {
return self.World().Get(addr) != nil return self.World().Get(addr) != nil
} }
func (self *Pipe) TransactString(key *ethcrypto.KeyPair, rec string, value, gas, price *ethutil.Value, data []byte) ([]byte, error) { func (self *Pipe) TransactString(key *crypto.KeyPair, rec string, value, gas, price *ethutil.Value, data []byte) ([]byte, error) {
// Check if an address is stored by this address // Check if an address is stored by this address
var hash []byte var hash []byte
addr := self.World().Config().Get("NameReg").StorageString(rec).Bytes() addr := self.World().Config().Get("NameReg").StorageString(rec).Bytes()
@ -104,7 +104,7 @@ func (self *Pipe) TransactString(key *ethcrypto.KeyPair, rec string, value, gas,
return self.Transact(key, hash, value, gas, price, data) return self.Transact(key, hash, value, gas, price, data)
} }
func (self *Pipe) Transact(key *ethcrypto.KeyPair, rec []byte, value, gas, price *ethutil.Value, data []byte) ([]byte, error) { func (self *Pipe) Transact(key *crypto.KeyPair, rec []byte, value, gas, price *ethutil.Value, data []byte) ([]byte, error) {
var hash []byte var hash []byte
var contractCreation bool var contractCreation bool
if rec == nil { if rec == nil {

4
ethstate/state_object.go
View File

@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"math/big" "math/big"
"github.com/ethereum/go-ethereum/ethcrypto" "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/ethtrie" "github.com/ethereum/go-ethereum/ethtrie"
"github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/ethutil"
) )
@ -310,7 +310,7 @@ func (c *StateObject) RlpEncode() []byte {
func (c *StateObject) CodeHash() ethutil.Bytes { func (c *StateObject) CodeHash() ethutil.Bytes {
var codeHash []byte var codeHash []byte
if len(c.Code) > 0 { if len(c.Code) > 0 {
codeHash = ethcrypto.Sha3(c.Code) codeHash = crypto.Sha3(c.Code)
} }
return codeHash return codeHash

6
ethtrie/trie.go
View File

@ -5,7 +5,7 @@ import (
"fmt" "fmt"
"sync" "sync"
"github.com/ethereum/go-ethereum/ethcrypto" "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/ethutil"
) )
@ -64,7 +64,7 @@ func (cache *Cache) PutValue(v interface{}, force bool) interface{} {
enc := value.Encode() enc := value.Encode()
if len(enc) >= 32 || force { if len(enc) >= 32 || force {
sha := ethcrypto.Sha3(enc) sha := crypto.Sha3(enc)
cache.nodes[string(sha)] = NewNode(sha, value, true) cache.nodes[string(sha)] = NewNode(sha, value, true)
cache.IsDirty = true cache.IsDirty = true
@ -178,7 +178,7 @@ func (self *Trie) setRoot(root interface{}) {
switch t := root.(type) { switch t := root.(type) {
case string: case string:
if t == "" { if t == "" {
root = ethcrypto.Sha3([]byte("")) root = crypto.Sha3([]byte(""))
} }
self.Root = root self.Root = root
case []byte: case []byte:

14
utils/cmd.go
View File

@ -14,7 +14,7 @@ import (
"bitbucket.org/kardianos/osext" "bitbucket.org/kardianos/osext"
"github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum"
"github.com/ethereum/go-ethereum/ethcrypto" "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/ethlog" "github.com/ethereum/go-ethereum/ethlog"
"github.com/ethereum/go-ethereum/ethminer" "github.com/ethereum/go-ethereum/ethminer"
@ -149,7 +149,7 @@ func NewClientIdentity(clientIdentifier, version, customIdentifier string) *ethw
return ethwire.NewSimpleClientIdentity(clientIdentifier, version, customIdentifier) return ethwire.NewSimpleClientIdentity(clientIdentifier, version, customIdentifier)
} }
func NewEthereum(db ethutil.Database, clientIdentity ethwire.ClientIdentity, keyManager *ethcrypto.KeyManager, usePnp bool, OutboundPort string, MaxPeer int) *eth.Ethereum { func NewEthereum(db ethutil.Database, clientIdentity ethwire.ClientIdentity, keyManager *crypto.KeyManager, usePnp bool, OutboundPort string, MaxPeer int) *eth.Ethereum {
ethereum, err := eth.New(db, clientIdentity, keyManager, eth.CapDefault, usePnp) ethereum, err := eth.New(db, clientIdentity, keyManager, eth.CapDefault, usePnp)
if err != nil { if err != nil {
logger.Fatalln("eth start err:", err) logger.Fatalln("eth start err:", err)
@ -173,13 +173,13 @@ func ShowGenesis(ethereum *eth.Ethereum) {
exit(nil) exit(nil)
} }
func NewKeyManager(KeyStore string, Datadir string, db ethutil.Database) *ethcrypto.KeyManager { func NewKeyManager(KeyStore string, Datadir string, db ethutil.Database) *crypto.KeyManager {
var keyManager *ethcrypto.KeyManager var keyManager *crypto.KeyManager
switch { switch {
case KeyStore == "db": case KeyStore == "db":
keyManager = ethcrypto.NewDBKeyManager(db) keyManager = crypto.NewDBKeyManager(db)
case KeyStore == "file": case KeyStore == "file":
keyManager = ethcrypto.NewFileKeyManager(Datadir) keyManager = crypto.NewFileKeyManager(Datadir)
default: default:
exit(fmt.Errorf("unknown keystore type: %s", KeyStore)) exit(fmt.Errorf("unknown keystore type: %s", KeyStore))
} }
@ -211,7 +211,7 @@ func DefaultAssetPath() string {
return assetPath return assetPath
} }
func KeyTasks(keyManager *ethcrypto.KeyManager, KeyRing string, GenAddr bool, SecretFile string, ExportDir string, NonInteractive bool) { func KeyTasks(keyManager *crypto.KeyManager, KeyRing string, GenAddr bool, SecretFile string, ExportDir string, NonInteractive bool) {
var err error var err error
switch { switch {

8
vm/address.go
View File

@ -3,7 +3,7 @@ package vm
import ( import (
"math/big" "math/big"
"github.com/ethereum/go-ethereum/ethcrypto" "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/ethutil"
) )
@ -27,16 +27,16 @@ var Precompiled = map[uint64]*PrecompiledAddress{
} }
func sha256Func(in []byte) []byte { func sha256Func(in []byte) []byte {
return ethcrypto.Sha256(in) return crypto.Sha256(in)
} }
func ripemd160Func(in []byte) []byte { func ripemd160Func(in []byte) []byte {
return ethutil.RightPadBytes(ethcrypto.Ripemd160(in), 32) return ethutil.RightPadBytes(crypto.Ripemd160(in), 32)
} }
func ecrecoverFunc(in []byte) []byte { func ecrecoverFunc(in []byte) []byte {
// In case of an invalid sig. Defaults to return nil // In case of an invalid sig. Defaults to return nil
defer func() { recover() }() defer func() { recover() }()
return ethcrypto.Ecrecover(in) return crypto.Ecrecover(in)
} }

6
vm/vm.go
View File

@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"math/big" "math/big"
"github.com/ethereum/go-ethereum/ethcrypto" "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/ethutil"
) )
@ -391,7 +391,7 @@ func (self *Vm) RunClosure(closure *Closure) (ret []byte, err error) {
case SHA3: case SHA3:
require(2) require(2)
size, offset := stack.Popn() 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)) stack.Push(ethutil.BigD(data))
@ -627,7 +627,7 @@ func (self *Vm) RunClosure(closure *Closure) (ret []byte, err error) {
) )
// Generate a new address // Generate a new address
addr := ethcrypto.CreateAddress(closure.Address(), closure.object.Nonce) addr := crypto.CreateAddress(closure.Address(), closure.object.Nonce)
closure.object.Nonce++ closure.object.Nonce++
closure.UseGas(closure.Gas) closure.UseGas(closure.Gas)

6
vm/vm_debug.go
View File

@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"math/big" "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/ethstate"
"github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/ethutil"
) )
@ -519,7 +519,7 @@ func (self *DebugVm) RunClosure(closure *Closure) (ret []byte, err error) {
// 0x20 range // 0x20 range
case SHA3: case SHA3:
size, offset := stack.Popn() 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)) stack.Push(ethutil.BigD(data))
@ -785,7 +785,7 @@ func (self *DebugVm) RunClosure(closure *Closure) (ret []byte, err error) {
// Generate a new address // Generate a new address
n := state.GetNonce(closure.Address()) n := state.GetNonce(closure.Address())
addr := ethcrypto.CreateAddress(closure.Address(), n) addr := crypto.CreateAddress(closure.Address(), n)
state.SetNonce(closure.Address(), n+1) state.SetNonce(closure.Address(), n+1)
self.Printf(" (*) %x", addr).Endl() self.Printf(" (*) %x", addr).Endl()