Andrew Poelstra
02fc69464f
Merge 5a6f3c5a01 into merged_master (Bitcoin PR #20080 )
2020-12-01 21:02:21 +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
64b8eac774
Merge 1a43cd3f74 into merged_master (Bitcoin PR #19709 )
2020-11-27 20:00:03 +00:00
Andrew Poelstra
419fd4f90d
Merge b75f2ad72d into merged_master (Bitcoin PR #19660 )
2020-11-27 04:05:36 +00:00
Andrew Poelstra
54f2d85914
Merge 34eb236258 into merged_master (Bitcoin PR #19326 )
2020-11-27 00:39:12 +00:00
Andrew Poelstra
e377f4f773
Merge f4cfa6d019 into merged_master (Bitcoin PR #15935 )
2020-11-26 18:11:36 +00:00
Andrew Poelstra
3894f4419c
Merge 3d57015aa2 into merged_master (Bitcoin PR #19491 )
2020-11-26 04:25:00 +00:00
Andrew Poelstra
2468108f7b
Merge b8740d6737 into merged_master (Bitcoin PR #18468 )
2020-11-26 01:09:07 +00:00
Andrew Poelstra
f32fd217a5
Merge ec4d27fa8b into merged_master (Bitcoin PR #18216 )
2020-11-26 01:08:40 +00:00
Andrew Poelstra
fd37b7c5d6
Merge 54f812d9d2 into merged_master (Bitcoin PR #18673 )
2020-11-26 01:08:23 +00:00
Andrew Poelstra
aeae0e2742
Merge 0dc6218c79 into merged_master (Bitcoin PR #18270 )
2020-11-26 01:08:03 +00:00
Andrew Poelstra
5b3e849748
Merge 2e97d80017 into merged_master (Bitcoin PR #18134 )
2020-11-26 01:08:02 +00:00
Andrew Poelstra
cc668250eb
Merge 97aadf98d0 into merged_master (Bitcoin PR #16117 )
2020-11-26 01:07:50 +00:00
Andrew Poelstra
a0d00c7c75
Merge 9027960932 into merged_master (Bitcoin PR #18225 )
2020-11-26 01:07:47 +00:00
Andrew Poelstra
f0e3e31c0d
Merge 03f98b15ad into merged_master (Bitcoin PR #17577 )
2020-11-26 01:07:45 +00:00
Andrew Poelstra
9a8c2b0e3f
Merge 8a56f79d49 into merged_master (Bitcoin PR #17482 )
2020-11-26 01:07:40 +00:00
Andrew Poelstra
2c846f5fa3
Merge da3611a580 into merged_master (Elements PR #808 )
2020-11-26 00:29:43 +00:00
Andrew Poelstra
7c53615bb6
Merge af05bd9e1e into merged_master (Bitcoin PR #17891 )
2020-11-14 16:52:07 +00:00
Andrew Poelstra
077355e651
Merge 6677be64f6 into merged_master (Bitcoin PR #17473 )
2020-11-14 16:52:01 +00:00
Andrew Poelstra
7d5d0e9d6a
Merge 94c6f2bba4 into merged_master (Bitcoin PR #17593 )
2020-11-14 16:52:00 +00:00
Andrew Poelstra
ba2897d87a
Merge 6b51cce65a into merged_master (Bitcoin PR #17753 )
2020-11-14 16:51:59 +00:00
Andrew Poelstra
35020e3a32
Merge a7aec7ad97 into merged_master (Bitcoin PR #15934 )
2020-11-09 23:10:09 +00:00
Andrew Poelstra
54dd52556e
Merge 772673dfbe into merged_master (Bitcoin PR #16978 )
2020-11-09 23:10:08 +00:00
Andrew Poelstra
056b9bb06d
Merge 46fc4d1a24 into merged_master (Bitcoin PR #17384 )
2020-11-09 23:10:08 +00:00
Andrew Poelstra
eace3e1898
Merge 6f4e247357 into merged_master (Bitcoin PR #17390 )
2020-11-09 23:10:08 +00:00
Andrew Poelstra
df7c1ad3d7
Merge 224c19645f into merged_master (Bitcoin PR #17388 )
2020-11-09 23:09:06 +00:00
Andrew Poelstra
bb87204b71
Merge cfec3e01b4 into merged_master (Bitcoin PR #17266 )
2020-11-09 21:20:46 +00:00
Andrew Poelstra
4749945d77
Merge 0ff7cd7d0c into merged_master (Bitcoin PR #16889 )
2020-11-09 21:20:42 +00:00
Andrew Poelstra
c704a02e4e
Merge c34b88620d into merged_master (Bitcoin PR #17095 )
2020-11-09 21:20:40 +00:00
Andrew Poelstra
f3f736f76d
Merge befdef8aee into merged_master (Bitcoin PR #16887 )
2020-11-09 21:20:37 +00:00
Andrew Poelstra
3fd0c0af03
Merge 52b9797119 into merged_master (Bitcoin PR #16670 )
2020-11-09 21:20:17 +00:00
Andrew Poelstra
527d180369
Merge b799ebcc17 into merged_master (Bitcoin PR #16566 )
2020-11-09 21:20:13 +00:00
Andrew Poelstra
9c3480fea9
Merge 3a3d8b8357 into merged_master (Bitcoin PR #16097 )
2020-11-09 21:20:11 +00:00
Andrew Poelstra
9fbf23d6f2
Merge 3dd46d1730 into merged_master (Elements PR #675 )
2020-11-09 21:19:26 +00:00
Andrew Poelstra
9274da2dfc
Merge 7400135b79 into merged_master (Bitcoin PR #16278 )
2020-11-09 03:58:17 +00:00
Andrew Poelstra
f81f984f36
Merge c52776e6ff into merged_master (Bitcoin PR #16252 )
2020-11-09 03:57:55 +00:00
Andrew Poelstra
0267d06c6a
Merge 62efead8a8 into merged_master (Bitcoin PR #16046 )
2020-10-29 23:41:15 +00:00
Andrew Poelstra
24e3d9635c
Merge 6f4ba6492a into merged_master (Bitcoin PR #15988 )
2020-10-29 17:04:58 +00:00
Andrew Poelstra
6674d9e91f
Merge 10ed4dff24 into merged_master (Bitcoin PR #15869 )
2020-10-29 02:06:04 +00:00
Andrew Poelstra
e6343c7258
Merge 0c9de67f34 into merged_master (Bitcoin PR #15352 )
2020-10-28 16:43:51 +00:00
Andrew Poelstra
161bcd2ae8
Merge 78295e97b8 into merged_master (Bitcoin PR #15788 )
2020-10-28 16:43:03 +00:00
Andrew Poelstra
175b8550f8
Merge c3b1cb958f into merged_master (Bitcoin PR #15573 )
2020-10-27 23:27:13 +00:00
Andrew Poelstra
a599a81d3a
Merge 789b0bbf2a into merged_master (Bitcoin PR #15335 )
2020-10-27 21:39:17 +00:00
Hennadii Stepanov
b19e88230f
util: Add StripRedundantLastElementsOfPath function
...
Co-authored-by: saibato <saibato.naga@pm.me>
Co-authored-by: MarcoFalke <falke.marco@gmail.com>
2020-10-27 21:45:32 +02:00
Karl-Johan Alm
ec9b25d046
test: signet network selection tests
2020-09-18 10:19:42 +09:00
Karl-Johan Alm
e8990f1214
add signet chain and accompanying parameters
...
Co-authored-by: Anthony Towns <aj@erisian.com.au>
2020-09-18 09:37:57 +09:00
Hennadii Stepanov
35cd2da623
test: Fix 'make cov' with clang
2020-08-14 12:18:47 +03:00
Wladimir J. van der Laan
0a8aa626dd
refactor: Make HexStr take a span
...
Make HexStr take a span of bytes, instead of an awkward pair of
templated iterators.
2020-08-06 19:41:43 +02:00
Pieter Wuille
77c507358b
Make Hash[160] consume range-like objects
2020-07-30 13:57:54 -07:00
Pieter Wuille
e549bf8a9a
Make CHash256 and CHash160 consume Spans
2020-07-30 13:57:53 -07:00
