Andrew Poelstra
5af69f3cb4
Merge 3a2d5bfeb3 into merged_master (Bitcoin PR #21201 )
2021-06-24 14:15:01 +00:00
Andrew Poelstra
37c94c9100
Merge b805dbb0b9 into merged_master (Bitcoin PR #19809 )
2021-06-24 13:52:54 +00:00
Andrew Poelstra
c1e4d9e7b0
Merge db656db2ed into merged_master (Bitcoin PR #19136 )
2021-06-24 13:27:40 +00:00
Andrew Poelstra
5a654c9bab
Merge 9017d55e7c into merged_master (Bitcoin PR #15946 )
2021-06-24 02:56:40 +00:00
Andrew Poelstra
89db5e68a5
Merge cd66d8b1d8 into merged_master (Bitcoin PR #20429 )
2021-06-24 02:44:14 +00:00
Andrew Poelstra
993a3aa40e
Merge 372dd8da24 into merged_master (Bitcoin PR #21110 )
2021-06-24 02:09:12 +00:00
Andrew Poelstra
8446d721cb
Merge 4dc1ff809a into merged_master (Bitcoin PR #21192 )
2021-06-24 01:43:38 +00:00
Andrew Poelstra
94bba2a1a9
Merge 569b5ba1dc into merged_master (Bitcoin PR #21121 )
2021-06-24 01:31:01 +00:00
Andrew Poelstra
f18680ede6
Merge 8639c446d8 into merged_master (Bitcoin PR #21188 )
2021-06-24 00:38:41 +00:00
Andrew Poelstra
543ec56f1f
Merge 7c8e605bf4 into merged_master (Bitcoin PR #21159 )
2021-06-23 23:48:59 +00:00
Andrew Poelstra
61a241c5ca
Merge 92fee79dab into merged_master (Bitcoin PR #19806 )
...
Looks like James hardcoded a couple hashes in hard-to-find places, which
caused a unit test to fail. I just changed the hash (which covers UTXO
data which naturally will be different for us on account of our differently
formatted CTxOuts).
TODO: determine how Assumeutxo interacts with the fact that we don't save
out nonces in our normal UTXO serialization. Probably we will need to remove
the nonce from the CCoinStats serialization to avoid having inconsistent
hashes across nodes, since these hashes are now checked in assumeutxo?
2021-06-23 23:36:26 +00:00
Andrew Poelstra
c9d7a30db7
Merge 9bbf08bf98 into merged_master (Bitcoin PR #20721 )
2021-06-23 14:43:10 +00:00
Andrew Poelstra
378f299aa3
Merge b55dc3ad84 into merged_master (Bitcoin PR #21185 )
2021-06-23 14:30:51 +00:00
Andrew Poelstra
5ac1d67769
Merge 489030f2a8 into merged_master (Bitcoin PR #20965 )
2021-06-23 14:18:22 +00:00
Andrew Poelstra
573890acfd
Merge cb073bed00 into merged_master (Bitcoin PR #21167 )
2021-06-23 14:05:56 +00:00
Andrew Poelstra
43a81d739c
Merge 45ea103f8f into merged_master (Bitcoin PR #20942 )
2021-06-23 13:28:48 +00:00
Andrew Poelstra
3bac1215b2
Merge 51397c0ff7 into merged_master (Bitcoin PR #20629 )
2021-06-23 13:16:31 +00:00
Andrew Poelstra
29d002046c
Merge 43981ee2c8 into merged_master (Bitcoin PR #21127 )
2021-06-23 12:39:41 +00:00
Andrew Poelstra
6c0688628e
Merge bf3189eda6 into merged_master (Bitcoin PR #21165 )
2021-06-23 03:56:56 +00:00
Andrew Poelstra
401d0bb381
Merge e9c037ba64 into merged_master (Bitcoin PR #19884 )
2021-06-23 03:43:29 +00:00
Andrew Poelstra
271029357b
Merge 9996b1806a into merged_master (Bitcoin PR #21064 )
2021-06-23 03:30:31 +00:00
Andrew Poelstra
957b3c90a0
Merge 54b66a6e5f into merged_master (Bitcoin PR #19522 )
2021-06-23 03:17:25 +00:00
Andrew Poelstra
f8d2574a56
Merge 8d82eddee6 into merged_master (Bitcoin PR #19145 )
2021-06-23 03:04:57 +00:00
Andrew Poelstra
283eff1475
Merge 937dfa8398 into merged_master (Bitcoin PR #21041 )
2021-06-22 23:04:36 +00:00
Andrew Poelstra
e79c69ed07
Merge 0ad4656790 into merged_master (Bitcoin PR #20370 )
2021-06-22 22:52:21 +00:00
Andrew Poelstra
f250da483b
Merge 8e1913ae02 into merged_master (Bitcoin PR #21062 )
2021-06-22 22:39:50 +00:00
Andrew Poelstra
289e1aa494
Merge a1be08405d into merged_master (Bitcoin PR #20788 )
2021-06-22 20:16:46 +00:00
Andrew Poelstra
a6af547c55
Merge 685c16fcb2 into merged_master (Bitcoin PR #21043 )
2021-06-22 20:04:29 +00:00
Andrew Poelstra
5e2b1c591f
Merge e498aeffbe into merged_master (Bitcoin PR #20211 )
2021-06-26 18:18:18 +00:00
Andrew Poelstra
61418645f4
Merge a59e7ed0bc into merged_master (Bitcoin PR #20915 )
2021-06-21 16:48:49 +00:00
Andrew Poelstra
78335024e1
Merge b69eab9025 into merged_master (Bitcoin PR #20663 )
2021-06-21 16:24:12 +00:00
Andrew Poelstra
53fd2c4f4c
Merge 3c514cfe62 into merged_master (Bitcoin PR #21114 )
2021-06-21 15:59:17 +00:00
Andrew Poelstra
c2ebafe4a8
Merge f61c3a1090 into merged_master (Bitcoin PR #21125 )
2021-06-21 15:09:51 +00:00
Andrew Poelstra
c0a01c55e9
Merge d202054675 into merged_master (Bitcoin PR #21052 )
2021-06-21 14:45:12 +00:00
Andrew Poelstra
a90e0beffe
Merge b847f49717 into merged_master (Bitcoin PR #20557 )
2021-06-21 14:20:26 +00:00
Andrew Poelstra
114f1b9ccc
Merge d864696649 into merged_master (Bitcoin PR #21115 )
2021-06-21 13:03:47 +00:00
Andrew Poelstra
77f846938e
Merge b09ad737ee into merged_master (Bitcoin PR #20944 )
2021-06-21 12:51:08 +00:00
Andrew Poelstra
b4d8577949
Merge e51f6c4dee into merged_master (Bitcoin PR #20936 )
2021-06-21 07:46:25 +00:00
Andrew Poelstra
0136cbc8db
Merge 6c6140846f into merged_master (Bitcoin PR bitcoin-core/gui#203 )
2021-06-21 03:28:29 +00:00
Andrew Poelstra
a62aec5b6c
Merge 173cf31299 into merged_master (Bitcoin PR #20839 )
2021-06-21 03:16:34 +00:00
Andrew Poelstra
639c731236
Merge b829894f84 into merged_master (Bitcoin PR #20764 )
2021-06-21 03:04:45 +00:00
Andrew Poelstra
829f929d4e
Merge 3931732191 into merged_master (Bitcoin PR #20646 )
2021-06-21 02:29:21 +00:00
Andrew Poelstra
d9966231cf
Merge 53730a78bc into merged_master (Bitcoin PR #21077 )
2021-06-21 02:17:09 +00:00
Andrew Poelstra
57b2a4e57d
Merge 4013e44c74 into merged_master (Bitcoin PR #21082 )
2021-06-21 01:52:16 +00:00
Andrew Poelstra
e66b70d884
Merge f1239b70d1 into merged_master (Bitcoin PR #21025 )
2021-06-21 00:03:36 +00:00
Andrew Poelstra
5313c74e69
Merge 4e946ebcf1 into merged_master (Bitcoin PR #20715 )
2021-06-20 23:51:29 +00:00
Andrew Poelstra
84118435fe
Merge ea96e17e1f into merged_master (Bitcoin PR #21060 )
2021-06-20 20:12:17 +00:00
Andrew Poelstra
81622629c1
Merge 384e090f93 into merged_master (Bitcoin PR #19509 )
2021-06-20 20:00:04 +00:00
Andrew Poelstra
3755e6d66f
Merge 1e69800d5e into merged_master (Bitcoin PR #21059 )
2021-06-20 19:25:08 +00:00
Andrew Poelstra
b6935e8759
Merge f72d80b07a into merged_master (Bitcoin PR #21051 )
2021-06-20 19:12:29 +00:00
