sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 20:12:57 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add IS parameter for gobject prepare (#2452)

Browse Source 
* Add IS parameter for gobject prepare

* Update if statement

Co-Authored-By: PastaPastaPasta <pasta@dashboost.org>

* Update src/rpc/governance.cpp

Co-Authored-By: PastaPastaPasta <pasta@dashboost.org>

* Update src/rpc/governance.cpp

Co-Authored-By: PastaPastaPasta <pasta@dashboost.org>
This commit is contained in:
PastaPastaPasta 2018-11-25 07:26:50 -06:00 committed by UdjinM6
parent 65528e9e7b
commit 45421b1a3a
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/rpc/governance.cpp
View File

@ -132,12 +132,13 @@ void gobject_prepare_help()
"2. revision (numeric, required) object revision in the system\n" "2. revision (numeric, required) object revision in the system\n"
"3. time (numeric, required) time this object was created\n" "3. time (numeric, required) time this object was created\n"
"4. data-hex (string, required) data in hex string form\n" "4. data-hex (string, required) data in hex string form\n"
"5. use-IS (boolean, optional, default=false) InstantSend lock the collateral, only requiring one chain confirmation\n"
); );
} }
UniValue gobject_prepare(const JSONRPCRequest& request) UniValue gobject_prepare(const JSONRPCRequest& request)
{ {
if (request.fHelp || request.params.size() != 5) if (request.fHelp || (request.params.size() != 5 && request.params.size() != 6))
gobject_prepare_help(); gobject_prepare_help();
if (!EnsureWalletIsAvailable(request.fHelp)) if (!EnsureWalletIsAvailable(request.fHelp))
@ -159,6 +160,8 @@ UniValue gobject_prepare(const JSONRPCRequest& request)
int nRevision = atoi(strRevision); int nRevision = atoi(strRevision);
int64_t nTime = atoi64(strTime); int64_t nTime = atoi64(strTime);
std::string strDataHex = request.params[4].get_str(); std::string strDataHex = request.params[4].get_str();
bool useIS = false;
if (request.params.size() > 5) useIS = request.params[5].getBool();
// CREATE A NEW COLLATERAL TRANSACTION FOR THIS SPECIFIC OBJECT // CREATE A NEW COLLATERAL TRANSACTION FOR THIS SPECIFIC OBJECT
@ -197,7 +200,7 @@ UniValue gobject_prepare(const JSONRPCRequest& request)
EnsureWalletIsUnlocked(); EnsureWalletIsUnlocked();
CWalletTx wtx; CWalletTx wtx;
if (!pwalletMain->GetBudgetSystemCollateralTX(wtx, govobj.GetHash(), govobj.GetMinCollateralFee(), false)) { if (!pwalletMain->GetBudgetSystemCollateralTX(wtx, govobj.GetHash(), govobj.GetMinCollateralFee(), useIS)) {
throw JSONRPCError(RPC_INTERNAL_ERROR, "Error making collateral transaction for governance object. Please check your wallet balance and make sure your wallet is unlocked."); throw JSONRPCError(RPC_INTERNAL_ERROR, "Error making collateral transaction for governance object. Please check your wallet balance and make sure your wallet is unlocked.");
} }