From c2538c81728f4fa833d87fc391a05beb2d717785 Mon Sep 17 00:00:00 2001 From: GTO90 Date: Tue, 17 Dec 2024 20:18:52 -0600 Subject: [PATCH 1/2] tests: Fixes feature_taproot.py functional test This commit fixes the feature_taproot.py functional test by correctly setting DUST_LIMIT and MIN_FEE to match 8.22 fee changes and COINBASE_MATURITY_2. --- test/functional/feature_taproot.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/test/functional/feature_taproot.py b/test/functional/feature_taproot.py index af25744ade..2ce01c66e2 100755 --- a/test/functional/feature_taproot.py +++ b/test/functional/feature_taproot.py @@ -6,7 +6,6 @@ # Test Taproot softfork (BIPs 340-342) from test_framework.blocktools import ( - COINBASE_MATURITY, COINBASE_MATURITY_2, create_coinbase, create_block, @@ -598,8 +597,8 @@ def byte_popper(expr): SINGLE_SIG = {"inputs": [getter("sign")]} SIG_ADD_ZERO = {"failure": {"sign": zero_appender(default_sign)}} -DUST_LIMIT = 600 -MIN_FEE = 1300000 +DUST_LIMIT = 60000 +MIN_FEE = 130000000 # === Actual test cases === @@ -1462,7 +1461,7 @@ def test_spenders(self, node, spenders, input_counts): def run_test(self): # Post-taproot activation tests go first (pre-taproot tests' blocks are invalid post-taproot). self.log.info("Post-activation tests...") - self.generate(self.nodes[1], COINBASE_MATURITY + 1) + self.generate(self.nodes[1], COINBASE_MATURITY_2 + 1) self.test_spenders(self.nodes[1], spenders_taproot_active(), input_counts=[1, 2, 2, 2, 2, 3]) # Re-connect nodes in case they have been disconnected From f9c5e7694c0cfa8f479c7449cc1f617b5fb19aa2 Mon Sep 17 00:00:00 2001 From: GTO90 Date: Tue, 17 Dec 2024 20:18:52 -0600 Subject: [PATCH 2/2] tests: Fixes feature_taproot.py functional test This commit fixes the feature_taproot.py functional test by correctly setting DUST_LIMIT and MIN_FEE to match 8.22 fee changes and COINBASE_MATURITY_2. --- test/functional/feature_taproot.py | 7 +++---- test/functional/rpc_blockchain.py | 11 ++++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/test/functional/feature_taproot.py b/test/functional/feature_taproot.py index af25744ade..2ce01c66e2 100755 --- a/test/functional/feature_taproot.py +++ b/test/functional/feature_taproot.py @@ -6,7 +6,6 @@ # Test Taproot softfork (BIPs 340-342) from test_framework.blocktools import ( - COINBASE_MATURITY, COINBASE_MATURITY_2, create_coinbase, create_block, @@ -598,8 +597,8 @@ def byte_popper(expr): SINGLE_SIG = {"inputs": [getter("sign")]} SIG_ADD_ZERO = {"failure": {"sign": zero_appender(default_sign)}} -DUST_LIMIT = 600 -MIN_FEE = 1300000 +DUST_LIMIT = 60000 +MIN_FEE = 130000000 # === Actual test cases === @@ -1462,7 +1461,7 @@ def test_spenders(self, node, spenders, input_counts): def run_test(self): # Post-taproot activation tests go first (pre-taproot tests' blocks are invalid post-taproot). self.log.info("Post-activation tests...") - self.generate(self.nodes[1], COINBASE_MATURITY + 1) + self.generate(self.nodes[1], COINBASE_MATURITY_2 + 1) self.test_spenders(self.nodes[1], spenders_taproot_active(), input_counts=[1, 2, 2, 2, 2, 3]) # Re-connect nodes in case they have been disconnected diff --git a/test/functional/rpc_blockchain.py b/test/functional/rpc_blockchain.py index 2bb182e0a8..c21df10065 100755 --- a/test/functional/rpc_blockchain.py +++ b/test/functional/rpc_blockchain.py @@ -155,13 +155,14 @@ def _test_getblockchaininfo(self): 'taproot': { 'type': 'bip9', 'bip9': { - 'status': 'defined', - 'start_time': 4070908800, - 'timeout': 4099766400, + 'status': 'active', + 'start_time': -1, + 'timeout': 9223372036854775807, 'since': 0, - 'min_activation_height': 0, + 'min_activation_height': 0 }, - 'active': False + 'height': 0, + 'active': True } })