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
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
af3fe60b69
Merge 94db963de5 into merged_master (Bitcoin PR bitcoin/bitcoin#23300 )
2023-05-17 13:44:36 +00:00
Byron Hambly
14a31b99b1
Merge 24abd8312e into merged_master (Bitcoin PR bitcoin/bitcoin#22949 )
2023-05-17 08:32:34 +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
7e120e5e97
Merge ab25ef8c7f into merged_master (Bitcoin PR bitcoin/bitcoin#23305 )
2023-05-16 10:18:11 +00:00
Byron Hambly
a27835cb7d
Merge 548ad5ef7f into merged_master (Bitcoin PR bitcoin/bitcoin#23281 )
2023-05-14 09:12:26 +00:00
James Dorfman
677e269c5c
Merge 1435161f64 into merged_master (Bitcoin PR bitcoin/bitcoin#23316 )
2023-05-14 01:36:16 +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
Byron Hambly
cca3f919f8
Merge 9e530c6352 into merged_master (Bitcoin PR bitcoin/bitcoin#20487 )
2023-05-09 11:22:04 +00:00
Byron Hambly
cc16227789
Merge 35a31d5f7e into merged_master (Bitcoin PR bitcoin/bitcoin#23136 )
2023-04-28 14:14:21 +00:00
Byron Hambly
ceeb3783ee
Merge 1cf7fb9fd6 into merged_master (Bitcoin PR bitcoin/bitcoin#23104 )
2023-04-28 12:33:54 +00:00
James Dorfman
b582aaadb4
Merge 33e31f8df9 into merged_master (Bitcoin PR bitcoin/bitcoin#23079 )
2023-04-28 10:07:15 +00:00
James Dorfman
203ee3f248
Merge 7d4ea7c7ef into merged_master (Bitcoin PR bitcoin/bitcoin#23120 )
2023-04-27 20:08:05 +00:00
Byron Hambly
10b5206170
Merge 58c25bdcea into merged_master (Bitcoin PR bitcoin/bitcoin#23092 )
2023-04-24 10:32:18 +00:00
Byron Hambly
ae797e1b5a
Merge 442e32e117 into merged_master (Bitcoin PR bitcoin/bitcoin#22817 )
2023-04-24 09:07:43 +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
7856df2733
test: elements fixes for Bitcoin PR bitcoin/bitcoin#22818
2023-04-24 08:30:36 +00:00
Byron Hambly
13fb374543
Merge 8e9801bfc4 into merged_master (Bitcoin PR bitcoin/bitcoin#22818 )
2023-04-24 07:13:42 +00:00
Byron Hambly
3d243eab9e
Merge 86c3b84388 into merged_master (Bitcoin PR bitcoin/bitcoin#23036 )
2023-04-23 09:38:53 +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
James Dorfman
e55a95a3a8
Merge de2af19dc8 into merged_master (Bitcoin PR bitcoin/bitcoin#22987 )
2023-04-21 15:39:51 +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
56c954f2c0
Merge 6d76b57ca0 into merged_master (Bitcoin PR bitcoin/bitcoin#22960 )
2023-04-21 11:35:05 +00:00
Byron Hambly
1acda7580c
Merge adccbb380b into merged_master (Bitcoin PR bitcoin/bitcoin#21862 )
2023-04-11 08:09:30 +00:00
James Dorfman
c8c66f0dc3
Merge eb09c26724 into merged_master (Bitcoin PR bitcoin/bitcoin#22741 )
2023-04-11 05:41:32 +00:00
Byron Hambly
639d71f0d1
Merge f5a406f003 into merged_master (Bitcoin PR bitcoin/bitcoin#22633 )
2023-04-10 12:59:14 +00:00
Byron Hambly
4cc48afd88
Merge 0b5344b0d1 into merged_master (Bitcoin PR bitcoin/bitcoin#22632 )
2023-04-09 06:06:34 +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
62076b5b7e
Merge f4328ebef5 into merged_master (Bitcoin PR bitcoin/bitcoin#22619 )
2023-04-07 04:34:13 +00:00
Byron Hambly
570683e6ac
Merge ad0fc453cc into merged_master (Bitcoin PR bitcoin/bitcoin#16333 )
2023-04-06 11:43:11 +00:00
Byron Hambly
05f9a1a7c2
Merge 06788c6705 into merged_master (Bitcoin PR bitcoin/bitcoin#21528 )
2023-04-04 11:04:30 +02:00
Byron Hambly
884d58e0e1
Merge b620b2d58a into merged_master (Bitcoin PR bitcoin/bitcoin#22378 )
2023-04-04 11:00:11 +02:00
James Dorfman
ebc6e3967f
Merge bb60960750 into merged_master (Bitcoin PR bitcoin/bitcoin#22593 )
2023-04-03 20:34:45 +00:00
Byron Hambly
e17125c41b
Merge f2e41d1109 into merged_master (Bitcoin PR bitcoin/bitcoin#22429 )
2023-04-03 15:12:22 +02:00
James Dorfman
4a1391ccb8
Merge 78f040a6b3 into merged_master (Bitcoin PR bitcoin/bitcoin#22490 )
2023-04-03 03:29:18 +00:00
