Merge pull request #31 from ghost-coin/fix/avgr-blocks

Fix block rejection

Author: bleach86

configure.ac

@@ -1,7 +1,7 @@
 AC_PREREQ([2.69])
 define(_CLIENT_VERSION_MAJOR, 0)
 define(_CLIENT_VERSION_MINOR, 22)
-define(_CLIENT_VERSION_REVISION, 1)
+define(_CLIENT_VERSION_REVISION, 2)
 define(_CLIENT_VERSION_GHOST, 0)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_RC, 0)

src/validation.cpp

@@ -2135,7 +2135,10 @@ DisconnectResult CChainState::DisconnectBlock(const CBlock& block, const CBlockI
             std::size_t outputsSize = 0;
             for(const auto& tx: block.vtx) {
                 for (const auto& txout: tx->vpout) {
-                    if (txout->IsStandardOutput()) {
+                    CScript outScript;
+                    txout->GetScriptPubKey(outScript);
+
+                    if (outScript[0] != OP_RETURN && txout->IsStandardOutput()) {
                         outputsSize++;
                     }
                 }
@@ -3415,6 +3418,7 @@ bool CChainState::ConnectBlock(const CBlock& block, BlockValidationState& state,
                         rewardTracker.addAddressTransaction(pindex->nHeight, addr, txout->GetValue(), ::Params().GetGvrCheckpoints());
                         rewardUndo.outputs[pindex->nHeight].emplace_back(make_pair(addr, txout->GetValue()));
                     } else {
+                        if (outScript[0] == OP_RETURN) continue;
                         LogPrintf("%s Can't extract destination address for tracking outputs \n", __func__);
                         return error("ConnectBlock(): Can't extract destination address for outputs\n");
                     }

test/functional/feature_gvr3.py

@@ -11,6 +11,11 @@
     assert_equal
 )
 
+from test_framework.script import (
+    CScript,
+    OP_RETURN,
+)
+
 class GhostVeteranReward3Test(GhostTestFramework):
     def set_test_params(self):
         self.setup_clean_chain = True
@@ -101,6 +106,11 @@ def run_test(self):
         nodes[0].sendghosttoanon(node1_receiving_addr, 1000, '', '', False, 'node0 -> node1 p->a')
         self.stakeBlocks(1)
 
+        # Spending to DATA_OUTPUT 
+        burn_script = CScript([OP_RETURN, ])
+        nodes[0].sendtypeto('ghost', 'ghost', [{'address': 'script', 'amount': 10, 'script': burn_script.hex()},])
+        self.stakeBlocks(1)
+
         res = nodes[0].verifychain(3)
         assert_equal(res, True)