Claim ether makes wallet & trasfers.

"#require" in solidity.

alethzero/Main.ui

@@ -95,8 +95,8 @@
            <widget class="QLineEdit" name="urlEdit"/>
           </item>
           <item>
-           <widget class="QWebView" name="webView" native="true">
+           <widget class="QWebView" name="webView">
-            <property name="url" stdset="0">
+            <property name="url">
              <url>
               <string>about:blank</string>
              </url>
@@ -1212,8 +1212,8 @@
       <number>0</number>
      </property>
      <item>
-      <widget class="QWebView" name="jsConsole" native="true">
+      <widget class="QWebView" name="jsConsole">
-       <property name="url" stdset="0">
+       <property name="url">
         <url>
          <string>about:blank</string>
         </url>
@@ -2035,7 +2035,7 @@ font-size: 14pt</string>
   </action>
   <action name="importKeyFile">
    <property name="enabled">
-    <bool>false</bool>
+    <bool>true</bool>
    </property>
    <property name="text">
     <string>Claim Ether Presale &amp;Wallet...</string>

alethzero/MainWin.cpp

@@ -755,7 +755,7 @@ void Main::on_importKey_triggered()
 
 void Main::on_importKeyFile_triggered()
 {
-	QString s = QFileDialog::getOpenFileName(this, "Import Account", QDir::homePath(), "JSON Files (*.json);;All Files (*)");
+	QString s = QFileDialog::getOpenFileName(this, "Claim Account Contents", QDir::homePath(), "JSON Files (*.json);;All Files (*)");
 	try
 	{
 		js::mValue val;
@@ -785,8 +785,12 @@ void Main::on_importKeyFile_triggered()
 
 			if (std::find(m_myKeys.begin(), m_myKeys.end(), k) == m_myKeys.end())
 			{
-				m_myKeys.append(k);
+				if (m_myKeys.empty())
-				keysChanged();
+				{
+					m_myKeys.push_back(KeyPair::create());
+					keysChanged();
+				}
+				ethereum()->transact(k.sec(), ethereum()->balanceAt(k.address()) - gasPrice() * c_txGas, m_myKeys.back().address(), {}, c_txGas, gasPrice());
 			}
 			else
 				QMessageBox::warning(this, "Already Have Key", "Could not import the secret key: we already own this account.");
@@ -1969,9 +1973,24 @@ void Main::on_debug_clicked()
 	}
 }
 
+bool beginsWith(Address _a, bytes const& _b)
+{
+	for (unsigned i = 0; i < min<unsigned>(20, _b.size()); ++i)
+		if (_a[i] != _b[i])
+			return false;
+	return true;
+}
+
 void Main::on_create_triggered()
 {
-	m_myKeys.append(KeyPair::create());
+	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);
+	if (!ok)
+		return;
+	KeyPair p;
+	while (!beginsWith(p.address(), asBytes(s.toStdString())))
+		p = KeyPair::create();
+	m_myKeys.append(p);
 	keysChanged();
 }
 

liblll/CodeFragment.cpp

@@ -266,7 +266,6 @@ void CodeFragment::constructOperation(sp::utree const& _t, CompilerState& _s)
 				}
 				++ii;
 			}
-
 		}
 		else if (us == "LIT")
 		{

liblll/CodeFragment.h

@@ -61,3 +61,4 @@ static const CodeFragment NullCodeFragment;
 
 }
 }
+

libsolidity/CompilerStack.cpp

@@ -21,6 +21,7 @@
  * Full-stack compiler that converts a source code string to bytecode.
  */
 
+#include <boost/algorithm/string.hpp>
 #include <libsolidity/AST.h>
 #include <libsolidity/Scanner.h>
 #include <libsolidity/Parser.h>
@@ -123,9 +124,49 @@ void CompilerStack::compile(bool _optimize)
 			}
 }
 
+string CompilerStack::expanded(string const& _sourceCode)
+{
+	// TODO: populate some nicer way.
+	static const map<string, string> c_requires = {
+		{ "Config", "contract Config{function lookup(uint256 service)constant returns(address a){}function kill(){}function unregister(uint256 id){}function register(uint256 id,address service){}}" },
+		{ "owned", "contract owned{function owned(){owner = msg.sender;}address owner;}" },
+		{ "mortal", "#require owned\ncontract mortal is owned {function kill() { if (msg.sender == owner) suicide(owner); }}" },
+		{ "NameReg", "contract NameReg{function register(string32 name){}function addressOf(string32 name)constant returns(address addr){}function unregister(){}function nameOf(address addr)constant returns(string32 name){}}" },
+		{ "named", "#require Config NameReg\ncontract named is mortal, owned {function named(string32 name) {NameReg(Config().lookup(1)).register(name);}" },
+		{ "std", "#require owned mortal Config NameReg named" },
+	};
+	string sub;
+	set<string> got;
+	function<string(string const&)> localExpanded;
+	localExpanded = [&](string const& s) -> string
+	{
+		string ret = s;
+		for (size_t p = 0; p != string::npos;)
+			if ((p = ret.find("#require ")) != string::npos)
+			{
+				string n = ret.substr(p + 9, ret.find_first_of('\n', p + 9) - p - 9);
+				ret.replace(p, n.size() + 9, "");
+				vector<string> rs;
+				boost::split(rs, n, boost::is_any_of(" \t,"), boost::token_compress_on);
+				for (auto const& r: rs)
+					if (!got.count(r))
+					{
+						if (c_requires.count(r))
+							sub.append("\n" + localExpanded(c_requires.at(r)) + "\n");
+						got.insert(r);
+					}
+			}
+			// TODO: remove once we have genesis contracts.
+			else if ((p = ret.find("Config()")) != string::npos)
+				ret.replace(p, 8, "Config(0x661005d2720d855f1d9976f88bb10c1a3398c77f)");
+		return ret;
+	};
+	return sub + localExpanded(_sourceCode);
+}
+
 bytes const& CompilerStack::compile(string const& _sourceCode, bool _optimize)
 {
-	parse(_sourceCode);
+	parse(expanded(_sourceCode));
 	compile(_optimize);
 	return getBytecode();
 }

libsolidity/CompilerStack.h

@@ -138,6 +138,10 @@ private:
 		Contract();
 	};
 
+	/// Expand source code with preprocessor-like includes.
+	/// @todo Replace with better framework.
+	std::string expanded(std::string const& _sourceCode);
+
 	void reset(bool _keepSources = false);
 	void resolveImports();