diff options
| author | Andrew Chow <achow101-github@achow101.com> | 2021-12-20 14:40:00 -0500 |
|---|---|---|
| committer | Andrew Chow <achow101-github@achow101.com> | 2021-12-20 14:48:22 -0500 |
| commit | 3ac38058ce0e80a9f4276bfa82951decdb237e9a (patch) | |
| tree | a0bb6697b1fd82fac83cb6431635d11a30dc74f4 /test/functional/wallet_groups.py | |
| parent | 9ac064d245f0fd4cb0362cfc472b65836328bffe (diff) | |
| parent | fada6c65d23f7bd4682fac281026612b835c4f8b (diff) | |
Merge bitcoin/bitcoin#23789: wallet: Strictly match tx change type to improve privacy
fada6c65d23f7bd4682fac281026612b835c4f8b wallet: Strictly match tx change type to improve privacy (MarcoFalke)
Pull request description:
Currently the change type will only match a destination by accident, making it easier to determine the change.
Fix that by strictly matching one of the destinations.
ACKs for top commit:
S3RK:
Concept & Approach ACK fada6c6. Also did light code review .
achow101:
ACK fada6c65d23f7bd4682fac281026612b835c4f8b
prayank23:
tACK https://github.com/bitcoin/bitcoin/pull/23789/commits/fada6c65d23f7bd4682fac281026612b835c4f8b
w0xlt:
tACK fada6c6
Tree-SHA512: 2b072c3c32debac7b0bef07a6df9a8f1a631e0f7d556b859973f18894ca490225582dc13e4588b29fa205ffbcd30fb632d5313b304d10ad17a26adc3f7684471
Diffstat (limited to 'test/functional/wallet_groups.py')
| -rwxr-xr-x | test/functional/wallet_groups.py | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/test/functional/wallet_groups.py b/test/functional/wallet_groups.py index 9052bc7f7f..eb305c5fa2 100755 --- a/test/functional/wallet_groups.py +++ b/test/functional/wallet_groups.py @@ -108,17 +108,10 @@ class WalletGroupTest(BitcoinTestFramework): assert_equal(input_addrs[0], input_addrs[1]) # Node 2 enforces avoidpartialspends so needs no checking here - if self.options.descriptors: - # Descriptor wallets will use Taproot change by default which has different fees - tx4_ungrouped_fee = 3060 - tx4_grouped_fee = 4400 - tx5_6_ungrouped_fee = 5760 - tx5_6_grouped_fee = 8480 - else: - tx4_ungrouped_fee = 2820 - tx4_grouped_fee = 4160 - tx5_6_ungrouped_fee = 5520 - tx5_6_grouped_fee = 8240 + tx4_ungrouped_fee = 2820 + tx4_grouped_fee = 4160 + tx5_6_ungrouped_fee = 5520 + tx5_6_grouped_fee = 8240 self.log.info("Test wallet option maxapsfee") addr_aps = self.nodes[3].getnewaddress() |