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

Fix mask

Browse Source
This commit is contained in:
jl777
2018-07-27 08:46:15 -11:00
parent 8bbfc238ac
commit 161d322e69
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/cc/CCtx.cpp
View File

@@ -47,16 +47,12 @@ std::string FinalizeCCTx(uint64_t CCmask,struct CCcontract_info *cp,CMutableTran
{ {
if ( mtx.vout[i].scriptPubKey.IsPayToCryptoCondition() == 0 ) if ( mtx.vout[i].scriptPubKey.IsPayToCryptoCondition() == 0 )
totaloutputs += mtx.vout[i].nValue; totaloutputs += mtx.vout[i].nValue;
else mask |= (1LL << i);
} }
if ( (n= mtx.vin.size()) > 64 ) if ( (n= mtx.vin.size()) > 64 )
{ {
fprintf(stderr,"FinalizeCCTx: %d is too many vins\n",n); fprintf(stderr,"FinalizeCCTx: %d is too many vins\n",n);
return(0); return(0);
} }
nmask = (1LL << n) - 1;
if ( (mask & nmask) != (CCmask & nmask) )
fprintf(stderr,"mask.%llx vs CCmask.%llx %llx %llx %llx\n",(long long)(mask & nmask),(long long)(CCmask & nmask),(long long)mask,(long long)CCmask,(long long)nmask);
Myprivkey(myprivkey); Myprivkey(myprivkey);
unspendablepk = GetUnspendable(cp,unspendablepriv); unspendablepk = GetUnspendable(cp,unspendablepriv);
GetCCaddress(cp,myaddr,mypk); GetCCaddress(cp,myaddr,mypk);
@@ -79,9 +75,13 @@ std::string FinalizeCCTx(uint64_t CCmask,struct CCcontract_info *cp,CMutableTran
} }
else else
{ {
else mask |= (1LL << i);
} }
} else fprintf(stderr,"FinalizeCCTx couldnt find %s\n",mtx.vin[i].prevout.hash.ToString().c_str()); } else fprintf(stderr,"FinalizeCCTx couldnt find %s\n",mtx.vin[i].prevout.hash.ToString().c_str());
} }
nmask = (1LL << n) - 1;
if ( (mask & nmask) != (CCmask & nmask) )
fprintf(stderr,"mask.%llx vs CCmask.%llx %llx %llx %llx\n",(long long)(mask & nmask),(long long)(CCmask & nmask),(long long)mask,(long long)CCmask,(long long)nmask);
if ( totalinputs >= totaloutputs+2*txfee ) if ( totalinputs >= totaloutputs+2*txfee )
{ {
change = totalinputs - (totaloutputs+txfee); change = totalinputs - (totaloutputs+txfee);

2
src/cc/CCutils.cpp
View File

@@ -228,7 +228,7 @@ bool Myprivkey(uint8_t myprivkey[])
if ( pwalletMain->GetKey(keyID,vchSecret) != 0 ) if ( pwalletMain->GetKey(keyID,vchSecret) != 0 )
{ {
memcpy(myprivkey,vchSecret.begin(),32); memcpy(myprivkey,vchSecret.begin(),32);
if ( 1 ) if ( 0 )
{ {
for (i=0; i<32; i++) for (i=0; i<32; i++)
fprintf(stderr,"0x%02x, ",myprivkey[i]); fprintf(stderr,"0x%02x, ",myprivkey[i]);