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

Reorder eval checks

Browse Source
This commit is contained in:
jl777
2018-08-22 06:51:21 -11:00
parent 558b29ac15
commit 90c811557b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/cc/CCutils.cpp
View File

@@ -267,11 +267,11 @@ CPubKey GetUnspendable(struct CCcontract_info *cp,uint8_t *unspendablepriv)
bool ProcessCC(struct CCcontract_info *cp,Eval* eval, std::vector<uint8_t> paramsNull,const CTransaction &ctx, unsigned int nIn) bool ProcessCC(struct CCcontract_info *cp,Eval* eval, std::vector<uint8_t> paramsNull,const CTransaction &ctx, unsigned int nIn)
{ {
CTransaction createTx; uint256 assetid,assetid2,hashBlock; uint8_t funcid; int32_t height,i,n,from_mempool = 0; int64_t amount; std::vector<uint8_t> origpubkey; CTransaction createTx; uint256 assetid,assetid2,hashBlock; uint8_t funcid; int32_t height,i,n,from_mempool = 0; int64_t amount; std::vector<uint8_t> origpubkey;
if ( ASSETCHAINS_CC == 0 || height < KOMODO_CCACTIVATE ) height = KOMODO_CONNECTING;
return(false);
if ( KOMODO_CONNECTING < 0 ) // always comes back with > 0 for final confirmation if ( KOMODO_CONNECTING < 0 ) // always comes back with > 0 for final confirmation
return(true); return(true);
height = KOMODO_CONNECTING; if ( ASSETCHAINS_CC == 0 || height < KOMODO_CCACTIVATE )
return eval->Invalid("CC are disabled or not active yet");
if ( (KOMODO_CONNECTING & (1<<30)) != 0 ) if ( (KOMODO_CONNECTING & (1<<30)) != 0 )
{ {
from_mempool = 1; from_mempool = 1;