diff options
| author | Gavin Andresen <[email protected]> | 2013-05-04 10:15:39 -0700 |
|---|---|---|
| committer | Gavin Andresen <[email protected]> | 2013-05-04 10:15:39 -0700 |
| commit | 33edd0a477f4448be9c6c4949fbff4e53f16cac6 (patch) | |
| tree | 52fce70249d5eff657c7cad299c84beaf85efcfe /src/rpcwallet.cpp | |
| parent | Merge pull request #2606 from gavinandresen/threadfix (diff) | |
| parent | Un-hardcode TX_FEE constants (diff) | |
| download | discoin-33edd0a477f4448be9c6c4949fbff4e53f16cac6.tar.xz discoin-33edd0a477f4448be9c6c4949fbff4e53f16cac6.zip | |
Merge pull request #2577 from gavinandresen/fee_bandaid
Treat dust outputs as non-standard, un-hardcode TX_FEE constants
Diffstat (limited to 'src/rpcwallet.cpp')
| -rw-r--r-- | src/rpcwallet.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/rpcwallet.cpp b/src/rpcwallet.cpp index 9a899f923..5fd400c6b 100644 --- a/src/rpcwallet.cpp +++ b/src/rpcwallet.cpp @@ -694,13 +694,10 @@ Value sendmany(const Array& params, bool fHelp) // Send CReserveKey keyChange(pwalletMain); int64 nFeeRequired = 0; - bool fCreated = pwalletMain->CreateTransaction(vecSend, wtx, keyChange, nFeeRequired); + string strFailReason; + bool fCreated = pwalletMain->CreateTransaction(vecSend, wtx, keyChange, nFeeRequired, strFailReason); if (!fCreated) - { - if (totalAmount + nFeeRequired > pwalletMain->GetBalance()) - throw JSONRPCError(RPC_WALLET_INSUFFICIENT_FUNDS, "Insufficient funds"); - throw JSONRPCError(RPC_WALLET_ERROR, "Transaction creation failed"); - } + throw JSONRPCError(RPC_WALLET_INSUFFICIENT_FUNDS, strFailReason); if (!pwalletMain->CommitTransaction(wtx, keyChange)) throw JSONRPCError(RPC_WALLET_ERROR, "Transaction commit failed"); |