MarcoFalke
5f18d337d4
Cleanup -includeconf error message
...
Remove the erroneous trailing newline '\n'. Also, print only the first
value to remove needless redundancy in the error message.
2021-06-19 02:40:20 +00:00
MarcoFalke
99b86594df
Fix crash when parsing command line with -noincludeconf=0
2021-06-19 02:39:07 +00:00
Andrew Poelstra
2f5c624b18
ci: eliminate a bunch of build warnings
...
Includes removing some variables from qt/intro.cpp that've been
unused since #13216 and ought to have been removed in the 0.17
rebase, but our linters were not so agressive then. Similarly
fix the BITCOIN_PID_FILE, whose value was incorrectly changed
in the 0.18 rebase.
2021-03-26 17:33:05 +00:00
Andrew Poelstra
02fc69464f
Merge 5a6f3c5a01 into merged_master (Bitcoin PR #20080 )
2020-12-01 21:02:21 +00:00
Andrew Poelstra
dad417577a
Merge 4769942d90 into merged_master (Bitcoin PR #19624 )
2020-12-01 06:42:52 +00:00
Andrew Poelstra
43ebfe681c
Merge 283a73d7ea into merged_master (Bitcoin PR #20092 )
2020-11-30 16:07:45 +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
a3ff560ad9
Merge 0adb80fe63 into merged_master (Bitcoin PR #19803 )
2020-11-28 17:09:11 +00:00
Andrew Poelstra
69eb9b4129
Merge 8e0f341779 into merged_master (Bitcoin PR #15704 )
2020-11-28 04:49:15 +00:00
Andrew Poelstra
1e421d01f4
Merge e3272ff290 into merged_master (Bitcoin PR #19614 )
2020-11-27 02:23:43 +00:00
Andrew Poelstra
519f434cd7
Merge e4df534c60 into merged_master (Bitcoin PR #15382 )
2020-11-27 01:48:55 +00:00
Andrew Poelstra
e377f4f773
Merge f4cfa6d019 into merged_master (Bitcoin PR #15935 )
2020-11-26 18:11:36 +00:00
Andrew Poelstra
c817786377
Merge 9573d2b55b into merged_master (Bitcoin PR #19194 )
2020-11-26 01:09:01 +00:00
Andrew Poelstra
5b9754580e
Merge 55b4c65bd1 into merged_master (Bitcoin PR #16127 )
2020-11-26 01:08:51 +00:00
Andrew Poelstra
7ba9c3d6ea
Merge 63d5ed2fc4 into merged_master (Bitcoin PR #18437 )
2020-11-26 01:08:34 +00:00
Andrew Poelstra
1ea940a2e2
Merge 4f802e59a0 into merged_master (Bitcoin PR #17509 )
2020-11-26 01:08:28 +00:00
Andrew Poelstra
e6c67f94cc
Merge 969ee85494 into merged_master (Bitcoin PR #18662 )
2020-11-26 01:08:22 +00:00
Andrew Poelstra
947e32f011
Merge 051439813e into merged_master (Bitcoin PR #13339 )
2020-11-26 01:07:43 +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
6f123becd3
Merge 1d1f8bbf57 into merged_master (Bitcoin PR #16115 )
2020-11-14 19:07:24 +00:00
Andrew Poelstra
b00e322143
Merge 04f78b818f into merged_master (Bitcoin PR #17887 )
2020-11-14 16:52:10 +00:00
Andrew Poelstra
7c53615bb6
Merge af05bd9e1e into merged_master (Bitcoin PR #17891 )
2020-11-14 16:52:07 +00:00
Andrew Poelstra
ebc31a85a2
Merge 190a4051fd into merged_master (Bitcoin PR #17762 )
2020-11-14 16:52:03 +00:00
Andrew Poelstra
077355e651
Merge 6677be64f6 into merged_master (Bitcoin PR #17473 )
2020-11-14 16:52:01 +00:00
Andrew Poelstra
6b5ef039c0
Merge 03dfa36641 into merged_master (Bitcoin PR #17229 )
2020-11-14 16:52:00 +00:00
Andrew Poelstra
84702646f3
Merge 23cecd6cd5 into merged_master (Bitcoin PR #17604 )
2020-11-14 16:51:51 +00:00
Andrew Poelstra
35020e3a32
Merge a7aec7ad97 into merged_master (Bitcoin PR #15934 )
2020-11-09 23:10:09 +00:00
Andrew Poelstra
fdb06a8ceb
Merge 4c1090c882 into merged_master (Bitcoin PR #17279 )
2020-11-09 21:20:46 +00:00
Andrew Poelstra
db225166af
Merge b6e34afe97 into merged_master (Bitcoin PR #17184 )
2020-11-09 21:20:42 +00:00
Andrew Poelstra
821f5256a5
Merge 46d6930f8c into merged_master (Bitcoin PR #16659 )
2020-11-09 21:20:41 +00:00
Andrew Poelstra
00efae6802
Merge b67ca4ee73 into merged_master (Bitcoin PR #17085 )
2020-11-09 21:20:37 +00:00
Andrew Poelstra
a191197ace
Merge 83112db129 into merged_master (Bitcoin PR #15864 )
2020-11-09 21:20:16 +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
83019c2acd
Merge d960d5ca99 into merged_master (Bitcoin PR #16362 )
2020-11-09 21:20:08 +00:00
Andrew Poelstra
9fbf23d6f2
Merge 3dd46d1730 into merged_master (Elements PR #675 )
2020-11-09 21:19:26 +00:00
Andrew Poelstra
15f0fb459f
Merge 4882040182 into merged_master (Bitcoin PR #16291 )
2020-11-09 03:58:20 +00:00
Andrew Poelstra
f7cb3a9645
Merge f373beebbc into merged_master (Bitcoin PR #16344 )
2020-11-09 03:58:19 +00:00
Andrew Poelstra
62a63e4c6b
Merge 8c69fae944 into merged_master (Bitcoin PR #15457 )
2020-11-09 03:58:19 +00:00
Andrew Poelstra
1c4217c939
Merge 935cd6b1ec into merged_master (Bitcoin PR #16300 )
2020-11-09 03:58:17 +00:00
Andrew Poelstra
e33ff205ee
Merge 1a274bce4b into merged_master (Bitcoin PR #16205 )
2020-11-06 15:20:15 +00:00
Andrew Poelstra
68d9951825
Merge d0f81a96d9 into merged_master (Bitcoin PR #16129 )
2020-11-06 15:20:13 +00:00
Samuel Dobson
5a6f3c5a01
Merge #20080 : Strip any trailing / in -datadir and -blocksdir paths
...
ad5cef5dfdb19e88230f#19933 .
Fixes #19928 .
ACKs for top commit:
MarcoFalke:
review ACK ad5cef5dfd🔙
promag:
Code review ACK ad5cef5dfdad5cef5dfd
2020-11-02 11:41:38 +13:00
Andrew Poelstra
e4fdf3639a
Merge c4560a7dfe into merged_master (Bitcoin PR #15650 )
2020-10-29 02:07:22 +00:00
Andrew Poelstra
44e5901b98
Merge 2c35fe6238 into merged_master (Bitcoin PR #15849 )
2020-10-29 02:06:12 +00:00
Andrew Poelstra
1e375568af
Merge 2d46f1be0c into merged_master (Bitcoin PR #15118 )
2020-10-27 21:52:10 +00:00
Andrew Poelstra
a599a81d3a
Merge 789b0bbf2a into merged_master (Bitcoin PR #15335 )
2020-10-27 21:39:17 +00:00
Hennadii Stepanov
ad5cef5dfd
doc: Update data directory path comments
2020-10-27 21:46:00 +02: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
