Marius Kjærstad
92ebe65724
Fix for license not being valid
This has to be included to not violate the license.
Ref: https://github.com/bitcoin/bitcoin/blob/master/COPYING
6 years ago
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.
6 years ago
Sean Bowe
f791ce00eb
Always write the empty root down as the best root, since we may roll back.
6 years ago
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.
6 years ago
Jack Grigg
554e00e8f9
Disable Sapling features on mainnet
Also places them behind an experimental features flag on testnet
6 years ago
Jack Grigg
dfcf33fe15
test: Use regtest in key_tests/zs_address_test
6 years ago
Jack Grigg
e7ca4eb3c3
test: gtest for Sapling encoding and decoding
6 years ago
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?
6 years ago
Sean Bowe
c2f661109d
make-release.py: Updated release notes and changelog for 2.0.0-rc1.
6 years ago
Sean Bowe
27f678b974
make-release.py: Updated manpages for 2.0.0-rc1.
6 years ago
Sean Bowe
3e9aec2a37
make-release.py: Versioning changes for 2.0.0-rc1.
6 years ago
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
6 years ago
Homu
40f320e0ee
Auto merge of #3443 - daira:testnet-rollback, r=str4d
Support testnet rollback.
Part of #1302 . Closes #2905 .
6 years ago
Jack Grigg
13751895c7
Move RewindBlockIndex log message inside rewindLength check
6 years ago
Homu
0c5733fc22
Auto merge of #3448 - ebfull:sapling-params, r=bitcartel
Switch to use the official Sapling parameters
6 years ago
Eirik Ogilvie-Wigley
4e1e91512d
Fix assertion and comment
6 years ago
Eirik Ogilvie-Wigley
7929851626
Only include the change field if we have a spending key
6 years ago
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 .
6 years ago
Jack Grigg
d0372cff5e
Adjust Makefile so that common can be used by the wallet
6 years ago
Jack Grigg
e188723823
Upgrade Rust to 1.28.0 stable
6 years ago
Jack Grigg
0ecdd0f30a
chainparams: Add BIP 44 coin type (as registered in SLIP 44)
6 years ago
Jonas Schnelli
4922d1c19a
Fix test_bitcoin circular dependency issue
7 years ago
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.
9 years ago
Sean Bowe
198dfd3c36
Switch to use the official Sapling parameters.
6 years ago
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
6 years ago
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 .**
6 years ago
Jack Grigg
25d5e80cbe
Rename *SpendingKey -> *SproutSpendingKey
Also GetPaymentAddresses -> GetSproutPaymentAddresses
6 years ago
Jack Grigg
f84cf5f817
Formatting nits
6 years ago
Jack Grigg
4c77517772
Rename *ViewingKey* -> *SproutViewingKey*
6 years ago
Jack Grigg
74f5b010df
Rename Serialized*Size -> SerializedSprout*Size
6 years ago
Jack Grigg
93fcf892d4
Rename SpendingKeyMap -> SproutSpendingKeyMap
6 years ago
Jack Grigg
5175a7f07b
Pass SaplingPaymentAddress to store through the CKeyStore
6 years ago
Jack Grigg
bc6344b350
Add CWallet::AddCryptedSaplingSpendingKey() hook
To be filled in when we implement Sapling persistence to disk.
6 years ago
Jack Grigg
9c9258c4f8
Remove outdated comment
6 years ago
Jack Grigg
4a89221ffc
Check for unencrypted Sapling keys in CCryptoKeyStore::SetCrypted()
6 years ago
Jack Grigg
0adba6789b
Add Sapling decryption check to CCryptoKeyStore::Unlock()
6 years ago
Jack Grigg
e8a949c153
Rename CryptedSpendingKeyMap -> CryptedSproutSpendingKeyMap
6 years ago
Jack Grigg
adf2eadba2
Rename DecryptSpendingKey -> DecryptSproutSpendingKey
6 years ago
Jay Graber
85beb9c9ca
Add Sapling keys to CCryptoKeyStore::EncryptKeys
6 years ago
Jay Graber
55f2889396
Add Sapling have/get sk crypter overrides
6 years ago
Daira Hopwood
66856b2b3c
Support testnet rollback.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
6 years ago
Sean Bowe
d9ef8f622e
Check the hash of the (Sapling+) zk-SNARK parameters during initialization.
6 years ago
Homu
871e1726c6
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.
6 years ago
Homu
16117c0d5a
Auto merge of #3439 - ebfull:fix-ecc, r=ebfull
Don't call ECC_Start/ECC_Stop outside the test harness.
6 years ago
Sean Bowe
80bd573dc2
Make changes to gtest ECC behavior suggested by @str4d .
6 years ago
Sean Bowe
262d21bcbb
Don't call ECC_Start/ECC_Stop outside the test harness.
6 years ago
Homu
0361f789fe
Auto merge of #3246 - str4d:checkpoint-304600, r=bitcartel
Add some more checkpoints, up to the 1.1.0 release
6 years ago
Homu
066cc9c6c7
Auto merge of #3429 - str4d:3217-sapling-address-creation, r=str4d
Add Sapling support to z_getnewaddress and z_listaddresses
Closes #3217 .
6 years ago
Jack Grigg
40dc060cb0
test: Update rpc_wallet_z_importexport to account for Sapling changes
6 years ago
Jack Grigg
4aabeebc1f
test: Fix permissions of wallet_addresses
6 years ago