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

test

Browse Source
This commit is contained in:
jl777
2016-11-08 15:08:46 -03:00
parent 1e983efa98
commit a3f23ee221
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/komodo_gateway.h
View File

@@ -146,11 +146,11 @@ int32_t komodo_issued_opreturn(uint8_t *shortflagp,char *base,uint256 *txids,uin
return(n); return(n);
} }
void komodo_gateway_deposits(CMutableTransaction *txNew,int32_t shortflag,char *symbol) void komodo_gateway_deposits(CMutableTransaction *txNew,int32_t shortflag,char *symbol,int32_t tokomodo)
{ {
struct pax_transaction *pax,*tmp; uint8_t *script,opcode,opret[10000],data[10000]; int32_t i,len=0,opretlen=0,numvouts=1; struct pax_transaction *pax,*tmp; uint8_t *script,opcode,opret[10000],data[10000]; int32_t i,len=0,opretlen=0,numvouts=1;
PENDING_KOMODO_TX = 0; PENDING_KOMODO_TX = 0;
if ( strcmp(symbol,"KMD") != 0 ) if ( tokomodo == 0 )
opcode = 'I'; opcode = 'I';
else opcode = 'X'; else opcode = 'X';
HASH_ITER(hh,PAX,pax,tmp) HASH_ITER(hh,PAX,pax,tmp)
@@ -176,7 +176,7 @@ void komodo_gateway_deposits(CMutableTransaction *txNew,int32_t shortflag,char *
} }
data[len++] = pax->vout & 0xff; data[len++] = pax->vout & 0xff;
data[len++] = (pax->vout >> 8) & 0xff; data[len++] = (pax->vout >> 8) & 0xff;
if ( strcmp(symbol,"KMD") != 0 ) if ( tokomodo == 0 )
PENDING_KOMODO_TX += pax->fiatoshis; PENDING_KOMODO_TX += pax->fiatoshis;
else else
{ {
@@ -208,7 +208,7 @@ void komodo_gateway_deposits(CMutableTransaction *txNew,int32_t shortflag,char *
txNew->vout[numvouts].scriptPubKey.resize(opretlen); txNew->vout[numvouts].scriptPubKey.resize(opretlen);
script = (uint8_t *)&txNew->vout[numvouts].scriptPubKey[0]; script = (uint8_t *)&txNew->vout[numvouts].scriptPubKey[0];
memcpy(script,opret,opretlen); memcpy(script,opret,opretlen);
printf("deposits: total numvouts.%d %.8f opretlen.%d\n",numvouts,dstr(PENDING_KOMODO_TX),opretlen); printf("MINER deposits: tokomodo.%d (%s) total numvouts.%d %.8f opretlen.%d\n",tokomodo,ASSETCHAINS_SYMBOL,numvouts,dstr(PENDING_KOMODO_TX),opretlen);
} }
} }

6
src/miner.cpp
View File

@@ -102,7 +102,7 @@ void UpdateTime(CBlockHeader* pblock, const Consensus::Params& consensusParams,
int32_t komodo_pax_opreturn(uint8_t *opret,int32_t maxsize); int32_t komodo_pax_opreturn(uint8_t *opret,int32_t maxsize);
uint64_t komodo_paxtotal(); uint64_t komodo_paxtotal();
int32_t komodo_is_issuer(); int32_t komodo_is_issuer();
void komodo_gateway_deposits(CMutableTransaction *txNew,int32_t shortflag,char *symbol); void komodo_gateway_deposits(CMutableTransaction *txNew,int32_t shortflag,char *symbol,int32_t tokomodo);
extern int32_t KOMODO_INITDONE,ASSETCHAINS_SHORTFLAG,KOMODO_REALTIME; extern int32_t KOMODO_INITDONE,ASSETCHAINS_SHORTFLAG,KOMODO_REALTIME;
extern char ASSETCHAINS_SYMBOL[16]; extern char ASSETCHAINS_SYMBOL[16];
@@ -376,11 +376,11 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn)
txNew.vout[1].nValue = 0; txNew.vout[1].nValue = 0;
//fprintf(stderr,"opretlen.%d\n",opretlen); //fprintf(stderr,"opretlen.%d\n",opretlen);
} }
komodo_gateway_deposits(&txNew,0,(char *)"EUR"); komodo_gateway_deposits(&txNew,0,(char *)"EUR",1);
} }
else if ( komodo_is_issuer() != 0 ) else if ( komodo_is_issuer() != 0 )
{ {
komodo_gateway_deposits(&txNew,0,ASSETCHAINS_SYMBOL); komodo_gateway_deposits(&txNew,0,ASSETCHAINS_SYMBOL,0);
fprintf(stderr,"txNew numvouts.%d\n",(int32_t)txNew.vout.size()); fprintf(stderr,"txNew numvouts.%d\n",(int32_t)txNew.vout.size());
} }
pblock->vtx[0] = txNew; pblock->vtx[0] = txNew;