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
Larry Ruane
c0aa34a4b2
generalize mininode.py protocol versioning
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
Eirik Ogilvie-Wigley
7d379f18c5
Rename test objects to include sprout or sapling
6 years ago
Eirik Ogilvie-Wigley
8ea8ef9850
Rename Witnesses to include sprout or sapling
6 years ago
Eirik Ogilvie-Wigley
4fc309f0f5
Rename Merkle Trees to include sprout or sapling
6 years ago
Jack Grigg
4fab49e173
test: Another assert in wallet_zkeys_tests.store_and_load_sapling_zkeys
6 years ago
Jack Grigg
d75e69da5a
test: Deduplicate logic in wallet_addresses RPC test
6 years ago
Homu
d84f14ec4a
Auto merge of #3417 - str4d:sapling-tx-builder, r=ebfull
TransactionBuilder for Sapling and transparent transactions
This PR includes zcash/librustzcash#24 , and will create a testnet chain split once merged into master (and once a Sapling transaction is mined).
6 years ago
Sean Bowe
a310f6c5fa
Relocate ECC_Start() to avoid test failures.
6 years ago
Jack Grigg
fbd029d99d
Formatting
6 years ago
Homu
ece49a49a5
Auto merge of #3430 - ebfull:check-valuebalance, r=ebfull
Ensure sum of valueBalance and all vpub_new's does not exceed MAX_MONEY
HT to @daira for noticing that we don't check this in `CheckTransactionWithoutProofVerification`. We actually do check it in `GetShieldedValueIn` (by throwing an exception) but these exceptions are not handled by `CheckTxInputs`, which may cause a remote DoS.
Not exploitable assuming our proving system is secure, but definitely worthy of a fix.
6 years ago
Sean Bowe
3d75e8b3e7
Move `extern params` to beginning of `test_checktransaction`.
6 years ago
Sean Bowe
291895fac7
Ensure sum of valueBalance and all vpub_new's does not exceed MAX_MONEY inside of CheckTransactionWithoutProofVerification.
6 years ago
Sean Bowe
04ed758e37
Fix bug in return value.
6 years ago
Sean Bowe
b7b088c46b
Update librustzcash and sapling-crypto.
6 years ago
Homu
a11e6aaacc
Auto merge of #3336 - arcalinea:expiryheight-createrawtransaction, r=bitcartel
Take expiryheight as param to createrawtransaction
Addresses #3333
6 years ago
Simon
f01c11bd0f
Add tests for expiryheight parameter of RPC createrawtransaction.
6 years ago
Jack Grigg
3f4ad5967b
Fix block hash for checkpoint at height 270000
6 years ago
Jack Grigg
eec85c4388
Add Sapling support to z_getnewaddress and z_listaddresses
6 years ago
Jack Grigg
281b51e567
Raise the 90-character limit on Bech32 encodings
Regtest addresses are 91 characters, and ZIP 32's Bech32 encoding will
be significantly longer.
6 years ago
Jack Grigg
4715b31c76
Implement CKeyStore::GetSaplingPaymentAddresses()
6 years ago
Jack Grigg
54a868cf0a
Rename xsk to expsk
xsk will be used for ZIP 32 extended spending keys, so renaming here to
reduce confusion.
6 years ago
Jack Grigg
a8dd4b0cf1
TransactionBuilder: Make fee configurable
6 years ago
Jack Grigg
45c0d1ec84
TransactionBuilder: Add change output to transaction
6 years ago
Homu
6b9c962725
Auto merge of #3410 - LarryRuane:3399-peer-ban, r=bitcartel
don't ban peers when loading pre-overwinter blocks
Addresses #3399 . If we see an invalid transaction (from our peers who are up to date, post-overwinter) during initial block download, don't invoke DoS (logging messages, blocking these peers). Instead, simply ignore the transaction.
6 years ago