@ -115,9 +115,14 @@ void help()
< < " <APPDATA>/Etherum or Library/Application Support/Ethereum). " < < endl < < " <APPDATA>/Etherum or Library/Application Support/Ethereum). " < < endl
< < " -D,--create-dag <this/next/number> Create the DAG in preparation for mining on given block and exit. " < < endl < < " -D,--create-dag <this/next/number> Create the DAG in preparation for mining on given block and exit. " < < endl
< < " -e,--ether-price <n> Set the ether price in the reference unit e.g. ¢ (Default: 30.679). " < < endl < < " -e,--ether-price <n> Set the ether price in the reference unit e.g. ¢ (Default: 30.679). " < < endl
< < " -E,--export <file> Export file as a concatenated series of blocks and exit. " < < endl
< < " --from <n> Export only from block n; n may be a decimal, a '0x' prefixed hash, or 'latest'. " < < endl
< < " --to <n> Export only to block n (inclusive); n may be a decimal, a '0x' prefixed hash, or 'latest'. " < < endl
< < " --only <n> Equivalent to --export-from n --export-to n. " < < endl
< < " -f,--force-mining Mine even when there are no transaction to mine (Default: off) " < < endl < < " -f,--force-mining Mine even when there are no transaction to mine (Default: off) " < < endl
< < " -h,--help Show this help message and exit. " < < endl < < " -h,--help Show this help message and exit. " < < endl
< < " -i,--interactive Enter interactive mode (default: non-interactive). " < < endl < < " -i,--interactive Enter interactive mode (default: non-interactive). " < < endl
< < " -I,--import <file> Import file as a concatenated series of blocks and exit. " < < endl
# if ETH_JSONRPC # if ETH_JSONRPC
< < " -j,--json-rpc Enable JSON-RPC server (default: off). " < < endl < < " -j,--json-rpc Enable JSON-RPC server (default: off). " < < endl
< < " --json-rpc-port Specify JSON-RPC server port (implies '-j', default: " < < SensibleHttpPort < < " ). " < < endl < < " --json-rpc-port Specify JSON-RPC server port (implies '-j', default: " < < SensibleHttpPort < < " ). " < < endl
@ -209,44 +214,78 @@ void doInitDAG(unsigned _n)
exit ( 0 ) ; exit ( 0 ) ;
} }
static const unsigned NoDAGInit = ( unsigned ) - 3 ; enum class OperationMode
{
Node ,
Import ,
Export ,
DAGInit
} ;
enum class Format
{
Binary ,
Hex ,
Human
} ;
int main ( int argc , char * * argv ) int main ( int argc , char * * argv )
{ {
unsigned initDAG = NoDAGInit ; // Init defaults
string listenIP ; Defaults : : get ( ) ;
unsigned short listenPort = 30303 ;
string publicIP ; /// Operating mode.
string remoteHost ; OperationMode mode = OperationMode : : Node ;
unsigned short remotePort = 30303 ;
string dbPath ; string dbPath ;
unsigned mining = ~ ( unsigned ) 0 ;
NodeMode mode = NodeMode : : Full ; /// File name for import/export.
unsigned peers = 5 ; string filename ;
int miners = - 1 ;
/// Hashes/numbers for export range.
string exportFrom = " 1 " ;
string exportTo = " latest " ;
Format exportFormat = Format : : Binary ;
/// DAG initialisation param.
unsigned initDAG = 0 ;
/// General params for Node operation
NodeMode nodeMode = NodeMode : : Full ;
bool interactive = false ; bool interactive = false ;
# if ETH_JSONRPC # if ETH_JSONRPC
int jsonrpc = - 1 ; int jsonrpc = - 1 ;
# endif # endif
bool bootstrap = false ;
bool upnp = true ; bool upnp = true ;
bool forceMining = false ;
WithExisting killChain = WithExisting : : Trust ; WithExisting killChain = WithExisting : : Trust ;
bool jit = false ; bool jit = false ;
/// Networking params.
string clientName ;
string listenIP ;
unsigned short listenPort = 30303 ;
string publicIP ;
string remoteHost ;
unsigned short remotePort = 30303 ;
unsigned peers = 5 ;
bool bootstrap = false ;
/// Mining params
unsigned mining = ~ ( unsigned ) 0 ;
int miners = - 1 ;
bool forceMining = false ;
bool turboMining = false ;
KeyPair us = KeyPair : : create ( ) ;
Address coinbase = us . address ( ) ;
/// Structured logging params
bool structuredLogging = false ; bool structuredLogging = false ;
string structuredLoggingFormat = " %Y-%m-%dT%H:%M:%S " ; string structuredLoggingFormat = " %Y-%m-%dT%H:%M:%S " ;
string clientName ;
/// Transaction params
TransactionPriority priority = TransactionPriority : : Medium ; TransactionPriority priority = TransactionPriority : : Medium ;
double etherPrice = 30.679 ; double etherPrice = 30.679 ;
double blockFees = 15.0 ; double blockFees = 15.0 ;
// Init defaults
Defaults : : get ( ) ;
// Our address.
KeyPair us = KeyPair : : create ( ) ;
Address coinbase = us . address ( ) ;
string configFile = getDataDir ( ) + " /config.rlp " ; string configFile = getDataDir ( ) + " /config.rlp " ;
bytes b = contents ( configFile ) ; bytes b = contents ( configFile ) ;
if ( b . size ( ) ) if ( b . size ( ) )
@ -255,12 +294,6 @@ int main(int argc, char** argv)
us = KeyPair ( config [ 0 ] . toHash < Secret > ( ) ) ; us = KeyPair ( config [ 0 ] . toHash < Secret > ( ) ) ;
coinbase = config [ 1 ] . toHash < Address > ( ) ; coinbase = config [ 1 ] . toHash < Address > ( ) ;
} }
else
{
RLPStream config ( 2 ) ;
config < < us . secret ( ) < < coinbase ;
writeFile ( configFile , config . out ( ) ) ;
}
for ( int i = 1 ; i < argc ; + + i ) for ( int i = 1 ; i < argc ; + + i )
{ {
@ -275,6 +308,37 @@ int main(int argc, char** argv)
remoteHost = argv [ + + i ] ; remoteHost = argv [ + + i ] ;
else if ( ( arg = = " -p " | | arg = = " --port " ) & & i + 1 < argc ) else if ( ( arg = = " -p " | | arg = = " --port " ) & & i + 1 < argc )
remotePort = ( short ) atoi ( argv [ + + i ] ) ; remotePort = ( short ) atoi ( argv [ + + i ] ) ;
else if ( ( arg = = " -I " | | arg = = " --import " ) & & i + 1 < argc )
{
mode = OperationMode : : Import ;
filename = argv [ + + i ] ;
}
else if ( ( arg = = " -E " | | arg = = " --export " ) & & i + 1 < argc )
{
mode = OperationMode : : Export ;
filename = argv [ + + i ] ;
}
else if ( arg = = " --format " & & i + 1 < argc )
{
string m = argv [ + + i ] ;
if ( m = = " binary " )
exportFormat = Format : : Binary ;
else if ( m = = " hex " )
exportFormat = Format : : Hex ;
else if ( m = = " human " )
exportFormat = Format : : Human ;
else
{
cerr < < " Bad " < < arg < < " option: " < < m < < endl ;
return - 1 ;
}
}
else if ( arg = = " --to " & & i + 1 < argc )
exportTo = argv [ + + i ] ;
else if ( arg = = " --from " & & i + 1 < argc )
exportFrom = argv [ + + i ] ;
else if ( arg = = " --only " & & i + 1 < argc )
exportTo = exportFrom = argv [ + + i ] ;
else if ( ( arg = = " -n " | | arg = = " --upnp " ) & & i + 1 < argc ) else if ( ( arg = = " -n " | | arg = = " --upnp " ) & & i + 1 < argc )
{ {
string m = argv [ + + i ] ; string m = argv [ + + i ] ;
@ -284,7 +348,7 @@ int main(int argc, char** argv)
upnp = false ; upnp = false ;
else else
{ {
cerr < < " Invalid -n/--upnp option: " < < m < < endl ; cerr < < " Bad " < < arg < < " option: " < < m < < endl ;
return - 1 ; return - 1 ;
} }
} }
@ -301,14 +365,13 @@ int main(int argc, char** argv)
} }
catch ( BadHexCharacter & _e ) catch ( BadHexCharacter & _e )
{ {
cwarn < < " invalid hex character, coinbase rejected " ; cerr < < " Bad hex in " < < arg < < " option: " < < argv [ i ] < < endl ;
cwarn < < boost : : diagnostic_information ( _e ) ; return - 1 ;
break ;
} }
catch ( . . . ) catch ( . . . )
{ {
cwarn < < " coinbase rejected " ; cerr < < " Bad " < < arg < < " option: " < < argv [ i ] < < endl ;
break ; return - 1 ;
} }
else if ( ( arg = = " -s " | | arg = = " --secret " ) & & i + 1 < argc ) else if ( ( arg = = " -s " | | arg = = " --secret " ) & & i + 1 < argc )
us = KeyPair ( h256 ( fromHex ( argv [ + + i ] ) ) ) ; us = KeyPair ( h256 ( fromHex ( argv [ + + i ] ) ) ) ;
@ -321,6 +384,7 @@ int main(int argc, char** argv)
else if ( ( arg = = " -D " | | arg = = " --create-dag " ) & & i + 1 < argc ) else if ( ( arg = = " -D " | | arg = = " --create-dag " ) & & i + 1 < argc )
{ {
string m = boost : : to_lower_copy ( string ( argv [ + + i ] ) ) ; string m = boost : : to_lower_copy ( string ( argv [ + + i ] ) ) ;
mode = OperationMode : : DAGInit ;
if ( m = = " next " ) if ( m = = " next " )
initDAG = PendingBlock ; initDAG = PendingBlock ;
else if ( m = = " this " ) else if ( m = = " this " )
@ -402,6 +466,8 @@ int main(int argc, char** argv)
bootstrap = true ; bootstrap = true ;
else if ( arg = = " -f " | | arg = = " --force-mining " ) else if ( arg = = " -f " | | arg = = " --force-mining " )
forceMining = true ; forceMining = true ;
else if ( arg = = " -T " | | arg = = " --turbo-mining " )
turboMining = true ;
else if ( arg = = " -i " | | arg = = " --interactive " ) else if ( arg = = " -i " | | arg = = " --interactive " )
interactive = true ; interactive = true ;
# if ETH_JSONRPC # if ETH_JSONRPC
@ -420,9 +486,9 @@ int main(int argc, char** argv)
{ {
string m = argv [ + + i ] ; string m = argv [ + + i ] ;
if ( m = = " full " ) if ( m = = " full " )
m ode= NodeMode : : Full ; nodeM ode= NodeMode : : Full ;
else if ( m = = " peer " ) else if ( m = = " peer " )
m ode= NodeMode : : PeerServer ; nodeM ode= NodeMode : : PeerServer ;
else else
{ {
cerr < < " Unknown mode: " < < m < < endl ; cerr < < " Unknown mode: " < < m < < endl ;
@ -449,17 +515,20 @@ int main(int argc, char** argv)
} }
} }
{
RLPStream config ( 2 ) ;
config < < us . secret ( ) < < coinbase ;
writeFile ( configFile , config . out ( ) ) ;
}
// Two codepaths is necessary since named block require database, but numbered
// Two codepaths is necessary since named block require database, but numbered
// blocks are superuseful to have when database is already open in another process.
// blocks are superuseful to have when database is already open in another process.
if ( initDAG < NoDAGInit ) if ( mode = = OperationMode : : DAGInit & & ! ( initDAG = = LatestBlock | | initDAG = = PendingBlock ) )
doInitDAG ( initDAG ) ; doInitDAG ( initDAG ) ;
if ( ! clientName . empty ( ) ) if ( ! clientName . empty ( ) )
clientName + = " / " ; clientName + = " / " ;
cout < < credits ( ) ;
StructuredLogger : : get ( ) . initialize ( structuredLogging , structuredLoggingFormat ) ; StructuredLogger : : get ( ) . initialize ( structuredLogging , structuredLoggingFormat ) ;
VMFactory : : setKind ( jit ? VMKind : : JIT : VMKind : : Interpreter ) ; VMFactory : : setKind ( jit ? VMKind : : JIT : VMKind : : Interpreter ) ;
auto netPrefs = publicIP . empty ( ) ? NetworkPreferences ( listenIP , listenPort , upnp ) : NetworkPreferences ( publicIP , listenIP , listenPort , upnp ) ; auto netPrefs = publicIP . empty ( ) ? NetworkPreferences ( listenIP , listenPort , upnp ) : NetworkPreferences ( publicIP , listenIP , listenPort , upnp ) ;
@ -469,23 +538,101 @@ int main(int argc, char** argv)
clientImplString , clientImplString ,
dbPath , dbPath ,
killChain , killChain ,
m ode= = NodeMode : : Full ? set < string > { " eth " , " shh " } : set < string > ( ) , nodeM ode= = NodeMode : : Full ? set < string > { " eth " , " shh " } : set < string > ( ) ,
netPrefs , netPrefs ,
& nodesState , & nodesState ,
miners miners
) ; ) ;
if ( initDAG = = LatestBlock | | initDAG = = PendingBlock ) if ( mode = = OperationMode : : DAGInit )
doInitDAG ( web3 . ethereum ( ) - > blockChain ( ) . number ( ) + ( initDAG = = PendingBlock ? 30000 : 0 ) ) ; doInitDAG ( web3 . ethereum ( ) - > blockChain ( ) . number ( ) + ( initDAG = = PendingBlock ? 30000 : 0 ) ) ;
auto toNumber = [ & ] ( string const & s ) - > unsigned {
if ( s = = " latest " )
return web3 . ethereum ( ) - > number ( ) ;
if ( s . size ( ) = = 64 | | ( s . size ( ) = = 66 & & s . substr ( 0 , 2 ) = = " 0x " ) )
return web3 . ethereum ( ) - > blockChain ( ) . number ( h256 ( s ) ) ;
try {
return stol ( s ) ;
}
catch ( . . . )
{
cerr < < " Bad block number/hash option: " < < s < < endl ;
exit ( - 1 ) ;
}
} ;
if ( mode = = OperationMode : : Export )
{
ofstream fout ( filename , std : : ofstream : : binary ) ;
ostream & out = ( filename . empty ( ) | | filename = = " -- " ) ? cout : fout ;
unsigned last = toNumber ( exportTo ) ;
for ( unsigned i = toNumber ( exportFrom ) ; i < = last ; + + i )
{
bytes block = web3 . ethereum ( ) - > blockChain ( ) . block ( web3 . ethereum ( ) - > blockChain ( ) . numberHash ( i ) ) ;
switch ( exportFormat )
{
case Format : : Binary : out . write ( ( char const * ) block . data ( ) , block . size ( ) ) ; break ;
case Format : : Hex : out < < toHex ( block ) < < endl ; break ;
case Format : : Human : out < < RLP ( block ) < < endl ; break ;
default : ;
}
}
return 0 ;
}
if ( mode = = OperationMode : : Import )
{
ifstream fin ( filename , std : : ifstream : : binary ) ;
istream & in = ( filename . empty ( ) | | filename = = " -- " ) ? cin : fin ;
unsigned alreadyHave = 0 ;
unsigned good = 0 ;
unsigned futureTime = 0 ;
unsigned unknownParent = 0 ;
unsigned bad = 0 ;
while ( in . peek ( ) ! = - 1 )
{
bytes block ( 8 ) ;
in . read ( ( char * ) block . data ( ) , 8 ) ;
block . resize ( RLP ( block , RLP : : LaisezFaire ) . actualSize ( ) ) ;
in . read ( ( char * ) block . data ( ) + 8 , block . size ( ) - 8 ) ;
try
{
web3 . ethereum ( ) - > injectBlock ( block ) ;
good + + ;
}
catch ( AlreadyHaveBlock const & )
{
alreadyHave + + ;
}
catch ( UnknownParent const & )
{
unknownParent + + ;
}
catch ( FutureTime const & )
{
futureTime + + ;
}
catch ( . . . )
{
bad + + ;
}
}
cout < < ( good + bad + futureTime + unknownParent + alreadyHave ) < < " total: " < < good < < " ok, " < < alreadyHave < < " got, " < < futureTime < < " future, " < < unknownParent < < " unknown parent, " < < bad < < " malformed. " < < endl ;
return 0 ;
}
cout < < credits ( ) ;
web3 . setIdealPeerCount ( peers ) ; web3 . setIdealPeerCount ( peers ) ;
std : : shared_ptr < eth : : BasicGasPricer > gasPricer = make_shared < eth : : BasicGasPricer > ( u256 ( double ( ether / 1000 ) / etherPrice ) , u256 ( blockFees * 1000 ) ) ; std : : shared_ptr < eth : : BasicGasPricer > gasPricer = make_shared < eth : : BasicGasPricer > ( u256 ( double ( ether / 1000 ) / etherPrice ) , u256 ( blockFees * 1000 ) ) ;
eth : : Client * c = mode = = NodeMode : : Full ? web3 . ethereum ( ) : nullptr ; eth : : Client * c = nodeM ode= = NodeMode : : Full ? web3 . ethereum ( ) : nullptr ;
StructuredLogger : : starting ( clientImplString , dev : : Version ) ; StructuredLogger : : starting ( clientImplString , dev : : Version ) ;
if ( c ) if ( c )
{ {
c - > setGasPricer ( gasPricer ) ; c - > setGasPricer ( gasPricer ) ;
c - > setForceMining ( forceMining ) ; c - > setForceMining ( forceMining ) ;
c - > setTurboMining ( turboMining ) ;
c - > setAddress ( coinbase ) ; c - > setAddress ( coinbase ) ;
} }
@ -553,10 +700,9 @@ int main(int argc, char** argv)
} }
else if ( cmd = = " connect " ) else if ( cmd = = " connect " )
{ {
string addr ; string addrPort ;
unsigned port ; iss > > addrPort ;
iss > > addr > > port ; web3 . addNode ( p2p : : NodeId ( ) , addrPort ) ;
web3 . addNode ( p2p : : NodeId ( ) , addr + " : " + toString ( port ? port : p2p : : c_defaultIPPort ) ) ;
} }
else if ( cmd = = " netstop " ) else if ( cmd = = " netstop " )
{ {
arkpar
10 years ago