From 077d9310b2c811881f40ac4cd78a8a8de08604cc Mon Sep 17 00:00:00 2001 From: Vincent Gariepy Date: Mon, 31 Mar 2014 17:51:07 -0400 Subject: [PATCH] gasPrice and gas in interactive help, fix cmd passed through iss instead of cin --- eth/main.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/eth/main.cpp b/eth/main.cpp index 499a43b40..af0522bce 100644 --- a/eth/main.cpp +++ b/eth/main.cpp @@ -78,8 +78,8 @@ void interactiveHelp() { cout << "Commands:" << endl - << " netstart Starts the network sybsystem on a specific port." << endl - << " netstop Stops the network subsystem." << endl + << " netstart Starts the network sybsystem on a specific port." << endl + << " netstop Stops the network subsystem." << endl << " connect Connects to a specific peer." << endl << " minestart Starts mining." << endl << " minestop Stops mining." << endl @@ -87,9 +87,9 @@ void interactiveHelp() << " secret Gives the current secret" << endl << " block Gives the current block height." << endl << " balance Gives the current balance." << endl - << " transact Executes a given transaction." << endl - << " send Executes a given transaction with current secret." << endl - << " inspect Dumps a contract to /.evm." << endl + << " transact Executes a given transaction." << endl + << " send Executes a given transaction with current secret." << endl + << " inspect Dumps a contract to /.evm." << endl << " exit Exits the application." << endl; } @@ -508,10 +508,11 @@ int main(int argc, char** argv) u256 amount; u256 gasPrice; u256 gas; - cin >> sechex >> rechex >> amount >> gasPrice >> gas; + iss >> sechex >> rechex >> amount >> gasPrice >> gas; Secret secret = h256(fromHex(sechex)); Address dest = h160(fromHex(rechex)); bytes data; + c.transact(secret, amount, gasPrice, gas, dest, data); } else if (cmd == "send") @@ -520,7 +521,7 @@ int main(int argc, char** argv) u256 amount; u256 gasPrice; u256 gas; - cin >> rechex >> amount >> gasPrice >> gas; + iss >> rechex >> amount >> gasPrice >> gas; Address dest = h160(fromHex(rechex)); c.transact(us.secret(), amount, gasPrice, gas, dest, bytes());