Fixes to ethereum.js and standard.js.

libjsqrc/ethereumjs/dist/ethereum.js

@@ -448,7 +448,7 @@ var abi = require('./abi');
  * var myContract = web3.eth.contract('0x0123123121', abi); // creation of contract object
  *
  * myContract.myMethod('this is test string param for call'); // myMethod call (implicit, default)
- * myContract.myMethod('this is test string param for call').call(); // myMethod call (explicit)
+ * myContract.call().myMethod('this is test string param for call'); // myMethod call (explicit)
  * myContract.transact().myMethod('this is test string param for transact'); // myMethod transact
  *
  * @param address - address of the contract, which should be called
@@ -457,6 +457,18 @@ var abi = require('./abi');
  */
 
 var contract = function (address, desc) {
+
+    desc.forEach(function (method) {
+        // workaround for invalid assumption that method.name is the full anonymous prototype of the method.
+        // it's not. it's just the name. the rest of the code assumes it's actually the anonymous
+        // prototype, so we make it so as a workaround.
+        if (method.name.indexOf('(') === -1) {
+            var displayName = method.name;
+            var typeName = method.inputs.map(function(i){return i.type}).join();
+            method.name = displayName + '(' + typeName + ')';
+        }
+    });
+
     var inputParser = abi.inputParser(desc);
     var outputParser = abi.outputParser(desc);
 

libjsqrc/ethereumjs/lib/contract.js

@@ -37,7 +37,7 @@ var abi = require('./abi');
  * var myContract = web3.eth.contract('0x0123123121', abi); // creation of contract object
  *
  * myContract.myMethod('this is test string param for call'); // myMethod call (implicit, default)
- * myContract.myMethod('this is test string param for call').call(); // myMethod call (explicit)
+ * myContract.call().myMethod('this is test string param for call'); // myMethod call (explicit)
  * myContract.transact().myMethod('this is test string param for transact'); // myMethod transact
  *
  * @param address - address of the contract, which should be called
@@ -46,6 +46,18 @@ var abi = require('./abi');
  */
 
 var contract = function (address, desc) {
+
+    desc.forEach(function (method) {
+        // workaround for invalid assumption that method.name is the full anonymous prototype of the method.
+        // it's not. it's just the name. the rest of the code assumes it's actually the anonymous
+        // prototype, so we make it so as a workaround.
+        if (method.name.indexOf('(') === -1) {
+            var displayName = method.name;
+            var typeName = method.inputs.map(function(i){return i.type}).join();
+            method.name = displayName + '(' + typeName + ')';
+        }
+    });
+
     var inputParser = abi.inputParser(desc);
     var outputParser = abi.outputParser(desc);
 

libsolidity/CompilerStack.cpp

@@ -44,14 +44,14 @@ bool CompilerStack::addSource(string const& _name, string const& _content)
 {
 	bool existed = m_sources.count(_name) != 0;
 	reset(true);
-	m_sources[_name].scanner = make_shared<Scanner>(CharStream(_content), _name);
+	m_sources[_name].scanner = make_shared<Scanner>(CharStream(expanded(_content)), _name);
 	return existed;
 }
 
 void CompilerStack::setSource(string const& _sourceCode)
 {
 	reset();
-	addSource("", _sourceCode);
+	addSource("", expanded(_sourceCode));
 }
 
 void CompilerStack::parse()
@@ -91,6 +91,7 @@ void CompilerStack::parse()
 void CompilerStack::parse(string const& _sourceCode)
 {
 	setSource(_sourceCode);
+	addSources(StandardSources);
 	parse();
 }
 
@@ -124,17 +125,26 @@ void CompilerStack::compile(bool _optimize)
 			}
 }
 
+const map<string, string> StandardSources = {
+/*	{ "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", "import \"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", "import \"Config\";\nimport \"NameReg\";\ncontract named is mortal, owned {function named(string32 name) {NameReg(Config().lookup(1)).register(name);}}" },
+	{ "std", "import \"owned\";\nimport \"mortal\";\nimport \"Config\";\nimport \"NameReg\";\nimport \"named\";\n" },
+*/};
+
 string CompilerStack::expanded(string const& _sourceCode)
 {
-	// TODO: populate some nicer way.
-	static const map<string, string> c_requires = {
+	const map<string, string> c_standardSources = {
 		{ "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);}" },
+		{ "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;
@@ -151,14 +161,14 @@ string CompilerStack::expanded(string const& _sourceCode)
 				for (auto const& r: rs)
 					if (!got.count(r))
 					{
-						if (c_requires.count(r))
-							sub.append("\n" + localExpanded(c_requires.at(r)) + "\n");
+						if (c_standardSources.count(r))
+							sub.append("\n" + localExpanded(c_standardSources.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)");
+				ret.replace(p, 8, "Config(0xc6d9d2cd449a754c494264e1809c50e34d64562b)");
 		return ret;
 	};
 	return sub + localExpanded(_sourceCode);
@@ -166,7 +176,7 @@ string CompilerStack::expanded(string const& _sourceCode)
 
 bytes const& CompilerStack::compile(string const& _sourceCode, bool _optimize)
 {
-	parse(expanded(_sourceCode));
+	parse(_sourceCode);
 	compile(_optimize);
 	return getBytecode();
 }

libsolidity/CompilerStack.h

@@ -49,6 +49,8 @@ enum class DocumentationType: uint8_t
 	ABI_SOLIDITY_INTERFACE
 };
 
+extern const std::map<std::string, std::string> StandardSources;
+
 /**
  * Easy to use and self-contained Solidity compiler with as few header dependencies as possible.
  * It holds state and can be used to either step through the compilation stages (and abort e.g.
@@ -61,6 +63,7 @@ public:
 
 	/// Adds a source object (e.g. file) to the parser. After this, parse has to be called again.
 	/// @returns true if a source object by the name already existed and was replaced.
+	void addSources(std::map<std::string, std::string> const& _nameContents) { for (auto const& i: _nameContents) addSource(i.first, i.second); }
 	bool addSource(std::string const& _name, std::string const& _content);
 	void setSource(std::string const& _sourceCode);
 	/// Parses all source units that were added

libweb3jsonrpc/WebThreeStubServerBase.cpp

@@ -216,8 +216,11 @@ WebThreeStubServerBase::WebThreeStubServerBase(jsonrpc::AbstractServerConnector&
 void WebThreeStubServerBase::setAccounts(std::vector<dev::KeyPair> const& _accounts)
 {
 	m_accounts.clear();
-	for (auto i: _accounts)
-		m_accounts[i.address()] = i.secret();
+	for (auto const& i: _accounts)
+	{
+		m_accounts.push_back(i.address());
+		m_accountsLookup[i.address()] = i;
+	}
 }
 
 void WebThreeStubServerBase::setIdentities(std::vector<dev::KeyPair> const& _ids)
@@ -235,8 +238,8 @@ std::string WebThreeStubServerBase::web3_sha3(std::string const& _param1)
 Json::Value WebThreeStubServerBase::eth_accounts()
 {
 	Json::Value ret(Json::arrayValue);
-	for (auto i: m_accounts)
-		ret.append(toJS(i.first));
+	for (auto const& i: m_accounts)
+		ret.append(toJS(i));
 	return ret;
 }
 
@@ -319,19 +322,19 @@ std::string WebThreeStubServerBase::eth_call(Json::Value const& _json)
 	TransactionSkeleton t = toTransaction(_json);
 	if (!t.from && m_accounts.size())
 	{
-		auto b = m_accounts.begin()->first;
-		for (auto a: m_accounts)
-			if (client()->balanceAt(a.first) > client()->balanceAt(b))
-				b = a.first;
+		auto b = m_accounts.front();
+		for (auto const& a: m_accounts)
+			if (client()->balanceAt(a) > client()->balanceAt(b))
+				b = a;
 		t.from = b;
 	}
-	if (!m_accounts.count(t.from))
+	if (!m_accountsLookup.count(t.from))
 		return ret;
 	if (!t.gasPrice)
 		t.gasPrice = 10 * dev::eth::szabo;
 	if (!t.gas)
 		t.gas = min<u256>(client()->gasLimitRemaining(), client()->balanceAt(t.from) / t.gasPrice);
-	ret = toJS(client()->call(m_accounts[t.from].secret(), t.value, t.to, t.data, t.gas, t.gasPrice));
+	ret = toJS(client()->call(m_accountsLookup[t.from].secret(), t.value, t.to, t.data, t.gas, t.gasPrice));
 	return ret;
 }
 
@@ -613,13 +616,13 @@ std::string WebThreeStubServerBase::eth_transact(Json::Value const& _json)
 	TransactionSkeleton t = toTransaction(_json);
 	if (!t.from && m_accounts.size())
 	{
-		auto b = m_accounts.begin()->first;
-		for (auto a: m_accounts)
-			if (client()->balanceAt(a.first) > client()->balanceAt(b))
-				b = a.first;
+		auto b = m_accounts.front();
+		for (auto const& a: m_accounts)
+			if (client()->balanceAt(a) > client()->balanceAt(b))
+				b = a;
 		t.from = b;
 	}
-	if (!m_accounts.count(t.from))
+	if (!m_accountsLookup.count(t.from))
 		return ret;
 	if (!t.gasPrice)
 		t.gasPrice = 10 * dev::eth::szabo;
@@ -629,9 +632,9 @@ std::string WebThreeStubServerBase::eth_transact(Json::Value const& _json)
 	{
 		if (t.to)
 			// TODO: from qethereum, insert validification hook here.
-			client()->transact(m_accounts[t.from].secret(), t.value, t.to, t.data, t.gas, t.gasPrice);
+			client()->transact(m_accountsLookup[t.from].secret(), t.value, t.to, t.data, t.gas, t.gasPrice);
 		else
-			ret = toJS(client()->transact(m_accounts[t.from].secret(), t.value, t.data, t.gas, t.gasPrice));
+			ret = toJS(client()->transact(m_accountsLookup[t.from].secret(), t.value, t.data, t.gas, t.gasPrice));
 		client()->flushTransactions();
 	}
 	return ret;

libweb3jsonrpc/WebThreeStubServerBase.h

@@ -130,7 +130,8 @@ protected:
 	virtual dev::WebThreeNetworkFace* network() = 0;
 	virtual dev::WebThreeStubDatabaseFace* db() = 0;
 
-	std::map<dev::Address, dev::KeyPair> m_accounts;
+	std::map<dev::Address, dev::KeyPair> m_accountsLookup;
+	std::vector<dev::Address> m_accounts;
 
 	std::map<dev::Public, dev::Secret> m_ids;
 	std::map<unsigned, dev::Public> m_shhWatches;

standard.js

@@ -11,12 +11,12 @@ 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 abiNameReg = [{"constant":true,"inputs":[{"name":"_owner","type":"address"}],"name":"getName","outputs":[{"name":"o_name","type":"string32"}]},{"constant":false,"inputs":[{"name":"name","type":"string32"}],"name":"register","outputs":[]},{"constant":true,"inputs":[{"name":"name","type":"string32"}],"name":"addressOf","outputs":[{"name":"addr","type":"address"}]},{"constant":true,"inputs":[{"name":"_name","type":"string32"}],"name":"getAddress","outputs":[{"name":"o_owner","type":"address"}]},{"constant":false,"inputs":[],"name":"unregister","outputs":[]},{"constant":true,"inputs":[{"name":"addr","type":"address"}],"name":"nameOf","outputs":[{"name":"name","type":"string32"}]}];
 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');
+regName(web3.eth.accounts[0], 'Gav');
+regName(web3.eth.accounts[1], 'Gav Would');
 
 /*
 // ASYNC API