Better strict control on blocknumber (if passed)

mengz0 · Nov 28, 2018 · 5b6af91 · 5b6af91
1 parent 67dcbfb
commit 5b6af91
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/libpoolprotocols/stratum/EthStratumClient.cpp b/libpoolprotocols/stratum/EthStratumClient.cpp
@@ -1243,25 +1243,29 @@ void EthStratumClient::processResponse(Json::Value& responseObject)
                     // Only some eth-proxy compatible implementations carry the block number
                     // namely ethermine.org
                     m_current.block = -1;
-                    if (m_conn->StratumMode() ==
-                        EthStratumClient::ETHPROXY && jPrm.size() > prmIdx)
+                    if (m_conn->StratumMode() == EthStratumClient::ETHPROXY &&
+                        jPrm.size() > prmIdx &&
+                        jPrm.get(Json::Value::ArrayIndex(prmIdx), "").asString().substr(0, 2) ==
+                            "0x")
                     {
                         try
                         {
                             m_current.block = std::stoul(
                                 jPrm.get(Json::Value::ArrayIndex(prmIdx), "").asString(), nullptr,
                                 16);
-                            /* check if the block number is in a valid range
-                                A year has ~31536000 seconds
-                                50 years have ~1576800000
-                                assuming a (very fast) blocktime of 10s:
-                                   ==> in 50 years we get 157680000 (=0x9660180) blocks
+                            /*
+                            check if the block number is in a valid range
+                            A year has ~31536000 seconds
+                            50 years have ~1576800000
+                            assuming a (very fast) blocktime of 10s:
+                            ==> in 50 years we get 157680000 (=0x9660180) blocks
                             */
                             if (m_current.block > 0x9660180)
-                                m_current.block = -1;
+                                throw new std::exception();
                         }
                         catch (const std::exception&)
                         {
+                            m_current.block = -1;
                         }
                     }