Vanity addresses in AZ.

Fixes to ethereum.js
eth.flush()

alethzero/Main.ui

@@ -148,6 +148,7 @@
     <addaction name="importKey"/>
     <addaction name="importKeyFile"/>
     <addaction name="exportKey"/>
+    <addaction name="killAccount"/>
     <addaction name="separator"/>
     <addaction name="loadJS"/>
    </widget>
@@ -2067,6 +2068,11 @@ font-size: 14pt</string>
     <string>Use &amp;LLVM-EVM</string>
    </property>
   </action>
+  <action name="killAccount">
+   <property name="text">
+    <string>&amp;Kill Account</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>

alethzero/MainWin.cpp

@@ -112,7 +112,7 @@ QString contentsOfQResource(string const& res)
 }
 
 //Address c_config = Address("661005d2720d855f1d9976f88bb10c1a3398c77f");
-Address c_newConfig = Address("661005d2720d855f1d9976f88bb10c1a3398c77f");
+Address c_newConfig = Address("c6d9d2cd449a754c494264e1809c50e34d64562b");
 //Address c_nameReg = Address("ddd1cea741d548f90d86fb87a3ae6492e18c03a1");
 
 Main::Main(QWidget *parent) :
@@ -788,6 +788,7 @@ void Main::on_importKeyFile_triggered()
 				}
 			}
 
+			cnote << k.address();
 			if (std::find(m_myKeys.begin(), m_myKeys.end(), k) == m_myKeys.end())
 			{
 				if (m_myKeys.empty())
@@ -1992,16 +1993,71 @@ bool beginsWith(Address _a, bytes const& _b)
 void Main::on_create_triggered()
 {
 	bool ok = true;
-	QString s = QInputDialog::getText(this, "Special Beginning?", "If you want a special key, enter some hex digits that it should begin with.\nNOTE: The more you enter, the longer generation will take.", QLineEdit::Normal, QString(), &ok);
+	enum { NoVanity = 0, FirstTwo, FirstTwoNextTwo, FirstThree, FirstFour, StringMatch };
+	QStringList items = {"No vanity (instant)", "Two pairs first (a few seconds)", "Two pairs first and second (a few minutes)", "Three pairs first (a few minutes)", "Four pairs first (several hours)", "Specific hex string"};
+	unsigned v = items.QList<QString>::indexOf(QInputDialog::getItem(this, "Vanity Key?", "Would you a vanity key? This could take several hours.", items, 0, false, &ok));
 	if (!ok)
 		return;
+
+	bytes bs;
+	if (v == StringMatch)
+	{
+		QString s = QInputDialog::getText(this, "Vanity Beginning?", "Enter some hex digits that it should begin with.\nNOTE: The more you enter, the longer generation will take.", QLineEdit::Normal, QString(), &ok);
+		if (!ok)
+			return;
+		bs = fromHex(s.toStdString());
+	}
+
 	KeyPair p;
-	while (!beginsWith(p.address(), asBytes(s.toStdString())))
-		p = KeyPair::create();
+	bool keepGoing = true;
+	unsigned done = 0;
+	function<void()> f = [&]() {
+		KeyPair lp;
+		while (keepGoing)
+		{
+			done++;
+			if (done % 1000 == 0)
+				cnote << "Tried" << done << "keys";
+			lp = KeyPair::create();
+			auto a = lp.address();
+			if (v == NoVanity ||
+				(v == FirstTwo && a[0] == a[1]) ||
+				(v == FirstTwoNextTwo && a[0] == a[1] && a[2] == a[3]) ||
+				(v == FirstThree && a[0] == a[1] && a[1] == a[2]) ||
+				(v == FirstFour && a[0] == a[1] && a[1] == a[2] && a[2] == a[3]) ||
+				(v == StringMatch && beginsWith(lp.address(), bs))
+			)
+				break;
+		}
+		if (keepGoing)
+			p = lp;
+		keepGoing = false;
+	};
+	vector<std::thread*> ts;
+	for (unsigned t = 0; t < std::thread::hardware_concurrency() - 1; ++t)
+		ts.push_back(new std::thread(f));
+	f();
+	for (std::thread* t: ts)
+	{
+		t->join();
+		delete t;
+	}
 	m_myKeys.append(p);
 	keysChanged();
 }
 
+void Main::on_killAccount_triggered()
+{
+	if (ui->ourAccounts->currentRow() >= 0 && ui->ourAccounts->currentRow() < m_myKeys.size())
+	{
+		auto k = m_myKeys[ui->ourAccounts->currentRow()];
+		if (ethereum()->balanceAt(k.address()) != 0 && QMessageBox::critical(this, "Kill Account?!", "Account " + render(k.address()) + " has " + QString::fromStdString(formatBalance(ethereum()->balanceAt(k.address()))) + " in it. It, and any contract that this account can access, will be lost forever if you continue. Do NOT continue unless you know what you are doing.\nAre you sure you want to continue?", QMessageBox::Yes, QMessageBox::No) == QMessageBox::No)
+			return;
+		m_myKeys.erase(m_myKeys.begin() + ui->ourAccounts->currentRow());
+		keysChanged();
+	}
+}
+
 void Main::on_debugStep_triggered()
 {
 	if (ui->debugTimeline->value() < m_history.size()) {

alethzero/MainWin.h

@@ -108,6 +108,7 @@ private slots:
 	void on_mine_triggered();
 	void on_send_clicked();
 	void on_create_triggered();
+	void on_killAccount_triggered();
 	void on_net_triggered();
 	void on_verbosity_valueChanged();
 	void on_ourAccounts_doubleClicked();

libdevcrypto/Common.cpp

@@ -22,6 +22,7 @@
 
 #include <random>
 #include <chrono>
+#include <thread>
 #include <mutex>
 #include <libdevcore/Guards.h>
 #include "SHA3.h"
@@ -96,12 +97,16 @@ bool dev::verify(Public const& _p, Signature const& _s, h256 const& _hash)
 
 KeyPair KeyPair::create()
 {
-	static mt19937_64 s_eng(time(0) + chrono::high_resolution_clock::now().time_since_epoch().count());
+	static boost::thread_specific_ptr<mt19937_64> s_eng;
+	static unsigned s_id = 0;
+	if (!s_eng.get())
+		s_eng.reset(new mt19937_64(time(0) + chrono::high_resolution_clock::now().time_since_epoch().count() + ++s_id));
+
 	uniform_int_distribution<uint16_t> d(0, 255);
 
 	for (int i = 0; i < 100; ++i)
 	{
-		KeyPair ret(FixedHash<32>::random(s_eng));
+		KeyPair ret(FixedHash<32>::random(*s_eng.get()));
 		if (ret.address())
 			return ret;
 	}

libethereum/BlockChain.cpp

@@ -60,7 +60,7 @@ std::map<Address, Account> const& dev::eth::genesisState()
 	{
 		// Initialise.
 		for (auto i: vector<string>({
-            "51ba59315b3a95761d0863b05ccc7a7f54703d99",
+			"dbdbdb2cbd23b783741e8d7fcf51e459b497e4a6",
 			"e6716f9544a56c530d868e4bfbacb172315bdead",
 			"b9c015918bdaba24b4ff057a92a3873d6eb201be",
 			"1a26338f0d905e295fccb71fa9ea849ffa12aaf4",

libjsqrc/ethereumjs/dist/ethereum.js

@@ -129,7 +129,7 @@ var formatInputReal = function (value) {
 
 var dynamicTypeBytes = function (type, value) {
     // TODO: decide what to do with array of strings
-    if (arrayType(type) || prefixedType('string')(type))
+    if (arrayType(type) || type == 'string')    // only string itself that is dynamic; stringX is static length.
         return formatInputInt(value.length); 
     return "";
 };
@@ -889,6 +889,7 @@ var ethMethods = function () {
     { name: 'transaction', call: transactionCall },
     { name: 'uncle', call: uncleCall },
     { name: 'compilers', call: 'eth_compilers' },
+    { name: 'flush', call: 'eth_flush' },
     { name: 'lll', call: 'eth_lll' },
     { name: 'solidity', call: 'eth_solidity' },
     { name: 'serpent', call: 'eth_serpent' },

libjsqrc/ethereumjs/lib/abi.js

@@ -128,7 +128,7 @@ var formatInputReal = function (value) {
 
 var dynamicTypeBytes = function (type, value) {
     // TODO: decide what to do with array of strings
-    if (arrayType(type) || prefixedType('string')(type))
+    if (arrayType(type) || type == 'string')    // only string itself that is dynamic; stringX is static length.
         return formatInputInt(value.length); 
     return "";
 };

libjsqrc/ethereumjs/lib/web3.js

@@ -82,6 +82,7 @@ var ethMethods = function () {
     { name: 'transaction', call: transactionCall },
     { name: 'uncle', call: uncleCall },
     { name: 'compilers', call: 'eth_compilers' },
+    { name: 'flush', call: 'eth_flush' },
     { name: 'lll', call: 'eth_lll' },
     { name: 'solidity', call: 'eth_solidity' },
     { name: 'serpent', call: 'eth_serpent' },

libweb3jsonrpc/WebThreeStubServerBase.cpp

@@ -307,6 +307,12 @@ static TransactionSkeleton toTransaction(Json::Value const& _json)
 	return ret;
 }
 
+bool WebThreeStubServerBase::eth_flush()
+{
+	client()->flushTransactions();
+	return true;
+}
+
 std::string WebThreeStubServerBase::eth_call(Json::Value const& _json)
 {
 	std::string ret;

libweb3jsonrpc/WebThreeStubServerBase.h

@@ -79,6 +79,7 @@ public:
 	virtual int eth_defaultBlock();
 	virtual std::string eth_gasPrice();
 	virtual Json::Value eth_filterLogs(int const& _id);
+	virtual bool eth_flush();
 	virtual Json::Value eth_logs(Json::Value const& _json);
 	virtual bool eth_listening();
 	virtual bool eth_mining();

libweb3jsonrpc/abstractwebthreestubserver.h

@@ -32,6 +32,7 @@ class AbstractWebThreeStubServer : public jsonrpc::AbstractServer<AbstractWebThr
             this->bindAndAddMethod(new jsonrpc::Procedure("eth_codeAt", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING, "param1",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_codeAtI);
             this->bindAndAddMethod(new jsonrpc::Procedure("eth_transact", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING, "param1",jsonrpc::JSON_OBJECT, NULL), &AbstractWebThreeStubServer::eth_transactI);
             this->bindAndAddMethod(new jsonrpc::Procedure("eth_call", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING, "param1",jsonrpc::JSON_OBJECT, NULL), &AbstractWebThreeStubServer::eth_callI);
+            this->bindAndAddMethod(new jsonrpc::Procedure("eth_flush", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_BOOLEAN,  NULL), &AbstractWebThreeStubServer::eth_flushI);
             this->bindAndAddMethod(new jsonrpc::Procedure("eth_blockByHash", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_OBJECT, "param1",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_blockByHashI);
             this->bindAndAddMethod(new jsonrpc::Procedure("eth_blockByNumber", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_OBJECT, "param1",jsonrpc::JSON_INTEGER, NULL), &AbstractWebThreeStubServer::eth_blockByNumberI);
             this->bindAndAddMethod(new jsonrpc::Procedure("eth_transactionByHash", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_OBJECT, "param1",jsonrpc::JSON_STRING,"param2",jsonrpc::JSON_INTEGER, NULL), &AbstractWebThreeStubServer::eth_transactionByHashI);
@@ -142,6 +143,10 @@ class AbstractWebThreeStubServer : public jsonrpc::AbstractServer<AbstractWebThr
         {
             response = this->eth_call(request[0u]);
         }
+        inline virtual void eth_flushI(const Json::Value &request, Json::Value &response)
+        {
+            response = this->eth_flush();
+        }
         inline virtual void eth_blockByHashI(const Json::Value &request, Json::Value &response)
         {
             response = this->eth_blockByHash(request[0u].asString());
@@ -274,6 +279,7 @@ class AbstractWebThreeStubServer : public jsonrpc::AbstractServer<AbstractWebThr
         virtual std::string eth_codeAt(const std::string& param1) = 0;
         virtual std::string eth_transact(const Json::Value& param1) = 0;
         virtual std::string eth_call(const Json::Value& param1) = 0;
+        virtual bool eth_flush() = 0;
         virtual Json::Value eth_blockByHash(const std::string& param1) = 0;
         virtual Json::Value eth_blockByNumber(const int& param1) = 0;
         virtual Json::Value eth_transactionByHash(const std::string& param1, const int& param2) = 0;

libweb3jsonrpc/spec.json

@@ -22,6 +22,7 @@
 
             { "name": "eth_transact", "params": [{}], "order": [], "returns": ""},
             { "name": "eth_call", "params": [{}], "order": [], "returns": ""},
+            { "name": "eth_flush", "params": [], "order": [], "returns" : true},
 
             { "name": "eth_blockByHash", "params": [""],"order": [], "returns": {}},
             { "name": "eth_blockByNumber", "params": [0],"order": [], "returns": {}},

standard.js

@@ -1,4 +1,27 @@
-var compile = function(name) { return web3.eth.solidity(env.contents("../../dapp-bin/" + name + "/" + name + ".sol")); };
+///TODO
+
+var compile = function(name) { return web3.eth.solidity(env.contents("/home/gav/Eth/dapp-bin/" + name + "/" + name + ".sol")); web3.eth.flush(); };
+var create = function(code) { return web3.eth.transact({ 'code': code }); web3.eth.flush(); };
+var createVal = function(code, val) { return web3.eth.transact(val ? { 'code': code, 'value': val } : { 'code': code }); web3.eth.flush(); };
+var send = function(from, val, to) { web3.eth.transact({ 'from': from, 'value': val, 'to': to }); web3.eth.flush(); };
+var initService = function(name) { return create(compile(name)); };
+var initServiceVal = function(name, val) { createVal(compile(name), val); };
+
+var addrConfig = create(compile("config"));
+var addrNameReg = initService("namereg", addrConfig);
+var addrGavsino = initServiceVal("gavmble", addrNameReg, "1000000000000000000");
+
+var abiNameReg = [{"constant":true,"inputs":[{"name":"name","type":"string32"}],"name":"addressOf","outputs":[{"name":"addr","type":"address"}]},{"constant":false,"inputs":[],"name":"kill","outputs":[]},{"constant":true,"inputs":[{"name":"addr","type":"address"}],"name":"nameOf","outputs":[{"name":"name","type":"string32"}]},{"constant":false,"inputs":[{"name":"name","type":"string32"}],"name":"register","outputs":[]},{"constant":false,"inputs":[],"name":"unregister","outputs":[]}];
+var regName = function(account, name) { return web3.eth.contract(addrNameReg, abiNameReg).transact({'from': account, 'gas': 10000}).register(name); };
+
+regName(accounts[0], 'Gav');
+send(web3.eth.accounts[0], '100000000000000000000', web3.eth.accounts[1]);
+regName(accounts[1], 'Gav Would');
+
+/*
+// ASYNC API
+
+var compile = function(name) { return web3.eth.solidity(env.contents("/home/gav/Eth/dapp-bin/" + name + "/" + name + ".sol")); };
 var create = function(code) { return web3.eth.transact({ 'code': code }); };
 var createVal = function(code, val) { return web3.eth.transact(val ? { 'code': code, 'value': val } : { 'code': code }); };
 var send = function(from, val, to) { return web3.eth.transact({ 'from': from, 'value': val, 'to': to }); };
@@ -11,13 +34,13 @@ var addrGavsino = initServiceVal("gavmble", addrNameReg, "1000000000000000000");
 
 var abiNameReg = [{"constant":true,"inputs":[{"name":"name","type":"string32"}],"name":"addressOf","outputs":[{"name":"addr","type":"address"}]},{"constant":false,"inputs":[],"name":"kill","outputs":[]},{"constant":true,"inputs":[{"name":"addr","type":"address"}],"name":"nameOf","outputs":[{"name":"name","type":"string32"}]},{"constant":false,"inputs":[{"name":"name","type":"string32"}],"name":"register","outputs":[]},{"constant":false,"inputs":[],"name":"unregister","outputs":[]}];
 var regName = function(account, name) { return web3.contract(addrNameReg, abiNameReg).register(name).transact({'from': account, 'gas': 10000}); };
-/*
-var coins = initService("coins", 1, nameReg);
-var coin = initService("coin", 2, coins);
-var approve = function(account, approvedAddress) { web3.eth.transact({ 'from': account, 'to': coin, 'gas': '10000', 'data': [ web3.fromAscii('approve'), approvedAddress ] }); };
-var exchange = initService("exchange", 3, coin);
-var offer = function(account, haveCoin, haveVal, wantCoin, wantVal) { web3.eth.transact({ 'from': account, 'to': exchange, 'gas': '10000', 'data': [web3.fromAscii('new'), haveCoin, haveVal, wantCoin, wantVal] }); };
-*/
+
+//var coins = initService("coins", 1, nameReg);
+//var coin = initService("coin", 2, coins);
+//var approve = function(account, approvedAddress) { web3.eth.transact({ 'from': account, 'to': coin, 'gas': '10000', 'data': [ web3.fromAscii('approve'), approvedAddress ] }); };
+//var exchange = initService("exchange", 3, coin);
+//var offer = function(account, haveCoin, haveVal, wantCoin, wantVal) { web3.eth.transact({ 'from': account, 'to': exchange, 'gas': '10000', 'data': [web3.fromAscii('new'), haveCoin, haveVal, wantCoin, wantVal] }); };
+
 addrConfig.then(function() {
     env.note("config ready");
     web3.eth.accounts.then(function(accounts)
@@ -39,7 +62,7 @@ addrConfig.then(function() {
 		//	eth.transact({ 'to': dnsReg, 'data': [web3.fromAscii('register'), web3.fromAscii('gav'), web3.fromAscii('opensecrecy.com')] });
 	});
 });
-
+*/
 // TODO
 /*
 var nameRegJeff;