Andrew Poelstra
f766518acd
Merge 9ab9665c74 into merged_master (Bitcoin PR #15710 )
2020-12-03 06:48:14 +00:00
Andrew Poelstra
870c0a9f76
Merge 28cb61646b into merged_master (Bitcoin PR #19065 )
2020-12-02 14:21:59 +00:00
Andrew Poelstra
af1c2e9f92
Merge 8a486158cb into merged_master (Bitcoin PR #20188 )
2020-12-02 13:38:34 +00:00
Andrew Poelstra
e765fc93ea
Merge 3caee16946 into merged_master (Bitcoin PR #19953 )
...
Taproot :D
2020-12-01 02:54:57 +00:00
Andrew Poelstra
4eeadb7fde
Merge 8ed37f6c84 into merged_master (Bitcoin PR #19077 )
2020-11-30 20:20:56 +00:00
Andrew Poelstra
f327fa97f2
Merge c2c4dbaebd into merged_master (Bitcoin PR #19988 )
2020-11-30 19:05:03 +00:00
Andrew Poelstra
455f61c0db
Merge 8c5f68118c into merged_master (Bitcoin PR #18267 )
...
This commit adds signet support, which is a little bit silly/redundant for us :)
Was a surprisingly easy merge to handle, and hopefully in future Core is more
mindful of signed blocks when they are changing code architecture.
I had to change a couple lines of src/signet.cpp to add blank assets to the
CTxOuts and to find transaction input scriptWitnesses. No need to add any
other tx witness data (and the CAsset()s that I did add to make things compile
won't be used..) because signet will always have g_con_elementsmode off.
2020-11-29 16:57:55 +00:00
Andrew Poelstra
510dbdf232
Merge 48a9968e50 into merged_master (Bitcoin PR #19558 )
2020-11-29 04:52:57 +00:00
Andrew Poelstra
1aced337f5
Merge 61b8c04d78 into merged_master (Bitcoin PR #19379 )
2020-11-28 18:11:17 +00:00
Andrew Poelstra
6183feb6ba
Merge 862fde88be into merged_master (Bitcoin PR #19067 )
2020-11-28 15:07:16 +00:00
Andrew Poelstra
0c44be97cb
Merge 4cde97374d into merged_master (Bitcoin PR #19718 )
2020-11-27 21:35:25 +00:00
Andrew Poelstra
9b52615161
Merge e349eeeb2c into merged_master (Bitcoin PR #19672 )
2020-11-27 03:08:06 +00:00
Andrew Poelstra
519f434cd7
Merge e4df534c60 into merged_master (Bitcoin PR #15382 )
2020-11-27 01:48:55 +00:00
Andrew Poelstra
0f9a38732c
Merge 4ebe2f6e75 into merged_master (Bitcoin PR #18011 )
2020-11-26 21:44:11 +00:00
Andrew Poelstra
12f11f8f70
Merge 2f71a1ea35 into merged_master (Bitcoin PR #18637 )
2020-11-26 20:30:20 +00:00
Andrew Poelstra
cd8a188ed8
Merge 090d877160 into merged_master (Bitcoin PR #19143 )
2020-11-26 13:52:27 +00:00
Andrew Poelstra
389b232e46
Merge 43125596ce into merged_master (Bitcoin PR #19296 )
2020-11-26 04:55:08 +00:00
Andrew Poelstra
cd38c4dfbf
Merge a42631775a into merged_master (Bitcoin PR #19222 )
2020-11-26 01:09:23 +00:00
Andrew Poelstra
a4f01a718d
Merge 8edfc1715a into merged_master (Bitcoin PR #19204 )
2020-11-26 01:09:15 +00:00
Andrew Poelstra
1f1b2cb2c6
Merge 90981b7d68 into merged_master (Bitcoin PR #19286 )
2020-11-26 01:09:13 +00:00
Andrew Poelstra
347c8d5942
Merge 8682414d02 into merged_master (Bitcoin PR #19247 )
2020-11-26 01:09:03 +00:00
Andrew Poelstra
04c3079da5
Merge a65b55fa45 into merged_master (Bitcoin PR #18994 )
2020-11-26 01:08:55 +00:00
Andrew Poelstra
1420e7da33
Merge d3b0ef80f6 into merged_master (Bitcoin PR #18867 )
2020-11-26 01:08:50 +00:00
Andrew Poelstra
51965ad1e6
Merge 25ad2c623a into merged_master (Bitcoin PR #18740 )
2020-11-26 01:08:47 +00:00
Andrew Poelstra
d7f7c1089d
Merge f763283b65 into merged_master (Bitcoin PR #18512 )
2020-11-26 01:08:39 +00:00
Andrew Poelstra
315d2556f2
Merge 0a729b0e42 into merged_master (Bitcoin PR #18783 )
2020-11-26 01:08:37 +00:00
Andrew Poelstra
0d9a090459
Merge ef8ef31fd2 into merged_master (Bitcoin PR #18775 )
2020-11-26 01:08:35 +00:00
Andrew Poelstra
cd480d07b3
Merge 95a9165016 into merged_master (Bitcoin PR #18736 )
2020-11-26 01:08:34 +00:00
Andrew Poelstra
2dd753afe1
Merge 65276c7737 into merged_master (Bitcoin PR #18744 )
2020-11-26 01:08:30 +00:00
Andrew Poelstra
627184ba0d
Merge c4c3f110eb into merged_master (Bitcoin PR #18190 )
2020-11-26 01:08:26 +00:00
Andrew Poelstra
23cab4213a
Merge 4702cadca9 into merged_master (Bitcoin PR #17954 )
2020-11-26 01:08:19 +00:00
Andrew Poelstra
9ce236f051
Merge 10358a381a into merged_master (Bitcoin PR #17737 )
2020-11-26 01:08:16 +00:00
Andrew Poelstra
d53e9f8d68
Merge 405713d00f into merged_master (Bitcoin PR #18529 )
2020-11-26 01:08:15 +00:00
Andrew Poelstra
78596942a2
Merge 661bd5dea3 into merged_master (Bitcoin PR #18363 )
2020-11-26 01:08:14 +00:00
Andrew Poelstra
5be76a4a3e
Merge 3410fe6887 into merged_master (Bitcoin PR #18521 )
2020-11-26 01:08:14 +00:00
Andrew Poelstra
7fc681d080
Merge bfef72d0fb into merged_master (Bitcoin PR #18565 )
2020-11-26 01:08:14 +00:00
Andrew Poelstra
3b362fff93
Merge 1f70185a80 into merged_master (Bitcoin PR #18551 )
2020-11-26 01:08:13 +00:00
Andrew Poelstra
e0c30317c3
Merge 516ebe8a62 into merged_master (Bitcoin PR #18514 )
2020-11-26 01:08:10 +00:00
Andrew Poelstra
f047a2ba2b
Merge 96a30b98c9 into merged_master (Bitcoin PR #18528 )
2020-11-26 01:08:10 +00:00
Andrew Poelstra
e096e9bf2b
Merge 4839560ee1 into merged_master (Bitcoin PR #18407 )
2020-11-26 01:08:09 +00:00
Andrew Poelstra
b67e35ae94
Merge 72ef366564 into merged_master (Bitcoin PR #18472 )
2020-11-26 01:08:06 +00:00
Andrew Poelstra
b4a305da0e
Merge 5f9cd62f33 into merged_master (Bitcoin PR #18455 )
2020-11-26 01:08:04 +00:00
Andrew Poelstra
dfa287846c
Merge e3154aacf4 into merged_master (Bitcoin PR #18445 )
2020-11-26 01:08:03 +00:00
Andrew Poelstra
0f324860f0
Merge 3f5107d008 into merged_master (Bitcoin PR #18423 )
2020-11-26 01:08:01 +00:00
Andrew Poelstra
026d7eeb7c
Merge 5236b2e267 into merged_master (Bitcoin PR #18417 )
2020-11-26 01:08:00 +00:00
Andrew Poelstra
f0feab3ce6
Merge e83a1de4c0 into merged_master (Bitcoin PR #18155 )
2020-11-26 01:07:58 +00:00
Andrew Poelstra
e20f8c85a5
Merge d2d0a04a66 into merged_master (Bitcoin PR #18353 )
2020-11-26 01:07:57 +00:00
Andrew Poelstra
8615d49507
Merge 249114b1a6 into merged_master (Bitcoin PR #18314 )
2020-11-26 01:07:54 +00:00
Andrew Poelstra
be6f250701
Merge f1064c1b0d into merged_master (Bitcoin PR #17989 )
2020-11-26 01:07:52 +00:00
Andrew Poelstra
4133bb22d9
Merge 6fb4bbfb0e into merged_master (Bitcoin PR #18176 )
2020-11-26 01:07:52 +00:00
