Commit Graph

12192 Commits

Author SHA1 Message Date
Homu aa0d1f3b94 Auto merge of #3892 - zebambam:add_responsible_disclosure_statement_security_3869, r=bitcartel
Added responsible disclosure statement for issue #3869
2019-03-18 18:29:43 -07:00
Homu 1078c7f9a6 Auto merge of #3887 - bitcartel:2.0.4_pre_release, r=bitcartel
Update chain work and checkpoint for 2.0.4

Closes #3886
2019-03-18 14:53:09 -07:00
zebambam 1da8882d88 Added responsible disclosure statement for issue #3869 2019-03-15 16:08:57 -07:00
Simon ea5f00aa5d Add checkpoint for block 497000. 2019-03-13 17:31:49 -07:00
Simon 16385486b8 Update nMinimumChainWork using block 497000. 2019-03-13 17:24:43 -07:00
Homu 1cbe5075d6 Auto merge of #3762 - str4d:2074-detach-wallet-from-miner, r=Eirik0
Detach wallet from miner

Cherry-picked from upstream PR bitcoin/bitcoin#5994.

Part of #2074.
2019-03-12 13:01:31 -07:00
Jack Grigg 1fee15028f
Move payment disclosure code and tests into wallet
The code was already compiled as part of the wallet, but the tests were
not, meaning that the tests would fail to compile when the wallet was
disabled.
2019-03-06 10:04:23 +13:00
Jack Grigg c7fc78987a
Move utiltest.cpp from wallet to common
This ensures it is accessible by the test suite when the wallet is
disabled.
2019-03-06 09:41:39 +13:00
Jack Grigg c233f6fd31
Add comments 2019-03-06 09:03:55 +13:00
Jack Grigg 3cb20f26a1
test: Make expected_utxos optional in get_coinbase_address() 2019-03-06 09:03:55 +13:00
Jack Grigg b0f1d643aa
test: Fetch coinbase address from coinbase UTXOs
After upstream PR bitcoin/bitcoin#5994, the first call to getnewaddress after
startup does not return the address being used by the miner.
2019-03-06 09:03:51 +13:00
Jonas Schnelli 648d6bee65
miner: rename UpdateRequestCount signal to ResetRequestCount 2019-03-06 09:02:50 +13:00
Jonas Schnelli f4055fe158
add CReserveScript to allow modular script keeping/returning
- use one CReserveScript per mining thread
2019-03-06 09:02:50 +13:00
Jonas Schnelli 38da0d16b1
fix GetScriptForMining() CReserveKey::keepKey() issue 2019-03-06 09:02:50 +13:00
Jonas Schnelli b2993bc5d4
detach wallet from miner 2019-03-06 09:02:50 +13:00
Homu 92cd76fcba Auto merge of #3859 - LarryRuane:3708-patched-explorer, r=mdr0id
Simplify DisconnectBlock arguments/return value

DisconnectBlock currently has a complicated interface:

  Situation       Return value
                  pfClean != nullptr   pfClean == nullptr

  All good:       true                 true
  Failure:        false                false
  Unclean rewind: true                 false
                  with *pfClean=false

Change this to return a tristate enum instead. As an added bonus,
remove the ValidationState& argument which was unused.
2019-02-26 10:50:59 -08:00
Pieter Wuille ec555a8e9b Simplify DisconnectBlock arguments/return value
DisconnectBlock currently has a complicated interface:

  Situation       Return value
                  pfClean != nullptr   pfClean == nullptr

  All good:       true                 true
  Failure:        false                false
  Unclean rewind: true                 false
                  with *pfClean=false

Change this to return a tristate enum instead. As an added bonus,
remove the ValidationState& argument which was unused.
2019-02-26 11:10:20 -07:00
Homu 52fbc1ce66 Auto merge of #3657 - Eirik0:3395-sapling-benchmarks, r=str4d
Update zcbenchmarks to include sapling data

Closes #3395

This PR adds a benchmark named `trydecryptsaplingnotes` which is intended to be similar to `trydecryptnotes`. It also adds a benchmark `incnotewitnessessapling` which is similar to `incnotewitnesses`.

As a side note, while looking for examples to follow I ran in to a fair amount of setup, which I wanted to be able to reuse, repeated across several tests. I pulled some of that logic in to a utility functions and refactored the existing tests using that setup.
2019-02-26 09:05:35 -08:00
Homu ff07644b21 Auto merge of #3819 - ioptio:rm-source-docs, r=Eirik0
redirect and update source docs

also, update Zcash logo source.

User guide related documentation in the `/doc` folder should really live in RTDs. I've left policy and process related docs as is for now.

This **should not** be merged until https://gitlab.com/zcash-docs/zcash-docs/merge_requests/90 is for associated redirect links to work.
2019-02-25 13:31:45 -08:00
Homu 48b7dea5a8 Auto merge of #3639 - leto:size_on_disk, r=bitcartel
Port getblockchaininfo.size_on_disk from BTC master

Closes #3630.
2019-02-25 10:08:44 -08:00
Homu 1ad0b3482b Auto merge of #3850 - Eirik0:update-author-aliases, r=Eirik0
Add missing author aliases

This adds some missing author aliases to release-notes.py.
2019-02-21 09:56:13 -08:00
Eirik Ogilvie-Wigley 3620d5709d Add missing author aliases 2019-02-20 12:52:41 -07:00
Homu e45154f559 Auto merge of #3817 - Eirik0:3646-better-error-msgs, r=mdr0id
Improve some error messages when building a transaction fails

Follow up from #3646
2019-02-19 10:09:43 -08:00
Homu 87171d35b1 Auto merge of #3843 - str4d:sapling-bench-runner, r=mdr0id
Add Sapling benchmarks to benchmark runner

Follow-up to #3611. Once this is merged, we can add the Sapling benchmarks to CI.
2019-02-18 15:12:54 -08:00
Jack Grigg ecde950bac
Add Sapling benchmarks to benchmark runner 2019-02-16 18:44:16 +00:00
Homu 6a20252282 Auto merge of #3809 - defuse:dependency-updates, r=str4d
Dependency Updates

This updates:

- Boost from 1.66.0 to 1.69.0
- OpenSSL From 1.1.0h to 1.1.1a
- Proton from 0.17.0 to 0.26.0
- Rust from 1.28.0 to 1.32.0
2019-02-14 17:30:04 -08:00
Homu 647c155dc7 Auto merge of #3833 - mdr0id:release-v2.0.3, r=mdr0id
Release v2.0.3
2019-02-11 10:34:20 -08:00
mdr0id f4fe8542c7 make-release.py: Updated release notes and changelog for 2.0.3. 2019-02-11 09:16:09 -08:00
mdr0id b22a364a2a make-release.py: Updated manpages for 2.0.3. 2019-02-11 09:16:09 -08:00
mdr0id 81fbf49883 make-release.py: Versioning changes for 2.0.3. 2019-02-11 09:05:39 -08:00
mdr0id fe0507761a Update nMinimumChainWork with information from the getblockchaininfo RPC 2019-02-11 09:04:13 -08:00
Taylor Hornby 78c916eb2e Patch Proton for a minimal build. #3786 2019-02-06 13:18:53 -07:00
Homu d26ec8ca71 Auto merge of #3826 - mdr0id:release-v2.0.3-rc1, r=mdr0id
Release v2.0.3 rc1
2019-02-04 18:03:05 -08:00
mdr0id 722b147425 make-release.py: Updated release notes and changelog for 2.0.3-rc1. 2019-02-04 12:05:43 -08:00
mdr0id 9e6228c5b0 make-release.py: Updated manpages for 2.0.3-rc1. 2019-02-04 12:05:43 -08:00
mdr0id 626874390a make-release.py: Versioning changes for 2.0.3-rc1. 2019-02-04 11:51:52 -08:00
Taylor Hornby f3d99770b5 Update Proton from 0.17.0 to 0.26.0. #3816, #3786 2019-01-30 14:16:50 -07:00
Taylor Hornby 0a4cafa6df Update Rust from v1.28.0 to v1.32.0. #3786 2019-01-30 14:16:42 -07:00
Taylor Hornby 221ca965eb Update boost from v1.66.0 to v1.69.0. #3786 2019-01-30 14:16:34 -07:00
Taylor Hornby b41b316758 Update OpenSSL from 1.1.0h to 1.1.1a. #3786 2019-01-30 14:16:25 -07:00
Paige Peterson 70ebc0942a redirect and update source documentation 2019-01-30 16:00:21 +00:00
Eirik Ogilvie-Wigley caa1203307 Improve some error messages when building a transaction fails 2019-01-30 04:12:15 -07:00
Eirik Ogilvie-Wigley 8a1d19307b Renaming and other minor cleanup 2019-01-29 21:18:10 -07:00
Eirik Ogilvie-Wigley 3e5cc59c2e Change to t->z transaction and create separate benchmark for sapling 2019-01-23 15:04:48 -07:00
Eirik Ogilvie-Wigley 275bd8f67a Add a method for generating a test CKey 2019-01-23 15:04:45 -07:00
Eirik Ogilvie-Wigley 010481c7e5 FakeCoinsViewDB can inherit directly from CCoinsView 2019-01-23 14:45:37 -07:00
Eirik Ogilvie-Wigley a6a17c45b8 benchmarks do not require updating network parameters 2019-01-23 14:45:37 -07:00
Eirik Ogilvie-Wigley b27ac486e4 Prevent header from being included multiple times 2019-01-23 14:45:37 -07:00
Eirik Ogilvie-Wigley edac39b8fd Include Sapling transactions in increment note witness benchmark 2019-01-23 14:45:37 -07:00
Eirik Ogilvie-Wigley 1534671fb0 Add test method for generating master Sapling extended spending keys 2019-01-23 14:45:37 -07:00