Commit Graph

303 Commits

Author SHA1 Message Date
jl777
4391153705 Makefile 2018-07-24 09:05:31 -11:00
jl777
0542b1cd55 Add dice.cpp 2018-07-24 07:45:35 -11:00
jl777
e3ec4c50aa Fix 2018-07-23 18:38:40 -11:00
jl777
d082e563f3 Fixes 2018-07-22 10:28:47 -11:00
jl777
c2f34bc31e Test 2018-07-22 03:32:23 -11:00
jl777
5a9f21107d Move assetstx to wallet 2018-07-22 03:31:31 -11:00
jl777
44a9fd7c3b Reorganize CC assets code 2018-07-22 02:49:52 -11:00
jl777
2abababa75 Test 2018-07-18 03:06:22 -11:00
Scott Sadler
e4f943d86d cross chain rpc methods 2018-05-18 19:29:33 -03:00
Scott Sadler
20c3ac51c2 wip 2018-05-09 16:17:28 -03:00
Scott Sadler
0cb91a8d20 wip 2018-04-29 00:34:57 -03:00
jl777
7213e636c1 Merge branch 'dev' into jl777 2018-04-17 23:28:32 +03:00
jl777
4d9b5edbcf Test 2018-04-16 08:35:52 +03:00
jl777
7b136bcd74 Merge branch 'dev' into devmerge
# Conflicts:
#	src/init.cpp
#	src/komodo_bitcoind.h
#	src/komodo_events.h
#	src/komodo_notary.h
#	src/komodo_structs.h
#	src/main.cpp
#	src/pow.cpp
#	src/rpcblockchain.cpp
2018-04-16 08:28:20 +03:00
ca333
afa02103c9 update Makefile 2018-04-16 07:21:04 +02:00
ca333
5da8e41df2 fix Makefile 2018-04-16 06:48:44 +02:00
jl777
f64557f7e0 Test 2018-04-16 07:19:36 +03:00
Scott Grayson
0c4f43951e Merge branch 'dev' of https://github.com/jl777/komodo into trunk-merge
* 'dev' of https://github.com/jl777/komodo: (1062 commits)
  Delay PoW check until connect block
  Declare
  KOMODO_NEWBLOCKS
  Prevent autorewind if syncing. Not a critical update
  Change n0/n1 size to int32_t
  Syntax
  Fix n -> static n0/n1
  Test
  Test
  Test
  KOMODO_LONGESTCHAIN = height;
  Sync main.cpp to jl777
  -print
  -USD/EUR
  readme
  curl fix
  -print
  Fix buffer overflows and reduce KMD men usage
  -print
  Test
  ...
2018-04-15 21:59:37 -04:00
Scott Sadler
8a8e10f02f cleanups 2018-04-09 11:53:13 -03:00
Scott Sadler
561f3e18c1 tests for bet protocol done; verify notarisation still to test 2018-04-05 05:06:22 -03:00
Scott Sadler
4c121ffdb0 cpp test suite for cryptoconditions integration 2018-04-01 21:18:01 -03:00
Scott Sadler
563581aff4 many changes: * fix CC malleability * extra validations for CCs such as requiring a signature and limiting types * different SIGHASH types for CC 2018-03-31 23:20:03 -03:00
Scott Sadler
9ef101bc21 mock up DisputePayout 2018-03-30 17:20:02 -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
TheTrunk
8b78a8199e Bitcore port 2018-03-27 13:34:52 +02:00
Scott Sadler
9e74de25fc merge jl777/dev; zcash upgrade, CC to fix 2018-03-26 20:07:32 -03:00
Scott Sadler
51aad18733 remove replacementpool 2018-03-26 16:21:33 -03:00
jl777
253b35b2ed Test 2018-03-25 18:48:39 +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
Scott Sadler
a8acafb354 test suite for replacementPool 2018-03-12 01:57:35 -03:00
Scott Sadler
2b2c75de29 basic implementation of transaction replacement. requires cleanup and testing 2018-03-08 15:15:01 -03:00
Jack Grigg
c4379e3a22 Add configure flags for enabling ASan/UBSan and TSan
Co-authored-by: Robert Seacord <rcseacord@gmail.com>
2018-03-01 16:04:42 +00:00
Jack Grigg
6e9c7629af Implement z_mergetoaddress for combining UTXOs and notes
Closes #2493.
2018-02-22 13:23:18 +00:00
Scott Sadler
691b8708f1 Komodo CC aux callback has access to transaction via checker 2018-02-21 19:28:52 -03:00
Scott Sadler
a01d0f5672 remove rpc crypto conditions 2018-02-16 14:24:38 -03:00
Jack Grigg
780f526bc9 Network upgrade activation mechanism 2018-02-04 22:57:56 +00:00
syd
a55c186a74 Fix libsnark dependency build.
This changes libsnark to build in-place, instead of copying first to
a build directory. Previously, modifications made to the original
sources wouldn't get rebuilt without a 'make clean' because users
would be pointing to the copies.

This closes #2689.
2017-12-16 15:52:08 -05:00
Homu
b9c7d84990 Auto merge of #2800 - str4d:2788-libsnark-test-hardening, r=str4d
Fix buffer overflow in libsnark

Applies `-fstack-protector-all` to libsnark, and fixes an underlying bug. This bug was not triggerable in `zcashd` because the function in question was being inlined by the compiler.

Closes #2788.
2017-12-15 07:32:41 -08:00
Jack Grigg
d66bf190cb Apply -fstack-protector-all to libsnark 2017-12-15 10:02:54 +00:00
Cory Fields
5dd887fdf7 build: add --enable-werror option
This turns some compiler warnings into errors. Useful for c-i.
2017-12-01 14:10:17 +00:00
Jack Grigg
ad96d74afe build: Split hardening/fPIE options out in Zcash-specific binaries 2017-12-01 14:10:11 +00:00
Cory Fields
c459de2f03 build: Split hardening/fPIE options out
This allows for fPIE to be used selectively.
2017-11-30 15:17:37 +00:00
Jack Grigg
daad2c2736 Check if OpenMP is available before using it 2017-11-29 17:28:44 +00:00
Homu
2ff8ab7dfb Auto merge of #2751 - syd0:upgrade-googletest-1.8.0, r=str4d
Upgrade googletest to 1.8.0

Closes #1432.
2017-11-28 07:37:20 -08:00
syd
7c591c6d2f Don't compile libgtest.a when building libsnark.
Previously libsnark would try to build libgtest if /usr/src/gtest
exists on the build machine. This caused issues because the
version of libgtest in /usr/src isn't necessarily the same as
the one that the rest of zcash's gtests were built with.
2017-11-25 10:58:37 -05:00
syd
2d342736dc Get the sec-hard tests to run correctly.
This fixes the way arguments were passed to security-check, and also
a typo in how BIND_NOW was being searched for in a list.

Also fix how symbol-check is invoked although that script isn't
currently used.
2017-11-20 00:48:12 -05:00
Jack Grigg
8f23c734e6 Pass correct dependencies path to libsnark from both Gitian and build.sh 2017-11-15 15:30:21 +00:00
Jack Grigg
83bef3fcbe Move libsnark from DIST_SUBDIRS into EXTRA_DIST 2017-11-15 11:10:19 +00:00
Simon
45232b1961 Add payment disclosure as experimental feature. 2017-11-14 13:29:05 -08:00
Scott Sadler
342611f932 add rpccryptoconditions 2017-10-21 23:23:57 -07:00