This commit is contained in:
jl777
2019-07-13 07:49:00 -11:00
parent 575b65ab10
commit 37a9a0b8a8
2 changed files with 12 additions and 9 deletions

View File

@@ -284,13 +284,16 @@ std::string FinalizeCCTx(uint64_t CCmask,struct CCcontract_info *cp,CMutableTran
} }
} }
uint256 sighash = SignatureHash(CCPubKey(cond), mtx, i, SIGHASH_ALL,utxovalues[i],consensusBranchId, &txdata); uint256 sighash = SignatureHash(CCPubKey(cond), mtx, i, SIGHASH_ALL,utxovalues[i],consensusBranchId, &txdata);
int32_t z; if ( 0 )
for (z=0; z<32; z++) {
fprintf(stderr,"%02x",privkey[z]); int32_t z;
fprintf(stderr," privkey, "); for (z=0; z<32; z++)
for (z=0; z<32; z++) fprintf(stderr,"%02x",privkey[z]);
fprintf(stderr,"%02x",((uint8_t *)sighash.begin())[z]); fprintf(stderr," privkey, ");
fprintf(stderr," sighash [%d] %.8f %x\n",i,(double)utxovalues[i]/COIN,consensusBranchId); for (z=0; z<32; z++)
fprintf(stderr,"%02x",((uint8_t *)sighash.begin())[z]);
fprintf(stderr," sighash [%d] %.8f %x\n",i,(double)utxovalues[i]/COIN,consensusBranchId);
}
if ( cc_signTreeSecp256k1Msg32(cond,privkey,sighash.begin()) != 0 ) if ( cc_signTreeSecp256k1Msg32(cond,privkey,sighash.begin()) != 0 )
{ {
mtx.vin[i].scriptSig = CCSig(cond); mtx.vin[i].scriptSig = CCSig(cond);

View File

@@ -158,11 +158,11 @@ int64_t AddFaucetInputs(struct CCcontract_info *cp,CMutableTransaction &mtx,CPub
vout = (int32_t)it->first.index; vout = (int32_t)it->first.index;
if ( it->second.satoshis < threshold ) if ( it->second.satoshis < threshold )
continue; continue;
char str[65]; fprintf(stderr,"check %s/v%d %.8f`\n",uint256_str(str,txid),vout,(double)it->second.satoshis/COIN); //char str[65]; fprintf(stderr,"check %s/v%d %.8f`\n",uint256_str(str,txid),vout,(double)it->second.satoshis/COIN);
// no need to prevent dup // no need to prevent dup
if ( myGetTransaction(txid,vintx,hashBlock) != 0 ) if ( myGetTransaction(txid,vintx,hashBlock) != 0 )
{ {
if ( KOMODO_NSPV != 0 || ((nValue= IsFaucetvout(cp,vintx,vout)) > 1000000 && myIsutxo_spentinmempool(ignoretxid,ignorevin,txid,vout) == 0) ) if ( (nValue= IsFaucetvout(cp,vintx,vout)) > 1000000 && myIsutxo_spentinmempool(ignoretxid,ignorevin,txid,vout) == 0 )
{ {
if ( total != 0 && maxinputs != 0 ) if ( total != 0 && maxinputs != 0 )
mtx.vin.push_back(CTxIn(txid,vout,CScript())); mtx.vin.push_back(CTxIn(txid,vout,CScript()));