Commit Graph

1884 Commits

Author SHA1 Message Date
miketout
47ab0926c4 Auto-rescan wallets on reorg if note witnesses get out of sync 2018-10-12 18:05:32 -07:00
miketout
83a426bc91 Adjust cheat catcher height 2018-10-12 16:53:53 -07:00
Homu
527b7feef5 Auto merge of #3592 - Eirik0:z-sendmany-better-error, r=bitcartel
Better error message when sending to both sprout and sapling

When trying to send to both Sprout and Sapling (not currently supported with z_sendmany) we were getting the following error in our operation result: `general exception: boost::bad_get: failed value get using boost::get`.

This PR changes this to fail with a better error message before the async operation begins:
```
error code: -8
error message:
Cannot send to both Sprout and Sapling addresses using z_sendmany
```
2018-10-12 15:30:34 -07:00
miketout
085c3640bb Improve error reporting and wallet cleanup 2018-10-12 13:54:31 -07:00
Eirik Ogilvie-Wigley
0917c84d9a Better error message when sending to both sprout and sapling
Co-authored-by mdr0id <marshall@z.cash>
2018-10-12 14:12:21 -06:00
Simon
cd10562c73 Resolves Sapling nullifier persistence issue when importing a key.
During a rescan, a CWalletTx was persisted to disk before it had its
note data set.  This meant that upon restart, the CWalletTx would
potentially be missing its nullifiers causing the wallet's balance
to include notes which had already been spent.

The resolution is to ensure that after a rescan, a CWalletTx is
persisted after it has had its nullifiers set correctly.

Co-authored-by: Eirik Ogilvie-Wigley <eirik@z.cash>
2018-10-11 21:25:53 -07:00
miketout
271326fafd Clean up stake rebroadcasting and mempool checking 2018-10-11 19:52:32 -07:00
miketout
8b57c15f6a Zcash latest changes 2018-10-11 14:30:42 -07:00
Michael Toutonghi
df756d24ba Cheatcatcher 2018-10-10 19:02:09 -07:00
Eirik Ogilvie-Wigley
3f824a908b Fix HDSeed comment 2018-10-10 16:00:59 -06:00
miketout
85ca7bb9cb Debug comment cleanup 2018-10-09 00:04:45 -07:00
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
Eirik Ogilvie-Wigley
d6ad8cef2c GenerateNewSproutZKey can return a SproutPaymentAddress 2018-10-08 14:52:58 -06:00
Eirik Ogilvie-Wigley
92fc29a3f4 Rename GenerateNewZKey to include Sprout 2018-10-08 14:23:03 -06:00
Homu
c2bb0ec67f Auto merge of #3517 - mdr0id:3388_persist_wallet, r=str4d
Sapling support for persisting wallet to disk

Closes #3388. Closes #3061.
2018-10-08 09:53:34 -07:00
Mihailo Milenkovic
30743f7333 Add checks for correct input data 2018-10-08 17:45:53 +02:00
miketout
ca4a5f2692 Change name to Stake Guard 2018-10-07 19:56:02 -07:00
Jack Grigg
5513faccf6 Ignore decoding errors during -zapwallettxes
The undecoded wallet transaction is logged before proceeding, so later
recovery of metadata might be possible. But the fact that the user is
using -zapwallettxes is a clear indicator that they want
transactions removed from their wallet, so this is the priority.
2018-10-06 12:18:56 +01:00
miketout
68b9a352da Change behavior of ExtractDestination, Solver, and GetscriptAddress for crypto conditions 2018-10-06 00:36:21 -07:00
Jack Grigg
3e471410f1 Persist Sapling payment address to IVK map
This ensures we remember any diversified addresses manually generated
outside the wallet.
2018-10-06 00:45:39 +01:00
mdr0id
9ce6f8425b Add gtest coverage of Sapling wallet persistence 2018-10-06 00:01:22 +01:00
mdr0id
48a93fd2e0 Serialize Sapling data in CWalletTx
If 2.0.0 nodes upgrade to 2.0.1 after Sapling has activated, the v4 Sapling
transactions in their wallet will be treated as corrupt, and a rescan will be
triggered which will overwrite the old-format transactions with the new
Sapling-aware format.
2018-10-06 00:01:20 +01:00
mdr0id
2fcf06077f Persist Sapling key material in the wallet to disk 2018-10-06 00:01:14 +01:00
Jack Grigg
1b79de781c Store ExtFVK with encrypted Sapling spending key instead of FVK
This ensures that even when the wallet is encrypted, we can derive the default
Sapling payment address for our spending keys.
2018-10-05 23:13:32 +01:00
Simon
4dcc48b8cb For #3546. Improve estimated tx size for Sapling outputs. 2018-10-05 11:16:20 -07:00
mdr0id
87ae893d75 Revert "wallet: Comment out HDSeed and CHDChain persistence to disk"
This reverts commit b7f9a7ae02.
2018-10-05 17:46:43 +01: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
Alrighttt
05f99c1b93 Merge pull request #20 from jl777/FSM
merge latest jl777-FSM
2018-10-03 11:38:09 -04: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
blackjok3r
0367b1a685 < 2018-10-02 00:53:28 +08:00
Mihailo Milenkovic
78086bc3bf - fix 2018-10-01 18:52:21 +02:00
blackjok3r
478370fd6c numutxos < 2 instead of 0... cant merge 1 utxo 2018-10-02 00:52:12 +08:00
blackjok3r
f882623570 remove prints and fix utxo counter in wrong place 2018-10-02 00:42:14 +08:00
Mihailo Milenkovic
7f0ed443f1 -modified ChannelsExactAmount
-fixes
2018-10-01 18:27:07 +02:00