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

Cmp refund to fundingaddr

Browse Source
This commit is contained in:
jl777
2018-11-08 21:04:47 -11:00
parent eafdbeb6ed
commit eb36c925f1
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/cc/dice.cpp
View File

@@ -842,7 +842,6 @@ bool DiceValidate(struct CCcontract_info *cp,Eval *eval,const CTransaction &tx)
return eval->Invalid("always should find vinofvin.0, but didnt for bet"); return eval->Invalid("always should find vinofvin.0, but didnt for bet");
else if ( vinTx.vin[0].prevout.hash != fundingtxid ) else if ( vinTx.vin[0].prevout.hash != fundingtxid )
{ {
//if ( vinofvinTx.vout[1].scriptPubKey != fundingPubKey )
if ( (int32_t)vinTx.vin[0].prevout.n < 0 || vinofvinTx.vout[vinTx.vin[0].prevout.n].scriptPubKey != fundingPubKey ) if ( (int32_t)vinTx.vin[0].prevout.n < 0 || vinofvinTx.vout[vinTx.vin[0].prevout.n].scriptPubKey != fundingPubKey )
{ {
uint8_t *ptr0,*ptr1; int32_t i; char str[65]; uint8_t *ptr0,*ptr1; int32_t i; char str[65];
@@ -950,7 +949,16 @@ bool DiceValidate(struct CCcontract_info *cp,Eval *eval,const CTransaction &tx)
if ( eval->GetTxUnconfirmed(tx.vin[0].prevout.hash,vinTx,hashBlock) == 0 ) if ( eval->GetTxUnconfirmed(tx.vin[0].prevout.hash,vinTx,hashBlock) == 0 )
return eval->Invalid("always should find vin.0, but didnt for refund"); return eval->Invalid("always should find vin.0, but didnt for refund");
else if ( vinTx.vout[tx.vin[0].prevout.n].scriptPubKey != fundingPubKey ) else if ( vinTx.vout[tx.vin[0].prevout.n].scriptPubKey != fundingPubKey )
return eval->Invalid("vin.0 not from fundingPubKey for refund"); {
char fundingaddr[64],cmpaddr[64];
Getscriptaddress(fundingaddr,fundingPubKey);
Getscriptaddress(cmpaddr,vinTx.vout[tx.vin[0].prevout.n].scriptPubKey);
if ( strcmp(cmpaddr,fundingaddr) != 0 )
{
fprintf(stderr,"cmpaddr.%s != fundingaddr.%s\n",cmpaddr,fundingaddr);
return eval->Invalid("vin.0 not from fundingPubKey for refund");
}
}
if ( (rand() % 100) == 0 ) if ( (rand() % 100) == 0 )
fprintf(stderr,"add more validation for refunds\n"); fprintf(stderr,"add more validation for refunds\n");
break; break;