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

check collateral tx, find masternode before vote

Browse Source
This commit is contained in:
Evan Duffield 2015-08-04 09:31:05 -07:00
parent 43fd168aa1
commit a0addf20a9
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/rpcmasternode-budget.cpp
View File

@ -106,7 +106,9 @@ Value mnbudget(const Array& params, bool fHelp)
// } // }
CWalletTx wtx; CWalletTx wtx;
pwalletMain->GetBudgetSystemCollateralTX(wtx, budgetProposalBroadcast.GetHash(), useIX); if(!pwalletMain->GetBudgetSystemCollateralTX(wtx, budgetProposalBroadcast.GetHash(), useIX)){
return "Error making collateral transaction for proposal. Please check your wallet balance and make sure your wallet is unlocked.";
}
// make our change address // make our change address
CReserveKey reservekey(pwalletMain); CReserveKey reservekey(pwalletMain);
@ -297,6 +299,12 @@ Value mnbudget(const Array& params, bool fHelp)
if(!darkSendSigner.SetKey(strMasterNodePrivKey, errorMessage, keyMasternode, pubKeyMasternode)) if(!darkSendSigner.SetKey(strMasterNodePrivKey, errorMessage, keyMasternode, pubKeyMasternode))
return "Error upon calling SetKey"; return "Error upon calling SetKey";
CMasternode* pmn = mnodeman.Find(activeMasternode.vin);
if(pmn == NULL)
{
return "Failure to find masternode in list : " + activeMasternode.vin.ToString();
}
CBudgetVote vote(activeMasternode.vin, hash, nVote); CBudgetVote vote(activeMasternode.vin, hash, nVote);
if(!vote.Sign(keyMasternode, pubKeyMasternode)){ if(!vote.Sign(keyMasternode, pubKeyMasternode)){
return "Failure to sign."; return "Failure to sign.";
@ -596,6 +604,12 @@ Value mnfinalbudget(const Array& params, bool fHelp)
if(!darkSendSigner.SetKey(strMasterNodePrivKey, errorMessage, keyMasternode, pubKeyMasternode)) if(!darkSendSigner.SetKey(strMasterNodePrivKey, errorMessage, keyMasternode, pubKeyMasternode))
return "Error upon calling SetKey"; return "Error upon calling SetKey";
CMasternode* pmn = mnodeman.Find(activeMasternode.vin);
if(pmn == NULL)
{
return "Failure to find masternode in list : " + activeMasternode.vin.ToString();
}
CFinalizedBudgetVote vote(activeMasternode.vin, hash); CFinalizedBudgetVote vote(activeMasternode.vin, hash);
if(!vote.Sign(keyMasternode, pubKeyMasternode)){ if(!vote.Sign(keyMasternode, pubKeyMasternode)){
return "Failure to sign."; return "Failure to sign.";