Commit Graph

94 Commits

Author SHA1 Message Date
jl777
c60397dd3a Lagging chaintip fix 2018-03-26 15:38:49 +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
997cf5a1d2 Test 2017-11-10 19:20:58 +02:00
jl777
7c130297c2 KOMODO_ASSETCHAIN_MAXLEN -> 65 2017-11-10 19:07:36 +02:00
jl777
1141b67821 Revert interest changes 2017-06-04 20:09:30 +03:00
jl777
5d2f557e44 Disable mining unclaimed interest 2017-06-04 19:39:48 +03:00
jl777
4d4a7cd55d https://github.com/zcash/zcash/pull/2259/commits
https://github.com/zcash/zcash/pull/2259/commits
2017-04-14 08:33:04 +03:00
Daira Hopwood
ec19e8e283 Simplify JoinSplit priority calculation. refs 1896
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2017-04-13 22:40:20 +01:00
jl777
945f015d80 Initial merge 2017-03-30 04:35:16 +03:00
Jack Grigg
43a03e3bfc Migrate IncrementalMerkleTree memory usage calls 2017-03-14 18:01:05 +13:00
Pieter Wuille
6bd1d60c97 Separate core memory usage computation in core_memusage.h 2017-03-14 13:45:05 +13:00
jl777
bc17ac4928 Merge remote-tracking branch 'zcash/master' into rebase
# Conflicts:
#	README.md
#	src/Makefile.gtest.include
#	src/chainparams.cpp
#	src/init.cpp
#	src/miner.cpp
#	src/wallet/wallet.cpp
2016-12-12 12:19:13 +02:00
zkbot
0617e428e2 Auto merge of #1895 - bitcartel:1857_tx_priority, r=str4d
Closes #1857. Fixes bug where a transaction sending from a zaddr would have a priority of zero.

Transactions sent from a zaddr should now be mined sooner as they no longer have a priority of zero
2016-12-09 08:10:21 +00:00
Sean Bowe
ebd9aa11b1 Ensure cache contains valid entry when anchor is popped. 2016-12-06 12:54:56 -07:00
Simon
520ced1405 Closes #1857. Fixes bug where tx spending only notes had priority of 0. 2016-11-28 22:54:49 -08:00
Sean Bowe
f398a94766 Anchors and nullifiers should always be inherited from the parent cache. 2016-11-17 11:43:54 -07:00
jl777
98f682257a test 2016-11-15 17:59:15 -03:00
jl777
38dfbe150a test 2016-11-15 17:57:55 -03:00
jl777
f6356642b0 test 2016-11-15 15:36:44 -03:00
jl777
798f28c7d3 test 2016-11-15 12:27:14 -03:00
jl777
c1c95e3627 test 2016-11-15 11:57:56 -03:00
jl777
d0e75beb85 test 2016-11-15 11:56:43 -03:00
jl777
5076058573 test 2016-11-15 11:47:21 -03:00
jl777
3b97ccc9a7 test 2016-11-15 11:39:36 -03:00
jl777
b25d6fd160 test 2016-11-15 11:38:03 -03:00
jl777
98d166cfc9 test 2016-11-15 11:33:45 -03:00
jl777
0fec0cc4b3 test 2016-11-15 10:38:38 -03:00
jl777
a130c5cb66 test 2016-11-15 07:47:14 -03:00
jl777
073a37a2dc test 2016-11-14 15:10:42 -03:00
jl777
3959e9f32d test 2016-11-12 12:10:15 -03:00
jl777
4a4e912bbe test 2016-11-11 20:15:05 -03:00
jl777
fd8dd3c26d test 2016-11-04 18:11:04 -03:00
jl777
2d4c201cef test 2016-11-04 09:16:44 -03:00
jl777
17878015bb test 2016-10-22 13:23:25 -03:00
jl777
fdbf481faf test 2016-10-22 11:56:19 -03:00
jl777
a6ce4b84b1 test 2016-10-22 10:41:02 -03:00
jl777
355ca56547 test 2016-10-21 19:09:24 -03:00
jl777
8ad9f27fdd test 2016-10-21 18:32:52 -03:00
jl777
560c5598be test 2016-10-21 18:03:15 -03:00
jl777
0f24f24562 test 2016-10-21 17:28:28 -03:00
jl777
f0eb47af80 test 2016-10-21 16:50:17 -03:00
jl777
8a9bc02778 test 2016-10-21 16:44:49 -03:00
jl777
63a9f52633 test 2016-10-21 16:08:37 -03:00
jl777
420af8fda7 test 2016-10-21 15:54:04 -03:00
jl777
8c8552a2ab test 2016-10-21 15:48:46 -03:00
jl777
e19d8b3dee test 2016-10-21 15:20:30 -03:00
jl777
92ec2db8e9 test 2016-10-20 16:09:21 -03:00
jl777
3127a4808b test 2016-10-20 16:08:02 -03:00
jl777
602dc7445d test 2016-10-20 15:14:39 -03:00
jl777
5fbcb13099 test 2016-10-18 18:44:09 -03:00