Merge pull request #2129 from gmaxwell/wallet_less_frequent_fees

gavinandresen · gavinandresen · commit 9980d118eebb · 2013-01-14T12:05:06.000-08:00
If the prio. will be enough after the next block don't force fees. [wallet]
diff --git a/src/wallet.cpp b/src/wallet.cpp
@@ -1154,7 +1154,10 @@ bool CWallet::CreateTransaction(const vector<pair<CScript, int64> >& vecSend, CW
                 BOOST_FOREACH(PAIRTYPE(const CWalletTx*, unsigned int) pcoin, setCoins)
                 {
                     int64 nCredit = pcoin.first->vout[pcoin.second].nValue;
-                    dPriority += (double)nCredit * pcoin.first->GetDepthInMainChain();
+                    //The priority after the next block (depth+1) is used instead of the current,
+                    //reflecting an assumption the user would accept a bit more delay for
+                    //a chance at a free transaction.
+                    dPriority += (double)nCredit * (pcoin.first->GetDepthInMainChain()+1);
                 }
 
                 int64 nChange = nValueIn - nValue - nFeeRet;

Original file line number	Diff line number	Diff line change
`@@ -1154,7 +1154,10 @@ bool CWallet::CreateTransaction(const vector<pair<CScript, int64> >& vecSend, CW`
`1154`	`1154`	`BOOST_FOREACH(PAIRTYPE(const CWalletTx*, unsigned int) pcoin, setCoins)`
`1155`	`1155`	`{`
`1156`	`1156`	`int64 nCredit = pcoin.first->vout[pcoin.second].nValue;`
`1157`		`- dPriority += (double)nCredit * pcoin.first->GetDepthInMainChain();`
	`1157`	`+ //The priority after the next block (depth+1) is used instead of the current,`
	`1158`	`+ //reflecting an assumption the user would accept a bit more delay for`
	`1159`	`+ //a chance at a free transaction.`
	`1160`	`+ dPriority += (double)nCredit * (pcoin.first->GetDepthInMainChain()+1);`
`1158`	`1161`	`}`
`1159`	`1162`
`1160`	`1163`	`int64 nChange = nValueIn - nValue - nFeeRet;`