Commit Graph

140 Commits

Author SHA1 Message Date
Jonathan "Duke" Leto
0f5e636fa8 For the want of parens consensus was lost 2019-11-22 08:03:46 -08:00
Jonathan "Duke" Leto
f3247b7209 remove some sprout code 2019-11-14 15:52:01 -08:00
Jonathan "Duke" Leto
a40f0b0f19 Delete sprout code from HaveJoinSplitRequirements and log reasons for failing reqs to stderr 2019-11-14 14:26:31 -08:00
Jonathan "Duke" Leto
5da33fe71d Remove commented out debris related to Verus breaking their immutability, sigh 2019-08-07 20:32:52 -07:00
Mihailo Milenkovic
1f013df156 Initial PegsCC implementation (#27) 2019-07-04 11:23:55 +02:00
jl777
0ea9ae3c05 Update copyright to 2019 2018-12-31 21:41:05 -11:00
jl777
fcce90b71b launchmap 2018-12-05 21:05:51 -11:00
miketout
3bfa5e2264 Latest Zcash updates and more CC for N@S 2018-10-05 00:26:06 -07:00
Eirik Ogilvie-Wigley
51e6ed6110 Move FIXME comment to where the fix should happen 2018-09-28 12:16:05 -06:00
Eirik Ogilvie-Wigley
a13492744d Use max priority for all shielded transfers 2018-09-28 10:32:30 -06:00
miketout
9feb4b9e08 Major updates integration from all upstreams 2018-09-18 14:33:53 -07:00
Michael Toutonghi
5034d1c134 Sync with latest Komodo changes 2018-08-06 12:52:22 -07:00
Eirik Ogilvie-Wigley
4fc309f0f5 Rename Merkle Trees to include sprout or sapling 2018-08-01 10:31:09 -06:00
Michael Toutonghi
37ad688668 Protect from null ptr on chain tip 2018-07-14 21:45:38 -07:00
jl777
d6f8eeb965 Remove mindiff cap for 100% PoS 2018-07-05 21:48:08 -11:00
Homu
9acfa0067f Auto merge of #3258 - Eirik0:3056-anchor-test-cases, r=str4d
Add tests for sapling anchors

Closes #3253
2018-06-19 09:28:20 -07:00
Scott Sadler
81389fc7b4 merge dev; tests broken, need to use wallet for block rewards 2018-05-29 19:04:47 -03:00
Michael Toutonghi
c6e2184378 post launch release readiness 2018-05-27 19:59:23 -07:00
Michael Toutonghi
c1e7194760 fix coinbase spend after 10080 & seg fault 2018-05-25 21:52:53 -07:00
Michael Toutonghi
b0e452de2a fix build for update 2018-05-25 20:15:38 -07:00
Michael Toutonghi
6c8e1cdfb7 Restore zcash coinbase rule and launch fix at 10080 2018-05-25 15:10:07 -07:00
Eirik Ogilvie-Wigley
3182b4abc3 Add tests for sapling anchors 2018-05-16 10:31:53 -06:00
Scott Sadler
20c3ac51c2 wip 2018-05-09 16:17:28 -03:00
Jack Grigg
97b46f00cc Add valueBalance to value balances, and enforce its consensus rules 2018-05-09 11:34:41 +01:00
Sean Bowe
8c57bbac15 Fix broken error messages. 2018-05-07 14:37:46 -06:00
Sean Bowe
e390a475c1 Fix outdated comment 2018-05-07 14:37:46 -06:00
Sean Bowe
1f8be05b63 Add consensus support for Sapling merkle trees. 2018-05-07 14:37:46 -06:00
Sean Bowe
85b39f57bb Add PushSaplingAnchor 2018-05-07 14:37:46 -06:00
Sean Bowe
c643ff0b51 Add support for PopAnchor(.., SPROUT/SAPLING) 2018-05-07 14:37:46 -06:00
Sean Bowe
27616b9a04 Add support for Sapling anchors in coins/txdb. 2018-05-07 14:37:46 -06:00
Sean Bowe
7703a673ea Generalize the PushAnchor implementation behavior. 2018-05-07 14:37:43 -06:00
Sean Bowe
9ea4e387b2 Generalize the PopAnchor implementation behavior. 2018-05-07 13:46:06 -06:00
Sean Bowe
18322f074c Introduce support for GetBestAnchor(SAPLING). 2018-05-07 13:46:06 -06:00
Sean Bowe
2bd59e1473 Rename PushAnchor to PushSproutAnchor. 2018-05-07 13:46:06 -06:00
Sean Bowe
008f4ee8e7 Rename GetAnchorAt to GetSproutAnchorAt. 2018-05-07 13:46:06 -06:00
Sean Bowe
08f0728884 Rename hashAnchor to hashSproutAnchor. 2018-05-07 13:46:06 -06:00
Sean Bowe
d455828fdc Specifically describe anchors as Sprout anchors. 2018-05-07 13:46:06 -06:00
Sean Bowe
28d20bdb11 Rename NullifierType to ShieldedType. 2018-05-07 13:46:06 -06:00
jl777
2f10423071 Test 2018-05-07 15:53:05 +03:00
jl777
a9bad5a300 test 2018-05-07 15:47:18 +03:00
Jack Grigg
1f9dfbb9f0 Fix -Wstring-plus-int warning on clang 2018-05-01 14:55:47 +01:00
Scott Sadler
0cb91a8d20 wip 2018-04-29 00:34:57 -03:00
Eirik Ogilvie-Wigley
9669920f75 Rename nullifier caches and maps to indicate sprout nullifiers 2018-04-25 11:26:38 -06:00
Eirik Ogilvie-Wigley
cab341e1a8 Add sapling nullifiers to db and mempool 2018-04-24 17:16:43 -06:00
Eirik Ogilvie-Wigley
708c87f16d Add enum for nullifier type 2018-04-24 09:57:14 -06:00
Eirik Ogilvie-Wigley
685e936c31 Add sapling nullifier set 2018-04-24 09:57:14 -06: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
997cf5a1d2 Test 2017-11-10 19:20:58 +02:00
jl777
7c130297c2 KOMODO_ASSETCHAIN_MAXLEN -> 65 2017-11-10 19:07:36 +02:00