Merge knots_branding-0.20

.github/ISSUE_TEMPLATE.md

@@ -1,8 +1,8 @@
-<!-- This issue tracker is only for technical issues related to Bitcoin Core.
+<!-- This issue tracker is only for technical issues related to Bitcoin Knots.
 
 General bitcoin questions and/or support requests are best directed to the Bitcoin StackExchange at https://bitcoin.stackexchange.com.
 
-For reporting security issues, please read instructions at https://bitcoincore.org/en/contact/.
+For reporting security issues, please read instructions at https://bitcoinknots.org/contact/
 
 If the node is "stuck" during sync or giving "block checksum mismatch" errors, please ensure your hardware is stable by running memtest and observe CPU temperature with a load-test tool such as linpack before creating an issue! -->
 
@@ -13,7 +13,7 @@ If the node is "stuck" during sync or giving "block checksum mismatch" errors, p
 
 <!--- How reliably can you reproduce the issue, what are the steps to do so? -->
 
-<!-- What version of Bitcoin Core are you using, where did you get it (website, self-compiled, etc)? -->
+<!-- What version of Bitcoin Knots are you using, where did you get it (website, self-compiled, etc)? -->
 
 <!-- What type of machine are you observing the error on (OS/CPU and disk type)? -->
 

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,11 +7,13 @@ assignees: ''
 
 ---
 
-<!-- This issue tracker is only for technical issues related to Bitcoin Core.
+<!-- This issue tracker is only for technical issues related to Bitcoin Knots.
 
 General bitcoin questions and/or support requests are best directed to the Bitcoin StackExchange at https://bitcoin.stackexchange.com.
 
-For reporting security issues, please read instructions at https://bitcoincore.org/en/contact/.
+For reporting security issues, please read instructions at https://bitcoinknots.org/contact/
+
+If your issue also affects Bitcoin Core, report it at https://github.com/bitcoin/bitcoin/issues/new?labels=Bug&template=bug_report.md
 
 If the node is "stuck" during sync or giving "block checksum mismatch" errors, please ensure your hardware is stable by running memtest and observe CPU temperature with a load-test tool such as linpack before creating an issue! -->
 
@@ -31,7 +33,7 @@ If the node is "stuck" during sync or giving "block checksum mismatch" errors, p
 
 **System information**
 
-<!-- What version of Bitcoin Core are you using, where did you get it (website, self-compiled, etc)? -->
+<!-- What version of Bitcoin Knots are you using, where did you get it (website, self-compiled, etc)? -->
 
 <!-- What type of machine are you observing the error on (OS/CPU and disk type)? -->
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,13 +1,19 @@
 <!--
 *** Please remove the following help text before submitting: ***
 
+Before opening a pull request to Bitcoin Knots, please first consider if it
+is appropriate for Bitcoin Core and, if so, rebase it and [open a pull request](https://github.com/bitcoin/bitcoin/compare)
+there first! Bitcoin Core has a strict and slow review process, but since
+Knots is more relaxed, feel free to request a merge of your Core PR into
+Knots even while it's waiting on Core.
+
 Pull requests without a rationale and clear improvement may be closed
 immediately.
 -->
 
 <!--
 Please provide clear motivation for your patch and explain how it improves
-Bitcoin Core user experience or Bitcoin Core developer experience
+Bitcoin Knots user experience or Bitcoin Knots developer experience
 significantly:
 
 * Any test improvements or new tests that improve coverage are always welcome.
@@ -18,22 +24,7 @@ significantly:
 * Bug fixes are most welcome when they come with steps to reproduce or an
   explanation of the potential issue as well as reasoning for the way the bug
   was fixed.
-* Features are welcome, but might be rejected due to design or scope issues.
-  If a feature is based on a lot of dependencies, contributors should first
-  consider building the system outside of Bitcoin Core, if possible.
-* Refactoring changes are only accepted if they are required for a feature or
-  bug fix or otherwise improve developer experience significantly. For example,
-  most "code style" refactoring changes require a thorough explanation why they
-  are useful, what downsides they have and why they *significantly* improve
-  developer experience or avoid serious programming bugs. Note that code style
-  is often a subjective matter. Unless they are explicitly mentioned to be
-  preferred in the [developer notes](/doc/developer-notes.md), stylistic code
-  changes are usually rejected.
--->
-
-<!--
-Bitcoin Core has a thorough review process and even the most trivial change
-needs to pass a lot of eyes and requires non-zero or even substantial time
-effort to review. There is a huge lack of active reviewers on the project, so
-patches often sit for a long time.
+* Features are typically welcome.
+* Refactoring changes are never accepted in Knots, and must be performed in
+  Bitcoin Core.
 -->

CONTRIBUTING.md

@@ -1,12 +1,12 @@
-Contributing to Bitcoin Core
-============================
+Contributing to Bitcoin Knots
+=============================
 
-The Bitcoin Core project operates an open contributor model where anyone is
+The Bitcoin Knots project operates an open contributor model where anyone is
 welcome to contribute towards development in the form of peer review, testing
 and patches. This document explains the practical process and guidelines for
 contributing.
 
-Firstly in terms of structure, there is no particular concept of "Core
+Firstly in terms of structure, there is no particular concept of "core
 developers" in the sense of privileged people. Open source often naturally
 revolves around meritocracy where longer term contributors gain more trust from
 the developer community. However, some hierarchy is necessary for practical
@@ -21,7 +21,7 @@ list or participate in a weekly [Bitcoin Core PR Review Club](https://bitcoincor
 Communication Channels
 ----------------------
 
-Most communication about Bitcoin Core development happens on IRC, in the
+Most communication about Bitcoin development happens on IRC, in the
 #bitcoin-core-dev channel on Freenode. The easiest way to participate on IRC is
 with the web client, [webchat.freenode.net](https://webchat.freenode.net/). Chat
 history logs can be found
@@ -208,11 +208,11 @@ workload on reviewing.
 "Decision Making" Process
 -------------------------
 
-The following applies to code changes to the Bitcoin Core project (and related
+The following applies to code changes to the Bitcoin Knots project (and related
 projects such as libsecp256k1), and is not to be confused with overall Bitcoin
 Network Protocol consensus changes.
 
-Whether a pull request is merged into Bitcoin Core rests with the project merge
+Whether a pull request is merged into Bitcoin Knots rests with the project merge
 maintainers and ultimately the project lead.
 
 Maintainers will take into consideration if a patch is in line with the general
@@ -351,7 +351,7 @@ https://github.com/bitcoin-core/bitcoin-maintainer-tools#backport).
 Release Policy
 --------------
 
-The project leader is the release manager for each Bitcoin Core release.
+The project leader is the release manager for each Bitcoin Knots release.
 
 Copyright
 ---------

INSTALL.md

@@ -2,4 +2,4 @@ Building Bitcoin
 ================
 
 See doc/build-*.md for instructions on building the various
-elements of the Bitcoin Core reference implementation of Bitcoin.
+elements of Bitcoin Knots.

Makefile.am

@@ -55,7 +55,7 @@ BIN_CHECKS=$(top_srcdir)/contrib/devtools/symbol-check.py \
            $(top_srcdir)/contrib/devtools/security-check.py
 
 WINDOWS_PACKAGING = src/qt/res/rendered_icons/bitcoin.ico \
-  $(top_srcdir)/share/pixmaps/nsis-header.bmp \
+  src/qt/res/rendered_icons/nsis-header.bmp \
   src/qt/res/rendered_icons/nsis-wizard.bmp \
   $(top_srcdir)/doc/README_windows.txt
 

README.md

@@ -1,36 +1,46 @@
-Bitcoin Core integration/staging tree
-=====================================
+Bitcoin Knots
+=============
 
-https://bitcoincore.org
+https://bitcoinknots.org
 
 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
+out collectively by the network. Bitcoin Knots is the name of open source
 software which enables the use of this currency.
 
 For more information, as well as an immediately usable, binary version of
-the Bitcoin Core software, see https://bitcoincore.org/en/download/, or read the
-[original whitepaper](https://bitcoincore.org/bitcoin.pdf).
+the Bitcoin Knots software, see https://bitcoinknots.org/ or read the
+[original whitepaper](https://bitcoin.org/bitcoin.pdf).
 
 License
 -------
 
-Bitcoin Core is released under the terms of the MIT license. See [COPYING](COPYING) for more
+Bitcoin Knots 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.
+Development generally takes place as part of [Bitcoin Core](https://github.com/bitcoin/bitcoin), and is merged into
+Knots for each release.
 
-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).
+Even if your pull request to Core is closed, or if your feature is not
+suitable for Core (eg, because it builds on a features not supported in Core;
+relies on centralised services; etc), it may still be eligible for inclusion
+in Bitcoin Knots. In this case, a pull request may be opened on the
+[Knots GitHub](https://github.com/bitcoinknots/bitcoin) for review and consideration.
+When accepted, you are expected to maintain the submitted branch in your own
+repository, and it will be automatically merged into new releases of Knots.
+
+The developer [mailing list](https://lists.linuxfoundation.org/mailman/listinfo/bitcoin-dev)
+should be used to discuss complicated or controversial changes before working
+on a patch set.
+
+Developer IRC can be found on Freenode at #bitcoin-dev.
 
 Testing
 -------

SECURITY.md

@@ -2,17 +2,22 @@
 
 ## Supported Versions
 
-See our website for versions of Bitcoin Core that are currently supported with
-security updates: https://bitcoincore.org/en/lifecycle/#schedule
+Only the most recent version of Bitcoin Knots is typically supported.
+If you need longer support periods, consider using Bitcoin Core instead, or
+if you are willing to financially fund long-term maintenance, you may contact
+Luke Dashjr at luke_bcknots_funding@dashjr.org.
 
 ## Reporting a Vulnerability
 
-To report security issues send an email to security@bitcoincore.org (not for support).
+To report security issues send an email to luke_bcknots_security@dashjr.org (not for support).
+
+If your issue affects Bitcoin Core as well, also email security@bitcoincore.org.
 
 The following keys may be used to communicate sensitive information to developers:
 
 | Name | Fingerprint |
 |------|-------------|
+| Luke Dashjr | E463 A93F 5F31 17EE DE6C 7316 BD02 9424 21F4 889F |
 | Wladimir van der Laan | 71A3 B167 3540 5025 D447  E8F2 7481 0B01 2346 C9A6 |
 | Jonas Schnelli | 32EE 5C4C 3FA1 5CCA DB46  ABE5 29D4 BCB6 416F 53EC |
 | Pieter Wuille | 133E AC17 9436 F14A 5CF1  B794 860F EB80 4E66 9320 |

build_msvc/README.md

@@ -5,7 +5,7 @@ Introduction
 ---------------------
 Solution and project files to build the Bitcoin Core applications `msbuild` or Visual Studio can be found in the build_msvc directory. The build has been tested with Visual Studio 2017 and 2019.
 
-Building with Visual Studio is an alternative to the Linux based [cross-compiler build](https://github.com/bitcoin/bitcoin/blob/master/doc/build-windows.md).
+Building Knots with Visual Studio is NOT supported, and it is recommended to instead use the Linux based [cross-compiler build](https://github.com/bitcoin/bitcoin/blob/master/doc/build-windows.md).
 
 Quick Start
 ---------------------

configure.ac

@@ -8,7 +8,7 @@ define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2020)
 define(_COPYRIGHT_HOLDERS,[The %s developers])
 define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Bitcoin Core]])
-AC_INIT([Bitcoin Core],m4_join([.], _CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MINOR, _CLIENT_VERSION_REVISION, m4_if(_CLIENT_VERSION_BUILD, [0], [], _CLIENT_VERSION_BUILD))m4_if(_CLIENT_VERSION_RC, [0], [], [rc]_CLIENT_VERSION_RC),[https://github.com/bitcoin/bitcoin/issues],[bitcoin],[https://bitcoincore.org/])
+AC_INIT([Bitcoin Knots],m4_join([.], _CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MINOR, _CLIENT_VERSION_REVISION, m4_if(_CLIENT_VERSION_BUILD, [0], [], _CLIENT_VERSION_BUILD))m4_if(_CLIENT_VERSION_RC, [0], [], [rc]_CLIENT_VERSION_RC),[https://github.com/bitcoinknots/bitcoin/issues],[bitcoin],[http://bitcoinknots.org/])
 AC_CONFIG_SRCDIR([src/validation.cpp])
 AC_CONFIG_HEADERS([src/config/bitcoin-config.h])
 AC_CONFIG_AUX_DIR([build-aux])
@@ -600,6 +600,9 @@ case $host in
 
      dnl We require Windows 7 (NT 6.1) or later
      AX_CHECK_LINK_FLAG([[-Wl,--major-subsystem-version -Wl,6 -Wl,--minor-subsystem-version -Wl,1]],[LDFLAGS="$LDFLAGS -Wl,--major-subsystem-version -Wl,6 -Wl,--minor-subsystem-version -Wl,1"],,[[$LDFLAG_WERROR]])
+
+     AC_PATH_PROGS([RSVG_CONVERT], [rsvg-convert rsvg],rsvg-convert)
+     AC_PATH_PROGS([IMAGEMAGICK_CONVERT], [convert],convert)
      ;;
   *darwin*)
      if test x$PNG2ICNS = xno; then

contrib/gitian-descriptors/gitian-win.yml

@@ -18,6 +18,7 @@ packages:
 - "libtool"
 - "automake"
 - "faketime"
+- "fonts-tuffy"
 - "bsdmainutils"
 - "mingw-w64"
 - "g++-mingw-w64"

contrib/init/bitcoind.conf

@@ -1,4 +1,4 @@
-description "Bitcoin Core Daemon"
+description "Bitcoin Knots Daemon"
 
 start on runlevel [2345]
 stop on starting rc RUNLEVEL=[016]

contrib/init/bitcoind.init

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-#  bitcoind The bitcoin core server.
+#  bitcoind The Bitcoin Knots server.
 #
 #
 # chkconfig: 345 80 20

contrib/init/bitcoind.openrc

@@ -18,7 +18,7 @@ BITCOIND_BIN=${BITCOIND_BIN:-/usr/bin/bitcoind}
 BITCOIND_NICE=${BITCOIND_NICE:-${NICELEVEL:-0}}
 BITCOIND_OPTS="${BITCOIND_OPTS:-${BITCOIN_OPTS}}"
 
-name="Bitcoin Core Daemon"
+name="Bitcoin Knots Daemon"
 description="Bitcoin cryptocurrency P2P network daemon"
 
 command="/usr/bin/bitcoind"

doc/Doxyfile.in

@@ -32,7 +32,7 @@ DOXYFILE_ENCODING      = UTF-8
 # title of most generated pages and in a few other places.
 # The default value is: My Project.
 
-PROJECT_NAME           = "Bitcoin Core"
+PROJECT_NAME           = "Bitcoin Knots"
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. This
 # could be handy for archiving the generated documentation or if some version

doc/README.md

@@ -1,15 +1,15 @@
-Bitcoin Core
+Bitcoin Knots
 =============
 
 Setup
 ---------------------
-Bitcoin Core is the original Bitcoin client and it builds the backbone of the network. It downloads and, by default, stores the entire history of Bitcoin transactions, which requires a few hundred gigabytes of disk space. Depending on the speed of your computer and network connection, the synchronization process can take anywhere from a few hours to a day or more.
+Bitcoin Knots is the original Bitcoin client and it builds the backbone of the network. It downloads and, by default, stores the entire history of Bitcoin transactions, which requires a few hundred gigabytes of disk space. Depending on the speed of your computer and network connection, the synchronization process can take anywhere from a few hours to a day or more.
 
-To download Bitcoin Core, visit [bitcoincore.org](https://bitcoincore.org/en/download/).
+To download Bitcoin Knots, visit [bitcoinknots.org](https://bitcoinknots.org/).
 
 Running
 ---------------------
-The following are some helpful notes on how to run Bitcoin Core on your native platform.
+The following are some helpful notes on how to run Bitcoin Knots on your native platform.
 
 ### Unix
 
@@ -24,7 +24,7 @@ Unpack the files into a directory, and then run bitcoin-qt.exe.
 
 ### macOS
 
-Drag Bitcoin Core to your applications folder, and then run Bitcoin Core.
+Drag Bitcoin Knots to your applications folder, and then run Bitcoin Knots.
 
 ### Need Help?
 
@@ -35,7 +35,7 @@ for help and more information.
 
 Building
 ---------------------
-The following are developer notes on how to build Bitcoin Core on your native platform. They are not complete guides, but include notes on the necessary libraries, compile flags, etc.
+The following are developer notes on how to build Bitcoin Knots on your native platform. They are not complete guides, but include notes on the necessary libraries, compile flags, etc.
 
 - [Dependencies](dependencies.md)
 - [macOS Build Notes](build-osx.md)

doc/README_windows.txt

@@ -1,4 +1,4 @@
-Bitcoin Core
+Bitcoin Knots
 =============
 
 Intro
@@ -13,7 +13,7 @@ Setup
 -----
 Unpack the files into a directory and run bitcoin-qt.exe.
 
-Bitcoin Core is the original Bitcoin client and it builds the backbone of the network.
+Bitcoin Knots is the original Bitcoin client and it builds the backbone of the network.
 However, it downloads and stores the entire history of Bitcoin transactions;
 depending on the speed of your computer and network connection, the synchronization
 process can take anywhere from a few hours to a day or more.

share/setup.nsi.in

@@ -13,7 +13,7 @@ SetCompressor /SOLID lzma
 !define MUI_WELCOMEFINISHPAGE_BITMAP "@abs_top_builddir@/src/qt/res/rendered_icons/nsis-wizard.bmp"
 !define MUI_HEADERIMAGE
 !define MUI_HEADERIMAGE_RIGHT
-!define MUI_HEADERIMAGE_BITMAP "@abs_top_srcdir@/share/pixmaps/nsis-header.bmp"
+!define MUI_HEADERIMAGE_BITMAP "@abs_top_builddir@/src/qt/res/rendered_icons/nsis-header.bmp"
 !define MUI_FINISHPAGE_NOAUTOCLOSE
 !define MUI_STARTMENUPAGE_REGISTRY_ROOT HKLM
 !define MUI_STARTMENUPAGE_REGISTRY_KEY ${REGKEY}

src/Makefile.am

@@ -744,7 +744,9 @@ endif
 
 # Rendered icons must be here, not in Makefile.qt.include, since they are distributed with the source tarball
 
-RES_RENDERED_ICON_SRC = qt/res/src/bitcoin.svg
+RES_RENDERED_ICON_SRC = \
+  qt/res/src/bitcoin.svg \
+  qt/res/src/nsis-header.svg
 
 RES_RENDERED_ICONS = \
   qt/res/rendered_icons/bitcoin.ico \
@@ -780,6 +782,9 @@ qt/res/rendered_icons/bitcoin_testnet.ico: qt/res/rendered_icons/bitcoin.ico
 qt/res/rendered_icons/nsis-wizard.bmp: qt/res/rendered_icons/bitcoin290.png
 	$(IMAGEMAGICK_CONVERT) $^ -crop 164x290+62+0 -border 0x12 -strip BMP3:$@
 
+qt/res/rendered_icons/nsis-header.bmp: qt/res/src/nsis-header.svg
+	sed 's/PACKAGE_NAME/$(PACKAGE_NAME)/' < "$<" | $(RSVG_CONVERT) -f png -d 57 -p 57 | $(IMAGEMAGICK_CONVERT) - -background white -alpha remove BMP3:$@
+
 endif
 
 if EMBEDDED_LEVELDB