From 1ddfeb65f131488f21c6debc1d8ba2202de6c662 Mon Sep 17 00:00:00 2001 From: Marko Simovic Date: Tue, 8 Apr 2014 13:55:32 -0400 Subject: [PATCH 1/2] Removed interactive mode from eth client and moved to separate subproject The subproject is not currently on the build path --- eth-ncurses-cli/CMakeLists.txt | 48 ++ eth-ncurses-cli/main.cpp | 1109 ++++++++++++++++++++++++++++++++ eth/CMakeLists.txt | 3 - eth/main.cpp | 875 +------------------------ 4 files changed, 1166 insertions(+), 869 deletions(-) create mode 100644 eth-ncurses-cli/CMakeLists.txt create mode 100644 eth-ncurses-cli/main.cpp diff --git a/eth-ncurses-cli/CMakeLists.txt b/eth-ncurses-cli/CMakeLists.txt new file mode 100644 index 000000000..54f26ccee --- /dev/null +++ b/eth-ncurses-cli/CMakeLists.txt @@ -0,0 +1,48 @@ +cmake_policy(SET CMP0015 NEW) + +aux_source_directory(. SRC_LIST) + +include_directories(../libethereum) +link_directories(../libethereum) + +add_executable(eth ${SRC_LIST}) + +if (${TARGET_PLATFORM} STREQUAL "w64") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -static-libstdc++") + target_link_libraries(eth gcc) + target_link_libraries(eth gdi32) + target_link_libraries(eth ws2_32) + target_link_libraries(eth mswsock) + target_link_libraries(eth shlwapi) + target_link_libraries(eth iphlpapi) + target_link_libraries(eth cryptopp) + target_link_libraries(eth ncurses) + target_link_libraries(eth form) + target_link_libraries(eth boost_system-mt-s) + target_link_libraries(eth boost_filesystem-mt-s) + target_link_libraries(eth boost_thread_win32-mt-s) + set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS) +elseif (UNIX) + target_link_libraries(eth ncurses) + target_link_libraries(eth form) +else () + target_link_libraries(eth ${CRYPTOPP_LIBRARIES}) + target_link_libraries(eth boost_system) + target_link_libraries(eth boost_filesystem) + target_link_libraries(eth ncurses) + target_link_libraries(eth form) + find_package(Threads REQUIRED) + target_link_libraries(eth ${CMAKE_THREAD_LIBS_INIT}) +endif () + +if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + include_directories(/usr/local/include) +endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + +target_link_libraries(eth ethereum) +target_link_libraries(eth miniupnpc) +target_link_libraries(eth leveldb) +target_link_libraries(eth gmp) + +install( TARGETS eth DESTINATION bin ) + diff --git a/eth-ncurses-cli/main.cpp b/eth-ncurses-cli/main.cpp new file mode 100644 index 000000000..e1eba9f44 --- /dev/null +++ b/eth-ncurses-cli/main.cpp @@ -0,0 +1,1109 @@ +/* + This file is part of cpp-ethereum. + + cpp-ethereum is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + cpp-ethereum is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with cpp-ethereum. If not, see . +*/ +/** @file main.cpp + * @author Gav Wood + * @date 2014 + * Ethereum client. + */ + +#include +#undef OK +#include +#undef OK +#include +#include +#include +#include +#include "Defaults.h" +#include "Client.h" +#include "PeerNetwork.h" +#include "BlockChain.h" +#include "State.h" +#include "FileSystem.h" +#include "Instruction.h" +#include "BuildInfo.h" +using namespace std; +using namespace eth; +using eth::Instruction; +using eth::c_instructionInfo; + +bool isTrue(std::string const& _m) +{ + return _m == "on" || _m == "yes" || _m == "true" || _m == "1"; +} + +bool isFalse(std::string const& _m) +{ + return _m == "off" || _m == "no" || _m == "false" || _m == "0"; +} + +void help() +{ + cout + << "Usage eth [OPTIONS] " << endl + << "Options:" << endl + << " -a,--address Set the coinbase (mining payout) address to addr (default: auto)." << endl + << " -c,--client-name Add a name to your client's version string (default: blank)." << endl + << " -d,--db-path Load database from path (default: ~/.ethereum " << endl + << " /Etherum or Library/Application Support/Ethereum)." << endl + << " -h,--help Show this help message and exit." << endl + << " -i,--interactive Enter interactive mode (default: non-interactive)." << endl + << " -l,--listen Listen on the given port for incoming connected (default: 30303)." << endl + << " -m,--mining Enable mining, optionally for a specified number of blocks (Default: off)" << endl + << " -n,--upnp Use upnp for NAT (default: on)." << endl + << " -o,--mode Start a full node or a peer node (Default: full)." << endl + << " -p,--port Connect to remote port (default: 30303)." << endl + << " -r,--remote Connect to remote host (default: none)." << endl + << " -s,--secret Set the secret key for use with send command (default: auto)." << endl + << " -u,--public-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 Attempt to connect to given number of peers (Default: 5)." << endl + << " -V,--version Show the version and exit." << endl; + exit(0); +} + +void interactiveHelp() +{ + cout + << "Commands:" << 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 + << " address Gives the current address." << endl + << " secret Gives the current secret" << endl + << " block Gives the current block height." << endl + << " balance Gives the current balance." << endl + << " peers List the peers that are connected" << endl + << " 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 Dumps a contract to /.evm." << endl + << " exit Exits the application." << endl; +} + +string credits(bool _interactive = false) +{ + std::ostringstream ccout; + ccout + << "Ethereum (++) " << ETH_QUOTED(ETH_VERSION) << endl + << " Code by Gav Wood, (c) 2013, 2014." << endl + << " Based on a design by Vitalik Buterin." << endl << endl; + + if (_interactive) + { + string vs = toString(ETH_QUOTED(ETH_VERSION)); + vs = vs.substr(vs.find_first_of('.') + 1)[0]; + int pocnumber = stoi(vs); + string m_servers; + if (pocnumber == 3) + m_servers = "54.201.28.117"; + if (pocnumber == 4) + m_servers = "54.72.31.55"; + + ccout << "Type 'netstart 30303' to start networking" << endl; + ccout << "Type 'connect " << m_servers << " 30303' to connect" << endl; + ccout << "Type 'exit' to quit" << endl << endl; + } + return ccout.str(); +} + +void version() +{ + cout << "eth version " << ETH_QUOTED(ETH_VERSION) << endl; + cout << "Build: " << ETH_QUOTED(ETH_BUILD_PLATFORM) << "/" << ETH_QUOTED(ETH_BUILD_TYPE) << endl; + exit(0); +} + +u256 c_minGasPrice = 10000000000000; +u256 c_minGas = 100; +Address c_config = Address("ccdeac59d35627b7de09332e819d5159e7bb7250"); +string pretty(h160 _a, eth::State _st) +{ + string ns; + h256 n; + if (h160 nameReg = (u160)_st.contractStorage(c_config, 0)) + n = _st.contractStorage(nameReg, (u160)(_a)); + if (n) + { + std::string s((char const*)n.data(), 32); + if (s.find_first_of('\0') != string::npos) + s.resize(s.find_first_of('\0')); + ns = " " + s; + } + return ns; +} + +namespace nc +{ + +class nc_window_streambuf: public std::streambuf +{ +public: + nc_window_streambuf(WINDOW* p, std::ostream& os, unsigned long cursesAttr = 0); + nc_window_streambuf(WINDOW* p, unsigned long _cursesAttr = 0); + nc_window_streambuf(nc_window_streambuf const& _rhs); + virtual ~nc_window_streambuf(); + + nc_window_streambuf& operator=(nc_window_streambuf const& _rhs); + + virtual int overflow(int c); + virtual int sync(); + +private: + void copy(nc_window_streambuf const& _rhs); + + WINDOW* m_pnl; + unsigned long m_flags; + std::ostream* m_os; + std::streambuf* m_old; +}; + +nc_window_streambuf::nc_window_streambuf(WINDOW * p, unsigned long _cursesAttr): + m_pnl(p), + m_flags(_cursesAttr), + m_os(0), + m_old(0) +{ + // Tell parent class that we want to call overflow() for each + // input char: + setp(0, 0); + setg(0, 0, 0); + scrollok(p, true); + mvwinch(p, 0, 0); +} + +nc_window_streambuf::nc_window_streambuf(WINDOW* _p, std::ostream& _os, unsigned long _cursesAttr): + m_pnl(_p), + m_flags(_cursesAttr), + m_os(&_os), + m_old(_os.rdbuf()) +{ + setp(0, 0); + setg(0, 0, 0); + _os.rdbuf(this); + scrollok(_p, true); + mvwinch(_p, 0, 0); +} + +void nc_window_streambuf::copy(nc_window_streambuf const& _rhs) +{ + if (this != &_rhs) + { + m_pnl = _rhs.m_pnl; + m_flags = _rhs.m_flags; + m_os = _rhs.m_os; + m_old = _rhs.m_old; + } +} + +nc_window_streambuf::nc_window_streambuf(nc_window_streambuf const& _rhs): + std::streambuf() +{ + copy(_rhs); +} + +nc_window_streambuf& nc_window_streambuf::operator=(nc_window_streambuf const& _rhs) +{ + copy(_rhs); + return *this; +} + +nc_window_streambuf::~nc_window_streambuf() +{ + if (m_os) + m_os->rdbuf(m_old); +} + +int nc_window_streambuf::overflow(int c) +{ + int ret = c; + if (c != EOF) + { + int x = 0; + int y = 0; + int mx = 0; + int my = 0; + getyx(m_pnl, y, x); + getmaxyx(m_pnl, my, mx); + (void)my; + if (y < 1) + y = 1; + if (x < 2) + x = 2; + if (x > mx - 4) + { + y++; + x = 2; + } + if (m_flags) + { + wattron(m_pnl, m_flags); + if (mvwaddch(m_pnl, y, x++, (chtype)c) == ERR) + ret = EOF; + wattroff(m_pnl, m_flags); + } + else if (mvwaddch(m_pnl, y, x++, (chtype)c) == ERR) + ret = EOF; + } + if (c == EOF) // || std::isspace(c) + if (sync() == EOF) + ret = EOF; + return ret; +} + +int nc_window_streambuf::sync() +{ + if (stdscr && m_pnl) + return (wrefresh(m_pnl) == ERR) ? EOF : 0; + return EOF; +} + +} + +vector form_dialog(vector _sfields, vector _lfields, vector _bfields, int _cols, int _rows, string _post_form); + + +int main(int argc, char** argv) +{ + unsigned short listenPort = 30303; + string remoteHost; + unsigned short remotePort = 30303; + bool interactive = false; + string dbPath; + eth::uint mining = ~(eth::uint)0; + NodeMode mode = NodeMode::Full; + unsigned peers = 5; + string publicIP; + bool upnp = true; + string clientName; + + // Init defaults + Defaults::get(); + + // Our address. + KeyPair us = KeyPair::create(); + Address coinbase = us.address(); + + string configFile = getDataDir() + "/config.rlp"; + bytes b = contents(configFile); + if (b.size()) + { + RLP config(b); + us = KeyPair(config[0].toHash()); + coinbase = config[1].toHash
(); + } + else + { + RLPStream config(2); + config << us.secret() << coinbase; + writeFile(configFile, config.out()); + } + + for (int i = 1; i < argc; ++i) + { + string arg = argv[i]; + if ((arg == "-l" || arg == "--listen" || arg == "--listen-port") && i + 1 < argc) + listenPort = (short)atoi(argv[++i]); + else if ((arg == "-u" || arg == "--public-ip" || arg == "--public") && i + 1 < argc) + publicIP = argv[++i]; + else if ((arg == "-r" || arg == "--remote") && i + 1 < argc) + remoteHost = argv[++i]; + else if ((arg == "-p" || arg == "--port") && i + 1 < argc) + remotePort = (short)atoi(argv[++i]); + else if ((arg == "-n" || arg == "--upnp") && i + 1 < argc) + { + string m = argv[++i]; + if (isTrue(m)) + upnp = true; + else if (isFalse(m)) + upnp = false; + else + { + cerr << "Invalid UPnP option: " << m << endl; + return -1; + } + } + else if ((arg == "-c" || arg == "--client-name") && i + 1 < argc) + clientName = argv[++i]; + else if ((arg == "-a" || arg == "--address" || arg == "--coinbase-address") && i + 1 < argc) + coinbase = h160(fromHex(argv[++i])); + else if ((arg == "-s" || arg == "--secret") && i + 1 < argc) + us = KeyPair(h256(fromHex(argv[++i]))); + else if (arg == "-i" || arg == "--interactive") + interactive = true; + 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 = ~(eth::uint)0; + else if (isFalse(m)) + mining = 0; + else if (int i = stoi(m)) + mining = i; + else + { + cerr << "Unknown mining option: " << m << endl; + return -1; + } + } + else if ((arg == "-v" || arg == "--verbosity") && i + 1 < argc) + g_logVerbosity = atoi(argv[++i]); + else if ((arg == "-x" || arg == "--peers") && i + 1 < argc) + peers = atoi(argv[++i]); + else if ((arg == "-o" || arg == "--mode") && i + 1 < argc) + { + string m = argv[++i]; + if (m == "full") + mode = NodeMode::Full; + else if (m == "peer") + mode = NodeMode::PeerServer; + else + { + cerr << "Unknown mode: " << m << endl; + return -1; + } + } + else if (arg == "-h" || arg == "--help") + help(); + else if (arg == "-V" || arg == "--version") + version(); + else + remoteHost = argv[i]; + } + + if (!clientName.empty()) + clientName += "/"; + Client c("Ethereum(++)/" + clientName + "v" ETH_QUOTED(ETH_VERSION) "/" ETH_QUOTED(ETH_BUILD_TYPE) "/" ETH_QUOTED(ETH_BUILD_PLATFORM), coinbase, dbPath); + cout << credits(); + + if (interactive) + { + std::ostringstream ccout; + + // Initialize ncurses + const char* chr; + char* str = new char[255]; + int width; + int height; + int y = 0; + int x = 2; + string cmd; + WINDOW * mainwin, * consolewin, * logwin, * blockswin, * pendingwin, *addswin, * contractswin, * peerswin; + + if (!(mainwin = initscr())) + { + cerr << "Error initialising ncurses."; + return -1; + } + + getmaxyx(mainwin, height, width); + int qheight = height * 3 / 5; + int qwidth = width / 4 - 4; + + nonl(); + cbreak(); + timeout(30000); + echo(); + keypad(mainwin, true); + + // Initialize color pairs + start_color(); + init_pair(1, COLOR_WHITE, COLOR_BLACK); + init_pair(2, COLOR_RED, COLOR_BLACK); + init_pair(3, 7, COLOR_BLACK); + use_default_colors(); + + logwin = newwin(height * 2 / 5 - 2, width * 2 / 3, qheight, 0); + nc::nc_window_streambuf outbuf(logwin, std::cout); + g_logVerbosity = 1; // Force verbosity level for now + + consolewin = newwin(qheight, width / 4, 0, 0); + nc::nc_window_streambuf coutbuf(consolewin, ccout); + blockswin = newwin(qheight, width / 4, 0, width / 4); + pendingwin = newwin(height * 1 / 5, width / 4, 0, width * 2 / 4); + peerswin = newwin(height * 2 / 5, width / 4, height * 1 / 5, width * 2 / 4); + addswin = newwin(height * 2 / 5 - 2, width / 3, qheight, width * 2 / 3); + contractswin = newwin(qheight, width / 4, 0, width * 3 / 4); + + int vl = qheight - 4; + wsetscrreg(consolewin, 1, vl); + wsetscrreg(blockswin, 1, vl); + wsetscrreg(pendingwin, 1, vl); + wsetscrreg(peerswin, 1, vl); + wsetscrreg(addswin, 1, vl); + wsetscrreg(contractswin, 1, vl); + + mvwprintw(mainwin, 1, 1, " > "); + wresize(mainwin, 3, width); + mvwin(mainwin, height - 3, 0); + + wmove(mainwin, 1, 4); + + if (!remoteHost.empty()) + c.startNetwork(listenPort, remoteHost, remotePort, mode, peers, publicIP, upnp); + + while (true) + { + wclrtobot(consolewin); + wclrtobot(pendingwin); + wclrtobot(peerswin); + wclrtobot(addswin); + wclrtobot(contractswin); + + ccout << credits(true); + + // Prompt + wmove(mainwin, 1, 4); + getstr(str); + + string s(str); + istringstream iss(s); + iss >> cmd; + + // Address + ccout << "Address:" << endl; + chr = toHex(us.address().asArray()).c_str(); + ccout << chr << endl << endl; + + mvwprintw(mainwin, 1, 1, " > "); + clrtoeol(); + + if (s.length() > 1) + { + ccout << "> "; + ccout << str << endl; + } + + if (cmd == "netstart") + { + eth::uint port; + iss >> port; + c.startNetwork((short)port); + } + else if (cmd == "connect") + { + string addr; + eth::uint port; + iss >> addr >> port; + c.connect(addr, (short)port); + } + else if (cmd == "netstop") + c.stopNetwork(); + else if (cmd == "minestart") + c.startMining(); + else if (cmd == "minestop") + c.stopMining(); + else if (cmd == "address") + { + ccout << "Current address:" << endl; + const char* addchr = toHex(us.address().asArray()).c_str(); + ccout << addchr << endl; + } + else if (cmd == "secret") + { + ccout << "Current secret:" << endl; + const char* addchr = toHex(us.secret().asArray()).c_str(); + ccout << addchr << endl; + } + else if (cmd == "block") + { + eth::uint n = c.blockChain().details().number; + ccout << "Current block # "; + const char* addchr = toString(n).c_str(); + ccout << addchr << endl; + } + else if (cmd == "peers") + { + for (auto it: c.peers()) + cout << it.host << ":" << it.port << ", " << it.clientVersion << ", " + << std::chrono::duration_cast(it.lastPing).count() << "ms" + << endl; + } + else if (cmd == "balance") + { + u256 balance = c.state().balance(us.address()); + ccout << "Current balance:" << endl; + const char* addchr = toString(balance).c_str(); + ccout << addchr << endl; + } + else if (cmd == "transact") + { + vector s; + s.push_back("Address"); + vector l; + l.push_back("Amount"); + l.push_back("Gas price"); + l.push_back("Gas"); + vector b; + b.push_back("Secret"); + b.push_back("Data"); + c.lock(); + vector fields = form_dialog(s, l, b, height, width, cmd); + c.unlock(); + int fs = fields.size(); + if (fs < 6) + { + if (fs > 0) + cwarn << "Missing parameter"; + } + else + { + fields[0].erase(std::remove(fields[0].begin(), fields[0].end(), ' '), fields[0].end()); + 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(), ' ')).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()); + string sechex = fields[4]; + string sdata = fields[5]; + int ssize = fields[4].length(); + if (size < 40) + { + if (size > 0) + cwarn << "Invalid address length: " << size; + } + else if (amount < 0) + cwarn << "Invalid amount: " << amount; + else if (gasPrice < c_minGasPrice) + cwarn << "Minimum gas price is " << c_minGasPrice; + else if (gas < c_minGas) + cwarn << "Minimum gas amount is " << c_minGas; + else if (ssize < 40) + { + if (ssize > 0) + cwarn << "Invalid secret length:" << ssize; + } + else + { + Secret secret = h256(fromHex(sechex)); + Address dest = h160(fromHex(fields[0])); + bytes data = asBytes(sdata); + c.transact(secret, amount, dest, data, gas, gasPrice); + } + } + } + else if (cmd == "send") + { + vector s; + s.push_back("Address"); + vector l; + l.push_back("Amount"); + vector b; + c.lock(); + vector fields = form_dialog(s, l, b, height, width, cmd); + c.unlock(); + int fs = fields.size(); + if (fs < 2) + { + if (fs > 0) + cwarn << "Missing parameter"; + } + else + { + 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()); + if (size < 40) + { + if (size > 0) + cwarn << "Invalid address length: " << size; + } + else if (amount <= 0) + cwarn << "Invalid amount: " << amount; + else + { + u256 gasPrice = c_minGasPrice; + u256 gas = c_minGas; + Address dest = h160(fromHex(fields[0])); + c.transact(us.secret(), amount, dest, bytes(), gas, gasPrice); + } + } + } + else if (cmd == "contract") + { + vector s; + vector l; + l.push_back("Endowment"); + l.push_back("Gas price"); + l.push_back("Gas"); + vector b; + b.push_back("Code"); + b.push_back("Init"); + c.lock(); + vector fields = form_dialog(s, l, b, height, width, cmd); + c.unlock(); + int fs = fields.size(); + if (fs < 5) + { + if (fs > 0) + cwarn << "Missing parameter"; + } + else + { + u256 endowment = atoll(fields[0].c_str()); + u256 gas = atoll(fields[2].c_str()); + u256 gasPrice = atoll(fields[1].c_str()); + if (endowment < 0) + cwarn << "Invalid endowment"; + else if (gasPrice < c_minGasPrice) + cwarn << "Minimum gas price is " << c_minGasPrice; + else if (gas < c_minGas) + cwarn << "Minimum gas amount is " << c_minGas; + else + { + fields[3].erase(std::find_if(fields[3].rbegin(), fields[3].rend(), std::bind1st(std::not_equal_to(), ' ')).base(), fields[3].end()); + fields[4].erase(std::find_if(fields[4].rbegin(), fields[4].rend(), std::bind1st(std::not_equal_to(), ' ')).base(), fields[4].end()); + string scode = fields[3]; + string sinit = fields[4]; + int size = scode.length(); + cout << "Code:" << endl << scode << endl; + cout << "Init:" << endl << sinit << endl; + cout << "Code size: " << size << endl; + if (size < 1) + cwarn << "No code submitted"; + else + { + eth::bytes code = assemble(scode); + cout << "Assembled:" << endl << code << endl; + eth::bytes init = assemble(sinit); + cout << "Init:" << endl << init << endl; + c.transact(us.secret(), endowment, code, init, gas, gasPrice); + } + } + } + } + else if (cmd == "inspect") + { + string rechex; + iss >> rechex; + + if (rechex.length() != 40) + cwarn << "Invalid address length"; + else + { + c.lock(); + auto h = h160(fromHex(rechex)); + + stringstream s; + auto mem = c.state().contractStorage(h); + u256 next = 0; + unsigned numerics = 0; + bool unexpectedNumeric = false; + for (auto const& i: mem) + { + if (next < i.first) + { + unsigned j; + for (j = 0; j <= numerics && next + j < i.first; ++j) + s << (j < numerics || unexpectedNumeric ? " 0" : " STOP"); + unexpectedNumeric = false; + numerics -= min(numerics, j); + if (next + j < i.first) + s << "\n@" << showbase << hex << i.first << " "; + } + else if (!next) + s << "@" << showbase << hex << i.first << " "; + auto iit = c_instructionInfo.find((Instruction)(unsigned)i.second); + if (numerics || iit == c_instructionInfo.end() || (u256)(unsigned)iit->first != i.second) // not an instruction or expecting an argument... + { + if (numerics) + numerics--; + else + unexpectedNumeric = true; + s << " " << showbase << hex << i.second; + } + else + { + auto const& ii = iit->second; + s << " " << ii.name; + numerics = ii.additional; + } + next = i.first + 1; + } + + string outFile = getDataDir() + "/" + rechex + ".evm"; + ofstream ofs; + ofs.open(outFile, ofstream::binary); + ofs.write(s.str().c_str(), s.str().length()); + ofs.close(); + + c.unlock(); + } + } + else if (cmd == "help") + interactiveHelp(); + else if (cmd == "exit") + break; + + // Clear cmd at each pass + cmd = ""; + + + // Blocks + auto const& st = c.state(); + auto const& bc = c.blockChain(); + y = 1; + for (auto h = bc.currentHash(); h != bc.genesisHash(); h = bc.details(h).parent) + { + auto d = bc.details(h); + string s = "# " + std::to_string(d.number) + ' ' + toString(h); // .abridged(); + mvwaddnstr(blockswin, y++, x, s.c_str(), qwidth); + + for (auto const& i: RLP(bc.block(h))[1]) + { + Transaction t(i.data()); + string ss; + ss = t.receiveAddress ? + " " + toString(toHex(t.safeSender().asArray())) + " " + (st.isContractAddress(t.receiveAddress) ? '*' : '-') + "> " + toString(t.receiveAddress) + ": " + toString(formatBalance(t.value)) + " [" + toString((unsigned)t.nonce) + "]": + " " + toString(toHex(t.safeSender().asArray())) + " +> " + toString(right160(t.sha3())) + ": " + toString(formatBalance(t.value)) + " [" + toString((unsigned)t.nonce) + "]"; + mvwaddnstr(blockswin, y++, x, ss.c_str(), qwidth - 2); + if (y > qheight - 2) + break; + } + if (y > qheight - 2) + break; + } + + + // Pending + y = 1; + auto aps = c.pending(); + for (auto const& t: aps) + { + string ss; + if (t.receiveAddress) + ss = toString(toHex(t.safeSender().asArray())) + " " + (st.isContractAddress(t.receiveAddress) ? '*' : '-') + "> " + toString(t.receiveAddress) + ": " + toString(formatBalance(t.value)) + " " + " [" + toString((unsigned)t.nonce) + "]"; + else + ss = toString(toHex(t.safeSender().asArray())) + " +> " + toString(right160(t.sha3())) + ": " + toString(formatBalance(t.value)) + "[" + toString((unsigned)t.nonce) + "]"; + mvwaddnstr(pendingwin, y++, x, ss.c_str(), qwidth); + if (y > qheight - 4) + break; + } + + + // Contracts and addresses + y = 1; + int cc = 1; + auto acs = st.addresses(); + for (auto const& i: acs) + { + auto r = i.first; + + string ss; + ss = toString(r) + pretty(r, st) + " : " + toString(formatBalance(i.second)) + " [" + toString((unsigned)st.transactionsFrom(i.first)) + "]"; + mvwaddnstr(addswin, y++, x, ss.c_str(), width / 2 - 4); + scrollok(addswin, true); + + if (st.isContractAddress(r)) + { + ss = toString(r) + " : " + toString(formatBalance(i.second)) + " [" + toString((unsigned)st.transactionsFrom(i.first)) + "]"; + mvwaddnstr(contractswin, cc++, x, ss.c_str(), qwidth); + if (cc > qheight - 2) + break; + } + if (y > height * 2 / 5 - 2) + break; + } + + // Peers + y = 1; + string psc; + string pss; + auto cp = c.peers(); + psc = toString(cp.size()) + " peer(s)"; + for (PeerInfo const& i: cp) + { + pss = toString(chrono::duration_cast(i.lastPing).count()) + " ms - " + i.host + ":" + toString(i.port) + " - " + i.clientVersion; + mvwaddnstr(peerswin, y++, x, pss.c_str(), qwidth); + if (y > height * 2 / 5 - 4) + break; + } + + box(consolewin, 0, 0); + box(blockswin, 0, 0); + box(pendingwin, 0, 0); + box(peerswin, 0, 0); + box(addswin, 0, 0); + box(contractswin, 0, 0); + box(mainwin, 0, 0); + + // Balance + stringstream ssb; + u256 balance = c.state().balance(us.address()); + Address gavCoin("91a10664d0cd489085a7a018beb5245d4f2272f1"); + u256 totalGavCoinBalance = st.contractStorage(gavCoin, (u160)us.address()); + ssb << "Balance: " << formatBalance(balance) << " | " << totalGavCoinBalance << " GAV"; + mvwprintw(consolewin, 0, x, ssb.str().c_str()); + + // Block + mvwprintw(blockswin, 0, x, "Block # "); + eth::uint n = c.blockChain().details().number; + chr = toString(n).c_str(); + mvwprintw(blockswin, 0, 10, chr); + + // Pending + string pc; + pc = "Pending: " + toString(c.pending().size()); + mvwprintw(pendingwin, 0, x, pc.c_str()); + + // Contracts + string sc = "Contracts: "; + sc += toString(cc - 1); + mvwprintw(contractswin, 0, x, sc.c_str()); + + // Peers + mvwprintw(peerswin, 0, x, "Peers: "); + chr = toString(c.peers().size()).c_str(); + mvwprintw(peerswin, 0, 9, chr); + + // Mining flag + if (c.isMining()) + mvwprintw(consolewin, qheight - 1, width / 4 - 11, "Mining ON"); + else + mvwprintw(consolewin, qheight - 1, width / 4 - 12, "Mining OFF"); + + wmove(consolewin, 1, x); + + // Addresses + string ac; + ac = "Addresses: " + toString(acs.size()); + mvwprintw(addswin, 0, x, ac.c_str()); + + + wrefresh(consolewin); + wrefresh(blockswin); + wrefresh(pendingwin); + wrefresh(peerswin); + wrefresh(addswin); + wrefresh(contractswin); + wrefresh(mainwin); + } + + delwin(addswin); + delwin(contractswin); + delwin(peerswin); + delwin(pendingwin); + delwin(blockswin); + delwin(consolewin); + delwin(logwin); + delwin(mainwin); + endwin(); + refresh(); + } + else + { + cout << "Address: " << endl << toHex(us.address().asArray()) << endl; + c.startNetwork(listenPort, remoteHost, remotePort, mode, peers, publicIP, upnp); + eth::uint n = c.blockChain().details().number; + if (mining) + c.startMining(); + while (true) + { + if (c.blockChain().details().number - n == mining) + c.stopMining(); + this_thread::sleep_for(chrono::milliseconds(100)); + } + } + + + return 0; +} + +void print_in_middle(WINDOW *win, int starty, int startx, int width, string str, chtype color) +{ + int length; + int x = 0; + int y = 0; + float temp; + + if (startx != 0) + x = startx; + if (starty != 0) + y = starty; + if (width == 0) + width = 80; + + length = str.length(); + temp = (width - length) / 2; + x = startx + (int)temp; + wattron(win, color); + mvwprintw(win, y, x, "%s", str.c_str()); + wattroff(win, color); + refresh(); +} + +vector form_dialog(vector _sv, vector _lv, vector _bv, int _cols, int _rows, string _post_form) +{ + vector vs; + WINDOW *form_win; + int _sfields = _sv.size(); + int _lfields = _lv.size(); + int _bfields = _bv.size(); + int maxfields = _sfields + _lfields + _bfields; + FIELD *field[maxfields]; + int ch; + int starty = 6; + int height = _cols; + int width = _rows; + + // Initialize the fields + int si; + int li; + int bi = 0; + vector labels; + for (si = 0; si < _sfields; ++si) + { + starty++; // Leave room for our labels, no window yet so that or fake fields... + field[si] = new_field(1, 40, starty++, 1, 0, 0); + labels.push_back(starty); + set_field_back(field[si], A_UNDERLINE); + set_field_type(field[si], TYPE_ALNUM, 40); + } + for (li = _sfields; li < _sfields + _lfields; ++li) + { + starty++; + field[li] = new_field(1, 64, starty++, 1, 3, 0); + labels.push_back(starty); + set_field_back(field[li], A_UNDERLINE); + } + for (bi = _sfields + _lfields; bi < maxfields; ++bi) + { + starty++; + field[bi] = new_field(5, 72, starty++, 1, 0, 0); + labels.push_back(starty); + field_opts_off(field[bi], O_STATIC); + set_field_back(field[bi], A_UNDERLINE); + starty += 4; + } + field[maxfields] = NULL; + + // Create the form and post it + FORM *form = new_form(field); + + // Calculate the area required for the form + scale_form(form, &_rows, &_cols); + + // Create the window to be associated with the form + form_win = newwin(_rows + 4, _cols + 8, (height / 2 - _rows / 2 - 2), (width / 2 - _cols / 2 - 2)); + + // Set main window and sub window + set_form_win(form, form_win); + set_form_sub(form, derwin(form_win, _rows, _cols, 2, 2)); + + nodelay(form_win, true); + keypad(form_win, true); + noecho(); + timeout(0); + + box(form_win, 0, 0); + print_in_middle(form_win, 1, 0, _cols, _post_form, COLOR_PAIR(2)); + + post_form(form); + + // Set labels + int ca = 0; + int cf; + for (cf = 0; cf < _sfields; ++cf) + { + wattron(form_win, COLOR_PAIR(3)); + mvwprintw(form_win, labels[ca], 3, _sv[cf].c_str()); + wattroff(form_win, COLOR_PAIR(3)); + ca++; + } + for (cf = 0; cf < _lfields; ++cf) + { + wattron(form_win, COLOR_PAIR(3)); + mvwprintw(form_win, labels[ca], 3, _lv[cf].c_str()); + mvwprintw(form_win, labels[ca] + 1, _cols - 1, "wei"); + wattroff(form_win, COLOR_PAIR(3)); + ca++; + } + for (cf = 0; cf < _bfields; ++cf) + { + wattron(form_win, COLOR_PAIR(3)); + mvwprintw(form_win, labels[ca], 3, _bv[cf].c_str()); + wattroff(form_win, COLOR_PAIR(3)); + ca++; + } + + wrefresh(form_win); + + print_in_middle(form_win, 3, 0, _cols, string("Use the TAB key to switch between fields."), COLOR_PAIR(1)); + print_in_middle(form_win, 4, 0, _cols, string("Use UP, DOWN arrow keys to switch between lines."), COLOR_PAIR(1)); + print_in_middle(form_win, 6, 0, _cols, string("Press ENTER to submit the form and ESC to cancel."), COLOR_PAIR(1)); + refresh(); + + while ((ch = wgetch(form_win)) != 27 && ch != 13) // KEY_F(1)) + { + switch (ch) + { + case 9: // Tab + form_driver(form, REQ_NEXT_FIELD); + form_driver(form, REQ_END_LINE); + break; + case KEY_DOWN: + form_driver(form, REQ_NEXT_LINE); + break; + case KEY_UP: + form_driver(form, REQ_PREV_LINE); + break; + case KEY_LEFT: + form_driver(form, REQ_LEFT_CHAR); + break; + case KEY_RIGHT: + form_driver(form, REQ_RIGHT_CHAR); + break; + case KEY_BACKSPACE: // Backspace + case KEY_DC: + case KEY_DL: + case 127: + form_driver(form, REQ_DEL_PREV); + wrefresh(form_win); + break; + case KEY_ENTER: // Enter + case 13: + case 27: // Esc + break; + default: + form_driver(form, ch); + break; + } + } + + if (form_driver(form, REQ_VALIDATION) != E_OK) + cwarn << "Validation error"; + + int fi; + for (fi = 0; fi < maxfields; ++fi) + free_field(field[fi]); + free_form(form); + unpost_form(form); + echo(); + timeout(30000); + delwin(form_win); + + if (ch == 13) + for (int fi = 0; fi < maxfields; ++fi) + vs.push_back(field_buffer(field[fi], 0)); + + return vs; +} diff --git a/eth/CMakeLists.txt b/eth/CMakeLists.txt index 54f26ccee..6eea3b053 100644 --- a/eth/CMakeLists.txt +++ b/eth/CMakeLists.txt @@ -16,20 +16,17 @@ if (${TARGET_PLATFORM} STREQUAL "w64") target_link_libraries(eth shlwapi) target_link_libraries(eth iphlpapi) target_link_libraries(eth cryptopp) - target_link_libraries(eth ncurses) target_link_libraries(eth form) target_link_libraries(eth boost_system-mt-s) target_link_libraries(eth boost_filesystem-mt-s) target_link_libraries(eth boost_thread_win32-mt-s) set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS) elseif (UNIX) - target_link_libraries(eth ncurses) target_link_libraries(eth form) else () target_link_libraries(eth ${CRYPTOPP_LIBRARIES}) target_link_libraries(eth boost_system) target_link_libraries(eth boost_filesystem) - target_link_libraries(eth ncurses) target_link_libraries(eth form) find_package(Threads REQUIRED) target_link_libraries(eth ${CMAKE_THREAD_LIBS_INIT}) diff --git a/eth/main.cpp b/eth/main.cpp index e1eba9f44..cd58726a2 100644 --- a/eth/main.cpp +++ b/eth/main.cpp @@ -20,10 +20,6 @@ * Ethereum client. */ -#include -#undef OK -#include -#undef OK #include #include #include @@ -76,27 +72,6 @@ void help() exit(0); } -void interactiveHelp() -{ - cout - << "Commands:" << 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 - << " address Gives the current address." << endl - << " secret Gives the current secret" << endl - << " block Gives the current block height." << endl - << " balance Gives the current balance." << endl - << " peers List the peers that are connected" << endl - << " 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 Dumps a contract to /.evm." << endl - << " exit Exits the application." << endl; -} - string credits(bool _interactive = false) { std::ostringstream ccout; @@ -149,142 +124,11 @@ string pretty(h160 _a, eth::State _st) return ns; } -namespace nc -{ - -class nc_window_streambuf: public std::streambuf -{ -public: - nc_window_streambuf(WINDOW* p, std::ostream& os, unsigned long cursesAttr = 0); - nc_window_streambuf(WINDOW* p, unsigned long _cursesAttr = 0); - nc_window_streambuf(nc_window_streambuf const& _rhs); - virtual ~nc_window_streambuf(); - - nc_window_streambuf& operator=(nc_window_streambuf const& _rhs); - - virtual int overflow(int c); - virtual int sync(); - -private: - void copy(nc_window_streambuf const& _rhs); - - WINDOW* m_pnl; - unsigned long m_flags; - std::ostream* m_os; - std::streambuf* m_old; -}; - -nc_window_streambuf::nc_window_streambuf(WINDOW * p, unsigned long _cursesAttr): - m_pnl(p), - m_flags(_cursesAttr), - m_os(0), - m_old(0) -{ - // Tell parent class that we want to call overflow() for each - // input char: - setp(0, 0); - setg(0, 0, 0); - scrollok(p, true); - mvwinch(p, 0, 0); -} - -nc_window_streambuf::nc_window_streambuf(WINDOW* _p, std::ostream& _os, unsigned long _cursesAttr): - m_pnl(_p), - m_flags(_cursesAttr), - m_os(&_os), - m_old(_os.rdbuf()) -{ - setp(0, 0); - setg(0, 0, 0); - _os.rdbuf(this); - scrollok(_p, true); - mvwinch(_p, 0, 0); -} - -void nc_window_streambuf::copy(nc_window_streambuf const& _rhs) -{ - if (this != &_rhs) - { - m_pnl = _rhs.m_pnl; - m_flags = _rhs.m_flags; - m_os = _rhs.m_os; - m_old = _rhs.m_old; - } -} - -nc_window_streambuf::nc_window_streambuf(nc_window_streambuf const& _rhs): - std::streambuf() -{ - copy(_rhs); -} - -nc_window_streambuf& nc_window_streambuf::operator=(nc_window_streambuf const& _rhs) -{ - copy(_rhs); - return *this; -} - -nc_window_streambuf::~nc_window_streambuf() -{ - if (m_os) - m_os->rdbuf(m_old); -} - -int nc_window_streambuf::overflow(int c) -{ - int ret = c; - if (c != EOF) - { - int x = 0; - int y = 0; - int mx = 0; - int my = 0; - getyx(m_pnl, y, x); - getmaxyx(m_pnl, my, mx); - (void)my; - if (y < 1) - y = 1; - if (x < 2) - x = 2; - if (x > mx - 4) - { - y++; - x = 2; - } - if (m_flags) - { - wattron(m_pnl, m_flags); - if (mvwaddch(m_pnl, y, x++, (chtype)c) == ERR) - ret = EOF; - wattroff(m_pnl, m_flags); - } - else if (mvwaddch(m_pnl, y, x++, (chtype)c) == ERR) - ret = EOF; - } - if (c == EOF) // || std::isspace(c) - if (sync() == EOF) - ret = EOF; - return ret; -} - -int nc_window_streambuf::sync() -{ - if (stdscr && m_pnl) - return (wrefresh(m_pnl) == ERR) ? EOF : 0; - return EOF; -} - -} - -vector form_dialog(vector _sfields, vector _lfields, vector _bfields, int _cols, int _rows, string _post_form); - - int main(int argc, char** argv) { unsigned short listenPort = 30303; string remoteHost; unsigned short remotePort = 30303; - bool interactive = false; string dbPath; eth::uint mining = ~(eth::uint)0; NodeMode mode = NodeMode::Full; @@ -345,8 +189,6 @@ int main(int argc, char** argv) coinbase = h160(fromHex(argv[++i])); else if ((arg == "-s" || arg == "--secret") && i + 1 < argc) us = KeyPair(h256(fromHex(argv[++i]))); - else if (arg == "-i" || arg == "--interactive") - interactive = true; else if ((arg == "-d" || arg == "--path" || arg == "--db-path") && i + 1 < argc) dbPath = argv[++i]; else if ((arg == "-m" || arg == "--mining") && i + 1 < argc) @@ -394,716 +236,17 @@ int main(int argc, char** argv) Client c("Ethereum(++)/" + clientName + "v" ETH_QUOTED(ETH_VERSION) "/" ETH_QUOTED(ETH_BUILD_TYPE) "/" ETH_QUOTED(ETH_BUILD_PLATFORM), coinbase, dbPath); cout << credits(); - if (interactive) - { - std::ostringstream ccout; - - // Initialize ncurses - const char* chr; - char* str = new char[255]; - int width; - int height; - int y = 0; - int x = 2; - string cmd; - WINDOW * mainwin, * consolewin, * logwin, * blockswin, * pendingwin, *addswin, * contractswin, * peerswin; - - if (!(mainwin = initscr())) - { - cerr << "Error initialising ncurses."; - return -1; - } - - getmaxyx(mainwin, height, width); - int qheight = height * 3 / 5; - int qwidth = width / 4 - 4; - - nonl(); - cbreak(); - timeout(30000); - echo(); - keypad(mainwin, true); - - // Initialize color pairs - start_color(); - init_pair(1, COLOR_WHITE, COLOR_BLACK); - init_pair(2, COLOR_RED, COLOR_BLACK); - init_pair(3, 7, COLOR_BLACK); - use_default_colors(); - - logwin = newwin(height * 2 / 5 - 2, width * 2 / 3, qheight, 0); - nc::nc_window_streambuf outbuf(logwin, std::cout); - g_logVerbosity = 1; // Force verbosity level for now - - consolewin = newwin(qheight, width / 4, 0, 0); - nc::nc_window_streambuf coutbuf(consolewin, ccout); - blockswin = newwin(qheight, width / 4, 0, width / 4); - pendingwin = newwin(height * 1 / 5, width / 4, 0, width * 2 / 4); - peerswin = newwin(height * 2 / 5, width / 4, height * 1 / 5, width * 2 / 4); - addswin = newwin(height * 2 / 5 - 2, width / 3, qheight, width * 2 / 3); - contractswin = newwin(qheight, width / 4, 0, width * 3 / 4); - - int vl = qheight - 4; - wsetscrreg(consolewin, 1, vl); - wsetscrreg(blockswin, 1, vl); - wsetscrreg(pendingwin, 1, vl); - wsetscrreg(peerswin, 1, vl); - wsetscrreg(addswin, 1, vl); - wsetscrreg(contractswin, 1, vl); - - mvwprintw(mainwin, 1, 1, " > "); - wresize(mainwin, 3, width); - mvwin(mainwin, height - 3, 0); - - wmove(mainwin, 1, 4); - - if (!remoteHost.empty()) - c.startNetwork(listenPort, remoteHost, remotePort, mode, peers, publicIP, upnp); - - while (true) - { - wclrtobot(consolewin); - wclrtobot(pendingwin); - wclrtobot(peerswin); - wclrtobot(addswin); - wclrtobot(contractswin); - - ccout << credits(true); - - // Prompt - wmove(mainwin, 1, 4); - getstr(str); - - string s(str); - istringstream iss(s); - iss >> cmd; - - // Address - ccout << "Address:" << endl; - chr = toHex(us.address().asArray()).c_str(); - ccout << chr << endl << endl; - - mvwprintw(mainwin, 1, 1, " > "); - clrtoeol(); - - if (s.length() > 1) - { - ccout << "> "; - ccout << str << endl; - } - - if (cmd == "netstart") - { - eth::uint port; - iss >> port; - c.startNetwork((short)port); - } - else if (cmd == "connect") - { - string addr; - eth::uint port; - iss >> addr >> port; - c.connect(addr, (short)port); - } - else if (cmd == "netstop") - c.stopNetwork(); - else if (cmd == "minestart") - c.startMining(); - else if (cmd == "minestop") - c.stopMining(); - else if (cmd == "address") - { - ccout << "Current address:" << endl; - const char* addchr = toHex(us.address().asArray()).c_str(); - ccout << addchr << endl; - } - else if (cmd == "secret") - { - ccout << "Current secret:" << endl; - const char* addchr = toHex(us.secret().asArray()).c_str(); - ccout << addchr << endl; - } - else if (cmd == "block") - { - eth::uint n = c.blockChain().details().number; - ccout << "Current block # "; - const char* addchr = toString(n).c_str(); - ccout << addchr << endl; - } - else if (cmd == "peers") - { - for (auto it: c.peers()) - cout << it.host << ":" << it.port << ", " << it.clientVersion << ", " - << std::chrono::duration_cast(it.lastPing).count() << "ms" - << endl; - } - else if (cmd == "balance") - { - u256 balance = c.state().balance(us.address()); - ccout << "Current balance:" << endl; - const char* addchr = toString(balance).c_str(); - ccout << addchr << endl; - } - else if (cmd == "transact") - { - vector s; - s.push_back("Address"); - vector l; - l.push_back("Amount"); - l.push_back("Gas price"); - l.push_back("Gas"); - vector b; - b.push_back("Secret"); - b.push_back("Data"); - c.lock(); - vector fields = form_dialog(s, l, b, height, width, cmd); - c.unlock(); - int fs = fields.size(); - if (fs < 6) - { - if (fs > 0) - cwarn << "Missing parameter"; - } - else - { - fields[0].erase(std::remove(fields[0].begin(), fields[0].end(), ' '), fields[0].end()); - 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(), ' ')).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()); - string sechex = fields[4]; - string sdata = fields[5]; - int ssize = fields[4].length(); - if (size < 40) - { - if (size > 0) - cwarn << "Invalid address length: " << size; - } - else if (amount < 0) - cwarn << "Invalid amount: " << amount; - else if (gasPrice < c_minGasPrice) - cwarn << "Minimum gas price is " << c_minGasPrice; - else if (gas < c_minGas) - cwarn << "Minimum gas amount is " << c_minGas; - else if (ssize < 40) - { - if (ssize > 0) - cwarn << "Invalid secret length:" << ssize; - } - else - { - Secret secret = h256(fromHex(sechex)); - Address dest = h160(fromHex(fields[0])); - bytes data = asBytes(sdata); - c.transact(secret, amount, dest, data, gas, gasPrice); - } - } - } - else if (cmd == "send") - { - vector s; - s.push_back("Address"); - vector l; - l.push_back("Amount"); - vector b; - c.lock(); - vector fields = form_dialog(s, l, b, height, width, cmd); - c.unlock(); - int fs = fields.size(); - if (fs < 2) - { - if (fs > 0) - cwarn << "Missing parameter"; - } - else - { - 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()); - if (size < 40) - { - if (size > 0) - cwarn << "Invalid address length: " << size; - } - else if (amount <= 0) - cwarn << "Invalid amount: " << amount; - else - { - u256 gasPrice = c_minGasPrice; - u256 gas = c_minGas; - Address dest = h160(fromHex(fields[0])); - c.transact(us.secret(), amount, dest, bytes(), gas, gasPrice); - } - } - } - else if (cmd == "contract") - { - vector s; - vector l; - l.push_back("Endowment"); - l.push_back("Gas price"); - l.push_back("Gas"); - vector b; - b.push_back("Code"); - b.push_back("Init"); - c.lock(); - vector fields = form_dialog(s, l, b, height, width, cmd); - c.unlock(); - int fs = fields.size(); - if (fs < 5) - { - if (fs > 0) - cwarn << "Missing parameter"; - } - else - { - u256 endowment = atoll(fields[0].c_str()); - u256 gas = atoll(fields[2].c_str()); - u256 gasPrice = atoll(fields[1].c_str()); - if (endowment < 0) - cwarn << "Invalid endowment"; - else if (gasPrice < c_minGasPrice) - cwarn << "Minimum gas price is " << c_minGasPrice; - else if (gas < c_minGas) - cwarn << "Minimum gas amount is " << c_minGas; - else - { - fields[3].erase(std::find_if(fields[3].rbegin(), fields[3].rend(), std::bind1st(std::not_equal_to(), ' ')).base(), fields[3].end()); - fields[4].erase(std::find_if(fields[4].rbegin(), fields[4].rend(), std::bind1st(std::not_equal_to(), ' ')).base(), fields[4].end()); - string scode = fields[3]; - string sinit = fields[4]; - int size = scode.length(); - cout << "Code:" << endl << scode << endl; - cout << "Init:" << endl << sinit << endl; - cout << "Code size: " << size << endl; - if (size < 1) - cwarn << "No code submitted"; - else - { - eth::bytes code = assemble(scode); - cout << "Assembled:" << endl << code << endl; - eth::bytes init = assemble(sinit); - cout << "Init:" << endl << init << endl; - c.transact(us.secret(), endowment, code, init, gas, gasPrice); - } - } - } - } - else if (cmd == "inspect") - { - string rechex; - iss >> rechex; - - if (rechex.length() != 40) - cwarn << "Invalid address length"; - else - { - c.lock(); - auto h = h160(fromHex(rechex)); - - stringstream s; - auto mem = c.state().contractStorage(h); - u256 next = 0; - unsigned numerics = 0; - bool unexpectedNumeric = false; - for (auto const& i: mem) - { - if (next < i.first) - { - unsigned j; - for (j = 0; j <= numerics && next + j < i.first; ++j) - s << (j < numerics || unexpectedNumeric ? " 0" : " STOP"); - unexpectedNumeric = false; - numerics -= min(numerics, j); - if (next + j < i.first) - s << "\n@" << showbase << hex << i.first << " "; - } - else if (!next) - s << "@" << showbase << hex << i.first << " "; - auto iit = c_instructionInfo.find((Instruction)(unsigned)i.second); - if (numerics || iit == c_instructionInfo.end() || (u256)(unsigned)iit->first != i.second) // not an instruction or expecting an argument... - { - if (numerics) - numerics--; - else - unexpectedNumeric = true; - s << " " << showbase << hex << i.second; - } - else - { - auto const& ii = iit->second; - s << " " << ii.name; - numerics = ii.additional; - } - next = i.first + 1; - } - - string outFile = getDataDir() + "/" + rechex + ".evm"; - ofstream ofs; - ofs.open(outFile, ofstream::binary); - ofs.write(s.str().c_str(), s.str().length()); - ofs.close(); - - c.unlock(); - } - } - else if (cmd == "help") - interactiveHelp(); - else if (cmd == "exit") - break; - - // Clear cmd at each pass - cmd = ""; - - - // Blocks - auto const& st = c.state(); - auto const& bc = c.blockChain(); - y = 1; - for (auto h = bc.currentHash(); h != bc.genesisHash(); h = bc.details(h).parent) - { - auto d = bc.details(h); - string s = "# " + std::to_string(d.number) + ' ' + toString(h); // .abridged(); - mvwaddnstr(blockswin, y++, x, s.c_str(), qwidth); - - for (auto const& i: RLP(bc.block(h))[1]) - { - Transaction t(i.data()); - string ss; - ss = t.receiveAddress ? - " " + toString(toHex(t.safeSender().asArray())) + " " + (st.isContractAddress(t.receiveAddress) ? '*' : '-') + "> " + toString(t.receiveAddress) + ": " + toString(formatBalance(t.value)) + " [" + toString((unsigned)t.nonce) + "]": - " " + toString(toHex(t.safeSender().asArray())) + " +> " + toString(right160(t.sha3())) + ": " + toString(formatBalance(t.value)) + " [" + toString((unsigned)t.nonce) + "]"; - mvwaddnstr(blockswin, y++, x, ss.c_str(), qwidth - 2); - if (y > qheight - 2) - break; - } - if (y > qheight - 2) - break; - } - - - // Pending - y = 1; - auto aps = c.pending(); - for (auto const& t: aps) - { - string ss; - if (t.receiveAddress) - ss = toString(toHex(t.safeSender().asArray())) + " " + (st.isContractAddress(t.receiveAddress) ? '*' : '-') + "> " + toString(t.receiveAddress) + ": " + toString(formatBalance(t.value)) + " " + " [" + toString((unsigned)t.nonce) + "]"; - else - ss = toString(toHex(t.safeSender().asArray())) + " +> " + toString(right160(t.sha3())) + ": " + toString(formatBalance(t.value)) + "[" + toString((unsigned)t.nonce) + "]"; - mvwaddnstr(pendingwin, y++, x, ss.c_str(), qwidth); - if (y > qheight - 4) - break; - } - - - // Contracts and addresses - y = 1; - int cc = 1; - auto acs = st.addresses(); - for (auto const& i: acs) - { - auto r = i.first; - - string ss; - ss = toString(r) + pretty(r, st) + " : " + toString(formatBalance(i.second)) + " [" + toString((unsigned)st.transactionsFrom(i.first)) + "]"; - mvwaddnstr(addswin, y++, x, ss.c_str(), width / 2 - 4); - scrollok(addswin, true); - - if (st.isContractAddress(r)) - { - ss = toString(r) + " : " + toString(formatBalance(i.second)) + " [" + toString((unsigned)st.transactionsFrom(i.first)) + "]"; - mvwaddnstr(contractswin, cc++, x, ss.c_str(), qwidth); - if (cc > qheight - 2) - break; - } - if (y > height * 2 / 5 - 2) - break; - } - - // Peers - y = 1; - string psc; - string pss; - auto cp = c.peers(); - psc = toString(cp.size()) + " peer(s)"; - for (PeerInfo const& i: cp) - { - pss = toString(chrono::duration_cast(i.lastPing).count()) + " ms - " + i.host + ":" + toString(i.port) + " - " + i.clientVersion; - mvwaddnstr(peerswin, y++, x, pss.c_str(), qwidth); - if (y > height * 2 / 5 - 4) - break; - } - - box(consolewin, 0, 0); - box(blockswin, 0, 0); - box(pendingwin, 0, 0); - box(peerswin, 0, 0); - box(addswin, 0, 0); - box(contractswin, 0, 0); - box(mainwin, 0, 0); - - // Balance - stringstream ssb; - u256 balance = c.state().balance(us.address()); - Address gavCoin("91a10664d0cd489085a7a018beb5245d4f2272f1"); - u256 totalGavCoinBalance = st.contractStorage(gavCoin, (u160)us.address()); - ssb << "Balance: " << formatBalance(balance) << " | " << totalGavCoinBalance << " GAV"; - mvwprintw(consolewin, 0, x, ssb.str().c_str()); - - // Block - mvwprintw(blockswin, 0, x, "Block # "); - eth::uint n = c.blockChain().details().number; - chr = toString(n).c_str(); - mvwprintw(blockswin, 0, 10, chr); - - // Pending - string pc; - pc = "Pending: " + toString(c.pending().size()); - mvwprintw(pendingwin, 0, x, pc.c_str()); - - // Contracts - string sc = "Contracts: "; - sc += toString(cc - 1); - mvwprintw(contractswin, 0, x, sc.c_str()); - - // Peers - mvwprintw(peerswin, 0, x, "Peers: "); - chr = toString(c.peers().size()).c_str(); - mvwprintw(peerswin, 0, 9, chr); - - // Mining flag - if (c.isMining()) - mvwprintw(consolewin, qheight - 1, width / 4 - 11, "Mining ON"); - else - mvwprintw(consolewin, qheight - 1, width / 4 - 12, "Mining OFF"); - - wmove(consolewin, 1, x); - - // Addresses - string ac; - ac = "Addresses: " + toString(acs.size()); - mvwprintw(addswin, 0, x, ac.c_str()); - - - wrefresh(consolewin); - wrefresh(blockswin); - wrefresh(pendingwin); - wrefresh(peerswin); - wrefresh(addswin); - wrefresh(contractswin); - wrefresh(mainwin); - } - - delwin(addswin); - delwin(contractswin); - delwin(peerswin); - delwin(pendingwin); - delwin(blockswin); - delwin(consolewin); - delwin(logwin); - delwin(mainwin); - endwin(); - refresh(); - } - else + cout << "Address: " << endl << toHex(us.address().asArray()) << endl; + c.startNetwork(listenPort, remoteHost, remotePort, mode, peers, publicIP, upnp); + eth::uint n = c.blockChain().details().number; + if (mining) + c.startMining(); + while (true) { - cout << "Address: " << endl << toHex(us.address().asArray()) << endl; - c.startNetwork(listenPort, remoteHost, remotePort, mode, peers, publicIP, upnp); - eth::uint n = c.blockChain().details().number; - if (mining) - c.startMining(); - while (true) - { - if (c.blockChain().details().number - n == mining) - c.stopMining(); - this_thread::sleep_for(chrono::milliseconds(100)); - } + if (c.blockChain().details().number - n == mining) + c.stopMining(); + this_thread::sleep_for(chrono::milliseconds(100)); } - return 0; } - -void print_in_middle(WINDOW *win, int starty, int startx, int width, string str, chtype color) -{ - int length; - int x = 0; - int y = 0; - float temp; - - if (startx != 0) - x = startx; - if (starty != 0) - y = starty; - if (width == 0) - width = 80; - - length = str.length(); - temp = (width - length) / 2; - x = startx + (int)temp; - wattron(win, color); - mvwprintw(win, y, x, "%s", str.c_str()); - wattroff(win, color); - refresh(); -} - -vector form_dialog(vector _sv, vector _lv, vector _bv, int _cols, int _rows, string _post_form) -{ - vector vs; - WINDOW *form_win; - int _sfields = _sv.size(); - int _lfields = _lv.size(); - int _bfields = _bv.size(); - int maxfields = _sfields + _lfields + _bfields; - FIELD *field[maxfields]; - int ch; - int starty = 6; - int height = _cols; - int width = _rows; - - // Initialize the fields - int si; - int li; - int bi = 0; - vector labels; - for (si = 0; si < _sfields; ++si) - { - starty++; // Leave room for our labels, no window yet so that or fake fields... - field[si] = new_field(1, 40, starty++, 1, 0, 0); - labels.push_back(starty); - set_field_back(field[si], A_UNDERLINE); - set_field_type(field[si], TYPE_ALNUM, 40); - } - for (li = _sfields; li < _sfields + _lfields; ++li) - { - starty++; - field[li] = new_field(1, 64, starty++, 1, 3, 0); - labels.push_back(starty); - set_field_back(field[li], A_UNDERLINE); - } - for (bi = _sfields + _lfields; bi < maxfields; ++bi) - { - starty++; - field[bi] = new_field(5, 72, starty++, 1, 0, 0); - labels.push_back(starty); - field_opts_off(field[bi], O_STATIC); - set_field_back(field[bi], A_UNDERLINE); - starty += 4; - } - field[maxfields] = NULL; - - // Create the form and post it - FORM *form = new_form(field); - - // Calculate the area required for the form - scale_form(form, &_rows, &_cols); - - // Create the window to be associated with the form - form_win = newwin(_rows + 4, _cols + 8, (height / 2 - _rows / 2 - 2), (width / 2 - _cols / 2 - 2)); - - // Set main window and sub window - set_form_win(form, form_win); - set_form_sub(form, derwin(form_win, _rows, _cols, 2, 2)); - - nodelay(form_win, true); - keypad(form_win, true); - noecho(); - timeout(0); - - box(form_win, 0, 0); - print_in_middle(form_win, 1, 0, _cols, _post_form, COLOR_PAIR(2)); - - post_form(form); - - // Set labels - int ca = 0; - int cf; - for (cf = 0; cf < _sfields; ++cf) - { - wattron(form_win, COLOR_PAIR(3)); - mvwprintw(form_win, labels[ca], 3, _sv[cf].c_str()); - wattroff(form_win, COLOR_PAIR(3)); - ca++; - } - for (cf = 0; cf < _lfields; ++cf) - { - wattron(form_win, COLOR_PAIR(3)); - mvwprintw(form_win, labels[ca], 3, _lv[cf].c_str()); - mvwprintw(form_win, labels[ca] + 1, _cols - 1, "wei"); - wattroff(form_win, COLOR_PAIR(3)); - ca++; - } - for (cf = 0; cf < _bfields; ++cf) - { - wattron(form_win, COLOR_PAIR(3)); - mvwprintw(form_win, labels[ca], 3, _bv[cf].c_str()); - wattroff(form_win, COLOR_PAIR(3)); - ca++; - } - - wrefresh(form_win); - - print_in_middle(form_win, 3, 0, _cols, string("Use the TAB key to switch between fields."), COLOR_PAIR(1)); - print_in_middle(form_win, 4, 0, _cols, string("Use UP, DOWN arrow keys to switch between lines."), COLOR_PAIR(1)); - print_in_middle(form_win, 6, 0, _cols, string("Press ENTER to submit the form and ESC to cancel."), COLOR_PAIR(1)); - refresh(); - - while ((ch = wgetch(form_win)) != 27 && ch != 13) // KEY_F(1)) - { - switch (ch) - { - case 9: // Tab - form_driver(form, REQ_NEXT_FIELD); - form_driver(form, REQ_END_LINE); - break; - case KEY_DOWN: - form_driver(form, REQ_NEXT_LINE); - break; - case KEY_UP: - form_driver(form, REQ_PREV_LINE); - break; - case KEY_LEFT: - form_driver(form, REQ_LEFT_CHAR); - break; - case KEY_RIGHT: - form_driver(form, REQ_RIGHT_CHAR); - break; - case KEY_BACKSPACE: // Backspace - case KEY_DC: - case KEY_DL: - case 127: - form_driver(form, REQ_DEL_PREV); - wrefresh(form_win); - break; - case KEY_ENTER: // Enter - case 13: - case 27: // Esc - break; - default: - form_driver(form, ch); - break; - } - } - - if (form_driver(form, REQ_VALIDATION) != E_OK) - cwarn << "Validation error"; - - int fi; - for (fi = 0; fi < maxfields; ++fi) - free_field(field[fi]); - free_form(form); - unpost_form(form); - echo(); - timeout(30000); - delwin(form_win); - - if (ch == 13) - for (int fi = 0; fi < maxfields; ++fi) - vs.push_back(field_buffer(field[fi], 0)); - - return vs; -} From 495dac1d3373795fd9c95889381283b40e29b591 Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Tue, 8 Apr 2014 16:22:03 -0400 Subject: [PATCH 2/2] Revert webtech changes that should never have been in. --- alethzero/Main.ui | 30 ------- alethzero/MainWin.cpp | 176 ------------------------------------------ alethzero/MainWin.h | 142 ---------------------------------- libethereum/Common.h | 2 +- 4 files changed, 1 insertion(+), 349 deletions(-) diff --git a/alethzero/Main.ui b/alethzero/Main.ui index c786a29f5..63e551ce4 100644 --- a/alethzero/Main.ui +++ b/alethzero/Main.ui @@ -36,29 +36,6 @@ 0 - - - - - - - - - - - - - - - about:blank - - - - - - - - @@ -869,13 +846,6 @@ - - - QWebView - QWidget -
QtWebKitWidgets/QWebView
- - destination calculatedName diff --git a/alethzero/MainWin.cpp b/alethzero/MainWin.cpp index 8071999d8..4114ce2a2 100644 --- a/alethzero/MainWin.cpp +++ b/alethzero/MainWin.cpp @@ -52,152 +52,6 @@ using eth::g_logPost; using eth::g_logVerbosity; using eth::c_instructionInfo; -// Horrible global for the mainwindow. Needed for the QEthereums to find the Main window which acts as multiplexer for now. -// Can get rid of this once we've sorted out ITC for signalling & multiplexed querying. -Main* g_main = nullptr; - -QEthereum::QEthereum(QObject* _p): QObject(_p) -{ - connect(g_main, SIGNAL(changed()), SIGNAL(changed())); -} - -QEthereum::~QEthereum() -{ -} - -Client* QEthereum::client() const -{ - return g_main->client(); -} - -Address QEthereum::coinbase() const -{ - return client()->address(); -} - -Address QEthereum::account() const -{ - if (g_main->owned().empty()) - return Address(); - return g_main->owned()[0].address(); -} - -QVector
QEthereum::accounts() const -{ - QVector
ret; - for (auto i: g_main->owned()) - ret.push_back(i.address()); - return ret; -} - -void QEthereum::setCoinbase(Address _a) -{ - if (client()->address() != _a) - { - client()->setAddress(_a); - changed(); - } -} - -QAccount::QAccount(QObject*) -{ -} - -QAccount::~QAccount() -{ -} - -void QAccount::setEthereum(QEthereum* _eth) -{ - if (m_eth == _eth) - return; - if (m_eth) - disconnect(m_eth, SIGNAL(changed()), this, SIGNAL(changed())); - m_eth = _eth; - if (m_eth) - connect(m_eth, SIGNAL(changed()), this, SIGNAL(changed())); - ethChanged(); - changed(); -} - -u256 QAccount::balance() const -{ - if (m_eth) - return m_eth->balanceAt(m_address); - return 0; -} - -double QAccount::txCount() const -{ - if (m_eth) - return m_eth->txCountAt(m_address); - return 0; -} - -bool QAccount::isContract() const -{ - if (m_eth) - return m_eth->isContractAt(m_address); - return 0; -} - -u256 QEthereum::balanceAt(Address _a) const -{ - return client()->postState().balance(_a); -} - -bool QEthereum::isContractAt(Address _a) const -{ - return client()->postState().isContractAddress(_a); -} - -bool QEthereum::isMining() const -{ - return client()->isMining(); -} - -bool QEthereum::isListening() const -{ - return client()->haveNetwork(); -} - -void QEthereum::setMining(bool _l) -{ - if (_l) - client()->startMining(); - else - client()->stopMining(); -} - -void QEthereum::setListening(bool _l) -{ - if (_l) - client()->startNetwork(); - else - client()->stopNetwork(); -} - -double QEthereum::txCountAt(Address _a) const -{ - return (double)client()->postState().transactionsFrom(_a); -} - -unsigned QEthereum::peerCount() const -{ - return (unsigned)client()->peerCount(); -} - -void QEthereum::transact(Secret _secret, u256 _amount, u256 _gasPrice, u256 _gas, QByteArray _code, QByteArray _init) -{ - client()->transact(_secret, _amount, bytes(_code.data(), _code.data() + _code.size()), bytes(_init.data(), _init.data() + _init.size()), _gas, _gasPrice); -} - -void QEthereum::transact(Secret _secret, Address _dest, u256 _amount, u256 _gasPrice, u256 _gas, QByteArray _data) -{ - client()->transact(_secret, _amount, _dest, bytes(_data.data(), _data.data() + _data.size()), _gas, _gasPrice); -} - - static void initUnits(QComboBox* _b) { for (auto n = (::uint)units().size(); n-- != 0; ) @@ -233,20 +87,11 @@ Main::Main(QWidget *parent) : QMainWindow(parent), ui(new Ui::Main) { - g_main = this; - setWindowFlags(Qt::Window); ui->setupUi(this); g_logPost = [=](std::string const& s, char const* c) { simpleDebugOut(s, c); ui->log->addItem(QString::fromStdString(s)); }; m_client.reset(new Client("AlethZero")); - qRegisterMetaType("eth::u256"); - qRegisterMetaType("eth::KeyPair"); - qRegisterMetaType("eth::Secret"); - qRegisterMetaType("eth::Address"); - qRegisterMetaType("QAccount*"); - qRegisterMetaType("QEthereum*"); - m_refresh = new QTimer(this); connect(m_refresh, SIGNAL(timeout()), SLOT(refresh())); m_refresh->start(100); @@ -291,18 +136,6 @@ Main::Main(QWidget *parent) : statusBar()->addPermanentWidget(ui->peerCount); statusBar()->addPermanentWidget(ui->blockCount); - connect(ui->webView, &QWebView::titleChanged, [=]() - { - ui->tabWidget->setTabText(0, ui->webView->title()); - }); - - QWebFrame* f = ui->webView->page()->currentFrame(); - connect(f, &QWebFrame::javaScriptWindowObjectCleared, [=](){ - f->addToJavaScriptWindowObject("eth", new QEthereum, QWebFrame::ScriptOwnership); - f->addToJavaScriptWindowObject("u256", new U256Helper, QWebFrame::ScriptOwnership); - f->addToJavaScriptWindowObject("key", new KeyHelper, QWebFrame::ScriptOwnership); - }); - readSettings(); refresh(); @@ -405,8 +238,6 @@ void Main::writeSettings() s.setValue("peers", m_peers); s.setValue("nameReg", ui->nameReg->text()); - s.setValue("url", ui->urlEdit->text()); - s.setValue("geometry", saveGeometry()); s.setValue("windowState", saveState()); } @@ -438,8 +269,6 @@ void Main::readSettings() ui->idealPeers->setValue(s.value("idealPeers", ui->idealPeers->value()).toInt()); ui->port->setValue(s.value("port", ui->port->value()).toInt()); ui->nameReg->setText(s.value("NameReg", "").toString()); - ui->urlEdit->setText(s.value("url", "file:///home/gav/gavcoin.html").toString()); - on_urlEdit_editingFinished(); } void Main::on_nameReg_textChanged() @@ -569,11 +398,6 @@ void Main::refresh(bool _override) m_client->unlock(); } -void Main::on_urlEdit_editingFinished() -{ - ui->webView->setUrl(ui->urlEdit->text()); -} - void Main::ourAccountsRowsMoved() { QVector myKeys; diff --git a/alethzero/MainWin.h b/alethzero/MainWin.h index b11348af5..841d58bee 100644 --- a/alethzero/MainWin.h +++ b/alethzero/MainWin.h @@ -23,145 +23,6 @@ class QJSEngine; class QEthereum; class QAccount; -Q_DECLARE_METATYPE(eth::u256) -Q_DECLARE_METATYPE(eth::Address) -Q_DECLARE_METATYPE(eth::Secret) -Q_DECLARE_METATYPE(eth::KeyPair) -Q_DECLARE_METATYPE(QEthereum*) -Q_DECLARE_METATYPE(QAccount*) - -class U256Helper: public QObject -{ - Q_OBJECT - -public: - U256Helper(QObject* _p = nullptr): QObject(_p) {} - - Q_INVOKABLE eth::u256 add(eth::u256 _a, eth::u256 _b) const { return _a + _b; } - Q_INVOKABLE eth::u256 sub(eth::u256 _a, eth::u256 _b) const { return _a - _b; } - Q_INVOKABLE eth::u256 mul(eth::u256 _a, int _b) const { return _a * _b; } - Q_INVOKABLE eth::u256 mul(int _a, eth::u256 _b) const { return _a * _b; } - Q_INVOKABLE eth::u256 div(eth::u256 _a, int _b) const { return _a / _b; } - - Q_INVOKABLE eth::u256 wei(double _s) const { return (eth::u256)_s; } - Q_INVOKABLE eth::u256 szabo(double _s) const { return (eth::u256)(_s * (double)eth::szabo); } - Q_INVOKABLE eth::u256 finney(double _s) const { return (eth::u256)(_s * (double)eth::finney); } - Q_INVOKABLE eth::u256 ether(double _s) const { return (eth::u256)(_s * (double)eth::ether); } - Q_INVOKABLE eth::u256 wei(unsigned _s) const { return (eth::u256)_s; } - Q_INVOKABLE eth::u256 szabo(unsigned _s) const { return (eth::u256)(_s * eth::szabo); } - Q_INVOKABLE eth::u256 finney(unsigned _s) const { return (eth::u256)(_s * eth::finney); } - Q_INVOKABLE eth::u256 ether(unsigned _s) const { return (eth::u256)(_s * eth::ether); } - Q_INVOKABLE double toWei(eth::u256 _t) const { return (double)_t; } - Q_INVOKABLE double toSzabo(eth::u256 _t) const { return toWei(_t) / (double)eth::szabo; } - Q_INVOKABLE double toFinney(eth::u256 _t) const { return toWei(_t) / (double)eth::finney; } - Q_INVOKABLE double toEther(eth::u256 _t) const { return toWei(_t) / (double)eth::ether; } - - Q_INVOKABLE double value(eth::u256 _t) const { return (double)_t; } - - Q_INVOKABLE QString stringOf(eth::u256 _t) const { return QString::fromStdString(eth::formatBalance(_t)); } - - Q_INVOKABLE QString testy() const { return "TEST"; } -}; - -class KeyHelper: public QObject -{ - Q_OBJECT - -public: - KeyHelper(QObject* _p = nullptr): QObject(_p) {} - - Q_INVOKABLE eth::KeyPair create() const { return eth::KeyPair::create(); } - Q_INVOKABLE eth::Address address(eth::KeyPair _p) const { return _p.address(); } - Q_INVOKABLE eth::Secret secret(eth::KeyPair _p) const { return _p.secret(); } - Q_INVOKABLE eth::KeyPair keypair(eth::Secret _k) const { return eth::KeyPair(_k); } - - Q_INVOKABLE bool isNull(eth::Address _a) const { return !_a; } - - Q_INVOKABLE eth::Address addressOf(QString _s) const { return eth::Address(_s.toStdString()); } - Q_INVOKABLE QString stringOf(eth::Address _a) const { return QString::fromStdString(eth::toHex(_a.asArray())); } - Q_INVOKABLE QString toAbridged(eth::Address _a) const { return QString::fromStdString(_a.abridged()); } -}; - -class QAccount: public QObject -{ - Q_OBJECT - -public: - QAccount(QObject* _p = nullptr); - virtual ~QAccount(); - - Q_INVOKABLE QEthereum* ethereum() const { return m_eth; } - Q_INVOKABLE eth::u256 balance() const; - Q_INVOKABLE double txCount() const; - Q_INVOKABLE bool isContract() const; - - // TODO: past transactions models. - -public slots: - void setEthereum(QEthereum* _eth); - -signals: - void changed(); - void ethChanged(); - -private: - QEthereum* m_eth = nullptr; - eth::Address m_address; - - Q_PROPERTY(eth::u256 balance READ balance NOTIFY changed STORED false) - Q_PROPERTY(double txCount READ txCount NOTIFY changed STORED false) - Q_PROPERTY(bool isContract READ isContract NOTIFY changed STORED false) - Q_PROPERTY(eth::Address address MEMBER m_address NOTIFY changed) - Q_PROPERTY(QEthereum* ethereum READ ethereum WRITE setEthereum NOTIFY ethChanged) -}; - -class QEthereum: public QObject -{ - Q_OBJECT - -public: - QEthereum(QObject* _p = nullptr); - virtual ~QEthereum(); - - eth::Client* client() const; - - Q_INVOKABLE eth::Address coinbase() const; - - Q_INVOKABLE bool isListening() const; - Q_INVOKABLE bool isMining() const; - - Q_INVOKABLE eth::u256 balanceAt(eth::Address _a) const; - Q_INVOKABLE double txCountAt(eth::Address _a) const; - Q_INVOKABLE bool isContractAt(eth::Address _a) const; - - Q_INVOKABLE QString ethTest() const { return "Hello world!"; } - - Q_INVOKABLE eth::Address account() const; - Q_INVOKABLE QVector accounts() const; - - Q_INVOKABLE unsigned peerCount() const; - - Q_INVOKABLE QEthereum* self() { return this; } - -public slots: - void transact(eth::Secret _secret, eth::Address _dest, eth::u256 _amount, eth::u256 _gasPrice, eth::u256 _gas, QByteArray _data); - void transact(eth::Secret _secret, eth::u256 _amount, eth::u256 _gasPrice, eth::u256 _gas, QByteArray _code, QByteArray _init); - void setCoinbase(eth::Address); - void setMining(bool _l); - - void setListening(bool _l); - -signals: - void changed(); -// void netChanged(); -// void miningChanged(); - -private: - Q_PROPERTY(eth::Address coinbase READ coinbase WRITE setCoinbase NOTIFY changed) - Q_PROPERTY(bool listening READ isListening WRITE setListening) - Q_PROPERTY(bool mining READ isMining WRITE setMining) -}; - class Main : public QMainWindow { Q_OBJECT @@ -200,7 +61,6 @@ private slots: void on_nameReg_textChanged(); void on_preview_triggered() { refresh(true); } void on_quit_triggered() { close(); } - void on_urlEdit_editingFinished(); void refresh(bool _override = false); void refreshNetwork(); @@ -241,8 +101,6 @@ private: unsigned m_backupGas; QNetworkAccessManager m_webCtrl; - - QEthereum* m_ethereum; }; #endif // MAIN_H diff --git a/libethereum/Common.h b/libethereum/Common.h index 68f19928b..d14686f9d 100644 --- a/libethereum/Common.h +++ b/libethereum/Common.h @@ -24,7 +24,7 @@ #pragma once // define version -#define ETH_VERSION 0.4.2 +#define ETH_VERSION 0.4.3 // way to many uint to size_t warnings in 32 bit build #ifdef _M_IX86