@ -19,6 +19,7 @@ package utils
import ( import (
"crypto/ecdsa" "crypto/ecdsa"
"fmt" "fmt"
"io/ioutil"
"log" "log"
"math" "math"
"math/big" "math/big"
@ -28,12 +29,14 @@ import (
"path/filepath" "path/filepath"
"runtime" "runtime"
"strconv" "strconv"
"strings"
"github.com/codegangsta/cli" "github.com/codegangsta/cli"
"github.com/ethereum/ethash" "github.com/ethereum/ethash"
"github.com/ethereum/go-ethereum/accounts" "github.com/ethereum/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/core/vm" "github.com/ethereum/go-ethereum/core/vm"
"github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/eth" "github.com/ethereum/go-ethereum/eth"
@ -42,6 +45,8 @@ import (
"github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/logger/glog" "github.com/ethereum/go-ethereum/logger/glog"
"github.com/ethereum/go-ethereum/metrics" "github.com/ethereum/go-ethereum/metrics"
"github.com/ethereum/go-ethereum/node"
"github.com/ethereum/go-ethereum/p2p/discover"
"github.com/ethereum/go-ethereum/p2p/nat" "github.com/ethereum/go-ethereum/p2p/nat"
"github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/params"
"github.com/ethereum/go-ethereum/rpc/api" "github.com/ethereum/go-ethereum/rpc/api"
@ -49,6 +54,7 @@ import (
"github.com/ethereum/go-ethereum/rpc/comms" "github.com/ethereum/go-ethereum/rpc/comms"
"github.com/ethereum/go-ethereum/rpc/shared" "github.com/ethereum/go-ethereum/rpc/shared"
"github.com/ethereum/go-ethereum/rpc/useragent" "github.com/ethereum/go-ethereum/rpc/useragent"
"github.com/ethereum/go-ethereum/whisper"
"github.com/ethereum/go-ethereum/xeth" "github.com/ethereum/go-ethereum/xeth"
) )
@ -192,12 +198,12 @@ var (
// Account settings
// Account settings
UnlockedAccountFlag = cli . StringFlag { UnlockedAccountFlag = cli . StringFlag {
Name : "unlock" , Name : "unlock" ,
Usage : "Unlock an account (may be creation index) until this program exits (prompts for password) " , Usage : "Comma separated list of accounts to unlock " ,
Value : "" , Value : "" ,
} }
PasswordFileFlag = cli . StringFlag { PasswordFileFlag = cli . StringFlag {
Name : "password" , Name : "password" ,
Usage : "Password file to use with options/subcommands needing a pass phrase " , Usage : "Password file to use for non-inteactive password input " ,
Value : "" , Value : "" ,
} }
@ -316,7 +322,7 @@ var (
} }
BootnodesFlag = cli . StringFlag { BootnodesFlag = cli . StringFlag {
Name : "bootnodes" , Name : "bootnodes" ,
Usage : "Space- separated enode URLs for P2P discovery bootstrap" , Usage : "Comma separated enode URLs for P2P discovery bootstrap" ,
Value : "" , Value : "" ,
} }
NodeKeyFileFlag = cli . StringFlag { NodeKeyFileFlag = cli . StringFlag {
@ -385,26 +391,40 @@ var (
} }
) )
// MakeNAT creates a port mapper from set command line flags.
// MustMakeDataDir retrieves the currently requested data directory, terminating
func MakeNAT ( ctx * cli . Context ) nat . Interface { // if none (or the empty string) is specified. If the node is starting a testnet,
natif , err := nat . Parse ( ctx . GlobalString ( NATFlag . Name ) ) // the a subdirectory of the specified datadir will be used.
if err != nil { func MustMakeDataDir ( ctx * cli . Context ) string {
Fatalf ( "Option %s: %v" , NATFlag . Name , err ) if path := ctx . GlobalString ( DataDirFlag . Name ) ; path != "" {
if ctx . GlobalBool ( TestNetFlag . Name ) {
return filepath . Join ( path , "/testnet" )
} }
return natif return path
}
Fatalf ( "Cannot determine default data directory, please set manually (--datadir)" )
return ""
} }
// MakeNodeKey creates a node key from set command line flags.
// MakeNodeKey creates a node key from set command line flags, either loading it
func MakeNodeKey ( ctx * cli . Context ) ( key * ecdsa . PrivateKey ) { // from a file or as a specified hex value. If neither flags were provided, this
hex , file := ctx . GlobalString ( NodeKeyHexFlag . Name ) , ctx . GlobalString ( NodeKeyFileFlag . Name ) // method returns nil and an emphemeral key is to be generated.
var err error func MakeNodeKey ( ctx * cli . Context ) * ecdsa . PrivateKey {
var (
hex = ctx . GlobalString ( NodeKeyHexFlag . Name )
file = ctx . GlobalString ( NodeKeyFileFlag . Name )
key * ecdsa . PrivateKey
err error
)
switch { switch {
case file != "" && hex != "" : case file != "" && hex != "" :
Fatalf ( "Options %q and %q are mutually exclusive" , NodeKeyFileFlag . Name , NodeKeyHexFlag . Name ) Fatalf ( "Options %q and %q are mutually exclusive" , NodeKeyFileFlag . Name , NodeKeyHexFlag . Name )
case file != "" : case file != "" :
if key , err = crypto . LoadECDSA ( file ) ; err != nil { if key , err = crypto . LoadECDSA ( file ) ; err != nil {
Fatalf ( "Option %q: %v" , NodeKeyFileFlag . Name , err ) Fatalf ( "Option %q: %v" , NodeKeyFileFlag . Name , err )
} }
case hex != "" : case hex != "" :
if key , err = crypto . HexToECDSA ( hex ) ; err != nil { if key , err = crypto . HexToECDSA ( hex ) ; err != nil {
Fatalf ( "Option %q: %v" , NodeKeyHexFlag . Name , err ) Fatalf ( "Option %q: %v" , NodeKeyHexFlag . Name , err )
@ -413,45 +433,196 @@ func MakeNodeKey(ctx *cli.Context) (key *ecdsa.PrivateKey) {
return key return key
} }
// MakeEthConfig creates ethereum options from set command line flags.
// MakeNodeName creates a node name from a base set and the command line flags.
func MakeEthConfig ( clientID , version string , ctx * cli . Context ) * eth . Config { func MakeNodeName ( client , version string , ctx * cli . Context ) string {
customName := ctx . GlobalString ( IdentityFlag . Name ) name := common . MakeName ( client , version )
if len ( customName ) > 0 { if identity := ctx . GlobalString ( IdentityFlag . Name ) ; len ( identity ) > 0 {
clientID += "/" + customName name += "/" + identity
}
if ctx . GlobalBool ( VMEnableJitFlag . Name ) {
name += "/JIT"
} }
am := MakeAccountManager ( ctx ) return name
etherbase , err := ParamToAddress ( ctx . GlobalString ( EtherbaseFlag . Name ) , am ) }
// MakeBootstrapNodes creates a list of bootstrap nodes from the command line
// flags, reverting to pre-configured ones if none have been specified.
func MakeBootstrapNodes ( ctx * cli . Context ) [ ] * discover . Node {
// Return pre-configured nodes if none were manually requested
if ! ctx . GlobalIsSet ( BootnodesFlag . Name ) {
if ctx . GlobalBool ( TestNetFlag . Name ) {
return TestNetBootNodes
}
return FrontierBootNodes
}
// Otherwise parse and use the CLI bootstrap nodes
bootnodes := [ ] * discover . Node { }
for _ , url := range strings . Split ( ctx . GlobalString ( BootnodesFlag . Name ) , "," ) {
node , err := discover . ParseNode ( url )
if err != nil { if err != nil {
glog . V ( logger . Error ) . Infof ( "Bootstrap URL %s: %v\n" , url , err )
continue
}
bootnodes = append ( bootnodes , node )
}
return bootnodes
}
// MakeListenAddress creates a TCP listening address string from set command
// line flags.
func MakeListenAddress ( ctx * cli . Context ) string {
return fmt . Sprintf ( ":%d" , ctx . GlobalInt ( ListenPortFlag . Name ) )
}
// MakeNAT creates a port mapper from set command line flags.
func MakeNAT ( ctx * cli . Context ) nat . Interface {
natif , err := nat . Parse ( ctx . GlobalString ( NATFlag . Name ) )
if err != nil {
Fatalf ( "Option %s: %v" , NATFlag . Name , err )
}
return natif
}
// MakeGenesisBlock loads up a genesis block from an input file specified in the
// command line, or returns the empty string if none set.
func MakeGenesisBlock ( ctx * cli . Context ) string {
genesis := ctx . GlobalString ( GenesisFileFlag . Name )
if genesis == "" {
return ""
}
data , err := ioutil . ReadFile ( genesis )
if err != nil {
Fatalf ( "Failed to load custom genesis file: %v" , err )
}
return string ( data )
}
// MakeAccountManager creates an account manager from set command line flags.
func MakeAccountManager ( ctx * cli . Context ) * accounts . Manager {
// Create the keystore crypto primitive, light if requested
scryptN := crypto . StandardScryptN
scryptP := crypto . StandardScryptP
if ctx . GlobalBool ( LightKDFFlag . Name ) {
scryptN = crypto . LightScryptN
scryptP = crypto . LightScryptP
}
// Assemble an account manager using the configured datadir
var (
datadir = MustMakeDataDir ( ctx )
keystore = crypto . NewKeyStorePassphrase ( filepath . Join ( datadir , "keystore" ) , scryptN , scryptP )
)
return accounts . NewManager ( keystore )
}
// MakeAddress converts an account specified directly as a hex encoded string or
// a key index in the key store to an internal account representation.
func MakeAddress ( accman * accounts . Manager , account string ) common . Address {
// If the specified account is a valid address, return it
if common . IsHexAddress ( account ) {
return common . HexToAddress ( account )
}
// Otherwise try to interpret the account as a keystore index
index , err := strconv . Atoi ( account )
if err != nil {
Fatalf ( "Invalid account address or index: '%s'" , account )
}
hex , err := accman . AddressByIndex ( index )
if err != nil {
Fatalf ( "Failed to retrieve requested account #%d: %v" , index , err )
}
return common . HexToAddress ( hex )
}
// MakeEtherbase retrieves the etherbase either from the directly specified
// command line flags or from the keystore if CLI indexed.
func MakeEtherbase ( accman * accounts . Manager , ctx * cli . Context ) common . Address {
// If the specified etherbase is a valid address, return it
etherbase := ctx . GlobalString ( EtherbaseFlag . Name )
if common . IsHexAddress ( etherbase ) {
return common . HexToAddress ( etherbase )
}
// If no etherbase was specified and no accounts are known, bail out
accounts , _ := accman . Accounts ( )
if etherbase == "" && len ( accounts ) == 0 {
glog . V ( logger . Error ) . Infoln ( "WARNING: No etherbase set and no accounts found as default" ) glog . V ( logger . Error ) . Infoln ( "WARNING: No etherbase set and no accounts found as default" )
return common . Address { }
} }
// Assemble the entire eth configuration and return
// Otherwise try to interpret the parameter as a keystore index
cfg := & eth . Config { index , err := strconv . Atoi ( etherbase )
Name : common . MakeName ( clientID , version ) , if err != nil {
DataDir : MustDataDir ( ctx ) , Fatalf ( "Invalid account address or index: '%s'" , etherbase )
GenesisFile : ctx . GlobalString ( GenesisFileFlag . Name ) , }
hex , err := accman . AddressByIndex ( index )
if err != nil {
Fatalf ( "Failed to set requested account #%d as etherbase: %v" , index , err )
}
return common . HexToAddress ( hex )
}
// MakeMinerExtra resolves extradata for the miner from the set command line flags
// or returns a default one composed on the client, runtime and OS metadata.
func MakeMinerExtra ( extra [ ] byte , ctx * cli . Context ) [ ] byte {
if ctx . GlobalIsSet ( ExtraDataFlag . Name ) {
return [ ] byte ( ctx . GlobalString ( ExtraDataFlag . Name ) )
}
return extra
}
// MakePasswordList loads up a list of password from a file specified by the
// command line flags.
func MakePasswordList ( ctx * cli . Context ) [ ] string {
if path := ctx . GlobalString ( PasswordFileFlag . Name ) ; path != "" {
blob , err := ioutil . ReadFile ( path )
if err != nil {
Fatalf ( "Failed to read password file: %v" , err )
}
return strings . Split ( string ( blob ) , "\n" )
}
return nil
}
// MakeSystemNode sets up a local node, configures the services to launch and
// assembles the P2P protocol stack.
func MakeSystemNode ( name , version string , extra [ ] byte , ctx * cli . Context ) * node . Node {
// Avoid conflicting network flags
networks , netFlags := 0 , [ ] cli . BoolFlag { DevModeFlag , TestNetFlag , OlympicFlag }
for _ , flag := range netFlags {
if ctx . GlobalBool ( flag . Name ) {
networks ++
}
}
if networks > 1 {
Fatalf ( "The %v flags are mutually exclusive" , netFlags )
}
// Configure the node's service container
stackConf := & node . Config {
DataDir : MustMakeDataDir ( ctx ) ,
PrivateKey : MakeNodeKey ( ctx ) ,
Name : MakeNodeName ( name , version , ctx ) ,
NoDiscovery : ctx . GlobalBool ( NoDiscoverFlag . Name ) ,
BootstrapNodes : MakeBootstrapNodes ( ctx ) ,
ListenAddr : MakeListenAddress ( ctx ) ,
NAT : MakeNAT ( ctx ) ,
MaxPeers : ctx . GlobalInt ( MaxPeersFlag . Name ) ,
MaxPendingPeers : ctx . GlobalInt ( MaxPendingPeersFlag . Name ) ,
}
// Configure the Ethereum service
accman := MakeAccountManager ( ctx )
ethConf := & eth . Config {
Genesis : MakeGenesisBlock ( ctx ) ,
FastSync : ctx . GlobalBool ( FastSyncFlag . Name ) , FastSync : ctx . GlobalBool ( FastSyncFlag . Name ) ,
BlockChainVersion : ctx . GlobalInt ( BlockchainVersionFlag . Name ) , BlockChainVersion : ctx . GlobalInt ( BlockchainVersionFlag . Name ) ,
DatabaseCache : ctx . GlobalInt ( CacheFlag . Name ) , DatabaseCache : ctx . GlobalInt ( CacheFlag . Name ) ,
SkipBcVersionCheck : false ,
NetworkId : ctx . GlobalInt ( NetworkIdFlag . Name ) , NetworkId : ctx . GlobalInt ( NetworkIdFlag . Name ) ,
LogFile : ctx . GlobalString ( LogFileFlag . Name ) , AccountManager : accman ,
Verbosity : ctx . GlobalInt ( VerbosityFlag . Name ) , Etherbase : MakeEtherbase ( accman , ctx ) ,
Etherbase : common . HexToAddress ( etherbase ) ,
MinerThreads : ctx . GlobalInt ( MinerThreadsFlag . Name ) , MinerThreads : ctx . GlobalInt ( MinerThreadsFlag . Name ) ,
AccountManager : am , ExtraData : MakeMinerExtra ( extra , ctx ) ,
VmDebug : ctx . GlobalBool ( VMDebugFlag . Name ) ,
MaxPeers : ctx . GlobalInt ( MaxPeersFlag . Name ) ,
MaxPendingPeers : ctx . GlobalInt ( MaxPendingPeersFlag . Name ) ,
Port : ctx . GlobalString ( ListenPortFlag . Name ) ,
Olympic : ctx . GlobalBool ( OlympicFlag . Name ) ,
NAT : MakeNAT ( ctx ) ,
NatSpec : ctx . GlobalBool ( NatspecEnabledFlag . Name ) , NatSpec : ctx . GlobalBool ( NatspecEnabledFlag . Name ) ,
DocRoot : ctx . GlobalString ( DocRootFlag . Name ) , DocRoot : ctx . GlobalString ( DocRootFlag . Name ) ,
Discovery : ! ctx . GlobalBool ( NoDiscoverFlag . Name ) ,
NodeKey : MakeNodeKey ( ctx ) ,
Shh : ctx . GlobalBool ( WhisperEnabledFlag . Name ) ,
Dial : true ,
BootNodes : ctx . GlobalString ( BootnodesFlag . Name ) ,
GasPrice : common . String2Big ( ctx . GlobalString ( GasPriceFlag . Name ) ) , GasPrice : common . String2Big ( ctx . GlobalString ( GasPriceFlag . Name ) ) ,
GpoMinGasPrice : common . String2Big ( ctx . GlobalString ( GpoMinGasPriceFlag . Name ) ) , GpoMinGasPrice : common . String2Big ( ctx . GlobalString ( GpoMinGasPriceFlag . Name ) ) ,
GpoMaxGasPrice : common . String2Big ( ctx . GlobalString ( GpoMaxGasPriceFlag . Name ) ) , GpoMaxGasPrice : common . String2Big ( ctx . GlobalString ( GpoMaxGasPriceFlag . Name ) ) ,
@ -462,46 +633,70 @@ func MakeEthConfig(clientID, version string, ctx *cli.Context) *eth.Config {
SolcPath : ctx . GlobalString ( SolcPathFlag . Name ) , SolcPath : ctx . GlobalString ( SolcPathFlag . Name ) ,
AutoDAG : ctx . GlobalBool ( AutoDAGFlag . Name ) || ctx . GlobalBool ( MiningEnabledFlag . Name ) , AutoDAG : ctx . GlobalBool ( AutoDAGFlag . Name ) || ctx . GlobalBool ( MiningEnabledFlag . Name ) ,
} }
// Configure the Whisper service
shhEnable := ctx . GlobalBool ( WhisperEnabledFlag . Name )
if ctx . GlobalBool ( DevModeFlag . Name ) && ctx . GlobalBool ( TestNetFlag . Name ) { // Override any default configs in dev mode or the test net
glog . Fatalf ( "%s and %s are mutually exclusive\n" , DevModeFlag . Name , TestNetFlag . Name ) switch {
case ctx . GlobalBool ( OlympicFlag . Name ) :
if ! ctx . GlobalIsSet ( NetworkIdFlag . Name ) {
ethConf . NetworkId = 1
} }
if ! ctx . GlobalIsSet ( GenesisFileFlag . Name ) {
if ctx . GlobalBool ( TestNetFlag . Name ) { ethConf . Genesis = core . OlympicGenesisBlock ( )
// testnet is always stored in the testnet folder
cfg . DataDir += "/testnet"
cfg . NetworkId = 2
cfg . TestNet = true
} }
if ctx . GlobalBool ( VMEnableJitFlag . Name ) { case ctx . GlobalBool ( TestNetFlag . Name ) :
cfg . Name += "/JIT" if ! ctx . GlobalIsSet ( NetworkIdFlag . Name ) {
ethConf . NetworkId = 2
} }
if ctx . GlobalBool ( DevModeFlag . Name ) { if ! ctx . GlobalIsSet ( GenesisFileFlag . Name ) {
if ! ctx . GlobalIsSet ( VMDebugFlag . Name ) { ethConf . Genesis = core . TestNetGenesisBlock ( )
cfg . VmDebug = true
} }
if ! ctx . GlobalIsSet ( MaxPeersFlag . Name ) { state . StartingNonce = 1048576 // (2**20)
cfg . MaxPeers = 0
case ctx . GlobalBool ( DevModeFlag . Name ) :
// Override the base network stack configs
if ! ctx . GlobalIsSet ( DataDirFlag . Name ) {
stackConf . DataDir = filepath . Join ( os . TempDir ( ) , "/ethereum_dev_mode" )
} }
if ! ctx . GlobalIsSet ( GasPriceFlag . Name ) { if ! ctx . GlobalIsSet ( MaxPeers Flag. Name ) {
cfg . GasPrice = new ( big . Int ) stackConf . MaxPeers = 0
} }
if ! ctx . GlobalIsSet ( ListenPortFlag . Name ) { if ! ctx . GlobalIsSet ( ListenPortFlag . Name ) {
cfg . Port = "0" // auto port
stackConf . ListenAddr = ":0"
}
// Override the Ethereum protocol configs
if ! ctx . GlobalIsSet ( GenesisFileFlag . Name ) {
ethConf . Genesis = core . OlympicGenesisBlock ( )
}
if ! ctx . GlobalIsSet ( GasPriceFlag . Name ) {
ethConf . GasPrice = new ( big . Int )
} }
if ! ctx . GlobalIsSet ( WhisperEnabledFlag . Name ) { if ! ctx . GlobalIsSet ( WhisperEnabledFlag . Name ) {
cfg . Shh = true shhEnable = true
} }
if ! ctx . GlobalIsSet ( DataDirFlag . Name ) { if ! ctx . GlobalIsSet ( VMDebug Flag. Name ) {
cfg . DataDir = os . TempDir ( ) + "/ethereum_dev_mode" vm . Debug = true
} }
cfg . PowTest = true ethConf . PowTest = true
cfg . DevMode = true }
// Assemble and return the protocol stack
glog . V ( logger . Info ) . Infoln ( "dev mode enabled" ) stack , err := node . New ( stackConf )
if err != nil {
Fatalf ( "Failed to create the protocol stack: %v" , err )
}
if err := stack . Register ( "eth" , func ( ctx * node . ServiceContext ) ( node . Service , error ) {
return eth . New ( ctx , ethConf )
} ) ; err != nil {
Fatalf ( "Failed to register the Ethereum service: %v" , err )
} }
return cfg if shhEnable {
if err := stack . Register ( "shh" , func ( * node . ServiceContext ) ( node . Service , error ) { return whisper . New ( ) , nil } ) ; err != nil {
Fatalf ( "Failed to register the Whisper service: %v" , err )
}
}
return stack
} }
// SetupLogger configures glog from the logging-related command line flags.
// SetupLogger configures glog from the logging-related command line flags.
@ -509,7 +704,12 @@ func SetupLogger(ctx *cli.Context) {
glog . SetV ( ctx . GlobalInt ( VerbosityFlag . Name ) ) glog . SetV ( ctx . GlobalInt ( VerbosityFlag . Name ) )
glog . CopyStandardLogTo ( "INFO" ) glog . CopyStandardLogTo ( "INFO" )
glog . SetToStderr ( true ) glog . SetToStderr ( true )
glog . SetLogDir ( ctx . GlobalString ( LogFileFlag . Name ) ) if ctx . GlobalIsSet ( LogFileFlag . Name ) {
logger . New ( "" , ctx . GlobalString ( LogFileFlag . Name ) , ctx . GlobalInt ( VerbosityFlag . Name ) )
}
if ctx . GlobalIsSet ( VMDebugFlag . Name ) {
vm . Debug = ctx . GlobalBool ( VMDebugFlag . Name )
}
} }
// SetupNetwork configures the system for either the main net or some test network.
// SetupNetwork configures the system for either the main net or some test network.
@ -535,7 +735,7 @@ func SetupVM(ctx *cli.Context) {
// MakeChain creates a chain manager from set command line flags.
// MakeChain creates a chain manager from set command line flags.
func MakeChain ( ctx * cli . Context ) ( chain * core . BlockChain , chainDb ethdb . Database ) { func MakeChain ( ctx * cli . Context ) ( chain * core . BlockChain , chainDb ethdb . Database ) {
datadir := MustDataDir ( ctx ) datadir := MustMake DataDir ( ctx )
cache := ctx . GlobalInt ( CacheFlag . Name ) cache := ctx . GlobalInt ( CacheFlag . Name )
var err error var err error
@ -543,7 +743,7 @@ func MakeChain(ctx *cli.Context) (chain *core.BlockChain, chainDb ethdb.Database
Fatalf ( "Could not open database: %v" , err ) Fatalf ( "Could not open database: %v" , err )
} }
if ctx . GlobalBool ( OlympicFlag . Name ) { if ctx . GlobalBool ( OlympicFlag . Name ) {
_ , err := core . WriteTestNetGenesisBlock ( chainDb , 42 ) _ , err := core . WriteTestNetGenesisBlock ( chainDb )
if err != nil { if err != nil {
glog . Fatalln ( err ) glog . Fatalln ( err )
} }
@ -560,32 +760,6 @@ func MakeChain(ctx *cli.Context) (chain *core.BlockChain, chainDb ethdb.Database
return chain , chainDb return chain , chainDb
} }
// MakeChain creates an account manager from set command line flags.
func MakeAccountManager ( ctx * cli . Context ) * accounts . Manager {
dataDir := MustDataDir ( ctx )
if ctx . GlobalBool ( TestNetFlag . Name ) {
dataDir += "/testnet"
}
scryptN := crypto . StandardScryptN
scryptP := crypto . StandardScryptP
if ctx . GlobalBool ( LightKDFFlag . Name ) {
scryptN = crypto . LightScryptN
scryptP = crypto . LightScryptP
}
ks := crypto . NewKeyStorePassphrase ( filepath . Join ( dataDir , "keystore" ) , scryptN , scryptP )
return accounts . NewManager ( ks )
}
// MustDataDir retrieves the currently requested data directory, terminating if
// none (or the empty string) is specified.
func MustDataDir ( ctx * cli . Context ) string {
if path := ctx . GlobalString ( DataDirFlag . Name ) ; path != "" {
return path
}
Fatalf ( "Cannot determine default data directory, please set manually (--datadir)" )
return ""
}
func IpcSocketPath ( ctx * cli . Context ) ( ipcpath string ) { func IpcSocketPath ( ctx * cli . Context ) ( ipcpath string ) {
if runtime . GOOS == "windows" { if runtime . GOOS == "windows" {
ipcpath = common . DefaultIpcPath ( ) ipcpath = common . DefaultIpcPath ( )
@ -605,39 +779,39 @@ func IpcSocketPath(ctx *cli.Context) (ipcpath string) {
return return
} }
func StartIPC ( eth * eth . Ethereum , ctx * cli . Context ) error { // StartIPC starts a IPC JSON-RPC API server.
func StartIPC ( stack * node . Node , ctx * cli . Context ) error {
config := comms . IpcConfig { config := comms . IpcConfig {
Endpoint : IpcSocketPath ( ctx ) , Endpoint : IpcSocketPath ( ctx ) ,
} }
initializer := func ( conn net . Conn ) ( comms . Stopper , shared . EthereumApi , error ) { initializer := func ( conn net . Conn ) ( comms . Stopper , shared . EthereumApi , error ) {
fe := useragent . NewRemoteFrontend ( conn , eth . AccountManager ( ) ) fe := useragent . NewRemoteFrontend ( conn , stack . Service ( " eth" ) . ( * eth . Ethereum ) . AccountManager ( ) )
xeth := xeth . New ( eth , fe ) xeth := xeth . New ( stack , fe )
apis , err := api . ParseApiString ( ctx . GlobalString ( IPCApiFlag . Name ) , codec . JSON , xeth , eth ) apis , err := api . ParseApiString ( ctx . GlobalString ( IPCApiFlag . Name ) , codec . JSON , xeth , stack )
if err != nil { if err != nil {
return nil , nil , err return nil , nil , err
} }
return xeth , api . Merge ( apis ... ) , nil return xeth , api . Merge ( apis ... ) , nil
} }
return comms . StartIpc ( config , codec . JSON , initializer ) return comms . StartIpc ( config , codec . JSON , initializer )
} }
func StartRPC ( eth * eth . Ethereum , ctx * cli . Context ) error { // StartRPC starts a HTTP JSON-RPC API server.
func StartRPC ( stack * node . Node , ctx * cli . Context ) error {
config := comms . HttpConfig { config := comms . HttpConfig {
ListenAddress : ctx . GlobalString ( RPCListenAddrFlag . Name ) , ListenAddress : ctx . GlobalString ( RPCListenAddrFlag . Name ) ,
ListenPort : uint ( ctx . GlobalInt ( RPCPortFlag . Name ) ) , ListenPort : uint ( ctx . GlobalInt ( RPCPortFlag . Name ) ) ,
CorsDomain : ctx . GlobalString ( RPCCORSDomainFlag . Name ) , CorsDomain : ctx . GlobalString ( RPCCORSDomainFlag . Name ) ,
} }
xeth := xeth . New ( eth , nil ) xeth := xeth . New ( stack , nil )
codec := codec . JSON codec := codec . JSON
apis , err := api . ParseApiString ( ctx . GlobalString ( RpcApiFlag . Name ) , codec , xeth , eth ) apis , err := api . ParseApiString ( ctx . GlobalString ( RpcApiFlag . Name ) , codec , xeth , stack )
if err != nil { if err != nil {
return err return err
} }
return comms . StartHttp ( config , codec , api . Merge ( apis ... ) ) return comms . StartHttp ( config , codec , api . Merge ( apis ... ) )
} }
@ -647,20 +821,3 @@ func StartPProf(ctx *cli.Context) {
log . Println ( http . ListenAndServe ( address , nil ) ) log . Println ( http . ListenAndServe ( address , nil ) )
} ( ) } ( )
} }
func ParamToAddress ( addr string , am * accounts . Manager ) ( addrHex string , err error ) {
if ! ( ( len ( addr ) == 40 ) || ( len ( addr ) == 42 ) ) { // with or without 0x
index , err := strconv . Atoi ( addr )
if err != nil {
Fatalf ( "Invalid account address '%s'" , addr )
}
addrHex , err = am . AddressByIndex ( index )
if err != nil {
return "" , err
}
} else {
addrHex = addr
}
return
}
Péter Szilágyi
9 years ago