Merge pull request #316 from caktux/rpcstateat

add RPC stateAt

eth/EthStubServer.cpp

@@ -138,6 +138,11 @@ std::string EthStubServer::storageAt(const std::string& _a, const std::string& x
 	return toJS(m_client.stateAt(jsToAddress(_a), jsToU256(x), 0));
 }
 
+std::string EthStubServer::stateAt(const std::string& _a, const std::string& x, const std::string& b)
+{
+	return toJS(m_client.stateAt(jsToAddress(_a), jsToU256(x), std::atol(b.c_str())));
+}
+
 Json::Value EthStubServer::transact(const std::string& _aDest, const std::string& _bData, const std::string& _sec, const std::string& _xGas, const std::string& _xGasPrice, const std::string& _xValue)
 {
 	m_client.transact(jsToSecret(_sec), jsToU256(_xValue), jsToAddress(_aDest), jsToBytes(_bData), jsToU256(_xGas), jsToU256(_xGasPrice));

eth/EthStubServer.h

@@ -49,6 +49,7 @@ public:
 	virtual Json::Value keys();
 	virtual int peerCount();
 	virtual std::string storageAt(const std::string& a, const std::string& x);
+	virtual std::string stateAt(const std::string& a, const std::string& x, const std::string& b);
 	virtual Json::Value transact(const std::string& aDest, const std::string& bData, const std::string& sec, const std::string& xGas, const std::string& xGasPrice, const std::string& xValue);
 	virtual std::string txCountAt(const std::string& a);
 	virtual std::string secretToAddress(const std::string& a);

eth/abstractethstubserver.h

@@ -30,6 +30,7 @@ class AbstractEthStubServer : public jsonrpc::AbstractServer<AbstractEthStubServ
             this->bindAndAddMethod(new jsonrpc::Procedure("procedures", jsonrpc::PARAMS_BY_NAME, jsonrpc::JSON_ARRAY,  NULL), &AbstractEthStubServer::proceduresI);
             this->bindAndAddMethod(new jsonrpc::Procedure("secretToAddress", jsonrpc::PARAMS_BY_NAME, jsonrpc::JSON_STRING, "a",jsonrpc::JSON_STRING, NULL), &AbstractEthStubServer::secretToAddressI);
             this->bindAndAddMethod(new jsonrpc::Procedure("storageAt", jsonrpc::PARAMS_BY_NAME, jsonrpc::JSON_STRING, "a",jsonrpc::JSON_STRING,"x",jsonrpc::JSON_STRING, NULL), &AbstractEthStubServer::storageAtI);
+            this->bindAndAddMethod(new jsonrpc::Procedure("stateAt", jsonrpc::PARAMS_BY_NAME, jsonrpc::JSON_STRING, "a",jsonrpc::JSON_STRING,"x",jsonrpc::JSON_STRING,"b",jsonrpc::JSON_STRING, NULL), &AbstractEthStubServer::stateAtI);
             this->bindAndAddMethod(new jsonrpc::Procedure("transact", jsonrpc::PARAMS_BY_NAME, jsonrpc::JSON_OBJECT, "aDest",jsonrpc::JSON_STRING,"bData",jsonrpc::JSON_STRING,"sec",jsonrpc::JSON_STRING,"xGas",jsonrpc::JSON_STRING,"xGasPrice",jsonrpc::JSON_STRING,"xValue",jsonrpc::JSON_STRING, NULL), &AbstractEthStubServer::transactI);
             this->bindAndAddMethod(new jsonrpc::Procedure("txCountAt", jsonrpc::PARAMS_BY_NAME, jsonrpc::JSON_STRING, "a",jsonrpc::JSON_STRING, NULL), &AbstractEthStubServer::txCountAtI);
 
@@ -120,6 +121,11 @@ class AbstractEthStubServer : public jsonrpc::AbstractServer<AbstractEthStubServ
             response = this->storageAt(request["a"].asString(), request["x"].asString());
         }
 
+        inline virtual void stateAtI(const Json::Value& request, Json::Value& response)
+        {
+            response = this->stateAt(request["a"].asString(), request["x"].asString(), request["b"].asString());
+        }
+
         inline virtual void transactI(const Json::Value& request, Json::Value& response) 
         {
             response = this->transact(request["aDest"].asString(), request["bData"].asString(), request["sec"].asString(), request["xGas"].asString(), request["xGasPrice"].asString(), request["xValue"].asString());
@@ -148,6 +154,7 @@ class AbstractEthStubServer : public jsonrpc::AbstractServer<AbstractEthStubServ
         virtual Json::Value procedures() = 0;
         virtual std::string secretToAddress(const std::string& a) = 0;
         virtual std::string storageAt(const std::string& a, const std::string& x) = 0;
+        virtual std::string stateAt(const std::string& a, const std::string& x, const std::string& b) = 0;
         virtual Json::Value transact(const std::string& aDest, const std::string& bData, const std::string& sec, const std::string& xGas, const std::string& xGasPrice, const std::string& xValue) = 0;
         virtual std::string txCountAt(const std::string& a) = 0;
 

eth/eth.js

@@ -25,6 +25,7 @@ var spec = [
             { "method": "peerCount", "params": null, "order": [], "returns" : 0 },
             { "method": "balanceAt", "params": { "a": "" }, "order": ["a"], "returns" : "" },
             { "method": "storageAt", "params": { "a": "", "x": "" }, "order": ["a", "x"], "returns" : "" },
+            { "method": "stateAt", "params": { "a": "", "x": "", "b": "" }, "order": ["a", "x", "b"], "returns" : "" },
             { "method": "txCountAt", "params": { "a": "" },"order": ["a"], "returns" : "" },
             { "method": "isContractAt", "params": { "a": "" }, "order": ["a"], "returns" : false },
             { "method": "create", "params": { "sec": "", "xEndowment": "", "bCode": "", "xGas": "", "xGasPrice": "" }, "order": ["sec", "xEndowment", "bCode", "xGas", "xGasPrice"] , "returns": "" },
@@ -70,9 +71,18 @@ window.eth = (function ethScope() {
 		var m = s.method;
 		var am = "get" + m.slice(0, 1).toUpperCase() + m.slice(1);
 		var getParams = function(a) {
-			var p = s.params ? {} : null
-			for (j in s.order)
-				p[s.order[j]] = (s.order[j][0] === "b") ? a[j].unbin() : a[j]
+			var p = s.params ? {} : null;
+			for (j in s.order) {
+				if (m == "stateAt") {
+					if (typeof(a[j]) == 'undefined') {
+						p[s.order[j]] = "0";
+					}
+					else
+						p[s.order[j]] = String(a[j]);
+				}
+				else
+					p[s.order[j]] = a[j];
+			}
 			return p
 		};
 		if (m == "create" || m == "transact")
@@ -101,7 +111,7 @@ window.eth = (function ethScope() {
 		for (var c in changed)
 			m_watching[changed[c]]()
 		var that = this;
-		setTimeout(function() { that.check() }, 5000)
+		setTimeout(function() { that.check() }, 12000)
 	}
 
 	ret.watch = function(a, fx, f) {