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-09-10 07:12:36 -11:00
parent 2aba50957a
commit 03c7ae9ed9
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/cc/gateways.cpp
View File

@@ -433,7 +433,7 @@ uint256 GatewaysReverseScan(uint256 &txid,int32_t height,uint256 reforacletxid,u
int64_t GatewaysVerify(char *refdepositaddr,uint256 oracletxid,int32_t claimvout,std::string refcoin,uint256 cointxid,const std::string deposithex,std::vector<uint8_t>proof,uint256 merkleroot,std::vector<uint8_t>redeemscript) int64_t GatewaysVerify(char *refdepositaddr,uint256 oracletxid,int32_t claimvout,std::string refcoin,uint256 cointxid,const std::string deposithex,std::vector<uint8_t>proof,uint256 merkleroot,std::vector<uint8_t>redeemscript)
{ {
uint256 hashBlock,txid = zeroid; CTransaction tx; std::string name,description,format; char destaddr[64],str[65]; int32_t i,offset,numvouts; int64_t nValue = 0; uint256 hashBlock,txid = zeroid; CTransaction tx; std::string name,description,format; char destaddr[64],str[65]; int32_t i,numvouts; int64_t nValue = 0;
if ( GetTransaction(oracletxid,tx,hashBlock,false) == 0 || (numvouts= tx.vout.size()) <= 0 ) if ( GetTransaction(oracletxid,tx,hashBlock,false) == 0 || (numvouts= tx.vout.size()) <= 0 )
{ {
fprintf(stderr,"GatewaysVerify cant find oracletxid %s\n",uint256_str(str,oracletxid)); fprintf(stderr,"GatewaysVerify cant find oracletxid %s\n",uint256_str(str,oracletxid));
@@ -446,16 +446,12 @@ int64_t GatewaysVerify(char *refdepositaddr,uint256 oracletxid,int32_t claimvout
} }
if ( DecodeHexTx(tx,deposithex) != 0 ) if ( DecodeHexTx(tx,deposithex) != 0 )
{ {
//scriptPubKey = redeemscript;
for (i=0; i<numvouts; i++) for (i=0; i<numvouts; i++)
{ {
Getscriptaddress(destaddr,tx.vout[i].scriptPubKey); Getscriptaddress(destaddr,tx.vout[i].scriptPubKey);
if ( strcmp(refdepositaddr,destaddr) == 0 ) if ( strcmp(refdepositaddr,destaddr) == 0 )
{ {
if ( redeemscript.size() < 0x100 ) if ( redeemscript.size() == tx.vout[claimvout].scriptPubKey.size() && memcmp(&redeemscript,&tx.vout[claimvout].scriptPubKey,redeemscript.size()) == 0 )
offset = 1;
else offset = 2;
if ( redeemscript.size()-offset == tx.vout[claimvout].scriptPubKey.size() && memcmp(&redeemscript+offset,&tx.vout[claimvout].scriptPubKey,redeemscript.size()) == 0 )
{ {
txid = tx.GetHash(); txid = tx.GetHash();
nValue = tx.vout[i].nValue; nValue = tx.vout[i].nValue;
@@ -464,10 +460,10 @@ int64_t GatewaysVerify(char *refdepositaddr,uint256 oracletxid,int32_t claimvout
else else
{ {
int j; int j;
for (j=0; j<25; j++) for (j=0; j<redeemscript.size(); j++)
fprintf(stderr,"%02x",((uint8_t *)redeemscript.data())[j]); fprintf(stderr,"%02x",((uint8_t *)redeemscript.data())[j]);
fprintf(stderr," redeemscript\n"); fprintf(stderr," redeemscript\n");
for (j=0; j<25; j++) for (j=0; j<tx.vout[claimvout].scriptPubKey.size(); j++)
fprintf(stderr,"%02x",((uint8_t *)tx.vout[claimvout].scriptPubKey.data())[j]); fprintf(stderr,"%02x",((uint8_t *)tx.vout[claimvout].scriptPubKey.data())[j]);
fprintf(stderr," claimvout.%d scriptPubKey mismatch\n",claimvout); fprintf(stderr," claimvout.%d scriptPubKey mismatch\n",claimvout);
} }