fix bug introduced in #1695 (#1714)

UdjinM6 · web-flow · commit 859144809407 · 2017-11-03T23:04:47.000+03:00
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -2439,7 +2439,7 @@ static void ApproximateBestSubset(vector<pair<CAmount, pair<const CWalletTx*,uns
         {
             for (unsigned int i = 0; i < vValue.size(); i++)
             {
-                if (fUseInstantSend && nTotal + vValue[i].first > sporkManager.GetSporkValue(SPORK_5_INSTANTSEND_MAX_VALUE)) {
+                if (fUseInstantSend && nTotal + vValue[i].first > sporkManager.GetSporkValue(SPORK_5_INSTANTSEND_MAX_VALUE)*COIN) {
                     continue;
                 }
                 //The solver here uses a randomized algorithm,
@@ -2504,7 +2504,7 @@ bool CWallet::SelectCoinsMinConf(const CAmount& nTargetValue, int nConfMine, int
     // List of values less than target
     pair<CAmount, pair<const CWalletTx*,unsigned int> > coinLowestLarger;
     coinLowestLarger.first = fUseInstantSend
-                                        ? sporkManager.GetSporkValue(SPORK_5_INSTANTSEND_MAX_VALUE)
+                                        ? sporkManager.GetSporkValue(SPORK_5_INSTANTSEND_MAX_VALUE)*COIN
                                         : std::numeric_limits<CAmount>::max();
     coinLowestLarger.second.first = NULL;
     vector<pair<CAmount, pair<const CWalletTx*,unsigned int> > > vValue;

Original file line number	Diff line number	Diff line change
`@@ -2439,7 +2439,7 @@ static void ApproximateBestSubset(vector<pair<CAmount, pair<const CWalletTx*,uns`
`2439`	`2439`	`{`
`2440`	`2440`	`for (unsigned int i = 0; i < vValue.size(); i++)`
`2441`	`2441`	`{`
`2442`		`- if (fUseInstantSend && nTotal + vValue[i].first > sporkManager.GetSporkValue(SPORK_5_INSTANTSEND_MAX_VALUE)) {`
	`2442`	`+ if (fUseInstantSend && nTotal + vValue[i].first > sporkManager.GetSporkValue(SPORK_5_INSTANTSEND_MAX_VALUE)*COIN) {`
`2443`	`2443`	`continue;`
`2444`	`2444`	`}`
`2445`	`2445`	`//The solver here uses a randomized algorithm,`
`@@ -2504,7 +2504,7 @@ bool CWallet::SelectCoinsMinConf(const CAmount& nTargetValue, int nConfMine, int`
`2504`	`2504`	`// List of values less than target`
`2505`	`2505`	`pair<CAmount, pair<const CWalletTx*,unsigned int> > coinLowestLarger;`
`2506`	`2506`	`coinLowestLarger.first = fUseInstantSend`
`2507`		`- ? sporkManager.GetSporkValue(SPORK_5_INSTANTSEND_MAX_VALUE)`
	`2507`	`+ ? sporkManager.GetSporkValue(SPORK_5_INSTANTSEND_MAX_VALUE)*COIN`
`2508`	`2508`	`: std::numeric_limits<CAmount>::max();`
`2509`	`2509`	`coinLowestLarger.second.first = NULL;`
`2510`	`2510`	`vector<pair<CAmount, pair<const CWalletTx*,unsigned int> > > vValue;`