Commit graph

122 commits

Author SHA1 Message Date
ivanlele
f5e0886059
Merge 604bf2ea37 into merged_master (Bitcoin PR bitcoin/bitcoin#28121) 2026-04-09 13:22:06 +00:00
ivanlele
744c517dac
Merge b0222bbb49 into merged_master (Bitcoin PR bitcoin/bitcoin#30239) 2026-04-03 10:45:45 +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
0418ff46dc
Merge 1afa3c84fc into merged_master (Bitcoin PR bitcoin/bitcoin#30562) 2026-03-11 10:50:48 +00:00
ivanlele
cd6ec40d0f
Merge 2aff9a36c3 into merged_master (Bitcoin PR bitcoin/bitcoin#30352) 2026-03-11 09:41:57 +00:00
ivanlele
aa41e29f97
Merge 3a29ff5dea into merged_master (Bitcoin PR bitcoin/bitcoin#30463) 2026-03-09 16:54:19 +00:00
ivanlele
514eb8e0cc
Merge 21656e99b5 into merged_master (Bitcoin PR bitcoin/bitcoin#29862) 2026-03-02 12:15:26 +00:00
ikripaka
17631653e2
Merge 5ee6b76c69 into merged_master (Bitcoin PR bitcoin/bitcoin#29325) 2026-02-26 20:15:02 +00:00
Tom Trevethan
47d5b97abe Merge 6e4d18f37f into merged_master (Bitcoin PR bitcoin/bitcoin#29496) 2026-02-26 00:37:21 +00:00
ivanlele
ac016af13b
Merge d73245abc7 into merged_master (Bitcoin PR bitcoin/bitcoin#29120) 2026-02-19 13:25:49 +00:00
ivanlele
6302a4cdf6
Merge 3d255dfb67 into merged_master (Bitcoin PR bitcoin/bitcoin#29459) 2026-02-16 11:38:58 +00:00
Byron Hambly
a8fa0d7b5e
Merge c265aad5b5 into merged_master (Bitcoin PR bitcoin/bitcoin#29434) 2025-12-04 09:03:33 +02:00
Byron Hambly
cca9d5bb4a
lint: fix python lints 2025-10-31 14:16:40 +02:00
Tom Trevethan
f8ff00aec1
remove redundant tests for small tx policy
(cherry picked from commit dea29eab119974afcdc1f57dddfadac3ed2906e6)
2025-08-22 11:34:32 +02:00
Byron Hambly
ccd960b0f9 Merge 7d65e3372f into merged_master (Bitcoin PR bitcoin/bitcoin#27733) 2025-06-27 21:52:08 +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
e118b94887 Merge b63f7ab9b5 into merged_master (Elements PR #1433) 2025-04-16 11:48:02 +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
7daea6099f Merge 26002570ab into merged_master (Bitcoin PR bitcoin/bitcoin#26646) 2025-04-01 21:20:32 +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
32390d1552
test: use bitcoin default dustrelayfee in mempool_accept.py 2025-03-13 09:38:10 +02:00
Matthew Zipkin
221c789e91
rpc: include verbose reject-details field in testmempoolaccept response 2024-12-04 14:37:37 -05:00
Byron Hambly
1d5e0e2049 Merge e9e943cfb7 into merged_master (Bitcoin PR bitcoin/bitcoin#26069) 2024-11-26 13:37:58 +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
fd8fa61417 Merge 1c7ef0abd1 into merged_master (Bitcoin PR bitcoin/bitcoin#25262) 2024-09-06 19:30:23 +00:00
Ava Chow
902dd14382
Merge bitcoin/bitcoin#30493: policy: enable full-rbf by default
590456e3f1 policy: enable full-rbf by default (Peter Todd)
195e98ea8e doc: add release notes for full-rbf (Peter Todd)

Pull request description:

  This pull request enables full rbf (mempool policy) by default. #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 590456e3f1
  instagibbs:
    reACK https://github.com/bitcoin/bitcoin/pull/30493/commits/590456e3f1043ba0680e0afec9fd7653db1098bb
  glozow:
    reACK 590456e3f1
  achow101:
    ACK 590456e3f1
  ariard:
    tested ACK 590456e3
  murchandamus:
    reACK 590456e3f1

Tree-SHA512: 83fceef9961021687e6ff979041f89be0c616f7a49cc28a5d7edf7d8ad064fcb9c0e2af0c31f4f89867a9f6dff4e40ef8ad4dbd624e7d6a4e00ac1f1c1f66c7a
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
Greg Sanders
2a3a24296e test: check that P2A with witness data is still consensus-legal 2024-08-02 13:03:06 -04:00
Greg Sanders
1349e9ec15 test: Add anchor mempool acceptance test 2024-07-30 14:06:58 -04: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
Lőrinc
969e047cfb Replace hard-coded constant in test 2024-06-18 19:43:33 +02:00
Ava Chow
429ec1aaaa refactor: Rename CTransaction::nVersion to version
In order to ensure that the change of nVersion to a uint32_t in the
previous commit has no effect, rename nVersion to version in this commit
so that reviewers can easily spot if a spot was missed or if there is a
check somewhere whose semantics have changed.
2024-06-07 13:55:23 -04:00
glozow
539404fe0f [policy] make v3 transactions standard
Note that, as CURRENT_VERSION = 2, the wallet will not make transactions
with nVersion=3 yet.
2024-06-02 08:54:50 +02:00
Brandon Odiwuor
e504b1fa1f test: Add test case for spending bare multisig
Co-authored-by: Anthony Towns <aj@erisian.com.au>
2024-04-25 16:22:58 +03:00
kevkevin
bf264e0598
test: check_mempool_result negative feerate
Adds test in mempool_accept to check if a negative maxfeerate is inputed
into check_mempool_result, asserts "Amount out of range" error message
and -3 error code
2024-02-21 10:07:53 -06:00
MarcoFalke
fa2a4fdef7
rpc: Fixed signed integer overflow for large feerates 2024-02-15 10:56:01 +01:00
Byron Hambly
c53eb39edf Merge 807169e10b into merged_master (Bitcoin PR bitcoin/bitcoin#24035) 2023-06-20 09:57:58 +00:00
Sebastian Falbesoner
1a572ce7d6 test: refactor: introduce generate_keypair helper with WIF support
In functional tests it is a quite common scenario to generate fresh
elliptic curve keypairs, which is currently a bit cumbersome as it
involves multiple steps, e.g.:

    privkey = ECKey()
    privkey.generate()
    privkey_wif = bytes_to_wif(privkey.get_bytes())
    pubkey = privkey.get_pubkey().get_bytes()

Simplify this by providing a new `generate_keypair` helper function that
returns the private key either as `ECKey` object or as WIF-string
(depending on the boolean `wif` parameter) and the public key as
byte-string; these formats are what we mostly need (currently we don't
use `ECPubKey` objects from generated keypairs anywhere).

With this, most of the affected code blocks following the pattern above
can be replaced by one-liners, e.g.:

    privkey, pubkey = generate_keypair(wif=True)

Note that after this commit, the only direct uses of `ECKey` remain in
situations where we want to set the private key explicitly, e.g. in
MiniWallet (test/functional/test_framework/wallet.py) or the test for
the signet miner script (test/functional/tool_signet_miner.py).
2023-06-19 17:38:14 +02:00
Byron Hambly
bd68371fb6 Merge ffdab41f94 into merged_master (Bitcoin PR bitcoin/bitcoin#23474) 2023-05-26 10:32:04 +00:00
Byron Hambly
7e120e5e97 Merge ab25ef8c7f into merged_master (Bitcoin PR bitcoin/bitcoin#23305) 2023-05-16 10:18:11 +00:00
MarcoFalke
faf4315c88
test: Return dict in MiniWallet::send_to 2023-05-12 15:26:50 +02:00
James Dorfman
ae89c4bc51 Merge a5d00d4baf into merged_master (Bitcoin PR bitcoin/bitcoin#22788) 2023-04-21 04:02:55 +00:00
Byron Hambly
884d58e0e1 Merge b620b2d58a into merged_master (Bitcoin PR bitcoin/bitcoin#22378) 2023-04-04 11:00:11 +02:00
kouloumos
0377d6bb42 test: add rescan_utxos in MiniWallet's initialization
this simplifies usage when MiniWallet is used with a pre-mined chain.
2023-01-16 19:01:09 +02:00
glozow
601bac88cb [rpc] return effective-includes in testmempoolaccept and submitpackage 2023-01-10 11:07:38 +00:00
glozow
1691eaa818 [rpc] return effective-feerate in testmempoolaccept and submitpackage 2023-01-10 11:06:10 +00:00
Hennadii Stepanov
306ccd4927
scripted-diff: Bump copyright headers
-BEGIN VERIFY SCRIPT-
./contrib/devtools/copyright_header.py update ./
-END VERIFY SCRIPT-

Commits of previous years:
- 2021: f47dda2c58
- 2020: fa0074e2d8
- 2019: aaaaad6ac9
2022-12-24 23:49:50 +00:00