diff --git a/brit-core/src/main/java/org/multibit/hd/brit/core/services/FeeService.java b/brit-core/src/main/java/org/multibit/hd/brit/core/services/FeeService.java index 1df3164..4b62936 100644 --- a/brit-core/src/main/java/org/multibit/hd/brit/core/services/FeeService.java +++ b/brit-core/src/main/java/org/multibit/hd/brit/core/services/FeeService.java @@ -42,7 +42,7 @@ public class FeeService { private static final Logger log = LoggerFactory.getLogger(FeeService.class); - public static final Coin MINIMUM_FEE_PER_KB = Coin.valueOf(1000); // Slightly higher than the minimum relay fee (1000 sat per KB) as per Bitcoin Core 0.9 + public static final Coin MINIMUM_FEE_PER_KB = Coin.valueOf(5000); // The minimum relay fee (5000 sat per KB) as per https://www.reddit.com/r/Bitcoin/comments/3oecqm/psa_to_address_mempool_flooding_bitcoin_core/ public static final Coin DEFAULT_FEE_PER_KB = Coin.valueOf(10000); // 0.1 mBTC per KB - a long used fee structure which works as of spam attacks of July 2015 public static final Coin MAXIMUM_FEE_PER_KB = Coin.valueOf(50000); // 0.5 mBTC per KB diff --git a/brit-core/src/test/java/org/multibit/hd/brit/core/services/FeeServicesTest.java b/brit-core/src/test/java/org/multibit/hd/brit/core/services/FeeServicesTest.java index ae653d7..86296b4 100644 --- a/brit-core/src/test/java/org/multibit/hd/brit/core/services/FeeServicesTest.java +++ b/brit-core/src/test/java/org/multibit/hd/brit/core/services/FeeServicesTest.java @@ -162,7 +162,7 @@ public void testCalculateFeeStateWithDummyURL() throws Exception { public void checkFeePerKB() { // Check minimum - assertThat(Coin.valueOf(1000).equals(FeeService.MINIMUM_FEE_PER_KB)).isTrue(); + assertThat(Coin.valueOf(5000).equals(FeeService.MINIMUM_FEE_PER_KB)).isTrue(); // Check default assertThat(Coin.valueOf(10000).equals(FeeService.DEFAULT_FEE_PER_KB)).isTrue(); @@ -177,7 +177,7 @@ public void checkFeePerKB() { // Too small assertThat(FeeService.MINIMUM_FEE_PER_KB.equals(FeeService.normaliseRawFeePerKB(-1))).isTrue(); - assertThat(FeeService.MINIMUM_FEE_PER_KB.equals(FeeService.normaliseRawFeePerKB(999))).isTrue(); + assertThat(FeeService.MINIMUM_FEE_PER_KB.equals(FeeService.normaliseRawFeePerKB(4999))).isTrue(); // Just right assertThat(Coin.valueOf(12345).equals(FeeService.normaliseRawFeePerKB(12345))).isTrue();