Commit Graph

16678 Commits

Author SHA1 Message Date
jl777
1cb56d219f Merge pull request #510 from kolobus/dev
-pax
2018-01-27 18:34:06 +04:00
Mihail Fedorov
8a52db13e1 pax 2018-01-27 17:26:42 +03:00
DeckerSU
b3f7ce9b7a added checkpoints for KMD blockchain. need to be tested.
- added method SetCheckpointData for CChainParams.
- as we can't check asset it or not in CMainParams() constructor, because command line arguments don't initialized at that time, we will execute SetCheckpointData in chainparams_commandline later.

changes was tested in komodo-qt wallet, but additional tests wouldn't be superfluous.
2018-01-27 13:28:43 +03:00
jl777
5513bebbf2 Merge pull request #509 from kolobus/dev
So long and thanks for all the pax
2018-01-27 10:46:10 +04:00
Mihail Fedorov
580a1ae0cf VOTE chain 2018-01-27 05:14:24 +03:00
Mihail Fedorov
26e6a849ac So long and thanks for all the pax 2018-01-27 04:47:14 +03:00
Mihail Fedorov
b3b56273c6 So long and thanks for all the pax 2018-01-27 04:46:39 +03:00
jl777
f41277aa91 PIZZA and BEER 2018-01-25 16:54:43 +04:00
Homu
70109a74e9 Auto merge of #2902 - bitcartel:2901_remove_unused_noblks_constants, r=daira
Remove unused NOBLKS_VERSION_{START,END} constants from version.h

Closes #2901. Backport from upstream PR https://github.com/bitcoin/bitcoin/pull/7662.
2018-01-25 04:37:33 -08:00
Pavel Vasin
20bfa355a0 remove unused NOBLKS_VERSION_{START,END} constants 2018-01-23 15:44:35 -08:00
Scott Sadler
63d3e4aab1 add isFulfulled to cryptoconditions 2018-01-23 14:12:43 -03:00
Scott Sadler
6585a02268 cli method to create CC transaction 2018-01-23 14:05:43 -03:00
Homu
a4a020de7b Auto merge of #2217 - str4d:2074-chainparams, r=str4d
Bitcoin 0.12 chainparams cleanups

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#6222
- bitcoin/bitcoin#6381
- bitcoin/bitcoin#6473
- bitcoin/bitcoin#6242

Part of #2074.
2018-01-22 15:22:24 -08:00
Homu
b4a20ae5ac Auto merge of #2897 - str4d:2892-zkey-rpc-bugfix, r=str4d
zkey_import_export: Synchronize mempools before mining

Resolves a race condition that caused the RPC test to intermittently fail.

Closes #2892.
2018-01-22 14:11:50 -08:00
Jack Grigg
9e8f1d09ca zkey_import_export: Synchronize mempools before mining
Resolves a race condition that caused the RPC test to intermittently fail.

Closes #2892.
2018-01-22 21:10:57 +00:00
Homu
d11230be73 Auto merge of #2886 - bitcartel:2885_cleanup_node_getutxo, r=str4d
Remove redundant service flag NODE_GETUTXO meant for Bitcoin XT.

For #2885. This frees up a service bit.  Zcash has never used this flag
and upstream Bitcoin Core does not support this flag, although
it did reserve it for compatibility with Bitcoin XT.
2018-01-22 08:38:49 -08:00
Jack Grigg
40ebf08ff8 Add viewing key prefix to regtest parameters 2018-01-22 15:32:52 +00:00
Jack Grigg
ff145dfe32 Add missing namespace for boost::get 2018-01-22 10:30:41 -05:00
Cory Fields
91690d6e84 chainparams: don't use std namespace 2018-01-22 10:30:41 -05:00
Cory Fields
47b71cec5d chainparams: move CCheckpointData into chainparams.h
This unties CChainParams from its dependency on checkpoints. Instead, now it
only depends on the raw checkpoint data.
2018-01-22 10:30:41 -05:00
Daniel Kraft
a97308c5d4 Clean up chainparams some more.
Clean up the code in chainparams a bit more after the recent
refactorings.  In particular, make sure the structure of the "RegTest"
params matches the structure of the other classes.  This makes the code
clearer to read.

Also remove redundant values of the genesis block in always-specified
optional arguments and mark variable/argument as "const".
2018-01-22 10:30:41 -05:00
Jorge Timón
54ab3b3183 Chainparams: CTestNetParams and CRegTestParams extend directly from CChainParams
...instead of CMainParams and CTestNetParams respectively

Do the same for CBaseChainParams.
The inheritance was only reducing readibility in this case
2018-01-22 10:30:41 -05:00
Jorge Timón
90b6ee6ce5 Chainparams: Introduce CreateGenesisBlock() static function 2018-01-22 10:30:41 -05:00
Mark Friedenbach
fe53749dc9 Explicitly set tx.nVersion for the genesis block and mining tests
If/when CTransaction::CURRENT_VERSION is incremented, this will break CChainParams and the miner tests. This fix sets the transaction version explicitly where we depend on the hash value (genesis block, proof of work checks).
2018-01-22 10:30:41 -05:00
jl777
854c233d36 Merge pull request #507 from ca333/dev
333
2018-01-22 10:07:05 +03:00
ca333
da925f7863 333
removed unneeded dependencies
2018-01-22 06:02:44 +01:00
ca333
b78cf0c841 Merge pull request #66 from jl777/dev
dev update
2018-01-22 05:30:50 +01:00
Simon
03a61ed87c Remove redundant service flag NODE_GETUTXO meant for Bitcoin XT.
This frees up a service bit.  Zcash has never used this flag
and upstream Bitcoin Core does not support this flag, although
it did reserve it for compatibility with Bitcoin XT.
2018-01-19 17:22:54 -08:00
Homu
38246ea461 Auto merge of #2873 - bitcartel:2793_dbcache, r=bitcartel
Closes #2793 to improve sync performance by increasing default value of dbcache.
2018-01-19 16:53:21 -08:00
Simon
d2b77b7afa Add note about dbcache to 1.0.15 release notes.
Adapted from upstream release notes here:
https://github.com/bitcoin/bitcoin/blob/master/doc/release-notes/release-notes-0.14.1.md#utxo-memory-accounting
2018-01-19 16:52:25 -08:00
Simon
334d591377 Add documentation about dbcache.
Adapted from documentation 'Reducing bitcoind memory usage' by @laanwj
https://gist.github.com/laanwj/efe29c7661ce9b6620a7
2018-01-17 16:55:26 -08:00
Homu
fdb59266fb Auto merge of #2848 - str4d:2795-rpc-test-chainValueZat, r=str4d
Check chainValueZat when checking value pool monitoring

Addresses https://github.com/zcash/zcash/pull/2795#discussion_r157343660
2018-01-17 10:17:46 -08:00
Homu
d80ab8ad34 Auto merge of #2845 - str4d:exportdir-completion, r=str4d
Enable Bash completion for -exportdir
2018-01-16 15:30:22 -08:00
Simon
5befbed4bc Fixes #2793. Backport commit f33afd3 to increase dbcache default. 2018-01-15 23:17:34 -08:00
Homu
0ad9255d2a Auto merge of #2858 - sandakersmann:patch-1, r=daira
Changed http:// to https:// on some links

Changed http:// to https:// on some links in code_of_conduct.md
2018-01-14 00:37:05 -08:00
Marius Kjærstad
a3e09f2117 Changed http:// to https:// on some links
Changed http:// to https:// on some links in code_of_conduct.md
2018-01-08 05:13:11 +01:00
jl777
df473cc277 Check for null index in FindFork 2018-01-07 18:06:14 +07:00
Homu
b2a114a8c9 Auto merge of #2771 - syd0:fix-snark-dep-build, r=str4d
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.
2018-01-04 17:06:33 -08:00
Homu
8dbe11451a Auto merge of #2770 - syd0:remove-some-cruft, r=str4d
Remove OSX and Windows files from Makefile + share directory.

These are stale holdovers from bitcoin.

This closes #2169.
2018-01-04 16:02:27 -08:00
syd
b6a990def0 Remove OSX and Windows files from Makefile + share directory.
These are stale holdovers from bitcoin.

This closes #2169.
2018-01-04 22:50:17 +00:00
Homu
db9f6f0485 Auto merge of #2821 - str4d:2335-scope-ecdsa-constants, r=str4d
Scope the ECDSA constant sizes to CPubKey / CKey classes

Cherry-picked from https://github.com/bitcoin/bitcoin/pull/10657, upstreaming our patches from #2335.
2018-01-04 14:47:50 -08:00
jl777
b91547118a -fiat -shark fiat-cli 2018-01-04 18:45:07 +07:00
jl777
5faab5a65a -SHARK 2018-01-04 18:35:35 +07:00
Homu
1ddecf644f Auto merge of #2849 - str4d:release-v1.0.14, r=str4d
Release v1.0.14
2018-01-03 16:39:43 -08:00
Jack Grigg
6bfa0fb79d make-release.py: Updated release notes and changelog for 1.0.14. 2018-01-03 23:54:16 +01:00
Jack Grigg
d3c1949cf1 make-release.py: Updated manpages for 1.0.14. 2018-01-03 23:54:00 +01:00
Jack Grigg
2091cf23ae make-release.py: Versioning changes for 1.0.14. 2018-01-03 23:44:51 +01:00
Jack Grigg
44e5b42751 Check chainValueZat when checking value pool monitoring 2018-01-03 23:41:53 +01:00
Jay Graber
9d2974ed5b Add getdeprecationinfo rpc call to return current version and deprecation block height. 2018-01-02 11:38:39 -08:00
jl777
6f95f2e584 Merge pull request #504 from jl777/dev
new coins and -SHARK
2018-01-03 01:07:13 +07:00