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

11599 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Homu
13b41a6760 Auto merge of #3156 - Eirik0:2935-change-indicator, r=bitcartel 
Add change indicator

This adds to the json returned when calling z_listreceivedbyaddress and z_listuspent an additional field entitiled 'change' which will be either true or false depending on whether or not the note was change from another transaction.
 2018-07-17 11:41:03 -07:00
Homu
ea0bd9d3b8 Auto merge of #3345 - str4d:sapling-z_validateaddress, r=bitcartel 
Add Sapling support to z_validateaddress

Part of #3217.
 2018-07-16 15:04:54 -07:00
Eirik Ogilvie-Wigley
62d707d1fd Fix test broken by change indicator 2018-07-16 14:50:06 -06:00
Eirik Ogilvie-Wigley
0646f749f9 Add change indicator for notes 2018-07-16 14:49:29 -06:00
Homu
b7d058cef3 Auto merge of #3334 - arielgabizon:add_groth_tests, r=bitcartel 
Extend JoinSplit tests to Groth

As we now have both PGHR and Groth proofs for Sprout - make the joinsplit tests check the Groth proofs as well.
See https://github.com/zcash/zcash/issues/3266
 2018-07-16 12:11:12 -07:00
Ariel Gabizon
589479fd33 Extend Joinsplit tests to Groth 2018-07-13 13:01:34 +02:00
Homu
eea0e2c924 Auto merge of #3390 - arcalinea:3319_discard_sk_if_invalid_ivk, r=str4d 
Discard sk if ivk == 0

Addresses #3319
 2018-07-13 03:16:21 -07:00
Jay Graber
db9f669c15 Discard sk if ivk == 0 2018-07-12 15:05:19 -07:00
Homu
f55bcd1c10 Auto merge of #3374 - rex4539:fix-typos, r=str4d 
Fix typos
 2018-07-12 14:25:15 -07:00
Jack Grigg
26948eb24b Update payment-api.md with type field of z_validateaddress 2018-07-12 22:14:14 +01:00
Homu
d86f60f382 Auto merge of #3324 - ebfull:sapling-note-encryption, r=ebfull 
Sapling note encryption implementation

Closes #3055

Implemented along with @gtank and @Eirik0

DH key exchange was implemented in https://github.com/zcash/librustzcash/pull/18
 2018-07-11 14:51:57 -07:00
Sean Bowe
7478876271 Minor edits 2018-07-11 15:48:41 -06:00
Jack Grigg
bea879157c Add Sapling support to z_validateaddress 2018-07-09 15:38:07 +01:00
Homu
579ad3b13e Auto merge of #3273 - arcalinea:sapling_keys, r=str4d 
Sapling keys in keystore, wallet

-  Add/Have/Get SaplingSpendingKey
- Add/Remove/Have/Get SaplingFullViewingKey
- Have/Get SaplingIncomingViewingKey

- SaplingSpendingKeyMap, SaplingFullViewingKeyMap, SaplingIncomingViewingKeyMap

- GenerateNewSaplingZKey()

Not included: note decryptors, crypted keystore
 2018-07-06 15:18:39 -07:00
Homu
16b617aca6 Auto merge of #3370 - LarryRuane:2984-libsnark-debug-logging, r=str4d 
Disable libsnark debug logging in Boost tests

Initialize `src/snark/libsnark/common/profiling.cpp: inhibit_profiling_info` to false.
 2018-07-06 09:28:44 -07:00
Dimitris Apostolou
ccf9106501 Fix typos 2018-07-06 14:33:24 +03:00
Jay Graber
2173767365 Add crypted keystore sapling add key 2018-07-05 15:00:00 -07:00
Jay Graber
8e91ebf76c Change default_address to return SaplingPaymentAddr and not boost::optional 2018-07-05 14:52:51 -07:00
Jay Graber
f82a864dc1 Add StoreAndRetrieveSaplingSpendingKey test 2018-07-05 14:52:51 -07:00
Jay Graber
f4207d0c0e Add SaplingIncomingViewingKeys map, SaplingFullViewingKey methods 2018-07-05 14:52:46 -07:00
Jay Graber
efb7662d4a Add Sapling Add/Have/Get to keystore 2018-07-05 14:37:33 -07:00
Larry Ruane
c872c1d2df Disable libsnark debug logging in Boost tests 2018-07-05 10:16:13 -06:00
Homu
cea065e3d4 Auto merge of #3360 - RichardLitt:feat/license, r=str4d 
docs(LICENSE): update license year to 2018

Part of #2887.
 2018-07-03 13:54:24 -07:00
Homu
bbee5e2525 Auto merge of #3363 - bitcartel:release-v1.1.2, r=str4d 
Release v1.1.2
 2018-07-02 02:19:08 -07:00
Simon
720b8ac8ad make-release.py: Updated release notes and changelog for 1.1.2. 2018-07-01 20:12:33 -07:00
Simon
7163f00303 make-release.py: Updated manpages for 1.1.2. 2018-07-01 20:12:33 -07:00
Simon
8fc73722e8 make-release.py: Versioning changes for 1.1.2. 2018-07-01 20:07:24 -07:00
Richard Littauer
5ffb24613f docs(LICENSE): update license year to 2018 
Should be the right thing to do, but I am not a lawyer, so I do not know.
 2018-06-26 10:06:23 -04:00
Homu
0f091f228c Auto merge of #3356 - bitcartel:release-v1.1.2-rc1, r=bitcartel 
Release v1.1.2 rc1
 2018-06-22 21:53:15 -07:00
Simon
3ef8f7abb3 make-release.py: Updated release notes and changelog for 1.1.2-rc1. 2018-06-22 17:03:41 -07:00
Simon
5121fad00c make-release.py: Updated manpages for 1.1.2-rc1. 2018-06-22 17:03:41 -07:00
Simon
5cbbb7e375 make-release.py: Versioning changes for 1.1.2-rc1. 2018-06-22 16:55:20 -07:00
Homu
f649bb36c5 Auto merge of #3303 - LarryRuane:2807-rpc-test-round-fees, r=bitcartel 
(rpc-test) accurately account for fee without rounding error

Fix for #2807, this test compares balances after doing key exports and imports, and expects these balances to be equal. But they are not exactly equal due to transaction fees, so the test makes them "equal" by rounding a value that has had fees taken out up to the nearest hundredth of a unit (which is much more than the default fee). This obviously is somewhat sloppy. It also converts a balance to float, which really should never be used due to loss of precision (use Decimal instead).

This change makes the test accurately account for the fee using precise comparisons, and removes the use of float. This test doesn't depend on the default fee (0.0001) but instead sets the fee (to that value). This way, if the default fee changes in the future, this test will continue to run. While testing these changes, I set the fee to various values (up to the max, 0.0190), and the test still passes.
 2018-06-22 14:01:48 -07:00
Simon
a4ff089b2a Fix pyflakes error in test zkey_import_export. 2018-06-22 11:34:21 -07:00
Homu
d5dcfa2b01 Auto merge of #3346 - bitcartel:3328_alert_non_overwinter_nodes, r=str4d 
Closes #3328. Send alert to put non-Overwinter nodes into safe mode.

The alert targets nodes running protocol version <= 170004.
Overwinter compatible nodes run protocol version >= 170005.
 2018-06-22 09:40:01 -07:00
Simon
e56117f894 Closes #3328. Send alert to put non-Overwinter nodes into safe mode. 
The alert targets nodes running protocol version <= 170004.
Overwinter compatible nodes run protocol version >= 170005.
 2018-06-22 09:07:12 -07:00
Homu
f587e61bda Auto merge of #3259 - leto:signmessage, r=str4d 
Clarify help that signmessage only works on taddrs
 2018-06-22 02:19:12 -07:00
Homu
f24d1ff546 Auto merge of #3337 - str4d:getblock-finalsaplingroot, r=bitcartel 
Add hashFinalSaplingRoot to getblockheader and getblock output
 2018-06-19 16:19:13 -07:00
Homu
9acfa0067f Auto merge of #3258 - Eirik0:3056-anchor-test-cases, r=str4d 
Add tests for sapling anchors

Closes #3253
 2018-06-19 09:28:20 -07:00
Eirik Ogilvie-Wigley
762ee0e896 Rename typename 2018-06-19 10:07:00 -06:00
Eirik Ogilvie-Wigley
115b26cb27 Add BOOST_TEST_CONTEXT to distinguish sprout v. sapling 2018-06-19 10:06:21 -06:00
Homu
2ebde5860e Auto merge of #3326 - str4d:3058-sapling-addresses, r=str4d 
Sapling address encodings

This PR enables Sapling keys and addresses to be passed in anywhere Sprout keys
and addresses are used. Doing so will cause crashes until those places are updated
with Sapling support.

Includes code cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#11167
  - Only the `ConvertBits()` function.
- bitcoin/bitcoin#11630

Closes #3058.
 2018-06-19 05:12:50 -07:00
Homu
4e3ff06507 Auto merge of #3320 - str4d:macos-tests, r=bitcartel 
Fix MacOS tests

Includes code cherry-picked from upstream PR bitcoin/bitcoin#8270.
 2018-06-18 19:00:56 -07:00
Sean Bowe
4e1f2daa0d Add get_esk() function to Sapling note encryption. 2018-06-18 13:14:43 -06:00
Jack Grigg
3af4633b4b Add hashFinalSaplingRoot to getblockheader and getblock output 2018-06-15 13:59:28 +12:00
Sean Bowe
c03e22612d Prevent nonce reuse in Sapling note encryption API. 2018-06-14 12:21:28 -06:00
Sean Bowe
90073aeca5 Swap types in OutputDescription to use new NoteEncryption interfaces. 2018-06-14 12:08:37 -06:00
Sean Bowe
9e1c2c4049 Implementation of Sapling in-band secret distribution. 2018-06-14 11:58:45 -06:00
Sean Bowe
9e8e121c9f Update librustzcash 2018-06-13 15:18:23 -06:00
Homu
3e38e248d5 Auto merge of #3332 - arcalinea:sapling_wallet_classes, r=bitcartel 
Add test vectors for sapling key components

Test vectors generated by python implementation here: https://github.com/zcash-hackworks/zcash-test-vectors/pull/4

Not testing note components in this PR
 2018-06-13 10:43:47 -07:00