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

Merge pull request #1483 from blackjok3rtt/jl777

Browse Source 
payments merge bug fix
This commit is contained in:
jl777
2019-05-15 06:15:41 -11:00
committed by GitHub
parent 06ed5c0525 aa919f3847
commit 4b47cd338d
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/cc/payments.cpp
View File

@@ -326,11 +326,6 @@ bool PaymentsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &
return(eval->Invalid("negative values")); return(eval->Invalid("negative values"));
if ( minimum < 10000 ) if ( minimum < 10000 )
return(eval->Invalid("minimum must be over 10000")); return(eval->Invalid("minimum must be over 10000"));
if ( amountReleased < minrelease*COIN )
{
fprintf(stderr, "does not meet minrelease amount.%li minrelease.%li\n",amountReleased, (int64_t)minrelease*COIN);
return(eval->Invalid("amount is too small"));
}
Paymentspk = GetUnspendable(cp,0); Paymentspk = GetUnspendable(cp,0);
txidpk = CCtxidaddr(txidaddr,createtxid); txidpk = CCtxidaddr(txidaddr,createtxid);
GetCCaddress1of2(cp,txidaddr,Paymentspk,txidpk); GetCCaddress1of2(cp,txidaddr,Paymentspk,txidpk);
@@ -343,6 +338,11 @@ bool PaymentsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &
if ( !fIsMerge ) if ( !fIsMerge )
{ {
if ( amountReleased < minrelease*COIN )
{
fprintf(stderr, "does not meet minrelease amount.%li minrelease.%li\n",amountReleased, (int64_t)minrelease*COIN);
return(eval->Invalid("amount is too small"));
}
// Get all the script pubkeys and allocations // Get all the script pubkeys and allocations
std::vector<int64_t> allocations; std::vector<int64_t> allocations;
std::vector<CScript> scriptPubKeys; std::vector<CScript> scriptPubKeys;