847df81f09
Auto merge of #3308 - ioptio:CoC-volunteer, r=daira
include note about volunteers in CoC
6 years ago
3e45258e7c
Update code_of_conduct.md
Wording tweak and line wrapping.
6 years ago
de1bc2d389
Auto merge of #3321 - bitcartel:remove_librustcash_xor, r=str4d
Remove now redundant Rust call to librustzcash_xor.
Related to https://github.com/zcash/librustzcash/pull/17 which removes librustzcash_xor from library.
6 years ago
10a7d55a03
Remove now redundant Rust call to librustzcash_xor.
6 years ago
80338c07e5
Auto merge of #3237 - str4d:std-array, r=str4d
Replace boost::array with std::array
6 years ago
4fb3d05ce9
Whitespace cleanup
6 years ago
ffba08b0e0
Auto merge of #3318 - Eirik0:3298-fix-getnetworksolps-params, r=bitcartel
Fix parsing parameters in getnetworksolps
This fixes https://github.com/zcash/zcash/issues/3298 . The parameters were not correctly being converted.
6 years ago
d18212b1d6
Auto merge of #3299 - Eirik0:3248-update-getblocktemplate, r=str4d
Add hashFinalSaplingRoot to getblocktemplate
Closes #3248
6 years ago
b4874e9b09
Auto merge of #3269 - arcalinea:sapling_wallet_classes, r=ebfull
Add Sapling key classes to wallet
Leverages new librustzcash APIs added in https://github.com/zcash/librustzcash/pull/9
6 years ago
c61ed9acfb
Fix parsing parameters in getnetworksolps
6 years ago
87c9994cb2
Make diversifier functions return option
6 years ago
0da9aac63e
s/SaplingInViewingKey/SaplingIncomingViewingKey
6 years ago
25c13ef702
Add hashFinalSaplingRoot to getblocktemplate
6 years ago
dd099401a3
Fix default_address()
6 years ago
521a6f1fc0
Minimal sapling key test
6 years ago
52d81ff794
Update librustzcash dependency, address comments
6 years ago
84e3a2212f
Change librustzcash dependency hash to work for new Sapling classes
6 years ago
11acfe6e9f
Add Sapling key classes to wallet, with new librustzcash APIs
6 years ago
53edd2b22c
include note about volunteers in CoC
6 years ago
73fea25404
Auto merge of #3300 - bitcartel:3277_add_comment_deprecated_txdb_prefixes, r=str4d
Part of #3277 . Add comment about deprecated txdb prefixes.
6 years ago
a6bbb26e08
Replace boost::array with std::array
6 years ago
047b0bf94a
Auto merge of #3305 - str4d:release-v1.1.1, r=str4d
Release v1.1.1
6 years ago
c290f8f263
Update release height to block 332000.
6 years ago
d670db7164
Sapling testnet activation height
6 years ago
10faedf758
make-release.py: Updated release notes and changelog for 1.1.1.
6 years ago
4ddd873d61
make-release.py: Updated manpages for 1.1.1.
6 years ago
40c33db2f4
make-release.py: Versioning changes for 1.1.1.
6 years ago
d5e82d73ac
Auto merge of #3287 - str4d:sapling-release-notes, r=str4d
Add Sapling details to release notes
6 years ago
088353ab02
Auto merge of #3302 - bitcartel:3301_fix_mac_compile_error, r=str4d
Closes #3301 . Non-void function should not have empty definition.
6 years ago
47db75426f
Closes #3301 . Non-void function should not have empty definition.
6 years ago
f9840089db
Part of #3277 . Add comment about deprecated txdb prefixes.
6 years ago
bae5adf0a4
Auto merge of #3289 - bitcartel:release-v1.1.1-rc2, r=bitcartel
Release v1.1.1 rc2
6 years ago
5d0172d762
make-release.py: Updated release notes and changelog for 1.1.1-rc2.
6 years ago
57ef6fba29
make-release.py: Updated manpages for 1.1.1-rc2.
6 years ago
d3ff27c0a6
make-release.py: Versioning changes for 1.1.1-rc2.
6 years ago
9c55d0b40e
Auto merge of #3286 - str4d:3153-gitian-fix, r=str4d
Comment out Gitian library handling while we don't build any libraries
Fixes a Gitian build failure introduced by #3153 .
6 years ago
bb838a0847
Add Sapling details to release notes
6 years ago
6d7ed43a73
Comment out Gitian library handling while we don't build any libraries
Fixes a Gitian build failure introduced by #3153 .
6 years ago
bbf01c67aa
Auto merge of #3279 - str4d:release-v1.1.1-rc1, r=str4d
Release v1.1.1-rc1
6 years ago
d03ae3e520
make-release.py: Updated release notes and changelog for 1.1.1-rc1.
6 years ago
062afe397b
make-release.py: Updated manpages for 1.1.1-rc1.
6 years ago
8bf890abac
make-release.py: Versioning changes for 1.1.1-rc1.
6 years ago
f5802f2c16
Auto merge of #3275 - ebfull:little-endian, r=str4d
Circuit change for endianness
This PR changes the circuit, encodings and parameters to match the encodings specified in the protocol spec. You'll want to `rm ~/.zcash-params/*.params` and run `./zcutil/fetch-params.sh --testnet` to switch to the new parameters for testnet.
6 years ago
3577de83aa
Change txdb prefixes for sapling and avoid writing unnecessary information.
6 years ago
8f5429a13a
Update merkle tree and pedersen hash tests to account for new encoding
6 years ago
45f1cb440e
Update Sapling testnet parameters
6 years ago
b9a5a116cd
Update librustzcash
6 years ago
386a9b35c0
Auto merge of #3238 - str4d:3199-mempool-sapling-activation, r=str4d
Update mempool_nu_activation RPC test to exercise both Overwinter and Sapling
Closes #3199 .
6 years ago
f62fff80d5
Auto merge of #3255 - str4d:sapling-value-pool, r=ebfull
Track net value entering and exiting the Sapling circuit
6 years ago
1063dfdeaa
Auto merge of #3271 - ebfull:stable-rust, r=bitcartel
Switch Rust to 1.26 Stable
6 years ago
Homu