@ -280,7 +280,7 @@ UniValue setaccount(const JSONRPCRequest& request)
throw JSONRPCError ( RPC_INVALID_ADDRESS_OR_KEY , " Invalid Bitcoin address " ) ;
throw JSONRPCError ( RPC_INVALID_ADDRESS_OR_KEY , " Invalid Bitcoin address " ) ;
std : : string strAccount ;
std : : string strAccount ;
if ( request . params . size ( ) > 1 )
if ( ! request . params [ 1 ] . isNull ( ) )
strAccount = AccountFromValue ( request . params [ 1 ] ) ;
strAccount = AccountFromValue ( request . params [ 1 ] ) ;
// Only add the account if the address is yours.
// Only add the account if the address is yours.
@ -768,7 +768,7 @@ UniValue getbalance(const JSONRPCRequest& request)
LOCK2 ( cs_main , pwallet - > cs_wallet ) ;
LOCK2 ( cs_main , pwallet - > cs_wallet ) ;
if ( request . params . size ( ) = = 0 )
if ( request . params [ 0 ] . isNull ( ) & & request . params [ 1 ] . isNull ( ) & & request . params [ 2 ] . isNull ( ) )
return ValueFromAmount ( pwallet - > GetBalance ( ) ) ;
return ValueFromAmount ( pwallet - > GetBalance ( ) ) ;
const std : : string & account_param = request . params [ 0 ] . get_str ( ) ;
const std : : string & account_param = request . params [ 0 ] . get_str ( ) ;
@ -838,11 +838,11 @@ UniValue movecmd(const JSONRPCRequest& request)
CAmount nAmount = AmountFromValue ( request . params [ 2 ] ) ;
CAmount nAmount = AmountFromValue ( request . params [ 2 ] ) ;
if ( nAmount < = 0 )
if ( nAmount < = 0 )
throw JSONRPCError ( RPC_TYPE_ERROR , " Invalid amount for send " ) ;
throw JSONRPCError ( RPC_TYPE_ERROR , " Invalid amount for send " ) ;
if ( request . params . size ( ) > 3 )
if ( ! request . params [ 3 ] . isNull ( ) )
// unused parameter, used to be nMinDepth, keep type-checking it though
// unused parameter, used to be nMinDepth, keep type-checking it though
( void ) request . params [ 3 ] . get_int ( ) ;
( void ) request . params [ 3 ] . get_int ( ) ;
std : : string strComment ;
std : : string strComment ;
if ( request . params . size ( ) > 4 )
if ( ! request . params [ 4 ] . isNull ( ) )
strComment = request . params [ 4 ] . get_str ( ) ;
strComment = request . params [ 4 ] . get_str ( ) ;
if ( ! pwallet - > AccountMove ( strFrom , strTo , nAmount , strComment ) ) {
if ( ! pwallet - > AccountMove ( strFrom , strTo , nAmount , strComment ) ) {
@ -899,7 +899,7 @@ UniValue sendfrom(const JSONRPCRequest& request)
if ( nAmount < = 0 )
if ( nAmount < = 0 )
throw JSONRPCError ( RPC_TYPE_ERROR , " Invalid amount for send " ) ;
throw JSONRPCError ( RPC_TYPE_ERROR , " Invalid amount for send " ) ;
int nMinDepth = 1 ;
int nMinDepth = 1 ;
if ( request . params . size ( ) > 3 )
if ( ! request . params [ 3 ] . isNull ( ) )
nMinDepth = request . params [ 3 ] . get_int ( ) ;
nMinDepth = request . params [ 3 ] . get_int ( ) ;
CWalletTx wtx ;
CWalletTx wtx ;
@ -1105,7 +1105,7 @@ UniValue addmultisigaddress(const JSONRPCRequest& request)
LOCK2 ( cs_main , pwallet - > cs_wallet ) ;
LOCK2 ( cs_main , pwallet - > cs_wallet ) ;
std : : string strAccount ;
std : : string strAccount ;
if ( request . params . size ( ) > 2 )
if ( ! request . params [ 2 ] . isNull ( ) )
strAccount = AccountFromValue ( request . params [ 2 ] ) ;
strAccount = AccountFromValue ( request . params [ 2 ] ) ;
// Construct using pay-to-script-hash:
// Construct using pay-to-script-hash:
@ -1711,10 +1711,10 @@ UniValue listaccounts(const JSONRPCRequest& request)
LOCK2 ( cs_main , pwallet - > cs_wallet ) ;
LOCK2 ( cs_main , pwallet - > cs_wallet ) ;
int nMinDepth = 1 ;
int nMinDepth = 1 ;
if ( request . params . size ( ) > 0 )
if ( ! request . params [ 0 ] . isNull ( ) )
nMinDepth = request . params [ 0 ] . get_int ( ) ;
nMinDepth = request . params [ 0 ] . get_int ( ) ;
isminefilter includeWatchonly = ISMINE_SPENDABLE ;
isminefilter includeWatchonly = ISMINE_SPENDABLE ;
if ( request . params . size ( ) > 1 )
if ( ! request . params [ 1 ] . isNull ( ) )
if ( request . params [ 1 ] . get_bool ( ) )
if ( request . params [ 1 ] . get_bool ( ) )
includeWatchonly = includeWatchonly | ISMINE_WATCH_ONLY ;
includeWatchonly = includeWatchonly | ISMINE_WATCH_ONLY ;
@ -2361,19 +2361,18 @@ UniValue lockunspent(const JSONRPCRequest& request)
LOCK2 ( cs_main , pwallet - > cs_wallet ) ;
LOCK2 ( cs_main , pwallet - > cs_wallet ) ;
if ( request . params . size ( ) = = 1 )
RPCTypeCheckArgument ( request . params [ 0 ] , UniValue : : VBOOL ) ;
RPCTypeCheck ( request . params , { UniValue : : VBOOL } ) ;
else
RPCTypeCheck ( request . params , { UniValue : : VBOOL , UniValue : : VARR } ) ;
bool fUnlock = request . params [ 0 ] . get_bool ( ) ;
bool fUnlock = request . params [ 0 ] . get_bool ( ) ;
if ( request . params . size ( ) = = 1 ) {
if ( request . params [ 1 ] . isNull ( ) ) {
if ( fUnlock )
if ( fUnlock )
pwallet - > UnlockAllCoins ( ) ;
pwallet - > UnlockAllCoins ( ) ;
return true ;
return true ;
}
}
RPCTypeCheckArgument ( request . params [ 1 ] , UniValue : : VARR ) ;
UniValue outputs = request . params [ 1 ] . get_array ( ) ;
UniValue outputs = request . params [ 1 ] . get_array ( ) ;
for ( unsigned int idx = 0 ; idx < outputs . size ( ) ; idx + + ) {
for ( unsigned int idx = 0 ; idx < outputs . size ( ) ; idx + + ) {
const UniValue & output = outputs [ idx ] ;
const UniValue & output = outputs [ idx ] ;