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
25323 commits 49 branches 359 tags 252 MiB
Commit graph

128 commits

Author SHA1 Message Date
Andrew Poelstra
bf899b9e7f Merge 16dfaed1b7 into merged_master (Bitcoin PR #18304) 2020-11-26 01:07:52 +00:00
Andrew Poelstra
0bfe4eb6c4 Merge 5d92ac26ed into merged_master (Bitcoin PR #18264) 2020-11-26 01:07:52 +00:00
Andrew Poelstra
cdeb19ce22 Merge 088604221b into merged_master (Bitcoin PR #18253) 2020-11-26 01:07:48 +00:00
Andrew Poelstra
1ce4e7c713 Merge a674e89d27 into merged_master (Bitcoin PR #18162) 2020-11-26 01:07:45 +00:00
Andrew Poelstra
e4c8881cdd Merge eddcbfb109 into merged_master (Bitcoin PR #18166) 2020-11-26 01:07:44 +00:00
Andrew Poelstra
464b206bfb Merge 33861a8367 into merged_master (Bitcoin PR #18145) 2020-11-26 01:07:43 +00:00
Andrew Poelstra
bca8bce3b7 Merge caa2f3af29 into merged_master (Bitcoin PR #12134) 2020-11-26 01:07:42 +00:00
Andrew Poelstra
68844be4f2 Merge b063cb690f into merged_master (Bitcoin PR #18081) 2020-11-26 01:07:41 +00:00
Andrew Poelstra
5a603ed0ac Merge c8ce2632eb into merged_master (Bitcoin PR #16392) 2020-11-26 00:29:45 +00:00
Andrew Poelstra
6bdfee52c0 Merge 4a07233076 into merged_master (Bitcoin PR #17767) 2020-11-14 16:52:11 +00:00
Andrew Poelstra
be24656ac4 Merge 2aaeca50b2 into merged_master (Bitcoin PR #17900) 
travis again..
 2020-11-14 16:52:08 +00:00
Andrew Poelstra
7c53615bb6 Merge af05bd9e1e into merged_master (Bitcoin PR #17891) 2020-11-14 16:52:07 +00:00
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
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
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
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
285f1c540f Merge 4116a50595 into merged_master (Bitcoin PR #16959) 2020-11-09 21:20:28 +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
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
MarcoFalke
16dfaed1b7
Merge #18304: ci: Enable all functional tests in valgrind 
4444edc2e6 ci: Enable all functional tests in valgrind (MarcoFalke)

Pull request description:

  The travis timeout for our repo has been bumped to 2h, so we can run all tests in valgrind now

ACKs for top commit:
  practicalswift:
    ACK 4444edc2e6 -- regarding the three disabled cases (`feature_abortnode`, `feature_block` and `rpc_bind`): not a big deal since MSan will take care of those once #18288 is merged. More is more :)

Tree-SHA512: ea2f798112911b6d1f3d88cfcdf0a7cdb698687248343703d6fe55da144542c961c15d888bffb41672c10aa76765615cb7c7ff93d468bfad3c51f962f24e7abb
 2020-03-11 08:39:09 -04:00
MarcoFalke
4444edc2e6
ci: Enable all functional tests in valgrind 2020-03-10 18:38:42 -04:00
fanquake
e21fa542b1
test: remove Boost Chrono installation from CI 2020-03-07 08:34:31 +08:00