DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity
11,954 Commits 7 Branches 3 Tags
4dcc48b8cb63d0a88bde9d32abeaf1cc6fe366d1
Commit Graph

636 Commits

Author SHA1 Message Date
Simon
4dcc48b8cb For #3546. Improve estimated tx size for Sapling outputs. 2018-10-05 11:16:20 -07:00
Homu
625797a037 Auto merge of #3518 - str4d:3216-z_shieldcoinbase, r=str4d 
Add Sapling support to z_shieldcoinbase

Part of #3216.
 2018-10-05 03:33:16 -07:00
Homu
967bbbc486 Auto merge of #3561 - bitcartel:3560_update_sapling_note_data, r=bitcartel 
Closes #3560. Update Sapling note data correctly when importing a key.
 2018-10-04 15:37:34 -07:00
Homu
4ba35551d4 Auto merge of #3510 - arcalinea:3378_z_listunspent, r=bitcartel 
Sapling support for z_listunspent

Closes #3378.
 2018-10-04 11:39:14 -07:00
Larry Ruane
27a6a99cb0 fix z_listunspent includeWatchonly logic 2018-10-04 12:26:36 -06:00
Homu
325ba00336 Auto merge of #3542 - Eirik0:3511-update-address-mapping, r=bitcartel 
Add newly discovered sapling addresses to the wallet when decrypting

Closes #3511
 2018-10-03 21:49:32 -07:00
Simon
f0dcfceb81 Closes #3560. Update Sapling note data correctly when importing a key. 2018-10-03 15:40:50 -07:00
Jack Grigg
5f91a95641 Add Sapling support to z_shieldcoinbase 
Part of #3216.
 2018-10-03 12:16:18 +01:00
Eirik Ogilvie-Wigley
a4ecd0fa72 Add newly discovered sapling addresses to the wallet 2018-10-01 09:34:25 -06:00
Simon
5f57babd08 Cleanup to address review comments. 2018-09-28 22:11:05 -07:00
Simon
c0f7e4059d Fix rebasing of CWallet::GetNullifiersForAddresses 2018-09-28 22:08:07 -07:00
Jay Graber
27b3cce94f Modify GetNullifiersForAddresses for Sapling 2018-09-28 15:23:21 -07:00
Jay Graber
cd1c6e3767 Modify comments 2018-09-28 15:19:10 -07:00
Jay Graber
66795a408b z_listunspent sapling support - needs refactor 2018-09-28 15:19:05 -07:00
Jay Graber
06f2a8f9b6 s/jsoutindex/outindex for sapling outputs 2018-09-28 15:13:29 -07:00
Larry Ruane
e4f0d6a8de Sapling support for z_listreceivedbyaddress 2018-09-27 16:59:29 -06:00
Eirik Ogilvie-Wigley
83c4e360da Address need not be optional when adding sapling keys 2018-09-27 15:44:04 -06:00
Homu
fbbbb1cc82 Auto merge of #3537 - str4d:enable-sapling-features, r=bitcartel 
Enable Sapling features on mainnet

Reverts the last commit from #3458.
 2018-09-21 17:32:56 -07:00
Jack Grigg
34e222c18e Revert "Disable Sapling features on mainnet" 
This reverts commit 554e00e8f9.
 2018-09-21 23:43:31 +01:00
Simon
f1cb49ac86 For #3533. Replace asserts with JSON errors. 
This helps prevent users from triggering an assert if they pass in
Sapling addresses to RPC calls: z_mergetoaddress, z_importviewingkey
and z_exportviewingkey.
 2018-09-21 15:01:45 -07:00
Homu
25c3f903c1 Auto merge of #3491 - Eirik0:3218-sapling-import-export-wallet, r=str4d 
Add Sapling support to z_importwallet and z_exportwallet

Includes code adapted from upstream PR https://github.com/bitcoin/bitcoin/pull/8323

Closes #3218.
 2018-09-19 12:15:48 -07:00
Jack Grigg
bb4b6982e3 Generate an ovk to encrypt outCiphertext for t-addr senders 
Closes #3506.
 2018-09-19 00:51:30 +01:00
Jack Grigg
bd3c860cb4 Use ovk directly in the TransactionBuilder API instead of fvk 2018-09-18 23:26:31 +01:00
Eirik Ogilvie-Wigley
b37dc4e22f Don't export empty zip32 metadata 2018-09-14 18:36:24 -06:00
Eirik Ogilvie-Wigley
2fe39561ec Export zip32 metadata with sapling keys 2018-09-14 17:27:20 -06:00
Eirik Ogilvie-Wigley
ae807af413 Export comment on HDSeed and fingerprint with wallet 2018-09-14 17:26:02 -06:00
Jonas Schnelli
002753ae64 [Wallet] ensure CKeyMetadata.hdMasterKeyID will be cleared during SetNull() 
Zcash: modified for zip32
 2018-09-14 17:17:24 -06:00
Jonas Schnelli
82e71233b0 [Wallet] print hd masterkeyid in getwalletinfo 
Zcash: modified for zip32
 2018-09-14 16:59:56 -06:00
Jonas Schnelli
b6d1af89f2 [Wallet] extend CKeyMetadata with HD keypath 
Zcash: modified for zip32
 2018-09-14 16:59:51 -06:00
Eirik Ogilvie-Wigley
9bcf90e2de Add sapling support to z_importwallet 2018-09-14 16:16:03 -06:00
Eirik Ogilvie-Wigley
0f03de5536 Return more information when adding a spending key 2018-09-14 16:00:47 -06:00
Eirik Ogilvie-Wigley
fcab001b1e Move AddSpendingKeyToWallet 2018-09-14 15:44:03 -06:00
Eirik Ogilvie-Wigley
a0783bb957 Rename AddZKey to include sprout 2018-09-14 15:07:15 -06:00
Eirik Ogilvie-Wigley
5e360fb29f Add sapling spending keys to z_exportwallet 2018-09-14 15:07:15 -06:00
Eirik Ogilvie-Wigley
d6b31d59b5 Rename map to include sprout 2018-09-14 15:07:15 -06:00
Homu
0e0f5e4ea7 Auto merge of #3496 - bitcartel:3442_sapling_note_locking, r=str4d 
Add Sapling note locking to the CWallet class

Closes #3442.
 2018-09-12 09:07:14 -07:00
Jack Grigg
94549326c9 Bugfix: Use time instead of block height for Sapling key metadata 2018-09-11 12:45:25 +01:00
Simon
761f8c8bb8 Add unit test SaplingNoteLocking 2018-09-04 14:56:08 -07:00
Simon
b1c693e532 Add methods to store SaplingOutPoint in setLockedSaplingNotes 2018-09-04 14:56:08 -07:00
Simon
0f62cacf0c Refactor: rename ListLockedNotes -> ListLockedSproutNotes 2018-09-04 14:56:08 -07:00
Simon
9ae73247e2 Refactor: rename UnlockAllNotes -> UnlockAllSproutNotes 2018-09-04 14:56:08 -07:00
Simon
d358d145ca Refactor: rename setLockedNotes -> setLockedSproutNotes 2018-09-04 14:55:58 -07:00
Jack Grigg
b33a7ec46e wallet: Don't allow an HDSeed to be overwritten 
We can maybe relax this restriction later once we have worked out the UX
implications.
 2018-09-03 10:45:37 +01:00
Jack Grigg
b7f9a7ae02 wallet: Comment out HDSeed and CHDChain persistence to disk 
Sapling keys generated from the seed are not yet persisted, so we don't
want to persist the seed or chain state either, otherwise the wallet
could end up in an inconsistent state.

Some tests are temporarily disabled because commenting out HDSeed
persistence breaks invariants inside CCryptoKeyStore.

Revert this commit during the PR for #3388.
 2018-09-03 10:45:37 +01:00
Jack Grigg
70b4ad2dcd wallet: Switch from SaplingSpendingKey to SaplingExtendedSpendingKey 
The wallet now only stores Sapling extended spending keys, and thus can
only be used with keys generated from an HDSeed via ZIP 32.

Note that not all Sapling keys in the wallet will correspond to the
wallet's HDSeed, as a standalone Sapling xsk can be imported via
z_importkey. However, it must have been generated from a seed itself,
and thus is more likely to be backed up elsewhere.
 2018-09-03 10:45:37 +01:00
Jack Grigg
a4ac4fc3f4 wallet: Store Sapling key metadata indexed by ivk 
Closes #3426.
 2018-09-03 10:45:37 +01:00
Jack Grigg
e2416930ea wallet: Store HDSeed and chain data 2018-09-03 10:45:37 +01:00
Jack Grigg
ec653523ad Store HDSeed in CCryptoKeyStore 2018-09-03 10:45:33 +01:00
Jack Grigg
7c02acc5b6 Minor cleanups 2018-09-03 01:28:31 +01:00
Jack Grigg
1ec06e93b1 Rename z_inputs_ to z_sprout_inputs_ 2018-09-03 01:13:18 +01:00