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

Test

Browse Source
This commit is contained in:
jl777
2019-01-15 05:30:48 -11:00
parent 97f40221f9
commit 1d946f8812
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/cc/marmara.cpp
View File

@@ -181,9 +181,9 @@ CScript Marmara_scriptPubKey(int32_t height,CPubKey pk)
if ( height > 0 && (height & 1) == 0 && pk.size() == 33 ) if ( height > 0 && (height & 1) == 0 && pk.size() == 33 )
{ {
ccvout = MakeCC1of2vout(EVAL_MARMARA,0,Marmarapk,pk); ccvout = MakeCC1of2vout(EVAL_MARMARA,0,Marmarapk,pk);
char coinaddr[64]; //char coinaddr[64];
Getscriptaddress(coinaddr,ccvout.scriptPubKey); //Getscriptaddress(coinaddr,ccvout.scriptPubKey);
fprintf(stderr,"Marmara_scriptPubKey %s ht.%d -> %s\n",HexStr(pk).c_str(),height,coinaddr); //fprintf(stderr,"Marmara_scriptPubKey %s ht.%d -> %s\n",HexStr(pk).c_str(),height,coinaddr);
} }
return(ccvout.scriptPubKey); return(ccvout.scriptPubKey);
} }

2
src/miner.cpp
View File

@@ -548,7 +548,7 @@ CBlockTemplate* CreateNewBlock(CPubKey _pk,const CScript& _scriptPubKeyIn, int32
{ {
char checkaddr[64]; char checkaddr[64];
Getscriptaddress(checkaddr,txNew.vout[0].scriptPubKey); Getscriptaddress(checkaddr,txNew.vout[0].scriptPubKey);
fprintf(stderr,"set mining coinbase -> %s\n",checkaddr); //`fprintf(stderr,"set mining coinbase -> %s\n",checkaddr);
txNew.vout.resize(2); txNew.vout.resize(2);
txNew.vout[1].nValue = 0; txNew.vout[1].nValue = 0;
txNew.vout[1].scriptPubKey = MarmaraCoinbaseOpret('C',nHeight,pk); txNew.vout[1].scriptPubKey = MarmaraCoinbaseOpret('C',nHeight,pk);