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

Merge pull request #986 from jl777/jl777

Browse Source 
Jl777
This commit is contained in:
jl777
2018-11-26 08:52:12 -11:00
committed by GitHub
parent fe274bf254 0b71e4822a
commit cb718dce12
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/cc/CCutils.cpp
View File

@@ -492,12 +492,12 @@ bool komodo_txnotarizedconfirmed(uint256 txid)
return(0); return(0);
} }
confirms=1 + pindex->GetHeight() - txheight; confirms=1 + pindex->GetHeight() - txheight;
if ( KOMODO_DPOWCONFS != 0 && txheight > 0 && confirms > 0 && (sp= komodo_stateptr(symbol,dest)) != 0 ) if ( txheight > 0 && confirms > 0 && (sp= komodo_stateptr(symbol,dest)) != 0 )
{ {
if ( (notarized=sp->NOTARIZED_HEIGHT) > 0 ) if ( (notarized=sp->NOTARIZED_HEIGHT) > 0 )
{ {
if ( txheight >= sp->NOTARIZED_HEIGHT ) if ( txheight >= sp->NOTARIZED_HEIGHT )
confirms=1; confirms = (txheight - sp->NOTARIZED_HEIGHT);
} }
} }
#ifdef TESTMODE #ifdef TESTMODE
@@ -508,4 +508,4 @@ bool komodo_txnotarizedconfirmed(uint256 txid)
else if (notarized==0 && confirms >= MIN_NON_NOTARIZED_CONFIRMS) else if (notarized==0 && confirms >= MIN_NON_NOTARIZED_CONFIRMS)
return (true); return (true);
return (false); return (false);
} }

2
src/cc/dapps/zmigrate.c
View File

@@ -906,7 +906,7 @@ int32_t main(int32_t argc,char **argv)
zsaddr = clonestr(argv[2]); zsaddr = clonestr(argv[2]);
printf("%s: %s %s\n",REFCOIN_CLI,coinstr,zsaddr); printf("%s: %s %s\n",REFCOIN_CLI,coinstr,zsaddr);
uint32_t lastopid; char coinaddr[64],zcaddr[128],opidstr[128]; int32_t finished; int64_t amount,stdamount,txfee; uint32_t lastopid; char coinaddr[64],zcaddr[128],opidstr[128]; int32_t finished; int64_t amount,stdamount,txfee;
stdamount = 1000 * SATOSHIDEN; stdamount = 10000 * SATOSHIDEN;
txfee = 10000; txfee = 10000;
again: again:
printf("start processing zmigrate\n"); printf("start processing zmigrate\n");