DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity
23,279 Commits 7 Branches 3 Tags
82cf345e94de801e4dcec919932ff4d6ec33ad83
Commit Graph

23279 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Homu
72f14060bc Auto merge of #3098 - str4d:2343-overwinter-disable-mempooltxinputlimit, r=str4d 
Ignore -mempooltxinputlimit once Overwinter activates

Overwinter changes the SignatureHash function to solve the quadratic hashing problem, so this option will no longer be needed.
 2018-03-30 08:33:58 -07:00
Simon
09bf7d2d3c Upgrade OpenSSL to 1.1.0h 2018-03-29 23:05:17 -07:00
Brad Miller
4e6400bc00 Implement note locking for z_mergetoaddress 
Co-authored-by: Eirik Ogilvie-Wigley <eirik@z.cash>
 2018-03-29 15:48:34 -06:00
Jack Grigg
9666cc912a Test calling z_mergetoaddress to merge notes while a note merge is ongoing 2018-03-29 15:38:26 -06:00
Jack Grigg
b96f7d692d wallet: Cast size_t to uint64_t before passing to UniValue 2018-03-29 01:05:45 +02:00
Jack Grigg
4ff92bb6d8 rpcwallet.cpp: Cast size_t to uint64_t before passing to UniValue 2018-03-29 01:02:58 +02:00
Scott Sadler
991c422a9d fix CC 2018-03-28 15:02:20 -03:00
Jack Grigg
8e95a12b63 Cast ZCIncrementalMerkleTree::size() to uint64_t before passing to UniValue 
size_t is ambiguous for serialization, and UniValue doesn't have an API for
handling this internally.
 2018-03-28 19:51:48 +02:00
Homu
5bdce01848 Auto merge of #2913 - bitcartel:2910_z_listunspent, r=bitcartel 
Closes #2910. Add z_listunspent RPC call.

Have tested on network.  Opening up for review.
 2018-03-28 10:40:49 -07:00
Simon
d72c19a662 Closes #2910. Add z_listunspent RPC call. 2018-03-28 10:38:57 -07:00
Jack Grigg
f0118aaa0b Add base case to CurrentEpoch() 2018-03-28 18:29:20 +02:00
Jack Grigg
792c05d8a9 Set PLATFORM flag when compiling libsnark 2018-03-28 18:29:19 +02:00
Jack Grigg
381a79a909 libsnark: Don't set -static on Darwin 
Co-authored-by: kozyilmaz <kazim@monolytic.com>
 2018-03-28 18:29:19 +02:00
Jack Grigg
4fe053e6e8 Move explicit instantiation of IncrementalMerkleTree::emptyroots into header 
Fixes a -Wundefined-var-template warning with clang.
 2018-03-28 18:29:19 +02:00
Jack Grigg
6c7930f688 Use uint64_t instead of size_t for serialized indices into tx.vjoinsplit 
size_t has no guarantee of uniform size, and thus far has been serialized as a
uint64_t on supported platforms.
 2018-03-28 18:29:19 +02:00
Jack Grigg
d58ed91af0 Optimise serialization of MerklePath, avoiding ambiguity of std::vector<bool> 
The serialization enforces a maximum supported Merkle tree depth of 64.

Closes #2831.
 2018-03-28 18:26:08 +02:00
Jack Grigg
d9cd254e5e Make Rust compilation mandatory 
The temporary integration check in CheckEquihashSolution() remains, until we
have "real" Rust code to integrate.

Closes #2688.
 2018-03-28 17:55:45 +02:00
Homu
058efdbe0f Auto merge of #3124 - bitcartel:update_boost_url, r=str4d 
Update boost package URL to match official download url on boost.org

Part of #3123.
 2018-03-28 08:26:39 -07:00
Homu
a08ad2b815 Auto merge of #3096 - str4d:2231-depends-vendor-rust-crates, r=str4d 
depends: Explicitly download and vendor Rust dependencies

Closes #2231.
 2018-03-28 07:01:39 -07:00
Jack Grigg
0adfdc99b2 depends: Explicitly download and vendor Rust dependencies 
Closes #2231.
 2018-03-28 15:46:51 +02:00
Homu
2c91e3ebc0 Auto merge of #3117 - charlieok:add_windows_rust_package, r=daira 
Add filename and SHA256 hash for Windows Rust package

When running `make download` in the `depends` directory, the `download-win` target (which `download` depends on) generates an error when it runs the commands defined in `check_or_remove_sources`:

```Makefile
sha256sum: /home/vagrant/zcash/depends/work/download/rust-1.16.0/..hash: no properly formatted SHA256 checksum lines found
funcs.mk:242: recipe for target '/home/vagrant/gitian-builder/cache/common/download-stamps/.stamp_fetched-rust-.hash' failed
make[1]: *** [/home/vagrant/gitian-builder/cache/common/download-stamps/.stamp_fetched-rust-.hash] Error 1
make[1]: Leaving directory '/home/vagrant/zcash/depends'
Makefile:153: recipe for target 'download-win' failed
make: *** [download-win] Error 2
```

The reason for the error is that `depends/packages/rust.mk` defines `rust_file_name_linux` and `rust_file_name_darwin` but leaves `rust_file_name_mingw32` undefined.

A directory of available rust downloads is here: https://static.rust-lang.org/dist/index.html

The closest windows analog in that list (using the same version number as currently defined in `rust.mk`) appears to be `rust-mingw-1.16.0-x86_64-pc-windows-gnu.tar.gz`. A corresponding sha256 value is also given in `rust-mingw-1.16.0-x86_64-pc-windows-gnu.tar.gz.sha256`.

After adding these values to `rust.mk`, the rust-mingw tar package was downloaded along with the rest of the dependencies and the above error message went away.
 2018-03-28 05:31:43 -07:00
Jack Grigg
31afbcc5c9 Ignore -mempooltxinputlimit once Overwinter activates 2018-03-28 14:25:42 +02:00
jl777
b65fbf346c Merge pull request #548 from jl777/jl777 
Jl777
 2018-03-28 14:25:54 +03:00
jl777
1d5c7ffa29 -googlemock 2018-03-28 14:22:39 +03:00
Homu
fb26130787 Auto merge of #3109 - bitcartel:2966_extend_tests, r=str4d 
Part of #2966, extending Sprout tests to other epochs.

Tests updated:
- test_Get
- test_simple_joinsplit_invalidity
 2018-03-27 13:10:39 -07:00
TheTrunk
cd7a937e74 Merge branch 'master' of https://github.com/TheTrunk/komodo 2018-03-27 19:43:42 +02:00
TheTrunk
68ea28d86f Removing vs stuff 2018-03-27 19:43:23 +02:00
Homu
99b6f76355 Auto merge of #3111 - bitcartel:3110_high_fee_error_reporting, r=bitcartel 
Closes #3110.  Ensure user can see error message about absurdly high fees.
 2018-03-27 10:33:52 -07:00
Simon
8b15afd315 Closes #3110. Ensure user can see error message about absurdly high fees. 2018-03-27 10:23:24 -07:00
jl777
8a0b06f603 Test 2018-03-27 20:22:23 +03:00
Simon
2b0783792b Update boost package URL to match official download url on boost.org 2018-03-27 09:39:06 -07:00
jl777
e1501755a4 Test 2018-03-27 19:30:33 +03:00
jl777
d4cc6fc35a Test 2018-03-27 19:29:30 +03:00
jl777
f717835b84 Test 2018-03-27 19:20:06 +03:00
jl777
f9b1c78a02 Test 2018-03-27 19:08:48 +03:00
jl777
c52074f248 Test alternate block2height 2018-03-27 19:03:55 +03:00
Homu
9a6809a75b Auto merge of #3113 - bitcartel:update_boost_1.66.0, r=str4d 
Update boost to 1.66.0

- Remove no longer required patch `deprecated_auto_ptr.patch`.
- Remove potentially no longer required patch `include_poll.patch`. This might cause a regression for unsupported platform Alpine Linux (see #1559)
 2018-03-27 07:31:16 -07:00
jl777
c7fc8157f9 Merge pull request #547 from jl777/jl777 
a few fixes to build scripts
 2018-03-27 17:00:39 +03:00
jl777
079de2e5e8 Test 2018-03-27 16:49:00 +03:00
jl777
919fa9f9c3 Add back googlemk 2018-03-27 16:39:18 +03:00
Homu
c24a617c40 Auto merge of #3120 - str4d:pyflakes-clean, r=daira 
cleanup: Ensure code is pyflakes-clean for CI
 2018-03-27 05:44:06 -07:00
TheTrunk
3c8d553438 Update README.md 2018-03-27 14:04:29 +02:00
TheTrunk
8b78a8199e Bitcore port 2018-03-27 13:34:52 +02:00
jl777
1328d71427 Remove / from bintray path 2018-03-27 14:22:06 +03:00
Jack Grigg
b466c1c90c cleanup: Ensure code is pyflakes-clean for CI 2018-03-27 02:47:57 +02:00
Simon
68cc953012 Part of #2966, extending Sprout tests to other epochs. 
Tests updated:
- test_Get
- test_simple_joinsplit_invalidity
 2018-03-26 16:22:37 -07:00
Scott Sadler
9e74de25fc merge jl777/dev; zcash upgrade, CC to fix 2018-03-26 20:07:32 -03:00
Charlie O'Keefe
de2c5e9be9 Add filename and sha256 hash for windows rust package 2018-03-26 14:52:58 -06:00
Scott Sadler
51aad18733 remove replacementpool 2018-03-26 16:21:33 -03:00
jl777
1e0e14dea7 Merge pull request #546 from jl777/jl777 
add pindex pubkey33 cache
 2018-03-26 19:45:54 +03:00