Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into mix_tx

alethzero/MainWin.cpp

@@ -1700,7 +1700,7 @@ void Main::on_data_textChanged()
 //				compiler.addSources(dev::solidity::StandardSources);
 				m_data = compiler.compile(src, m_enableOptimizer);
 				solidity = "<h4>Solidity</h4>";
-				solidity += "<pre>" + QString::fromStdString(compiler.getInterface()).replace(QRegExp("\\s"), "").toHtmlEscaped() + "</pre>";
+				solidity += "<pre>var " + QString::fromStdString(compiler.getContractNames().back()) + " = web3.eth.contractFromAbi(" + QString::fromStdString(compiler.getInterface()).replace(QRegExp("\\s"), "").toHtmlEscaped() + ");</pre>";
 				solidity += "<pre>" + QString::fromStdString(compiler.getSolidityInterface()).toHtmlEscaped() + "</pre>";
 				solidity += "<pre>" + QString::fromStdString(getFunctionHashes(compiler)).toHtmlEscaped() + "</pre>";
 			}

libjsqrc/ethereumjs/dist/ethereum.js

@@ -486,6 +486,15 @@ var contract = function (address, desc) {
         return result;
     };
 
+    result._options = {};
+    ['gas', 'gasPrice', 'value', 'from'].forEach(function(p) {
+        result[p] = function (v) {
+            result._options[p] = v;
+            return result;
+        };
+    });
+
+
     desc.forEach(function (method) {
 
         var displayName = abi.methodDisplayName(method.name);
@@ -1096,6 +1105,15 @@ var web3 = {
 
     /// eth object prototype
     eth: {
+        contractFromAbi: function (abi) {
+            return function(addr) {
+                // Default to address of Config. TODO: rremove prior to genesis.
+                addr = addr || '0xc6d9d2cd449a754c494264e1809c50e34d64562b';
+                var ret = web3.eth.contract(addr, abi);
+                ret.address = addr;
+                return ret;
+            };
+        },
         watch: function (params) {
             return new web3.filter(params, ethWatch);
         }

libjsqrc/ethereumjs/lib/contract.js

@@ -75,6 +75,15 @@ var contract = function (address, desc) {
         return result;
     };
 
+    result._options = {};
+    ['gas', 'gasPrice', 'value', 'from'].forEach(function(p) {
+        result[p] = function (v) {
+            result._options[p] = v;
+            return result;
+        };
+    });
+
+
     desc.forEach(function (method) {
 
         var displayName = abi.methodDisplayName(method.name);

libjsqrc/ethereumjs/lib/web3.js

@@ -268,6 +268,15 @@ var web3 = {
 
     /// eth object prototype
     eth: {
+        contractFromAbi: function (abi) {
+            return function(addr) {
+                // Default to address of Config. TODO: rremove prior to genesis.
+                addr = addr || '0xc6d9d2cd449a754c494264e1809c50e34d64562b';
+                var ret = web3.eth.contract(addr, abi);
+                ret.address = addr;
+                return ret;
+            };
+        },
         watch: function (params) {
             return new web3.filter(params, ethWatch);
         }

libsolidity/CompilerStack.cpp

@@ -130,7 +130,7 @@ const map<string, string> StandardSources = map<string, string>{
 	{ "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);}}" },
+	{ "named", "import \"Config\";\nimport \"NameReg\";\ncontract named {function named(string32 name) {NameReg(Config().lookup(1)).register(name);}}" },
 	{ "std", "import \"owned\";\nimport \"mortal\";\nimport \"Config\";\nimport \"NameReg\";\nimport \"named\";\n" },
 */};
 
@@ -141,10 +141,11 @@ string CompilerStack::expanded(string const& _sourceCode)
 {
 	const map<string, string> c_standardSources = map<string, string>{
 		{ "Config", "contract Config{function lookup(uint256 service)constant returns(address a){}function kill(){}function unregister(uint256 id){}function register(uint256 id,address service){}}" },
+		{ "service", "#require Config\ncontract service{function service(uint _n){Config().register(_n, this);}}" },
 		{ "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 {function named(string32 name) {NameReg(Config().lookup(1)).register(name);}}" },
 		{ "std", "#require owned mortal Config NameReg named" },
 	};
 

standard.js

@@ -8,8 +8,9 @@ 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 addrNameReg = initService("namereg");
-var addrGavsino = initServiceVal("gavmble", addrNameReg, "1000000000000000000");
+var addrGavsino = initServiceVal("gavmble", "1000000000000000000");
+var addrCoinReg = initService("coins");
 
 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); };