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-10-22 13:35:17 -03:00
parent 17878015bb
commit 7652ed92bd
3 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/komodo.h
View File

@@ -678,5 +678,12 @@ void komodo_index2pubkey33(uint8_t *pubkey33,CBlockIndex *pindex,int32_t height)
} }
} }
int32_t komodo_opreturn(uint8_t *opret,int32_t maxsize)
{
int32_t i;
for (i=0; i<8; i++)
opret[i] = i;
return(i);
}
#endif #endif

12
src/miner.cpp
View File

@@ -96,6 +96,8 @@ void UpdateTime(CBlockHeader* pblock, const Consensus::Params& consensusParams,
pblock->nBits = GetNextWorkRequired(pindexPrev, pblock, consensusParams); pblock->nBits = GetNextWorkRequired(pindexPrev, pblock, consensusParams);
} }
int32_t komodo_opreturn(uint8_t *opret,int32_t maxsize);
CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn) CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn)
{ {
const CChainParams& chainparams = Params(); const CChainParams& chainparams = Params();
@@ -333,11 +335,19 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn)
//txNew.nLockTime = (uint32_t)time(NULL) - 60; //txNew.nLockTime = (uint32_t)time(NULL) - 60;
txNew.vin.resize(1); txNew.vin.resize(1);
txNew.vin[0].prevout.SetNull(); txNew.vin[0].prevout.SetNull();
txNew.vout.resize(1); int32_t opretlen; uint8_t opret[8192];
if ( (opretlen= komodo_opreturn(opret,sizeof(opret))) > 0 )
{
txNew.vout.resize(2);
txNew.vout[1].scriptPubKey.resize(opretlen);
memcpy(txNew.vout[1].scriptPubKey.data(),opret,opretlen);
txNew.vout[1].nValue = 0;
} else txNew.vout.resize(1);
txNew.vout[0].scriptPubKey = scriptPubKeyIn; txNew.vout[0].scriptPubKey = scriptPubKeyIn;
txNew.vout[0].nValue = GetBlockSubsidy(nHeight, chainparams.GetConsensus()); txNew.vout[0].nValue = GetBlockSubsidy(nHeight, chainparams.GetConsensus());
// Add fees // Add fees
txNew.vout[0].nValue += nFees; txNew.vout[0].nValue += nFees;
txNew.vin[0].scriptSig = CScript() << nHeight << OP_0; txNew.vin[0].scriptSig = CScript() << nHeight << OP_0;
pblock->vtx[0] = txNew; pblock->vtx[0] = txNew;

2
src/wallet/rpcwallet.cpp
View File

@@ -2372,7 +2372,7 @@ Value listunspent(const Array& params, bool fHelp)
uint64_t interest; uint64_t interest;
if ( pindex != 0 ) if ( pindex != 0 )
{ {
interest = komodo_interest(out.tx->nHeight,nValue,out.tx->nLockTime,pindex->nTime); interest = komodo_interest(pindex->nHeight,nValue,out.tx->nLockTime,pindex->nTime);
entry.push_back(Pair("interest",ValueFromAmount(interest))); entry.push_back(Pair("interest",ValueFromAmount(interest)));
} }
} }