Merge branch 'master' of https://github.com/bitstopco/breadwallet-core …

…into HEAD Revert to BRPeerManagerIsConnected()
Groestlcoin · Mar 29, 2018 · 04455b6 · 04455b6
2 parents 9171657 + 4ca34ed
commit 04455b6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/BRTransaction.h b/BRTransaction.h
@@ -34,7 +34,7 @@
 extern "C" {
 #endif
 
-#define TX_FEE_PER_KB        1000ULL     // standard tx fee per kb of tx size, rounded up to nearest kb
+#define TX_FEE_PER_KB        191ULL     // standard tx fee per kb of tx size, rounded up to nearest kb
 #define TX_OUTPUT_SIZE       34          // estimated size for a typical transaction output
 #define TX_INPUT_SIZE        148         // estimated size for a typical compact pubkey transaction input
 #define TX_MIN_OUTPUT_AMOUNT (TX_FEE_PER_KB*3*(TX_OUTPUT_SIZE + TX_INPUT_SIZE)/1000) //no txout can be below this amount

diff --git a/BRWallet.h b/BRWallet.h
@@ -36,7 +36,7 @@ extern "C" {
 #endif
 
 #define DEFAULT_FEE_PER_KB ((5000ULL*1000 + 99)/100) // bitcoind 0.11 min relay fee on 100bytes
-#define MIN_FEE_PER_KB     ((191ULL*1000 + 190)/191) // minimum relay fee on a 191byte tx
+#define MIN_FEE_PER_KB     ((TX_FEE_PER_KB*1000 + 190)/191) // minimum relay fee on a 191byte tx
 #define MAX_FEE_PER_KB     ((1000100ULL*1000 + 190)/191) // slightly higher than a 10000bit fee on a 191byte tx
 
 typedef struct {