Skip to content

Add IS parameter for gobject prepare #2452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
UdjinM6 merged 4 commits into from
Nov 25, 2018
Merged

Add IS parameter for gobject prepare #2452

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
21db0de
Add IS parameter for gobject prepare
Nov 16, 2018
8ba92f9
Update if statement
InhumanPerfection Nov 16, 2018
9ee0ddf
Update src/rpc/governance.cpp
InhumanPerfection Nov 16, 2018
b53c4e8
Update src/rpc/governance.cpp
UdjinM6 Nov 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/rpc/governance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,12 +132,13 @@ void gobject_prepare_help()
"2. revision (numeric, required) object revision in the system\n"
"3. time (numeric, required) time this object was created\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)
{
if (request.fHelp || request.params.size() != 5)
if (request.fHelp || (request.params.size() != 5 && request.params.size() != 6))
gobject_prepare_help();

if (!EnsureWalletIsAvailable(request.fHelp))
Expand All @@ -159,6 +160,8 @@ UniValue gobject_prepare(const JSONRPCRequest& request)
int nRevision = atoi(strRevision);
int64_t nTime = atoi64(strTime);
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

Expand Down Expand Up @@ -197,7 +200,7 @@ UniValue gobject_prepare(const JSONRPCRequest& request)
EnsureWalletIsUnlocked();

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.");
}

Expand Down