DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Fix

Browse Source
This commit is contained in:
jl777
2019-01-15 04:52:18 -11:00
parent 6dc61c6bcf
commit 3e2991000f
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/cc/marmara.cpp
View File

@@ -195,6 +195,7 @@ int32_t MarmaraValidateCoinbase(int32_t height,CTransaction tx)
{ {
struct CCcontract_info *cp,C; CPubKey pk; int32_t ht,unlockht; CTxOut ccvout; struct CCcontract_info *cp,C; CPubKey pk; int32_t ht,unlockht; CTxOut ccvout;
cp = CCinit(&C,EVAL_MARMARA); cp = CCinit(&C,EVAL_MARMARA);
Marmarapk = GetUnspendable(cp,0);
if ( 0 ) if ( 0 )
{ {
int32_t d,histo[365*2+30]; int32_t d,histo[365*2+30];
@@ -222,7 +223,7 @@ int32_t MarmaraValidateCoinbase(int32_t height,CTransaction tx)
if ( ht == height && MarmaraUnlockht(height) == unlockht ) if ( ht == height && MarmaraUnlockht(height) == unlockht )
{ {
//fprintf(stderr,"ht.%d -> unlock.%d\n",ht,unlockht); //fprintf(stderr,"ht.%d -> unlock.%d\n",ht,unlockht);
ccvout = MakeCC1vout(EVAL_MARMARA,0,pk); ccvout = MakeCC1of2vout(EVAL_MARMARA,0,Marmarapk,pk);
if ( ccvout.scriptPubKey == tx.vout[0].scriptPubKey ) if ( ccvout.scriptPubKey == tx.vout[0].scriptPubKey )
return(0); return(0);
fprintf(stderr,"ht.%d mismatched CCvout scriptPubKey\n",height); fprintf(stderr,"ht.%d mismatched CCvout scriptPubKey\n",height);