Commit Graph
32164 Commits
Author SHA1 Message Date
Homu 20f87bc226 Auto merge of #3422 - bitcartel:3061_track_notes_based_on_3062, r=str4d
Track Sapling notes and nullifiers in the wallet (in-memory only, no persistence to disk)

Part of #3061.  Add in-memory tracking of Sapling notes and nullifiers to the wallet.
2018-08-17 14:42:52 -07:00
Jack Grigg c9339bb61f test: Fix comment in WalletTests.FindMySaplingNotes 2018-08-17 21:39:16 +01:00
Jack Grigg bce692390f configure: Don't add -ldl to RUST_LIBS for mingw32 2018-08-17 18:54:04 +01:00
David Mercer 8a16251eda libsnark: convert 0ul to UINT64_C(0) 2018-08-17 18:54:04 +01:00
David MercerandDaira Hopwood 32d3a3352e libsnark: convert long long and unsigned long to C++11 fixed-width types
Co-authored-by: Daira Hopwood <daira@jacaranda.org>
2018-08-17 18:53:59 +01:00
jl777 8009c43953 Merge branch 'jl777' into FSM 2018-08-17 05:29:28 -11:00
jl777 2703f76b3e Merge pull request #814 from libscott/fixCrash1OSX
Fix crash1 osx
2018-08-17 05:28:43 -11:00
Scott Sadler 0af81154e3 fix crash #1 on osx 2018-08-17 13:24:32 -03:00
Jack Grigg 7d65dcf4d9 depends: Pass correct compiler, linker, and flags into googletest 2018-08-17 16:47:03 +01:00
Jack Grigg 2456eb80ae Metrics UI: Tell Windows users how to stop zcashd
Ctrl+C is not configured for Windows, as it does not work (yet):
https://github.com/Microsoft/vscode/issues/9347
https://github.com/Microsoft/console/issues/57
2018-08-17 16:46:41 +01:00
Jack Grigg 8fa09c244a Metrics UI: Enable virtual terminal sequence processing on Windows
https://docs.microsoft.com/en-us/windows/console/console-virtual-terminal-sequences
2018-08-17 16:46:29 +01:00
Jack Grigg c5b26acad8 Use boost::filesystem::path::string() instead of path::native()
This fixes a mingw32 conversion error during cross-compilation.
2018-08-17 16:46:18 +01:00
Jack Grigg 1dae6e9336 Pass correct compiler, linker, and flags into libsnark 2018-08-17 16:45:55 +01:00
Jack Grigg f2d3715727 zcutil/build.sh: Remove --enable-werror from default configuration
Windows cross-compile has currently-unavoidable warnings. Upstream Bitcoin Core
has them as well. For now, let's remove this from the default configuration, and
add it to the Linux and OSX CI builders (so we effectively still enforce it for
merged PRs).
2018-08-17 16:45:32 +01:00
Jack Grigg 03ea5a8122 zcutil/build.sh: Use config.site to set default ./configure settings
This is a more reliable way to configure the depends path (matching what is done
upstream), and frees up --prefix for user configuration.
2018-08-17 16:45:28 +01:00
Jack Grigg d10a762fb8 Clean up libzcash CPPFLAGS, CXXFLAGS, and LDFLAGS
By using the flags defined through ./configure instead, libzcash will react to
configuration and build system changes (such as PIC_FLAGS being empty for
Windows builds).
2018-08-17 16:44:05 +01:00
Jack Grigg 283ad96e85 Use -O1 for darwin and mingw32 release builds
In 46ad3c2758 we standardised our linux builds to
use -O1, but we didn't adjust the other targets.
2018-08-17 16:44:00 +01:00
Jack GriggandDavid Mercer ceca40d68f Measure Windows console size for metrics UI
Co-authored-by: David Mercer <radix42@gmail.com>
2018-08-17 16:43:43 +01:00
Jack Grigg 8d45f6e4e2 configure: Don't require RELRO and BIND_NOW when cross-compiling
mingw-w64's ld (at least mingw-w64 4.0.4-2) appears to not support -z
2018-08-17 16:43:20 +01:00
Jack Grigg b057754005 zcutil/build.sh: Use $HOST to specify the depends prefix 2018-08-17 16:43:06 +01:00
Jack GriggandDavid Mercer 3d308c2232 depends: Fix BDB naming issue when cross-compiling
Co-authored-by: David Mercer <radix42@gmail.com>
2018-08-17 16:42:35 +01:00
Jack Grigg f77650a6ac depends: Configure librustzcash for cross-compiling 2018-08-17 16:41:51 +01:00
Jack Grigg b57e4484ef depends: Correctly configure Rust when cross-compiling 2018-08-17 16:41:40 +01:00
ca333 9b3d320620 Merge pull request #51 from jl777/dev
update dev
2018-08-17 16:01:29 +02:00
Asher Dawes eddc1d45e8 troubleshooting installer 2018-08-16 20:37:00 -07:00
Scott Sadler 79887a0987 replace malloc in CC with calloc 2018-08-16 18:52:04 -03:00
jl777 5a80480ebc Merge pull request #813 from letolabs/cctests
WIP More CC tests
2018-08-16 04:54:01 -11:00
Jonathan "Duke" Leto e4f4e63bf5 Merge remote-tracking branch 'origin/jl777' into cctests
Tests failing right now due to change in behavior:

CC Eval EVAL_FAUCET Invalid: faucet is only for brand new addresses
2018-08-16 17:40:57 +02:00
Jonathan "Duke" Leto 8a3e1884d6 More token tests and more error checking and better errors from internals 2018-08-16 17:17:54 +02:00
jl777 4d47fcb937 Create nonzero tokens 2018-08-16 01:07:44 -11:00
jl777 f6160f58c1 Add rpc error checking 2018-08-16 01:06:06 -11:00
jl777 11864181a1 Merge branch 'jl777' into FSM 2018-08-16 00:08:53 -11:00
jl777 291a646a84 Fix bid fill 2018-08-15 23:47:37 -11:00
jl777 bf52d98e76 Merge branch 'jl777' into FSM 2018-08-15 22:11:18 -11:00
jl777 764eb2e5be +dice attack vector 2018-08-15 22:10:55 -11:00
Homu d960b75de0 Auto merge of #3472 - bitcartel:release-v2.0.0, r=ebfull
Release v2.0.0
2018-08-16 01:26:25 -07:00
Simon 2f4735b3af make-release.py: Updated release notes and changelog for 2.0.0. 2018-08-15 17:57:50 -07:00
Simon 84b13aee88 make-release.py: Updated manpages for 2.0.0. 2018-08-15 17:57:50 -07:00
Simon 94f7201424 make-release.py: Versioning changes for 2.0.0. 2018-08-15 17:51:39 -07:00
Homu 4f82febcf1 Auto merge of #3469 - ebfull:sapling-mainnet-activation, r=bitcartel
Set Sapling mainnet activation height

In mainnet, block #419200 is expected to appear on October 28, 2018, Zcash's birthday.

In testnet, block #280000 is expected about a week from now. (Current height is ~275249, plus 4032 blocks for a week, plus a little more just to make the number nice.)

These are the activation heights for Sapling in mainnet and testnet, respectively. Protocol version is also changed.
2018-08-15 15:47:08 -07:00
Jonathan "Duke" Leto 8e0ff2b732 Test refactoring, more tests, and lots of error checking improvements and uint64_t fixes 2018-08-15 23:24:59 +02:00
jl777 59e96a4256 -print 2018-08-15 08:19:58 -11:00
jl777 c4a13b6f0d Test 2018-08-15 08:10:29 -11:00
jl777 5159767093 +print 2018-08-15 08:09:21 -11:00
jl777 8d13c0ef19 Consensus stable faucet get constraint 2018-08-15 07:41:28 -11:00
Sean Bowe 955b328ad1 Sapling mainnet activation height 2018-08-15 12:09:31 -06:00
jl777 f344c69338 +prints 2018-08-15 05:18:01 -11:00
jl777 4b3021d80b Fix mempool zombie 2018-08-15 05:07:28 -11:00
jl777 af3024a344 Faucet get only for first txid 2018-08-15 02:44:59 -11:00
jl777 87c119b71c Add pub key to faucet get I-return 2018-08-15 02:29:44 -11:00