DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity
20,630 Commits 7 Branches 3 Tags
5f63373eb96780294c82380309093a3ea080dc07
Commit Graph

1306 Commits

Author SHA1 Message Date
miketout
5f63373eb9 Selectively reject Sapling transactions while synced below activation height. Add separate control of staking. 2018-10-08 21:15:21 -07:00
miketout
c2dc091e40 Merge branch 'master' of https://github.com/zcash/zcash into dev 2018-10-08 17:19:15 -07:00
miketout
8682e17a7d Sapling support for z_shieldcoinbase and more 2018-10-08 16:17:24 -07:00
miketout
ca4a5f2692 Change name to Stake Guard 2018-10-07 19:56:02 -07:00
miketout
68b9a352da Change behavior of ExtractDestination, Solver, and GetscriptAddress for crypto conditions 2018-10-06 00:36:21 -07:00
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
miketout
3bfa5e2264 Latest Zcash updates and more CC for N@S 2018-10-05 00:26:06 -07:00
miketout
7a9960f086 Comment debugging printf's - tracked down to Zcash raw tx bug, which means we should sync 2018-10-04 17:13:42 -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
miketout
2ed3bbec38 Debugging 2018-10-03 22:04:39 -07: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
miketout
0a962eb958 remove sign from time lock check 2018-10-03 19:59:48 -07:00
miketout
905fe35e50 More work on CoinbaseGuard and validation 2018-10-03 16:26:41 -07:00
Simon
f0dcfceb81 Closes #3560. Update Sapling note data correctly when importing a key. 2018-10-03 15:40:50 -07:00
miketout
86e31e3dfc Cleanup staking and fee consistency for stake tx 2018-10-03 10:31:01 -07:00
miketout
b3e3f61826 Enable extended data on stakes and general cleanup 2018-10-03 09:26:40 -07:00
Jack Grigg
5f91a95641 Add Sapling support to z_shieldcoinbase 
Part of #3216.
 2018-10-03 12:16:18 +01:00
miketout
06f4116090 VerusStakeTransaction 2018-10-03 00:58:00 -07:00
miketout
8a727a26a7 Beginning of N@S solution using CoinbaseGuard CC 2018-10-02 19:49:54 -07: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
miketout
c68ca1a225 Leverage nonce for overwhelming chance of single deterministic winner for chain power in POS 2018-09-28 14:35:38 -07:00
miketout
4b729ec577 Changes for most chain power rule 2018-09-28 01:38:14 -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
miketout
644c7445ec Latest Zcash updates 2018-09-20 13:32:57 -07:00
miketout
b8deecdc09 Sapling transaction testing 2018-09-20 03:08:36 -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
miketout
9feb4b9e08 Major updates integration from all upstreams 2018-09-18 14:33:53 -07: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