BTCPrivate
/
BitcoinPrivate-legacy
mirror of https://github.com/BTCPrivate/BitcoinPrivate-legacy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
10,804 Commits 12 Branches 14 Tags 52 MiB
Commit Graph

10804 Commits

Author SHA1 Message Date
jc23424 370cb386cf
Merge branch 'master' into adjust-pch 2018-02-02 08:35:37 -05:00
BlueSilver22 37820c5579
Merge pull request #52 from jc23424/disable-coinbase-shielding 
dont enforce requirement that coinbases must be first shielded
 2018-02-02 06:55:03 -06:00
BlueSilver22 5406e79357
Merge pull request #48 from zanethomas/merge-zclassic-changes-001 
Bringing In Test Failure Fixes from zclassic
 2018-02-02 06:54:54 -06:00
BlueSilver22 216d7ea26f
Merge pull request #43 from ch4ot1c/btcp-msgmagic 
strMessageMagic for BitcoinPrivate
 2018-02-02 06:54:42 -06:00
BlueSilver22 376e574ab1
Merge pull request #54 from josephnicholas/master 
GCC-7 Fixes merged from Z-Classic
 2018-01-28 10:26:52 -06:00
josephnicholas 6600061376 GCC-7 Fixes merged from zclassic 2018-01-29 00:17:50 +08:00
jc bc03affae5 bump version for next testnet 2018-01-27 23:44:53 -05:00
jc 1b58b0615e adjust pchMessageStart to isolate network 2018-01-27 18:33:29 -05:00
jc 8af36e19b9 dont enforce requirement that coinbases must be first shielded 2018-01-27 14:54:22 -05:00
BlueSilver22 cef3f89e75
Merge pull request #49 from zanethomas/change-sighash-forkid 
SIGHASH_FORKID defined as an int but used in the code as a bit-field constant
 2018-01-25 17:15:02 -05:00
Zane Thomas 0c5a196b1b SIGHASH_FORKID defined as an int but used in the code as a bit-field constant 
This is a serious error which is causing a lot of trouble in the test
suite. I have not been able to determine what sorts of problems it
might cause, or vulnerabilities open up, but I believe that this
constant should be changed asap.
 2018-01-23 20:05:43 -06:00
Zane Thomas ae963c00d8 Bringing In Test Failure Fixes from zclassic 
These are all the changes I made recently to get the full test suite to
run in zclassic. Running the same test suite on BTCPrivate is
generating new errors. I’ll be making a new branch for those.
 2018-01-21 21:00:56 -06:00
Jon Layton f459e58f54 strMessageMagic for BitcoinPrivate 2018-01-16 11:13:05 -06:00
Rhett Creighton b1e4e22d12
Merge pull request #29 from leto/2way_replay_protection 
Use a valid shift for SCRIPT_ENABLE_SIGHASH_FORKID
 2018-01-05 21:44:13 -06:00
Jonathan "Duke" Leto 815b962c71 Use a valid shift for SCRIPT_ENABLE_SIGHASH_FORKID 2018-01-05 19:20:14 -08:00
Rhett Creighton 97423c77de
Merge pull request #28 from leto/2way_replay_protection 
This constant is actually spelled SCRIPT_ERR_ILLEGAL_FORKID
 2018-01-05 18:39:12 -06:00
Jonathan "Duke" Leto e70c93fdd4 This constant is actually spelled SCRIPT_ERR_ILLEGAL_FORKID 2018-01-05 15:28:08 -08:00
Rhett Creighton bfff58020b
Merge pull request #18 from leto/2way_replay_protection 
2way replay protection
 2018-01-03 19:55:23 -06:00
airk42 076dc380ff
Merge pull request #19 from zero1z/patch-1 
Replace "Kb" and "kB" with KB
 2018-01-01 01:53:46 -05:00
zero1z 353b429f04
Replace "Kb" and "kB" with KB 
A trivial change to avoid possible confusion with the number of bytes -- and also to maintain consistency.
 2017-12-31 06:07:34 -05:00
Jonathan "Duke" Leto da30307c73 Lowercase our currency name, hey look, an emerging standard 2017-12-30 23:51:38 -08:00
Jonathan "Duke" Leto 3113973c12 Make sure to allow SIGHASH_FORKID in a few places 2017-12-30 23:38:58 -08:00
Jonathan "Duke" Leto 44a066194a Update CheckSignatureEncoding 2017-12-30 22:10:40 -08:00
Jonathan "Duke" Leto 402ff83645 Add script verification flag for SIGHASH_FORKID 2017-12-30 21:45:29 -08:00
Jonathan "Duke" Leto 35844a3e01 Teach signrawtransaction RPC about SIGHASH_FORKID 2017-12-30 21:43:10 -08:00
Jonathan "Duke" Leto 6b6abb3d12 Ensure 2WRP by concatenating a unique string in the sighash when our fork is active 2017-12-30 21:23:56 -08:00
Jonathan "Duke" Leto fe749e06be Define a SIGHASH_FORKID and convert bitcoin-tx to use it 2017-12-30 20:54:12 -08:00
Rhett Creighton 66a4d607e8 remove zclassic related files 2017-12-28 11:14:30 -06:00
Rhett Creighton ca822de6a0
Merge pull request #13 from airk42/renametools 
Some renaming's
 2017-12-28 02:29:08 -06:00
airk42 8131da0554 resolved PR #13 merge conflicts 2017-12-28 03:23:32 -05:00
airk42 157e0e64e5 Renamed: 
1. zcutil -> btcputil
2. zcashd -> btcpd
3. zcash-cli -> btcp-cli
4. Misc. messages: Zcash -> Bitcoin Private and so on
 2017-12-28 02:12:59 -05:00
Rhett Creighton 6ba7737a56
Merge pull request #9 from ch4ot1c/master 
Zcash -> BTCPrivate in intro docs, AC_INIT package -> BTCPrivate
 2017-12-28 00:43:18 -06:00
Rhett Creighton 6a93b29e33
Merge pull request #11 from ch4ot1c/mac-installation 
Mac installation: nproc -> sysctl
 2017-12-28 00:39:52 -06:00
BlueSilver22 1a2071d5e3
Add files via upload 2017-12-28 01:32:47 -05:00
Jon Layton 3c445eef11 Mac installation: nproc -> sysctl 2017-12-27 22:04:54 -05:00
Jon Layton 88bf031c0e Mac installation: nproc -> sysctl 2017-12-27 22:02:08 -05:00
Jon Layton a10b01a99c Zcash -> BTCPrivate for introductory docs, AC_INIT package name is now BTCPrivate 2017-12-27 19:57:02 -05:00
Rhett Creighton bfc3959c06
Merge pull request #6 from ackusativ/min-osx-build-failure-fix 
Fix minimum mac osx version build failure for dependencies
 2017-12-26 18:59:15 -06:00
ackusativ a63c16ad9e Fix minimum mac osx version build failure for dependencies 2017-12-27 01:01:22 +01:00
Rhett Creighton 9e946ced70
Merge pull request #2 from ulloa/feature/btcprivateRebrand 
Rebranded from Zclassic to Bitcoin Private
 2017-12-25 06:04:58 -06:00
ulloa 8229ececb3 Rebranded from Zclassic to Bitcoin Private 
Links, ticker, and genesis block building which used Zclassic remain unchanged.
 2017-12-24 12:37:28 -08:00
Procrastinator 588ec1cdf9
Merge pull request #110 from tedy5/patch-1 
Update deprecation.h
 2017-11-10 13:25:09 -05:00
tedy5 0d7b77f0f1
Update deprecation.h 
New deprecation block is now 800,000. That's quick fix, feel free to chose different block.
 2017-11-10 17:52:36 +01:00
Procrastinator c71b0bbbfc Update libsnark.mk 2017-09-15 13:18:26 -04:00
Procrastinator f94256c806 Merge pull request #100 from aayanl/zcl-v1.0.10-1 
Merge v1.0.10-1 from zcash
 2017-08-24 15:03:06 -04:00
aayanl 94768ab173 Checkpoint block 160000 2017-08-23 23:06:41 -04:00
aayanl bbb2d1423c Zcash release v1.0.10-1 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJZTemCAAoJEMj0nAgfOsbEBhAQAKDhVCZbinJanT29coarBAwG
 6yXXLzhO2nQOKqLfcCLG1XyEF1cmcG73lLPBNnR6L5JSvdOcZKil7ajeyNXFCFR+
 Tq4Sl3LFURWICN6qUj+DCv0Jv7305fHTIyzxzVXv7jcMFsopVauawUVMH89Qi1tF
 dm1fLmdBSeTtdzJ8LTuiezs1j7uMDgvFzdatrTrmsJDCw9d95sWusXsFJ4JefGcN
 JadFmGo6iq7MwDhmbNneZVXntTq1AjSmWADC1vXBT75jjnBs6BdVjJWuzVpnFQxs
 NasBeZb/GnbB4kqr9uCBxCoRVsvNYLaDV95I0udEEFLD2Kf33+7L3PBh94lBHE8N
 k+cIBwMuyDv0W71dCrkJhXONWJEGMo4tAXv7lcfKa0XwMDkJPtdsdXsW/MwB3os5
 38Dx2X+/psRzwKF8w8v7sy60eyXH637EX8Hzp61qetmhIQwAgdY2NakM61KXFxMK
 GopNIk2wdU1G9ZVN1dxL9ZJRITmLn5B6DhJcwUk+MCHtPXCticferMlJaMiyQKXy
 gHJE55cQTyhRg4oI/vluVWb4NHWE480A9bZWUJBCZxT4QaBWz1nldBOhU9Qj1wR2
 SGFbXdDcZuO7eFt3ACGW/bSnqI/DczHpeKTrAvH6LBF7DA10cUm9K/xaLryZWer0
 sCuGMJoGPUpMOB4lVds5
 =9035
 -----END PGP SIGNATURE-----

Merge tag 'v1.0.10-1' into zcl-v1.0.10-1

Zcash release v1.0.10-1
 2017-08-23 21:53:37 -04:00
Joshua Yabut 20d4581134 Merge pull request #98 from z-classic/revert-zencash-exploit 
Revert ZenCash Exploit
 2017-07-10 00:24:25 -04:00
joshuayabut d753a0c790 Revert "Merge pull request #96 from dkaidalov/Fix_replay_protection" 
This reverts commit a1739f1a41, reversing
changes made to 7348fcce47.
 2017-07-09 15:54:05 -04:00
heyrhett a1739f1a41 Merge pull request #96 from dkaidalov/Fix_replay_protection 
Add replay protection. Bugfix.
 2017-07-06 14:40:05 -07:00