From 557e27fd2150953ce175ec123013faddcabcccde Mon Sep 17 00:00:00 2001
From: Thomas Winget <tewinget@gmail.com>
Date: Thu, 2 Oct 2014 16:44:55 -0400
Subject: per kb fees

---
 src/wallet/wallet2.cpp | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'src/wallet/wallet2.cpp')

diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index 5af9a71bd..31345879b 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -954,7 +954,22 @@ std::vector<wallet2::pending_tx> wallet2::create_transactions(std::vector<crypto
       {
         cryptonote::transaction tx;
         pending_tx ptx;
-        transfer(dst_vector, fake_outs_count, unlock_time, fee, extra, tx, ptx);
+
+	// loop until fee is met without increasing tx size to next KB boundary.
+	uint64_t needed_fee = 0;
+	do
+	{
+	  transfer(dst_vector, fake_outs_count, unlock_time, fee, extra, tx, ptx);
+	  auto txBlob = t_serializable_object_to_blob(ptx.tx);
+	  uint64_t txSize = txBlob.size();
+	  uint64_t numKB = txSize / 1024;
+	  if (txSize % 1024)
+	  {
+	    numKB++;
+	  }
+	  needed_fee = numKB * FEE_PER_KB;
+	} while (ptx.fee < needed_fee);
+
         ptx_vector.push_back(ptx);
 
         // mark transfers to be used as "spent"
-- 
cgit v1.2.3


From dc67b12ea9b8056efdf72c57bf4377c758f26a64 Mon Sep 17 00:00:00 2001
From: Thomas Winget <tewinget@gmail.com>
Date: Thu, 30 Oct 2014 18:53:56 -0400
Subject: Should now properly do per-kb fee

I'm an idiot.
---
 src/wallet/wallet2.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/wallet/wallet2.cpp')

diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index 31345879b..173321d42 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -957,9 +957,10 @@ std::vector<wallet2::pending_tx> wallet2::create_transactions(std::vector<crypto
 
 	// loop until fee is met without increasing tx size to next KB boundary.
 	uint64_t needed_fee = 0;
+	uint64_t current_fee = 0;
 	do
 	{
-	  transfer(dst_vector, fake_outs_count, unlock_time, fee, extra, tx, ptx);
+	  transfer(dst_vector, fake_outs_count, unlock_time, current_fee, extra, tx, ptx);
 	  auto txBlob = t_serializable_object_to_blob(ptx.tx);
 	  uint64_t txSize = txBlob.size();
 	  uint64_t numKB = txSize / 1024;
-- 
cgit v1.2.3


From d2287d31083bc1f9c5ff52f77c23846ff5241819 Mon Sep 17 00:00:00 2001
From: Thomas Winget <tewinget@gmail.com>
Date: Mon, 3 Nov 2014 14:35:48 -0500
Subject: per kb fees not passing correct fee to transfer()

---
 src/wallet/wallet2.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/wallet/wallet2.cpp')

diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index 173321d42..5b247ff47 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -957,10 +957,9 @@ std::vector<wallet2::pending_tx> wallet2::create_transactions(std::vector<crypto
 
 	// loop until fee is met without increasing tx size to next KB boundary.
 	uint64_t needed_fee = 0;
-	uint64_t current_fee = 0;
 	do
 	{
-	  transfer(dst_vector, fake_outs_count, unlock_time, current_fee, extra, tx, ptx);
+	  transfer(dst_vector, fake_outs_count, unlock_time, needed_fee, extra, tx, ptx);
 	  auto txBlob = t_serializable_object_to_blob(ptx.tx);
 	  uint64_t txSize = txBlob.size();
 	  uint64_t numKB = txSize / 1024;
-- 
cgit v1.2.3