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

Compiler happiness

Browse Source
This commit is contained in:
Duke Leto
2020-12-16 04:58:22 -05:00
parent e4ffb34756
commit c5f1021d8a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cc/games/prices.cpp
View File

@@ -127,7 +127,7 @@ int64_t prices_blockinfo(int32_t height,char *acaddr)
UniValue games_settle(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) UniValue games_settle(uint64_t txfee,struct CCcontract_info *cp,cJSON *params)
{ {
UniValue result(UniValue::VOBJ); char acaddr[64]; CPubKey acpk,mypk,gamespk; int64_t prizefund = 0; int32_t height,nextheight = komodo_nextheight(); UniValue result(UniValue::VOBJ); char acaddr[64]; CPubKey acpk,mypk,gamespk; int64_t prizefund = 0; int32_t height,nextheight = hush_nextheight();
if ( ASSETCHAINS_OVERRIDE_PUBKEY33[0] == 0 ) if ( ASSETCHAINS_OVERRIDE_PUBKEY33[0] == 0 )
{ {
result.push_back(Pair("result","error")); result.push_back(Pair("result","error"));
@@ -169,7 +169,7 @@ UniValue games_settle(uint64_t txfee,struct CCcontract_info *cp,cJSON *params)
UniValue games_bet(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) UniValue games_bet(uint64_t txfee,struct CCcontract_info *cp,cJSON *params)
{ {
CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), komodo_nextheight()); CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight());
UniValue result(UniValue::VOBJ); std::string rawtx; int64_t amount,inputsum; uint64_t price; CPubKey gamespk,mypk,acpk; UniValue result(UniValue::VOBJ); std::string rawtx; int64_t amount,inputsum; uint64_t price; CPubKey gamespk,mypk,acpk;
if ( ASSETCHAINS_OVERRIDE_PUBKEY33[0] == 0 ) if ( ASSETCHAINS_OVERRIDE_PUBKEY33[0] == 0 )
{ {

2
src/wallet/rpcwallet.cpp
View File

@@ -8304,7 +8304,7 @@ UniValue opreturn_burn(const UniValue& params, bool fHelp, const CPubKey& mypk)
throw JSONRPCError(RPC_TYPE_ERROR, "keypool error."); throw JSONRPCError(RPC_TYPE_ERROR, "keypool error.");
} }
CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), komodo_nextheight()); CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight());
int64_t normalInputs = AddNormalinputs(mtx, myPubkey, nAmount+txfee, 60); int64_t normalInputs = AddNormalinputs(mtx, myPubkey, nAmount+txfee, 60);
if (normalInputs < nAmount) if (normalInputs < nAmount)