Andrew Poelstra
8bfdfd9e77
Merge 08eec6907a into merged_master (Bitcoin PR bitcoin-core/gui#206 )
2021-06-24 18:46:53 +00:00
Andrew Poelstra
41743b65e8
Merge 0e9596c860 into merged_master (Bitcoin PR bitcoin-core/gui#205 )
...
Some commented-out GUI code becomes conditional ... maybe it doesn't need to
be commented out anymore? I dunno, I left it alone.
2021-06-24 18:34:02 +00:00
Andrew Poelstra
2b9625fa81
Merge fd725c2d79 into merged_master (Bitcoin PR bitcoin-core/gui#204 )
...
Some GUI changes that conflict with commented-out code. I made an educated
guess as to what new stuff should be commented out or not but honestly I
have no idea what the GUI is supposed to do or show.
2021-06-24 18:18:40 +00:00
Andrew Poelstra
01e64b2225
Merge 8d7d5f257b into merged_master (Bitcoin PR bitcoin-core/gui#202 )
2021-06-24 17:59:24 +00:00
Andrew Poelstra
fe1e52f667
Merge 02fda8267a into merged_master (Bitcoin PR bitcoin-core/gui#179 )
2021-06-24 17:47:01 +00:00
Andrew Poelstra
e353185d46
Merge 5bb64acd9d into merged_master (Bitcoin PR #21243 )
2021-06-24 17:34:42 +00:00
Andrew Poelstra
4268df69bc
Merge 828bb776d2 into merged_master (Bitcoin PR #20750 )
2021-06-24 17:22:15 +00:00
Andrew Poelstra
792f148c68
Merge c46fe4d107 into merged_master (Bitcoin PR #21088 )
2021-06-24 16:57:05 +00:00
Andrew Poelstra
f6e9f3b96f
Merge f1c339d452 into merged_master (Bitcoin PR #21211 )
2021-06-24 16:44:18 +00:00
Andrew Poelstra
c4cee850cf
Merge 09eb46c943 into merged_master (Bitcoin PR #21187 )
2021-06-24 15:53:57 +00:00
Andrew Poelstra
ceaad126f8
Merge 6a680a6236 into merged_master (Bitcoin PR #21226 )
2021-06-24 15:41:30 +00:00
Andrew Poelstra
77e3c88f81
Merge f1c2f619a6 into merged_master (Bitcoin PR #21221 )
2021-06-24 15:28:55 +00:00
Andrew Poelstra
bd07d081fa
Merge f093310b2e into merged_master (Bitcoin PR #21228 )
2021-06-24 15:16:37 +00:00
Andrew Poelstra
c647605af5
Merge 56fe4bb3c5 into merged_master (Bitcoin PR #21210 )
2021-06-24 15:04:14 +00:00
Andrew Poelstra
819ed1e785
Merge 04e01606e3 into merged_master (Bitcoin PR #21205 )
2021-06-24 14:39:52 +00:00
Andrew Poelstra
cf1a11db0c
Merge 9f3ffa2938 into merged_master (Bitcoin PR #21230 )
2021-06-24 14:27:34 +00:00
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
2cec742519
Merge 860f916803 into merged_master (Bitcoin PR #20524 )
2021-06-24 13:40:22 +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
9af7876d99
Merge 04336086d3 into merged_master (Bitcoin PR #21182 )
2021-06-24 01:56:11 +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
30e50425ca
Merge 7f831346cb into merged_master (Bitcoin PR #20380 )
2021-06-24 00:26:19 +00:00
Andrew Poelstra
1c42ada28c
Merge 69f7f50aa5 into merged_master (Bitcoin PR #20993 )
2021-06-24 00:14:00 +00:00
Andrew Poelstra
bb33ff2b40
Merge 36be9b821a into merged_master (Bitcoin PR #21087 )
2021-06-24 00:01:43 +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
937e79ce4d
Merge 3c9d9d21e1 into merged_master (Bitcoin PR #21008 )
2021-06-23 21:50:50 +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
dfb2fe7759
Merge d19639d2b6 into merged_master (Bitcoin PR #21096 )
2021-06-23 13:53:33 +00:00
Andrew Poelstra
59b1a731c8
Merge 8d6994f93d into merged_master (Bitcoin PR #21100 )
2021-06-23 13:41:16 +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
c54075afab
Merge df8892dc9f into merged_master (Bitcoin PR #20986 )
2021-06-23 13:04:11 +00:00
Andrew Poelstra
f530e437e3
Merge e4f0c4cd73 into merged_master (Bitcoin PR #21163 )
2021-06-23 12:51:58 +00:00
Andrew Poelstra
29d002046c
Merge 43981ee2c8 into merged_master (Bitcoin PR #21127 )
2021-06-23 12:39:41 +00:00
Andrew Poelstra
96e4fca4db
Merge b08cbd09b8 into merged_master (Bitcoin PR #21028 )
2021-06-23 04:09:05 +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
