Commit Graph

2421 Commits

Author SHA1 Message Date
jl777
d5d586e078 Test 2018-04-09 20:59:16 +03:00
jl777
e1a17ed172 Test 2018-04-09 20:47:37 +03:00
jl777
357e4ca5f0 Test 2018-04-09 19:33:50 +03:00
jl777
add7f889fd Test 2018-04-09 18:38:38 +03:00
jl777
9159a0408b Test 2018-04-09 18:07:58 +03:00
jl777
df643d5cd7 Test 2018-04-09 18:06:37 +03:00
jl777
ebcb53068f Test 2018-04-09 18:03:28 +03:00
jl777
2d5f478f9a Test 2018-04-09 18:02:28 +03:00
jl777
1f34df6b3f Test 2018-04-09 17:59:33 +03:00
jl777
8a60c80593 Test 2018-04-09 17:09:47 +03:00
jl777
d9b696bb26 Test 2018-04-09 17:04:39 +03:00
jl777
51217f768f Test 2018-04-09 16:38:45 +03:00
jl777
b8429de9d1 Test 2018-04-09 16:33:16 +03:00
jl777
9339a0cbbd Test 2018-04-09 16:26:57 +03:00
jl777
66b4e56310 Test 2018-04-09 15:43:05 +03:00
jl777
786456eeca Test 2018-04-09 14:47:43 +03:00
jl777
eeb2685d9a Test 2018-04-09 14:46:15 +03:00
jl777
4c62ef37b4 Test 2018-04-09 14:42:07 +03:00
jl777
d15f9225f7 Test 2018-04-09 14:37:43 +03:00
jl777
969322e042 Test 2018-04-09 14:36:59 +03:00
jl777
1e7ed9289b Test 2018-04-09 14:35:50 +03:00
jl777
21965c3f7a Test 2018-04-09 14:26:07 +03:00
jl777
be7928150b Test 2018-04-07 22:58:10 +03:00
jl777
565aa1b298 Test 2018-04-07 22:54:14 +03:00
jl777
5611b8ff59 Test 2018-04-07 22:53:26 +03:00
jl777
30092d77e2 Test 2018-04-07 22:52:09 +03:00
jl777
eb6c7bb831 Test 2018-04-07 22:46:38 +03:00
jl777
c6e53b1ad3 Test 2018-04-07 22:39:43 +03:00
jl777
74f0baa468 Test 2018-04-07 22:34:16 +03:00
jl777
50a7fa9e12 Test 2018-04-07 22:32:56 +03:00
jl777
073421433b Test 2018-04-07 22:25:09 +03:00
jl777
a16386bc8c Test 2018-04-07 22:23:00 +03:00
Homu
599c847818 Auto merge of #2820 - str4d:darwin-build-patches, r=str4d
[macOS] Darwin build patches

Part of #2246.
2018-04-03 12:44:24 -07:00
Homu
3055fd5508 Auto merge of #3136 - str4d:2937-z_importviewingkey-startheight, r=daira
Fix z_importviewingkey startHeight parameter

Closes #2937.

Co-authored-by: Tomas M <tomas@slax.org>
2018-04-03 09:41:09 -07:00
Homu
ca981fd442 Auto merge of #3080 - leto:jsindex, r=bitcartel
Return JoinSplit and JoinSplitOutput indexes in z_listreceivedbyaddress

This implements a feature request by @nathan-at-least in https://github.com/zcash/zcash/issues/2932 and I wanted to ask for feedback about the exact form of the data returned before updating tests and docs.
2018-04-03 00:30:11 -07:00
Jack Grigg
28915c30ca Fix z_importviewingkey startHeight parameter
Closes #2937.
2018-04-03 02:43:52 +01:00
Homu
347804fe73 Auto merge of #3106 - braddmiller:3046-mergetoaddress-concurrent, r=str4d
Add Note Locking to z_mergetoaddress

Adds note locking to `z_mergetoaddress` allowing it to be invoked multiple times before previous `z_mergetoaddress` operations have finished.

Reference issue [#3046](https://github.com/zcash/zcash/issues/3046)

Co-authored-by: Eirik Ogilvie-Wigley <eirik@z.cash>
2018-03-30 14:29:17 -07:00
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
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
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
Simon
d72c19a662 Closes #2910. Add z_listunspent RPC call. 2018-03-28 10:38:57 -07: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
31afbcc5c9 Ignore -mempooltxinputlimit once Overwinter activates 2018-03-28 14:25:42 +02:00
jl777
c60397dd3a Lagging chaintip fix 2018-03-26 15:38:49 +03:00
jl777
eb9facd492 Merge branch 'dev' into jl777 2018-03-25 22:24:20 +03:00
jl777
3fc8685f0e Test 2018-03-25 21:37:22 +03:00
jl777
9000990c30 Merge remote-tracking branch 'zcash/master' into rebase2
# Conflicts:
#	.travis.yml
#	Makefile.am
#	README.md
#	configure.ac
#	depends/Makefile
#	depends/builders/darwin.mk
#	depends/funcs.mk
#	depends/hosts/darwin.mk
#	depends/packages/googlemock.mk
#	depends/packages/googletest.mk
#	depends/packages/libsnark.mk
#	depends/packages/libsodium.mk
#	depends/packages/packages.mk
#	depends/packages/rust.mk
#	src/Makefile.am
#	src/Makefile.gtest.include
#	src/chainparams.cpp
#	src/chainparams.h
#	src/checkpoints.h
#	src/clientversion.h
#	src/coins.cpp
#	src/consensus/consensus.h
#	src/gtest/test_mempool.cpp
#	src/httprpc.cpp
#	src/init.cpp
#	src/komodo-tx.cpp
#	src/main.cpp
#	src/miner.cpp
#	src/policy/fees.cpp
#	src/policy/fees.h
#	src/rpcmining.cpp
#	src/rpcrawtransaction.cpp
#	src/rpcserver.cpp
#	src/test/policyestimator_tests.cpp
#	src/test/rpc_wallet_tests.cpp
#	src/test/transaction_tests.cpp
#	src/txdb.cpp
#	src/txmempool.cpp
#	src/wallet/asyncrpcoperation_sendmany.cpp
#	src/wallet/rpcwallet.cpp
#	src/wallet/wallet.cpp
#	src/wallet/wallet.h
#	src/zcash/CreateJoinSplit.cpp
#	zcutil/build.sh
2018-03-25 18:44:38 +03:00
jl777
076452eeaa Merge pull request #539 from jl777/jl777
MoM support
2018-03-24 17:05:12 +02:00
jl777
18c6cfce1d MoM support 2018-03-22 14:21:00 +02:00