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

change it, might be safter this way

Browse Source
This commit is contained in:
blackjok3r
2018-10-17 00:31:57 +08:00
parent a3b0c67415
commit b6b33147b1
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/komodo_bitcoind.h
View File

@@ -1582,10 +1582,18 @@ int32_t komodo_checkPOW(int32_t slowflag,CBlock *pblock,int32_t height)
return(-1); return(-1);
} }
} }
else if ( ASSETCHAINS_STREAM != 0 ) { else
{
if ( komodo_checkcommission(pblock,height) < 0 )
return(-1);
}
if ( ASSETCHAINS_STREAM != 0 && height > 128 )
{
int lasttx = ( pblock->vtx.size() -1 ); int lasttx = ( pblock->vtx.size() -1 );
uint256 hash; CTransaction tx;
printf("ABOUT TO CHECK LAST TX: %d\n",lasttx); printf("ABOUT TO CHECK LAST TX: %d\n",lasttx);
if ( lasttx == 0 )
return(-1);
uint256 hash; CTransaction tx;
if (GetTransaction(pblock->vtx[lasttx].vin[0].prevout.hash,tx,hash,false)) if (GetTransaction(pblock->vtx[lasttx].vin[0].prevout.hash,tx,hash,false))
{ {
printf("CHECKING THE script pubkey\n"); printf("CHECKING THE script pubkey\n");
@@ -1596,10 +1604,6 @@ int32_t komodo_checkPOW(int32_t slowflag,CBlock *pblock,int32_t height)
} }
printf("THE PUBKEY IS RIGHT! \n"); printf("THE PUBKEY IS RIGHT! \n");
} }
} else
{
if ( komodo_checkcommission(pblock,height) < 0 )
return(-1);
} }
} }
//fprintf(stderr,"komodo_checkPOW possible.%d slowflag.%d ht.%d notaryid.%d failed.%d\n",possible,slowflag,height,notaryid,failed); //fprintf(stderr,"komodo_checkPOW possible.%d slowflag.%d ht.%d notaryid.%d failed.%d\n",possible,slowflag,height,notaryid,failed);

9
src/wallet/rpcwallet.cpp
View File

@@ -4608,14 +4608,7 @@ int32_t komodo_notaryvin(CMutableTransaction &txNew,uint8_t *notarypub33)
// ((uint8_t *)&revtxid)[i] = ((uint8_t *)&utxotxid)[31 - i]; // ((uint8_t *)&revtxid)[i] = ((uint8_t *)&utxotxid)[31 - i];
txNew.vin[0].prevout.hash = utxotxid; //revtxid; txNew.vin[0].prevout.hash = utxotxid; //revtxid;
txNew.vin[0].prevout.n = utxovout; txNew.vin[0].prevout.n = utxovout;
if ( ASSETCHAINS_STREAM != 0 ) txNew.vout[0].nValue = utxovalue - txfee;
{
txNew.vout[0].nValue = 0;
}
else
{
txNew.vout[0].nValue = utxovalue - txfee;
}
txNew.vout[0].scriptPubKey = CScript() << ParseHex(CRYPTO777_PUBSECPSTR) << OP_CHECKSIG; txNew.vout[0].scriptPubKey = CScript() << ParseHex(CRYPTO777_PUBSECPSTR) << OP_CHECKSIG;
CTransaction txNewConst(txNew); CTransaction txNewConst(txNew);
signSuccess = ProduceSignature(TransactionSignatureCreator(&keystore, &txNewConst, 0, utxovalue, SIGHASH_ALL), best_scriptPubKey, sigdata, consensusBranchId); signSuccess = ProduceSignature(TransactionSignatureCreator(&keystore, &txNewConst, 0, utxovalue, SIGHASH_ALL), best_scriptPubKey, sigdata, consensusBranchId);