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

Make compiler happy

Browse Source
This commit is contained in:
Duke Leto
2019-12-22 05:12:34 -05:00
parent 148e86a33b
commit f5c54dad71
2 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/cc/CCcustom.cpp
View File

@@ -402,14 +402,6 @@ struct CCcontract_info *CCinit(struct CCcontract_info *cp, uint8_t evalcode)
cp->validate = PegsValidate; cp->validate = PegsValidate;
cp->ismyvin = IsPegsInput; cp->ismyvin = IsPegsInput;
break; break;
case EVAL_MARMARA:
strcpy(cp->unspendableCCaddr,MarmaraCCaddr);
strcpy(cp->normaladdr,MarmaraNormaladdr);
strcpy(cp->CChexstr,MarmaraCChexstr);
memcpy(cp->CCpriv,MarmaraCCpriv,32);
cp->validate = MarmaraValidate;
cp->ismyvin = IsMarmaraInput;
break;
case EVAL_PAYMENTS: case EVAL_PAYMENTS:
strcpy(cp->unspendableCCaddr,PaymentsCCaddr); strcpy(cp->unspendableCCaddr,PaymentsCCaddr);
strcpy(cp->normaladdr,PaymentsNormaladdr); strcpy(cp->normaladdr,PaymentsNormaladdr);

10
src/komodo_gateway.h
View File

@@ -27,8 +27,6 @@ int32_t dummy_linker_tricker()
return(1); return(1);
}*/ }*/
int32_t MarmaraValidateCoinbase(int32_t height,CTransaction tx);
int32_t pax_fiatstatus(uint64_t *available,uint64_t *deposited,uint64_t *issued,uint64_t *withdrawn,uint64_t *approved,uint64_t *redeemed,char *base) int32_t pax_fiatstatus(uint64_t *available,uint64_t *deposited,uint64_t *issued,uint64_t *withdrawn,uint64_t *approved,uint64_t *redeemed,char *base)
{ {
int32_t baseid; struct komodo_state *sp; int64_t netliability,maxallowed,maxval; int32_t baseid; struct komodo_state *sp; int64_t netliability,maxallowed,maxval;
@@ -740,14 +738,6 @@ int32_t komodo_check_deposit(int32_t height,const CBlock& block,uint32_t prevtim
} }
} }
} }
if ( height > 0 && ASSETCHAINS_MARMARA != 0 && (height & 1) == 0 )
{
if ( MarmaraValidateCoinbase(height,block.vtx[0]) < 0 )
{
fprintf(stderr,"MARMARA error ht.%d constrains even height blocks to pay 100%% to CC in vout0 with opreturn\n",height);
return(-1);
}
}
if ( ASSETCHAINS_SYMBOL[0] == 0 || if ( ASSETCHAINS_SYMBOL[0] == 0 ||
((ASSETCHAINS_COMMISSION != 0 || ASSETCHAINS_FOUNDERS_REWARD) && height > 1) || ((ASSETCHAINS_COMMISSION != 0 || ASSETCHAINS_FOUNDERS_REWARD) && height > 1) ||
NetworkUpgradeActive(height, Params().GetConsensus(), Consensus::UPGRADE_SAPLING) ) NetworkUpgradeActive(height, Params().GetConsensus(), Consensus::UPGRADE_SAPLING) )