Merge pull request #1070 from debris/shh_getMessages

added shh_getMessages, fixed #899

libweb3jsonrpc/WebThreeStubServerBase.cpp

@@ -613,6 +613,29 @@ Json::Value WebThreeStubServerBase::shh_changed(int _id)
 	return ret;
 }
 
+Json::Value WebThreeStubServerBase::shh_getMessages(int _id)
+{
+	Json::Value ret(Json::arrayValue);
+	auto pub = m_shhWatches[_id];
+	if (!pub || m_ids.count(pub))
+		for (h256 const& h: face()->watchMessages(_id))
+		{
+			auto e = face()->envelope(h);
+			shh::Message m;
+			if (pub)
+			{
+				cwarn << "Silently decrypting message from identity" << pub.abridged() << ": User validation hook goes here.";
+				m = e.open(face()->fullTopic(_id), m_ids[pub]);
+			}
+			else
+				m = e.open(face()->fullTopic(_id));
+			if (!m)
+				continue;
+			ret.append(toJson(h, e, m));
+		}
+	return ret;
+}
+
 int WebThreeStubServerBase::shh_newFilter(Json::Value const& _json)
 {
 	auto w = toWatch(_json);

libweb3jsonrpc/WebThreeStubServerBase.h

@@ -113,6 +113,7 @@ public:
 
 	virtual std::string shh_addToGroup(std::string const& _group, std::string const& _who);
 	virtual Json::Value shh_changed(int _id);
+	virtual Json::Value shh_getMessages(int _id);
 	virtual bool shh_haveIdentity(std::string const& _id);
 	virtual int shh_newFilter(Json::Value const& _json);
 	virtual std::string shh_newGroup(std::string const& _id, std::string const& _who);

libweb3jsonrpc/abstractwebthreestubserver.h

@@ -63,6 +63,7 @@ class AbstractWebThreeStubServer : public jsonrpc::AbstractServer<AbstractWebThr
             this->bindAndAddMethod(jsonrpc::Procedure("shh_newFilter", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_INTEGER, "param1",jsonrpc::JSON_OBJECT, NULL), &AbstractWebThreeStubServer::shh_newFilterI);
             this->bindAndAddMethod(jsonrpc::Procedure("shh_uninstallFilter", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_BOOLEAN, "param1",jsonrpc::JSON_INTEGER, NULL), &AbstractWebThreeStubServer::shh_uninstallFilterI);
             this->bindAndAddMethod(jsonrpc::Procedure("shh_changed", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_ARRAY, "param1",jsonrpc::JSON_INTEGER, NULL), &AbstractWebThreeStubServer::shh_changedI);
+            this->bindAndAddMethod(jsonrpc::Procedure("shh_getMessages", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_ARRAY, "param1",jsonrpc::JSON_INTEGER, NULL), &AbstractWebThreeStubServer::shh_getMessagesI);
         }
 
         inline virtual void web3_sha3I(const Json::Value &request, Json::Value &response)
@@ -281,6 +282,10 @@ class AbstractWebThreeStubServer : public jsonrpc::AbstractServer<AbstractWebThr
         {
             response = this->shh_changed(request[0u].asInt());
         }
+        inline virtual void shh_getMessagesI(const Json::Value &request, Json::Value &response)
+        {
+            response = this->shh_getMessages(request[0u].asInt());
+        }
         virtual std::string web3_sha3(const std::string& param1) = 0;
         virtual std::string eth_coinbase() = 0;
         virtual bool eth_setCoinbase(const std::string& param1) = 0;
@@ -332,6 +337,7 @@ class AbstractWebThreeStubServer : public jsonrpc::AbstractServer<AbstractWebThr
         virtual int shh_newFilter(const Json::Value& param1) = 0;
         virtual bool shh_uninstallFilter(int param1) = 0;
         virtual Json::Value shh_changed(int param1) = 0;
+        virtual Json::Value shh_getMessages(int param1) = 0;
 };
 
 #endif //JSONRPC_CPP_STUB_ABSTRACTWEBTHREESTUBSERVER_H_

libweb3jsonrpc/spec.json

@@ -59,6 +59,7 @@
             
             { "name": "shh_newFilter", "params": [{}], "order": [], "returns": 0},
             { "name": "shh_uninstallFilter", "params": [0], "order": [], "returns": true},
-            { "name": "shh_changed", "params": [0], "order": [], "returns": []}
+            { "name": "shh_changed", "params": [0], "order": [], "returns": []},
+            { "name": "shh_getMessages", "params": [0], "order": [], "returns": []}
 ]
 

test/webthreestubclient.h

@@ -535,6 +535,16 @@ class WebThreeStubClient : public jsonrpc::Client
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
+        Json::Value shh_getMessages(int param1) throw (jsonrpc::JsonRpcException)
+        {
+            Json::Value p;
+            p.append(param1);
+            Json::Value result = this->CallMethod("shh_getMessages",p);
+            if (result.isArray())
+                return result;
+            else
+                throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
+        }
 };
 
 #endif //JSONRPC_CPP_STUB_WEBTHREESTUBCLIENT_H_