Commit graph

29954 commits

Author SHA1 Message Date
Andrew Poelstra
969b50e413 Merge 1212808762 into merged_master (Bitcoin PR #16257) 2020-11-09 03:58:17 +00:00
Andrew Poelstra
75b8ff4157 Merge b3edacb529 into merged_master (Bitcoin PR #16309) 2020-11-09 03:58:17 +00:00
Andrew Poelstra
12cc64506d Merge 6e9eda5567 into merged_master (Bitcoin PR #16271) 2020-11-09 03:58:17 +00:00
Andrew Poelstra
d97e53163b Merge e7f3450b7d into merged_master (Bitcoin PR #16302) 2020-11-09 03:58:17 +00:00
Andrew Poelstra
14df5ad8c2 Merge fd925e9b1c into merged_master (Bitcoin PR #16313) 2020-11-09 03:58:17 +00:00
Andrew Poelstra
b42145117d Merge 04710b6d8c into merged_master (Bitcoin PR #15964) 2020-11-09 03:58:17 +00:00
Andrew Poelstra
4b51c73733 Merge 0f309541aa into merged_master (Bitcoin PR #16258) 2020-11-09 03:58:17 +00:00
Andrew Poelstra
1c4217c939 Merge 935cd6b1ec into merged_master (Bitcoin PR #16300) 2020-11-09 03:58:17 +00:00
Andrew Poelstra
9274da2dfc Merge 7400135b79 into merged_master (Bitcoin PR #16278) 2020-11-09 03:58:17 +00:00
Andrew Poelstra
2cafad1e18 Merge 3077f11dad into merged_master (Bitcoin PR #16289) 2020-11-09 03:58:17 +00:00
Andrew Poelstra
5a4bd6287a Merge 1b28bca04c into merged_master (Bitcoin PR #16287) 2020-11-09 03:58:17 +00:00
Andrew Poelstra
d363ffe5e4 Merge ca80fec973 into merged_master (Bitcoin PR #16286) 2020-11-09 03:58:17 +00:00
Andrew Poelstra
695bf1c24d Merge 332c6134bb into merged_master (Bitcoin PR #15894) 2020-11-09 03:58:16 +00:00
Andrew Poelstra
f81f984f36 Merge c52776e6ff into merged_master (Bitcoin PR #16252) 2020-11-09 03:57:55 +00:00
MarcoFalke
fa4234d877
test: Mock IBD in net_processing fuzzers 2020-11-07 07:50:59 +01:00
MarcoFalke
7e373294a5
Merge #20315: travis: Remove s390x build
fa2c3c0d96 ci: Set LC_ALL=C to allow running the s390x tests in qemu (MarcoFalke)
fac0517836 travis: Remove s390x build (MarcoFalke)

Pull request description:

  This has been discussed in the last meeting.

  Refer to the commit body for more details.

Top commit has no ACKs.

Tree-SHA512: 8e0455286ce41c95ed2e5eb624ac534251bb4a321f13d26d14356497e0c39f841372e166373ffd4a0a9fa379636c2cfb535bd92534fff427cdcb827354e66b6c
2020-11-06 18:08:32 +01:00
MarcoFalke
4727c1ca24
Merge #20328: cirrus: Skip tasks on the gui repo main branch
66667acc53 cirrus: Skip tasks on the gui repo main branch (MarcoFalke)

Pull request description:

  No need to run every build twice, once in the main repo and then in the read-only gui mirror repo

ACKs for top commit:
  decryp2kanon:
    ACK 66667ac
  hebasto:
    ACK 66667acc53, though still preferring `only_if` as showing skipped tasks as successful ones seems a bit confused.

Tree-SHA512: 0d35bd115152e06ba4dc5f364130ba5496167d960c44eac2c76192ff9bf7c51f46ab72e2d054dcc6a91818a18dffbbc262f8a4c4483857158c0af4f55dfe9b28
2020-11-06 18:03:49 +01:00
Andrew Poelstra
1cdf2213c6 Merge bc948d4cfd into merged_master (Bitcoin PR #16183) 2020-11-06 15:20:17 +00:00
Andrew Poelstra
5ff46ab858 Merge 21bd6eb782 into merged_master (Bitcoin PR #16188) 2020-11-06 15:20:17 +00:00
Andrew Poelstra
62bfa13828 Merge e115a21f79 into merged_master (Bitcoin PR #16223) 2020-11-06 15:20:17 +00:00
Andrew Poelstra
2b724b13ae Merge 44e849c35a into merged_master (Bitcoin PR #16254) 2020-11-06 15:20:17 +00:00
Andrew Poelstra
891d875e5b Merge c8fee6769a into merged_master (Bitcoin PR #16263) 2020-11-06 15:20:17 +00:00
Andrew Poelstra
d29b3df6f5 Merge c1bab5052a into merged_master (Bitcoin PR #16231) 2020-11-06 15:20:17 +00:00
Andrew Poelstra
ac51ef6930 Merge 2cbcc55ba6 into merged_master (Bitcoin PR #16239) 2020-11-06 15:20:17 +00:00
Andrew Poelstra
bb82340205 Merge 7b302eb99d into merged_master (Elements PR #663) 2020-11-06 15:20:17 +00:00
Andrew Poelstra
f59cc8301d Merge a409d015e9 into merged_master (Elements PR #661) 2020-11-06 15:20:17 +00:00
Andrew Poelstra
f36e4b9cba Merge 32e9453818 into merged_master (Bitcoin PR #16256) 2020-11-06 15:20:16 +00:00
Andrew Poelstra
f68fbc1a56 Merge fd333e15a5 into merged_master (Bitcoin PR #16226) 2020-11-06 15:20:16 +00:00
Andrew Poelstra
c995586189 Merge 303ec103ba into merged_master (Bitcoin PR #16026) 2020-11-06 15:20:16 +00:00
Andrew Poelstra
163591f1c2 Merge 23815ee74d into merged_master (Bitcoin PR #16246) 2020-11-06 15:20:16 +00:00
Andrew Poelstra
d212fe637d Merge b4ad4c0de3 into merged_master (Bitcoin PR #16207) 2020-11-06 15:20:16 +00:00
Andrew Poelstra
399dd855d9 Merge ea45967e85 into merged_master (Bitcoin PR #16234) 2020-11-06 15:20:16 +00:00
Andrew Poelstra
11f30c220e Merge 9c95515ba0 into merged_master (Bitcoin PR #15520) 2020-11-06 15:20:16 +00:00
Andrew Poelstra
6515bef81f Merge 413e438ea9 into merged_master (Bitcoin PR #16243) 2020-11-06 15:20:16 +00:00
Andrew Poelstra
6f1a305225 Merge b1344eac5f into merged_master (Bitcoin PR #16241) 2020-11-06 15:20:16 +00:00
Andrew Poelstra
72703c7358 Merge 0221420d1a into merged_master (Bitcoin PR #16235) 2020-11-06 15:20:16 +00:00
Andrew Poelstra
4a70305bf8 Merge 44d8172323 into merged_master (Bitcoin PR #13756)
This PR introduces a `avoid_reuse` flag to the `getnewaddress` `sendtoaddress` `getbalance`
RPCs, which we've also added some asset-specific stuff. Since both changes have default
values they aren't individually breaking, but together they are since some existing
asset-related RPC workflows now require the user to jam a `False` in there to make
the new avoid-reuse stuff go away.
2020-11-06 15:20:16 +00:00
Andrew Poelstra
1b9fe24406 Merge ac4d38c337 into merged_master (Bitcoin PR #16236) 2020-11-06 15:20:16 +00:00
Andrew Poelstra
f60ef72524 Merge 0b68fca700 into merged_master (Bitcoin PR #16092) 2020-11-06 15:20:15 +00:00
Andrew Poelstra
e596f32b6f Merge 0853d8d2fd into merged_master (Bitcoin PR #16112) 2020-11-06 15:20:15 +00:00
Andrew Poelstra
a18976a7f9 Merge 6c9d3c704f into merged_master (Bitcoin PR #15651) 2020-11-06 15:20:15 +00:00
Andrew Poelstra
9de7dbaae0 Merge 8777a80706 into merged_master (Bitcoin PR #12324) 2020-11-06 15:20:15 +00:00
Andrew Poelstra
83f93df4d0 Merge e2182b02b5 into merged_master (Bitcoin PR #16171) 2020-11-06 15:20:15 +00:00
Andrew Poelstra
66474e84c9 Merge 22b6c4ed75 into merged_master (Bitcoin PR #15899) 2020-11-06 15:20:15 +00:00
Andrew Poelstra
f2d74db77d Merge 98958c81f5 into merged_master (Bitcoin PR #16225) 2020-11-06 15:20:15 +00:00
Andrew Poelstra
a29984dd9a Merge 91958d66cb into merged_master (Bitcoin PR #16210) 2020-11-06 15:20:15 +00:00
Andrew Poelstra
046cf94f99 Merge d9bafca20c into merged_master (Bitcoin PR #15982) 2020-11-06 15:20:15 +00:00
Andrew Poelstra
0e110f2b6e Merge fce4123242 into merged_master (Bitcoin PR #16217) 2020-11-06 15:20:15 +00:00
Andrew Poelstra
e33ff205ee Merge 1a274bce4b into merged_master (Bitcoin PR #16205) 2020-11-06 15:20:15 +00:00
Andrew Poelstra
9e2fd1df5e Merge f3855781fd into merged_master (Bitcoin PR #16196) 2020-11-06 15:20:15 +00:00