Commit Graph

15455 Commits

Author SHA1 Message Date
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
79c3d5f3b6 Test 2018-03-24 16:55:47 +02:00
jl777
f99c2ff39e Test 2018-03-24 16:53:48 +02:00
jl777
d185481844 Test 2018-03-24 16:51:57 +02:00
jl777
a192131ddc Test 2018-03-24 16:46:33 +02:00
jl777
98598a7094 Test 2018-03-24 16:43:51 +02:00
jl777
bcc13cd8e2 Test 2018-03-24 16:38:12 +02:00
jl777
a67cb299d8 Test 2018-03-24 16:30:46 +02:00
jl777
15280cb441 Test 2018-03-24 16:22:18 +02:00
jl777
b91ef9cf13 Test 2018-03-24 16:02:25 +02:00
jl777
6e1d2e7dc9 Test 2018-03-24 15:59:48 +02:00
jl777
709a9861ee Test 2018-03-24 15:56:43 +02:00
jl777
1f37849a4c Test 2018-03-24 15:55:26 +02:00
jl777
78f9d61210 Test 2018-03-24 15:53:08 +02:00
jl777
5ca88c28d8 Test 2018-03-24 15:39:49 +02:00
jl777
ecf9c398f9 Test 2018-03-24 15:36:15 +02:00
jl777
6bc6362031 Test 2018-03-24 14:54:19 +02:00
jl777
16ed777a8c Fix off by ones 2018-03-24 14:28:18 +02:00
jl777
b3548b524d Test 2018-03-24 14:16:00 +02:00
jl777
663304d963 Test 2018-03-24 14:12:10 +02:00
jl777
5473ce392a Test 2018-03-24 14:11:57 +02:00
jl777
aa5ca00101 Test 2018-03-24 14:10:59 +02:00
jl777
2b7b4c274c Test 2018-03-24 14:08:45 +02:00
jl777
8b8c54db07 Test 2018-03-24 14:07:49 +02:00
jl777
682ee10f6b Test 2018-03-24 14:06:20 +02:00
jl777
e9115be059 Test 2018-03-24 14:04:24 +02:00
jl777
66b1416d7d Fix 2018-03-24 14:02:43 +02:00
jl777
375a0ca39d Test 2018-03-24 13:16:16 +02:00
jl777
4329679df7 height_MoM rpc 2018-03-24 12:59:36 +02:00
Homu
4d6498b900 Auto merge of #3082 - str4d:overwinter-info, r=daira
Add link to Overwinter info page
2018-03-23 07:25:09 -07:00
jl777
617c9c6178 Test 2018-03-22 18:19:13 +02:00
jl777
f850a97b77 Test 2018-03-22 18:15:25 +02:00
jl777
c26fb215f4 Test 2018-03-22 18:10:32 +02:00
jl777
0ab5b33594 Test 2018-03-22 18:09:08 +02:00
jl777
f1a96e3bbd Test 2018-03-22 17:11:31 +02:00
jl777
895977bf2e Test 2018-03-22 17:07:27 +02:00
jl777
3da303b505 Test 2018-03-22 16:58:48 +02:00
jl777
279fac9187 Test 2018-03-22 16:56:41 +02:00
jl777
e35bc6fea3 Test 2018-03-22 16:23:32 +02:00
jl777
98b7faf6e2 Test 2018-03-22 16:18:04 +02:00
jl777
e8f0f0d67a Test 2018-03-22 16:13:10 +02:00
jl777
c130fb54bb Test 2018-03-22 15:55:15 +02:00
jl777
25bf4d686e Test 2018-03-22 15:43:59 +02:00
jl777
1c1b7f3f25 test 2018-03-22 15:27:45 +02:00
jl777
2ff8e0e5d9 Test 2018-03-22 15:18:58 +02:00
jl777
c88fa588de Test 2018-03-22 15:13:15 +02:00
jl777
ed7bd56252 Test 2018-03-22 14:57:50 +02:00
jl777
3f41df7562 Test 2018-03-22 14:53:30 +02:00
jl777
582c741ff3 Test 2018-03-22 14:43:49 +02:00
jl777
18c6cfce1d MoM support 2018-03-22 14:21:00 +02:00