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

Merge branch 'jl777' into FSM

Browse Source 
# Conflicts:
#	src/cc/CCinclude.h
This commit is contained in:
jl777
2018-08-24 00:40:04 -11:00
parent 90c811557b dcdb45372d
commit cccd779df5
3 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/wallet/rpcwallet.cpp
View File

@@ -4836,6 +4836,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
int32_t ensure_CCrequirements()
{
extern uint8_t NOTARY_PUBKEY33[];
CCerror = "";
if ( NOTARY_PUBKEY33[0] == 0 )
return(-1);
else if ( GetBoolArg("-addressindex", DEFAULT_ADDRESSINDEX) == 0 )
@@ -5402,7 +5403,7 @@ UniValue dicebet(const UniValue& params, bool fHelp)
{
result.push_back(Pair("result", "success"));
result.push_back(Pair("hex", hex));
} else ERR_RESULT("couldnt create dice bet transaction");
} else ERR_RESULT("couldnt create dice bet transaction. make sure your address has funds");
} else {
ERR_RESULT("amount and odds must be positive");
}