ivanlele
623932d6b0
Merge b9c241804c into merged_master (Bitcoin PR bitcoin/bitcoin#30226 )
2026-04-14 13:19:39 +00:00
ivanlele
b573c24538
Merge 0a931a9787 into merged_master (Bitcoin PR bitcoin/bitcoin
...
(#31599
#31403 )
2026-04-14 09:01:18 +00:00
ivanlele
f5e0886059
Merge 604bf2ea37 into merged_master (Bitcoin PR bitcoin/bitcoin#28121 )
2026-04-09 13:22:06 +00:00
ivanlele
83750eb16f
Merge 0903ce8dbc into merged_master (Bitcoin PR bitcoin/bitcoin#30592 )
2026-04-02 15:05:13 +00:00
ivanlele
ad912fd7a2
Merge 902dd14382 into merged_master (Bitcoin PR bitcoin/bitcoin#30493 )
2026-03-11 12:11:34 +00:00
ivanlele
aa41e29f97
Merge 3a29ff5dea into merged_master (Bitcoin PR bitcoin/bitcoin#30463 )
2026-03-09 16:54:19 +00:00
Tom Trevethan
5bdda96136
Merge ecd23656db into merged_master (Bitcoin PR bitcoin/bitcoin#30133 )
2026-02-22 23:31:44 +00:00
Byron Hambly
cca9d5bb4a
lint: fix python lints
2025-10-31 14:16:40 +02:00
Tom Trevethan
2ac4a15957
fix test issues in feature_rbf
...
(cherry picked from commit 22851e4144f62bd2128133f4cd7d77ffb3632e48)
2025-08-22 11:36:18 +02:00
Byron Hambly
1576f6243d
Merge ccc431d53e into merged_master (Bitcoin PR bitcoin/bitcoin#27640 )
2025-06-20 21:20:02 +02:00
Byron Hambly
8c94853dce
Merge bf9361d375 into merged_master (Bitcoin PR bitcoin/bitcoin#26941 )
2025-04-04 08:47:38 +02:00
Byron Hambly
769260634b
Merge 8339f3cea8 into merged_master (Bitcoin PR bitcoin/bitcoin#26886 )
2025-04-02 21:57:11 +02:00
Byron Hambly
b4405ba453
Merge e9262ea32a into merged_master (Bitcoin PR bitcoin/bitcoin#26750 )
2025-03-31 16:37:52 +02:00
Byron Hambly
1b7e6dda13
Merge f3bc1a7282 into merged_master (Bitcoin PR bitcoin/bitcoin#26265 )
2025-03-31 16:29:50 +02:00
Byron Hambly
0b0d5d214e
Merge 8597260872 into merged_master (Bitcoin PR bitcoin/bitcoin#26480 )
2025-03-04 10:42:21 +02:00
Alfonso Roman Zubeldia
723440c5b8
test framework, wallet: rename get_scriptPubKey method to get_output_script
2025-01-24 14:57:36 -03:00
Matthew Zipkin
f9cac63523
test: cover testmempoolaccept debug-message in RBF test
2024-12-10 11:00:25 -05:00
Byron Hambly
8499b13762
lint: fix lint issues
2024-12-03 14:02:33 +02:00
Byron Hambly
7a022fb75d
Merge c5f0cbefa3 into merged_master (Bitcoin PR bitcoin/bitcoin#25775 )
2024-11-04 15:04:48 +02:00
Greg Sanders
111a23d9b3
Remove -mempoolfullrbf option
2024-10-28 11:53:20 -04:00
James Dorfman
35cd74da0f
Merge 31c6309cc6 into merged_master (Bitcoin PR bitcoin/bitcoin#25596 )
2024-10-16 06:30:40 +00:00
James Dorfman
00aa7139b8
Fix invalid RPC call within feature_rbf functional test
2024-10-16 05:42:41 +00:00
James Dorfman
a1bb92a8d7
Merge 39d111aee7 into merged_master (Bitcoin PR bitcoin/bitcoin#25575 )
2024-10-16 04:56:58 +00:00
James Dorfman
dbab4c012c
Merge a7f3479ba3 into merged_master (Bitcoin PR bitcoin/bitcoin#25353 )
2024-10-13 18:06:13 +00:00
James Dorfman
9841d576fb
Merge 8ef096d4f8 into merged_master (Bitcoin PR bitcoin/bitcoin#25522 )
...
This commit made a lot of changes to test/functional/feature_rbf.py.
That functional test already had each subtest commented out, because
they weren't working properly.
For the most part, I simply accepted the incoming changes, and did not
actually get the functional test to start working.
2024-10-13 06:56:17 +00:00
James Dorfman
7c29c4bcdd
Merge c8261026a4 into merged_master (Bitcoin PR bitcoin/bitcoin#25445 )
...
Please double check my changes here -- I had to adjust some units
in test/functional/test_framework/wallet.py.
2024-09-17 18:35:09 +00:00
James Dorfman
aa54d7bc2f
Merge f52d074363 into merged_master (Bitcoin PR bitcoin/bitcoin#25439 )
2024-09-16 05:31:22 +00:00
James Dorfman
fa1a985ef3
Merge 1b71c76886 into merged_master (Bitcoin PR bitcoin/bitcoin#25435 )
2024-09-16 04:45:07 +00:00
James Dorfman
63397a752c
Merge a55606c3bd into merged_master (Bitcoin PR bitcoin/bitcoin#25356 )
2024-09-10 18:37:30 +00:00
James Dorfman
abdd702c0f
Merge e282764e04 into merged_master (Bitcoin PR bitcoin/bitcoin#25228 )
2024-09-09 19:39:17 +00:00
Ava Chow
902dd14382
Merge bitcoin/bitcoin#30493 : policy: enable full-rbf by default
...
590456e3f1195e98ea8e#28132 was closed recently with this [comment](https://github.com/bitcoin/bitcoin/pull/28132#issuecomment-2225369634 ).
---
Rationale:
- Full RBF config option was added in July 2022: https://github.com/bitcoin/bitcoin/pull/25353
- It is used regularly: https://mempool.space/rbf#fullrbf
- Most mining pools are using it: https://github.com/bitcoin/bitcoin/pull/28132#issuecomment-2059120917
ACKs for top commit:
petertodd:
ACK 590456e3f1https://github.com/bitcoin/bitcoin/pull/30493/commits/590456e3f1043ba0680e0afec9fd7653db1098bb
glozow:
reACK 590456e3f1590456e3f1590456e3590456e3f1
2024-08-05 16:10:46 -04:00
Peter Todd
590456e3f1
policy: enable full-rbf by default
...
Enable full rbf (mempool policy) by default and update tests accordingly.
2024-08-02 20:22:20 +00:00
Hennadii Stepanov
a0473442d1
scripted-diff: Add __file__ argument to BitcoinTestFramework.init()
...
-BEGIN VERIFY SCRIPT-
sed -i -e 's/\s*().main\s*()/(__file__).main()/' $(git ls-files test/functional/*.py)
sed -i -e 's/def __init__(self)/def __init__(self, test_file)/' test/functional/test_framework/test_framework.py
-END VERIFY SCRIPT-
2024-07-16 22:06:47 +01:00
Sebastian Falbesoner
8950053636
test: remove unneeded -maxorphantx=1000 settings
...
It's unclear what the motivation for increasing the orphan pool is, and
it seems that this not needed at all. None of these tests involve orphan
transactions explicitly, and if they would occur occasionally, there is
no good reason to prefer a value of 1000 over the default of 100 (see
DEFAULT_MAX_ORPHAN_TRANSACTIONS).
2024-05-17 22:38:59 +02:00
Byron Hambly
b59e244da3
lint: fix issues from lint-python.sh
2023-09-01 16:04:39 +02:00
Byron Hambly
c53eb39edf
Merge 807169e10b into merged_master (Bitcoin PR bitcoin/bitcoin#24035 )
2023-06-20 09:57:58 +00:00
Byron Hambly
ca596d446a
Merge 529ed33362 into merged_master (Bitcoin PR bitcoin/bitcoin#23715 )
2023-06-06 10:18:36 +00:00
Byron Hambly
bd68371fb6
Merge ffdab41f94 into merged_master (Bitcoin PR bitcoin/bitcoin#23474 )
2023-05-26 10:32:04 +00:00
Byron Hambly
2110cca82e
Merge 2539980e1d into merged_master (Bitcoin PR bitcoin/bitcoin#23371 )
...
- added a few fixme notes where necessary
- for some reason the given internal_key from upstream has a different
parity, causing verifytaprootcommitment to fail... which is why the
internal_key has been changed
- fixed up the rpc_blockchain test
2023-05-24 10:25:00 +00:00
James Dorfman
677e269c5c
Merge 1435161f64 into merged_master (Bitcoin PR bitcoin/bitcoin#23316 )
2023-05-14 01:36:16 +00:00
MarcoFalke
faf4315c88
test: Return dict in MiniWallet::send_to
2023-05-12 15:26:50 +02:00
Byron Hambly
56426ad2cb
Merge c6f710ec98 into merged_master (Bitcoin PR bitcoin/bitcoin#23052 )
2023-05-09 10:31:34 +00:00
James Dorfman
b582aaadb4
Merge 33e31f8df9 into merged_master (Bitcoin PR bitcoin/bitcoin#23079 )
2023-04-28 10:07:15 +00:00
Byron Hambly
73ff8d7d61
FIXME commented out rbf tests
2023-04-23 07:15:22 +00:00
Byron Hambly
8b51bd1072
Merge ae674a0198 into merged_master (Bitcoin PR bitcoin/bitcoin#22998 )
2023-04-22 08:12:34 +00:00
Byron Hambly
787dbf524e
Merge 89447a63b9 into merged_master (Bitcoin PR bitcoin/bitcoin#23017 )
2023-04-22 07:35:38 +00:00
Byron Hambly
01372df8d5
Merge b997dd211e into merged_master (Bitcoin PR bitcoin/bitcoin#22809 )
2023-04-13 12:18:40 +00:00
James Dorfman
c8c66f0dc3
Merge eb09c26724 into merged_master (Bitcoin PR bitcoin/bitcoin#22741 )
2023-04-11 05:41:32 +00:00
James Dorfman
ebc6e3967f
Merge bb60960750 into merged_master (Bitcoin PR bitcoin/bitcoin#22593 )
2023-04-03 20:34:45 +00:00
Byron Hambly
9b98dc8ab1
Merge da1c0c64fd into merged_master (Bitcoin PR bitcoin/bitcoin#22330 )
2023-04-03 14:50:19 +02:00
