eth_submitWork's hash rate is now a hex string

LefterisJP · LefterisJP · commit 01f4a63bea45 · 2015-08-17T13:56:33.000+02:00
diff --git a/ethminer/FarmClient.h b/ethminer/FarmClient.h
@@ -34,7 +34,7 @@ class FarmClient : public jsonrpc::Client
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
-        bool eth_submitHashrate(int param1, const std::string& param2) throw (jsonrpc::JsonRpcException)
+        bool eth_submitHashrate(const std::string& param1, const std::string& param2) throw (jsonrpc::JsonRpcException)
         {
             Json::Value p;
             p.append(param1);
diff --git a/ethminer/MinerAux.h b/ethminer/MinerAux.h
@@ -515,7 +515,7 @@ class MinerCLI
 					auto rate = mp.rate();
 					try
 					{
-						rpc.eth_submitHashrate((int)rate, "0x" + id.hex());
+						rpc.eth_submitHashrate(toHex((u256)rate, HexPrefix::Add), "0x" + id.hex());
 					}
 					catch (jsonrpc::JsonRpcException const& _e)
 					{
diff --git a/ethminer/farm.json b/ethminer/farm.json
@@ -1,7 +1,7 @@
 [
 	{ "name": "eth_getWork", "params": [], "order": [], "returns": []},
 	{ "name": "eth_submitWork", "params": ["", "", ""], "order": [], "returns": true},
-	{ "name": "eth_submitHashrate", "params": [0, ""], "order": [], "returns": true},
+	{ "name": "eth_submitHashrate", "params": ["", ""], "order": [], "returns": true},
 	{ "name": "eth_awaitNewWork", "params": [], "order": [], "returns": []},
 	{ "name": "eth_progress", "params": [], "order": [], "returns": true}
 ]
diff --git a/libweb3jsonrpc/WebThreeStubServerBase.cpp b/libweb3jsonrpc/WebThreeStubServerBase.cpp
@@ -780,9 +780,9 @@ bool WebThreeStubServerBase::eth_submitWork(string const& _nonce, string const&,
 	}
 }
 
-bool WebThreeStubServerBase::eth_submitHashrate(int _hashes, string const& _id)
+bool WebThreeStubServerBase::eth_submitHashrate(std::string const& _hashes, string const& _id)
 {
-	client()->submitExternalHashrate(_hashes, jsToFixed<32>(_id));
+	client()->submitExternalHashrate(std::stoi(_hashes, nullptr, 0), jsToFixed<32>(_id));
 	return true;
 }
 
diff --git a/libweb3jsonrpc/WebThreeStubServerBase.h b/libweb3jsonrpc/WebThreeStubServerBase.h
@@ -139,7 +139,7 @@ class WebThreeStubServerBase: public AbstractWebThreeStubServer
 	virtual Json::Value eth_getLogsEx(Json::Value const& _json);
 	virtual Json::Value eth_getWork();
 	virtual bool eth_submitWork(std::string const& _nonce, std::string const&, std::string const& _mixHash);
-	virtual bool eth_submitHashrate(int _hashes, std::string const& _id);
+	virtual bool eth_submitHashrate(std::string const& _hashes, std::string const& _id);
 	virtual std::string eth_register(std::string const& _address);
 	virtual bool eth_unregister(std::string const& _accountId);
 	virtual Json::Value eth_fetchQueuedTransactions(std::string const& _accountId);
diff --git a/libweb3jsonrpc/abstractwebthreestubserver.h b/libweb3jsonrpc/abstractwebthreestubserver.h
@@ -60,7 +60,7 @@ class AbstractWebThreeStubServer : public jsonrpc::AbstractServer<AbstractWebThr
             this->bindAndAddMethod(jsonrpc::Procedure("eth_getLogsEx", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_ARRAY, "param1",jsonrpc::JSON_OBJECT, NULL), &AbstractWebThreeStubServer::eth_getLogsExI);
             this->bindAndAddMethod(jsonrpc::Procedure("eth_getWork", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_ARRAY,  NULL), &AbstractWebThreeStubServer::eth_getWorkI);
             this->bindAndAddMethod(jsonrpc::Procedure("eth_submitWork", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_BOOLEAN, "param1",jsonrpc::JSON_STRING,"param2",jsonrpc::JSON_STRING,"param3",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_submitWorkI);
-            this->bindAndAddMethod(jsonrpc::Procedure("eth_submitHashrate", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_BOOLEAN, "param1",jsonrpc::JSON_INTEGER,"param2",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_submitHashrateI);
+            this->bindAndAddMethod(jsonrpc::Procedure("eth_submitHashrate", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_BOOLEAN, "param1",jsonrpc::JSON_STRING,"param2",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_submitHashrateI);
             this->bindAndAddMethod(jsonrpc::Procedure("eth_register", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING, "param1",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_registerI);
             this->bindAndAddMethod(jsonrpc::Procedure("eth_unregister", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_BOOLEAN, "param1",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_unregisterI);
             this->bindAndAddMethod(jsonrpc::Procedure("eth_fetchQueuedTransactions", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_ARRAY, "param1",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_fetchQueuedTransactionsI);
@@ -315,7 +315,7 @@ class AbstractWebThreeStubServer : public jsonrpc::AbstractServer<AbstractWebThr
         }
         inline virtual void eth_submitHashrateI(const Json::Value &request, Json::Value &response)
         {
-            response = this->eth_submitHashrate(request[0u].asInt(), request[1u].asString());
+            response = this->eth_submitHashrate(request[0u].asString(), request[1u].asString());
         }
         inline virtual void eth_registerI(const Json::Value &request, Json::Value &response)
         {
@@ -534,7 +534,7 @@ class AbstractWebThreeStubServer : public jsonrpc::AbstractServer<AbstractWebThr
         virtual Json::Value eth_getLogsEx(const Json::Value& param1) = 0;
         virtual Json::Value eth_getWork() = 0;
         virtual bool eth_submitWork(const std::string& param1, const std::string& param2, const std::string& param3) = 0;
-        virtual bool eth_submitHashrate(int param1, const std::string& param2) = 0;
+        virtual bool eth_submitHashrate(const std::string& param1, const std::string& param2) = 0;
         virtual std::string eth_register(const std::string& param1) = 0;
         virtual bool eth_unregister(const std::string& param1) = 0;
         virtual Json::Value eth_fetchQueuedTransactions(const std::string& param1) = 0;
diff --git a/libweb3jsonrpc/spec.json b/libweb3jsonrpc/spec.json
@@ -49,7 +49,7 @@
 { "name": "eth_getLogsEx", "params": [{}], "order": [], "returns": []},
 { "name": "eth_getWork", "params": [], "order": [], "returns": []},
 { "name": "eth_submitWork", "params": ["", "", ""], "order": [], "returns": true},
-{ "name": "eth_submitHashrate", "params": [0, ""], "order": [], "returns": true},
+{ "name": "eth_submitHashrate", "params": ["", ""], "order": [], "returns": true},
 { "name": "eth_register", "params": [""], "order": [], "returns": ""},
 { "name": "eth_unregister", "params": [""], "order": [], "returns": true},
 { "name": "eth_fetchQueuedTransactions", "params": [""], "order": [], "returns": []},
diff --git a/test/libweb3jsonrpc/webthreestubclient.h b/test/libweb3jsonrpc/webthreestubclient.h
@@ -506,7 +506,7 @@ class WebThreeStubClient : public jsonrpc::Client
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
-        bool eth_submitHashrate(int param1, const std::string& param2) throw (jsonrpc::JsonRpcException)
+        bool eth_submitHashrate(const std::string& param1, const std::string& param2) throw (jsonrpc::JsonRpcException)
         {
             Json::Value p;
             p.append(param1);

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ class FarmClient : public jsonrpc::Client`
`34`	`34`	`else`
`35`	`35`	`throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());`
`36`	`36`	`}`
`37`		`- bool eth_submitHashrate(int param1, const std::string& param2) throw (jsonrpc::JsonRpcException)`
	`37`	`+ bool eth_submitHashrate(const std::string& param1, const std::string& param2) throw (jsonrpc::JsonRpcException)`
`38`	`38`	`{`
`39`	`39`	`Json::Value p;`
`40`	`40`	`p.append(param1);`
Original file line number	Diff line number	Diff line change
`@@ -515,7 +515,7 @@ class MinerCLI`
`515`	`515`	`auto rate = mp.rate();`
`516`	`516`	`try`
`517`	`517`	`{`
`518`		`- rpc.eth_submitHashrate((int)rate, "0x" + id.hex());`
	`518`	`+ rpc.eth_submitHashrate(toHex((u256)rate, HexPrefix::Add), "0x" + id.hex());`
`519`	`519`	`}`
`520`	`520`	`catch (jsonrpc::JsonRpcException const& _e)`
`521`	`521`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`[`
`2`	`2`	`{ "name": "eth_getWork", "params": [], "order": [], "returns": []},`
`3`	`3`	`{ "name": "eth_submitWork", "params": ["", "", ""], "order": [], "returns": true},`
`4`		`- { "name": "eth_submitHashrate", "params": [0, ""], "order": [], "returns": true},`
	`4`	`+ { "name": "eth_submitHashrate", "params": ["", ""], "order": [], "returns": true},`
`5`	`5`	`{ "name": "eth_awaitNewWork", "params": [], "order": [], "returns": []},`
`6`	`6`	`{ "name": "eth_progress", "params": [], "order": [], "returns": true}`
`7`	`7`	`]`
Original file line number	Diff line number	Diff line change
`@@ -780,9 +780,9 @@ bool WebThreeStubServerBase::eth_submitWork(string const& _nonce, string const&,`
`780`	`780`	`}`
`781`	`781`	`}`
`782`	`782`
`783`		`-bool WebThreeStubServerBase::eth_submitHashrate(int _hashes, string const& _id)`
	`783`	`+bool WebThreeStubServerBase::eth_submitHashrate(std::string const& _hashes, string const& _id)`
`784`	`784`	`{`
`785`		`- client()->submitExternalHashrate(_hashes, jsToFixed<32>(_id));`
	`785`	`+ client()->submitExternalHashrate(std::stoi(_hashes, nullptr, 0), jsToFixed<32>(_id));`
`786`	`786`	`return true;`
`787`	`787`	`}`
`788`	`788`
Original file line number	Diff line number	Diff line change
`@@ -506,7 +506,7 @@ class WebThreeStubClient : public jsonrpc::Client`
`506`	`506`	`else`
`507`	`507`	`throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());`
`508`	`508`	`}`
`509`		`- bool eth_submitHashrate(int param1, const std::string& param2) throw (jsonrpc::JsonRpcException)`
	`509`	`+ bool eth_submitHashrate(const std::string& param1, const std::string& param2) throw (jsonrpc::JsonRpcException)`
`510`	`510`	`{`
`511`	`511`	`Json::Value p;`
`512`	`512`	`p.append(param1);`