sami7777/cac3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1 from akshaynexus/master

Browse Source 
[Build] Update version , Bitcoin to NYC3 , Gitian descriptors update
This commit is contained in:
nyc3coin
2019-06-11 06:12:10 +08:00
committed by GitHub
parent c6c7351beb f7f7c5c1bf
commit 1739b485fd
959 changed files with 6726 additions and 3905 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/ISSUE_TEMPLATE.md
+3 -3
View File
@@ -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/. 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? --> <!--- 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)? --> <!-- What type of machine are you observing the error on (OS/CPU and disk type)? -->
.github/PULL_REQUEST_TEMPLATE.md
+3 -3
View File
@@ -2,7 +2,7 @@ Pull requests without a rationale and clear improvement may be closed
immediately. immediately.
Please provide clear motivation for your patch and explain how it improves 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. significantly.
* Any test improvements or new tests that improve coverage are always welcome. * Any test improvements or new tests that improve coverage are always welcome.
@@ -15,7 +15,7 @@ significantly.
was fixed. was fixed.
* Features are welcome, but might be rejected due to design or scope issues. * 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 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 * Refactoring changes are only accepted if they are required for a feature or
bug fix or otherwise improve developer experience significantly. For example, bug fix or otherwise improve developer experience significantly. For example,
most "code style" refactoring changes require a thorough explanation why they 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 preferred in the [developer notes](/doc/developer-notes.md), stylistic code
changes are usually rejected. 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 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 effort to review. There is a huge lack of active reviewers on the project, so
patches often sit for a long time. patches often sit for a long time.
.gitignore
+1 -1
View File
@@ -83,7 +83,7 @@ src/qt/bitcoin-qt.includes
*.qm *.qm
Makefile Makefile
bitcoin-qt bitcoin-qt
Bitcoin-Qt.app NYC3-Qt.app
background.tiff* background.tiff*
# Unit-tests # Unit-tests
.travis/lint_04_install.sh
+1 -1
View File
@@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/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 # Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php. # file COPYING or http://www.opensource.org/licenses/mit-license.php.
.travis/lint_05_before_script.sh
+1 -1
View File
@@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/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 # Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php. # file COPYING or http://www.opensource.org/licenses/mit-license.php.
.travis/lint_06_script.sh
+1 -1
View File
@@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/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 # Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php. # file COPYING or http://www.opensource.org/licenses/mit-license.php.
.travis/test_03_before_install.sh
+1 -1
View File
@@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/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 # Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php. # file COPYING or http://www.opensource.org/licenses/mit-license.php.
.travis/test_04_install.sh
+1 -1
View File
@@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/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 # Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php. # file COPYING or http://www.opensource.org/licenses/mit-license.php.
.travis/test_05_before_script.sh
+1 -1
View File
@@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/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 # Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php. # file COPYING or http://www.opensource.org/licenses/mit-license.php.
.travis/test_06_script_a.sh
+1 -1
View File
@@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/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 # Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php. # file COPYING or http://www.opensource.org/licenses/mit-license.php.
.travis/test_06_script_b.sh
+1 -1
View File
@@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/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 # Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php. # file COPYING or http://www.opensource.org/licenses/mit-license.php.
CONTRIBUTING.md
+3 -3
View File
@@ -200,7 +200,7 @@ workload on reviewing.
------------------------- -------------------------
The following applies to code changes to the NYC3 project (and related 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. Network Protocol consensus changes.
Whether a pull request is merged into NYC3 rests with the project merge 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 - Where bugs are fixed, where possible, there should be unit tests
demonstrating the bug and also proving the fix. This helps prevent regression. 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 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 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 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 mistakes could be very costly to the wider community. This includes refactoring
of consensus critical code. 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 extensively on the mailing list and IRC, be accompanied by a widely
discussed BIP and have a generally widely perceived technical consensus of being discussed BIP and have a generally widely perceived technical consensus of being
a worthwhile change based on the judgement of the maintainers. a worthwhile change based on the judgement of the maintainers.
COPYING
+2 -2
View File
@@ -1,7 +1,7 @@
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2009-2019 The Bitcoin Core developers Copyright (c) 2009-2019 The NYC3 Core developers
Copyright (c) 2009-2019 Bitcoin Developers Copyright (c) 2009-2019 NYC3 Developers
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal
INSTALL.md
+2 -2
View File
@@ -1,5 +1,5 @@
Building Bitcoin Building NYC3
================ ================
See doc/build-*.md for instructions on building the various 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.
Makefile.am
+9 -9
View File
@@ -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 # Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php. # file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -26,7 +26,7 @@ BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EX
empty := empty :=
space := $(empty) $(empty) space := $(empty) $(empty)
OSX_APP=Bitcoin-Qt.app OSX_APP=NYC3-Qt.app
OSX_VOLNAME = $(subst $(space),-,$(PACKAGE_NAME)) OSX_VOLNAME = $(subst $(space),-,$(PACKAGE_NAME))
OSX_DMG = $(OSX_VOLNAME).dmg OSX_DMG = $(OSX_VOLNAME).dmg
OSX_BACKGROUND_SVG=background.svg OSX_BACKGROUND_SVG=background.svg
@@ -35,7 +35,7 @@ OSX_BACKGROUND_IMAGE_DPIS=36 72
OSX_DSSTORE_GEN=$(top_srcdir)/contrib/macdeploy/custom_dsstore.py OSX_DSSTORE_GEN=$(top_srcdir)/contrib/macdeploy/custom_dsstore.py
OSX_DEPLOY_SCRIPT=$(top_srcdir)/contrib/macdeploy/macdeployqtplus OSX_DEPLOY_SCRIPT=$(top_srcdir)/contrib/macdeploy/macdeployqtplus
OSX_FANCY_PLIST=$(top_srcdir)/contrib/macdeploy/fancy.plist OSX_FANCY_PLIST=$(top_srcdir)/contrib/macdeploy/fancy.plist
OSX_INSTALLER_ICONS=$(top_srcdir)/src/qt/res/icons/bitcoin.icns OSX_INSTALLER_ICONS=$(top_srcdir)/src/qt/res/icons/nyc3.icns
OSX_PLIST=$(top_builddir)/share/qt/Info.plist #not installed OSX_PLIST=$(top_builddir)/share/qt/Info.plist #not installed
OSX_QT_TRANSLATIONS = da,de,es,hu,ru,uk,zh_CN,zh_TW OSX_QT_TRANSLATIONS = da,de,es,hu,ru,uk,zh_CN,zh_TW
@@ -94,11 +94,11 @@ $(OSX_APP)/Contents/Info.plist: $(OSX_PLIST)
$(MKDIR_P) $(@D) $(MKDIR_P) $(@D)
$(INSTALL_DATA) $< $@ $(INSTALL_DATA) $< $@
$(OSX_APP)/Contents/Resources/bitcoin.icns: $(OSX_INSTALLER_ICONS) $(OSX_APP)/Contents/Resources/nyc3.icns: $(OSX_INSTALLER_ICONS)
$(MKDIR_P) $(@D) $(MKDIR_P) $(@D)
$(INSTALL_DATA) $< $@ $(INSTALL_DATA) $< $@
$(OSX_APP)/Contents/MacOS/Bitcoin-Qt: all-recursive $(OSX_APP)/Contents/MacOS/NYC3-Qt: all-recursive
$(MKDIR_P) $(@D) $(MKDIR_P) $(@D)
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_QT_BIN) $@ STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_QT_BIN) $@
@@ -107,8 +107,8 @@ $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings:
echo '{ CFBundleDisplayName = "$(PACKAGE_NAME)"; CFBundleName = "$(PACKAGE_NAME)"; }' > $@ echo '{ CFBundleDisplayName = "$(PACKAGE_NAME)"; CFBundleName = "$(PACKAGE_NAME)"; }' > $@
OSX_APP_BUILT=$(OSX_APP)/Contents/PkgInfo $(OSX_APP)/Contents/Resources/empty.lproj \ OSX_APP_BUILT=$(OSX_APP)/Contents/PkgInfo $(OSX_APP)/Contents/Resources/empty.lproj \
$(OSX_APP)/Contents/Resources/bitcoin.icns $(OSX_APP)/Contents/Info.plist \ $(OSX_APP)/Contents/Resources/nyc3.icns $(OSX_APP)/Contents/Info.plist \
$(OSX_APP)/Contents/MacOS/Bitcoin-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings $(OSX_APP)/Contents/MacOS/NYC3-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings
osx_volname: osx_volname:
echo $(OSX_VOLNAME) >$@ echo $(OSX_VOLNAME) >$@
@@ -133,7 +133,7 @@ $(APP_DIST_DIR)/Applications:
@rm -f $@ @rm -f $@
@cd $(@D); $(LN_S) /Applications $(@F) @cd $(@D); $(LN_S) /Applications $(@F)
$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Bitcoin-Qt $(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/NYC3-Qt
$(OSX_DMG): $(APP_DIST_EXTRAS) $(OSX_DMG): $(APP_DIST_EXTRAS)
$(GENISOIMAGE) -no-cache-inodes -D -l -probe -V "$(OSX_VOLNAME)" -no-pad -r -dir-mode 0755 -apple -o $@ dist $(GENISOIMAGE) -no-cache-inodes -D -l -probe -V "$(OSX_VOLNAME)" -no-pad -r -dir-mode 0755 -apple -o $@ dist
@@ -148,7 +148,7 @@ $(APP_DIST_DIR)/.background/$(OSX_BACKGROUND_IMAGE): $(OSX_BACKGROUND_IMAGE_DPIF
$(APP_DIST_DIR)/.DS_Store: $(OSX_DSSTORE_GEN) $(APP_DIST_DIR)/.DS_Store: $(OSX_DSSTORE_GEN)
$(PYTHON) $< "$@" "$(OSX_VOLNAME)" $(PYTHON) $< "$@" "$(OSX_VOLNAME)"
$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Bitcoin-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING) $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/NYC3-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING)
INSTALLNAMETOOL=$(INSTALLNAMETOOL) OTOOL=$(OTOOL) STRIP=$(STRIP) $(PYTHON) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) -translations-dir=$(QT_TRANSLATION_DIR) -add-qt-tr $(OSX_QT_TRANSLATIONS) -verbose 2 INSTALLNAMETOOL=$(INSTALLNAMETOOL) OTOOL=$(OTOOL) STRIP=$(STRIP) $(PYTHON) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) -translations-dir=$(QT_TRANSLATION_DIR) -add-qt-tr $(OSX_QT_TRANSLATIONS) -verbose 2
deploydir: $(APP_DIST_EXTRAS) deploydir: $(APP_DIST_EXTRAS)
README.md
+1 -1
View File
@@ -2,7 +2,7 @@ NYC3 (NewYorkCoin3) integration/staging tree
============================================ ============================================
Built upon Bitcoin Core 0.18; NYC3 offers a blocktime of 10 seconds, consensus operates using a modified version of the Argon2 password hashing algorithm (http://github.com/barrystyle/argon2s) in a POW configuration and uses LWMA3 to regulate block-spacing. Built upon NYC3 Core 0.18; NYC3 offers a blocktime of 10 seconds, consensus operates using a modified version of the Argon2 password hashing algorithm (http://github.com/barrystyle/argon2s) in a POW configuration and uses LWMA3 to regulate block-spacing.
License License
autogen.sh
+1 -1
View File
@@ -1,5 +1,5 @@
#!/bin/sh #!/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 # Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php. # file COPYING or http://www.opensource.org/licenses/mit-license.php.
build-aux/m4/bitcoin_find_bdb48.m4
+1 -1
View File
@@ -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 Distributed under the MIT software license, see the accompanying
dnl file COPYING or http://www.opensource.org/licenses/mit-license.php. dnl file COPYING or http://www.opensource.org/licenses/mit-license.php.
build-aux/m4/bitcoin_qt.m4
+1 -1
View File
@@ -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 Distributed under the MIT software license, see the accompanying
dnl file COPYING or http://www.opensource.org/licenses/mit-license.php. dnl file COPYING or http://www.opensource.org/licenses/mit-license.php.
build-aux/m4/bitcoin_subdir_to_include.m4
+1 -1
View File
@@ -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 Distributed under the MIT software license, see the accompanying
dnl file COPYING or http://www.opensource.org/licenses/mit-license.php. dnl file COPYING or http://www.opensource.org/licenses/mit-license.php.
build_msvc/README.md
+1 -1
View File
@@ -9,7 +9,7 @@ Building with Visual Studio is an alternative to the Linux based [cross-compiler
Dependencies 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: Options for installing the dependencies in a Visual Studio compatible manner are:
build_msvc/bitcoin_config.h
+1 -1
View File
@@ -23,7 +23,7 @@
#define COPYRIGHT_HOLDERS "The %s developers" #define COPYRIGHT_HOLDERS "The %s developers"
/* Copyright holder(s) */ /* 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 */ /* Replacement for %s in copyright holders string */
#define COPYRIGHT_HOLDERS_SUBSTITUTION "NYC3" #define COPYRIGHT_HOLDERS_SUBSTITUTION "NYC3"
configure.ac
+2 -2
View File
@@ -1,7 +1,7 @@
dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N) dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
AC_PREREQ([2.60]) AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 0) define(_CLIENT_VERSION_MAJOR, 1)
define(_CLIENT_VERSION_MINOR, 18) define(_CLIENT_VERSION_MINOR, 1)
define(_CLIENT_VERSION_REVISION, 0) define(_CLIENT_VERSION_REVISION, 0)
define(_CLIENT_VERSION_BUILD, 0) define(_CLIENT_VERSION_BUILD, 0)
define(_CLIENT_VERSION_RC, 0) define(_CLIENT_VERSION_RC, 0)
contrib/README.md
+2 -2
View File
@@ -13,7 +13,7 @@ Construct a linear, no-fork, best version of the blockchain.
### [Qos](/contrib/qos) ### ### [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) ### ### [Seeds](/contrib/seeds) ###
Utility to generate the pnSeed[] array that is compiled into the client. Utility to generate the pnSeed[] array that is compiled into the client.
@@ -42,7 +42,7 @@ Test and Verify Tools
--------------------- ---------------------
### [TestGen](/contrib/testgen) ### ### [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) ### ### [Verify Binaries](/contrib/verifybinaries) ###
This script attempts to download and verify the signature file SHA256SUMS.asc from bitcoin.org. This script attempts to download and verify the signature file SHA256SUMS.asc from bitcoin.org.
contrib/bitcoin-cli.bash-completion
+1 -1
View File
@@ -1,5 +1,5 @@
# bash programmable completion for bitcoin-cli(1) # 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 # Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php. # file COPYING or http://www.opensource.org/licenses/mit-license.php.
contrib/bitcoin-tx.bash-completion
+1 -1
View File
@@ -1,5 +1,5 @@
# bash programmable completion for bitcoin-tx(1) # 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 # Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php. # file COPYING or http://www.opensource.org/licenses/mit-license.php.
contrib/bitcoind.bash-completion
+1 -1
View File
@@ -1,5 +1,5 @@
# bash programmable completion for bitcoind(1) and bitcoin-qt(1) # 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 # Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php. # file COPYING or http://www.opensource.org/licenses/mit-license.php.
contrib/debian/copyright
+1 -1
View File
@@ -1,5 +1,5 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ 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> Upstream-Contact: Satoshi Nakamoto <satoshin@gmx.com>
irc://#bitcoin@freenode.net irc://#bitcoin@freenode.net
Source: https://github.com/bitcoin/bitcoin Source: https://github.com/bitcoin/bitcoin
contrib/devtools/README.md
+7 -7
View File
@@ -36,31 +36,31 @@ Specifying `verbose` will list the full filenames of files of each category.
copyright\_header.py update \<base\_directory\> [verbose] 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: 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: 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. where `<lastModifiedYear>` is obtained from the `git log` history.
This subcommand also handles copyright headers that have only a single year. In This subcommand also handles copyright headers that have only a single year. In
those cases: those cases:
``` ```
// Copyright (c) <year> The Bitcoin Core developers // Copyright (c) <year> The NYC3 Core developers
``` ```
will be updated to: 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. where the update is appropriate.
copyright\_header.py insert \<file\> 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 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 file is a Python file and it has `#!` starting the first line, the header is
inserted in the line below it. 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_introduced>` is equal to `<current_year>`, it will be set as a single
year rather than two hyphenated years. 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. script will exit.
gen-manpages.sh gen-manpages.sh
contrib/devtools/copyright_header.py
+14 -14
View File
@@ -1,5 +1,5 @@
#!/usr/bin/env python3 #!/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 # Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php. # 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 = [ EXPECTED_HOLDER_NAMES = [
"Satoshi Nakamoto\n", "Satoshi Nakamoto\n",
"The Bitcoin Core developers\n", "The NYC3 Core developers\n",
"NYC3 Developers\n", "NYC3 Developers\n",
"BitPay Inc\.\n", "BitPay Inc\.\n",
"University of Illinois at Urbana-Champaign\.\n", "University of Illinois at Urbana-Champaign\.\n",
@@ -334,7 +334,7 @@ def write_file_lines(filename, file_lines):
COPYRIGHT = 'Copyright \(c\)' COPYRIGHT = 'Copyright \(c\)'
YEAR = "20[0-9][0-9]" YEAR = "20[0-9][0-9]"
YEAR_RANGE = '(%s)(-%s)?' % (YEAR, YEAR) 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])) UPDATEABLE_LINE_COMPILED = re.compile(' '.join([COPYRIGHT, YEAR_RANGE, HOLDER]))
def get_updatable_copyright_line(file_lines): def get_updatable_copyright_line(file_lines):
@@ -399,24 +399,24 @@ def exec_update_header_year(base_directory):
################################################################################ ################################################################################
UPDATE_USAGE = """ 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: 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: 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. where <lastModifiedYear> is obtained from the 'git log' history.
This subcommand also handles copyright headers that have only a single year. In those cases: 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: 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. 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] return [line + '\n' for line in lines]
CPP_HEADER = ''' 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 // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // 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)) return reversed(get_header_lines(CPP_HEADER, start_year, end_year))
PYTHON_HEADER = ''' 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 # Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php. # 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): def exec_insert_header(filename, style):
file_lines = read_file_lines(filename) file_lines = read_file_lines(filename)
if file_already_has_core_copyright(file_lines): 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)) % (filename))
start_year, end_year = get_git_change_year_range(filename) start_year, end_year = get_git_change_year_range(filename)
if style == 'python': if style == 'python':
@@ -525,7 +525,7 @@ def exec_insert_header(filename, style):
################################################################################ ################################################################################
INSERT_USAGE = """ 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 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 file is a Python file and it has a '#!' starting the first line, the header is
inserted in the line below it. inserted in the line below it.
@@ -539,7 +539,7 @@ where <year_introduced> is according to the 'git log' history. If
"<current_year>" "<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. script will exit.
Usage: Usage:
@@ -571,7 +571,7 @@ def insert_cmd(argv):
################################################################################ ################################################################################
USAGE = """ 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. Core developers' in repository source files.
Usage: Usage:
contrib/devtools/optimize-pngs.py
+1 -1
View File
@@ -1,5 +1,5 @@
#!/usr/bin/env python3 #!/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 # Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php. # file COPYING or http://www.opensource.org/licenses/mit-license.php.
''' '''
contrib/devtools/security-check.py
+1 -1
View File
@@ -1,5 +1,5 @@
#!/usr/bin/env python3 #!/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 # Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php. # file COPYING or http://www.opensource.org/licenses/mit-license.php.
''' '''
contrib/devtools/test-security-check.py
+1 -1
View File
@@ -1,5 +1,5 @@
#!/usr/bin/env python3 #!/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 # Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php. # file COPYING or http://www.opensource.org/licenses/mit-license.php.
''' '''
contrib/devtools/update-translations.py
+1 -1
View File
@@ -30,7 +30,7 @@ SOURCE_LANG = 'bitcoin_en.ts'
LOCALE_DIR = 'src/qt/locale' LOCALE_DIR = 'src/qt/locale'
# Minimum number of messages for translation to be considered at all # Minimum number of messages for translation to be considered at all
MIN_NUM_MESSAGES = 10 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,}') ADDRESS_REGEXP = re.compile('([13]|bc1)[a-zA-Z0-9]{30,}')
def check_at_repository_root(): def check_at_repository_root():
contrib/gitian-build.py
+1 -1
View File
@@ -29,7 +29,7 @@ def setup():
if not os.path.isdir('gitian-builder'): if not os.path.isdir('gitian-builder'):
subprocess.check_call(['git', 'clone', 'https://github.com/devrandom/gitian-builder.git']) subprocess.check_call(['git', 'clone', 'https://github.com/devrandom/gitian-builder.git'])
if not os.path.isdir('bitcoin'): if not os.path.isdir('bitcoin'):
subprocess.check_call(['git', 'clone', 'https://github.com/bitcoin/bitcoin.git']) subprocess.check_call(['git', 'clone', 'https://github.com/nyc3coin/nyc3'])
os.chdir('gitian-builder') os.chdir('gitian-builder')
make_image_prog = ['bin/make-base-vm', '--suite', 'bionic', '--arch', 'amd64'] make_image_prog = ['bin/make-base-vm', '--suite', 'bionic', '--arch', 'amd64']
if args.docker: if args.docker:
contrib/gitian-descriptors/gitian-linux.yml
+10 -7
View File
@@ -1,5 +1,5 @@
--- ---
name: "bitcoin-linux-0.18" name: "nyc3-linux-0.18"
enable_cache: true enable_cache: true
suites: suites:
- "bionic" - "bionic"
@@ -32,12 +32,15 @@ packages:
- "ca-certificates" - "ca-certificates"
- "python" - "python"
remotes: remotes:
- "url": "https://github.com/bitcoin/bitcoin.git" - "url": "https://github.com/nyc3coin/nyc3"
"dir": "bitcoin" "dir": "nyc3"
- "url": "https://github.com/barrystyle/argon2s.git"
"dir": "argon2s"
files: [] files: []
script: | script: |
set -e -o pipefail 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 WRAP_DIR=$HOME/wrapped
HOSTS="i686-pc-linux-gnu x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu riscv64-linux-gnu" 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" CONFIGFLAGS="--enable-glibc-back-compat --enable-reduce-exports --disable-bench --disable-gui-tests"
@@ -122,7 +125,7 @@ script: |
chmod +x ${WRAP_DIR}/${prog} chmod +x ${WRAP_DIR}/${prog}
done done
cd bitcoin cd nyc3
BASEPREFIX=`pwd`/depends BASEPREFIX=`pwd`/depends
# Build dependencies for each host # Build dependencies for each host
for i in $HOSTS; do for i in $HOSTS; do
@@ -144,13 +147,13 @@ script: |
./autogen.sh ./autogen.sh
CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/ CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
make dist make dist
SOURCEDIST=`echo bitcoin-*.tar.gz` SOURCEDIST=`echo nyc3-*.tar.gz`
DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'` DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
# Correct tar file order # Correct tar file order
mkdir -p temp mkdir -p temp
pushd temp pushd temp
tar xf ../$SOURCEDIST tar xf ../$SOURCEDIST
find bitcoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST find nyc3-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
popd popd
# Workaround for tarball not building with the bare tag version (prep) # Workaround for tarball not building with the bare tag version (prep)
contrib/gitian-descriptors/gitian-osx-signer.yml
+1 -1
View File
@@ -1,5 +1,5 @@
--- ---
name: "bitcoin-dmg-signer" name: "nyc3-dmg-signer"
suites: suites:
- "bionic" - "bionic"
architectures: architectures:
contrib/gitian-descriptors/gitian-osx.yml
+11 -7
View File
@@ -1,5 +1,5 @@
--- ---
name: "bitcoin-osx-0.18" name: "nyc3-osx-0.18"
enable_cache: true enable_cache: true
suites: suites:
- "bionic" - "bionic"
@@ -28,13 +28,17 @@ packages:
- "python-setuptools" - "python-setuptools"
- "fonts-tuffy" - "fonts-tuffy"
remotes: remotes:
- "url": "https://github.com/bitcoin/bitcoin.git" - "url": "https://github.com/nyc3coin/nyc3"
"dir": "bitcoin" "dir": "nyc3"
- "url": "https://github.com/barrystyle/argon2s.git"
"dir": "argon2s"
files: files:
- "MacOSX10.11.sdk.tar.gz" - "MacOSX10.11.sdk.tar.gz"
script: | script: |
set -e -o pipefail 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 WRAP_DIR=$HOME/wrapped
HOSTS="x86_64-apple-darwin14" HOSTS="x86_64-apple-darwin14"
CONFIGFLAGS="--enable-reduce-exports --disable-bench --disable-gui-tests GENISOIMAGE=$WRAP_DIR/genisoimage" CONFIGFLAGS="--enable-reduce-exports --disable-bench --disable-gui-tests GENISOIMAGE=$WRAP_DIR/genisoimage"
@@ -86,7 +90,7 @@ script: |
create_per-host_faketime_wrappers "2000-01-01 12:00:00" create_per-host_faketime_wrappers "2000-01-01 12:00:00"
export PATH=${WRAP_DIR}:${PATH} export PATH=${WRAP_DIR}:${PATH}
cd bitcoin cd nyc3
BASEPREFIX=`pwd`/depends BASEPREFIX=`pwd`/depends
mkdir -p ${BASEPREFIX}/SDKs mkdir -p ${BASEPREFIX}/SDKs
@@ -107,14 +111,14 @@ script: |
./autogen.sh ./autogen.sh
CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/ CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
make dist make dist
SOURCEDIST=`echo bitcoin-*.tar.gz` SOURCEDIST=`echo nyc3-*.tar.gz`
DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'` DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
# Correct tar file order # Correct tar file order
mkdir -p temp mkdir -p temp
pushd temp pushd temp
tar xf ../$SOURCEDIST tar xf ../$SOURCEDIST
find bitcoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST find nyc3-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
popd popd
# Workaround for tarball not building with the bare tag version (prep) # Workaround for tarball not building with the bare tag version (prep)
contrib/gitian-descriptors/gitian-win-signer.yml
+1 -1
View File
@@ -1,5 +1,5 @@
--- ---
name: "bitcoin-win-signer" name: "nyc3-win-signer"
suites: suites:
- "bionic" - "bionic"
architectures: architectures:
contrib/gitian-descriptors/gitian-win.yml
+13 -10
View File
@@ -1,5 +1,5 @@
--- ---
name: "bitcoin-win-0.18" name: "nyc3-win-0.18"
enable_cache: true enable_cache: true
suites: suites:
- "bionic" - "bionic"
@@ -23,12 +23,15 @@ packages:
- "python" - "python"
- "rename" - "rename"
remotes: remotes:
- "url": "https://github.com/bitcoin/bitcoin.git" - "url": "https://github.com/nyc3coin/nyc3"
"dir": "bitcoin" "dir": "nyc3"
- "url": "https://github.com/barrystyle/argon2s.git"
"dir": "argon2s"
files: [] files: []
script: | script: |
set -e -o pipefail 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 WRAP_DIR=$HOME/wrapped
HOSTS="i686-w64-mingw32 x86_64-w64-mingw32" HOSTS="i686-w64-mingw32 x86_64-w64-mingw32"
CONFIGFLAGS="--enable-reduce-exports --disable-bench --disable-gui-tests" CONFIGFLAGS="--enable-reduce-exports --disable-bench --disable-gui-tests"
@@ -76,7 +79,7 @@ script: |
function create_per-host_linker_wrapper { function create_per-host_linker_wrapper {
# This is only needed for trusty, as the mingw linker leaks a few bytes of # This is only needed for trusty, as the mingw linker leaks a few bytes of
# heap, causing non-determinism. See discussion in https://github.com/bitcoin/bitcoin/pull/6900 # heap, causing non-determinism. See discussion in https://github.com/nyc3/nyc3/pull/6900
for i in $HOSTS; do for i in $HOSTS; do
mkdir -p ${WRAP_DIR}/${i} mkdir -p ${WRAP_DIR}/${i}
for prog in collect2; do for prog in collect2; do
@@ -105,7 +108,7 @@ script: |
create_per-host_linker_wrapper "2000-01-01 12:00:00" create_per-host_linker_wrapper "2000-01-01 12:00:00"
export PATH=${WRAP_DIR}:${PATH} export PATH=${WRAP_DIR}:${PATH}
cd bitcoin cd nyc3
BASEPREFIX=`pwd`/depends BASEPREFIX=`pwd`/depends
# Build dependencies for each host # Build dependencies for each host
for i in $HOSTS; do for i in $HOSTS; do
@@ -123,14 +126,14 @@ script: |
./autogen.sh ./autogen.sh
CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/ CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
make dist make dist
SOURCEDIST=`echo bitcoin-*.tar.gz` SOURCEDIST=`echo nyc3-*.tar.gz`
DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'` DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
# Correct tar file order # Correct tar file order
mkdir -p temp mkdir -p temp
pushd temp pushd temp
tar xf ../$SOURCEDIST tar xf ../$SOURCEDIST
find bitcoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST find nyc3-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
mkdir -p $OUTDIR/src mkdir -p $OUTDIR/src
cp ../$SOURCEDIST $OUTDIR/src cp ../$SOURCEDIST $OUTDIR/src
popd popd
@@ -159,7 +162,7 @@ script: |
make deploy make deploy
make install DESTDIR=${INSTALLPATH} make install DESTDIR=${INSTALLPATH}
rename 's/-setup\.exe$/-setup-unsigned.exe/' *-setup.exe rename 's/-setup\.exe$/-setup-unsigned.exe/' *-setup.exe
cp -f bitcoin-*setup*.exe $OUTDIR/ cp -f nyc3-*setup*.exe $OUTDIR/
cd installed cd installed
mv ${DISTNAME}/bin/*.dll ${DISTNAME}/lib/ mv ${DISTNAME}/bin/*.dll ${DISTNAME}/lib/
find . -name "lib*.la" -delete find . -name "lib*.la" -delete
@@ -175,7 +178,7 @@ script: |
cp -rf contrib/windeploy $BUILD_DIR cp -rf contrib/windeploy $BUILD_DIR
cd $BUILD_DIR/windeploy cd $BUILD_DIR/windeploy
mkdir unsigned mkdir unsigned
cp $OUTDIR/bitcoin-*setup-unsigned.exe unsigned/ cp $OUTDIR/nyc3-*setup-unsigned.exe unsigned/
find . | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-win-unsigned.tar.gz find . | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-win-unsigned.tar.gz
mv ${OUTDIR}/${DISTNAME}-x86_64-*-debug.zip ${OUTDIR}/${DISTNAME}-win64-debug.zip mv ${OUTDIR}/${DISTNAME}-x86_64-*-debug.zip ${OUTDIR}/${DISTNAME}-win64-debug.zip
mv ${OUTDIR}/${DISTNAME}-i686-*-debug.zip ${OUTDIR}/${DISTNAME}-win32-debug.zip mv ${OUTDIR}/${DISTNAME}-i686-*-debug.zip ${OUTDIR}/${DISTNAME}-win32-debug.zip
contrib/init/bitcoind.conf
+1 -1
View File
@@ -38,7 +38,7 @@ pre-start script
echo "It is recommended that you also set alertnotify so you are " echo "It is recommended that you also set alertnotify so you are "
echo "notified of problems:" echo "notified of problems:"
echo echo
echo "ie: alertnotify=echo %%s | mail -s \"Bitcoin Alert\"" \ echo "ie: alertnotify=echo %%s | mail -s \"NYC3 Alert\"" \
"admin@foo.com" "admin@foo.com"
echo echo
exit 1 exit 1
contrib/init/bitcoind.openrc
+2 -2
View File
@@ -19,7 +19,7 @@ BITCOIND_NICE=${BITCOIND_NICE:-${NICELEVEL:-0}}
BITCOIND_OPTS="${BITCOIND_OPTS:-${BITCOIN_OPTS}}" BITCOIND_OPTS="${BITCOIND_OPTS:-${BITCOIN_OPTS}}"
name="NYC3 Daemon" name="NYC3 Daemon"
description="Bitcoin cryptocurrency P2P network daemon" description="NYC3 cryptocurrency P2P network daemon"
command="/usr/bin/bitcoind" command="/usr/bin/bitcoind"
command_args="-pid=\"${BITCOIND_PIDFILE}\" \ command_args="-pid=\"${BITCOIND_PIDFILE}\" \
@@ -84,7 +84,7 @@ checkconfig()
eerror "It is recommended that you also set alertnotify so you are " eerror "It is recommended that you also set alertnotify so you are "
eerror "notified of problems:" eerror "notified of problems:"
eerror "" eerror ""
eerror "ie: alertnotify=echo %%s | mail -s \"Bitcoin Alert\"" \ eerror "ie: alertnotify=echo %%s | mail -s \"NYC3 Alert\"" \
"admin@foo.com" "admin@foo.com"
eerror "" eerror ""
return 1 return 1
contrib/init/bitcoind.service
+1 -1
View File
@@ -9,7 +9,7 @@
# in ExecStart= # in ExecStart=
[Unit] [Unit]
Description=Bitcoin daemon Description=NYC3 daemon
After=network.target After=network.target
[Service] [Service]
contrib/linearize/README.md
+1 -1
View File
@@ -1,5 +1,5 @@
# Linearize # 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. run using Python 3 but are compatible with Python 2.
## Step 1: Download hash list ## Step 1: Download hash list
contrib/linearize/linearize-data.py
+1 -1
View File
@@ -2,7 +2,7 @@
# #
# linearize-data.py: Construct a linear, no-fork version of the chain. # 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 # Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php. # file COPYING or http://www.opensource.org/licenses/mit-license.php.
# #
contrib/linearize/linearize-hashes.py
+3 -3
View File
@@ -2,7 +2,7 @@
# #
# linearize-hashes.py: List blocks in a linear, no-fork version of the chain. # 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 # Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php. # 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)] pairList = [s[i:i+2].encode() for i in range(0, len(s), 2)]
return b''.join(pairList[::-1]).decode() return b''.join(pairList[::-1]).decode()
class BitcoinRPC: class NYC3RPC:
def __init__(self, host, port, username, password): def __init__(self, host, port, username, password):
authpair = "%s:%s" % (username, password) authpair = "%s:%s" % (username, password)
authpair = authpair.encode('utf-8') authpair = authpair.encode('utf-8')
@@ -64,7 +64,7 @@ class BitcoinRPC:
return 'error' in resp_obj and resp_obj['error'] is not None return 'error' in resp_obj and resp_obj['error'] is not None
def get_block_hashes(settings, max_blocks_per_call=10000): 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']) settings['rpcuser'], settings['rpcpassword'])
height = settings['min_height'] height = settings['min_height']
contrib/macdeploy/README.md
+1 -1
View File
@@ -11,5 +11,5 @@ This script should not be run manually, instead, after building as usual:
During the process, the disk image window will pop up briefly where the fancy During the process, the disk image window will pop up briefly where the fancy
settings are applied. This is normal, please do not interfere. settings are applied. This is normal, please do not interfere.
When finished, it will produce `Bitcoin-Core.dmg`. When finished, it will produce `NYC3-Core.dmg`.
contrib/macdeploy/background.svg
+1 -1
View File
@@ -3,7 +3,7 @@
"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd"> "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"> <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; <!-- 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 Distributed under the MIT software license, see the accompanying
file COPYING or http://www.opensource.org/licenses/mit-license.php. file COPYING or http://www.opensource.org/licenses/mit-license.php.
--> -->
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

contrib/macdeploy/custom_dsstore.py
+2 -2
View File
@@ -1,5 +1,5 @@
#!/usr/bin/env python3 #!/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 # Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php. # file COPYING or http://www.opensource.org/licenses/mit-license.php.
import biplist import biplist
@@ -53,7 +53,7 @@ ds['.']['icvp'] = icvp
ds['.']['vSrn'] = ('long', 1) ds['.']['vSrn'] = ('long', 1)
ds['Applications']['Iloc'] = (370, 156) ds['Applications']['Iloc'] = (370, 156)
ds['Bitcoin-Qt.app']['Iloc'] = (128, 156) ds['NYC3-Qt.app']['Iloc'] = (128, 156)
ds.flush() ds.flush()
ds.close() ds.close()
contrib/macdeploy/detached-sig-apply.sh
+1 -1
View File
@@ -1,5 +1,5 @@
#!/bin/sh #!/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 # Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php. # file COPYING or http://www.opensource.org/licenses/mit-license.php.
contrib/macdeploy/detached-sig-create.sh
+2 -2
View File
@@ -1,5 +1,5 @@
#!/bin/sh #!/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 # Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php. # file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -7,7 +7,7 @@ export LC_ALL=C
set -e set -e
ROOTDIR=dist ROOTDIR=dist
BUNDLE="${ROOTDIR}/Bitcoin-Qt.app" BUNDLE="${ROOTDIR}/NYC3-Qt.app"
CODESIGN=codesign CODESIGN=codesign
TEMPDIR=sign.temp TEMPDIR=sign.temp
TEMPLIST=${TEMPDIR}/signatures.txt TEMPLIST=${TEMPDIR}/signatures.txt
contrib/macdeploy/extract-osx-sdk.sh
+1 -1
View File
@@ -1,5 +1,5 @@
#!/usr/bin/env bash #!/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 # Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php. # file COPYING or http://www.opensource.org/licenses/mit-license.php.
contrib/macdeploy/macdeployqtplus
+2 -2
View File
@@ -154,7 +154,7 @@ class FrameworkInfo(object):
class ApplicationBundleInfo(object): class ApplicationBundleInfo(object):
def __init__(self, path): def __init__(self, path):
self.path = path self.path = path
appName = "Bitcoin-Qt" appName = "NYC3-Qt"
self.binaryPath = os.path.join(path, "Contents", "MacOS", appName) self.binaryPath = os.path.join(path, "Contents", "MacOS", appName)
if not os.path.exists(self.binaryPath): if not os.path.exists(self.binaryPath):
raise RuntimeError("Could not find bundle binary for " + path) raise RuntimeError("Could not find bundle binary for " + path)
@@ -596,7 +596,7 @@ else:
# ------------------------------------------------ # ------------------------------------------------
target = os.path.join("dist", "Bitcoin-Qt.app") target = os.path.join("dist", "NYC3-Qt.app")
if verbose >= 2: if verbose >= 2:
print("+ Copying source bundle +") print("+ Copying source bundle +")
contrib/qos/README.md
+1 -1
View File
@@ -1,5 +1,5 @@
### QoS (Quality of service) ### ### QoS (Quality of service) ###
This is a Linux bash script that will set up tc to limit the outgoing bandwidth for connections to the Bitcoin network. It limits outbound TCP traffic with a source or destination port of 8333, but not if the destination IP is within a LAN. This is a Linux bash script that will set up tc to limit the outgoing bandwidth for connections to the NYC3 network. It limits outbound TCP traffic with a source or destination port of 8333, but not if the destination IP is within a LAN.
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. 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.
contrib/qos/tc.sh
+2 -2
View File
@@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/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 # Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php. # file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -9,7 +9,7 @@ export LC_ALL=C
IF="eth0" IF="eth0"
#limit of the network interface in question #limit of the network interface in question
LINKCEIL="1gbit" LINKCEIL="1gbit"
#limit outbound Bitcoin protocol traffic to this rate #limit outbound NYC3 protocol traffic to this rate
LIMIT="160kbit" LIMIT="160kbit"
#defines the IPv4 address space for which you wish to disable rate limiting #defines the IPv4 address space for which you wish to disable rate limiting
LOCALNET_V4="192.168.0.0/16" LOCALNET_V4="192.168.0.0/16"
contrib/seeds/makeseeds.py
+1 -1
View File
@@ -1,5 +1,5 @@
#!/usr/bin/env python3 #!/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 # Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php. # file COPYING or http://www.opensource.org/licenses/mit-license.php.
# #
contrib/testgen/README.md
+1 -1
View File
@@ -1,6 +1,6 @@
### TestGen ### ### TestGen ###
Utilities to generate test vectors for the data-driven Bitcoin tests. Utilities to generate test vectors for the data-driven NYC3 tests.
Usage: Usage:
contrib/testgen/base58.py
+3 -3
View File
@@ -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 # Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php. # 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) Based on https://bitcointalk.org/index.php?topic=1026.0 (public domain)
''' '''
@@ -39,7 +39,7 @@ def b58encode(v):
long_value = div long_value = div
result = __b58chars[long_value] + result 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 # leading 0-bytes in the input become leading-1s
nPad = 0 nPad = 0
for c in v: for c in v:
contrib/testgen/gen_key_io_test_vectors.py
+1 -1
View File
@@ -1,5 +1,5 @@
#!/usr/bin/env python3 #!/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 # Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php. # file COPYING or http://www.opensource.org/licenses/mit-license.php.
''' '''
contrib/valgrind.supp
+1 -1
View File
@@ -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 # Includes known Valgrind warnings in our dependencies that cannot be fixed
# in-tree. # in-tree.
contrib/verify-commits/gpg.sh
+1 -1
View File
@@ -1,5 +1,5 @@
#!/bin/sh #!/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 # Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php. # file COPYING or http://www.opensource.org/licenses/mit-license.php.
contrib/verify-commits/pre-push-hook.sh
+1 -1
View File
@@ -1,5 +1,5 @@
#!/usr/bin/env bash #!/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 # Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php. # file COPYING or http://www.opensource.org/licenses/mit-license.php.
contrib/verify-commits/verify-commits.py
+1 -1
View File
@@ -1,5 +1,5 @@
#!/usr/bin/env python3 #!/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 # Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php. # file COPYING or http://www.opensource.org/licenses/mit-license.php.
"""Verify commits against a trusted keys list.""" """Verify commits against a trusted keys list."""
contrib/verifybinaries/verify.sh
+1 -1
View File
@@ -1,5 +1,5 @@
#!/usr/bin/env bash #!/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 # Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php. # file COPYING or http://www.opensource.org/licenses/mit-license.php.
contrib/windeploy/detached-sig-create.sh
+1 -1
View File
@@ -1,5 +1,5 @@
#!/bin/sh #!/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 # Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php. # file COPYING or http://www.opensource.org/licenses/mit-license.php.
contrib/zmq/zmq_sub.py
+2 -2
View File
@@ -1,12 +1,12 @@
#!/usr/bin/env python3 #!/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 # Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php. # file COPYING or http://www.opensource.org/licenses/mit-license.php.
""" """
ZMQ example using python3's asyncio 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 \ bitcoind -testnet -daemon \
-zmqpubrawtx=tcp://127.0.0.1:28332 \ -zmqpubrawtx=tcp://127.0.0.1:28332 \
-zmqpubrawblock=tcp://127.0.0.1:28332 \ -zmqpubrawblock=tcp://127.0.0.1:28332 \
contrib/zmq/zmq_sub3.4.py
+2 -2
View File
@@ -1,12 +1,12 @@
#!/usr/bin/env python3 #!/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 # Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php. # file COPYING or http://www.opensource.org/licenses/mit-license.php.
""" """
ZMQ example using python3's asyncio 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 \ bitcoind -testnet -daemon \
-zmqpubrawtx=tcp://127.0.0.1:28332 \ -zmqpubrawtx=tcp://127.0.0.1:28332 \
-zmqpubrawblock=tcp://127.0.0.1:28332 \ -zmqpubrawblock=tcp://127.0.0.1:28332 \
depends/README.md
+2 -2
View File
@@ -12,9 +12,9 @@ For example:
make HOST=x86_64-w64-mingw32 -j4 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 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 ./configure --prefix=`pwd`/depends/x86_64-w64-mingw32
depends/description.md
+1 -1
View File
@@ -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: There are several features that make it different from most similar systems:
### It is designed to be builder and host agnostic ### It is designed to be builder and host agnostic
doc/Doxyfile.in
+2 -2
View File
@@ -1265,7 +1265,7 @@ DOCSET_FEEDNAME = "Doxygen generated docs"
# The default value is: org.doxygen.Project. # The default value is: org.doxygen.Project.
# This tag requires that the tag GENERATE_DOCSET is set to YES. # 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 DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
# the documentation publisher. This should be a reverse domain-name style # 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. # The default value is: org.doxygen.Publisher.
# This tag requires that the tag GENERATE_DOCSET is set to YES. # 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 DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
# The default value is: Publisher. # The default value is: Publisher.
doc/README.md
+6 -6
View File
@@ -3,7 +3,7 @@ NYC3
Setup 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/). 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? ### 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. 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 [#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 Building
--------------------- ---------------------
@@ -48,7 +48,7 @@ The following are developer notes on how to build NYC3 on your native platform.
Development 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) - [Developer Notes](developer-notes.md)
- [Productivity Notes](productivity.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) - [Benchmarking](benchmarking.md)
### Resources ### 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 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 ### Miscellaneous
- [Assets Attribution](assets-attribution.md) - [Assets Attribution](assets-attribution.md)
doc/README_windows.txt
+3 -3
View File
@@ -3,7 +3,7 @@ NYC3
Intro 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 completely decentralized, without the need for a central server or trusted
parties. Users hold the crypto keys to their own money and transact directly 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. 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. 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. NYC3 is the original NYC3 client and it builds the backbone of the network.
However, it downloads and stores the entire history of Bitcoin transactions; However, it downloads and stores the entire history of NYC3 transactions;
depending on the speed of your computer and network connection, the synchronization 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. process can take anywhere from a few hours to a day or more.
doc/bips.md
+2 -2
View File
@@ -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 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 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 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 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 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)). * [`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 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 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 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)). * [`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)).
doc/bitcoin-conf.md
+1 -1
View File
@@ -32,6 +32,6 @@ Network specific options can be:
## Configuration File Path ## 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. The `includeconf=<file>` option in the `bitcoin.conf` file can be used to include additional configuration files.
doc/build-freebsd.md
+1 -1
View File
@@ -13,7 +13,7 @@ You will need the following dependencies, which can be installed as root via pkg
```shell ```shell
pkg install autoconf automake boost-libs git gmake libevent libtool openssl pkgconf pkg install autoconf automake boost-libs git gmake libevent libtool openssl pkgconf
git clone https://github.com/bitcoin/bitcoin.git git clone https://github.com/nyc3coin/nyc3
``` ```
In order to run the test suite (recommended), you will need to have Python 3 installed: In order to run the test suite (recommended), you will need to have Python 3 installed:
doc/build-netbsd.md
+1 -1
View File
@@ -22,7 +22,7 @@ libtool
pkg-config pkg-config
python37 python37
git clone https://github.com/bitcoin/bitcoin.git git clone https://github.com/nyc3coin/nyc3
``` ```
See [dependencies.md](dependencies.md) for a complete overview. See [dependencies.md](dependencies.md) for a complete overview.
doc/build-openbsd.md
+1 -1
View File
@@ -17,7 +17,7 @@ pkg_add autoconf # (select highest version, e.g. 2.69)
pkg_add automake # (select highest version, e.g. 1.16) pkg_add automake # (select highest version, e.g. 1.16)
pkg_add python # (select highest version, e.g. 3.6) pkg_add python # (select highest version, e.g. 3.6)
git clone https://github.com/bitcoin/bitcoin.git git clone https://github.com/nyc3coin/nyc3
``` ```
See [dependencies.md](dependencies.md) for a complete overview. See [dependencies.md](dependencies.md) for a complete overview.
doc/build-osx.md
+4 -4
View File
@@ -82,17 +82,17 @@ NYC3 is now available at `./src/bitcoind`
Before running, you may create an empty configuration file: 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. 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: 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: Other commands:
------- -------
doc/build-unix.md
+1 -1
View File
@@ -244,7 +244,7 @@ Setup and Build Example: Arch Linux
This example lists the steps necessary to setup and build a command line only, non-wallet distribution of the latest changes on Arch Linux: This example lists the steps necessary to setup and build a command line only, non-wallet distribution of the latest changes on Arch Linux:
pacman -S git base-devel boost libevent python pacman -S git base-devel boost libevent python
git clone https://github.com/bitcoin/bitcoin.git git clone https://github.com/nyc3coin/nyc3
cd bitcoin/ cd bitcoin/
./autogen.sh ./autogen.sh
./configure --disable-wallet --without-gui --without-miniupnpc ./configure --disable-wallet --without-gui --without-miniupnpc
doc/build-windows.md
+2 -2
View File
@@ -89,7 +89,7 @@ This means you cannot use a directory that is located directly on the host Windo
Acquire the source in the usual way: Acquire the source in the usual way:
git clone https://github.com/bitcoin/bitcoin.git git clone https://github.com/nyc3coin/nyc3
Once the source code is ready the build steps are below: Once the source code is ready the build steps are below:
@@ -117,7 +117,7 @@ This means you cannot use a directory that located directly on the host Windows
Acquire the source in the usual way: Acquire the source in the usual way:
git clone https://github.com/bitcoin/bitcoin.git git clone https://github.com/nyc3coin/nyc3
Then build using: Then build using:
doc/descriptors.md
+1 -1
View File
@@ -100,7 +100,7 @@ not contain "p2" for brevity.
### Multisig ### Multisig
Several pieces of software use multi-signature (multisig) scripts based 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* `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 multisig policy, where any *k* out of the *n* provided `KEY` expressions must
sign. sign.
doc/developer-notes.md
+3 -3
View File
@@ -807,7 +807,7 @@ you must be aware of.
In most configurations we use the default LevelDB value for `max_open_files`, 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 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 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 reason, on 64-bit Unix systems we rely on an internal LevelDB optimization that
uses `mmap()` + `close()` to open table files without actually retaining uses `mmap()` + `close()` to open table files without actually retaining
@@ -833,14 +833,14 @@ details.
### Consensus Compatibility ### Consensus Compatibility
It is possible for LevelDB changes to inadvertently change consensus 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 first introduced). When upgrading LevelDB you should review the upstream changes
to check for issues affecting consensus compatibility. to check for issues affecting consensus compatibility.
For example, if LevelDB had a bug that accidentally prevented a key from being 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 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 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 copy of LevelDB. In general you should be wary of any upstream changes affecting
what data is returned from LevelDB queries. what data is returned from LevelDB queries.
doc/dnsseed-policy.md
+5 -5
View File
@@ -4,9 +4,9 @@ Expectations for DNS Seed operators
NYC3 attempts to minimize the level of trust in DNS seeds, NYC3 attempts to minimize the level of trust in DNS seeds,
but DNS seeds still pose a small amount of risk for the network. 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 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 seeds and may be more exposed. In light of this exposure, this
document establishes some basic expectations for operating dnsseeds. 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. contracted by the operator are equally expected to uphold these expectations.
1. The DNS seed results must consist exclusively of fairly selected and 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. operator's understanding and capability.
2. For the avoidance of doubt, the results may be randomized but must not 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. 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 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 network and must not be retained longer than necessary nor disclosed
to any third party. to any third party.
@@ -42,7 +42,7 @@ details of their operating practices.
related to the DNS seed operation. related to the DNS seed operation.
If these expectations cannot be satisfied the operator should 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 Core development team as well as posting on
[bitcoin-dev](https://lists.linuxfoundation.org/mailman/listinfo/bitcoin-dev). [bitcoin-dev](https://lists.linuxfoundation.org/mailman/listinfo/bitcoin-dev).
doc/init.md
+3 -3
View File
@@ -84,9 +84,9 @@ OpenRC).
### macOS ### macOS
Binary: `/usr/local/bin/bitcoind` Binary: `/usr/local/bin/bitcoind`
Configuration file: `~/Library/Application Support/Bitcoin/bitcoin.conf` Configuration file: `~/Library/Application Support/NYC3/bitcoin.conf`
Data directory: `~/Library/Application Support/Bitcoin` Data directory: `~/Library/Application Support/NYC3`
Lock file: `~/Library/Application Support/Bitcoin/.lock` Lock file: `~/Library/Application Support/NYC3/.lock`
Installing Service Configuration Installing Service Configuration
----------------------------------- -----------------------------------
doc/man/bitcoin-cli.1
+1 -1
View File
@@ -104,7 +104,7 @@ Chain selection options:
.IP .IP
Use the test chain Use the test chain
.SH COPYRIGHT .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 Please contribute if you find NYC3 useful. Visit
<https://bitcoincore.org> for further information about the software. <https://bitcoincore.org> for further information about the software.
doc/man/bitcoin-qt.1
+1 -1
View File
@@ -626,7 +626,7 @@ Set SSL root certificates for payment request (default: \fB\-system\-\fR)
.IP .IP
Show splash screen on startup (default: 1) Show splash screen on startup (default: 1)
.SH COPYRIGHT .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 Please contribute if you find NYC3 useful. Visit
<https://bitcoincore.org> for further information about the software. <https://bitcoincore.org> for further information about the software.
doc/man/bitcoin-tx.1
+1 -1
View File
@@ -105,7 +105,7 @@ set=NAME:JSON\-STRING
.IP .IP
Set register NAME to given JSON\-STRING Set register NAME to given JSON\-STRING
.SH COPYRIGHT .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 Please contribute if you find NYC3 useful. Visit
<https://bitcoincore.org> for further information about the software. <https://bitcoincore.org> for further information about the software.
doc/man/bitcoin-wallet.1
+1 -1
View File
@@ -52,7 +52,7 @@ info
.IP .IP
Get wallet info Get wallet info
.SH COPYRIGHT .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 Please contribute if you find NYC3 useful. Visit
<https://bitcoincore.org> for further information about the software. <https://bitcoincore.org> for further information about the software.
doc/man/bitcoind.1
+1 -1
View File
@@ -600,7 +600,7 @@ Username for JSON\-RPC connections
.IP .IP
Accept command line and JSON\-RPC commands Accept command line and JSON\-RPC commands
.SH COPYRIGHT .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 Please contribute if you find NYC3 useful. Visit
<https://bitcoincore.org> for further information about the software. <https://bitcoincore.org> for further information about the software.
doc/psbt.md
+4 -4
View File
@@ -1,6 +1,6 @@
# PSBT Howto for NYC3 # 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 Transactions (PSBTs, as specified in
[BIP 174](https://github.com/bitcoin/bips/blob/master/bip-0174.mediawiki)). [BIP 174](https://github.com/bitcoin/bips/blob/master/bip-0174.mediawiki)).
@@ -10,7 +10,7 @@ scenarios.
## PSBT in general ## 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. 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 It is intended to simplify workflows where multiple parties need to cooperate to
produce a transaction. Examples include hardware wallets, multisig setups, and 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 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: following steps:
- A **Creator** proposes a particular transaction to be created. They construct - 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). 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 - A **Finalizer** is run for each input to convert the partial signatures and
possibly script information into a final `scriptSig` and/or `scriptWitness`. 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. from a PSBT for which all inputs are finalized.
Generally, each of the above (excluding Creator and Extractor) will simply Generally, each of the above (excluding Creator and Extractor) will simply
doc/release-notes.md
+1 -1
View File
@@ -19,7 +19,7 @@ How to Upgrade
If you are running an older version, shut it down. Wait until it has 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 completely shut down (which might take a few minutes for older
versions), then run the installer (on Windows) or just copy over 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). Linux).
The first time you run version 0.15.0 or newer, your chainstate database The first time you run version 0.15.0 or newer, your chainstate database
doc/release-notes/release-notes-0.10.0.md
+8 -8
View File
@@ -17,7 +17,7 @@ How to Upgrade
If you are running an older version, shut it down. Wait until it has completely 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 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). bitcoind/bitcoin-qt (on Linux).
Downgrading warning 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 This change is a result of switching signing to use libsecp256k1
instead of OpenSSL. Libsecp256k1 is a cryptographic library 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. Core developer Pieter Wuille.
There exist attacks[1] against most ECC implementations where an 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 way into a released version of OpenSSL. Libsecp256k1 achieves
significantly stronger protection: As far as we're aware this is significantly stronger protection: As far as we're aware this is
the only deployed implementation of constant time signing for 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 libsecp256k1 is better tested and more thoroughly reviewed
than the implementation in OpenSSL. than the implementation in OpenSSL.
@@ -225,7 +225,7 @@ Consensus library
Starting from 0.10.0, the NYC3 distribution includes a 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 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 bindings such as [python-bitcoinlib](https://pypi.python.org/pypi/python-bitcoinlib) or
alternative node implementations. alternative node implementations.
@@ -247,7 +247,7 @@ Standard script rules relaxed for P2SH addresses
The IsStandard() rules have been almost completely removed for P2SH The IsStandard() rules have been almost completely removed for P2SH
redemption scripts, allowing applications to make use of any valid redemption scripts, allowing applications to make use of any valid
script type, such as "n-of-m OR y", hash-locked oracle addresses, etc. 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 actually using them on mainnet has been previously inconvenient as
standard NYC3 nodes wouldn't relay them to miners, nor would standard NYC3 nodes wouldn't relay them to miners, nor would
most miners include them in blocks they mined. 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 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 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. 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. 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 stratum mining protocol: this does not affect you.
If you are mining with the getblocktemplate protocol to a pool: this will affect 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 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 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. technically still permitted inside blocks.
This change breaks the dependency on OpenSSL's signature parsing, and is 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 - `7007402` Implement SI-style (thin space) thoudands separator
- `91cce17` Use fixed-point arithmetic in amount spinbox - `91cce17` Use fixed-point arithmetic in amount spinbox
- `bdba2dd` Remove an obscure option no-one cares about - `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 - `94e1b9e` Re-work overviewpage UI
- `8bfdc9a` Better looking trayicon - `8bfdc9a` Better looking trayicon
- `b197bf3` disable tray interactions when client model set to 0 - `b197bf3` disable tray interactions when client model set to 0
doc/release-notes/release-notes-0.10.1.md
+1 -1
View File
@@ -17,7 +17,7 @@ How to Upgrade
If you are running an older version, shut it down. Wait until it has completely 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 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). bitcoind/bitcoin-qt (on Linux).
Downgrade warning Downgrade warning
doc/release-notes/release-notes-0.10.2.md
+1 -1
View File
@@ -17,7 +17,7 @@ How to Upgrade
If you are running an older version, shut it down. Wait until it has completely 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 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). bitcoind/bitcoin-qt (on Linux).
Downgrade warning Downgrade warning
doc/release-notes/release-notes-0.10.3.md
+4 -4
View File
@@ -17,7 +17,7 @@ How to Upgrade
If you are running an older version, shut it down. Wait until it has completely 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 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). bitcoind/bitcoin-qt (on Linux).
Downgrade warning Downgrade warning
@@ -84,15 +84,15 @@ much more common since BIP62 was initially written.
NYC3 has produced compatible signatures since a28fb70e in NYC3 has produced compatible signatures since a28fb70e in
September 2013, but this didn't make it into a release until 0.9 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. in March 2014; NYC3j has done so for a similar span of time.
Bitcoinjs and electrum have been more recently updated. NYC3js and electrum have been more recently updated.
This does not replace the need for BIP62 or similar, as miners can This does not replace the need for BIP62 or similar, as miners can
still cooperate to break transactions. Nor does it replace the still cooperate to break transactions. Nor does it replace the
need for wallet software to handle malleability sanely[1]. This need for wallet software to handle malleability sanely[1]. This
only eliminates the cheap and irritating DOS attack. 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 Marcin Andrychowicz, Stefan Dziembowski, Daniel Malinowski, Łukasz Mazurek
http://fc15.ifca.ai/preproceedings/bitcoin/paper_9.pdf http://fc15.ifca.ai/preproceedings/bitcoin/paper_9.pdf
doc/release-notes/release-notes-0.10.4.md
+1 -1
View File
@@ -18,7 +18,7 @@ How to Upgrade
If you are running an older version, shut it down. Wait until it has completely 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 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). bitcoind/bitcoin-qt (on Linux).
Downgrade warning Downgrade warning
doc/release-notes/release-notes-0.11.0.md
+4 -4
View File
@@ -17,7 +17,7 @@ How to Upgrade
If you are running an older version, shut it down. Wait until it has completely 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 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). bitcoind/bitcoin-qt (on Linux).
Downgrade warning Downgrade warning
@@ -346,7 +346,7 @@ git merge commit are mentioned.
- #5626 `ab0d798` Fix icon sizes and column width - #5626 `ab0d798` Fix icon sizes and column width
- #5683 `c7b22aa` add new osx dmg background picture - #5683 `c7b22aa` add new osx dmg background picture
- #5620 `7823598` Payment request expiration bug fix - #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 - #5753 `0f44672` Add bitcoin logo to about screen
- #5629 `a956586` Prevent amount overflow problem with payment requests - #5629 `a956586` Prevent amount overflow problem with payment requests
- #5830 `215475a` Don't save geometry for options and about/help window - #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 - #6104 `3e2559c` Show an init message while activating best chain
- #6125 `351f73e` Clean up parsing of bool command line args - #6125 `351f73e` Clean up parsing of bool command line args
- #5964 `b4c219b` Lightweight task scheduler - #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 - #6168 `b3024f0` contrib/linearize: Support linearization of testnet blocks
- #6098 `7708fcd` Update Windows resource files (and add one for bitcoin-tx) - #6098 `7708fcd` Update Windows resource files (and add one for bitcoin-tx)
- #6159 `e1412d3` Catch errors on datadir lock and pidfile delete - #6159 `e1412d3` Catch errors on datadir lock and pidfile delete
@@ -427,7 +427,7 @@ Thanks to everyone who directly contributed to this release:
- azeteki - azeteki
- Ben Holden-Crowther - Ben Holden-Crowther
- bikinibabe - bikinibabe
- BitcoinPRReadingGroup - NYC3PRReadingGroup
- Blake Jakopovic - Blake Jakopovic
- BtcDrak - BtcDrak
- charlescharles - charlescharles
doc/release-notes/release-notes-0.11.1.md
+4 -4
View File
@@ -17,7 +17,7 @@ How to Upgrade
If you are running an older version, shut it down. Wait until it has completely 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 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). bitcoind/bitcoin-qt (on Linux).
Downgrade warning Downgrade warning
@@ -85,15 +85,15 @@ much more common since BIP62 was initially written.
NYC3 has produced compatible signatures since a28fb70e in NYC3 has produced compatible signatures since a28fb70e in
September 2013, but this didn't make it into a release until 0.9 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. in March 2014; NYC3j has done so for a similar span of time.
Bitcoinjs and electrum have been more recently updated. NYC3js and electrum have been more recently updated.
This does not replace the need for BIP62 or similar, as miners can This does not replace the need for BIP62 or similar, as miners can
still cooperate to break transactions. Nor does it replace the still cooperate to break transactions. Nor does it replace the
need for wallet software to handle malleability sanely[1]. This need for wallet software to handle malleability sanely[1]. This
only eliminates the cheap and irritating DOS attack. 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 Marcin Andrychowicz, Stefan Dziembowski, Daniel Malinowski, Łukasz Mazurek
http://fc15.ifca.ai/preproceedings/bitcoin/paper_9.pdf http://fc15.ifca.ai/preproceedings/bitcoin/paper_9.pdf
doc/release-notes/release-notes-0.11.2.md
+2 -2
View File
@@ -18,7 +18,7 @@ How to Upgrade
If you are running an older version, shut it down. Wait until it has completely 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 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). bitcoind/bitcoin-qt (on Linux).
Downgrade warning 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() 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 they may be added to a valid block. Current consensus rules require
that blocks have a block header time greater than the locktime specified that blocks have a block header time greater than the locktime specified
in any transaction in that block. in any transaction in that block.
doc/release-notes/release-notes-0.12.0.md
+5 -5
View File
@@ -16,7 +16,7 @@ How to Upgrade
If you are running an older version, shut it down. Wait until it has completely 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 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). bitcoind/bitcoin-qt (on Linux).
Downgrade warning Downgrade warning
@@ -60,7 +60,7 @@ Notable changes
Signature validation using libsecp256k1 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. [libsecp256k1](https://github.com/bitcoin-core/secp256k1) instead of OpenSSL.
Depending on the platform, this means a significant speedup for raw signature Depending on the platform, this means a significant speedup for raw signature
@@ -250,7 +250,7 @@ information, pass `-debug=tor`.
Notifications through ZMQ 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. 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 This feature requires installation of the ZMQ C API library 4.x and
configuring its use through the command line or configuration file. 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. transaction fees.
Users can decide to pay a predefined fee rate by setting `-paytxfee=<n>` 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 Core to use floating fees. By default, NYC3 will use floating
fees. fees.
@@ -637,7 +637,7 @@ git merge commit are mentioned.
### Build system ### Build system
- #6210 `0e4f2a0` build: disable optional use of gmp in internal secp256k1 build (Wladimir J. van der Laan) - #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) - #6218 `9d67b10` build/gitian misc updates (Cory Fields)
- #6269 `d4565b6` gitian: Use the new bitcoin-detached-sigs git repo for OSX signatures (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) - #6418 `d4a910c` Add autogen.sh to source tarball. (randy-waterhouse)

Some files were not shown because too many files have changed in this diff Show More