Commit Graph

13098 Commits

Author SHA1 Message Date
Gavin Andresen d7a20b6373 Simple benchmarking framework
Benchmarking framework, loosely based on google's micro-benchmarking
library (https://github.com/google/benchmark)

Wny not use the Google Benchmark framework? Because adding Even More Dependencies
isn't worth it. If we get a dozen or three benchmarks and need nanosecond-accurate
timings of threaded code then switching to the full-blown Google Benchmark library
should be considered.

The benchmark framework is hard-coded to run each benchmark for one wall-clock second,
and then spits out .csv-format timing information to stdout. It is left as an
exercise for later (or maybe never) to add command-line arguments to specify which
benchmark(s) to run, how long to run them for, how to format results, etc etc etc.
Again, see the Google Benchmark framework for where that might end up.

See src/bench/MilliSleep.cpp for a sanity-test benchmark that just benchmarks
'sleep 100 milliseconds.'

To compile and run benchmarks:
  cd src; make bench

Sample output:

Benchmark,count,min,max,average
Sleep100ms,10,0.101854,0.105059,0.103881
2020-01-22 21:40:35 +00:00
Alfredo Garcia 76a43b6790 Return address and type of imported key in z_importkey
Co-authored-by: Dagur Valberg Johannsson <dagurval@pvv.ntnu.no>
2020-01-22 14:41:02 -03:00
Homu b8ca7131c7 Auto merge of #4303 - ebfull:release-v2.1.1, r=mdr0id
Release v2.1.1

The release height for this is roughly Tuesday.
2020-01-21 20:11:48 +00:00
Sean Bowe 811158a483
make-release.py: Updated release notes and changelog for 2.1.1. 2020-01-17 10:27:31 -07:00
Sean Bowe c214fa13b7
make-release.py: Updated manpages for 2.1.1. 2020-01-17 10:27:31 -07:00
Sean Bowe 5133275342
make-release.py: Versioning changes for 2.1.1. 2020-01-17 10:26:14 -07:00
Homu dcddb8b6e4 Auto merge of #4299 - ebfull:release-v2.1.1-rc2, r=mdr0id
Release v2.1.1 rc2
2020-01-14 18:33:40 +00:00
Sean Bowe 0dca75a21d
make-release.py: Updated release notes and changelog for 2.1.1-rc2. 2020-01-13 17:56:29 -07:00
Sean Bowe 131e1aa77a
make-release.py: Updated manpages for 2.1.1-rc2. 2020-01-13 17:56:29 -07:00
Sean Bowe 846868f0c7
make-release.py: Versioning changes for 2.1.1-rc2. 2020-01-13 17:55:01 -07:00
Homu 02706325ca Auto merge of #4296 - milesmanley:4295.update-libsodium-dl-path, r=mdr0id
Update libsodium download-path

This PR fixes the macOS build that is currently failing due to the download path for Libsodium changing - mentioned in issue #4295
2020-01-13 21:31:32 +00:00
Miles Manley 6f28ddc3a5
Update libsodium download-path
Fixes error 404 when building for macOS

Maybe update to 1.0.16?
2020-01-13 13:23:16 +09:00
Homu 2f8cf61a2a Auto merge of #4290 - defuse:fix-proton-build, r=ebfull
Fix broken proton build
2020-01-09 01:01:35 +00:00
Taylor Hornby 84497b862a Fix broken proton build 2020-01-08 16:23:29 -07:00
Homu 1ac3e8fb82 Auto merge of #4289 - daira:remove-eos-workaround, r=ebfull
Remove temporary workaround for deprecation height.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-08 06:20:52 +00:00
Daira Hopwood 7eb5c49d32 Remove temporary workaround for deprecation height.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-08 06:14:05 +00:00
Homu 19aa3dfed0 Auto merge of #4288 - ebfull:release-v2.1.1-rc1, r=ebfull
Release v2.1.1-rc1
2020-01-08 04:15:40 +00:00
Sean Bowe 3b2ebf2447
make-release.py: Updated release notes and changelog for 2.1.1-rc1. 2020-01-07 20:13:52 -07:00
Sean Bowe 356491a046
make-release.py: Updated manpages for 2.1.1-rc1. 2020-01-07 20:13:51 -07:00
Sean Bowe 2c88a156ba
make-release.py: Versioning changes for 2.1.1-rc1. 2020-01-07 20:13:03 -07:00
Homu 3a18c95042 Auto merge of #4287 - ebfull:update-proton, r=ebfull
Update proton from 0.26.0 to 0.30.0
2020-01-08 01:26:26 +00:00
Taylor Hornby a5affb11d1 Update proton from 0.26.0 to 0.30.0 2020-01-07 21:36:14 +00:00
Homu 043ce3f2ac Auto merge of #3912 - bitcartel:fix_getwalletinfo_help_message, r=daira
Closes #3911. Fix help message of RPC getwalletinfo.
2020-01-06 04:37:09 +00:00
Homu efab5aaca4 Auto merge of #4281 - LarryRuane:test-fixes-enable-debug, r=daira
fix tests for enable-debug build

Addresses part of #4275.
2020-01-06 03:29:34 +00:00
Homu 6a08c22567 Auto merge of #4277 - sandakersmann:master, r=daira
Update copyright year to 2020

Update copyright year to 2020
2020-01-05 20:49:00 +00:00
Larry Ruane 7b5148cc64 fix tests for enable-debug build 2019-12-31 12:18:16 -07:00
Homu 1da79ed1c3 Auto merge of #4278 - LarryRuane:4223-fix-spentindex-test, r=daira
insightexplorer: LOCK(cs_main) during rpcs

Closes #4223. Ensure lock cs_main is held during calls to GetSpentIndex().
2019-12-28 14:43:08 +00:00
Larry Ruane 14ec1016b9 insightexplorer: LOCK(cs_main) during rpcs 2019-12-27 10:21:46 -07:00
sandakersmann 0859ea4951
Update _COPYRIGHT_YEAR in configure.ac to 2020 2019-12-27 18:04:14 +01:00
sandakersmann 91b8de9151
Update COPYRIGHT_YEAR in clientversion.h to 2020 2019-12-27 18:01:51 +01:00
sandakersmann 4dd8cf1fc2
Update of copyright year to 2020 2019-12-27 17:58:48 +01:00
Taylor Hornby d7108d36b1 Update list of dependencies to check 2019-12-19 14:33:51 -07:00
Taylor Hornby 49f94dbe3d Add GitHub API credential 2019-12-19 14:33:41 -07:00
Taylor Hornby d83e8a6a44 Add Python script for checking if dependencies have updates. 2019-12-19 13:58:36 -07:00
Homu 5177d2e708 Auto merge of #4259 - rex4539:fix-warnings, r=daira
depends macOS: hide linker visibility warnings

Closes https://github.com/zcash/zcash/issues/4255

Tested that all lines with `ld: warning: direct access in` are gone from build log.
2019-12-19 16:37:32 +00:00
Homu 900ed4555f Auto merge of #4271 - str4d:2074-wallet-3, r=ebfull
Bitcoin wallet PRs 3

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#7687
- bitcoin/bitcoin#11116
  - Excludes SegWit tests
  - Excludes `isInvalid` code (which is part of the SegWit support structure)
- bitcoin/bitcoin#13002
  - Excludes changes to `importwallet` (missing bitcoin/bitcoin#11667)
  - Excludes changes to `ProcessImport` (missing bitcoin/bitcoin#7551)
  - Third commit was rewritten to add an internal SigVersion argument (which we didn't have because it was added to support SegWit logic).
2019-12-19 01:17:12 +00:00
Pieter Wuille 82eefce0ab
Use anonymous namespace instead of static functions 2019-12-18 18:59:15 -06:00
Pieter Wuille 790f21e9a8
Mention removal of bare multisig IsMine in release notes 2019-12-18 18:59:15 -06:00
Pieter Wuille e82901f4fd
Do not treat bare multisig as IsMine
Such outputs can still be watched, and signed for, but they aren't treated as valid payments.
That means they won't cause transactions to appear in listtransactions, their outputs to be
shown under listunspent, or affect balances.
2019-12-18 18:59:15 -06:00
Pieter Wuille 84b4bdbb51
Track difference between scriptPubKey and P2SH execution in IsMine
Inside IsMine we care about the distinction between scriptPubKey execution
and P2SH redeemScript execution. The consensus code does not care about this
distinction, and thus SigVersion does not have a field for P2SH. As the IsMine
code will care, it uses a separate enum with more fields.
2019-12-18 18:59:15 -06:00
Pieter Wuille 36f067bb95
Switch to a private version of SigVersion inside IsMine
This will allow us to have the consensus code and IsMine code diverge.
2019-12-18 18:59:15 -06:00
Pieter Wuille 030e173d98
Do not expose SigVersion argument to IsMine
Only IsMine's internal code needs this, as part of a recursion into P2SH and P2WSH
scripts. The exposed functions always operate on actual scriptPubKeys and not on
redeemScripts or witness scripts.

Zcash: Rewrote this commit so that it instead adds an internal
SigVersion argument (which we didn't have because it was added to
support SegWit logic).

Co-authored-by: Jack Grigg <jack@z.cash>
2019-12-18 18:59:15 -06:00
Pieter Wuille df00e51e3e
Make CScript -> CScriptID conversion explicit
Zcash: Excludes changes to importwallet (missing bitcoin/bitcoin#11667)
and ProcessImport (missing bitcoin/bitcoin#7551).
2019-12-18 18:59:15 -06:00
Jim Posen de9c679770
[script] Unit tests for IsMine
Does not test watch-only addresses.

Zcash: Excluding SegWit tests and isInvalid code (which is part of the
SegWit support structure).
2019-12-18 18:59:15 -06:00
Jim Posen bf2c8b3bc6
[script] Unit tests for script/standard functions
Zcash: Excluding unit tests for SegWit logic.
2019-12-18 18:59:15 -06:00
Pieter Wuille 9ed1fe9c6b
Stop treating importaddress'ed scripts as change
Before this, if someone imported a scriptPubKey directly (in hex form) using
importaddress, outputs sending to it would be treated as change, as the
corresponding CTxDestination was not added to the address book.

Fix this by trying to detect scriptPubKeys that are in fact convertible to a
CTxDestination and add them anyway. Add a warning to the RPC help to warn
against importing raw non-standard scripts.
2019-12-18 18:59:15 -06:00
Homu fa341bcff0 Auto merge of #4270 - str4d:2074-wallet-2, r=str4d
Bitcoin wallet PRs 2

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#7576
- bitcoin/bitcoin#7577
- bitcoin/bitcoin#7608
- bitcoin/bitcoin#7691
- bitcoin/bitcoin#7905
2019-12-18 23:53:21 +00:00
Wladimir J. van der Laan e42359dcbf
test: Rename wallet.dat to wallet_test.dat
Indicate that the file name is not hardcoded, and a little bit of safety
so that it never nukes the main wallet.

Suggestion by Marco Falke.
2019-12-18 16:50:29 -06:00
Wladimir J. van der Laan 3782c4d6ab
wallet_ismine.h → script/ismine.h
Removes conditional dependency of `src/test` on wallet.

Makes multisig and P2SH tests complete without wallet built-in.
2019-12-18 16:50:29 -06:00
Wladimir J. van der Laan 91f0b506ca
test: Create test fixture for wallet
Removes all the `#ifdef ENABLE_WALLET` from `test_bitcoin` by
making the wallet tests use their own fixture.
2019-12-18 16:50:29 -06:00