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

118 commits

Author SHA1 Message Date
Andrew Poelstra
1e9eff8c6d Merge 52900a764c into merged_master (Bitcoin PR #17849) 2020-11-14 16:52:03 +00:00
Andrew Poelstra
009bc2fdfb Merge 99813a9745 into merged_master (Bitcoin PR #17829) 2020-11-14 16:52:02 +00:00
Andrew Poelstra
ce1aa041cb Merge 890eac8f82 into merged_master (Bitcoin PR #17725) 
Another travis mess
 2020-11-14 16:52:00 +00:00
Andrew Poelstra
b34f506353 Merge a54c16cdb6 into merged_master (Bitcoin PR #17661) 2020-11-14 16:52:00 +00:00
Andrew Poelstra
80212a63e2 Merge fc0da027e8 into merged_master (Bitcoin PR #17635) 
This is another one where git sorta mangled .travis.yml and I didn't bother
trying to sort it out. Just took the original code for every conflict. We'll
pretty-much have to redo the CI post-rebase.
 2020-11-14 16:51:54 +00:00
Andrew Poelstra
719c7784db Merge cf43f3f0a8 into merged_master (Bitcoin PR #17674) 2020-11-14 16:51:53 +00:00
Andrew Poelstra
5a48ca16e3 Merge fee01bb053 into merged_master (Bitcoin PR #17517) 2020-11-14 16:51:52 +00:00
Andrew Poelstra
df14d3c511 Merge 1705f1949a into merged_master (Bitcoin PR #17549) 2020-11-14 16:51:51 +00:00
Andrew Poelstra
c3c860b38a Merge 69ca6cdd66 into merged_master (Bitcoin PR #17599) 2020-11-14 16:51:51 +00:00
Andrew Poelstra
b4d7d9d503 Merge 1f59885d27 into merged_master (Bitcoin PR #17361) 2020-11-14 16:51:50 +00:00
Andrew Poelstra
0e603ca0d7 Merge 2c1c43754b into merged_master (Bitcoin PR #17591) 2020-11-14 16:51:49 +00:00
Andrew Poelstra
810568e0fa Merge a6f5b6f47d into merged_master (Bitcoin PR #17550) 2020-11-14 16:51:48 +00:00
Andrew Poelstra
d575b88283 Merge 41162c0ba0 into merged_master (Bitcoin PR #17423) 2020-11-09 23:10:13 +00:00
Andrew Poelstra
247ac78e37 Merge 76e777df83 into merged_master (Bitcoin PR #16161) 2020-11-09 23:10:13 +00:00
Andrew Poelstra
db065548fc Merge b4a1da9ef8 into merged_master (Bitcoin PR #17515) 2020-11-09 23:10:12 +00:00
Andrew Poelstra
a648df2425 Merge 2065ef66ee into merged_master (Bitcoin PR #17265) 2020-11-09 23:10:12 +00:00
Andrew Poelstra
21cb153472 Merge 24647a09e7 into merged_master (Bitcoin PR #17470) 2020-11-09 23:10:12 +00:00
Andrew Poelstra
989b448129 Merge 9e0aabe50c into merged_master (Bitcoin PR #17367) 2020-11-09 23:10:09 +00:00
Andrew Poelstra
e9aed1d9c3 Merge def69e5a86 into merged_master (Bitcoin PR #17233) 2020-11-09 21:20:50 +00:00
Andrew Poelstra
878a2af564 Merge 0e6cae0248 into merged_master (Bitcoin PR #17284) 2020-11-09 21:20:49 +00:00
Andrew Poelstra
466ecf5506 Merge d91af4768c into merged_master (Bitcoin PR #17165) 
This commit removes BIP70 support. Since this was the only thing our
payment sernver supported (we had previously dropped support for
bitcoin: urls) I also dropped all the paymentrequest logic.
 2020-11-09 21:20:45 +00:00
Andrew Poelstra
e876859985 Merge 4af0447169 into merged_master (Bitcoin PR #17240) 2020-11-09 21:20:44 +00:00
Andrew Poelstra
c20d5e8e7a Merge 4aaeb04497 into merged_master (Bitcoin PR #17205) 2020-11-09 21:20:43 +00:00
Andrew Poelstra
605163ef88 Merge fc1040acc0 into merged_master (Bitcoin PR #17176) 2020-11-09 21:20:42 +00:00
Andrew Poelstra
42deaf6a29 Merge ec3ed5a448 into merged_master (Bitcoin PR #16597) 2020-11-09 21:20:41 +00:00
Andrew Poelstra
1a2b4f816c Merge 3c01b3435e into merged_master (Elements PR #742) 2020-11-09 21:20:36 +00:00
Andrew Poelstra
d8c3562011 Merge 42d0eca725 into merged_master (Bitcoin PR #13728) 2020-11-09 21:20:36 +00:00
Andrew Poelstra
b448c20b7b Merge 1c11e53bb6 into merged_master (Bitcoin PR #17041) 
Take .travis.yml changes from PR (this time from Core, which looks like it drops
the Win32 build, which I semi-mistakenly added last time when I took the entire
file from Elements.
 2020-11-09 21:20:35 +00:00
Andrew Poelstra
45c44b4d29 Merge 34919e0033 into merged_master (Bitcoin PR #17011) 2020-11-09 21:20:34 +00:00
Andrew Poelstra
366e82e966 Merge 284cd3195a into merged_master (Bitcoin PR #17040) 2020-11-09 21:20:33 +00:00
Andrew Poelstra
134e52cbed Merge ddc4e3c2d6 into merged_master (Bitcoin PR #17006) 2020-11-09 21:20:32 +00:00
Andrew Poelstra
065f0f7e86 Merge 4c4ff4911a into merged_master (Bitcoin PR #16961) 2020-11-09 21:20:28 +00:00
Andrew Poelstra
285f1c540f Merge 4116a50595 into merged_master (Bitcoin PR #16959) 2020-11-09 21:20:28 +00:00
Andrew Poelstra
b11de4e489 Merge cfcaa9759e into merged_master (Bitcoin PR #16907) 2020-11-09 21:20:26 +00:00
Andrew Poelstra
dd3496415c Merge 19f301def7 into merged_master (Bitcoin PR #16871) 2020-11-09 21:20:25 +00:00
Andrew Poelstra
6be382597b Merge 102998ea03 into merged_master (Bitcoin PR #15584) 2020-11-09 21:20:24 +00:00
Andrew Poelstra
eb174d36e9 Merge 45be44cce4 into merged_master (Bitcoin PR #15257) 2020-11-09 21:20:21 +00:00
Andrew Poelstra
d22322a764 Merge 1f77c5c3e7 into merged_master (Bitcoin PR #16739) 2020-11-09 21:20:19 +00:00
Andrew Poelstra
941161fcd8 Merge 8b42db130f into merged_master (Bitcoin PR #16623) 
Just took all of Core's .travis.yml changes; will revisit after the rebase is done
 2020-11-09 21:20:16 +00:00
Andrew Poelstra
6775f51528 Merge aed15edf17 into merged_master (Bitcoin PR #16633) 2020-11-09 21:20:15 +00:00
Andrew Poelstra
6137593682 Merge 367b023ae4 into merged_master (Bitcoin PR #16582) 2020-11-09 21:20:14 +00:00
Hennadii Stepanov
87744b16b0
ci: Fix brew python link 2020-01-02 18:08:10 +02:00
MarcoFalke
aaaaad6ac9
scripted-diff: Bump copyright of files changed in 2019 
-BEGIN VERIFY SCRIPT-
./contrib/devtools/copyright_header.py update ./
-END VERIFY SCRIPT-
 2019-12-30 10:42:20 +13:00
MarcoFalke
890eac8f82
Merge #17725: ci: Add valgrind run 
facb416ad5 ci: Add valgrind run (MarcoFalke)

Pull request description:

  Fixes #17460

ACKs for top commit:
  practicalswift:
    ACK facb416ad5

Tree-SHA512: 55396e548a76f976d7b7170b68bc5f93cfd44656162267172f66db7eb549699a2a22d3b1bb0d5f180fe0697931939e652c8cdb86b435e81e7ce572485798009d
 2019-12-17 11:46:22 -05:00
Elichai Turkel
e190000869
ci-s390x: Add qemu and depends support in the ci script 2019-12-14 18:27:13 +02:00
MarcoFalke
facb416ad5
ci: Add valgrind run 2019-12-10 19:37:37 -05:00
MarcoFalke
fc0da027e8
Merge #17635: ci: Add CentOS 7 build 
711e0449cf ci: Remove trusty build (Hennadii Stepanov)
7f3ae22468 ci: Add CentOS 7 build (Hennadii Stepanov)

Pull request description:

  Arguably, CentOS is the most conservative distro of all the popular ones. Thus, it could be a good way to check the Bitcoin Core compatibility with aged dependencies.

  Currently, CentOS 7 has:
  - Berkeley DB == 4.8.30
  - Boost == 1.53.0
  - GCC == 4.8.5
  - libevent == 2.0.21 < minimum required [2.0.22](https://github.com/bitcoin/bitcoin/blob/master/doc/dependencies.md), but tests passed
  - MiniUPnPc == 2.0
  - Python == 3.6.8
  - qrencode == 3.4.1
  - Qt == 5.9.7
  - ZeroMQ == 4.1.4

  ~Please note that this PR is based on the bugfix #17634.~

  Also trusty build has been removed for the following reasons:
  - https://github.com/bitcoin/bitcoin/issues/17628#issuecomment-559448201:
  > Maybe it'd make sense to replace Ubuntu Trusty with Centos 7 as the "check ancient backward compatibililty" Travis run. It's supported until 2024, apparently.

  - https://github.com/bitcoin/bitcoin/pull/17635#discussion_r354811792:
  > Our travis is currently running at its limit and this doesn't seem like it is adding a lot new coverage compared to the other builds.

  Close #17628

ACKs for top commit:
  MarcoFalke:
    ACK 711e0449cf 🚠

Tree-SHA512: 614ec8394943f482a5867067f7119bffd052924a51e32ffda9a08e10c392c4a955a3539e2f8907cb65bfd9347dadf0ba62f6d1530bbc49927c347360a5a7f73c
 2019-12-06 23:32:21 -05:00
Hennadii Stepanov
711e0449cf
ci: Remove trusty build 
Co-authored-by: Emil Engler <me@emilengler.com>
 2019-12-06 21:54:37 +02:00
Hennadii Stepanov
7f3ae22468
ci: Add CentOS 7 build 2019-12-06 21:44:35 +02:00
practicalswift
1f9d5af4f1 tests: Add initialization order fiasco detection in Travis 2019-12-05 10:54:18 +00:00