Commit graph

138 commits

Author SHA1 Message Date
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
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
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
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
Byron Hambly
965ac7c53b Merge 58e02395ba into merged_master (Bitcoin PR bitcoin/bitcoin#22955) 2023-04-21 11:43:16 +00:00
Byron Hambly
8599606ab3 Merge 21438d55d5 into merged_master (Bitcoin PR bitcoin/bitcoin#21800) 2023-04-09 05:08:13 +00:00
James Dorfman
ebc6e3967f Merge bb60960750 into merged_master (Bitcoin PR bitcoin/bitcoin#22593) 2023-04-03 20:34:45 +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
Andrew Chow
544cbf776c tests: Use batched RPC in feature_fee_estimation
feature_fee_estimation has a lot of loops that hit the RPC many times in
succession in order to setup scenarios. Using batched requests for these
can reduce the test's runtime without effecting the test's behavior.
2022-12-09 13:57:01 -05:00
MarcoFalke
38cbf43dee
Merge bitcoin/bitcoin#26414: test: Move tx creation to create_self_transfer_multi
0b78110f73 test: Move tx creation to create_self_transfer_multi (kouloumos)

Pull request description:

  Two birds with one stone: replacement of https://github.com/bitcoin/bitcoin/pull/26278 with simplification of the MiniWallet's transaction creation logic.

  Currently the MiniWallet creates simple txns (1 input, 1 output) with `create_self_transfer`.  https://github.com/bitcoin/bitcoin/pull/24637 introduced `create_self_transfer_multi` **which uses** `create_self_transfer` to create a "transaction template" which then adjusts (copy and mutate inputs and outputs) in order to create more complex multi-input multi-output transactions.
  This can more easily lead to issues such as https://github.com/bitcoin/bitcoin/pull/26278 and is more of a maintenance burden.

  This PR simplifies the logic by going the other way around. Now `create_self_transfer` **uses** `create_self_transfer_multi`.
  The transaction creation logic has been moved to `create_self_transfer_multi` which is being called by `create_self_transfer` to construct the simple case of 1 input 1 output transaction.

ACKs for top commit:
  MarcoFalke:
    ACK 0b78110f73 👒

Tree-SHA512: 147e577ed5444bee57865bd375b37c9b49d6539e9875c30c2667e70fcba27fe80bcb4552a4e6efb42760d34b40d5dad826883b778eaeefe29425ec081787b4bd
2022-12-05 16:22:42 +01:00
kouloumos
0b78110f73 test: Move tx creation to create_self_transfer_multi 2022-10-28 16:19:55 +03:00
w0xlt
17cad44851 test: refactor RPCPackagesTest to use MiniWallet 2022-10-03 22:37:40 -03:00
MacroFake
fa2537cf0a
test: Target exact weight in MiniWallet _bulk_tx
Also, replace broad -acceptnonstdtxn=1 with -datacarriersize=100000
2022-08-03 12:02:20 +02:00
Andreas Kouloumos
f2f6068b69 test: MiniWallet: add send_self_transfer_chain to create chain of txns
With this new method, a chain of transactions can be created. This
method is introduced to further simplify the mempool_package_limits.py
tests.
2022-08-01 19:11:36 +03:00
Andreas Kouloumos
1d6b438ef0 test: use MiniWallet to simplify mempool_package_limits.py tests
Moved `bulk_transaction` into MiniWallet class as `_bulk_tx` private
helper method to be used when the newly added `target_weight` option is
passed to `create_self_transfer*`
2022-08-01 19:11:35 +03:00
MacroFake
fa5059b7df
test: Make the scriptPubKey of MiniWallet created txs mutable
This makes individual bytes of the scriptPubKey mutable, previously it
could only be re-assigned as a whole.
2022-07-01 12:29:23 +02:00
MacroFake
fa29245827
test: Allow setting sequence per input in MiniWallet create_self_transfer_multi
Previously it was only possible to set the same sequence in all inputs
2022-07-01 12:29:22 +02:00