Byron Hambly
ccd960b0f9
Merge 7d65e3372f into merged_master (Bitcoin PR bitcoin/bitcoin#27733 )
2025-06-27 21:52:08 +02:00
Byron Hambly
810427867c
Merge 3132ec64d9 into merged_master (Bitcoin PR bitcoin/bitcoin#27177 )
2025-06-23 11:27:52 +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
0b1508bf01
ci: fix lint issues
2025-04-17 11:06:32 +02:00
Byron Hambly
a8c15ff245
Merge c0311b1dda into merged_master (Bitcoin PR bitcoin/bitcoin#27349 )
2025-04-12 10:10:01 +02:00
Byron Hambly
e048a4bffd
Merge 873a5062db into merged_master (Bitcoin PR bitcoin/bitcoin#27269 )
2025-04-11 22:20:04 +02:00
Byron Hambly
a40bcf97bd
Merge 89fb354f28 into merged_master (Bitcoin PR bitcoin/bitcoin#26625 )
2025-04-03 10:33:03 +02:00
Byron Hambly
769260634b
Merge 8339f3cea8 into merged_master (Bitcoin PR bitcoin/bitcoin#26886 )
2025-04-02 21:57:11 +02:00
Tom Trevethan
15bc30b2c3
Merge 599e941c19 into merged_master (Bitcoin PR bitcoin/bitcoin#26657 )
2025-04-02 16:04:31 +00:00
Byron Hambly
b4405ba453
Merge e9262ea32a into merged_master (Bitcoin PR bitcoin/bitcoin#26750 )
2025-03-31 16:37:52 +02:00
Byron Hambly
41f380c8f0
Merge bd13d6b369 into merged_master (Bitcoin PR bitcoin/bitcoin#26656 )
2025-03-31 10:06:08 +02:00
Byron Hambly
4f17f28214
Merge 38cbf43dee into merged_master (Bitcoin PR bitcoin/bitcoin#26414 )
2025-03-05 09:36:38 +02:00
Byron Hambly
3ed5ae03ca
Merge 00c323610a into merged_master (Bitcoin PR bitcoin/bitcoin#25986 )
2025-03-03 16:38:50 +02:00
Byron Hambly
b11cdfc92b
Merge 2c3115d4f5 into merged_master (Bitcoin PR bitcoin/bitcoin#25773 )
2024-10-25 12:00:10 +02:00
Byron Hambly
48d663a3d6
Merge 9155f9b7af into merged_master (Bitcoin PR bitcoin/bitcoin#25379 )
2024-10-25 09:50:32 +02: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
fa1a985ef3
Merge 1b71c76886 into merged_master (Bitcoin PR bitcoin/bitcoin#25435 )
2024-09-16 04:45:07 +00:00
James Dorfman
b816bdc2f3
Merge b178807265 into merged_master (Bitcoin PR bitcoin/bitcoin#25430 )
2024-09-16 03:45:20 +00:00
James Dorfman
7c166369af
Merge f8586b25f6 into merged_master (Bitcoin PR bitcoin/bitcoin#25289 )
...
These changes to the functional test framework are pretty simple,
but please verify that I did them correctly. I'm not certain about them.
2024-09-11 16:10:03 +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
041147b7c6
Merge 506d9b25a3 into merged_master (Bitcoin PR bitcoin/bitcoin#24839 )
...
This required some changes to various helper methods in the python
functional test framework. Please verify those.
2024-09-10 17:49:27 +00:00
James Dorfman
abdd702c0f
Merge e282764e04 into merged_master (Bitcoin PR bitcoin/bitcoin#25228 )
2024-09-09 19:39:17 +00:00
James Dorfman
fd8fa61417
Merge 1c7ef0abd1 into merged_master (Bitcoin PR bitcoin/bitcoin#25262 )
2024-09-06 19:30:23 +00:00
James Dorfman
0d39470585
Merge 9cc010f5a9 into merged_master (Bitcoin PR bitcoin/bitcoin#25087 )
2024-09-06 18:49:38 +00:00
James Dorfman
33fdfa36b1
Merge d24318a40c into merged_master (Bitcoin PR bitcoin/bitcoin#24941 )
2024-08-08 20:56:06 +00:00
James Dorfman
3a37a8cbb5
Merge 3297f5c11c into merged_master (Bitcoin PR bitcoin/bitcoin#24623 )
2024-04-10 16:04:47 +00:00
James Dorfman
c3629a2443
Merge 864fb89b2f into merged_master (Bitcoin PR bitcoin/bitcoin#24637 )
2024-01-17 21:00:59 +00:00
James Dorfman
92481c3833
Merge 8234cdaf62 into merged_master (Bitcoin PR bitcoin/bitcoin#24587 )
2024-01-17 01:39:36 +00:00
James Dorfman
aa80572b01
Merge e3206c9445 into merged_master (Bitcoin PR bitcoin/bitcoin#24605 )
...
Please review my changes in test/functional/test_framework/wallet.py.
Confirm that my change of the return value from 1 --> 2 was correct.
That fixed a failing test. I think it's needed because in elements we
have an extra fee output.
2024-01-08 19:45:18 +00:00
James Dorfman
1c5469b60c
Re-activate assertion which was disabled in the merge of bitcoin/bitcoin#23371 in 2110cca
...
A subsequent commit appears to have fixed that assertion. It works now.
2023-08-01 10:28:20 +02: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
42605e228f
Merge d3582f2d3b into merged_master (Bitcoin PR bitcoin/bitcoin#23866 )
...
I had to make some python changes for the rpc_scantxoutset.py which are
pretty hacky but get the job done.
2023-06-14 13:08:29 +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
2a6a83b69b
Merge fa2303989b into merged_master (Bitcoin PR bitcoin/bitcoin#23515 )
2023-05-25 08:43:30 +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
brunoerg
272eb55616
test: fix include_immature_coinbase logic in get_utxos
...
Use current block height to compute the confirmation count
instead of using the value from utxo object
2023-05-19 09:13:30 -03:00
brunoerg
60ced9007d
test: fix intermittent issue in feature_bip68_sequence
...
To avoid `bad-txns-premature-spend-of-coinbase` error,
when getting a utxo (using `get_utxo`) to create a new
transaction `get_utxo` shouldn't return by default
immature coinbase.
2023-05-19 09:13:17 -03:00
Byron Hambly
18c7997de0
Merge 8bac3b1096 into merged_master (Bitcoin PR bitcoin/bitcoin#23375 )
2023-05-16 12:39:37 +00:00
Byron Hambly
a27835cb7d
Merge 548ad5ef7f into merged_master (Bitcoin PR bitcoin/bitcoin#23281 )
2023-05-14 09:12:26 +00:00
MarcoFalke
faf4315c88
test: Return dict in MiniWallet::send_to
2023-05-12 15:26:50 +02:00
Byron Hambly
f80332fee5
Merge 2e82af46e2 into merged_master (Bitcoin PR bitcoin/bitcoin#23207 )
2023-05-12 09:55:10 +00:00
Byron Hambly
ee8f77f5b2
Merge 991753e4d5 into merged_master (Bitcoin PR bitcoin/bitcoin#23118 )
2023-05-10 11:36:56 +00:00
Byron Hambly
1c0f4948ec
Merge b4437d7dfe into merged_master (Bitcoin PR bitcoin/bitcoin#23210 )
2023-05-10 11:04:50 +00:00
Byron Hambly
15ada59eac
Merge bb8550b788 into merged_master (Bitcoin PR bitcoin/bitcoin#23209 )
2023-05-09 13:33:24 +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
04a9784dae
Merge 01b5cfb951 into merged_master (Bitcoin PR bitcoin/bitcoin#23047 )
2023-04-24 08:39: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
