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 07:36:32 -11:00
parent 3f92539f81
commit 5c61755daa
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/cc/assets.cpp
View File

@@ -346,10 +346,7 @@ uint8_t DecodeOpRet(const CScript &scriptPubKey,uint256 &assetid,uint256 &asseti
fprintf(stderr,"decode.[%c]\n",funcid); fprintf(stderr,"decode.[%c]\n",funcid);
switch ( funcid ) switch ( funcid )
{ {
case 'o': case 't': case 'x': case 'o':
return(funcid);
break;
case 't': case 'x':
if ( E_UNMARSHAL(vopret, ss >> assetid) != 0 ) if ( E_UNMARSHAL(vopret, ss >> assetid) != 0 )
return(funcid); return(funcid);
break; break;
@@ -490,7 +487,7 @@ std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,
mycond = MakeCC(evalcode,mypk); mycond = MakeCC(evalcode,mypk);
GetCCaddress(evalcode,unspendable,unspendablepk); GetCCaddress(evalcode,unspendable,unspendablepk);
othercond = MakeCC(evalcode,unspendablepk); othercond = MakeCC(evalcode,unspendablepk);
fprintf(stderr,"myCCaddr.(%s) %p vs unspendable.(%s) %p\n",myaddr,mycond,unspendable,othercond); //fprintf(stderr,"myCCaddr.(%s) %p vs unspendable.(%s) %p\n",myaddr,mycond,unspendable,othercond);
memset(utxovalues,0,sizeof(utxovalues)); memset(utxovalues,0,sizeof(utxovalues));
for (i=0; i<n; i++) for (i=0; i<n; i++)
{ {
@@ -501,7 +498,7 @@ std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,
totalinputs += utxovalues[i]; totalinputs += utxovalues[i];
if ( vintx.vout[utxovout].scriptPubKey.IsPayToCryptoCondition() == 0 ) if ( vintx.vout[utxovout].scriptPubKey.IsPayToCryptoCondition() == 0 )
{ {
fprintf(stderr,"vin.%d is normal %.8f\n",i,(double)utxovalues[i]/COIN); //fprintf(stderr,"vin.%d is normal %.8f\n",i,(double)utxovalues[i]/COIN);
vinimask |= (1LL << i); vinimask |= (1LL << i);
} }
else else
@@ -530,18 +527,18 @@ std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,
else else
{ {
Getscriptaddress(destaddr,vintx.vout[utxovout].scriptPubKey); Getscriptaddress(destaddr,vintx.vout[utxovout].scriptPubKey);
fprintf(stderr,"vin.%d is CC %.8f -> (%s)\n",i,(double)utxovalues[i]/COIN,destaddr); //fprintf(stderr,"vin.%d is CC %.8f -> (%s)\n",i,(double)utxovalues[i]/COIN,destaddr);
if ( strcmp(destaddr,myaddr) == 0 ) if ( strcmp(destaddr,myaddr) == 0 )
{ {
privkey = myprivkey; privkey = myprivkey;
cond = mycond; cond = mycond;
fprintf(stderr,"my CC addr.(%s)\n",myaddr); //fprintf(stderr,"my CC addr.(%s)\n",myaddr);
} }
else if ( strcmp(destaddr,unspendable) == 0 ) else if ( strcmp(destaddr,unspendable) == 0 )
{ {
privkey = unspendablepriv; privkey = unspendablepriv;
cond = othercond; cond = othercond;
fprintf(stderr,"unspendable CC addr.(%s)\n",unspendable); //fprintf(stderr,"unspendable CC addr.(%s)\n",unspendable);
} }
else else
{ {