DragonX/hush3
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
11,729 Commits 1 Branch 1 Tag
da85cdfe27f81eb0acdcf9c27d3a434b013fbafc
Commit Graph

11729 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Za Wilcox
da85cdfe27 Revise help output for z_sendmany 
The previous version of the usage message for z_sendmany used the word "Change"
in an ambiguous way.

The intent was to describe "Change" the noun that indicates the portion of a
transaction's funds that are returned to the payer, however the context did not
provide an immediate cue to differentiate from the verb form meaning
"to alter".  Indeed, in other help strings in the same file that meaning of the
word is correct, i.e. the verb form is used.  Moreover a typo in the form of a
missing "a" later in the same sentence exacerbated the problem, by decreasing
readability precisely where context could reduce confusion.
 2018-08-08 12:57:27 -06: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
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
Jack Grigg
bc6344b350 Add CWallet::AddCryptedSaplingSpendingKey() hook 
To be filled in when we implement Sapling persistence to disk.
 2018-08-03 00:23:08 +01:00
Jack Grigg
9c9258c4f8 Remove outdated comment 2018-08-03 00:23:08 +01:00
Jack Grigg
4a89221ffc Check for unencrypted Sapling keys in CCryptoKeyStore::SetCrypted() 2018-08-03 00:23:08 +01:00
Jack Grigg
0adba6789b Add Sapling decryption check to CCryptoKeyStore::Unlock() 2018-08-03 00:23:08 +01:00
Jack Grigg
e8a949c153 Rename CryptedSpendingKeyMap -> CryptedSproutSpendingKeyMap 2018-08-03 00:23:08 +01:00
Jack Grigg
adf2eadba2 Rename DecryptSpendingKey -> DecryptSproutSpendingKey 2018-08-03 00:23:08 +01:00
Jay Graber
85beb9c9ca Add Sapling keys to CCryptoKeyStore::EncryptKeys 2018-08-03 00:23:08 +01:00
Jay Graber
55f2889396 Add Sapling have/get sk crypter overrides 2018-08-03 00:23:08 +01:00
Daira Hopwood
66856b2b3c Support testnet rollback. 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2018-08-02 23:10:30 +01:00
Sean Bowe
d9ef8f622e Check the hash of the (Sapling+) zk-SNARK parameters during initialization. 2018-08-02 12:18:13 -06:00
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.
 2018-08-01 20:48:17 -07:00
Homu
16117c0d5a Auto merge of #3439 - ebfull:fix-ecc, r=ebfull 
Don't call ECC_Start/ECC_Stop outside the test harness.
 2018-08-01 17:23:14 -07:00
Sean Bowe
80bd573dc2 Make changes to gtest ECC behavior suggested by @str4d. 2018-08-01 16:53:27 -06:00
Sean Bowe
262d21bcbb Don't call ECC_Start/ECC_Stop outside the test harness. 2018-08-01 16:45:12 -06:00
Homu
0361f789fe Auto merge of #3246 - str4d:checkpoint-304600, r=bitcartel 
Add some more checkpoints, up to the 1.1.0 release
 2018-08-01 13:55:34 -07:00
Homu
066cc9c6c7 Auto merge of #3429 - str4d:3217-sapling-address-creation, r=str4d 
Add Sapling support to z_getnewaddress and z_listaddresses

Closes #3217.
 2018-08-01 12:01:39 -07:00
Jack Grigg
40dc060cb0 test: Update rpc_wallet_z_importexport to account for Sapling changes 2018-08-01 19:59:57 +01:00
Jack Grigg
4aabeebc1f test: Fix permissions of wallet_addresses 2018-08-01 19:56:01 +01:00
Eirik Ogilvie-Wigley
7d379f18c5 Rename test objects to include sprout or sapling 2018-08-01 10:52:58 -06:00
Eirik Ogilvie-Wigley
8ea8ef9850 Rename Witnesses to include sprout or sapling 2018-08-01 10:41:36 -06:00
Eirik Ogilvie-Wigley
4fc309f0f5 Rename Merkle Trees to include sprout or sapling 2018-08-01 10:31:09 -06:00
Jack Grigg
4fab49e173 test: Another assert in wallet_zkeys_tests.store_and_load_sapling_zkeys 2018-08-01 09:46:32 +01:00
Jack Grigg
d75e69da5a test: Deduplicate logic in wallet_addresses RPC test 2018-08-01 09:44:31 +01:00
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).
 2018-07-31 23:44:29 -07:00
Sean Bowe
a310f6c5fa Relocate ECC_Start() to avoid test failures. 2018-08-01 00:42:02 -06:00
Jack Grigg
fbd029d99d Formatting 2018-07-31 23:28:42 +01:00
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.
 2018-07-31 07:34:44 -07:00
Sean Bowe
3d75e8b3e7 Move extern params to beginning of test_checktransaction. 2018-07-31 08:33:33 -06:00
Sean Bowe
291895fac7 Ensure sum of valueBalance and all vpub_new's does not exceed MAX_MONEY inside of CheckTransactionWithoutProofVerification. 2018-07-30 22:35:31 -06:00
Sean Bowe
04ed758e37 Fix bug in return value. 2018-07-30 22:03:40 -06:00
Sean Bowe
b7b088c46b Update librustzcash and sapling-crypto. 2018-07-30 21:59:12 -06:00