James Dorfman
d923eab56e
Merge 0808c88d7b into merged_master (Bitcoin PR bitcoin/bitcoin#25443 )
2024-09-16 05:05:56 +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
d02360aec2
Merge 4c0d1fec16 into merged_master (Bitcoin PR bitcoin/bitcoin#25374 )
2024-09-10 19:20:39 +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
4b197fbfb4
Merge c3daa321f9 into merged_master (Bitcoin PR bitcoin/bitcoin#25312 )
2024-09-09 21:13:12 +00:00
James Dorfman
e993380998
Merge 455780b1ae into merged_master (Bitcoin PR bitcoin/bitcoin#25294 )
2024-09-09 21:12:59 +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
0cf35ca80d
Merge bb83aba6c9 into merged_master (Bitcoin PR bitcoin/bitcoin#25161 )
2024-08-13 04:30:55 +00:00
James Dorfman
addbcad66f
Merge e016c00e98 into merged_master (Bitcoin PR bitcoin/bitcoin#25126 )
2024-08-13 04:12:40 +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
28408ce8a5
Merge becea48fe0 into merged_master (Bitcoin PR bitcoin/bitcoin#25034 )
2024-08-08 18:08:45 +00:00
James Dorfman
de5fe0b74d
Merge cf0a8b9c48 into merged_master (Bitcoin PR bitcoin/bitcoin#24559 )
2024-07-30 15:23:21 +00:00
James Dorfman
41e72be6e1
Merge 10f629e644 into merged_master (Bitcoin PR bitcoin/bitcoin#24576 )
2024-07-29 19:15:06 +00:00
James Dorfman
b0c4300d1d
Merge 6c9460edae into merged_master (Bitcoin PR bitcoin/bitcoin#24358 )
2024-07-29 18:46:45 +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
Byron Hambly
53d81644ad
Merge f94784f5bc into merged_master (Bitcoin PR bitcoin/bitcoin#24533 )
2023-10-15 11:49:10 +00:00
Byron Hambly
45f83fd396
Merge bada9636d7 into merged_master (Bitcoin PR bitcoin/bitcoin#24043 )
2023-10-13 07:53:59 +00:00
James Dorfman
bb30fa363d
Fix feature_taproot functional test which has been failing since
...
the merge of bitcoin/bitcoin#23394 in 1beaa601b4
2023-08-11 16:39:14 +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
7a7253639a
Merge 267917f563 into merged_master (Bitcoin PR bitcoin/bitcoin#23304 )
2023-07-03 10:06:51 +00:00
Byron Hambly
1223ba95ca
Merge f1ce67f09f into merged_master (Bitcoin PR bitcoin/bitcoin#19013 )
2023-07-02 15:42:51 +00:00
Byron Hambly
d2ee0b0b61
Merge 7164e00e1b into merged_master (Bitcoin PR bitcoin/bitcoin#24324 )
2023-06-30 17:34:42 +00:00
Byron Hambly
71acfa3da7
Merge 6b8e4977b8 into merged_master (Bitcoin PR bitcoin/bitcoin#24342 )
2023-06-30 17:03:39 +00:00
Byron Hambly
900cf5f60d
Merge eca694a4e7 into merged_master (Bitcoin PR bitcoin/bitcoin#24239 )
2023-06-30 10:01:50 +00:00
Byron Hambly
687f3b8fcd
Merge 8f137e69ca into merged_master (Bitcoin PR bitcoin/bitcoin#24192 )
2023-06-29 14:39:34 +00:00
Byron Hambly
5931d7d47c
Merge d4e92d8436 into merged_master (Bitcoin PR bitcoin/bitcoin#23508 )
2023-06-29 11:46:17 +00:00
Byron Hambly
c53eb39edf
Merge 807169e10b into merged_master (Bitcoin PR bitcoin/bitcoin#24035 )
2023-06-20 09:57:58 +00:00
Byron Hambly
37a2061f06
Merge d69af93223 into merged_master (Bitcoin PR bitcoin/bitcoin#23737 )
2023-06-14 17:43:17 +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
54c9ee347d
Merge 9635760ce8 into merged_master (Bitcoin PR bitcoin/bitcoin#22777 )
2023-06-13 10:06:36 +00:00
Byron Hambly
70c69d94f6
Merge 9f7661c0c4 into merged_master (Bitcoin PR bitcoin/bitcoin#19499 )
2023-06-12 13:11:30 +00:00
Byron Hambly
32bcb2de54
Merge 09e60df115 into merged_master (Bitcoin PR bitcoin/bitcoin#23723 )
2023-06-06 11:56:36 +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
1413ea774b
Merge 68ca8677e0 into merged_master (Bitcoin PR bitcoin/bitcoin#23716 )
2023-06-06 10:11:17 +00:00
Byron Hambly
50957f3e4b
Merge 26a1147ce5 into merged_master (Bitcoin PR bitcoin/bitcoin#23636 )
2023-06-01 12:04:07 +00:00
James Dorfman
b7ee0e8b7f
Merge aef8c7cf82 into merged_master (Bitcoin PR bitcoin/bitcoin#23289 )
2023-06-01 05:52:23 +00:00
James Dorfman
5aadbb7a9d
Merge 63c0d0e937 into merged_master (Bitcoin PR bitcoin/bitcoin#21327 )
...
I commented out a few new lines at the bottom of test/functional/p2p_ibd_txrelay.py
It tests that nodes process certain transactions, after IBD. These new assertions
from upstream are failing, but it may be because our IBD / tx sharing logic is different.
We should revisit this.
2023-06-01 05:27:06 +00:00
Byron Hambly
6f1067c437
Merge a574f4ad39 into merged_master (Bitcoin PR bitcoin/bitcoin#23392 )
2023-05-31 11:42:45 +00:00
Byron Hambly
eb7b15c660
Merge 4f8b1f8759 into merged_master (Bitcoin PR bitcoin/bitcoin#23608 )
2023-05-31 10:24:48 +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
1ca7d86b81
Merge 41e6909c07 into merged_master (Bitcoin PR bitcoin/bitcoin#23516 )
2023-05-26 09:32:13 +00:00
Byron Hambly
1beaa601b4
Merge 5ccab7187b into merged_master (Bitcoin PR bitcoin/bitcoin#23394 )
...
- commented out some script tests that need to be fixed
- commented out feature_taproot.py since it needs significant updates
2023-05-26 09:14:20 +00:00
