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
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
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
MarcoFalke
00004565cc
ci: Use clang-12 for asan task
...
Changes from Ubuntu Focal to Hirsute to get clang-12.
Generally, it can be expected that more recent compilers have
better support for sanitizers.
2021-04-20 12:46:03 +02:00
MarcoFalke
fadbd99885
test: Remove spurious double lock tsan suppressions by bumping to clang-12
2021-04-13 19:54:39 +02:00
fanquake
f0b457212f
Merge #21467 : Move external signer out of wallet module
...
88d4d5ff2fb0db187e5bb54b2e7b1a#21417 . With additional modifications external signers could be used without a wallet in general, e.g. via `signrawtransaction`.
The `signerdisplayaddress` RPC is ranamed to `walletdisplayaddress` because it requires wallet context. A future `displayaddress` RPC call without wallet context could take a descriptor argument.
This commit fixes a `rpc_help.py` failure when configured with `--disable-wallet`.
ACKs for top commit:
ryanofsky:
Code review ACK 88d4d5ff2f88d4d5ff2f
2021-04-13 14:35:16 +08:00
MarcoFalke
fa278412a0
ci: Restart docker before run
...
Also, add setting for persistent worker in .cirrus.yml
2021-04-09 15:56:23 +02:00
Sjors Provoost
b0db187e5b
ci: use --enable-external-signer instead of --with-boost-process
...
An earlier version of #16546 used both --with-boost-process and --enable-external-signer, which was simplified to only use the latter. However I forgot to update CI, so the external signer tests were not run.
2021-04-08 17:56:00 +02:00
MarcoFalke
fa97a17ac3
ci: Bump Android cross-build to Ubuntu Focal
...
This does not change behavior, but bumping to Focal now means it doesn't
have to be done later when Bionic is no longer used and EOL.
2021-03-28 20:05:46 +02:00
MarcoFalke
fac577d423
ci: Build depends only once for Android build
...
Depends is currently built twice for the Android build. For example, the
same task building it twice:
* https://cirrus-ci.com/task/6673185279049728?logs=ci#L3418 (aarch64-linux-android)
* https://cirrus-ci.com/task/6673185279049728?logs=ci#L3422 (x86_64-pc-linux-gnu, 4 lines later)
2021-03-28 20:05:31 +02:00
MarcoFalke
fa908a41f3
ci: Set DEPENDS_DIR when setting BASE_ROOT_DIR
...
The depends dir can not be overwritten by a FILE_ENV file. Also, a FILE_ENV file
might depend on the DEPENDS_DIR value. Thus, set it before reading FILE_ENV.
This commit does not change behavior, but is required for later commits.
Can be reviewed with --color-moved=dimmed-zebra
2021-03-28 20:04:24 +02:00
Andrew Poelstra
1f068f8bd9
ci: fiddle with macos CFLAGS to work around apparent clang bug
...
See https://github.com/ElementsProject/elements/issues/782
2021-03-26 17:33:05 +00:00
Andrew Poelstra
89926e6b5f
ci: correct bitcoin-node to elements-node for multiprocess CI job
...
Also rename libbitcoin_consensus to libelements_consensus more
consistently in src/Makefile.am. I'm not sure this was causing any
problems but it did make it harder to follow what autotools is
thinking.
2021-03-26 17:33:05 +00:00
Andrew Poelstra
db64bd5276
ci: change bitcoin- paths to elements- paths since that's where autotools puts stuff
2021-03-26 17:33:04 +00:00
