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
2018-07-21 02:36:04 -11:00
parent 9a579b3083
commit b06e1a9383
1 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/cc/assets.cpp
View File

@@ -225,12 +225,17 @@ CScript EncodeOpRet(uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t pri
bool Getscriptaddress(char *destaddr,const CScript &scriptPubKey) bool Getscriptaddress(char *destaddr,const CScript &scriptPubKey)
{ {
CTxDestination address; CTxDestination address; txnouttype whichType;
if ( ExtractDestination(scriptPubKey,address) != 0 ) if ( IsStandard(scriptPubKey,whichType) != 0 )
{ {
strcpy(destaddr,(char *)CBitcoinAddress(address).ToString().c_str()); if ( ExtractDestination(scriptPubKey,address) != 0 )
return(true); {
strcpy(destaddr,(char *)CBitcoinAddress(address).ToString().c_str());
return(true);
}
fprintf(stderr,"ExtractDestination failed\n");
} }
fprintf(stderr,"Getscriptaddress nonstandard\n");
return(false); return(false);
} }
@@ -262,7 +267,9 @@ 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);
fprintf(stderr,"found privkey!\n"); for (i=0; i<32; i++)
fprintf(stderr,"%02x",myprivkey[i]);
fprintf(stderr," found privkey!\n");
} }
#endif #endif
} }
@@ -302,14 +309,18 @@ CC *MakeCC(uint8_t evalcode,CPubKey pk)
bool GetCCaddress(uint8_t evalcode,char *destaddr,CPubKey pk) bool GetCCaddress(uint8_t evalcode,char *destaddr,CPubKey pk)
{ {
CC *payoutCond; CC *payoutCond;
destaddr[0] = 0;
if ( evalcode == EVAL_ASSETS ) if ( evalcode == EVAL_ASSETS )
{ {
payoutCond = MakeAssetCond(pk); if ( (payoutCond= MakeAssetCond(pk)) != 0 )
destaddr[0] = 0; {
Getscriptaddress(destaddr,CCPubKey(payoutCond)); Getscriptaddress(destaddr,CCPubKey(payoutCond));
cc_free(payoutCond); cc_free(payoutCond);
}
return(destaddr[0] != 0); return(destaddr[0] != 0);
} else return false; }
fprintf(stderr,"%02x is invalid evalcode\n",evalcode);
return false;
} }
uint8_t DecodeOpRet(const CScript &scriptPubKey,uint256 &assetid,uint256 &assetid2,uint64_t &price,std::vector<uint8_t> &origpubkey) uint8_t DecodeOpRet(const CScript &scriptPubKey,uint256 &assetid,uint256 &assetid2,uint64_t &price,std::vector<uint8_t> &origpubkey)
@@ -505,10 +516,12 @@ std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,
} }
} 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());
} }
fprintf(stderr,"do cc_frees\n");
if ( mycond != 0 ) if ( mycond != 0 )
cc_free(mycond); cc_free(mycond);
if ( othercond != 0 ) if ( othercond != 0 )
cc_free(othercond); cc_free(othercond);
fprintf(stderr,"did cc_frees\n");
if ( totalinputs >= totaloutputs+2*txfee ) if ( totalinputs >= totaloutputs+2*txfee )
{ {
change = totalinputs - (totaloutputs+txfee); change = totalinputs - (totaloutputs+txfee);