Commit Graph

255 Commits

Author SHA1 Message Date
Scott Sadler
81389fc7b4 merge dev; tests broken, need to use wallet for block rewards 2018-05-29 19:04:47 -03:00
Jonathan "Duke" Leto
8cf70067ac Use the KOMODO_MINDIFF_NBITS constant 2018-05-19 10:49:01 -07:00
Jonathan "Duke" Leto
16df92af59 Use latest Zcash regtest params, could not use the same as Hush because KMD has merged in latest consensus changes from ZEC upstream 2018-05-19 10:45:12 -07:00
Jonathan "Duke" Leto
373afcb499 Use correct regtest genesis block hash
komodod now starts up and dies with InvalidChainFound, I think due to
checkpoints:

call komodo_args.(./src/komodod) NOTARY_PUBKEY.()
initialized  at 1526749522
finished loading blocks
Assertion failed: (tip), function InvalidChainFound, file main.cpp, line 1942.
2018-05-19 10:05:53 -07:00
Jonathan "Duke" Leto
b78c39beb2 Convert to using CreateGenesisBlock() like Zcash upstream 2018-05-19 08:51:45 -07:00
Jonathan "Duke" Leto
db83a2c0c3 Try Hush regtest params
This fails with:

$ ./komodod -regtest
Assertion failed: (consensus.hashGenesisBlock == uint256S("0x0379ff1530af893f2f2e61146db6e900dd828dc8254215b9de23df2dba06664f")), function CRegTestParams, file chainparams.cpp, line 540.
Abort trap: 6 (core dumped)

From 1d8c55ecc2
2018-05-19 00:56:25 -07:00
Scott Sadler
0cb91a8d20 wip 2018-04-29 00:34:57 -03:00
jl777
05c2ba6371 split out asset chain p2p port from roc port 2018-04-22 17:10:35 +03:00
jl777
eb9facd492 Merge branch 'dev' into jl777 2018-03-25 22:24:20 +03:00
jl777
694e664eb9 Test 2018-03-25 21:49:50 +03:00
jl777
1ade213100 Test 2018-03-25 21:20:12 +03:00
jl777
028a570576 Test 2018-03-25 21:18:25 +03:00
jl777
aa22b9566a Test 2018-03-25 21:17:46 +03:00
jl777
b35fd60032 Test 2018-03-25 21:16:11 +03:00
jl777
d78a07c645 Test 2018-03-25 21:15:11 +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
Jack Grigg
138cf77004 Overwinter release notes and testnet activation height
Closes #2957.
2018-02-28 13:19:36 +00:00
Mihail Fedorov
b26a0857dc sleepless 2018-02-26 08:50:39 +03:00
Mihail Fedorov
4afdbc9556 New final dns names for seeds 2018-02-26 02:38:59 +03:00
Simon
2423a40c08 Add field nProtocolVersion to struct NetworkUpgrade. 2018-02-23 14:05:13 -08:00
Simon
072099d788 Implementation of Overwinter transaction format ZIP 202. 2018-02-16 10:10:15 -08:00
Jack Grigg
548683767c Add Overwinter to upgrade list 2018-02-04 22:58:42 +00:00
Jack Grigg
f52da91139 Test network upgrade logic
Also demonstrates how to specify a network upgrade.
2018-02-04 22:58:39 +00:00
Jack Grigg
b174b7e330 Allow changing network upgrade parameters on regtest
Derived from upstream commit 56c87e92110f05d7452f1e85bf755246ffc77206:
    Allow changing BIP9 parameters on regtest
2018-02-04 22:57:59 +00:00
Jack Grigg
780f526bc9 Network upgrade activation mechanism 2018-02-04 22:57:56 +00: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
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
Jack Grigg
49cf707d2c Add Base58 encoding of viewing keys 2017-12-20 00:46:33 +00:00
syd
dffc025d38 Get rid of consensus.fPowAllowMinDifficultyBlocks.
This closes #1380
2017-11-23 12:20:50 -05:00
jl777
b978bc5b67 Test 2017-11-10 19:20:03 +02:00
jl777
7c130297c2 KOMODO_ASSETCHAIN_MAXLEN -> 65 2017-11-10 19:07:36 +02:00
ca333
9d36579649 uni3 2017-10-09 11:45:49 +02:00
Homu
0a80a1cea3 Auto merge of #2227 - str4d:2074-ignore-virtual-cores, r=str4d
Use real number of cores, ignore virtual cores

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#6361
- bitcoin/bitcoin#6370

Part of #2074.
2017-06-15 17:05:02 -07:00
Simon
05844ba53b Change regtest port to 18344. Closes #2269. 2017-04-16 14:48:04 -07:00
jl777
d5f3353d30 Test 2017-03-30 05:34:26 +03:00
jl777
945f015d80 Initial merge 2017-03-30 04:35:16 +03:00
Wladimir J. van der Laan
2854c4e366 Remove ChainParams::DefaultMinerThreads
No longer relevant after #5957. This hack existed because of another
hack where the numthreads parameter, on regtest, doubled as how many
blocks to generate.
2017-03-29 16:06:02 +13:00
Wladimir J. van der Laan
ce83df8fc4 rpc: Remove chain-specific RequireRPCPassword
I've never liked the chain-specific exception to having to set a
password. It gives issues with #6388 which makes it valid to
set no password in every case (as it enables random cookie authentication).

This pull removes the flag, so that all chains are regarded the same.

It also removes the username==password test, which doesn't provide any
substantial extra security.
2017-03-02 13:23:03 -08:00
zkbot
1a41597af8 Auto merge of #2114 - bitcartel:fix_fr_test_bug_and_new_testnet_addresses, r=daira
Closes #2113. Fixes bug in test and updates testnet fr addresses.

Updating the testnet fr addresses will introduce a consensus change on testnet, so all testnet nodes will be required to upgrade.  See #2113 for more information.
2017-03-02 02:18:33 +00:00
zkbot
6f5d8fbe81 Auto merge of #2126 - bitcartel:checkpoint_mainnet_67500, r=daira
Add checkpoint at block 67500 (mainnet)

Close #2125
2017-02-28 01:01:56 +00:00
Simon
5a888f7294 Add testnet checkpoint at block 38000 2017-02-22 22:34:20 -08:00
Simon
b897de531c Add mainnet checkpoint at block 67500 2017-02-22 21:36:44 -08:00
Simon
1003180260 Keep first three original testnet fr addresses so existing coinbase
transactions on testnet remain valid during upgrade.  New addresses
will be used starting from block 53127.
2017-02-22 11:04:17 -08:00