Commit Graph

1752 Commits

Author SHA1 Message Date
jl777
02626c56b2 Test 2018-04-15 20:59:34 +03:00
jl777
549446dd13 Test 2018-04-15 20:44:32 +03:00
jl777
a1f98933bc Test 2018-04-15 20:43:36 +03:00
jl777
59e8a4f7ee Sync main.cpp to jl777 2018-04-15 20:27:23 +03:00
jl777
f90c9f681c Test 2018-04-13 22:53:01 +03:00
jl777
b5ca03bca7 Test 2018-04-13 22:49:40 +03:00
jl777
4323ab1cfb Test 2018-04-13 19:26:23 +03:00
jl777
f796b1fb8f Clean fix and speedup 2018-04-13 18:44:18 +03:00
jl777
409c28a2e2 Test 2018-04-10 19:46:33 +03:00
jl777
294925c70a Test 2018-04-10 18:22:32 +03:00
jl777
b1e74295fd Test 2018-04-10 18:19:27 +03:00
jl777
4786d20c0b PoW targeting in -ac_staking=perc mode 2018-04-10 16:40:59 +03:00
jl777
5bb3d0fe9f Test 2018-04-10 01:19:49 +03:00
jl777
d9b696bb26 Test 2018-04-09 17:04:39 +03:00
jl777
c38ad7246d Test 2018-04-09 16:48:19 +03:00
jl777
9aa73758b7 Test 2018-04-09 16:46:55 +03:00
jl777
f0a5789a5b Test 2018-04-09 16:43:37 +03:00
jl777
935fee29b5 Test 2018-04-09 16:41:32 +03:00
jl777
9339a0cbbd Test 2018-04-09 16:26:57 +03:00
jl777
8d787d2580 Test 2018-04-08 21:55:19 +03:00
jl777
fd836de79b Test 2018-04-08 19:59:29 +03:00
jl777
91165f19e6 Test 2018-04-08 19:01:04 +03:00
jl777
dbbdf7de87 Test 2018-04-08 18:57:56 +03:00
jl777
6a933d59d8 Test 2018-04-08 18:53:33 +03:00
jl777
84165583ca Merge branch 'dev' into jl777 2018-04-08 13:19:02 +03:00
jl777
53db65421e Merge pull request #538 from libscott/cryptoconditions
Crypto-Conditions
2018-04-08 13:18:26 +03:00
jl777
ce5dd5473e Test 2018-04-07 18:53:54 +03:00
jl777
ea1244288b Test 2018-04-07 15:50:31 +03:00
jl777
b7dc56995e Test 2018-04-07 15:48:51 +03:00
jl777
de4a435c68 Test 2018-04-07 15:42:18 +03:00
jl777
cf7f440296 Test 2018-04-06 18:29:45 +03:00
jl777
6b30b27c1c Test 2018-04-06 17:44:47 +03:00
jl777
b0bd536aad Test 2018-04-06 17:25:31 +03:00
jl777
09a3e8c285 Test 2018-04-06 13:25:11 +03:00
jl777
5ba45a00f1 Test 2018-04-06 13:23:39 +03:00
jl777
0b652b660a Test 2018-04-06 13:22:26 +03:00
jl777
5c079fa330 Test 2018-04-06 13:18:38 +03:00
Scott Sadler
2c8d8268dd ImportPayout cc eval code and alot of general cc polish. tests to write 2018-03-30 15:46:41 -03:00
jl777
2c0218f0ab Test 2018-03-26 16:23:01 +03:00
jl777
b3167f313c Test 2018-03-26 16:15:14 +03:00
jl777
2da1debd06 Test 2018-03-26 16:10:12 +03:00
jl777
c60397dd3a Lagging chaintip fix 2018-03-26 15:38:49 +03:00
jl777
28ee65c78a Test 2018-03-26 14:42:46 +03:00
jl777
60aee10df5 Test 2018-03-26 14:40:11 +03:00
jl777
287a665404 Test 2018-03-25 22:48:54 +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
f233f9b156 Revert 2018-03-08 05:46:26 +02:00
jl777
ca65f7ab1e Test 2018-03-08 05:40:10 +02:00
jl777
1931844a9c Change IsInitialBlockDownload for asset chains to match KMD 2018-03-08 05:30:26 +02:00
jl777
4e0d20786b Test 2018-03-08 02:37:17 +02:00