Homu
847df81f09
Auto merge of #3308 - ioptio:CoC-volunteer, r=daira
...
include note about volunteers in CoC
2018-06-09 03:17:32 -07:00
Daira Hopwood
3e45258e7c
Update code_of_conduct.md
...
Wording tweak and line wrapping.
2018-06-09 11:16:43 +01:00
Homu
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.
2018-06-07 20:37:07 -07:00
Jack Grigg
341a22ad90
Skip ELF-only sec-hard checks on non-ELF binaries
2018-06-07 18:49:15 +12:00
Simon
10a7d55a03
Remove now redundant Rust call to librustzcash_xor.
2018-06-06 23:24:21 -07:00
Jack Grigg
2802e321c1
Fix cached_witnesses_empty_chain test failure on MacOS
...
Assertion error format is different, so match only on the assertion.
2018-06-07 17:49:05 +12:00
Jack Grigg
5e38c24c1d
Add Mach-O 64-bit detection to security-check.py
...
Fixes sec-hard test on MacOS CI worker. At some point we can extend this with
actual security hardening checks.
2018-06-07 17:49:01 +12:00
Jack Grigg
bec3e62bc1
Implement encoding and decoding of Sapling keys and addresses
2018-06-07 17:28:50 +12:00
Jack Grigg
c8511dfc07
Fix bech32::Encode() error handling
...
Previously, an input with invalid characters would result in out-of-bounds
reads, potentially exposing up to 224 bytes of memory following the location of
the CHARSET constant. This commit fixes the function to return an empty string,
which is what was originally documented as happening.
2018-06-07 17:19:44 +12:00
Pieter Wuille
6a2cc8ddc0
Simplify Base32 and Base64 conversions
2018-06-07 17:19:43 +12:00
Pieter Wuille
ac70f76c5d
Generalize ConvertBits
2018-06-07 17:19:34 +12:00
Jack Grigg
6b759fb092
ConvertBits() - convert from one power-of-2 number base to another.
...
Function extracted from upstream:
PR bitcoin/bitcoin#11167
Commit c091b99379b97cb314c9fa123beabdbc324cf7a4
2018-06-07 16:42:01 +12:00
Jack Grigg
7e45636707
chainparams: Add Sapling Bech32 HRPs
2018-06-07 16:41:59 +12:00
Homu
80338c07e5
Auto merge of #3237 - str4d:std-array, r=str4d
...
Replace boost::array with std::array
2018-06-06 19:36:57 -07:00
Jack Grigg
4fb3d05ce9
Whitespace cleanup
2018-06-07 14:35:56 +12:00
Homu
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.
2018-06-06 10:00:21 -07:00
Homu
d18212b1d6
Auto merge of #3299 - Eirik0:3248-update-getblocktemplate, r=str4d
...
Add hashFinalSaplingRoot to getblocktemplate
Closes #3248
2018-06-06 05:00:58 -07:00
Homu
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
2018-06-05 15:46:24 -07:00
Jack Grigg
c7e64754dc
Add MacOS support to no-dot-so test
2018-06-05 22:32:13 +12:00
Matthew King
12d3277171
Favour python over python2 as per PR #7723
2018-06-05 21:57:21 +12:00
Matthew King
d28d3d20de
Use portable #! in python scripts (/usr/bin/env)
2018-06-05 21:56:13 +12:00
Eirik Ogilvie-Wigley
c61ed9acfb
Fix parsing parameters in getnetworksolps
2018-06-04 16:45:12 -06:00
Jay Graber
87c9994cb2
Make diversifier functions return option
2018-06-04 07:47:46 -07:00
Jay Graber
0da9aac63e
s/SaplingInViewingKey/SaplingIncomingViewingKey
2018-06-04 04:59:07 -07:00
Eirik Ogilvie-Wigley
25c13ef702
Add hashFinalSaplingRoot to getblocktemplate
2018-06-01 15:47:30 -06:00
Jay Graber
dd099401a3
Fix default_address()
2018-06-01 04:03:27 -07:00
Jay Graber
521a6f1fc0
Minimal sapling key test
2018-06-01 02:32:17 -07:00
Jay Graber
52d81ff794
Update librustzcash dependency, address comments
2018-06-01 01:48:28 -07:00
Jay Graber
84e3a2212f
Change librustzcash dependency hash to work for new Sapling classes
2018-06-01 00:04:13 -07:00
Jay Graber
11acfe6e9f
Add Sapling key classes to wallet, with new librustzcash APIs
2018-06-01 00:04:13 -07:00
Paige Peterson
53edd2b22c
include note about volunteers in CoC
2018-05-30 07:10:25 -04:00
Homu
73fea25404
Auto merge of #3300 - bitcartel:3277_add_comment_deprecated_txdb_prefixes, r=str4d
...
Part of #3277 . Add comment about deprecated txdb prefixes.
2018-05-25 18:42:05 -07:00
Jack Grigg
a6bbb26e08
Replace boost::array with std::array
2018-05-26 00:12:57 +12:00
Homu
047b0bf94a
Auto merge of #3305 - str4d:release-v1.1.1, r=str4d
...
Release v1.1.1
2018-05-25 01:21:49 -07:00
Simon
c290f8f263
Update release height to block 332000.
2018-05-24 23:09:02 -07:00
Jack Grigg
d670db7164
Sapling testnet activation height
2018-05-25 16:05:25 +12:00
Jack Grigg
10faedf758
make-release.py: Updated release notes and changelog for 1.1.1.
2018-05-25 15:49:34 +12:00
Jack Grigg
4ddd873d61
make-release.py: Updated manpages for 1.1.1.
2018-05-25 15:49:33 +12:00
Jack Grigg
40c33db2f4
make-release.py: Versioning changes for 1.1.1.
2018-05-25 15:38:43 +12:00
Homu
d5e82d73ac
Auto merge of #3287 - str4d:sapling-release-notes, r=str4d
...
Add Sapling details to release notes
2018-05-24 18:50:50 -07:00
Homu
088353ab02
Auto merge of #3302 - bitcartel:3301_fix_mac_compile_error, r=str4d
...
Closes #3301 . Non-void function should not have empty definition.
2018-05-24 17:03:42 -07:00
Larry Ruane
fff031688e
(rpc-test) accurately account for fee without rounding error
2018-05-24 11:29:14 -04:00
Simon
47db75426f
Closes #3301 . Non-void function should not have empty definition.
2018-05-23 21:04:51 -07:00
Simon
f9840089db
Part of #3277 . Add comment about deprecated txdb prefixes.
2018-05-23 20:37:34 -07:00
Homu
bae5adf0a4
Auto merge of #3289 - bitcartel:release-v1.1.1-rc2, r=bitcartel
...
Release v1.1.1 rc2
2018-05-23 11:44:49 -07:00
Simon
5d0172d762
make-release.py: Updated release notes and changelog for 1.1.1-rc2.
2018-05-23 09:28:50 -07:00
Simon
57ef6fba29
make-release.py: Updated manpages for 1.1.1-rc2.
2018-05-23 09:28:49 -07:00
Simon
d3ff27c0a6
make-release.py: Versioning changes for 1.1.1-rc2.
2018-05-23 09:27:59 -07:00
Homu
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 .
2018-05-22 16:49:51 -07:00
Jack Grigg
bb838a0847
Add Sapling details to release notes
2018-05-23 11:27:13 +12:00