Merge pull request #1598 from Alrighttt/jl777

joker's payment fix and safer magic for ac_cbmaturity
2019-07-09 19:52:20 -11:00
parent 5d1600e289 3596b0d021
commit 52bec46cdb
2 changed files with 3 additions and 1 deletions
--- a/src/cc/payments.cpp
+++ b/src/cc/payments.cpp
@@ -314,6 +314,8 @@ bool PaymentsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &
            fIsMerge = true;
        else if ( DecodePaymentsReleaseOpRet(ccopret,createtxid,amountReleased) != 'R' )
            return(eval->Invalid("could not decode ccopret"));
+        if ( tx.vout.back().scriptPubKey.IsOpReturn() )
+            fHasOpret = true;
        mpz_set_si(mpzCheckamount,amountReleased); 
    } else return(eval->Invalid("could not decode ccopret"));