GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-16 13:01:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
32238 commits 49 branches 359 tags 252 MiB
Commit graph

293 commits

Author SHA1 Message Date
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
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
Igor Cota
7563720e30 CI: add Android APK build script 2021-03-21 22:33:35 +01:00
Hennadii Stepanov
e4c0cada79
ci, gitian: Drop unneeded python3-dev package for macOS builds 2021-03-14 14:55:12 +02:00
Hennadii Stepanov
3272e34f9c
build: Add xkbcommon 0.8.4 
Co-authored-by: fanquake <fanquake@gmail.com>
 2021-03-10 08:23:47 +08:00
Hennadii Stepanov
f7f3829a68
build, doc: Drop libbz2-dev from macOS cross-compiling dependencies 2021-03-03 22:43:08 +02:00
Hennadii Stepanov
d8239362e2
build, doc: Drop libcap-dev from macOS cross-compiling dependencies 2021-03-03 22:38:45 +02:00
fanquake
ccb7b6a976
contrib: run test-symbol check for RISCV 
Now that we are using Focal for Gitian building (glibc 2.31), we can
user a newer introduced  symbol, and include RISCV in this test.
 2021-02-22 08:35:06 +08:00
MarcoFalke
fa330d8fed
ci: Avoid invoking curl on the host 2021-02-20 09:52:55 +01:00
MarcoFalke
6a680a6236
Merge #21226: build: Fix fuzz binary compilation under windows 
56ace907b9 Fix fuzz binary compilation under windows (Dan Benjamin)

Pull request description:

  Small change to allow the fuzz binary to compile under windows. Also removed --disable-fuzz-binary from the windows CI test. This fixes #21212.

ACKs for top commit:
  MarcoFalke:
    review ACK 56ace907b9 the best bugfixes are the ones removing code

Tree-SHA512: 6088fd955a5e511b5ca1b3eaa8469a889eb6d994c2827acac7695dac6e4e320a344b45f4015a2f279b16df0d4b23ec4df13304ae6315395ad2fe8c5b526cada4
 2021-02-19 11:30:41 +01:00
Dan Benjamin
56ace907b9 Fix fuzz binary compilation under windows 2021-02-18 17:35:24 -05:00