for external mining (p2/pools)

neiros · Jun 30, 2018 · aa18110 · aa18110
1 parent 3dc4b93
commit aa18110
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 1 deletion.
diff --git a/src/clientversion.h b/src/clientversion.h
@@ -9,7 +9,7 @@
 #define CLIENT_VERSION_MAJOR       0
 #define CLIENT_VERSION_MINOR       8
 #define CLIENT_VERSION_REVISION    217    // 99
-#define CLIENT_VERSION_BUILD       6
+#define CLIENT_VERSION_BUILD       7
 
 // Set to true for release, false for prerelease or test build                          Установите true для релиза, false для предварительной или тестовой сборки
 #define CLIENT_VERSION_IS_RELEASE  true     // false

diff --git a/src/main.h b/src/main.h
@@ -1386,6 +1386,7 @@ struct CBlockTemplate
     std::vector<int64_t> vTxFees;
     std::vector<int64_t> vTxSigOps;
     CBigNum sumTrDif;
+    std::vector<CTxOut> vBackWhither;  // сколько куда
 };
 
 

diff --git a/src/miner.cpp b/src/miner.cpp
@@ -503,6 +503,8 @@ CBlockTemplate* CreateNewBlock(CReserveKey& reservekey)
                         {
                             pblock->vtx[0].vout.push_back(CTxOut(ret, vecTxHashPriority[cp].get<1>().scriptPubKey));
                             NewCoin -= ret;
+
+                            pblocktemplate->vBackWhither.push_back(CTxOut(ret, vecTxHashPriority[cp].get<1>().scriptPubKey)); // сколько куда
                         }
                     }
                     else

diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp
@@ -704,6 +704,19 @@ Value getblocktemplate(const Array& params, bool fHelp)
     result.push_back(Pair("bits", HexBits(pblock->nBits)));
     result.push_back(Pair("height", (int64_t)(pindexPrev->nHeight+1)));
 
+    Array FeeBack;
+    for (unsigned int i = 0; pblocktemplate->vBackWhither.size() > i; i++)
+    {
+        Object entry;
+
+        CDataStream TxOut(SER_NETWORK, PROTOCOL_VERSION);
+        TxOut << pblocktemplate->vBackWhither[i];
+
+        entry.push_back(Pair("BackWhither", HexStr(TxOut.begin(), TxOut.end())));
+        FeeBack.push_back(entry);
+    }
+    result.push_back(Pair("FeeBack", FeeBack));
+
     return result;
 }