fixes for peercoin

peercoin · Apr 16, 2019 · 063fb52 · 063fb52
1 parent 9b27e47
commit 063fb52
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/src/server/poolserver/NetworkMgr/NetworkMgr.cpp b/src/server/poolserver/NetworkMgr/NetworkMgr.cpp
@@ -3,7 +3,7 @@
 
 NetworkMgr* NetworkMgr::singleton = 0;
 
-NetworkMgr::NetworkMgr(asio::io_service& io_service) : _io_service(io_service), _blockNotifyTimer(io_service), _blockCheckTimer(io_service), _blockHeight(0)
+NetworkMgr::NetworkMgr(asio::io_service& io_service) : _io_service(io_service), _blockNotifyTimer(io_service), _blockCheckTimer(io_service), _blockHeight(-1)
 {
     BlockCheckTimerStart();
     BlockNotifyTimerStart();
@@ -21,7 +21,7 @@ void NetworkMgr::Connect(JSONRPCConnectionInfo coninfo)
     JSONRPC* bitcoinrpc = new JSONRPC();
     bitcoinrpc->Connect(coninfo);
 
-    JSON response = bitcoinrpc->Query("getinfo");
+    JSON response = bitcoinrpc->Query("getblockchaininfo");
 
     if (response["error"].GetType() != JSON_NULL)
         throw Exception(Util::FS("Failed to get response from bitcoin rpc: %s", response["error"].GetString().c_str()));
@@ -61,8 +61,10 @@ void NetworkMgr::UpdateBlockTemplate()
 
             // Add coinbase tx
             BinaryData pubkey = Util::ASCIIToBin(sConfig.Get<std::string>("MiningAddress"));
-            block->tx.push_back(Bitcoin::CreateCoinbaseTX(_blockHeight, pubkey, response["coinbasevalue"].GetInt(), Util::ASCIIToBin("D7PoolBeta")));
-
+
+            block->tx.push_back(Bitcoin::CreateCoinbaseTX(_blockHeight+1, pubkey, response["coinbasevalue"].GetInt(), Util::ASCIIToBin("537061726B6C6572")));
+
+            //block->tx.push_back(Bitcoin::CreateCoinbaseTX(_blockHeight, pubkey, response["coinbasevalue"].GetInt(), Util::ASCIIToBin("706f6f6c6f766572")));
             // Fix nTime for coinbase tx
             block->tx[0].time = block->time;
 
@@ -131,10 +133,10 @@ void NetworkMgr::BlockCheck()
     for (int i = 0; i < _cons.size(); ++i)
     {
         try {
-            JSON response = _cons[i]->Query("getinfo");
+            JSON response = _cons[i]->Query("getblockchaininfo");
             uint32 curBlock = response["blocks"].GetInt();
 
-            if (curBlock > _blockHeight) {
+            if ((curBlock > _blockHeight) || _blockHeight == -1) {
                 sLog.Debug(LOG_SERVER, "New block on network! Height: %u", curBlock);
                 _blockHeight = curBlock;
 

diff --git a/src/server/poolserver/Stratum/Client.cpp b/src/server/poolserver/Stratum/Client.cpp
@@ -345,11 +345,12 @@ namespace Stratum
 
         // Split coinbase
         // tx.version                   - 4 bytes
+	// tx.timestamp                 - 4 bytes
         // tx.in[0].outpoint.hash       - 32 bytes
         // tx.in[0].outpoint.n          - 4 bytes
         // tx.script (varint)           - 2 bytes
         // tx.script (block height)     - 4 bytes
-        uint32 cbsplit = 4 + 32 + 4 + 2 + 4;
+        uint32 cbsplit = 4 + 4 + 32 + 4 + 2 + 4;
         job->coinbase1 = BinaryData(coinbase.begin(), coinbase.begin() + cbsplit);
         job->coinbase2 = BinaryData(coinbase.begin() + cbsplit + 8, coinbase.end()); // plus extranonce size
 

diff --git a/src/server/shared/Bitcoin/Bitcoin.h b/src/server/shared/Bitcoin/Bitcoin.h
@@ -39,7 +39,9 @@ namespace Bitcoin
         // Extranonce placeholder
         BinaryData extranonce_ph(8, 0);
         ByteBuffer scriptsig;
-        scriptsig << blockHeight << extranonce_ph << extras;
+	uint8 three=3;
+	scriptsig << three << blockHeight;
+        scriptsig << extranonce_ph << extras;
 
         Bitcoin::OutPoint outpoint;
         outpoint.hash.resize(32, 0);

diff --git a/src/server/shared/Logging/Log.cpp b/src/server/shared/Logging/Log.cpp
@@ -99,12 +99,12 @@ void Log::Write(LogLevel level, LogType type, std::string msg)
         case LOG_LEVEL_DEBUG:
             if (sConfig.Get<uint32_t>("LogConsoleLevel") >= level) {
                 uint32_t debugmask = sConfig.Get<uint32_t>("LogConsoleDebugMask");
-                if (debugmask & uint32_t(pow(2, type)))
+                if (debugmask & uint32_t(pow(2, static_cast<double>(type))))
                     std::cout << timestamp << " [DEBUG] " << msg << std::endl;
             }
             if (sConfig.Get<uint32_t>("LogFileLevel") >= level) {
                 uint32_t debugmask = sConfig.Get<uint32_t>("LogFileDebugMask");
-                if (debugmask & uint32_t(pow(2, type)))
+                if (debugmask & uint32_t(pow(2, static_cast<double>(type))))
                     AppendFile(timestamp + " [DEBUG] " + msg);
             }
             break;