Bitcoin to NYC3 and update gitian compile code

2019-06-09 12:22:49 +03:00
parent d8192b664c
commit 516a7bafec
921 changed files with 1868 additions and 1858 deletions
@@ -1,6 +1,6 @@
-<!-- This issue tracker is only for technical issues related to Bitcoin Core.
+<!-- This issue tracker is only for technical issues related to NYC3 Core.

-General bitcoin questions and/or support requests are best directed to the Bitcoin StackExchange at https://bitcoin.stackexchange.com.
+General bitcoin questions and/or support requests are best directed to the NYC3 StackExchange at https://bitcoin.stackexchange.com.

 For reporting security issues, please read instructions at https://bitcoincore.org/en/contact/.

@@ -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 NYC3 Core 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)? -->

@@ -2,7 +2,7 @@ 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
+NYC3 Core user experience or NYC3 Core developer experience
 significantly.

 * Any test improvements or new tests that improve coverage are always welcome.
@@ -15,7 +15,7 @@ significantly.
  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.
+  consider building the system outside of NYC3 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
@@ -25,7 +25,7 @@ significantly.
  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
+NYC3 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.
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2018 The Bitcoin Core developers
+# Copyright (c) 2018 The NYC3 Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2018 The Bitcoin Core developers
+# Copyright (c) 2018 The NYC3 Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2018 The Bitcoin Core developers
+# Copyright (c) 2018 The NYC3 Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2018 The Bitcoin Core developers
+# Copyright (c) 2018 The NYC3 Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2018 The Bitcoin Core developers
+# Copyright (c) 2018 The NYC3 Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2018 The Bitcoin Core developers
+# Copyright (c) 2018 The NYC3 Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2018 The Bitcoin Core developers
+# Copyright (c) 2018 The NYC3 Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2018 The Bitcoin Core developers
+# Copyright (c) 2018 The NYC3 Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.

@@ -200,7 +200,7 @@ workload on reviewing.
 -------------------------

 The following applies to code changes to the NYC3 project (and related
-projects such as libsecp256k1), and is not to be confused with overall Bitcoin
+projects such as libsecp256k1), and is not to be confused with overall NYC3
 Network Protocol consensus changes.

 Whether a pull request is merged into NYC3 rests with the project merge
@@ -221,7 +221,7 @@ In general, all pull requests must:
  - Where bugs are fixed, where possible, there should be unit tests
    demonstrating the bug and also proving the fix. This helps prevent regression.

-Patches that change Bitcoin consensus rules are considerably more involved than
+Patches that change NYC3 consensus rules are considerably more involved than
 normal because they affect the entire ecosystem and so must be preceded by
 extensive mailing list discussions and have a numbered BIP. While each case will
 be different, one should be prepared to expend more time and effort than for
@@ -262,7 +262,7 @@ higher in terms of discussion and peer review requirements, keeping in mind that
 mistakes could be very costly to the wider community. This includes refactoring
 of consensus critical code.

-Where a patch set proposes to change the Bitcoin consensus, it must have been
+Where a patch set proposes to change the NYC3 consensus, it must have been
 discussed extensively on the mailing list and IRC, be accompanied by a widely
 discussed BIP and have a generally widely perceived technical consensus of being
 a worthwhile change based on the judgement of the maintainers.
@@ -1,7 +1,7 @@
 The MIT License (MIT)

-Copyright (c) 2009-2019 The Bitcoin Core developers
-Copyright (c) 2009-2019 Bitcoin Developers
+Copyright (c) 2009-2019 The NYC3 Core developers
+Copyright (c) 2009-2019 NYC3 Developers

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -1,5 +1,5 @@
-Building Bitcoin
+Building NYC3
 ================

 See doc/build-*.md for instructions on building the various
-elements of the NYC3 reference implementation of Bitcoin.
+elements of the NYC3 reference implementation of NYC3.
@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2016 The Bitcoin Core developers
+# Copyright (c) 2013-2016 The NYC3 Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.

@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2013-2016 The Bitcoin Core developers
+# Copyright (c) 2013-2016 The NYC3 Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.

@@ -1,4 +1,4 @@
-dnl Copyright (c) 2013-2015 The Bitcoin Core developers
+dnl Copyright (c) 2013-2015 The NYC3 Core developers
 dnl Distributed under the MIT software license, see the accompanying
 dnl file COPYING or http://www.opensource.org/licenses/mit-license.php.

@@ -1,4 +1,4 @@
-dnl Copyright (c) 2013-2016 The Bitcoin Core developers
+dnl Copyright (c) 2013-2016 The NYC3 Core developers
 dnl Distributed under the MIT software license, see the accompanying
 dnl file COPYING or http://www.opensource.org/licenses/mit-license.php.

@@ -1,4 +1,4 @@
-dnl Copyright (c) 2013-2014 The Bitcoin Core developers
+dnl Copyright (c) 2013-2014 The NYC3 Core developers
 dnl Distributed under the MIT software license, see the accompanying
 dnl file COPYING or http://www.opensource.org/licenses/mit-license.php.

@@ -9,7 +9,7 @@ Building with Visual Studio is an alternative to the Linux based [cross-compiler

 Dependencies
 ---------------------
-A number of [open source libraries](https://github.com/bitcoin/bitcoin/blob/master/doc/dependencies.md) are required in order to be able to build Bitcoin.
+A number of [open source libraries](https://github.com/bitcoin/bitcoin/blob/master/doc/dependencies.md) are required in order to be able to build NYC3.

 Options for installing the dependencies in a Visual Studio compatible manner are:

@@ -23,7 +23,7 @@
 #define COPYRIGHT_HOLDERS "The %s developers"

 /* Copyright holder(s) */
-#define COPYRIGHT_HOLDERS_FINAL "The Bitcoin Core developers"
+#define COPYRIGHT_HOLDERS_FINAL "The NYC3 Core developers"

 /* Replacement for %s in copyright holders string */
 #define COPYRIGHT_HOLDERS_SUBSTITUTION "NYC3"
@@ -13,7 +13,7 @@ Construct a linear, no-fork, best version of the blockchain.

 ### [Qos](/contrib/qos) ###

-A Linux bash script that will set up traffic control (tc) to limit the outgoing bandwidth for connections to the Bitcoin network. This means one can have an always-on bitcoind instance running, and another local bitcoind/bitcoin-qt instance which connects to this node and receives blocks from it.
+A Linux bash script that will set up traffic control (tc) to limit the outgoing bandwidth for connections to the NYC3 network. This means one can have an always-on bitcoind instance running, and another local bitcoind/bitcoin-qt instance which connects to this node and receives blocks from it.

 ### [Seeds](/contrib/seeds) ###
 Utility to generate the pnSeed[] array that is compiled into the client.
@@ -42,7 +42,7 @@ Test and Verify Tools
 ---------------------

 ### [TestGen](/contrib/testgen) ###
-Utilities to generate test vectors for the data-driven Bitcoin tests.
+Utilities to generate test vectors for the data-driven NYC3 tests.

 ### [Verify Binaries](/contrib/verifybinaries) ###
 This script attempts to download and verify the signature file SHA256SUMS.asc from bitcoin.org.
@@ -1,5 +1,5 @@
 # bash programmable completion for bitcoin-cli(1)
-# Copyright (c) 2012-2016 The Bitcoin Core developers
+# Copyright (c) 2012-2016 The NYC3 Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.

@@ -1,5 +1,5 @@
 # bash programmable completion for bitcoin-tx(1)
-# Copyright (c) 2016 The Bitcoin Core developers
+# Copyright (c) 2016 The NYC3 Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.

@@ -1,5 +1,5 @@
 # bash programmable completion for bitcoind(1) and bitcoin-qt(1)
-# Copyright (c) 2012-2016 The Bitcoin Core developers
+# Copyright (c) 2012-2016 The NYC3 Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.

@@ -1,5 +1,5 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: Bitcoin
+Upstream-Name: NYC3
 Upstream-Contact: Satoshi Nakamoto <satoshin@gmx.com>
 irc://#bitcoin@freenode.net
 Source: https://github.com/bitcoin/bitcoin
@@ -36,31 +36,31 @@ Specifying `verbose` will list the full filenames of files of each category.

 copyright\_header.py update \<base\_directory\> [verbose]
 ---------------------------------------------------------
-Updates all the copyright headers of `The Bitcoin Core developers` which were
+Updates all the copyright headers of `The NYC3 Core developers` which were
 changed in a year more recent than is listed. For example:
 ```
-// Copyright (c) <firstYear>-<lastYear> The Bitcoin Core developers
+// Copyright (c) <firstYear>-<lastYear> The NYC3 Core developers
 ```
 will be updated to:
 ```
-// Copyright (c) <firstYear>-<lastModifiedYear> The Bitcoin Core developers
+// Copyright (c) <firstYear>-<lastModifiedYear> The NYC3 Core developers
 ```
 where `<lastModifiedYear>` is obtained from the `git log` history.

 This subcommand also handles copyright headers that have only a single year. In
 those cases:
 ```
-// Copyright (c) <year> The Bitcoin Core developers
+// Copyright (c) <year> The NYC3 Core developers
 ```
 will be updated to:
 ```
-// Copyright (c) <year>-<lastModifiedYear> The Bitcoin Core developers
+// Copyright (c) <year>-<lastModifiedYear> The NYC3 Core developers
 ```
 where the update is appropriate.

 copyright\_header.py insert \<file\>
 ------------------------------------
-Inserts a copyright header for `The Bitcoin Core developers` at the top of the
+Inserts a copyright header for `The NYC3 Core developers` at the top of the
 file in either Python or C++ style as determined by the file extension. If the
 file is a Python file and it has  `#!` starting the first line, the header is
 inserted in the line below it.
@@ -70,7 +70,7 @@ The copyright dates will be set to be `<year_introduced>-<current_year>` where
 `<year_introduced>` is equal to `<current_year>`, it will be set as a single
 year rather than two hyphenated years.

-If the file already has a copyright for `The Bitcoin Core developers`, the
+If the file already has a copyright for `The NYC3 Core developers`, the
 script will exit.

 gen-manpages.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright (c) 2016-2018 The Bitcoin Core developers
+# Copyright (c) 2016-2018 The NYC3 Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.

@@ -89,7 +89,7 @@ def compile_copyright_regex(copyright_style, year_style, name):

 EXPECTED_HOLDER_NAMES = [
    "Satoshi Nakamoto\n",
-    "The Bitcoin Core developers\n",
+    "The NYC3 Core developers\n",
    "NYC3 Developers\n",
    "BitPay Inc\.\n",
    "University of Illinois at Urbana-Champaign\.\n",
@@ -334,7 +334,7 @@ def write_file_lines(filename, file_lines):
 COPYRIGHT = 'Copyright \(c\)'
 YEAR = "20[0-9][0-9]"
 YEAR_RANGE = '(%s)(-%s)?' % (YEAR, YEAR)
-HOLDER = 'The Bitcoin Core developers'
+HOLDER = 'The NYC3 Core developers'
 UPDATEABLE_LINE_COMPILED = re.compile(' '.join([COPYRIGHT, YEAR_RANGE, HOLDER]))

 def get_updatable_copyright_line(file_lines):
@@ -399,24 +399,24 @@ def exec_update_header_year(base_directory):
 ################################################################################

 UPDATE_USAGE = """
-Updates all the copyright headers of "The Bitcoin Core developers" which were
+Updates all the copyright headers of "The NYC3 Core developers" which were
 changed in a year more recent than is listed. For example:

-// Copyright (c) <firstYear>-<lastYear> The Bitcoin Core developers
+// Copyright (c) <firstYear>-<lastYear> The NYC3 Core developers

 will be updated to:

-// Copyright (c) <firstYear>-<lastModifiedYear> The Bitcoin Core developers
+// Copyright (c) <firstYear>-<lastModifiedYear> The NYC3 Core developers

 where <lastModifiedYear> is obtained from the 'git log' history.

 This subcommand also handles copyright headers that have only a single year. In those cases:

-// Copyright (c) <year> The Bitcoin Core developers
+// Copyright (c) <year> The NYC3 Core developers

 will be updated to:

-// Copyright (c) <year>-<lastModifiedYear> The Bitcoin Core developers
+// Copyright (c) <year>-<lastModifiedYear> The NYC3 Core developers

 where the update is appropriate.

@@ -449,7 +449,7 @@ def get_header_lines(header, start_year, end_year):
    return [line + '\n' for line in lines]

 CPP_HEADER = '''
-// Copyright (c) %s The Bitcoin Core developers
+// Copyright (c) %s The NYC3 Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 '''
@@ -458,7 +458,7 @@ def get_cpp_header_lines_to_insert(start_year, end_year):
    return reversed(get_header_lines(CPP_HEADER, start_year, end_year))

 PYTHON_HEADER = '''
-# Copyright (c) %s The Bitcoin Core developers
+# Copyright (c) %s The NYC3 Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 '''
@@ -512,7 +512,7 @@ def insert_cpp_header(filename, file_lines, start_year, end_year):
 def exec_insert_header(filename, style):
    file_lines = read_file_lines(filename)
    if file_already_has_core_copyright(file_lines):
-        sys.exit('*** %s already has a copyright by The Bitcoin Core developers'
+        sys.exit('*** %s already has a copyright by The NYC3 Core developers'
                 % (filename))
    start_year, end_year = get_git_change_year_range(filename)
    if style == 'python':
@@ -525,7 +525,7 @@ def exec_insert_header(filename, style):
 ################################################################################

 INSERT_USAGE = """
-Inserts a copyright header for "The Bitcoin Core developers" at the top of the
+Inserts a copyright header for "The NYC3 Core developers" at the top of the
 file in either Python or C++ style as determined by the file extension. If the
 file is a Python file and it has a '#!' starting the first line, the header is
 inserted in the line below it.
@@ -539,7 +539,7 @@ where <year_introduced> is according to the 'git log' history. If

 "<current_year>"

-If the file already has a copyright for "The Bitcoin Core developers", the
+If the file already has a copyright for "The NYC3 Core developers", the
 script will exit.

 Usage:
@@ -571,7 +571,7 @@ def insert_cmd(argv):
 ################################################################################

 USAGE = """
-copyright_header.py - utilities for managing copyright headers of 'The Bitcoin
+copyright_header.py - utilities for managing copyright headers of 'The NYC3
 Core developers' in repository source files.

 Usage:
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright (c) 2014-2018 The Bitcoin Core developers
+# Copyright (c) 2014-2018 The NYC3 Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 '''
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright (c) 2015-2018 The Bitcoin Core developers
+# Copyright (c) 2015-2018 The NYC3 Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 '''
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright (c) 2015-2018 The Bitcoin Core developers
+# Copyright (c) 2015-2018 The NYC3 Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 '''
@@ -30,7 +30,7 @@ SOURCE_LANG = 'bitcoin_en.ts'
 LOCALE_DIR = 'src/qt/locale'
 # Minimum number of messages for translation to be considered at all
 MIN_NUM_MESSAGES = 10
-# Regexp to check for Bitcoin addresses
+# Regexp to check for NYC3 addresses
 ADDRESS_REGEXP = re.compile('([13]|bc1)[a-zA-Z0-9]{30,}')

 def check_at_repository_root():
@@ -34,10 +34,13 @@ packages:
 remotes:
 - "url": "https://github.com/nyc3coin/nyc3"
  "dir": "nyc3"
+- "url": "https://github.com/barrystyle/argon2s.git"
+  "dir": "argon2s"
 files: []
 script: |
  set -e -o pipefail
-
+#this is a hack since gitian has no natural support for submodules
+  cp -r argon2s/* nyc3/src/argon2s
  WRAP_DIR=$HOME/wrapped
  HOSTS="i686-pc-linux-gnu x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu riscv64-linux-gnu"
  CONFIGFLAGS="--enable-glibc-back-compat --enable-reduce-exports --disable-bench --disable-gui-tests"
@@ -30,11 +30,15 @@ packages:
 remotes:
 - "url": "https://github.com/nyc3coin/nyc3"
  "dir": "nyc3"
+- "url": "https://github.com/barrystyle/argon2s.git"
+  "dir": "argon2s"
 files:
 - "MacOSX10.11.sdk.tar.gz"
 script: |
  set -e -o pipefail
-
+#this is a hack since gitian has no natural support for submodules
+  cp -r argon2s/* nyc3/src/argon2s
+  #make sure this file exists... 
  WRAP_DIR=$HOME/wrapped
  HOSTS="x86_64-apple-darwin14"
  CONFIGFLAGS="--enable-reduce-exports --disable-bench --disable-gui-tests GENISOIMAGE=$WRAP_DIR/genisoimage"
@@ -25,10 +25,13 @@ packages:
 remotes:
 - "url": "https://github.com/nyc3coin/nyc3"
  "dir": "nyc3"
+- "url": "https://github.com/barrystyle/argon2s.git"
+  "dir": "argon2s"
 files: []
 script: |
  set -e -o pipefail
-
+#this is a hack since gitian has no natural support for submodules
+  cp -r argon2s/* nyc3/src/argon2s
  WRAP_DIR=$HOME/wrapped
  HOSTS="i686-w64-mingw32 x86_64-w64-mingw32"
  CONFIGFLAGS="--enable-reduce-exports --disable-bench --disable-gui-tests"
@@ -38,7 +38,7 @@ pre-start script
        echo "It is recommended that you also set alertnotify so you are "
        echo "notified of problems:"
        echo
-        echo "ie: alertnotify=echo %%s | mail -s \"Bitcoin Alert\"" \
+        echo "ie: alertnotify=echo %%s | mail -s \"NYC3 Alert\"" \
            "admin@foo.com"
        echo
        exit 1
@@ -19,7 +19,7 @@ BITCOIND_NICE=${BITCOIND_NICE:-${NICELEVEL:-0}}
 BITCOIND_OPTS="${BITCOIND_OPTS:-${BITCOIN_OPTS}}"

 name="NYC3 Daemon"
-description="Bitcoin cryptocurrency P2P network daemon"
+description="NYC3 cryptocurrency P2P network daemon"

 command="/usr/bin/bitcoind"
 command_args="-pid=\"${BITCOIND_PIDFILE}\" \
@@ -84,7 +84,7 @@ checkconfig()
 		eerror "It is recommended that you also set alertnotify so you are "
 		eerror "notified of problems:"
 		eerror ""
-		eerror "ie: alertnotify=echo %%s | mail -s \"Bitcoin Alert\"" \
+		eerror "ie: alertnotify=echo %%s | mail -s \"NYC3 Alert\"" \
 			"admin@foo.com"
 		eerror ""
 		return 1
@@ -9,7 +9,7 @@
 # in ExecStart=

 [Unit]
-Description=Bitcoin daemon
+Description=NYC3 daemon
 After=network.target

 [Service]
@@ -1,5 +1,5 @@
 # Linearize
-Construct a linear, no-fork, best version of the Bitcoin blockchain. The scripts
+Construct a linear, no-fork, best version of the NYC3 blockchain. The scripts
 run using Python 3 but are compatible with Python 2.

 ## Step 1: Download hash list
@@ -2,7 +2,7 @@
 #
 # linearize-data.py: Construct a linear, no-fork version of the chain.
 #
-# Copyright (c) 2013-2018 The Bitcoin Core developers
+# Copyright (c) 2013-2018 The NYC3 Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 #
@@ -2,7 +2,7 @@
 #
 # linearize-hashes.py:  List blocks in a linear, no-fork version of the chain.
 #
-# Copyright (c) 2013-2018 The Bitcoin Core developers
+# Copyright (c) 2013-2018 The NYC3 Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 #
@@ -22,7 +22,7 @@ def hex_switchEndian(s):
    pairList = [s[i:i+2].encode() for i in range(0, len(s), 2)]
    return b''.join(pairList[::-1]).decode()

-class BitcoinRPC:
+class NYC3RPC:
    def __init__(self, host, port, username, password):
        authpair = "%s:%s" % (username, password)
        authpair = authpair.encode('utf-8')
@@ -64,7 +64,7 @@ class BitcoinRPC:
        return 'error' in resp_obj and resp_obj['error'] is not None

 def get_block_hashes(settings, max_blocks_per_call=10000):
-    rpc = BitcoinRPC(settings['host'], settings['port'],
+    rpc = NYC3RPC(settings['host'], settings['port'],
             settings['rpcuser'], settings['rpcpassword'])

    height = settings['min_height']
@@ -3,7 +3,7 @@
 "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
 <svg version="1.0" xmlns="http://www.w3.org/2000/svg" width="1000pt" height="640pt" viewBox="0 0 1000 640" preserveAspectRatio="xMidYMid meet">
 	<!-- kate: space-indent off;
-	Copyright (c) 2015 The Bitcoin Core developers
+	Copyright (c) 2015 The NYC3 Core developers
 	Distributed under the MIT software license, see the accompanying
 	file COPYING or http://www.opensource.org/licenses/mit-license.php.
 	-->
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright (c) 2013-2018 The Bitcoin Core developers
+# Copyright (c) 2013-2018 The NYC3 Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 import biplist
@@ -53,7 +53,7 @@ ds['.']['icvp'] = icvp
 ds['.']['vSrn'] = ('long', 1)

 ds['Applications']['Iloc'] = (370, 156)
-ds['Bitcoin-Qt.app']['Iloc'] = (128, 156)
+ds['NYC3-Qt.app']['Iloc'] = (128, 156)

 ds.flush()
 ds.close()
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2014-2015 The Bitcoin Core developers
+# Copyright (c) 2014-2015 The NYC3 Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.

@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2014-2015 The Bitcoin Core developers
+# Copyright (c) 2014-2015 The NYC3 Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.

@@ -7,7 +7,7 @@ export LC_ALL=C
 set -e

 ROOTDIR=dist
-BUNDLE="${ROOTDIR}/Bitcoin-Qt.app"
+BUNDLE="${ROOTDIR}/NYC3-Qt.app"
 CODESIGN=codesign
 TEMPDIR=sign.temp
 TEMPLIST=${TEMPDIR}/signatures.txt
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright (c) 2016 The Bitcoin Core developers
+# Copyright (c) 2016 The NYC3 Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2017 The Bitcoin Core developers
+# Copyright (c) 2017 The NYC3 Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright (c) 2013-2018 The Bitcoin Core developers
+# Copyright (c) 2013-2018 The NYC3 Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 #
@@ -1,6 +1,6 @@
 ### TestGen ###

-Utilities to generate test vectors for the data-driven Bitcoin tests.
+Utilities to generate test vectors for the data-driven NYC3 tests.

 Usage: 

@@ -1,8 +1,8 @@
-# Copyright (c) 2012-2018 The Bitcoin Core developers
+# Copyright (c) 2012-2018 The NYC3 Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 '''
-Bitcoin base58 encoding and decoding.
+NYC3 base58 encoding and decoding.

 Based on https://bitcointalk.org/index.php?topic=1026.0 (public domain)
 '''
@@ -39,7 +39,7 @@ def b58encode(v):
        long_value = div
    result = __b58chars[long_value] + result

-    # Bitcoin does a little leading-zero-compression:
+    # NYC3 does a little leading-zero-compression:
    # leading 0-bytes in the input become leading-1s
    nPad = 0
    for c in v:
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright (c) 2012-2018 The Bitcoin Core developers
+# Copyright (c) 2012-2018 The NYC3 Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 '''
@@ -1,4 +1,4 @@
-# Valgrind suppressions file for Bitcoin.
+# Valgrind suppressions file for NYC3.
 #
 # Includes known Valgrind warnings in our dependencies that cannot be fixed
 # in-tree.
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2014-2016 The Bitcoin Core developers
+# Copyright (c) 2014-2016 The NYC3 Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright (c) 2014-2015 The Bitcoin Core developers
+# Copyright (c) 2014-2015 The NYC3 Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright (c) 2018 The Bitcoin Core developers
+# Copyright (c) 2018 The NYC3 Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 """Verify commits against a trusted keys list."""
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright (c) 2016 The Bitcoin Core developers
+# Copyright (c) 2016 The NYC3 Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.

@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2014-2015 The Bitcoin Core developers
+# Copyright (c) 2014-2015 The NYC3 Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.

@@ -1,12 +1,12 @@
 #!/usr/bin/env python3
-# Copyright (c) 2014-2018 The Bitcoin Core developers
+# Copyright (c) 2014-2018 The NYC3 Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.

 """
    ZMQ example using python3's asyncio

-    Bitcoin should be started with the command line arguments:
+    NYC3 should be started with the command line arguments:
        bitcoind -testnet -daemon \
                -zmqpubrawtx=tcp://127.0.0.1:28332 \
                -zmqpubrawblock=tcp://127.0.0.1:28332 \
@@ -1,12 +1,12 @@
 #!/usr/bin/env python3
-# Copyright (c) 2014-2018 The Bitcoin Core developers
+# Copyright (c) 2014-2018 The NYC3 Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.

 """
    ZMQ example using python3's asyncio

-    Bitcoin should be started with the command line arguments:
+    NYC3 should be started with the command line arguments:
        bitcoind -testnet -daemon \
                -zmqpubrawtx=tcp://127.0.0.1:28332 \
                -zmqpubrawblock=tcp://127.0.0.1:28332 \
@@ -12,9 +12,9 @@ For example:

    make HOST=x86_64-w64-mingw32 -j4

-A prefix will be generated that's suitable for plugging into Bitcoin's
+A prefix will be generated that's suitable for plugging into NYC3's
 configure. In the above example, a dir named x86_64-w64-mingw32 will be
-created. To use it for Bitcoin:
+created. To use it for NYC3:

    ./configure --prefix=`pwd`/depends/x86_64-w64-mingw32

@@ -1,4 +1,4 @@
-This is a system of building and caching dependencies necessary for building Bitcoin. 
+This is a system of building and caching dependencies necessary for building NYC3. 
 There are several features that make it different from most similar systems:

 ### It is designed to be builder and host agnostic
@@ -1265,7 +1265,7 @@ DOCSET_FEEDNAME        = "Doxygen generated docs"
 # The default value is: org.doxygen.Project.
 # This tag requires that the tag GENERATE_DOCSET is set to YES.

-DOCSET_BUNDLE_ID       = org.bitcoin.Bitcoin-Core
+DOCSET_BUNDLE_ID       = org.bitcoin.NYC3-Core

 # The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
 # the documentation publisher. This should be a reverse domain-name style
@@ -1273,7 +1273,7 @@ DOCSET_BUNDLE_ID       = org.bitcoin.Bitcoin-Core
 # The default value is: org.doxygen.Publisher.
 # This tag requires that the tag GENERATE_DOCSET is set to YES.

-DOCSET_PUBLISHER_ID    = org.bitcoin.Bitcoin-Core
+DOCSET_PUBLISHER_ID    = org.bitcoin.NYC3-Core

 # The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
 # The default value is: Publisher.
@@ -3,7 +3,7 @@ NYC3

 Setup
 ---------------------
-NYC3 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.
+NYC3 is the original NYC3 client and it builds the backbone of the network. It downloads and, by default, stores the entire history of NYC3 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 NYC3, visit [bitcoincore.org](https://bitcoincore.org/en/download/).

@@ -28,10 +28,10 @@ Drag NYC3 to your applications folder, and then run NYC3.

 ### Need Help?

-* See the documentation at the [Bitcoin Wiki](https://en.bitcoin.it/wiki/Main_Page)
+* See the documentation at the [NYC3 Wiki](https://en.bitcoin.it/wiki/Main_Page)
 for help and more information.
 * Ask for help on [#bitcoin](http://webchat.freenode.net?channels=bitcoin) on Freenode. If you don't have an IRC client, use [webchat here](http://webchat.freenode.net?channels=bitcoin).
-* Ask for help on the [BitcoinTalk](https://bitcointalk.org/) forums, in the [Technical Support board](https://bitcointalk.org/index.php?board=4.0).
+* Ask for help on the [NYC3Talk](https://bitcointalk.org/) forums, in the [Technical Support board](https://bitcointalk.org/index.php?board=4.0).

 Building
 ---------------------
@@ -48,7 +48,7 @@ The following are developer notes on how to build NYC3 on your native platform.

 Development
 ---------------------
-The Bitcoin repo's [root README](/README.md) contains relevant information on the development process and automated testing.
+The NYC3 repo's [root README](/README.md) contains relevant information on the development process and automated testing.

 - [Developer Notes](developer-notes.md)
 - [Productivity Notes](productivity.md)
@@ -66,9 +66,9 @@ The Bitcoin repo's [root README](/README.md) contains relevant information on th
 - [Benchmarking](benchmarking.md)

 ### Resources
-* Discuss on the [BitcoinTalk](https://bitcointalk.org/) forums, in the [Development & Technical Discussion board](https://bitcointalk.org/index.php?board=6.0).
+* Discuss on the [NYC3Talk](https://bitcointalk.org/) forums, in the [Development & Technical Discussion board](https://bitcointalk.org/index.php?board=6.0).
 * Discuss project-specific development on #bitcoin-core-dev on Freenode. If you don't have an IRC client, use [webchat here](http://webchat.freenode.net/?channels=bitcoin-core-dev).
-* Discuss general Bitcoin development on #bitcoin-dev on Freenode. If you don't have an IRC client, use [webchat here](http://webchat.freenode.net/?channels=bitcoin-dev).
+* Discuss general NYC3 development on #bitcoin-dev on Freenode. If you don't have an IRC client, use [webchat here](http://webchat.freenode.net/?channels=bitcoin-dev).

 ### Miscellaneous
 - [Assets Attribution](assets-attribution.md)
@@ -3,7 +3,7 @@ NYC3

 Intro
 -----
-Bitcoin is a free open source peer-to-peer electronic cash system that is
+NYC3 is a free open source peer-to-peer electronic cash system that is
 completely decentralized, without the need for a central server or trusted
 parties.  Users hold the crypto keys to their own money and transact directly
 with each other, with the help of a P2P network to check for double-spending.
@@ -13,8 +13,8 @@ Setup
 -----
 Unpack the files into a directory and run bitcoin-qt.exe.

-NYC3 is the original Bitcoin client and it builds the backbone of the network.
-However, it downloads and stores the entire history of Bitcoin transactions;
+NYC3 is the original NYC3 client and it builds the backbone of the network.
+However, it downloads and stores the entire history of NYC3 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.

@@ -5,7 +5,7 @@ BIPs that are implemented by NYC3 (up-to-date up to **v0.18.0**):
 * [`BIP 13`](https://github.com/bitcoin/bips/blob/master/bip-0013.mediawiki): The address format for P2SH addresses has been implemented since **v0.6.0** ([PR #669](https://github.com/bitcoin/bitcoin/pull/669)).
 * [`BIP 14`](https://github.com/bitcoin/bips/blob/master/bip-0014.mediawiki): The subversion string is being used as User Agent since **v0.6.0** ([PR #669](https://github.com/bitcoin/bitcoin/pull/669)).
 * [`BIP 16`](https://github.com/bitcoin/bips/blob/master/bip-0016.mediawiki): The pay-to-script-hash evaluation rules have been implemented since **v0.6.0**, and took effect on *April 1st 2012* ([PR #748](https://github.com/bitcoin/bitcoin/pull/748)).
-* [`BIP 21`](https://github.com/bitcoin/bips/blob/master/bip-0021.mediawiki): The URI format for Bitcoin payments has been implemented since **v0.6.0** ([PR #176](https://github.com/bitcoin/bitcoin/pull/176)).
+* [`BIP 21`](https://github.com/bitcoin/bips/blob/master/bip-0021.mediawiki): The URI format for NYC3 payments has been implemented since **v0.6.0** ([PR #176](https://github.com/bitcoin/bitcoin/pull/176)).
 * [`BIP 22`](https://github.com/bitcoin/bips/blob/master/bip-0022.mediawiki): The 'getblocktemplate' (GBT) RPC protocol for mining has been implemented since **v0.7.0** ([PR #936](https://github.com/bitcoin/bitcoin/pull/936)).
 * [`BIP 23`](https://github.com/bitcoin/bips/blob/master/bip-0023.mediawiki): Some extensions to GBT have been implemented since **v0.10.0rc1**, including longpolling and block proposals ([PR #1816](https://github.com/bitcoin/bitcoin/pull/1816)).
 * [`BIP 30`](https://github.com/bitcoin/bips/blob/master/bip-0030.mediawiki): The evaluation rules to forbid creating new transactions with the same txid as previous not-fully-spent transactions were implemented since **v0.6.0**, and the rule took effect on *March 15th 2012* ([PR #915](https://github.com/bitcoin/bitcoin/pull/915)).
@@ -35,5 +35,5 @@ BIPs that are implemented by NYC3 (up-to-date up to **v0.18.0**):
 * [`BIP 152`](https://github.com/bitcoin/bips/blob/master/bip-0152.mediawiki): Compact block transfer and related optimizations are used as of **v0.13.0** ([PR 8068](https://github.com/bitcoin/bitcoin/pull/8068)).
 * [`BIP 159`](https://github.com/bitcoin/bips/blob/master/bip-0159.mediawiki): The NODE_NETWORK_LIMITED service bit is signalled as of **v0.16.0** ([PR 11740](https://github.com/bitcoin/bitcoin/pull/11740)), and such nodes are connected to as of **v0.17.0** ([PR 10387](https://github.com/bitcoin/bitcoin/pull/10387)).
 * [`BIP 173`](https://github.com/bitcoin/bips/blob/master/bip-0173.mediawiki): Bech32 addresses for native Segregated Witness outputs are supported as of **v0.16.0** ([PR 11167](https://github.com/bitcoin/bitcoin/pull/11167)).
-* [`BIP 174`](https://github.com/bitcoin/bips/blob/master/bip-0174.mediawiki): RPCs to operate on Partially Signed Bitcoin Transactions (PSBT) are present as of **v0.17.0** ([PR 13557](https://github.com/bitcoin/bitcoin/pull/13557)).
+* [`BIP 174`](https://github.com/bitcoin/bips/blob/master/bip-0174.mediawiki): RPCs to operate on Partially Signed NYC3 Transactions (PSBT) are present as of **v0.17.0** ([PR 13557](https://github.com/bitcoin/bitcoin/pull/13557)).
 * [`BIP 176`](https://github.com/bitcoin/bips/blob/master/bip-0176.mediawiki): Bits Denomination [QT only] is supported as of **v0.16.0** ([PR 12035](https://github.com/bitcoin/bitcoin/pull/12035)).
@@ -32,6 +32,6 @@ Network specific options can be:

 ## Configuration File Path

-The configuration file is not automatically created; you can create it using your favorite text editor. By default, the configuration file name is `bitcoin.conf` and it is located in the Bitcoin data directory, but both the Bitcoin data directory and the configuration file path may be changed using the `-datadir` and `-conf` command-line options.
+The configuration file is not automatically created; you can create it using your favorite text editor. By default, the configuration file name is `bitcoin.conf` and it is located in the NYC3 data directory, but both the NYC3 data directory and the configuration file path may be changed using the `-datadir` and `-conf` command-line options.

 The `includeconf=<file>` option in the `bitcoin.conf` file can be used to include additional configuration files.
@@ -82,17 +82,17 @@ NYC3 is now available at `./src/bitcoind`

 Before running, you may create an empty configuration file:

-    mkdir -p "/Users/${USER}/Library/Application Support/Bitcoin"
+    mkdir -p "/Users/${USER}/Library/Application Support/NYC3"

-    touch "/Users/${USER}/Library/Application Support/Bitcoin/bitcoin.conf"
+    touch "/Users/${USER}/Library/Application Support/NYC3/bitcoin.conf"

-    chmod 600 "/Users/${USER}/Library/Application Support/Bitcoin/bitcoin.conf"
+    chmod 600 "/Users/${USER}/Library/Application Support/NYC3/bitcoin.conf"

 The first time you run bitcoind, it will start downloading the blockchain. This process could take many hours, or even days on slower than average systems.

 You can monitor the download process by looking at the debug.log file:

-    tail -f $HOME/Library/Application\ Support/Bitcoin/debug.log
+    tail -f $HOME/Library/Application\ Support/NYC3/debug.log

 Other commands:
 -------
@@ -100,7 +100,7 @@ not contain "p2" for brevity.
 ### Multisig

 Several pieces of software use multi-signature (multisig) scripts based
-on Bitcoin's OP_CHECKMULTISIG opcode. To support these, we introduce the
+on NYC3's OP_CHECKMULTISIG opcode. To support these, we introduce the
 `multi(k,key_1,key_2,...,key_n)` function. It represents a *k-of-n*
 multisig policy, where any *k* out of the *n* provided `KEY` expressions must
 sign.
@@ -807,7 +807,7 @@ you must be aware of.

 In most configurations we use the default LevelDB value for `max_open_files`,
 which is 1000 at the time of this writing. If LevelDB actually uses this many
-file descriptors it will cause problems with Bitcoin's `select()` loop, because
+file descriptors it will cause problems with NYC3's `select()` loop, because
 it may cause new sockets to be created where the fd value is >= 1024. For this
 reason, on 64-bit Unix systems we rely on an internal LevelDB optimization that
 uses `mmap()` + `close()` to open table files without actually retaining
@@ -833,14 +833,14 @@ details.
 ### Consensus Compatibility

 It is possible for LevelDB changes to inadvertently change consensus
-compatibility between nodes. This happened in Bitcoin 0.8 (when LevelDB was
+compatibility between nodes. This happened in NYC3 0.8 (when LevelDB was
 first introduced). When upgrading LevelDB you should review the upstream changes
 to check for issues affecting consensus compatibility.

 For example, if LevelDB had a bug that accidentally prevented a key from being
 returned in an edge case, and that bug was fixed upstream, the bug "fix" would
 be an incompatible consensus change. In this situation the correct behavior
-would be to revert the upstream fix before applying the updates to Bitcoin's
+would be to revert the upstream fix before applying the updates to NYC3's
 copy of LevelDB. In general you should be wary of any upstream changes affecting
 what data is returned from LevelDB queries.

@@ -4,9 +4,9 @@ Expectations for DNS Seed operators
 NYC3 attempts to minimize the level of trust in DNS seeds,
 but DNS seeds still pose a small amount of risk for the network.
 As such, DNS seeds must be run by entities which have some minimum
-level of trust within the Bitcoin community.
+level of trust within the NYC3 community.

-Other implementations of Bitcoin software may also use the same
+Other implementations of NYC3 software may also use the same
 seeds and may be more exposed. In light of this exposure, this
 document establishes some basic expectations for operating dnsseeds.

@@ -16,7 +16,7 @@ and not sell or transfer control of the DNS seed. Any hosting services
 contracted by the operator are equally expected to uphold these expectations.

 1. The DNS seed results must consist exclusively of fairly selected and
-functioning Bitcoin nodes from the public network to the best of the
+functioning NYC3 nodes from the public network to the best of the
 operator's understanding and capability.

 2. For the avoidance of doubt, the results may be randomized but must not
@@ -26,7 +26,7 @@ urgent technical necessity and disclosed.
 3. The results may not be served with a DNS TTL of less than one minute.

 4. Any logging of DNS queries should be only that which is necessary
-for the operation of the service or urgent health of the Bitcoin
+for the operation of the service or urgent health of the NYC3
 network and must not be retained longer than necessary nor disclosed
 to any third party.

@@ -42,7 +42,7 @@ details of their operating practices.
 related to the DNS seed operation.

 If these expectations cannot be satisfied the operator should
-discontinue providing services and contact the active Bitcoin
+discontinue providing services and contact the active NYC3
 Core development team as well as posting on
 [bitcoin-dev](https://lists.linuxfoundation.org/mailman/listinfo/bitcoin-dev).

@@ -84,9 +84,9 @@ OpenRC).
 ### macOS

 Binary:              `/usr/local/bin/bitcoind`  
-Configuration file:  `~/Library/Application Support/Bitcoin/bitcoin.conf`  
-Data directory:      `~/Library/Application Support/Bitcoin`  
-Lock file:           `~/Library/Application Support/Bitcoin/.lock`  
+Configuration file:  `~/Library/Application Support/NYC3/bitcoin.conf`  
+Data directory:      `~/Library/Application Support/NYC3`  
+Lock file:           `~/Library/Application Support/NYC3/.lock`  

 Installing Service Configuration
 -----------------------------------
@@ -104,7 +104,7 @@ Chain selection options:
 .IP
 Use the test chain
 .SH COPYRIGHT
-Copyright (C) 2009-2019 The Bitcoin Core developers
+Copyright (C) 2009-2019 The NYC3 Core developers

 Please contribute if you find NYC3 useful. Visit
 <https://bitcoincore.org> for further information about the software.
@@ -626,7 +626,7 @@ Set SSL root certificates for payment request (default: \fB\-system\-\fR)
 .IP
 Show splash screen on startup (default: 1)
 .SH COPYRIGHT
-Copyright (C) 2009-2019 The Bitcoin Core developers
+Copyright (C) 2009-2019 The NYC3 Core developers

 Please contribute if you find NYC3 useful. Visit
 <https://bitcoincore.org> for further information about the software.
@@ -105,7 +105,7 @@ set=NAME:JSON\-STRING
 .IP
 Set register NAME to given JSON\-STRING
 .SH COPYRIGHT
-Copyright (C) 2009-2019 The Bitcoin Core developers
+Copyright (C) 2009-2019 The NYC3 Core developers

 Please contribute if you find NYC3 useful. Visit
 <https://bitcoincore.org> for further information about the software.
@@ -52,7 +52,7 @@ info
 .IP
 Get wallet info
 .SH COPYRIGHT
-Copyright (C) 2009-2019 The Bitcoin Core developers
+Copyright (C) 2009-2019 The NYC3 Core developers

 Please contribute if you find NYC3 useful. Visit
 <https://bitcoincore.org> for further information about the software.
@@ -600,7 +600,7 @@ Username for JSON\-RPC connections
 .IP
 Accept command line and JSON\-RPC commands
 .SH COPYRIGHT
-Copyright (C) 2009-2019 The Bitcoin Core developers
+Copyright (C) 2009-2019 The NYC3 Core developers

 Please contribute if you find NYC3 useful. Visit
 <https://bitcoincore.org> for further information about the software.
@@ -1,6 +1,6 @@
 # PSBT Howto for NYC3

-Since NYC3 0.17, an RPC interface exists for Partially Signed Bitcoin
+Since NYC3 0.17, an RPC interface exists for Partially Signed NYC3
 Transactions (PSBTs, as specified in
 [BIP 174](https://github.com/bitcoin/bips/blob/master/bip-0174.mediawiki)).

@@ -10,7 +10,7 @@ scenarios.

 ## PSBT in general

-PSBT is an interchange format for Bitcoin transactions that are not fully signed
+PSBT is an interchange format for NYC3 transactions that are not fully signed
 yet, together with relevant metadata to help entities work towards signing it.
 It is intended to simplify workflows where multiple parties need to cooperate to
 produce a transaction. Examples include hardware wallets, multisig setups, and
@@ -18,7 +18,7 @@ produce a transaction. Examples include hardware wallets, multisig setups, and

 ### Overall workflow

-Overall, the construction of a fully signed Bitcoin transaction goes through the
+Overall, the construction of a fully signed NYC3 transaction goes through the
 following steps:

 - A **Creator** proposes a particular transaction to be created. They construct
@@ -32,7 +32,7 @@ following steps:
  partial signature for the inputs for which they have relevant key(s).
 - A **Finalizer** is run for each input to convert the partial signatures and
  possibly script information into a final `scriptSig` and/or `scriptWitness`.
- An **Extractor** produces a valid Bitcoin transaction (in network format)
+- An **Extractor** produces a valid NYC3 transaction (in network format)
  from a PSBT for which all inputs are finalized.

 Generally, each of the above (excluding Creator and Extractor) will simply
@@ -19,7 +19,7 @@ How to Upgrade
 If you are running an older version, shut it down. Wait until it has
 completely shut down (which might take a few minutes for older
 versions), then run the installer (on Windows) or just copy over
-`/Applications/Bitcoin-Qt` (on Mac) or `bitcoind`/`bitcoin-qt` (on
+`/Applications/NYC3-Qt` (on Mac) or `bitcoind`/`bitcoin-qt` (on
 Linux).

 The first time you run version 0.15.0 or newer, your chainstate database
@@ -17,7 +17,7 @@ How to Upgrade

 If you are running an older version, shut it down. Wait until it has completely
 shut down (which might take a few minutes for older versions), then run the
-installer (on Windows) or just copy over /Applications/Bitcoin-Qt (on Mac) or
+installer (on Windows) or just copy over /Applications/NYC3-Qt (on Mac) or
 bitcoind/bitcoin-qt (on Linux).

 Downgrading warning
@@ -172,7 +172,7 @@ improved by making the signatures constant time and deterministic.

 This change is a result of switching signing to use libsecp256k1
 instead of OpenSSL. Libsecp256k1 is a cryptographic library
-optimized for the curve Bitcoin uses which was created by Bitcoin
+optimized for the curve NYC3 uses which was created by NYC3
 Core developer Pieter Wuille.

 There exist attacks[1] against most ECC implementations where an
@@ -187,7 +187,7 @@ long time, but this functionality has still not made its
 way into a released version of OpenSSL. Libsecp256k1 achieves
 significantly stronger protection: As far as we're aware this is
 the only deployed implementation of constant time signing for
-the curve Bitcoin uses and we have reason to believe that
+the curve NYC3 uses and we have reason to believe that
 libsecp256k1 is better tested and more thoroughly reviewed
 than the implementation in OpenSSL.

@@ -225,7 +225,7 @@ Consensus library
 Starting from 0.10.0, the NYC3 distribution includes a consensus library.

 The purpose of this library is to make the verification functionality that is
-critical to Bitcoin's consensus available to other applications, e.g. to language
+critical to NYC3's consensus available to other applications, e.g. to language
 bindings such as [python-bitcoinlib](https://pypi.python.org/pypi/python-bitcoinlib) or
 alternative node implementations.

@@ -247,7 +247,7 @@ Standard script rules relaxed for P2SH addresses
 The IsStandard() rules have been almost completely removed for P2SH
 redemption scripts, allowing applications to make use of any valid
 script type, such as "n-of-m OR y", hash-locked oracle addresses, etc.
-While the Bitcoin protocol has always supported these types of script,
+While the NYC3 protocol has always supported these types of script,
 actually using them on mainnet has been previously inconvenient as
 standard NYC3 nodes wouldn't relay them to miners, nor would
 most miners include them in blocks they mined.
@@ -282,7 +282,7 @@ Mining and relay policy enhancements
 NYC3's block templates are now for version 3 blocks only, and any mining
 software relying on its `getblocktemplate` must be updated in parallel to use
 libblkmaker either version 0.4.2 or any version from 0.5.1 onward.
-If you are solo mining, this will affect you the moment you upgrade Bitcoin
+If you are solo mining, this will affect you the moment you upgrade NYC3
 Core, which must be done prior to BIP66 achieving its 951/1001 status.
 If you are mining with the stratum mining protocol: this does not affect you.
 If you are mining with the getblocktemplate protocol to a pool: this will affect
@@ -315,7 +315,7 @@ BIP 66: strict DER encoding for signatures

 NYC3 0.10 implements BIP 66, which introduces block version 3, and a new
 consensus rule, which prohibits non-DER signatures. Such transactions have been
-non-standard since Bitcoin v0.8.0 (released in February 2013), but were
+non-standard since NYC3 v0.8.0 (released in February 2013), but were
 technically still permitted inside blocks.

 This change breaks the dependency on OpenSSL's signature parsing, and is
@@ -539,7 +539,7 @@ GUI:
 - `7007402` Implement SI-style (thin space) thoudands separator
 - `91cce17` Use fixed-point arithmetic in amount spinbox
 - `bdba2dd` Remove an obscure option no-one cares about
- `bd0aa10` Replace the temporary file hack currently used to change Bitcoin-Qt's dock icon (OS X) with a buffer-based solution
+- `bd0aa10` Replace the temporary file hack currently used to change NYC3-Qt's dock icon (OS X) with a buffer-based solution
 - `94e1b9e` Re-work overviewpage UI
 - `8bfdc9a` Better looking trayicon
 - `b197bf3` disable tray interactions when client model set to 0
@@ -17,7 +17,7 @@ How to Upgrade

 If you are running an older version, shut it down. Wait until it has completely
 shut down (which might take a few minutes for older versions), then run the
-installer (on Windows) or just copy over /Applications/Bitcoin-Qt (on Mac) or
+installer (on Windows) or just copy over /Applications/NYC3-Qt (on Mac) or
 bitcoind/bitcoin-qt (on Linux).

 Downgrade warning
@@ -17,7 +17,7 @@ How to Upgrade

 If you are running an older version, shut it down. Wait until it has completely
 shut down (which might take a few minutes for older versions), then run the
-installer (on Windows) or just copy over /Applications/Bitcoin-Qt (on Mac) or
+installer (on Windows) or just copy over /Applications/NYC3-Qt (on Mac) or
 bitcoind/bitcoin-qt (on Linux).

 Downgrade warning
@@ -17,7 +17,7 @@ How to Upgrade

 If you are running an older version, shut it down. Wait until it has completely
 shut down (which might take a few minutes for older versions), then run the
-installer (on Windows) or just copy over /Applications/Bitcoin-Qt (on Mac) or
+installer (on Windows) or just copy over /Applications/NYC3-Qt (on Mac) or
 bitcoind/bitcoin-qt (on Linux).

 Downgrade warning
@@ -84,15 +84,15 @@ much more common since BIP62 was initially written.

 NYC3 has produced compatible signatures since a28fb70e in
 September 2013, but this didn't make it into a release until 0.9
-in March 2014; Bitcoinj has done so for a similar span of time.
-Bitcoinjs and electrum have been more recently updated.
+in March 2014; NYC3j has done so for a similar span of time.
+NYC3js and electrum have been more recently updated.

 This does not replace the need for BIP62 or similar, as miners can
 still cooperate to break transactions.  Nor does it replace the
 need for wallet software to handle malleability sanely[1]. This
 only eliminates the cheap and irritating DOS attack.

-[1] On the Malleability of Bitcoin Transactions
+[1] On the Malleability of NYC3 Transactions
 Marcin Andrychowicz, Stefan Dziembowski, Daniel Malinowski, Łukasz Mazurek
 http://fc15.ifca.ai/preproceedings/bitcoin/paper_9.pdf

@@ -18,7 +18,7 @@ How to Upgrade

 If you are running an older version, shut it down. Wait until it has completely
 shut down (which might take a few minutes for older versions), then run the
-installer (on Windows) or just copy over /Applications/Bitcoin-Qt (on Mac) or
+installer (on Windows) or just copy over /Applications/NYC3-Qt (on Mac) or
 bitcoind/bitcoin-qt (on Linux).

 Downgrade warning
@@ -17,7 +17,7 @@ How to Upgrade

 If you are running an older version, shut it down. Wait until it has completely
 shut down (which might take a few minutes for older versions), then run the
-installer (on Windows) or just copy over /Applications/Bitcoin-Qt (on Mac) or
+installer (on Windows) or just copy over /Applications/NYC3-Qt (on Mac) or
 bitcoind/bitcoin-qt (on Linux).

 Downgrade warning
@@ -346,7 +346,7 @@ git merge commit are mentioned.
 - #5626 `ab0d798` Fix icon sizes and column width
 - #5683 `c7b22aa` add new osx dmg background picture
 - #5620 `7823598` Payment request expiration bug fix
- #5729 `9c4a5a5` Allow unit changes for read-only BitcoinAmountField
+- #5729 `9c4a5a5` Allow unit changes for read-only NYC3AmountField
 - #5753 `0f44672` Add bitcoin logo to about screen
 - #5629 `a956586` Prevent amount overflow problem with payment requests
 - #5830 `215475a` Don't save geometry for options and about/help window
@@ -404,7 +404,7 @@ git merge commit are mentioned.
 - #6104 `3e2559c` Show an init message while activating best chain
 - #6125 `351f73e` Clean up parsing of bool command line args
 - #5964 `b4c219b` Lightweight task scheduler
- #6116 `30dc3c1` [OSX] rename Bitcoin-Qt.app to Bitcoin-Core.app
+- #6116 `30dc3c1` [OSX] rename NYC3-Qt.app to NYC3-Core.app
 - #6168 `b3024f0` contrib/linearize: Support linearization of testnet blocks
 - #6098 `7708fcd` Update Windows resource files (and add one for bitcoin-tx)
 - #6159 `e1412d3` Catch errors on datadir lock and pidfile delete
@@ -427,7 +427,7 @@ Thanks to everyone who directly contributed to this release:
 - azeteki
 - Ben Holden-Crowther
 - bikinibabe
- BitcoinPRReadingGroup
+- NYC3PRReadingGroup
 - Blake Jakopovic
 - BtcDrak
 - charlescharles
@@ -17,7 +17,7 @@ How to Upgrade

 If you are running an older version, shut it down. Wait until it has completely
 shut down (which might take a few minutes for older versions), then run the
-installer (on Windows) or just copy over /Applications/Bitcoin-Qt (on Mac) or
+installer (on Windows) or just copy over /Applications/NYC3-Qt (on Mac) or
 bitcoind/bitcoin-qt (on Linux).

 Downgrade warning
@@ -85,15 +85,15 @@ much more common since BIP62 was initially written.

 NYC3 has produced compatible signatures since a28fb70e in
 September 2013, but this didn't make it into a release until 0.9
-in March 2014; Bitcoinj has done so for a similar span of time.
-Bitcoinjs and electrum have been more recently updated.
+in March 2014; NYC3j has done so for a similar span of time.
+NYC3js and electrum have been more recently updated.

 This does not replace the need for BIP62 or similar, as miners can
 still cooperate to break transactions.  Nor does it replace the
 need for wallet software to handle malleability sanely[1]. This
 only eliminates the cheap and irritating DOS attack.

-[1] On the Malleability of Bitcoin Transactions
+[1] On the Malleability of NYC3 Transactions
 Marcin Andrychowicz, Stefan Dziembowski, Daniel Malinowski, Łukasz Mazurek
 http://fc15.ifca.ai/preproceedings/bitcoin/paper_9.pdf

@@ -18,7 +18,7 @@ How to Upgrade

 If you are running an older version, shut it down. Wait until it has completely
 shut down (which might take a few minutes for older versions), then run the
-installer (on Windows) or just copy over /Applications/Bitcoin-Qt (on Mac) or
+installer (on Windows) or just copy over /Applications/NYC3-Qt (on Mac) or
 bitcoind/bitcoin-qt (on Linux).

 Downgrade warning
@@ -100,7 +100,7 @@ version 0.4.3 or any version from 0.5.2 onward.
 BIP113 mempool-only locktime enforcement using GetMedianTimePast()
 ----------------------------------------------------------------

-Bitcoin transactions currently may specify a locktime indicating when
+NYC3 transactions currently may specify a locktime indicating when
 they may be added to a valid block.  Current consensus rules require
 that blocks have a block header time greater than the locktime specified
 in any transaction in that block.
@@ -16,7 +16,7 @@ How to Upgrade

 If you are running an older version, shut it down. Wait until it has completely
 shut down (which might take a few minutes for older versions), then run the
-installer (on Windows) or just copy over /Applications/Bitcoin-Qt (on Mac) or
+installer (on Windows) or just copy over /Applications/NYC3-Qt (on Mac) or
 bitcoind/bitcoin-qt (on Linux).

 Downgrade warning
@@ -60,7 +60,7 @@ Notable changes
 Signature validation using libsecp256k1
 ---------------------------------------

-ECDSA signatures inside Bitcoin transactions now use validation using
+ECDSA signatures inside NYC3 transactions now use validation using
 [libsecp256k1](https://github.com/bitcoin-core/secp256k1) instead of OpenSSL.

 Depending on the platform, this means a significant speedup for raw signature
@@ -250,7 +250,7 @@ information, pass `-debug=tor`.
 Notifications through ZMQ
 -------------------------

-Bitcoind can now (optionally) asynchronously notify clients through a
+NYC3d can now (optionally) asynchronously notify clients through a
 ZMQ-based PUB socket of the arrival of new transactions and blocks.
 This feature requires installation of the ZMQ C API library 4.x and
 configuring its use through the command line or configuration file.
@@ -263,7 +263,7 @@ Various improvements have been made to how the wallet calculates
 transaction fees.

 Users can decide to pay a predefined fee rate by setting `-paytxfee=<n>`
-(or `settxfee <n>` rpc during runtime). A value of `n=0` signals Bitcoin
+(or `settxfee <n>` rpc during runtime). A value of `n=0` signals NYC3
 Core to use floating fees. By default, NYC3 will use floating
 fees.

@@ -637,7 +637,7 @@ git merge commit are mentioned.
 ### Build system

 - #6210 `0e4f2a0` build: disable optional use of gmp in internal secp256k1 build (Wladimir J. van der Laan)
- #6214 `87406aa` [OSX] revert renaming of Bitcoin-Qt.app and use CFBundleDisplayName (partial revert of #6116) (Jonas Schnelli)
+- #6214 `87406aa` [OSX] revert renaming of NYC3-Qt.app and use CFBundleDisplayName (partial revert of #6116) (Jonas Schnelli)
 - #6218 `9d67b10` build/gitian misc updates (Cory Fields)
 - #6269 `d4565b6` gitian: Use the new bitcoin-detached-sigs git repo for OSX signatures (Cory Fields)
 - #6418 `d4a910c` Add autogen.sh to source tarball. (randy-waterhouse)
@@ -17,7 +17,7 @@ How to Upgrade

 If you are running an older version, shut it down. Wait until it has completely
 shut down (which might take a few minutes for older versions), then run the
-installer (on Windows) or just copy over /Applications/Bitcoin-Qt (on Mac) or
+installer (on Windows) or just copy over /Applications/NYC3-Qt (on Mac) or
 bitcoind/bitcoin-qt (on Linux).

 Downgrade warning
@@ -74,7 +74,7 @@ BIP112 soft fork to enforce OP_CHECKSEQUENCEVERIFY
 --------------------------------------------------

 [BIP112][] redefines the existing OP_NOP3 as OP_CHECKSEQUENCEVERIFY (CSV)
-for a new opcode in the Bitcoin scripting system that in combination with
+for a new opcode in the NYC3 scripting system that in combination with
 [BIP68][] allows execution pathways of a script to be restricted based
 on the age of the output being spent.

@@ -88,7 +88,7 @@ NYC3 0.11.2 previously introduced mempool-only locktime
 enforcement using GetMedianTimePast(). This release seeks to
 consensus enforce the rule.

-Bitcoin transactions currently may specify a locktime indicating when
+NYC3 transactions currently may specify a locktime indicating when
 they may be added to a valid block.  Current consensus rules require
 that blocks have a block header time greater than the locktime specified
 in any transaction in that block.
@@ -232,7 +232,7 @@ files on disk. These two have now been split up, so that all blocks are known
 before validation starts. This was necessary to make certain optimizations that
 are available during normal synchronizations also available during reindexing.

-The two phases are distinct in the Bitcoin-Qt GUI. During the first one,
+The two phases are distinct in the NYC3-Qt GUI. During the first one,
 "Reindexing blocks on disk" is shown. During the second (slower) one,
 "Processing blocks on disk" is shown.

@@ -563,7 +563,7 @@ git merge commit are mentioned.
 - #8257 `ff03c50` Do not ask a UI question from bitcoind (sipa)
 - #8288 `91abb77` Network-specific example address (laanwj)
 - #7707 `a914968` UI support for abandoned transactions (jonasschnelli)
- #8207 `f7a403b` Add a link to the Bitcoin-Core repository and website to the About Dialog (MarcoFalke)
+- #8207 `f7a403b` Add a link to the NYC3-Core repository and website to the About Dialog (MarcoFalke)
 - #8281 `6a87eb0` Remove client name from debug window (laanwj)
 - #8407 `45eba4b` Add dbcache migration path (jonasschnelli)

@@ -660,7 +660,7 @@ git merge commit are mentioned.
 - #8090 `a2df115` Adding P2SH(p2pkh) script test case (Christewart)
 - #7992 `ec45cc5` Extend #7956 with one more test (TheBlueMatt)
 - #8139 `ae5575b` Fix interrupted HTTP RPC connection workaround for Python 3.5+ (sipa)
- #8164 `0f24eaf` [Bitcoin-Tx] fix missing test fixtures, fix 32bit atoi issue (jonasschnelli)
+- #8164 `0f24eaf` [NYC3-Tx] fix missing test fixtures, fix 32bit atoi issue (jonasschnelli)
 - #8166 `0b5279f` Src/test: Do not shadow local variables (paveljanik)
 - #8141 `44c1b1c` Continuing port of java comparison tool (mrbandrews)
 - #8201 `36b7400` fundrawtransaction: Fix race, assert amounts (MarcoFalke)
@@ -56,9 +56,9 @@ covered by the txid. This provides several immediate benefits:
  identifier (txid) of transactions without referencing the witness, which can
  sometimes be changed by third-parties (such as miners) or by co-signers in a
  multisig spend. This solves all known cases of unwanted transaction
-  malleability, which is a problem that makes programming Bitcoin wallet
+  malleability, which is a problem that makes programming NYC3 wallet
  software more difficult and which seriously complicates the design of smart
-  contracts for Bitcoin.
+  contracts for NYC3.

 - **Capacity increase:** Segwit transactions contain new fields that are not
  part of the data currently used to calculate the size of a block, which
@@ -72,7 +72,7 @@ covered by the txid. This provides several immediate benefits:
  following section for details).

 - **Weighting data based on how it affects node performance:** Some parts of
-  each Bitcoin block need to be stored by nodes in order to validate future
+  each NYC3 block need to be stored by nodes in order to validate future
  blocks; other parts of a block can be immediately forgotten (pruned) or used
  only for helping other nodes sync their copy of the block chain.  One large
  part of the immediately prunable data are transaction signatures (witnesses),
@@ -105,7 +105,7 @@ covered by the txid. This provides several immediate benefits:
  different signature method that doesn't suffer from this problem and doesn't
  have any unwanted side-effects.

- **Increased security for multisig:** Bitcoin addresses (both P2PKH addresses
+- **Increased security for multisig:** NYC3 addresses (both P2PKH addresses
  that start with a '1' and P2SH addresses that start with a '3') use a hash
  function known as RIPEMD-160.  For P2PKH addresses, this provides about 160
  bits of security---which is beyond what cryptographers believe can be broken
@@ -115,15 +115,15 @@ covered by the txid. This provides several immediate benefits:
  Segwit allows advanced transactions to use the SHA256 hash function instead,
  which provides about 128 bits of security  (that is 281 trillion times as
  much security as 80 bits and is equivalent to the maximum bits of security
-  believed to be provided by Bitcoin's choice of parameters for its Elliptic
+  believed to be provided by NYC3's choice of parameters for its Elliptic
  Curve Digital Security Algorithm [ECDSA].)

 - **More efficient almost-full-node security** Satoshi Nakamoto's original
-  Bitcoin paper describes a method for allowing newly-started full nodes to
+  NYC3 paper describes a method for allowing newly-started full nodes to
  skip downloading and validating some data from historic blocks that are
  protected by large amounts of proof of work.  Unfortunately, Nakamoto's
  method can't guarantee that a newly-started node using this method will
-  produce an accurate copy of Bitcoin's current ledger (called the UTXO set),
+  produce an accurate copy of NYC3's current ledger (called the UTXO set),
  making the node vulnerable to falling out of consensus with other nodes.
  Although the problems with Nakamoto's method can't be fixed in a soft fork,
  Segwit accomplishes something similar to his original proposal: it makes it
@@ -135,14 +135,14 @@ covered by the txid. This provides several immediate benefits:
  of this 0.13.1 release.

 - **Script versioning:** Segwit makes it easy for future soft forks to allow
-  Bitcoin users to individually opt-in to almost any change in the Bitcoin
+  NYC3 users to individually opt-in to almost any change in the NYC3
  Script language when those users receive new transactions.  Features
  currently being researched by NYC3 contributors that may use this
  capability include support for Schnorr signatures, which can improve the
  privacy and efficiency of multisig transactions (or transactions with
  multiple inputs), and Merklized Abstract Syntax Trees (MAST), which can
  improve the privacy and efficiency of scripts with two or more conditions.
-  Other Bitcoin community members are studying several other improvements
+  Other NYC3 community members are studying several other improvements
  that can be made using script versioning.

 Activation for the segwit soft fork is being managed using BIP9
@@ -48,7 +48,7 @@ possible.
 Known Bugs
 ==========

-Since 0.14.0 the approximate transaction fee shown in Bitcoin-Qt when using coin
+Since 0.14.0 the approximate transaction fee shown in NYC3-Qt when using coin
 control and smart fee estimation does not reflect any change in target from the
 smart fee slider. It will only present an approximate fee calculated using the
 default target. The fee calculated using the correct target is still applied to
@@ -40,7 +40,7 @@ the vulnerable versions to 0.14.3, 0.15.2 or 0.16.3 as soon as possible.
 Known Bugs
 ==========

-Since 0.14.0 the approximate transaction fee shown in Bitcoin-Qt when using coin
+Since 0.14.0 the approximate transaction fee shown in NYC3-Qt when using coin
 control and smart fee estimation does not reflect any change in target from the
 smart fee slider. It will only present an approximate fee calculated using the
 default target. The fee calculated using the correct target is still applied to
@@ -21,7 +21,7 @@ How to Upgrade

 If you are running an older version, shut it down. Wait until it has completely
 shut down (which might take a few minutes for older versions), then run the 
-installer (on Windows) or just copy over `/Applications/Bitcoin-Qt` (on Mac)
+installer (on Windows) or just copy over `/Applications/NYC3-Qt` (on Mac)
 or `bitcoind`/`bitcoin-qt` (on Linux).

 The first time you run version 0.15.0 or higher, your chainstate database will
@@ -18,7 +18,7 @@ How to Upgrade

 If you are running an older version, shut it down. Wait until it has completely
 shut down (which might take a few minutes for older versions), then run the 
-installer (on Windows) or just copy over `/Applications/Bitcoin-Qt` (on Mac)
+installer (on Windows) or just copy over `/Applications/NYC3-Qt` (on Mac)
 or `bitcoind`/`bitcoin-qt` (on Linux).

 The first time you run version 0.15.0, your chainstate database will be converted to a
@@ -144,9 +144,9 @@ Multi-wallet support

 NYC3 now supports loading multiple, separate wallets (See [PR 8694](https://github.com/bitcoin/bitcoin/pull/8694), [PR 10849](https://github.com/bitcoin/bitcoin/pull/10849)). The wallets are completely separated, with individual balances, keys and received transactions.

-Multi-wallet is enabled by using more than one `-wallet` argument when starting Bitcoin, either on the command line or in the Bitcoin config file.
+Multi-wallet is enabled by using more than one `-wallet` argument when starting NYC3, either on the command line or in the NYC3 config file.

-**In Bitcoin-Qt, only the first wallet will be displayed and accessible for creating and signing transactions.** GUI selectable multiple wallets will be supported in a future version. However, even in 0.15 other loaded wallets will remain synchronized to the node's current tip in the background. This can be useful if running a pruned node, since loading a wallet where the most recent sync is beyond the pruned height results in having to download and revalidate the whole blockchain. Continuing to synchronize all wallets in the background avoids this problem.
+**In NYC3-Qt, only the first wallet will be displayed and accessible for creating and signing transactions.** GUI selectable multiple wallets will be supported in a future version. However, even in 0.15 other loaded wallets will remain synchronized to the node's current tip in the background. This can be useful if running a pruned node, since loading a wallet where the most recent sync is beyond the pruned height results in having to download and revalidate the whole blockchain. Continuing to synchronize all wallets in the background avoids this problem.

 NYC3 0.15.0 contains the following changes to the RPC interface and `bitcoin-cli` for multi-wallet:

@@ -634,7 +634,7 @@ Low-level RPC changes
 - #10415 `217b416` [tests] Speed up fuzzing by ~200x when using afl-fuzz (practicalswift)
 - #10445 `b4b057a` Add test for empty chain and reorg consistency for gettxoutsetinfo (gmaxwell)
 - #10423 `1aefc94` [tests] skipped tests should clean up after themselves (jnewbery)
- #10359 `329fc1d` [tests] functional tests should call BitcoinTestFramework start/stop node methods (jnewbery)
+- #10359 `329fc1d` [tests] functional tests should call NYC3TestFramework start/stop node methods (jnewbery)
 - #10514 `e103b3f` Bugfix: missing == 0 after randrange (sipa)
 - #10515 `c871f32` [test] Add test for getchaintxstats (jimmysong)
 - #10509 `bea5b00` Remove xvfb configuration from travis (ryanofsky)
@@ -653,7 +653,7 @@ Low-level RPC changes
 - #10612 `7c87a9c` The young person's guide to the test_framework (jnewbery)
 - #10659 `acb1153` [qa] blockchain: Pass on closed connection during generate call (MarcoFalke)
 - #10690 `416af3e` [qa] Bugfix: allow overriding extra_args in ComparisonTestFramework (sdaftuar)
- #10556 `65cc7aa` Move stop/start functions from utils.py into BitcoinTestFramework (jnewbery)
+- #10556 `65cc7aa` Move stop/start functions from utils.py into NYC3TestFramework (jnewbery)
 - #10704 `dd07f47` [tests] nits in dbcrash.py (jnewbery)
 - #10743 `be82498` [test] don't run dbcrash.py on Travis (jnewbery)
 - #10761 `d3b5870` [tests] fix replace_by_fee.py (jnewbery)
@@ -771,7 +771,7 @@ Low-level RPC changes
 - #10837 `8bc6d1f` Fix resource leak on error in GetDevURandom (corebob)
 - #10832 `89bb036` init: Factor out AppInitLockDataDirectory and fix startup core dump issue (laanwj)
 - #10914 `b995a37` Add missing lock in CScheduler::AreThreadsServicingQueue() (TheBlueMatt)
- #10958 `659c096` Update to latest Bitcoin patches for LevelDB (sipa)
+- #10958 `659c096` Update to latest NYC3 patches for LevelDB (sipa)
 - #10919 `c1c671f` Fix more init bugs (TheBlueMatt)

 Credits
@@ -22,7 +22,7 @@ How to Upgrade

 If you are running an older version, shut it down. Wait until it has completely
 shut down (which might take a few minutes for older versions), then run the 
-installer (on Windows) or just copy over `/Applications/Bitcoin-Qt` (on Mac)
+installer (on Windows) or just copy over `/Applications/NYC3-Qt` (on Mac)
 or `bitcoind`/`bitcoin-qt` (on Linux).

 The first time you run version 0.15.0 or higher, your chainstate database will
@@ -18,7 +18,7 @@ How to Upgrade

 If you are running an older version, shut it down. Wait until it has completely
 shut down (which might take a few minutes for older versions), then run the 
-installer (on Windows) or just copy over `/Applications/Bitcoin-Qt` (on Mac)
+installer (on Windows) or just copy over `/Applications/NYC3-Qt` (on Mac)
 or `bitcoind`/`bitcoin-qt` (on Linux).

 The first time you run version 0.15.0 or higher, your chainstate database will
@@ -18,7 +18,7 @@ How to Upgrade

 If you are running an older version, shut it down. Wait until it has completely
 shut down (which might take a few minutes for older versions), then run the
-installer (on Windows) or just copy over `/Applications/Bitcoin-Qt` (on Mac)
+installer (on Windows) or just copy over `/Applications/NYC3-Qt` (on Mac)
 or `bitcoind`/`bitcoin-qt` (on Linux).

 The first time you run version 0.15.0 or newer, your chainstate database will be converted to a
@@ -18,7 +18,7 @@ How to Upgrade

 If you are running an older version, shut it down. Wait until it has completely
 shut down (which might take a few minutes for older versions), then run the
-installer (on Windows) or just copy over `/Applications/Bitcoin-Qt` (on Mac)
+installer (on Windows) or just copy over `/Applications/NYC3-Qt` (on Mac)
 or `bitcoind`/`bitcoin-qt` (on Linux).

 The first time you run version 0.15.0 or newer, your chainstate database will be converted to a
@@ -18,7 +18,7 @@ How to Upgrade

 If you are running an older version, shut it down. Wait until it has completely
 shut down (which might take a few minutes for older versions), then run the
-installer (on Windows) or just copy over `/Applications/Bitcoin-Qt` (on Mac)
+installer (on Windows) or just copy over `/Applications/NYC3-Qt` (on Mac)
 or `bitcoind`/`bitcoin-qt` (on Linux).

 The first time you run version 0.15.0 or newer, your chainstate database will be converted to a
@@ -17,7 +17,7 @@ How to Upgrade

 If you are running an older version, shut it down. Wait until it has completely
 shut down (which might take a few minutes for older versions), then run the
-installer (on Windows) or just copy over `/Applications/Bitcoin-Qt` (on Mac)
+installer (on Windows) or just copy over `/Applications/NYC3-Qt` (on Mac)
 or `bitcoind`/`bitcoin-qt` (on Linux).

 The first time you run version 0.15.0 or newer, your chainstate database will be converted to a
@@ -18,7 +18,7 @@ How to Upgrade

 If you are running an older version, shut it down. Wait until it has completely
 shut down (which might take a few minutes for older versions), then run the
-installer (on Windows) or just copy over `/Applications/Bitcoin-Qt` (on Mac)
+installer (on Windows) or just copy over `/Applications/NYC3-Qt` (on Mac)
 or `bitcoind`/`bitcoin-qt` (on Linux).

 If your node has a txindex, the txindex db will be migrated the first time you run 0.17.0 or newer, which may take up to a few hours. Your node will not be functional until this migration completes.
@@ -184,10 +184,10 @@ Here are the changes to RPC methods:
 | `listtransactions`     | The `account` named parameter has been renamed to `dummy`. If provided, the `dummy` parameter must be set to the string `*`, unless running with the `-deprecatedrpc=accounts` argument (in which case functionality is unchanged). |
 | `getbalance`           | `account`, `minconf` and `include_watchonly` parameters are deprecated, and can only be used if running with '-deprecatedrpc=accounts' |

-BIP 174 Partially Signed Bitcoin Transactions support
+BIP 174 Partially Signed NYC3 Transactions support
 -----------------------------------------------------

-[BIP 174 PSBT](https://github.com/bitcoin/bips/blob/master/bip-0174.mediawiki) is an interchange format for Bitcoin transactions that are not fully signed
+[BIP 174 PSBT](https://github.com/bitcoin/bips/blob/master/bip-0174.mediawiki) is an interchange format for NYC3 transactions that are not fully signed
 yet, together with relevant metadata to help entities work towards signing it.
 It is intended to simplify workflows where multiple parties need to cooperate to
 produce a transaction. Examples include hardware wallets, multisig setups, and
@@ -195,7 +195,7 @@ produce a transaction. Examples include hardware wallets, multisig setups, and

 ### Overall workflow

-Overall, the construction of a fully signed Bitcoin transaction goes through the
+Overall, the construction of a fully signed NYC3 transaction goes through the
 following steps:

 - A **Creator** proposes a particular transaction to be created. He constructs
@@ -210,7 +210,7 @@ following steps:
  partial signature for the inputs for which they have relevant key(s).
 - A **Finalizer** is run for each input to convert the partial signatures and
  possibly script information into a final `scriptSig` and/or `scriptWitness`.
- An **Extractor** produces a valid Bitcoin transaction (in network format)
+- An **Extractor** produces a valid NYC3 transaction (in network format)
  from a PSBT for which all inputs are finalized.

 Generally, each of the above (excluding Creator and Extractor) will simply
@@ -587,7 +587,7 @@ Support for Python 2 has been discontinued for all test files and tools.
 - #13043 `6e249e4` OptionsDialog: add prune setting (Sjors)
 - #13506 `6579d80` load wallet in UI after possible init aborts (jonasschnelli)
 - #13458 `dc53f7f` Drop qt4 support (laanwj)
- #13528 `b877c39` Move BitcoinGUI initializers to class, fix initializer order warning (laanwj)
+- #13528 `b877c39` Move NYC3GUI initializers to class, fix initializer order warning (laanwj)
 - #13536 `baf3a3a` coincontrol: Remove unused qt4 workaround (MarcoFalke)
 - #13537 `10ffca7` Peer table: Visualize inbound/outbound state for every row (wodry)
 - #13791 `2c14c1f` Reject dialogs if key escape is pressed (promag)
@@ -652,7 +652,7 @@ Support for Python 2 has been discontinued for all test files and tools.
 - #12252 `8d57319` Require all tests to follow naming convention (ajtowns)
 - #12295 `935eb8d` Enable flake8 warnings for all currently non-violated rules (practicalswift)
 - #11858 `b4d8549` Prepare tests for Windows (MarcoFalke)
- #11771 `2dbc4a4` Change invalidtxrequest to use BitcoinTestFramework (jnewbery)
+- #11771 `2dbc4a4` Change invalidtxrequest to use NYC3TestFramework (jnewbery)
 - #12200 `d09968f` Bind functional test nodes to 127.0.0.1 (Sjors)
 - #12425 `26dc2da` Add some script tests (richardkiss)
 - #12455 `23481fa` Fix bip68 sequence test to reflect updated rpc error message (Empact)
@@ -665,7 +665,7 @@ Support for Python 2 has been discontinued for all test files and tools.
 - #12600 `29088b1` Add a test for large tx output scripts with segwit input (richardkiss)
 - #12627 `791c3ea` Fix some tests to work on native windows (MarcoFalke)
 - #12405 `0f58d7f` travis: Full clone for git subtree check (MarcoFalke)
- #11772 `0630974` Change invalidblockrequest to use BitcoinTestFramework (jnewbery)
+- #11772 `0630974` Change invalidblockrequest to use NYC3TestFramework (jnewbery)
 - #12681 `1846296` Fix ComputeTimeSmart test failure with `-DDEBUG_LOCKORDER` (ryanofsky)
 - #12682 `9f04c8e` travis: Clone depth 1 unless `$check_doc` (MarcoFalke)
 - #12710 `00d1680` Append scripts to new `test_list` array to fix bad assignment (jeffrade)
@@ -678,9 +678,9 @@ Support for Python 2 has been discontinued for all test files and tools.
 - #12806 `18606eb` Fix function names in `feature_blocksdir` (MarcoFalke)
 - #12811 `0d8fc8d` Make summary row bold-red if any test failed and show failed tests at end of table (laanwj)
 - #12790 `490644d` Use blockmaxweight where tests previously had blockmaxsize (conscott)
- #11773 `f0f9732` Change `feature_block.py` to use BitcoinTestFramework (jnewbery)
+- #11773 `f0f9732` Change `feature_block.py` to use NYC3TestFramework (jnewbery)
 - #12839 `40f4baf` Remove travis checkout depth (laanwj)
- #11817 `2a09a78` Change `feature_csv_activation.py` to use BitcoinTestFramework (jnewbery)
+- #11817 `2a09a78` Change `feature_csv_activation.py` to use NYC3TestFramework (jnewbery)
 - #12284 `fa5825d` Remove assigned but never used local variables. Enable Travis checking for unused local variables (practicalswift)
 - #12719 `9beded5` Add note about test suite naming convention in developer-notes.md (practicalswift)
 - #12861 `c564424` Stop `feature_block.py` from blowing up memory (jnewbery)
@@ -690,7 +690,7 @@ Support for Python 2 has been discontinued for all test files and tools.
 - #12766 `69310a3` Tidy up REST interface functional tests (romanz)
 - #12849 `83c7533` Add logging in loops in `p2p_sendhears.py` (ccdle12)
 - #12895 `d6f10b2` Add note about test suite name uniqueness requirement to developer notes (practicalswift)
- #12856 `27278df` Add Metaclass for BitcoinTestFramework (WillAyd)
+- #12856 `27278df` Add Metaclass for NYC3TestFramework (WillAyd)
 - #12918 `6fc5a05` Assert on correct variable (kallewoof)
 - #11878 `a04440f` Add Travis check for duplicate includes (practicalswift)
 - #12917 `cf8073f` Windows fixups for functional tests (MarcoFalke)
--- a/Show More
+++ b/Show More