Homu [Fri, 17 Aug 2018 21:42:52 +0000 (14:42 -0700)]
Auto merge of #3422 - bitcartel:3061_track_notes_based_on_3062, r=str4d
Track Sapling notes and nullifiers in the wallet (in-memory only, no persistence to disk)
Part of #3061. Add in-memory tracking of Sapling notes and nullifiers to the wallet.
Jack Grigg [Fri, 17 Aug 2018 20:39:16 +0000 (21:39 +0100)]
test: Fix comment in WalletTests.FindMySaplingNotes
Homu [Thu, 16 Aug 2018 08:26:25 +0000 (01:26 -0700)]
Auto merge of #3472 - bitcartel:release-v2.0.0, r=ebfull
Release v2.0.0
Simon [Thu, 16 Aug 2018 00:57:50 +0000 (17:57 -0700)]
make-release.py: Updated release notes and changelog for 2.0.0.
Simon [Thu, 16 Aug 2018 00:57:50 +0000 (17:57 -0700)]
make-release.py: Updated manpages for 2.0.0.
Simon [Thu, 16 Aug 2018 00:51:39 +0000 (17:51 -0700)]
make-release.py: Versioning changes for 2.0.0.
Homu [Wed, 15 Aug 2018 22:47:08 +0000 (15:47 -0700)]
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.
Sean Bowe [Wed, 15 Aug 2018 14:21:45 +0000 (08:21 -0600)]
Sapling mainnet activation height
Homu [Wed, 15 Aug 2018 00:18:47 +0000 (17:18 -0700)]
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`](https://github.com/zcash/zcash/commit/
3577de83aa126fec4db8bb022dbeecf9a77a3af8) 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.
Sean Bowe [Tue, 14 Aug 2018 21:17:30 +0000 (15:17 -0600)]
Always write the empty root down as the best root, since we may roll back.
Homu [Tue, 14 Aug 2018 15:52:46 +0000 (08:52 -0700)]
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.
Jack Grigg [Mon, 13 Aug 2018 13:18:18 +0000 (14:18 +0100)]
Disable Sapling features on mainnet
Also places them behind an experimental features flag on testnet
Jack Grigg [Mon, 13 Aug 2018 13:17:17 +0000 (14:17 +0100)]
test: Use regtest in key_tests/zs_address_test
Jack Grigg [Mon, 13 Aug 2018 12:20:07 +0000 (13:20 +0100)]
test: gtest for Sapling encoding and decoding
Homu [Thu, 9 Aug 2018 18:44:52 +0000 (11:44 -0700)]
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?
Sean Bowe [Thu, 9 Aug 2018 16:56:56 +0000 (16:56 +0000)]
make-release.py: Updated release notes and changelog for 2.0.0-rc1.
Sean Bowe [Thu, 9 Aug 2018 16:56:56 +0000 (16:56 +0000)]
make-release.py: Updated manpages for 2.0.0-rc1.
Sean Bowe [Thu, 9 Aug 2018 16:46:45 +0000 (16:46 +0000)]
make-release.py: Versioning changes for 2.0.0-rc1.
Homu [Wed, 8 Aug 2018 20:47:40 +0000 (13:47 -0700)]
Auto merge of #3438 - Eirik0:3424-change-field-improvement, r=bitcartel
Only include the change field if we have a spending key
Closes #3424
Simon [Wed, 8 Aug 2018 18:33:18 +0000 (11:33 -0700)]
Fix comment in CWallet::SyncMetaData.
Simon [Wed, 8 Aug 2018 18:04:35 +0000 (11:04 -0700)]
Clean up wallet unit tests: replace .value() with .get() for clarity.
This is to avoid confusion with note.value().
Simon [Wed, 8 Aug 2018 17:55:35 +0000 (10:55 -0700)]
Update wallet unit tests to revert upgraded network parameters.
Simon [Wed, 8 Aug 2018 04:06:03 +0000 (21:06 -0700)]
Add new wallet test: MarkAffectedSaplingTransactionsDirty
Also rename MarkAffectedTransactionsDirty to MarkAffectedSproutTransactionsDirty.
Simon [Wed, 8 Aug 2018 02:07:46 +0000 (19:07 -0700)]
Add new wallet test: GetConflictedSaplingNotes
Simon [Tue, 7 Aug 2018 22:38:23 +0000 (15:38 -0700)]
Add new wallet test: SetSaplingNoteAddrsInCWalletTx.
Simon [Tue, 7 Aug 2018 17:55:40 +0000 (10:55 -0700)]
Update CWallet::GetConflicts for Sapling.
Simon [Tue, 7 Aug 2018 17:18:21 +0000 (10:18 -0700)]
Fix typo in parameter name.
Simon [Tue, 7 Aug 2018 16:59:23 +0000 (09:59 -0700)]
Fix inaccurate comments in test.
Simon [Tue, 7 Aug 2018 16:57:24 +0000 (09:57 -0700)]
Fix typo in variable name in test.
Simon [Tue, 7 Aug 2018 16:54:49 +0000 (09:54 -0700)]
Rename wallet tests for clarity between Sprout and Sapling.
Simon [Tue, 7 Aug 2018 03:11:03 +0000 (20:11 -0700)]
Add new wallet tests: SpentSaplingNoteIsFromMe.
Simon [Sat, 4 Aug 2018 05:10:57 +0000 (22:10 -0700)]
Add new wallet test: UpdatedSaplingNoteData.
Simon [Fri, 3 Aug 2018 18:31:59 +0000 (11:31 -0700)]
Add new wallet test: NavigateFromSaplingNullifierToNote
Checks caching of Sapling nullifier and mapping to its SaplingOutPoint.
Simon [Fri, 3 Aug 2018 06:56:31 +0000 (23:56 -0700)]
Add two new wallet tests: FindMySaplingNotes, SaplingNullifierIsSpent.
Simon [Fri, 3 Aug 2018 06:21:55 +0000 (23:21 -0700)]
Fix code review nits.
Simon [Fri, 3 Aug 2018 06:12:25 +0000 (23:12 -0700)]
Refactor IsSpent(nullifier) for Sprout and Sapling domain separation.
We need separate functions for checking Sprout and Sapling nullifiers,
because they are in separate domains and aren't guaranteed to be
collision-resistant (otherwise there is a possibility of a nullifier
collision, however remote, between Sprout and Sapling causing the spend
of one to prevent the spend of the other).
Simon [Fri, 3 Aug 2018 05:30:30 +0000 (22:30 -0700)]
Iterate over mapSaplingFullViewingKeys with ivk->fvk mapping (1:1).
When diversified addresses are supported, iterating over
mapSaplingIncomingViewingKeys will be inefficient as the mapping will
be addresses->ivk (n:1).
Simon [Fri, 3 Aug 2018 02:13:24 +0000 (19:13 -0700)]
Add test for CWalletTx::SetSaplingNoteData()
Simon [Fri, 3 Aug 2018 02:00:03 +0000 (19:00 -0700)]
Clean up names of unit tests in gtest/test_wallet.cpp.
Simon [Fri, 3 Aug 2018 01:21:28 +0000 (18:21 -0700)]
Update CWallet::IsSpent() to check Sapling nullifiers.
Simon [Wed, 1 Aug 2018 22:28:27 +0000 (15:28 -0700)]
Add caching and updating of Sapling note nullifier.
Simon [Wed, 1 Aug 2018 03:15:00 +0000 (20:15 -0700)]
Update CWalletTx::GetAmounts() to return COutputEntry for Sapling valueBalance.
Simon [Wed, 1 Aug 2018 03:11:39 +0000 (20:11 -0700)]
Cleanup CWalletTx::GetAmounts() for clarity. No-op.
Simon [Tue, 31 Jul 2018 21:42:20 +0000 (14:42 -0700)]
Remove dead code in CWalletTx::GetAmounts() as filed in issue #3434.
Simon [Tue, 31 Jul 2018 00:09:13 +0000 (17:09 -0700)]
Create CWallet::IsSaplingNullifierFromMe()
Simon [Mon, 30 Jul 2018 22:35:34 +0000 (15:35 -0700)]
Rename IsFromMe(nullifier) to IsSproutNullifierFromMe(nullifier).
Simon [Sat, 28 Jul 2018 17:09:42 +0000 (10:09 -0700)]
Create CWallet::FindMySaplingNotes()
Simon [Wed, 1 Aug 2018 21:02:32 +0000 (14:02 -0700)]
Update test to pass in required cm to SaplingNotePlaintext::decrypt().
Sean Bowe [Mon, 30 Jul 2018 20:37:12 +0000 (14:37 -0600)]
Check commitment validity within the decryption API for Sapling note plaintexts.
Simon [Sat, 28 Jul 2018 17:06:55 +0000 (10:06 -0700)]
Create CWallet::AddToSaplingSpends() to track Sapling nullifiers.
Simon [Sat, 28 Jul 2018 17:04:54 +0000 (10:04 -0700)]
Update CWallet::UpdatedNoteData() for Sapling.
Simon [Sat, 28 Jul 2018 17:02:48 +0000 (10:02 -0700)]
Update CWallet::MarkAffectedTransactionsDirty() for Sapling.
Simon [Sat, 28 Jul 2018 07:04:09 +0000 (00:04 -0700)]
Add ivk member variable and equality comparators to SaplingNoteData class.
Simon [Fri, 27 Jul 2018 23:56:57 +0000 (16:56 -0700)]
Rename mapTxNullifiers to mapTxSproutNullifiers.
Simon [Fri, 27 Jul 2018 23:56:26 +0000 (16:56 -0700)]
Rename CWallet::AddToSpends methods for clarity.
Simon [Thu, 26 Jul 2018 03:08:36 +0000 (20:08 -0700)]
Rename mapNullifiersToNotes to mapSproutNullifiersToNotes.
Simon [Thu, 26 Jul 2018 03:03:59 +0000 (20:03 -0700)]
Rename GetNoteNullifier to GetSproutNoteNullifier.
Simon [Thu, 26 Jul 2018 00:12:03 +0000 (17:12 -0700)]
Rename FindMyNotes to FindMySproutNotes.
Homu [Wed, 8 Aug 2018 12:28:08 +0000 (05:28 -0700)]
Auto merge of #3443 - daira:testnet-rollback, r=str4d
Support testnet rollback.
Part of #1302. Closes #2905.
Jack Grigg [Wed, 8 Aug 2018 11:08:29 +0000 (12:08 +0100)]
Move RewindBlockIndex log message inside rewindLength check
Homu [Tue, 7 Aug 2018 18:20:10 +0000 (11:20 -0700)]
Auto merge of #3448 - ebfull:sapling-params, r=bitcartel
Switch to use the official Sapling parameters
Eirik Ogilvie-Wigley [Wed, 1 Aug 2018 20:46:09 +0000 (14:46 -0600)]
Fix assertion and comment
Eirik Ogilvie-Wigley [Wed, 1 Aug 2018 20:16:04 +0000 (14:16 -0600)]
Only include the change field if we have a spending key
Homu [Sun, 5 Aug 2018 12:26:10 +0000 (05:26 -0700)]
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.
Jack Grigg [Sat, 4 Aug 2018 16:45:21 +0000 (17:45 +0100)]
Adjust Makefile so that common can be used by the wallet
Jack Grigg [Fri, 3 Aug 2018 14:57:45 +0000 (15:57 +0100)]
Upgrade Rust to 1.28.0 stable
Jack Grigg [Wed, 1 Aug 2018 14:01:16 +0000 (15:01 +0100)]
chainparams: Add BIP 44 coin type (as registered in SLIP 44)
Jonas Schnelli [Fri, 7 Jul 2017 14:03:24 +0000 (16:03 +0200)]
Fix test_bitcoin circular dependency issue
Cory Fields [Thu, 26 Mar 2015 23:15:28 +0000 (19:15 -0400)]
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.
Sean Bowe [Sat, 4 Aug 2018 22:28:39 +0000 (16:28 -0600)]
Switch to use the official Sapling parameters.
Homu [Fri, 3 Aug 2018 16:48:22 +0000 (09:48 -0700)]
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
Homu [Fri, 3 Aug 2018 14:52:09 +0000 (07:52 -0700)]
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.**
Jack Grigg [Fri, 3 Aug 2018 09:10:26 +0000 (10:10 +0100)]
Rename *SpendingKey -> *SproutSpendingKey
Also GetPaymentAddresses -> GetSproutPaymentAddresses
Jack Grigg [Fri, 3 Aug 2018 01:25:51 +0000 (02:25 +0100)]
Formatting nits
Jack Grigg [Fri, 3 Aug 2018 01:16:42 +0000 (02:16 +0100)]
Rename *ViewingKey* -> *SproutViewingKey*
Jack Grigg [Fri, 3 Aug 2018 00:57:40 +0000 (01:57 +0100)]
Rename Serialized*Size -> SerializedSprout*Size
Jack Grigg [Fri, 3 Aug 2018 00:47:30 +0000 (01:47 +0100)]
Rename SpendingKeyMap -> SproutSpendingKeyMap
Jack Grigg [Thu, 2 Aug 2018 21:34:31 +0000 (22:34 +0100)]
Pass SaplingPaymentAddress to store through the CKeyStore
Jack Grigg [Wed, 1 Aug 2018 22:22:32 +0000 (23:22 +0100)]
Add CWallet::AddCryptedSaplingSpendingKey() hook
To be filled in when we implement Sapling persistence to disk.
Jack Grigg [Wed, 1 Aug 2018 15:05:33 +0000 (16:05 +0100)]
Remove outdated comment
Jack Grigg [Wed, 1 Aug 2018 15:05:22 +0000 (16:05 +0100)]
Check for unencrypted Sapling keys in CCryptoKeyStore::SetCrypted()
Jack Grigg [Wed, 1 Aug 2018 14:58:32 +0000 (15:58 +0100)]
Add Sapling decryption check to CCryptoKeyStore::Unlock()
Jack Grigg [Wed, 1 Aug 2018 14:53:23 +0000 (15:53 +0100)]
Rename CryptedSpendingKeyMap -> CryptedSproutSpendingKeyMap
Jack Grigg [Wed, 1 Aug 2018 14:47:33 +0000 (15:47 +0100)]
Rename DecryptSpendingKey -> DecryptSproutSpendingKey
Jay Graber [Tue, 17 Jul 2018 20:52:04 +0000 (13:52 -0700)]
Add Sapling keys to CCryptoKeyStore::EncryptKeys
Jay Graber [Thu, 12 Jul 2018 21:57:53 +0000 (14:57 -0700)]
Add Sapling have/get sk crypter overrides
Daira Hopwood [Tue, 31 Jul 2018 21:29:14 +0000 (22:29 +0100)]
Support testnet rollback.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Sean Bowe [Thu, 2 Aug 2018 18:18:13 +0000 (12:18 -0600)]
Check the hash of the (Sapling+) zk-SNARK parameters during initialization.
Homu [Thu, 2 Aug 2018 03:48:17 +0000 (20:48 -0700)]
Auto merge of #3340 - Eirik0:rename-merkle-typedefs, r=str4d
Rename merkle tree typedefs to include Sprout
This is to be consistent with the naming convention we have been using to distinguish Sprout/Sapling.
Homu [Thu, 2 Aug 2018 00:23:14 +0000 (17:23 -0700)]
Auto merge of #3439 - ebfull:fix-ecc, r=ebfull
Don't call ECC_Start/ECC_Stop outside the test harness.
Sean Bowe [Wed, 1 Aug 2018 22:53:27 +0000 (16:53 -0600)]
Make changes to gtest ECC behavior suggested by @str4d.
Sean Bowe [Wed, 1 Aug 2018 22:45:12 +0000 (16:45 -0600)]
Don't call ECC_Start/ECC_Stop outside the test harness.
Homu [Wed, 1 Aug 2018 20:55:34 +0000 (13:55 -0700)]
Auto merge of #3246 - str4d:checkpoint-304600, r=bitcartel
Add some more checkpoints, up to the 1.1.0 release
Homu [Wed, 1 Aug 2018 19:01:39 +0000 (12:01 -0700)]
Auto merge of #3429 - str4d:3217-sapling-address-creation, r=str4d
Add Sapling support to z_getnewaddress and z_listaddresses
Closes #3217.
Jack Grigg [Wed, 1 Aug 2018 18:59:57 +0000 (19:59 +0100)]
test: Update rpc_wallet_z_importexport to account for Sapling changes
Jack Grigg [Wed, 1 Aug 2018 18:56:01 +0000 (19:56 +0100)]
test: Fix permissions of wallet_addresses
Eirik Ogilvie-Wigley [Wed, 1 Aug 2018 16:52:58 +0000 (10:52 -0600)]
Rename test objects to include sprout or sapling
Eirik Ogilvie-Wigley [Wed, 1 Aug 2018 16:41:36 +0000 (10:41 -0600)]
Rename Witnesses to include sprout or sapling
Eirik Ogilvie-Wigley [Wed, 1 Aug 2018 16:31:09 +0000 (10:31 -0600)]
Rename Merkle Trees to include sprout or sapling
Jack Grigg [Wed, 1 Aug 2018 08:46:32 +0000 (09:46 +0100)]
test: Another assert in wallet_zkeys_tests.store_and_load_sapling_zkeys
This page took 0.067731 seconds and 4 git commands to generate.