From 55c7af2bb2d463978c9aa6e8ea124323cb854011 Mon Sep 17 00:00:00 2001 From: rynomster Date: Fri, 23 Oct 2015 20:16:10 +0200 Subject: [PATCH] Forward to Adam Back Ringsigs --- src/qt/walletmodel.cpp | 2 +- src/wallet.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index 14e58ccd7f..8379293372 100644 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -609,7 +609,7 @@ WalletModel::SendCoinsReturn WalletModel::sendCoinsAnon(const QListAddAnonInputs(RING_SIG_1, nTotalOut, nRingSize, vecSend, vecChange, wtxNew, nFeeRequired, false, sError)) + if (!wallet->AddAnonInputs(RING_SIG_2, nTotalOut, nRingSize, vecSend, vecChange, wtxNew, nFeeRequired, false, sError)) { if ((nTotalOut + nFeeRequired) > nBalance) // FIXME: could cause collisions in the future return SendCoinsReturn(AmountWithFeeExceedsBalance, nFeeRequired); diff --git a/src/wallet.cpp b/src/wallet.cpp index f44a510bcc..6470f8a4a6 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -4796,7 +4796,7 @@ bool CWallet::SendAnonToAnon(CStealthAddress& sxAddress, int64_t nValue, int nRi int64_t nFeeRequired; std::string sError2; - if (!AddAnonInputs(RING_SIG_1, nValue, nRingSize, vecSend, vecChange, wtxNew, nFeeRequired, false, sError2)) + if (!AddAnonInputs(RING_SIG_2, nValue, nRingSize, vecSend, vecChange, wtxNew, nFeeRequired, false, sError2)) { LogPrintf("SendAnonToAnon() AddAnonInputs failed %s.\n", sError2.c_str()); sError = "AddAnonInputs() failed : " + sError2; @@ -4905,7 +4905,7 @@ bool CWallet::SendAnonToSdc(CStealthAddress& sxAddress, int64_t nValue, int nRin int64_t nFeeRequired; std::string sError2; - if (!AddAnonInputs(RING_SIG_1, nValue, nRingSize, vecSend, vecChange, wtxNew, nFeeRequired, false, sError2)) + if (!AddAnonInputs(RING_SIG_2, nValue, nRingSize, vecSend, vecChange, wtxNew, nFeeRequired, false, sError2)) { LogPrintf("SendAnonToSdc() AddAnonInputs failed %s.\n", sError2.c_str()); sError = "AddAnonInputs() failed: " + sError2; @@ -5202,7 +5202,7 @@ bool CWallet::EstimateAnonFee(int64_t nValue, int nRingSize, std::string& sNarr, }; int64_t nFeeRequired; - if (!AddAnonInputs(RING_SIG_1, nValue, nRingSize, vecSend, vecChange, wtxNew, nFeeRequired, true, sError)) + if (!AddAnonInputs(RING_SIG_2, nValue, nRingSize, vecSend, vecChange, wtxNew, nFeeRequired, true, sError)) { LogPrintf("EstimateAnonFee() AddAnonInputs failed %s.\n", sError.c_str()); sError = "AddAnonInputs() failed.";