Commit Graph

11760 Commits

Author SHA1 Message Date
Jack Grigg
8fa09c244a Metrics UI: Enable virtual terminal sequence processing on Windows
https://docs.microsoft.com/en-us/windows/console/console-virtual-terminal-sequences
2018-08-17 16:46:29 +01:00
Jack Grigg
c5b26acad8 Use boost::filesystem::path::string() instead of path::native()
This fixes a mingw32 conversion error during cross-compilation.
2018-08-17 16:46:18 +01:00
Jack Grigg
1dae6e9336 Pass correct compiler, linker, and flags into libsnark 2018-08-17 16:45:55 +01:00
Jack Grigg
f2d3715727 zcutil/build.sh: Remove --enable-werror from default configuration
Windows cross-compile has currently-unavoidable warnings. Upstream Bitcoin Core
has them as well. For now, let's remove this from the default configuration, and
add it to the Linux and OSX CI builders (so we effectively still enforce it for
merged PRs).
2018-08-17 16:45:32 +01:00
Jack Grigg
03ea5a8122 zcutil/build.sh: Use config.site to set default ./configure settings
This is a more reliable way to configure the depends path (matching what is done
upstream), and frees up --prefix for user configuration.
2018-08-17 16:45:28 +01:00
Jack Grigg
d10a762fb8 Clean up libzcash CPPFLAGS, CXXFLAGS, and LDFLAGS
By using the flags defined through ./configure instead, libzcash will react to
configuration and build system changes (such as PIC_FLAGS being empty for
Windows builds).
2018-08-17 16:44:05 +01:00
Jack Grigg
283ad96e85 Use -O1 for darwin and mingw32 release builds
In 46ad3c2758 we standardised our linux builds to
use -O1, but we didn't adjust the other targets.
2018-08-17 16:44:00 +01:00
Jack Grigg
ceca40d68f Measure Windows console size for metrics UI
Co-authored-by: David Mercer <radix42@gmail.com>
2018-08-17 16:43:43 +01:00
Jack Grigg
8d45f6e4e2 configure: Don't require RELRO and BIND_NOW when cross-compiling
mingw-w64's ld (at least mingw-w64 4.0.4-2) appears to not support -z
2018-08-17 16:43:20 +01:00
Jack Grigg
b057754005 zcutil/build.sh: Use $HOST to specify the depends prefix 2018-08-17 16:43:06 +01:00
Jack Grigg
3d308c2232 depends: Fix BDB naming issue when cross-compiling
Co-authored-by: David Mercer <radix42@gmail.com>
2018-08-17 16:42:35 +01:00
Jack Grigg
f77650a6ac depends: Configure librustzcash for cross-compiling 2018-08-17 16:41:51 +01:00
Jack Grigg
b57e4484ef depends: Correctly configure Rust when cross-compiling 2018-08-17 16:41:40 +01:00
Homu
d960b75de0 Auto merge of #3472 - bitcartel:release-v2.0.0, r=ebfull
Release v2.0.0
2018-08-16 01:26:25 -07:00
Simon
2f4735b3af make-release.py: Updated release notes and changelog for 2.0.0. 2018-08-15 17:57:50 -07:00
Simon
84b13aee88 make-release.py: Updated manpages for 2.0.0. 2018-08-15 17:57:50 -07:00
Simon
94f7201424 make-release.py: Versioning changes for 2.0.0. 2018-08-15 17:51:39 -07:00
Homu
4f82febcf1 Auto merge of #3469 - ebfull:sapling-mainnet-activation, r=bitcartel
Set Sapling mainnet activation height

In mainnet, block #419200 is expected to appear on October 28, 2018, Zcash's birthday.

In testnet, block #280000 is expected about a week from now. (Current height is ~275249, plus 4032 blocks for a week, plus a little more just to make the number nice.)

These are the activation heights for Sapling in mainnet and testnet, respectively. Protocol version is also changed.
2018-08-15 15:47:08 -07:00
Sean Bowe
955b328ad1 Sapling mainnet activation height 2018-08-15 12:09:31 -06:00
Homu
e868f8247f Auto merge of #3463 - ebfull:revert-empty-root, r=ebfull
Always write the empty root down as the best root, since we may roll back

In [`3577de83`](3577de83aa) we started not writing the Sapling empty root down as the "best" anchor because we had changed the encodings and didn't want users who compiled from master to have inconsistent coindb's in the future if the encoding changed again for some reason.

However, if we don't write the empty root down then during rollbacks to Sapling activation we leave the best anchor on disk different from what's in the cache, which will trigger an assertion.

This reverts the change from `3577de83` since we've settled on the encodings.
2018-08-14 17:18:47 -07:00
Sean Bowe
f791ce00eb Always write the empty root down as the best root, since we may roll back. 2018-08-14 15:17:30 -06:00
Homu
b004f254d5 Auto merge of #3458 - str4d:temp-sapling-disable, r=ebfull
Disable Sapling features on mainnet

Also places them behind an experimental features flag on testnet.
2018-08-14 08:52:46 -07:00
Jack Grigg
554e00e8f9 Disable Sapling features on mainnet
Also places them behind an experimental features flag on testnet
2018-08-13 14:18:18 +01:00
Jack Grigg
dfcf33fe15 test: Use regtest in key_tests/zs_address_test 2018-08-13 14:17:17 +01:00
Jack Grigg
e7ca4eb3c3 test: gtest for Sapling encoding and decoding 2018-08-13 13:20:07 +01:00
Homu
d54bf1dbda Auto merge of #3453 - ebfull:release-v2.0.0-rc1, r=bitcartel
Release v2.0.0 rc1

Doesn't contain "Notable changes" section in release notes, is that okay for an RC?
2018-08-09 11:44:52 -07:00
Sean Bowe
c2f661109d make-release.py: Updated release notes and changelog for 2.0.0-rc1. 2018-08-09 16:56:56 +00:00
Sean Bowe
27f678b974 make-release.py: Updated manpages for 2.0.0-rc1. 2018-08-09 16:56:56 +00:00
Sean Bowe
3e9aec2a37 make-release.py: Versioning changes for 2.0.0-rc1. 2018-08-09 16:46:45 +00:00
Homu
75286ba19b Auto merge of #3438 - Eirik0:3424-change-field-improvement, r=bitcartel
Only include the change field if we have a spending key

Closes #3424
2018-08-08 13:47:40 -07:00
Homu
40f320e0ee Auto merge of #3443 - daira:testnet-rollback, r=str4d
Support testnet rollback.

Part of #1302. Closes #2905.
2018-08-08 05:28:08 -07:00
Jack Grigg
13751895c7 Move RewindBlockIndex log message inside rewindLength check 2018-08-08 12:08:29 +01:00
Homu
0c5733fc22 Auto merge of #3448 - ebfull:sapling-params, r=bitcartel
Switch to use the official Sapling parameters
2018-08-07 11:20:10 -07:00
Eirik Ogilvie-Wigley
4e1e91512d Fix assertion and comment 2018-08-06 09:58:40 -06:00
Eirik Ogilvie-Wigley
7929851626 Only include the change field if we have a spending key 2018-08-06 09:58:40 -06:00
Homu
8df048b1de Auto merge of #3447 - str4d:zip32-prep, r=str4d
ZIP 32 preparations

Includes Makefile changes cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#7689
- bitcoin/bitcoin#10849

Part of #3380.
2018-08-05 05:26:10 -07:00
Jack Grigg
d0372cff5e Adjust Makefile so that common can be used by the wallet 2018-08-05 10:41:06 +01:00
Jack Grigg
e188723823 Upgrade Rust to 1.28.0 stable 2018-08-05 10:41:06 +01:00
Jack Grigg
0ecdd0f30a chainparams: Add BIP 44 coin type (as registered in SLIP 44) 2018-08-05 10:41:06 +01:00
Jonas Schnelli
4922d1c19a Fix test_bitcoin circular dependency issue 2018-08-05 10:41:06 +01:00
Cory Fields
6a753e4f9c crypter: shuffle Makefile so that crypto can be used by the wallet
Wallet must come before crypto, otherwise linking fails on some platforms.

Includes a tangentially-related general cleanup rather than making the Makefile
sloppier.
2018-08-05 10:41:07 +01:00
Sean Bowe
198dfd3c36 Switch to use the official Sapling parameters. 2018-08-04 16:28:39 -06:00
Homu
aa32786576 Auto merge of #3396 - arcalinea:3389_sapling_crypter, r=str4d
Update CCryptoKeyStore with Sapling support

Sapling crypter overrides for various `CCryptoKeyStore` functions such as:
- `HaveSaplingSpendingKey()`
- `GetSaplingSpendingKey()`

Also includes some changes to prepare for diversified addresses and ZIP 32.

Closes #3389
2018-08-03 09:48:22 -07:00
Homu
4b27d2efcd Auto merge of #3441 - ebfull:check-param-hash, r=str4d
Check the hash of the zk-SNARK parameters during initialization

**Please also review https://github.com/zcash/librustzcash/pull/28.**
2018-08-03 07:52:09 -07:00
Jack Grigg
25d5e80cbe Rename *SpendingKey -> *SproutSpendingKey
Also GetPaymentAddresses -> GetSproutPaymentAddresses
2018-08-03 10:10:26 +01:00
Jack Grigg
f84cf5f817 Formatting nits 2018-08-03 02:25:51 +01:00
Jack Grigg
4c77517772 Rename *ViewingKey* -> *SproutViewingKey* 2018-08-03 02:23:38 +01:00
Jack Grigg
74f5b010df Rename Serialized*Size -> SerializedSprout*Size 2018-08-03 01:57:40 +01:00
Jack Grigg
93fcf892d4 Rename SpendingKeyMap -> SproutSpendingKeyMap 2018-08-03 01:47:30 +01:00
Jack Grigg
5175a7f07b Pass SaplingPaymentAddress to store through the CKeyStore 2018-08-03 01:01:45 +01:00