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 08:00:44 -11:00
parent fc00ea5f5c
commit d558f6e581
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/cc/assets.cpp
View File

@@ -344,7 +344,7 @@ bool GetCCaddress(uint8_t evalcode,char *destaddr,CPubKey pk)
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)
{ {
std::vector<uint8_t> vopret; uint8_t funcid=0,*script; std::vector<uint8_t> vopret; uint8_t funcid=0,*script,e,f;
GetOpReturnData(scriptPubKey, vopret); GetOpReturnData(scriptPubKey, vopret);
script = (uint8_t *)vopret.data(); script = (uint8_t *)vopret.data();
memset(&assetid,0,sizeof(assetid)); memset(&assetid,0,sizeof(assetid));
@@ -357,23 +357,23 @@ uint8_t DecodeOpRet(const CScript &scriptPubKey,uint256 &assetid,uint256 &asseti
switch ( funcid ) switch ( funcid )
{ {
case 't': case 'x': case 'o': case 't': case 'x': case 'o':
if ( E_UNMARSHAL(vopret, ss >> assetid) != 0 ) if ( E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> assetid) != 0 )
{ {
int32_t i; for (i=31; i>=0; i--) int32_t i; for (i=0; i<32; i++)
fprintf(stderr,"%02x",((uint8_t *)&assetid)[i]); fprintf(stderr,"%02x",((uint8_t *)&assetid)[i]);
fprintf(stderr," got assetid\n"); fprintf(stderr," got assetid\n");
return(funcid); return(funcid);
} }
break; break;
case 's': case 'b': case 'S': case 'B': case 's': case 'b': case 'S': case 'B':
if ( E_UNMARSHAL(vopret, ss >> assetid; ss >> price; ss >> origpubkey) != 0 ) if ( E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> assetid; ss >> price; ss >> origpubkey) != 0 )
{ {
fprintf(stderr,"got price %llu\n",(long long)price); fprintf(stderr,"got price %llu\n",(long long)price);
return(funcid); return(funcid);
} }
break; break;
case 'E': case 'e': case 'E': case 'e':
if ( E_UNMARSHAL(vopret, ss >> assetid; ss >> assetid2; ss >> price; ss >> origpubkey) != 0 ) if ( E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> assetid; ss >> assetid2; ss >> price; ss >> origpubkey) != 0 )
return(funcid); return(funcid);
break; break;
default: default: