Commit Graph

18 Commits

Author SHA1 Message Date
jl777
cb3c65aa45 NSPV_defaultkey 2019-07-05 01:57:09 -11:00
jl777
0ea9ae3c05 Update copyright to 2019 2018-12-31 21:41:05 -11:00
jl777
6a71342500 Fixes 2018-12-29 01:39:30 -11:00
jl777
c10c7d3309 Komod-tx functions 2018-12-29 01:37:53 -11:00
jl777
222e4ce1fe Fix 2018-11-24 09:12:02 -11:00
jl777
91f355fd69 4MB block size with sapling 2018-11-24 08:39:23 -11:00
miketout
6e2a502b0e Merge of Komodo and Verus Technologies Post Sapling, Pre-VerusPoP with Support for Time locked coinbases 2018-11-14 16:40:10 -08:00
Michael Toutonghi
8fc4030c10 Reorganized cheatcatcher for build issues 2018-10-10 21:46:40 -07:00
miketout
9feb4b9e08 Major updates integration from all upstreams 2018-09-18 14:33:53 -07:00
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
5416af1ddc KOMODO_DEFS_H 2017-11-10 19:15:34 +02:00
jl777
945f015d80 Initial merge 2017-03-30 04:35:16 +03:00
jl777
97fdbcc2ab test 2016-11-17 19:11:41 -03:00
jl777
798f28c7d3 test 2016-11-15 12:27:14 -03:00
jl777
a933451cc1 test 2016-11-15 11:58:58 -03:00
jl777
fa627dbecd test 2016-10-29 13:07:59 -03:00
jl777
2d490dcdae test 2016-10-28 14:38:01 -03:00