|
|
@ -3,6 +3,8 @@ package eth |
|
|
|
import ( |
|
|
|
import ( |
|
|
|
"crypto/ecdsa" |
|
|
|
"crypto/ecdsa" |
|
|
|
"fmt" |
|
|
|
"fmt" |
|
|
|
|
|
|
|
"io/ioutil" |
|
|
|
|
|
|
|
"path" |
|
|
|
"strings" |
|
|
|
"strings" |
|
|
|
|
|
|
|
|
|
|
|
"github.com/ethereum/go-ethereum/core" |
|
|
|
"github.com/ethereum/go-ethereum/core" |
|
|
@ -80,6 +82,27 @@ func (cfg *Config) parseBootNodes() []*discover.Node { |
|
|
|
return ns |
|
|
|
return ns |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
func (cfg *Config) nodeKey() (*ecdsa.PrivateKey, error) { |
|
|
|
|
|
|
|
// use explicit key from command line args if set
|
|
|
|
|
|
|
|
if cfg.NodeKey != nil { |
|
|
|
|
|
|
|
return cfg.NodeKey, nil |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
// use persistent key if present
|
|
|
|
|
|
|
|
keyfile := path.Join(cfg.DataDir, "nodekey") |
|
|
|
|
|
|
|
key, err := crypto.LoadECDSA(keyfile) |
|
|
|
|
|
|
|
if err == nil { |
|
|
|
|
|
|
|
return key, nil |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
// no persistent key, generate and store a new one
|
|
|
|
|
|
|
|
if key, err = crypto.GenerateKey(); err != nil { |
|
|
|
|
|
|
|
return nil, fmt.Errorf("could not generate server key: %v", err) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
if err := ioutil.WriteFile(keyfile, crypto.FromECDSA(key), 0600); err != nil { |
|
|
|
|
|
|
|
logger.Errorln("could not persist nodekey: ", err) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
return key, nil |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
type Ethereum struct { |
|
|
|
type Ethereum struct { |
|
|
|
// Channel for shutting down the ethereum
|
|
|
|
// Channel for shutting down the ethereum
|
|
|
|
shutdownChan chan bool |
|
|
|
shutdownChan chan bool |
|
|
@ -164,18 +187,16 @@ func New(config *Config) (*Ethereum, error) { |
|
|
|
insertChain := eth.chainManager.InsertChain |
|
|
|
insertChain := eth.chainManager.InsertChain |
|
|
|
eth.blockPool = NewBlockPool(hasBlock, insertChain, ezp.Verify) |
|
|
|
eth.blockPool = NewBlockPool(hasBlock, insertChain, ezp.Verify) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
netprv, err := config.nodeKey() |
|
|
|
|
|
|
|
if err != nil { |
|
|
|
|
|
|
|
return nil, err |
|
|
|
|
|
|
|
} |
|
|
|
ethProto := EthProtocol(eth.txPool, eth.chainManager, eth.blockPool) |
|
|
|
ethProto := EthProtocol(eth.txPool, eth.chainManager, eth.blockPool) |
|
|
|
protocols := []p2p.Protocol{ethProto} |
|
|
|
protocols := []p2p.Protocol{ethProto} |
|
|
|
if config.Shh { |
|
|
|
if config.Shh { |
|
|
|
protocols = append(protocols, eth.whisper.Protocol()) |
|
|
|
protocols = append(protocols, eth.whisper.Protocol()) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
netprv := config.NodeKey |
|
|
|
|
|
|
|
if netprv == nil { |
|
|
|
|
|
|
|
if netprv, err = crypto.GenerateKey(); err != nil { |
|
|
|
|
|
|
|
return nil, fmt.Errorf("could not generate server key: %v", err) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
eth.net = &p2p.Server{ |
|
|
|
eth.net = &p2p.Server{ |
|
|
|
PrivateKey: netprv, |
|
|
|
PrivateKey: netprv, |
|
|
|
Name: config.Name, |
|
|
|
Name: config.Name, |
|
|
|