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

Count all vins and bouts

Browse Source
This commit is contained in:
jl777
2018-07-21 03:42:11 -11:00
parent 7d03ac603b
commit 7eecd6a6ac
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/cc/assets.cpp
View File

@@ -251,7 +251,7 @@ std::vector<uint8_t> Mypubkey()
return(pubkey); return(pubkey);
} }
void Myprivkey(uint8_t myprivkey[]) bool Myprivkey(uint8_t myprivkey[])
{ {
char coinaddr[64]; std::string strAddress; char *dest; int32_t i,n; CBitcoinAddress address; CKeyID keyID; CKey vchSecret; char coinaddr[64]; std::string strAddress; char *dest; int32_t i,n; CBitcoinAddress address; CKeyID keyID; CKey vchSecret;
if ( Getscriptaddress(coinaddr,CScript() << Mypubkey() << OP_CHECKSIG) != 0 ) if ( Getscriptaddress(coinaddr,CScript() << Mypubkey() << OP_CHECKSIG) != 0 )
@@ -268,13 +268,16 @@ void 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);
for (i=0; i<32; i++) //for (i=0; i<32; i++)
fprintf(stderr,"%02x",myprivkey[i]); // fprintf(stderr,"%02x",myprivkey[i]);
fprintf(stderr," found privkey!\n"); //fprintf(stderr," found privkey!\n");
return(true);
} }
#endif #endif
} }
} }
fprintf(stderr,"privkey for the -pubkey= address is not in the wallet, importprivkey!\n");
return(false);
} }
CC *MakeAssetCond(CPubKey pk) CC *MakeAssetCond(CPubKey pk)
@@ -467,7 +470,7 @@ std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,
n = mtx.vout.size(); n = mtx.vout.size();
for (i=0; i<n; i++) for (i=0; i<n; i++)
{ {
if ( mtx.vout[i].scriptPubKey.IsPayToCryptoCondition() == 0 ) //if ( mtx.vout[i].scriptPubKey.IsPayToCryptoCondition() == 0 )
totaloutputs += mtx.vout[i].nValue; totaloutputs += mtx.vout[i].nValue;
} }
if ( (n= mtx.vin.size()) > 64 ) if ( (n= mtx.vin.size()) > 64 )
@@ -487,11 +490,11 @@ std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,
{ {
if ( GetTransaction(mtx.vin[i].prevout.hash,vintx,hashBlock,false) != 0 ) if ( GetTransaction(mtx.vin[i].prevout.hash,vintx,hashBlock,false) != 0 )
{ {
utxovalues[i] = vintx.vout[mtx.vin[i].prevout.n].nValue;
totalinputs += utxovalues[i];
if ( IsCCInput(mtx.vin[i].scriptSig) == 0 ) if ( IsCCInput(mtx.vin[i].scriptSig) == 0 )
{ {
vinimask |= (1LL << i); vinimask |= (1LL << i);
utxovalues[i] = vintx.vout[mtx.vin[i].prevout.n].nValue;
totalinputs += utxovalues[i];
} }
else else
{ {