lukechilds
/
ethminer
mirror of https://github.com/lukechilds/ethminer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #165 from caktux/develop 

neth: add -m option for mining and fix contract creation
cl-refactor
Gav Wood 11 years ago
parent
b65134aafc 585ffb1025
commit
772319bbf4
1 changed files with 53 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 75
      neth/main.cpp

75
neth/main.cpp
View File

@ -65,14 +65,15 @@ void help()
<< " <APPDATA>/Etherum or Library/Application Support/Ethereum)." << endl
<< " -h,--help Show this help message and exit." << endl
<< " -l,--listen <port> Listen on the given port for incoming connected (default: 30303)." << endl
<< " -m,--mining <on/off> Enable mining (default: off)" << endl
<< " -n,--upnp <on/off> Use upnp for NAT (default: on)." << endl
<< " -o,--mode <full/peer> Start a full node or a peer node (Default: full)." << endl
<< " -p,--port <port> Connect to remote port (default: 30303)." << endl
<< " -r,--remote <host> Connect to remote host (default: none)." << endl
<< " -s,--secret <secretkeyhex> Set the secret key for use with send command (default: auto)." << endl
<< " -u,--public-ip <ip> Force public ip to given (default; auto)." << endl
<< " -v,--verbosity <0..9> Set the log verbosity from 0 to 9 (Default: 8)." << endl
<< " -x,--peers <number> Attempt to connect to given number of peers (Default: 5)." << endl
<< " -v,--verbosity <0..9> Set the log verbosity from 0 to 9 (tmp forced to 1)." << endl
<< " -x,--peers <number> Attempt to connect to given number of peers (default: 5)." << endl
<< " -V,--version Show the version and exit." << endl;
exit(0);
}
@ -94,8 +95,8 @@ void interactiveHelp()
<< " transact Execute a given transaction." << endl
<< " send Execute a given transaction with current secret." << endl
<< " contract Create a new contract with current secret." << endl
<< " inspect <contract> Dumps a contract to <APPDATA>/<contract>.evm." << endl
<< " exit Exits the application." << endl;
<< " inspect <contract> Dumps a contract to <APPDATA>/<contract>.evm." << endl
<< " exit Exits the application." << endl;
}
string credits()
@ -284,6 +285,7 @@ int main(int argc, char** argv)
string remoteHost;
unsigned short remotePort = 30303;
string dbPath;
bool mining = false;
NodeMode mode = NodeMode::Full;
unsigned peers = 5;
string publicIP;
@ -344,6 +346,18 @@ int main(int argc, char** argv)
us = KeyPair(h256(fromHex(argv[++i])));
else if ((arg == "-d" || arg == "--path" || arg == "--db-path") && i + 1 < argc)
dbPath = argv[++i];
else if ((arg == "-m" || arg == "--mining") && i + 1 < argc)
{
string m = argv[++i];
if (isTrue(m))
mining = true;
else if (isFalse(m))
mining = false;
else
{
cerr << "Unknown mining option: " << m << endl;
}
}
else if ((arg == "-v" || arg == "--verbosity") && i + 1 < argc)
g_logVerbosity = atoi(argv[++i]);
else if ((arg == "-x" || arg == "--peers") && i + 1 < argc)
@ -437,6 +451,8 @@ int main(int argc, char** argv)
if (!remoteHost.empty())
c.startNetwork(listenPort, remoteHost, remotePort, mode, peers, publicIP, upnp);
if (mining)
c.startMining();
while (true)
{
@ -548,9 +564,18 @@ int main(int argc, char** argv)
fields[4].erase(std::remove(fields[4].begin(), fields[4].end(), ' '), fields[4].end());
fields[5].erase(std::find_if(fields[5].rbegin(), fields[5].rend(), std::bind1st(std::not_equal_to<char>(), ' ')).base(), fields[5].end());
int size = fields[0].length();
u256 amount = atoll(fields[1].c_str());
u256 gasPrice = atoll(fields[2].c_str());
u256 gas = atoll(fields[3].c_str());
u256 amount;
u256 gasPrice;
u256 gas;
stringstream ssa;
ssa << fields[1];
ssa >> amount;
stringstream ssg;
ssg << fields[3];
ssg >> gas;
stringstream ssp;
ssp << fields[2];
ssp >> gasPrice;
string sechex = fields[4];
string sdata = fields[5];
cnote << "Data:";
@ -607,7 +632,10 @@ int main(int argc, char** argv)
{
fields[0].erase(std::remove(fields[0].begin(), fields[0].end(), ' '), fields[0].end());
int size = fields[0].length();
u256 amount = atoll(fields[1].c_str());
u256 amount;
stringstream sss;
sss << fields[1];
sss >> amount;
if (size < 40)
{
if (size > 0)
@ -632,8 +660,8 @@ int main(int argc, char** argv)
l.push_back("Gas price");
l.push_back("Gas");
vector<string> b;
b.push_back("Code");
b.push_back("Init");
b.push_back("Code (hex)");
b.push_back("Init (hex)");
c.lock();
vector<string> fields = form_dialog(s, l, b, height, width, cmd);
c.unlock();
@ -645,9 +673,18 @@ int main(int argc, char** argv)
}
else
{
u256 endowment = atoll(fields[0].c_str());
u256 gas = atoll(fields[2].c_str());
u256 gasPrice = atoll(fields[1].c_str());
u256 endowment;
u256 gas;
u256 gasPrice;
stringstream sse;
sse << fields[0];
sse >> endowment;
stringstream ssg;
ssg << fields[2];
ssg >> gas;
stringstream ssp;
ssp << fields[1];
ssp >> gasPrice;
if (endowment < 0)
cwarn << "Invalid endowment";
else if (gasPrice < c_minGasPrice)
@ -670,23 +707,17 @@ int main(int argc, char** argv)
cwarn << "No code submitted";
else
{
bytes data;
// bytes code = compileLisp(scode, false, data);
// scode = asString(code);
bytes code = assemble(scode);
bytes code = fromHex(scode);
cnote << "Assembled:";
stringstream ssc;
ssc << disassemble(code);
cnote << ssc.str();
// int ssize = sinit.length();
// bytes init = compileLisp(sinit, false, data);
// sinit = asString(init);
bytes init = assemble(sinit);
bytes init = fromHex(sinit);
ssc.str(string());
ssc << disassemble(init);
cnote << "Init:";
cnote << ssc.str();
c.transact(us.secret(), endowment, data, init, gas, gasPrice);
c.transact(us.secret(), endowment, code, init, gas, gasPrice);
}
}
}

Write Preview
Loading…
Cancel
Save