Andrew Poelstra
1a0a945459
Merge 7c561bea52 into merged_master (Bitcoin PR bitcoin/bitcoin#21935 )
2021-07-25 23:50:09 +00:00
Andrew Poelstra
c7b124ac91
Merge 1a60c547fd into merged_master (Bitcoin PR bitcoin/bitcoin#21749 )
2021-07-08 05:07:57 +00:00
Andrew Poelstra
fb81781ca1
Merge 9c05da4a5c into merged_master (Bitcoin PR bitcoin/bitcoin#21865 )
2021-07-07 05:28:58 +00:00
Andrew Poelstra
086ab9fa9c
Merge f8575bce31 into merged_master (Bitcoin PR bitcoin/bitcoin#21864 )
2021-07-07 04:39:12 +00:00
Andrew Poelstra
6ce592d7cd
Merge 1b9a5236e9 into merged_master (Bitcoin PR bitcoin/bitcoin#21740 )
2021-07-07 01:15:58 +00:00
Andrew Poelstra
cc047c66f0
Merge b7c2625703 into merged_master (Bitcoin PR bitcoin/bitcoin#21664 )
2021-07-06 15:36:05 +00:00
Andrew Poelstra
566f94ccc5
Merge a1c6434e19 into merged_master (Bitcoin PR bitcoin/bitcoin#21852 )
2021-07-05 22:27:26 +00:00
Andrew Poelstra
488cc1141f
Merge 0ca8b7e7ec into merged_master (Bitcoin PR bitcoin/bitcoin#21812 )
2021-07-05 21:35:49 +00:00
Andrew Poelstra
bf708b833a
Merge 77d569ccb5 into merged_master (Bitcoin PR bitcoin/bitcoin#19817 )
2021-07-05 03:33:56 +00:00
Andrew Poelstra
e300bdf641
Merge 1daca9f9a9 into merged_master (Bitcoin PR bitcoin/bitcoin#21738 )
2021-07-03 15:30:12 +00:00
Andrew Poelstra
7d5bc3ab04
Merge b8e5bbdf93 into merged_master (Bitcoin PR #21669 )
2021-06-30 13:06:15 +00:00
Andrew Poelstra
f2bd5dd18b
Merge f0b457212f into merged_master (Bitcoin PR #21467 )
2021-07-27 01:26:50 +00:00
Andrew Poelstra
7be2681e15
Merge 1e3db6807d into merged_master (Bitcoin PR #21619 )
2021-06-30 00:08:37 +00:00
Andrew Poelstra
d5c659bd94
Merge de4d3ba437 into merged_master (Bitcoin PR #21541 )
2021-06-28 16:44:24 +00:00
Andrew Poelstra
d5101eebcb
Merge 23b15601df into merged_master (Bitcoin PR #17227 )
2021-06-28 13:45:32 +00:00
Andrew Poelstra
8519730f3c
Merge d42078e93b into merged_master (Bitcoin PR #21437 )
2021-06-26 23:04:19 +00:00
Andrew Poelstra
9e0c92057c
Merge e828fc8f52 into merged_master (Bitcoin PR #21376 )
2021-06-26 19:33:37 +00:00
Andrew Poelstra
3eea8d3fee
Merge 2620ac4ec3 into merged_master (Bitcoin PR #21354 )
2021-06-26 01:46:08 +00:00
Andrew Poelstra
2f9409db22
Merge 84af29337c into merged_master (Bitcoin PR #21255 )
2021-06-24 20:03:43 +00:00
Andrew Poelstra
e353185d46
Merge 5bb64acd9d into merged_master (Bitcoin PR #21243 )
2021-06-24 17:34:42 +00:00
Andrew Poelstra
ceaad126f8
Merge 6a680a6236 into merged_master (Bitcoin PR #21226 )
2021-06-24 15:41:30 +00:00
Andrew Poelstra
819ed1e785
Merge 04e01606e3 into merged_master (Bitcoin PR #21205 )
2021-06-24 14:39:52 +00:00
Andrew Poelstra
dfb2fe7759
Merge d19639d2b6 into merged_master (Bitcoin PR #21096 )
2021-06-23 13:53:33 +00:00
Andrew Poelstra
271029357b
Merge 9996b1806a into merged_master (Bitcoin PR #21064 )
2021-06-23 03:30:31 +00:00
Andrew Poelstra
eeba6af790
Merge cda914228a into merged_master (Bitcoin PR #21138 )
2021-06-21 15:22:16 +00:00
Andrew Poelstra
ca010c3309
Merge 09530b0255 into merged_master (Bitcoin PR #21126 )
2021-06-21 14:57:29 +00:00
Andrew Poelstra
705b45662c
Merge 3641ec1aac into merged_master (Bitcoin PR #21112 )
2021-06-21 14:08:14 +00:00
Andrew Poelstra
43da2e129e
Merge ca85449f22 into merged_master (Bitcoin PR #21036 )
2021-06-21 08:11:10 +00:00
Andrew Poelstra
b4d8577949
Merge e51f6c4dee into merged_master (Bitcoin PR #20936 )
2021-06-21 07:46:25 +00:00
Andrew Poelstra
2575f618b0
Merge 40dd757bf6 into merged_master (Bitcoin PR #21012 )
2021-06-19 17:24:40 +00:00
Andrew Poelstra
561bf64d1b
Merge 80e16cadd5 into merged_master (Bitcoin PR #20012 )
...
Made some edits to rpc/client.cpp on the advice of test/functional/rpc_help.py
to make the "RPC conversion tables" consistent, but I have no idea what these
tables are or what they're for. I assume, given that nobody has noticed these
inconsistencies ever, that they're fine.
2021-06-19 16:30:37 +00:00
Andrew Poelstra
c5a022192f
Merge d7e2401c62 into merged_master (Bitcoin PR #18077 )
2021-06-17 01:59:15 +00:00
Andrew Poelstra
f1c013c119
Merge f52f427b8e into merged_master (Bitcoin PR #20817 )
2021-06-16 16:33:15 +00:00
Andrew Poelstra
27930edc9c
Merge 4a540683ec into merged_master (Bitcoin PR #20813 )
2021-06-16 14:11:07 +00:00
Sjors Provoost
5be90c907e
build: enable external signer by default
2021-06-16 10:48:57 +02:00
Andrew Poelstra
ad862c1bc6
Merge f061da2887 into merged_master (Bitcoin PR #20697 )
2021-06-15 15:27:02 +00:00
Andrew Poelstra
64ce0f34bc
Merge 20f4a9421b into merged_master (Bitcoin PR #20682 )
2021-06-15 14:07:10 +00:00
Andrew Poelstra
994de82dac
Merge 9b28bd73a3 into merged_master (Bitcoin PR #20691 )
2021-06-15 13:07:58 +00:00
Andrew Poelstra
183caa4bd2
Merge 6f2ca726ce into merged_master (Bitcoin PR #20658 )
...
This deletes .travis.yml. In a follow-up commit (to the whole rebase) we should
re-instate the Liquid-specific CI tests in Cirrus.
2021-06-14 21:14:04 +00:00
Andrew Poelstra
f0dda8aba2
Merge 4acbcfa97d into merged_master (Bitcoin PR #20470 )
2021-06-14 20:26:03 +00:00
Andrew Poelstra
4c7b6cc700
Merge e20b488395 into merged_master (Bitcoin PR #20567 )
2021-06-13 22:35:08 +00:00
Andrew Poelstra
cfb963615f
Merge e2ae6a2bef into merged_master (Bitcoin PR #20182 )
2021-06-11 01:49:34 +00:00
Andrew Poelstra
526794235b
Merge a3186b6da6 into merged_master (Bitcoin PR #20520 )
2021-06-11 00:33:58 +00:00
Andrew Poelstra
89d42f9e24
Merge 3693fccc3a into merged_master (Bitcoin PR #20543 )
2021-06-10 23:10:07 +00:00
W. J. van der Laan
1a60c547fd
Merge bitcoin/bitcoin#21749 : test: Bump shellcheck version
...
08f3dbb1b0https://github.com/koalaman/shellcheck/blob/v0.7.2/CHANGELOG.md ).
Only [SC2268](https://github.com/koalaman/shellcheck/wiki/SC2268 ) requires to update our code.
ACKs for top commit:
jarolrod:
ACK 08f3dbb1b0
2021-05-10 13:49:50 +02:00
Andrew Poelstra
3473a5279a
Merge 2e1336dbfe into merged_master (Bitcoin PR #20471 )
2021-05-08 00:24:41 +00:00
Andrew Poelstra
607eeb9d7a
Merge cb89e18845 into merged_master (Bitcoin PR #19179 )
2021-05-07 18:43:16 +00:00
Andrew Poelstra
0ecb5364be
Merge 555b5d1bf9 into merged_master (Bitcoin PR #20419 )
2021-05-07 17:59:54 +00:00
Andrew Poelstra
1d951c2239
Merge ea7926527c into merged_master (Bitcoin PR #20413 )
2021-05-06 18:51:59 +00:00
Andrew Poelstra
b8d53f04fb
Merge 4b24c3962f into merged_master (Bitcoin PR #19504 )
2021-05-06 16:02:38 +00:00
