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

66 commits

Author SHA1 Message Date
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
MarcoFalke
faf757a125
ci: Guess the native host when not cross compiling 2019-11-07 13:42:57 -05:00
MarcoFalke
fa8a60bce9
ci: Run non-cross-compile builds natively 2019-11-04 14:10:24 -05:00
MarcoFalke
fa56bcbb01
ci: Run CI_WAIT only on travis 2019-11-04 14:10:07 -05:00
MarcoFalke
def69e5a86
Merge #17233: travis: Run unit and functional tests on native arm 
facc0da63a travis: Run unit and functional tests on native arm (MarcoFalke)
fafa064d2a ci: Remove ccache requirement on the host (MarcoFalke)

Pull request description:

  This keeps the cross-compilation to make it easy to run the ci on non-arm hardware. To run this locally in qemu-user as it used to be, just `export QEMU_USER_CMD="qemu-arm -L /usr/arm-linux-gnueabihf/"`.

ACKs for top commit:
  laanwj:
    LGTM ACK facc0da63a
  practicalswift:
    ACK facc0da63a -- diff looks correct and Travis seems happy

Tree-SHA512: 0dc1bc82eb93e2bd8b159e044f20fe3055f8cdfd73aaa238bd2e178397582144dfc0c6a87bd8270115dafea1a623e642bde5d5f30254f94140f1a2cdb12fc2da
 2019-11-04 08:23:21 -05:00
randymcmillann
58d0393bec
build: update retry to current version 
from: 7d2caa94a7
 2019-10-30 18:49:57 -04:00
MarcoFalke
facc0da63a
travis: Run unit and functional tests on native arm 2019-10-30 14:45:32 -04:00
MarcoFalke
fafa064d2a
ci: Remove ccache requirement on the host 
ccache is only needed to create the cache dir on the host, if it didn't
already exist. The same can be achieved with mkdir, so just use that
instead.
 2019-10-24 18:37:38 -04:00
fanquake
3548e4aac7
Remove BIP70 Support 2019-10-24 16:01:43 -04:00
fanquake
67328bb7ca
build: remove protobuf from depends 2019-10-24 16:01:42 -04:00
MarcoFalke
fa710066b9
ci: Disable functional tests on mac host 2019-10-24 12:43:55 -04:00
MarcoFalke
4aaeb04497
Merge #17205: ci: Enable address sanitizer (ASan) stack-use-after-return checking 
8d22ab0e50 ci: Enable address sanitizer (ASan) stack-use-after-return checking (practicalswift)

Pull request description:

  Enable address sanitizer (ASan) stack-use-after-return checking (`detect_stack_use_after_return=1`).

  Example:

  ```
  #include <iostream>
  #include <string>

  const std::string& get_string(int i) {
      return std::to_string(i);
  }

  int main() {
      std::cout << get_string(41) << "\n";
  }
  ```

  Without address sanitizer (ASan) stack-use-after-return checking:

  ```
  $ ./stack-use-after-return

  $
  ```

  With address sanitizer (ASan) stack-use-after-return checking:

  ```
  $ ASAN_OPTIONS="detect_stack_use_after_return=1" ./stack-use-after-return
  =================================================================
  ==10400==ERROR: AddressSanitizer: stack-use-after-return on address 0x7f7fa0400030 at pc 0x00000049d2cc bp 0x7ffcbd617070 sp 0x7ffcbd616820
  READ of size 2 at 0x7f7abbecd030 thread T0
      #0 0x439781 in fwrite
      #1 0x7f7ac0504cb3 in std::basic_ostream<char, std::char_traits<char> >& std::__ostream_insert<char, std::char_traits<char> >(std::basic_ostream<char, std::char_traits<char> >&, char const*, long) (/usr/lib/x86_64-linux-gnu/libstdc++.so.6+0x113cb3)
      #2 0x4f9b5f in main stack-use-after-return.cpp:9:15
      #3 0x7f7abf440b96 in __libc_start_main
      #4 0x41bbc9 in _start
  …
  $
  ```

Top commit has no ACKs.

Tree-SHA512: 6557a9ff184023380fd9aa433cdf413e01a928ea99dbc59ec138e5d69cb9e13592e8bb5951612f231ff17a37a895bec5c0940c8db5f328a5c840a5771bdeeba5
 2019-10-22 13:14:16 -04:00
practicalswift
8d22ab0e50 ci: Enable address sanitizer (ASan) stack-use-after-return checking 2019-10-21 10:04:28 +00:00
MarcoFalke
fa677d1801
ci: Remove redundant check for TRAVIS_OS_NAME 
Can be reviewed with
git diff --ignore-all-space --function-context
 2019-10-17 11:30:36 -04:00
MarcoFalke
4444704ca9
ci: Cleanup macOS runs 2019-10-17 10:47:02 -04:00
Sjors Provoost
1f6c650c99
travis: run tests on macOS native 
Review hint:
git show -w

Co-authored-by: MarcoFalke <falke.marco@gmail.com>
Co-authored-by: keneanung <keneanung@googlemail.com>
Co-authored-by: Vadim Peretokin <vperetokin@gmail.com>
 2019-10-14 23:00:49 +02:00
MarcoFalke
42d0eca725
Merge #13728: lint: Run the CI lint stage on mac 
cd82f75a43 lint: Install grep and git via brew on mac for --perl-regexp (Ben Woosley)
eafa747ca5 lint: Fix shellcheck SC2155 (Ben Woosley)
615ff4e7db lint: Run the linters against Mac OS on Travis (Ben Woosley)

Pull request description:

  This helps ensure ongoing compatibility with macOS-distributed version of GNU bash.

ACKs for top commit:
  MarcoFalke:
    ACK cd82f75a43

Tree-SHA512: 8d56d2303bbebedba8ea2291f4ab35b7fdf3245b7a4c3f04557eee4f19d83573798ad32facc92bfa060aaeb294e6d2c95e6d1c3b795fd7951dcf3aa1cccec107
 2019-10-09 14:37:53 -04:00
Ben Woosley
cd82f75a43
lint: Install grep and git via brew on mac for --perl-regexp 
Particularly `--with-pcre2` is needed to run `git grep --perl-regexp` in
`test/link/check-doc.py`
 2019-10-09 15:50:42 +01:00
Ben Woosley
eafa747ca5
lint: Fix shellcheck SC2155 
Declare and assign separately to avoid masking return values.

https://github.com/koalaman/shellcheck/wiki/SC2155
 2019-10-09 15:50:42 +01:00
Ben Woosley
615ff4e7db
lint: Run the linters against Mac OS on Travis 
This helps ensure ongoing compatibility with macOS-distributed version
of GNU bash.
 2019-10-09 15:49:51 +01:00
MarcoFalke
fa79dff624
ci: Run tests on arm 2019-10-09 09:33:07 -04:00
Wladimir J. van der Laan
34919e0033
Merge #17011: ci: Use busybox utils for one build 
ddddd8961b ci: Use busybox utils for one build (MarcoFalke)

Pull request description:

  To make sure Bitcoin Core can be built with BusyBox, see https://github.com/bitcoin/bitcoin/pull/16927#issuecomment-536483706

ACKs for top commit:
  laanwj:
    ACK ddddd8961b

Tree-SHA512: da3a4654ee7975206d04643675d309b4973a510ca344acaec97fb1ed19c43cf13489bdf236c92c4a90499ec5b3c18c3338fff096110b26abee5ffe955089f267
 2019-10-08 11:31:48 +02:00
MarcoFalke
fa95503d64
ci: Make apt-get more verbose, to debug travis timeouts 2019-10-03 10:50:33 -04:00
MarcoFalke
ddddd8961b
ci: Use busybox utils for one build 2019-10-02 10:01:04 -04:00
practicalswift
aa81e2cc0e Enable UBSan for Travis fuzzer job 2019-10-01 08:23:34 +00:00
MarcoFalke
4c4ff4911a
Merge #16961: test: Remove python dead code linter 
f4beb4996d test: Remove python dead code linter (Wladimir J. van der Laan)

Pull request description:

  Primarily I'd like to remove this because it is very imprecise, due to Python's dynamic nature, giving it a large list of false positives that need to be listed as exceptions. See for example #16906.

  It's also a frequent source of complaints. I'm doubtful of the usefulness of checking for dead code in a linter in the first place.
  Having some dead code in the test framework for a while is not a
  disaster.

ACKs for top commit:
  sdaftuar:
    utACK f4beb4996d
  practicalswift:
    ACK f4beb4996d -- diff looks correct
  jamesob:
    ACK https://github.com/bitcoin/bitcoin/pull/16961/commits/f4beb4996d27f2cdaf4f0a63e7dc044bf17decce

Tree-SHA512: 329b1555210311d5d15799fd2cb794b3208b0ac4d8a2ffaf4dece1bcc3e0e8b1fe952d5e7a394f94a98919cab579fb579eae7db2a796cc9a1a42ef495dd17507
 2019-09-25 13:14:22 -04:00
Wladimir J. van der Laan
f4beb4996d test: Remove python dead code linter 
Primarily I'd like to remove this because it is very imprecise, due to
Python's dynamic nature, giving it a large list of false positives that
need to be listed as exceptions. See for example #16906.

It's also a frequent source of complaints. I'm doubtful of the
usefulness of checking for dead code in a linter in the first place.
Having some dead code in the test framework for a while is not a
disaster.
 2019-09-25 11:16:09 +02:00