From 20187f8487f19c67be689a4081699553e495e23a Mon Sep 17 00:00:00 2001 From: Greg Sanders Date: Mon, 17 Jun 2024 14:35:22 -0400 Subject: [PATCH] package rbf: cpfp structure requires package > parent feerate --- src/validation.cpp | 2 +- test/functional/mempool_package_rbf.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/validation.cpp b/src/validation.cpp index c34d60f137246d..b38b47bdc772eb 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -1201,7 +1201,7 @@ bool MemPoolAccept::PackageMempoolChecks(const std::vector& txn const CFeeRate package_feerate(m_subpackage.m_total_modified_fees, m_subpackage.m_total_vsize); if (package_feerate <= parent_feerate) { return package_state.Invalid(PackageValidationResult::PCKG_POLICY, - "package RBF failed: package feerate is less than parent feerate", + "package RBF failed: package feerate is less than or equal to parent feerate", strprintf("package feerate %s <= parent feerate is %s", package_feerate.ToString(), parent_feerate.ToString())); } diff --git a/test/functional/mempool_package_rbf.py b/test/functional/mempool_package_rbf.py index 078d99783926b5..0679070fca47fb 100755 --- a/test/functional/mempool_package_rbf.py +++ b/test/functional/mempool_package_rbf.py @@ -191,7 +191,7 @@ def test_package_rbf_additional_fees(self): self.assert_mempool_contents(expected=package_txns4) package_hex5, package_txns5 = self.create_simple_package(coin, parent_fee=DEFAULT_CHILD_FEE, child_fee=DEFAULT_CHILD_FEE) pkg_results5 = node.submitpackage(package_hex5) - assert 'package RBF failed: package feerate is less than parent feerate' in pkg_results5["package_msg"] + assert 'package RBF failed: package feerate is less than or equal to parent feerate' in pkg_results5["package_msg"] self.assert_mempool_contents(expected=package_txns4) package_hex5_1, package_txns5_1 = self.create_simple_package(coin, parent_fee=DEFAULT_CHILD_FEE, child_fee=DEFAULT_CHILD_FEE + Decimal("0.00000001"))