diff --git a/README.md b/README.md index 23577d54f..665bc1a1e 100644 --- a/README.md +++ b/README.md @@ -1,35 +1,22 @@ -Bitcoin Core integration/staging tree -===================================== +NYC3 (NewYorkCoin3) integration/staging tree +============================================ -[![Build Status](https://travis-ci.org/bitcoin/bitcoin.svg?branch=master)](https://travis-ci.org/bitcoin/bitcoin) -https://bitcoincore.org +Built upon Bitcoin Core 0.18; NYC3 offers a blocktime of 10 seconds, consensus operates using the 'Parallel' password hashing algorithm in a POW configuration (SHA512-based) and uses LWMA3 to regulate block-spacing. -What is Bitcoin? ----------------- - -Bitcoin is an experimental digital currency that enables instant payments to -anyone, anywhere in the world. Bitcoin uses peer-to-peer technology to operate -with no central authority: managing transactions and issuing money are carried -out collectively by the network. Bitcoin Core is the name of open source -software which enables the use of this currency. - -For more information, as well as an immediately useable, binary version of -the Bitcoin Core software, see https://bitcoincore.org/en/download/, or read the -[original whitepaper](https://bitcoincore.org/bitcoin.pdf). License ------- -Bitcoin Core is released under the terms of the MIT license. See [COPYING](COPYING) for more +NYC3 is released under the terms of the MIT license. See [COPYING](COPYING) for more information or see https://opensource.org/licenses/MIT. Development Process ------------------- The `master` branch is regularly built and tested, but is not guaranteed to be -completely stable. [Tags](https://github.com/bitcoin/bitcoin/tags) are created -regularly to indicate new official, stable release versions of Bitcoin Core. +completely stable. [Tags](https://github.com/nyc3coin/nyc3/tags) are created +regularly to indicate new official, stable release versions of NYC3. The contribution workflow is described in [CONTRIBUTING.md](CONTRIBUTING.md) and useful hints for developers can be found in [doc/developer-notes.md](doc/developer-notes.md). @@ -61,17 +48,3 @@ Changes should be tested by somebody other than the developer who wrote the code. This is especially important for large or high-risk changes. It is useful to add a test plan to the pull request description if testing the changes is not straightforward. - -Translations ------------- - -Changes to translations as well as new translations can be submitted to -[Bitcoin Core's Transifex page](https://www.transifex.com/projects/p/bitcoin/). - -Translations are periodically pulled from Transifex and merged into the git repository. See the -[translation process](doc/translation_process.md) for details on how this works. - -**Important**: We do not accept translation changes as GitHub pull requests because the next -pull from Transifex would automatically overwrite them again. - -Translators should also subscribe to the [mailing list](https://groups.google.com/forum/#!forum/bitcoin-translators). diff --git a/src/consensus/consensus.h b/src/consensus/consensus.h index 788fa4e55..00a734851 100644 --- a/src/consensus/consensus.h +++ b/src/consensus/consensus.h @@ -16,7 +16,7 @@ static const unsigned int MAX_BLOCK_WEIGHT = 4000000; /** The maximum allowed number of signature check operations in a block (network rule) */ static const int64_t MAX_BLOCK_SIGOPS_COST = 80000; /** Coinbase transaction outputs can only be spent after this number of new blocks (network rule) */ -static const int COINBASE_MATURITY = 100; +static const int COINBASE_MATURITY = 40; static const int WITNESS_SCALE_FACTOR = 4; diff --git a/src/validation.cpp b/src/validation.cpp index cbe4f8384..4392b50cf 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -1158,7 +1158,7 @@ CAmount GetBlockSubsidy(int nHeight, const Consensus::Params& consensusParams) if (nHeight > 0 && nHeight <= 16) nSubsidy = 9062500000 * COIN; if (nHeight > 16) - nSubsidy = 500 * COIN; + nSubsidy = 125 * COIN; return nSubsidy; }