Commit Graph

10826 Commits

Author SHA1 Message Date
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
Homu d6ec3954c6 Auto merge of #2474 - bitcartel:release-v1.0.10-1, r=bitcartel
Release v1.0.10-1
2017-06-23 20:13:47 -07:00
Simon 2762b68576 make-release.py: Updated release notes and changelog for 1.0.10-1. 2017-06-23 19:50:41 -07:00
Simon a0a3eb70b9 make-release.py: Updated manpages for 1.0.10-1. 2017-06-23 19:50:40 -07:00
Simon d444e1cf40 make-release.py: Versioning changes for 1.0.10-1. 2017-06-23 19:43:29 -07:00
Homu ad5e8a544b Auto merge of #2462 - str4d:2404-gitian-no-proton, r=ebfull
Disable building Proton in Gitian

This is the patch used to build 1.0.9 and 1.0.10.

Part of #2404.
2017-06-23 18:34:31 -07:00
Homu 1605da740e Auto merge of #2473 - ebfull:init-proto-hotfix-release, r=ebfull
Revert changes to INIT_PROTO_VERSION

This reverts https://github.com/zcash/zcash/pull/2245 in order to fix degraded networking behavior for 1.0.10 clients.
2017-06-23 17:26:34 -07:00
Sean Bowe 15a9937654 Revert "Delete old protocol version constants and simplify code that used them."
This reverts commit 5a49c929dd.
2017-06-23 18:19:25 -06:00
Sean Bowe 9ad9a25eff Revert "Remove an unneeded version workaround as per @str4d's review comment."
This reverts commit 1e9db0b38a.
2017-06-23 18:19:17 -06:00
Dmytro Kaidalov 0d9afc87eb Add replay protection. Bugfix. 2017-06-23 18:31:05 +03:00
Jack Grigg f86111d3f5
Disable building Proton in Gitian
This is the patch used to build 1.0.9 and 1.0.10.

Part of #2404.
2017-06-23 01:02:01 +12:00
Homu d52ac0d498 Auto merge of #2461 - str4d:release-v1.0.10, r=str4d
Release v1.0.10
2017-06-21 20:40:11 -07:00
Jack Grigg 5073467dad
Move temporary release notes to final ones 2017-06-22 15:23:02 +12:00
Jack Grigg 93a63765b6
make-release.py: Updated release notes and changelog for 1.0.10. 2017-06-22 15:13:04 +12:00
Jack Grigg c04ffa0e32
make-release.py: Updated manpages for 1.0.10. 2017-06-22 15:05:04 +12:00
Jack Grigg dc2ead6021
make-release.py: Versioning changes for 1.0.10. 2017-06-22 14:47:15 +12:00
Homu 59de56eeca Auto merge of #2342 - bitcartel:1081__mempoolpatch, r=str4d
Add ability for node to reject tx from mempool by number of tx inputs

Implement short-term solution described in #2343 so that users can respond promptly to critical short-term problems caused by quadratic validation scaling, such as the getblocktemplate latency, block propagation latency, and mempool size inflation issues described in #2333.
2017-06-21 14:42:13 -07:00
Jack Grigg 6ea58d1531
Use sendfrom for both t-addr calls 2017-06-22 09:34:10 +12:00
Homu 02e5fffadc Auto merge of #2360 - daira:2359.remove-lax-der-validation, r=arcalinea
Remove unneeded lax ECDSA signature verification

Fixes #2359. Removes code for lax ECDSA verification, and the SCRIPT_VERIFY_DERSIG flag that controlled it. The behaviour is as-if the flag is always set.
2017-06-20 19:05:58 -07:00
Simon 99f6d5da6c Fix #b1eb4f2 so test checks sendfrom as originally intended.
Also reduce number of z_sendmany calls made so test runs quicker.
2017-06-20 22:49:47 +00:00
Daira Hopwood 193b3e8b28 Delete test that is redundant and inapplicable to Zcash.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2017-06-20 10:03:17 +01:00
Homu c050b99469 Auto merge of #2456 - btccom:master, r=str4d
[mining] let "getblocktemplate" work when disable wallet

we already support GetBlockTemplate without build wallet, see:

https://github.com/zcash/zcash/blob/master/src/rpcmining.cpp

```
    // Wallet or miner address is required because we support coinbasetxn
    if (GetArg("-mineraddress", "").empty()) {
#ifdef ENABLE_WALLET
        if (!pwalletMain) {
            throw JSONRPCError(RPC_METHOD_NOT_FOUND, "Wallet disabled and -mineraddress not set");
        }
#else
        throw JSONRPCError(RPC_METHOD_NOT_FOUND, "zcashd compiled without wallet and -mineraddress not set");
#endif
    }
```

so the macro should be removed from `src/rpcserver.cpp`, otherwise you can't call `getblocktemplate` when you disable wallet.
2017-06-20 01:15:15 -07:00
Jack Grigg b1eb4f251a
Fix comment 2017-06-20 19:54:11 +12:00
Homu 00fd23930b Auto merge of #2443 - str4d:1621-priority-download-path, r=str4d
Rename FALLBACK_DOWNLOAD_PATH to PRIORITY_DOWNLOAD_PATH

Closes #1621.
2017-06-19 23:46:44 -07:00
Simon d8616d012a Partial revert & fix for commit 9e84b5a ; code block in wrong location. 2017-06-19 21:11:34 -07:00
Jack Grigg 4ef014151d
Additional testing of -mempooltxinputlimit 2017-06-20 15:58:46 +12:00
Kevin Pan 26d27a15ce "getblocktemplate" could work without wallet 2017-06-20 10:41:46 +08:00
Joshua Yabut 7348fcce47 Merge pull request #95 from z-classic/fix-redeems
Allow reedeeming of previously replay protected transactions
2017-06-19 18:44:14 -04:00
joshuayabut 476b5245a8 Make multisig replay protected txs redeemable 2017-06-19 15:35:43 -04:00