mirror of
https://github.com/Retropex/bitcoin.git
synced 2025-05-12 03:00:42 +02:00
Merge knots_branding-25
This commit is contained in:
commit
0cb9491304
13
.github/ISSUE_TEMPLATE/bug.yml
vendored
13
.github/ISSUE_TEMPLATE/bug.yml
vendored
@ -5,11 +5,12 @@ body:
|
||||
- type: markdown
|
||||
attributes:
|
||||
value: |
|
||||
## This issue tracker is only for technical issues related to Bitcoin Core.
|
||||
## This issue tracker is only for technical issues related to Bitcoin Knots.
|
||||
|
||||
* General bitcoin questions and/or support requests should use Bitcoin StackExchange at https://bitcoin.stackexchange.com.
|
||||
* For reporting security issues, please read instructions at https://bitcoincore.org/en/contact/.
|
||||
* For reporting security issues, please read instructions at https://bitcoinknots.org/contact/
|
||||
* If the node is "stuck" during sync or giving "block checksum mismatch" errors, please ensure your hardware is stable by running `memtest` and observe CPU temperature with a load-test tool such as `linpack` before creating an issue.
|
||||
* If your issue also affects Bitcoin Core, report it at https://github.com/bitcoin/bitcoin/issues/new?labels=bug&template=bug.yml
|
||||
|
||||
----
|
||||
- type: checkboxes
|
||||
@ -57,7 +58,7 @@ body:
|
||||
required: false
|
||||
- type: dropdown
|
||||
attributes:
|
||||
label: How did you obtain Bitcoin Core
|
||||
label: How did you obtain Bitcoin Knots
|
||||
multiple: false
|
||||
options:
|
||||
- Compiled from source
|
||||
@ -67,10 +68,10 @@ body:
|
||||
validations:
|
||||
required: true
|
||||
- type: input
|
||||
id: core-version
|
||||
id: knots-version
|
||||
attributes:
|
||||
label: What version of Bitcoin Core are you using?
|
||||
description: Run `bitcoind --version` or in Bitcoin-QT use `Help > About Bitcoin Core`
|
||||
label: What version of Bitcoin Knots are you using?
|
||||
description: Run `bitcoind --version` or in Bitcoin-QT use `Help > About Bitcoin Knots`
|
||||
placeholder: e.g. v24.0.1 or master@e1bf547
|
||||
validations:
|
||||
required: true
|
||||
|
10
.github/ISSUE_TEMPLATE/config.yml
vendored
10
.github/ISSUE_TEMPLATE/config.yml
vendored
@ -1,8 +1,8 @@
|
||||
blank_issues_enabled: true
|
||||
contact_links:
|
||||
- name: Bitcoin Core Security Policy
|
||||
url: https://github.com/bitcoin/bitcoin/blob/master/SECURITY.md
|
||||
- name: Bitcoin Knots Security Policy
|
||||
url: https://bitcoinknots.org/contact/
|
||||
about: View security policy
|
||||
- name: Bitcoin Core Developers
|
||||
url: https://bitcoincore.org
|
||||
about: Bitcoin Core homepage
|
||||
- name: Bitcoin Knots Website
|
||||
url: https://bitcoinknots.org
|
||||
about: User-oriented information
|
||||
|
42
.github/ISSUE_TEMPLATE/good_first_issue.yml
vendored
42
.github/ISSUE_TEMPLATE/good_first_issue.yml
vendored
@ -1,42 +0,0 @@
|
||||
name: Good First Issue
|
||||
description: (Regular devs only) Suggest a new good first issue
|
||||
labels: [good first issue]
|
||||
body:
|
||||
- type: markdown
|
||||
attributes:
|
||||
value: |
|
||||
Please add the label "good first issue" manually before or after opening
|
||||
|
||||
A good first issue is an uncontroversial issue, that has a relatively unique and obvious solution
|
||||
|
||||
Motivate the issue and explain the solution briefly
|
||||
- type: textarea
|
||||
id: motivation
|
||||
attributes:
|
||||
label: Motivation
|
||||
description: Motivate the issue
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
id: solution
|
||||
attributes:
|
||||
label: Possible solution
|
||||
description: Describe a possible solution
|
||||
validations:
|
||||
required: false
|
||||
- type: textarea
|
||||
id: useful-skills
|
||||
attributes:
|
||||
label: Useful Skills
|
||||
description: For example, “`std::thread`”, “Qt5 GUI and async GUI design” or “basic understanding of Bitcoin mining and the Bitcoin Core RPC interface”.
|
||||
validations:
|
||||
required: false
|
||||
- type: textarea
|
||||
attributes:
|
||||
label: Guidance for new contributors
|
||||
description: Please leave this to automatically add the footer for new contributors
|
||||
value: |
|
||||
Want to work on this issue?
|
||||
|
||||
For guidance on contributing, please read [CONTRIBUTING.md](https://github.com/bitcoin/bitcoin/blob/master/CONTRIBUTING.md) before opening your pull request.
|
||||
|
18
.github/ISSUE_TEMPLATE/gui_issue.yml
vendored
18
.github/ISSUE_TEMPLATE/gui_issue.yml
vendored
@ -1,18 +0,0 @@
|
||||
name: Issue or feature request related to the GUI
|
||||
description: Any report, issue or feature request related to the GUI
|
||||
labels: [GUI]
|
||||
body:
|
||||
- type: checkboxes
|
||||
id: acknowledgement
|
||||
attributes:
|
||||
label: Issues, reports or feature requests related to the GUI should be opened directly on the GUI repo
|
||||
description: https://github.com/bitcoin-core/gui/issues/
|
||||
options:
|
||||
- label: I still think this issue should be opened here
|
||||
required: true
|
||||
- type: textarea
|
||||
id: gui-request
|
||||
attributes:
|
||||
label: Report
|
||||
validations:
|
||||
required: true
|
33
.github/PULL_REQUEST_TEMPLATE.md
vendored
33
.github/PULL_REQUEST_TEMPLATE.md
vendored
@ -1,17 +1,17 @@
|
||||
<!--
|
||||
*** Please remove the following help text before submitting: ***
|
||||
|
||||
Pull requests without a rationale and clear improvement may be closed
|
||||
immediately.
|
||||
Before opening a pull request to Bitcoin Knots, please first consider if it
|
||||
is appropriate for Bitcoin Core and, if so, rebase it and [open a pull request](https://github.com/bitcoin/bitcoin/compare)
|
||||
there first! Bitcoin Core has a strict and slow review process, but since
|
||||
Knots is more relaxed, feel free to request a merge of your Core PR into
|
||||
Knots even while it's waiting on Core.
|
||||
|
||||
GUI-related pull requests should be opened against
|
||||
https://github.com/bitcoin-core/gui
|
||||
first. See CONTRIBUTING.md
|
||||
-->
|
||||
|
||||
<!--
|
||||
Please provide clear motivation for your patch and explain how it improves
|
||||
Bitcoin Core user experience or Bitcoin Core developer experience
|
||||
Bitcoin Knots user experience or Bitcoin Knots developer experience
|
||||
significantly:
|
||||
|
||||
* Any test improvements or new tests that improve coverage are always welcome.
|
||||
@ -22,22 +22,7 @@ significantly:
|
||||
* Bug fixes are most welcome when they come with steps to reproduce or an
|
||||
explanation of the potential issue as well as reasoning for the way the bug
|
||||
was fixed.
|
||||
* Features are welcome, but might be rejected due to design or scope issues.
|
||||
If a feature is based on a lot of dependencies, contributors should first
|
||||
consider building the system outside of Bitcoin Core, if possible.
|
||||
* Refactoring changes are only accepted if they are required for a feature or
|
||||
bug fix or otherwise improve developer experience significantly. For example,
|
||||
most "code style" refactoring changes require a thorough explanation why they
|
||||
are useful, what downsides they have and why they *significantly* improve
|
||||
developer experience or avoid serious programming bugs. Note that code style
|
||||
is often a subjective matter. Unless they are explicitly mentioned to be
|
||||
preferred in the [developer notes](/doc/developer-notes.md), stylistic code
|
||||
changes are usually rejected.
|
||||
-->
|
||||
|
||||
<!--
|
||||
Bitcoin Core has a thorough review process and even the most trivial change
|
||||
needs to pass a lot of eyes and requires non-zero or even substantial time
|
||||
effort to review. There is a huge lack of active reviewers on the project, so
|
||||
patches often sit for a long time.
|
||||
* Features are typically welcome.
|
||||
* Refactoring changes are never accepted in Knots, and must be performed in
|
||||
Bitcoin Core.
|
||||
-->
|
||||
|
@ -1,12 +1,12 @@
|
||||
Contributing to Bitcoin Core
|
||||
============================
|
||||
Contributing to Bitcoin Knots
|
||||
=============================
|
||||
|
||||
The Bitcoin Core project operates an open contributor model where anyone is
|
||||
The Bitcoin Knots project operates an open contributor model where anyone is
|
||||
welcome to contribute towards development in the form of peer review, testing
|
||||
and patches. This document explains the practical process and guidelines for
|
||||
contributing.
|
||||
|
||||
First, in terms of structure, there is no particular concept of "Bitcoin Core
|
||||
First, in terms of structure, there is no particular concept of "core
|
||||
developers" in the sense of privileged people. Open source often naturally
|
||||
revolves around a meritocracy where contributors earn trust from the developer
|
||||
community over time. Nevertheless, some hierarchy is necessary for practical
|
||||
@ -55,7 +55,7 @@ and is also an effective way to request assistance if and when you need it.
|
||||
Communication Channels
|
||||
----------------------
|
||||
|
||||
Most communication about Bitcoin Core development happens on IRC, in the
|
||||
Most communication about Bitcoin development happens on IRC, in the
|
||||
`#bitcoin-core-dev` channel on Libera Chat. The easiest way to participate on IRC is
|
||||
with the web client, [web.libera.chat](https://web.libera.chat/#bitcoin-core-dev). Chat
|
||||
history logs can be found
|
||||
@ -289,12 +289,12 @@ workload on reviewing.
|
||||
"Decision Making" Process
|
||||
-------------------------
|
||||
|
||||
The following applies to code changes to the Bitcoin Core project (and related
|
||||
The following applies to code changes to the Bitcoin Knots project (and related
|
||||
projects such as libsecp256k1), and is not to be confused with overall Bitcoin
|
||||
Network Protocol consensus changes.
|
||||
|
||||
Whether a pull request is merged into Bitcoin Core rests with the project merge
|
||||
maintainers.
|
||||
Whether a pull request is merged into Bitcoin Knots rests with the project merge
|
||||
maintainers and ultimately the project lead.
|
||||
|
||||
Maintainers will take into consideration if a patch is in line with the general
|
||||
principles of the project; meets the minimum standards for inclusion; and will
|
||||
|
@ -1 +1 @@
|
||||
See [doc/build-\*.md](/doc)
|
||||
See [doc/build-\*.md](/doc)
|
||||
|
@ -60,7 +60,7 @@ BIN_CHECKS=$(top_srcdir)/contrib/devtools/symbol-check.py \
|
||||
$(top_srcdir)/contrib/devtools/utils.py
|
||||
|
||||
WINDOWS_PACKAGING = src/qt/res/rendered_icons/bitcoin.ico \
|
||||
$(top_srcdir)/share/pixmaps/nsis-header.bmp \
|
||||
src/qt/res/rendered_icons/nsis-header.bmp \
|
||||
src/qt/res/rendered_icons/nsis-wizard.bmp \
|
||||
$(top_srcdir)/doc/README_windows.txt
|
||||
|
||||
|
39
README.md
39
README.md
@ -1,40 +1,41 @@
|
||||
Bitcoin Core integration/staging tree
|
||||
=====================================
|
||||
Bitcoin Knots
|
||||
=============
|
||||
|
||||
https://bitcoincore.org
|
||||
https://bitcoinknots.org
|
||||
|
||||
For an immediately usable, binary version of the Bitcoin Core software, see
|
||||
https://bitcoincore.org/en/download/.
|
||||
For an immediately usable, binary version of the Bitcoin Knots software, see
|
||||
the website.
|
||||
|
||||
What is Bitcoin Core?
|
||||
---------------------
|
||||
What is Bitcoin Knots?
|
||||
----------------------
|
||||
|
||||
Bitcoin Core connects to the Bitcoin peer-to-peer network to download and fully
|
||||
Bitcoin Knots connects to the Bitcoin peer-to-peer network to download and fully
|
||||
validate blocks and transactions. It also includes a wallet and graphical user
|
||||
interface, which can be optionally built.
|
||||
|
||||
Further information about Bitcoin Core is available in the [doc folder](/doc).
|
||||
Further information about Bitcoin Knots is available in the [doc folder](/doc).
|
||||
|
||||
License
|
||||
-------
|
||||
|
||||
Bitcoin Core is released under the terms of the MIT license. See [COPYING](COPYING) for more
|
||||
Bitcoin Knots is released under the terms of the MIT license. See [COPYING](COPYING) for more
|
||||
information or see https://opensource.org/licenses/MIT.
|
||||
|
||||
Development Process
|
||||
-------------------
|
||||
|
||||
The `master` branch is regularly built (see `doc/build-*.md` for instructions) and tested, but it is not guaranteed to be
|
||||
completely stable. [Tags](https://github.com/bitcoin/bitcoin/tags) are created
|
||||
regularly from release branches to indicate new official, stable release versions of Bitcoin Core.
|
||||
Development generally takes place as part of [Bitcoin Core](https://github.com/bitcoin/bitcoin), and is merged into
|
||||
Knots for each release.
|
||||
|
||||
The https://github.com/bitcoin-core/gui repository is used exclusively for the
|
||||
development of the GUI. Its master branch is identical in all monotree
|
||||
repositories. Release branches and tags do not exist, so please do not fork
|
||||
that repository unless it is for development reasons.
|
||||
Even if your pull request to Core is closed, or if your feature is not
|
||||
suitable for Core (eg, because it builds on a features not supported in Core;
|
||||
relies on centralised services; etc), it may still be eligible for inclusion
|
||||
in Bitcoin Knots. In this case, a pull request may be opened on the
|
||||
[Knots GitHub](https://github.com/bitcoinknots/bitcoin) for review and consideration.
|
||||
When accepted, you are expected to maintain the submitted branch in your own
|
||||
repository, and it will be automatically merged into new releases of Knots.
|
||||
|
||||
The contribution workflow is described in [CONTRIBUTING.md](CONTRIBUTING.md)
|
||||
and useful hints for developers can be found in [doc/developer-notes.md](doc/developer-notes.md).
|
||||
Developer IRC can be found on Freenode at #bitcoin-dev.
|
||||
|
||||
Testing
|
||||
-------
|
||||
|
12
SECURITY.md
12
SECURITY.md
@ -2,19 +2,17 @@
|
||||
|
||||
## Supported Versions
|
||||
|
||||
See our website for versions of Bitcoin Core that are currently supported with
|
||||
security updates: https://bitcoincore.org/en/lifecycle/#schedule
|
||||
See our website for versions of Bitcoin Knots that are currently supported with
|
||||
security updates: https://bitcoinknots.org/
|
||||
|
||||
## Reporting a Vulnerability
|
||||
|
||||
To report security issues send an email to security@bitcoincore.org (not for support).
|
||||
To report security issues send an email to luke+security+knots@dashjr.org (not for support).
|
||||
|
||||
The following keys may be used to communicate sensitive information to developers:
|
||||
The following OpenPGP key should be used to communicate sensitive information:
|
||||
|
||||
| Name | Fingerprint |
|
||||
|------|-------------|
|
||||
| Pieter Wuille | 133E AC17 9436 F14A 5CF1 B794 860F EB80 4E66 9320 |
|
||||
| Michael Ford | E777 299F C265 DD04 7930 70EB 944D 35F9 AC3D B76A |
|
||||
| Andrew Chow | 1528 1230 0785 C964 44D3 334D 1756 5732 E08E 5E41 |
|
||||
| Luke Dashjr | FAC0 98FE 8DF9 975F 9024 1881 3666 E2B1 782A 18E1 |
|
||||
|
||||
You can import a key by running the following command with that individual’s fingerprint: `gpg --keyserver hkps://keys.openpgp.org --recv-keys "<fingerprint>"` Ensure that you put quotes around fingerprints containing spaces.
|
||||
|
@ -11,7 +11,7 @@ To build Bitcoin Core from the command-line, it is sufficient to only install th
|
||||
|
||||
The "Desktop development with C++" workload must be installed as well.
|
||||
|
||||
Building with Visual Studio is an alternative to the Linux based [cross-compiler build](../doc/build-windows.md).
|
||||
Building Knots with Visual Studio is NOT supported, and it is recommended to instead use the Linux based [cross-compiler build](../doc/build-windows.md).
|
||||
|
||||
|
||||
Prerequisites
|
||||
|
@ -7,7 +7,7 @@ define(_CLIENT_VERSION_IS_RELEASE, true)
|
||||
define(_COPYRIGHT_YEAR, 2023)
|
||||
define(_COPYRIGHT_HOLDERS,[The %s developers])
|
||||
define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Bitcoin Core]])
|
||||
AC_INIT([Bitcoin Core],m4_join([.], _CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MINOR, _CLIENT_VERSION_BUILD)m4_if(_CLIENT_VERSION_RC, [0], [], [rc]_CLIENT_VERSION_RC),[https://github.com/bitcoin/bitcoin/issues],[bitcoin],[https://bitcoincore.org/])
|
||||
AC_INIT([Bitcoin Knots],m4_join([.], _CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MINOR, _CLIENT_VERSION_BUILD)m4_if(_CLIENT_VERSION_RC, [0], [], [rc]_CLIENT_VERSION_RC),[https://github.com/bitcoinknots/bitcoin/issues],[bitcoin],[https://bitcoinknots.org/])
|
||||
AC_CONFIG_SRCDIR([src/validation.cpp])
|
||||
AC_CONFIG_HEADERS([src/config/bitcoin-config.h])
|
||||
AC_CONFIG_AUX_DIR([build-aux])
|
||||
@ -790,6 +790,9 @@ case $host in
|
||||
|
||||
dnl We require Windows 7 (NT 6.1) or later
|
||||
AX_CHECK_LINK_FLAG([-Wl,--major-subsystem-version -Wl,6 -Wl,--minor-subsystem-version -Wl,1], [CORE_LDFLAGS="$CORE_LDFLAGS -Wl,--major-subsystem-version -Wl,6 -Wl,--minor-subsystem-version -Wl,1"], [], [$LDFLAG_WERROR])
|
||||
|
||||
AC_PATH_PROGS([RSVG_CONVERT], [rsvg-convert rsvg],rsvg-convert)
|
||||
AC_PATH_PROGS([IMAGEMAGICK_CONVERT], [convert],convert)
|
||||
;;
|
||||
*darwin*)
|
||||
if test x$PNG2ICNS = xno; then
|
||||
|
@ -31,6 +31,7 @@
|
||||
(gnu packages tls)
|
||||
(gnu packages version-control)
|
||||
(guix build-system cmake)
|
||||
(guix build-system font)
|
||||
(guix build-system gnu)
|
||||
(guix build-system python)
|
||||
(guix build-system trivial)
|
||||
@ -206,6 +207,25 @@ chain for " target " development."))
|
||||
(search-our-patches "nsis-gcc-10-memmove.patch"
|
||||
"nsis-disable-installer-reloc.patch")))
|
||||
|
||||
(define-public font-tuffy
|
||||
(package
|
||||
(name "font-tuffy")
|
||||
(version "20120614")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://tulrich.com/fonts/tuffy-" version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"02vf72bgrp30vrbfhxjw82s115z27dwfgnmmzfb0n9wfhxxfpyf6"))))
|
||||
(build-system font-build-system)
|
||||
(home-page "http://tulrich.com/fonts/")
|
||||
(synopsis "The Tuffy Truetype Font Family")
|
||||
(description
|
||||
"Thatcher Ulrich's first outline font design. He started with the goal of producing a neutral, readable sans-serif text font. There are lots of \"expressive\" fonts out there, but he wanted to start with something very plain and clean, something he might want to actually use. ")
|
||||
(license license:public-domain)))
|
||||
|
||||
(define (fix-ppc64-nx-default lief)
|
||||
(package-with-extra-patches lief
|
||||
(search-our-patches "lief-fix-ppc64-nx-default.patch")))
|
||||
@ -611,7 +631,7 @@ inspecting signatures in Mach-O binaries.")
|
||||
(let ((target (getenv "HOST")))
|
||||
(cond ((string-suffix? "-mingw32" target)
|
||||
;; Windows
|
||||
(list zip
|
||||
(list font-tuffy zip
|
||||
(make-mingw-pthreads-cross-toolchain "x86_64-w64-mingw32")
|
||||
(make-nsis-for-gcc-10 nsis-x86_64)
|
||||
nss-certs
|
||||
|
@ -1,4 +1,4 @@
|
||||
description "Bitcoin Core Daemon"
|
||||
description "Bitcoin Knots Daemon"
|
||||
|
||||
start on runlevel [2345]
|
||||
stop on starting rc RUNLEVEL=[016]
|
||||
|
@ -1,6 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
#
|
||||
# bitcoind The bitcoin core server.
|
||||
# bitcoind The Bitcoin Knots server.
|
||||
#
|
||||
#
|
||||
# chkconfig: 345 80 20
|
||||
|
@ -18,7 +18,7 @@ BITCOIND_BIN=${BITCOIND_BIN:-/usr/bin/bitcoind}
|
||||
BITCOIND_NICE=${BITCOIND_NICE:-${NICELEVEL:-0}}
|
||||
BITCOIND_OPTS="${BITCOIND_OPTS:-${BITCOIN_OPTS}}"
|
||||
|
||||
name="Bitcoin Core Daemon"
|
||||
name="Bitcoin Knots Daemon"
|
||||
description="Bitcoin cryptocurrency P2P network daemon"
|
||||
|
||||
command="/usr/bin/bitcoind"
|
||||
|
@ -32,7 +32,7 @@ DOXYFILE_ENCODING = UTF-8
|
||||
# title of most generated pages and in a few other places.
|
||||
# The default value is: My Project.
|
||||
|
||||
PROJECT_NAME = "Bitcoin Core"
|
||||
PROJECT_NAME = "Bitcoin Knots"
|
||||
|
||||
# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
|
||||
# could be handy for archiving the generated documentation or if some version
|
||||
|
@ -1,15 +1,15 @@
|
||||
Bitcoin Core
|
||||
Bitcoin Knots
|
||||
=============
|
||||
|
||||
Setup
|
||||
---------------------
|
||||
Bitcoin Core is the original Bitcoin client and it builds the backbone of the network. It downloads and, by default, stores the entire history of Bitcoin transactions, which requires a few hundred gigabytes of disk space. Depending on the speed of your computer and network connection, the synchronization process can take anywhere from a few hours to a day or more.
|
||||
Bitcoin Knots is the original Bitcoin client and it builds the backbone of the network. It downloads and, by default, stores the entire history of Bitcoin transactions, which requires a few hundred gigabytes of disk space. Depending on the speed of your computer and network connection, the synchronization process can take anywhere from a few hours to a day or more.
|
||||
|
||||
To download Bitcoin Core, visit [bitcoincore.org](https://bitcoincore.org/en/download/).
|
||||
To download Bitcoin Knots, visit [bitcoinknots.org](https://bitcoinknots.org/).
|
||||
|
||||
Running
|
||||
---------------------
|
||||
The following are some helpful notes on how to run Bitcoin Core on your native platform.
|
||||
The following are some helpful notes on how to run Bitcoin Knots on your native platform.
|
||||
|
||||
### Unix
|
||||
|
||||
@ -24,7 +24,7 @@ Unpack the files into a directory, and then run bitcoin-qt.exe.
|
||||
|
||||
### macOS
|
||||
|
||||
Drag Bitcoin Core to your applications folder, and then run Bitcoin Core.
|
||||
Drag Bitcoin Knots to your applications folder, and then run Bitcoin Knots.
|
||||
|
||||
### Need Help?
|
||||
|
||||
@ -36,7 +36,7 @@ for help and more information.
|
||||
|
||||
Building
|
||||
---------------------
|
||||
The following are developer notes on how to build Bitcoin Core on your native platform. They are not complete guides, but include notes on the necessary libraries, compile flags, etc.
|
||||
The following are developer notes on how to build Bitcoin Knots on your native platform. They are not complete guides, but include notes on the necessary libraries, compile flags, etc.
|
||||
|
||||
- [Dependencies](dependencies.md)
|
||||
- [macOS Build Notes](build-osx.md)
|
||||
|
@ -1,4 +1,4 @@
|
||||
Bitcoin Core
|
||||
Bitcoin Knots
|
||||
=============
|
||||
|
||||
Intro
|
||||
@ -13,7 +13,7 @@ Setup
|
||||
-----
|
||||
Unpack the files into a directory and run bitcoin-qt.exe.
|
||||
|
||||
Bitcoin Core is the original Bitcoin client and it builds the backbone of the network.
|
||||
Bitcoin Knots is the original Bitcoin client and it builds the backbone of the network.
|
||||
However, it downloads and stores the entire history of Bitcoin transactions;
|
||||
depending on the speed of your computer and network connection, the synchronization
|
||||
process can take anywhere from a few hours to a day or more.
|
||||
|
@ -19,7 +19,7 @@ Unicode true
|
||||
!define MUI_WELCOMEFINISHPAGE_BITMAP "@abs_top_builddir@/src/qt/res/rendered_icons/nsis-wizard.bmp"
|
||||
!define MUI_HEADERIMAGE
|
||||
!define MUI_HEADERIMAGE_RIGHT
|
||||
!define MUI_HEADERIMAGE_BITMAP "@abs_top_srcdir@/share/pixmaps/nsis-header.bmp"
|
||||
!define MUI_HEADERIMAGE_BITMAP "@abs_top_builddir@/src/qt/res/rendered_icons/nsis-header.bmp"
|
||||
!define MUI_FINISHPAGE_NOAUTOCLOSE
|
||||
!define MUI_STARTMENUPAGE_REGISTRY_ROOT HKLM
|
||||
!define MUI_STARTMENUPAGE_REGISTRY_KEY ${REGKEY}
|
||||
|
@ -1131,7 +1131,9 @@ endif
|
||||
|
||||
# Rendered icons must be here, not in Makefile.qt.include, since they are distributed with the source tarball
|
||||
|
||||
RES_RENDERED_ICON_SRC = qt/res/src/bitcoin.svg
|
||||
RES_RENDERED_ICON_SRC = \
|
||||
qt/res/src/bitcoin.svg \
|
||||
qt/res/src/nsis-header.svg
|
||||
|
||||
RES_RENDERED_ICONS = \
|
||||
qt/res/rendered_icons/bitcoin.ico \
|
||||
@ -1167,6 +1169,9 @@ qt/res/rendered_icons/bitcoin_testnet.ico: qt/res/rendered_icons/bitcoin.ico
|
||||
qt/res/rendered_icons/nsis-wizard.bmp: qt/res/rendered_icons/bitcoin290.png
|
||||
$(IMAGEMAGICK_CONVERT) $^ -crop 164x290+62+0 -border 0x12 -strip BMP3:$@
|
||||
|
||||
qt/res/rendered_icons/nsis-header.bmp: qt/res/src/nsis-header.svg
|
||||
sed 's/PACKAGE_NAME/$(PACKAGE_NAME)/' < "$<" | $(RSVG_CONVERT) -f png -d 57 -p 57 | $(IMAGEMAGICK_CONVERT) - -background white -alpha remove BMP3:$@
|
||||
|
||||
endif
|
||||
|
||||
|
||||
|
@ -62,7 +62,7 @@ std::string FormatFullVersion()
|
||||
/**
|
||||
* Format the subversion field according to BIP 14 spec (https://github.com/bitcoin/bips/blob/master/bip-0014.mediawiki)
|
||||
*/
|
||||
std::string FormatSubVersion(const std::string& name, int nClientVersion, const std::vector<std::string>& comments)
|
||||
std::string FormatSubVersion(const std::string& name, int nClientVersion, const std::vector<std::string>& comments, const bool fBaseNameOnly)
|
||||
{
|
||||
std::ostringstream ss;
|
||||
ss << "/";
|
||||
@ -76,6 +76,8 @@ std::string FormatSubVersion(const std::string& name, int nClientVersion, const
|
||||
ss << ")";
|
||||
}
|
||||
ss << "/";
|
||||
if (!fBaseNameOnly)
|
||||
ss << "Knots:20170901/";
|
||||
return ss.str();
|
||||
}
|
||||
|
||||
@ -93,7 +95,7 @@ std::string CopyrightHolders(const std::string& strPrefix)
|
||||
|
||||
std::string LicenseInfo()
|
||||
{
|
||||
const std::string URL_SOURCE_CODE = "<https://github.com/bitcoin/bitcoin>";
|
||||
const std::string URL_SOURCE_CODE = "<https://github.com/bitcoinknots/bitcoin>";
|
||||
|
||||
return CopyrightHolders(strprintf(_("Copyright (C) %i-%i").translated, 2009, COPYRIGHT_YEAR) + " ") + "\n" +
|
||||
"\n" +
|
||||
|
@ -39,7 +39,7 @@ extern const std::string CLIENT_NAME;
|
||||
|
||||
|
||||
std::string FormatFullVersion();
|
||||
std::string FormatSubVersion(const std::string& name, int nClientVersion, const std::vector<std::string>& comments);
|
||||
std::string FormatSubVersion(const std::string& name, int nClientVersion, const std::vector<std::string>& comments, bool fBaseNameOnly = false);
|
||||
|
||||
std::string CopyrightHolders(const std::string& strPrefix);
|
||||
|
||||
|
File diff suppressed because one or more lines are too long
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 121 KiB |
359
src/qt/res/src/nsis-header.svg
Normal file
359
src/qt/res/src/nsis-header.svg
Normal file
@ -0,0 +1,359 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<!-- Designer: Steven Hay
|
||||
License: MIT
|
||||
-->
|
||||
|
||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||
<svg version="1.1"
|
||||
id="svg2" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="2.632in" height="1in"
|
||||
viewBox="-34 -34 1526 580" enable-background="new 0 0 1024 1024" xml:space="preserve">
|
||||
|
||||
<style type="text/css"><![CDATA[
|
||||
text {
|
||||
font-family: "Tuffy";
|
||||
font-size: 170px;
|
||||
fill: black;
|
||||
text-anchor: left;
|
||||
}
|
||||
]]></style>
|
||||
<g transform="scale(0.54, 0.54) translate(-25, 230)">
|
||||
<radialGradient id="coinShape" cx="256.0276" cy="256.0027" r="255.9878" gradientUnits="userSpaceOnUse">
|
||||
<stop offset="0" style="stop-color:#F9AA4B"/>
|
||||
<stop offset="1" style="stop-color:#F7931A"/>
|
||||
</radialGradient>
|
||||
<circle cx="256" cy="256" r="256" fill="url(#coinShape)" filter="url(#dropShadowAlpha)" />
|
||||
<g id="B_gradient" filter="url(#dropShadowAlpha)">
|
||||
<g id="XMLID_3_">
|
||||
<g>
|
||||
<path fill="#006837" d="M267.362,284.56c12.797,13.063,20.853,27.315,20.038,50.53l-17.054,1.63
|
||||
c0-18.271-4.623-30.62-14.189-40.589L267.362,284.56z"/>
|
||||
</g>
|
||||
<g>
|
||||
<path fill="none" stroke="#00FF00" stroke-miterlimit="10" d="M256.157,296.131c9.566,9.969,14.189,22.317,14.189,40.589
|
||||
l17.054-1.63c0.814-23.215-7.241-37.468-20.038-50.53L256.157,296.131z"/>
|
||||
</g>
|
||||
</g>
|
||||
<path fill="#006837" stroke="#00FF00" stroke-width="2" stroke-miterlimit="10" d="M282.99,135.289
|
||||
c-1.986-25.323-23.207-38.778-33.149-45.31c0,0-27.572,19.359-30.367,45.172l14.5-0.797c1.501-13.867,15.867-26.219,15.867-26.219
|
||||
c5.34,3.508,16.171,12.968,17.24,26.571L282.99,135.289z"/>
|
||||
<path fill="#006837" stroke="#00FF00" stroke-width="2" stroke-miterlimit="10" d="M285.313,364.219
|
||||
c-1.884,25.896-33.298,45.424-33.298,45.424c-10.166-6.179-30.208-19.2-33.084-44.438l13.472-0.771
|
||||
c1.721,15.096,12.714,23.357,18.795,27.053c0,0,16.893-11.563,18.02-27.053L285.313,364.219z"/>
|
||||
<path fill="#006837" stroke="#00FF00" stroke-miterlimit="10" d="M258.624,198.976c8.271-9.869,11.998-25.563,10.472-39.732
|
||||
l9.13,1.356l7.543,1.025c2.218,18.973-4.603,33.846-14.45,46.919"/>
|
||||
<g>
|
||||
<path fill="#006837" stroke="#00FF00" stroke-miterlimit="10" d="M245.155,283.111c-20.945-24.394-3.255-62.365,3.613-71.508
|
||||
l11.207,10.161c-11.732,14.165-14.71,34.056-4.357,50.159L245.155,283.111z"/>
|
||||
</g>
|
||||
<path fill="#006837" stroke="#00FF00" stroke-width="2" stroke-miterlimit="10" d="M292.298,242.088
|
||||
c-25.802-11.596-73.829-48.033-73.809-84.929l13.958-0.825c-2.061,36.529,66.376,69.887,77.665,72.504L292.298,242.088z"/>
|
||||
<path fill="#006837" stroke="#00FF00" stroke-width="3" stroke-miterlimit="10" d="M334.596,237.27
|
||||
c0,0,43.137,19.028,43.137,58.166c0,69.071-92.42,68.782-92.42,68.782c-130.445,1.722-149.219,5.693-141.667,2.179
|
||||
c29.979-13.959,28.084-31.828,28.084-31.828l-1.776-176.069c0,0-0.366-14.362-27.736-22.949
|
||||
c-2.829-0.888,138.281-0.284,138.281-0.284s85.6-0.202,85.847,57.323c0.137,32.286-69.803,69.731-69.803,69.731
|
||||
c-8.351,6.159-58.897,35.61-62.733,74.432h-15.122c0,0-1.343-45.08,78.142-97.715c23.004-15.233,36.543-35.399,36.543-46.448
|
||||
c-0.009-18.345-32.452-29.366-52.407-32.277c-53.935-7.855-73.342-1.648-73.342-1.648s-6.985,2.105-8.358,8.056
|
||||
c-0.878,3.79-1.3,11.287-1.3,11.287l1.831,149.521c0,0-0.41,9.121,7.598,9.326l62.954-0.135c0-0.001,67.41,0,67.375-45.81
|
||||
c-0.014-17.696-7.266-31.59-24.364-38.707c0,0,19.186-13.086,21.032-15.036"/>
|
||||
<path fill="#006837" stroke="#00FF00" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" d="M219.046,336.188"/>
|
||||
</g>
|
||||
<g id="Rope" transform="translate(-17.1,-17.1) scale(1.09375)" filter="url(#dropShadowAlpha)">
|
||||
<path fill="#8C6239" stroke="#42210B" stroke-width="2" stroke-miterlimit="10" d="M489.61,239.538
|
||||
c-1.499-5.47-5.238-10.585-11.214-15.342c5.53-13.903,2.378-25.404-9.461-34.5c5.531-13.903,2.378-25.403-9.46-34.5
|
||||
c7.497-18.98-4.618-38.813-24.491-41.783c-2.164-14.807-10.647-23.188-25.449-25.141c-2.163-14.807-10.646-23.187-25.449-25.141
|
||||
c-2.995-20.136-23.285-31.481-42.011-24.084c-9.29-11.732-20.828-14.736-34.618-9.014c-9.29-11.731-20.831-14.736-34.621-9.014
|
||||
c-12.679-15.929-35.773-15.485-48.289,0.232c-13.903-5.536-25.403-2.386-34.503,9.452c-13.902-5.537-25.403-2.387-34.503,9.45
|
||||
c-18.985-7.505-38.811,4.628-41.777,24.5c-14.806,2.169-23.183,10.655-25.133,25.458c-14.806,2.168-23.184,10.654-25.134,25.457
|
||||
c-20.132,3.001-31.463,23.3-24.075,42.021c-11.734,9.286-14.742,20.825-9.024,34.617c-11.735,9.286-14.743,20.824-9.024,34.616
|
||||
C5.435,239.5,5.879,262.86,21.599,275.381c-5.539,13.902-2.389,25.403,9.447,34.505c-5.538,13.901-2.39,25.401,9.446,34.504
|
||||
c-7.504,18.977,4.607,38.816,24.477,41.794c2.16,14.808,10.64,23.191,25.44,25.15c2.159,14.808,10.639,23.191,25.44,25.15
|
||||
c2.988,20.136,23.253,31.477,41.98,24.09c9.284,11.735,20.822,14.746,34.616,9.03c9.283,11.737,20.822,14.747,34.615,9.03
|
||||
c12.679,15.946,35.994,15.499,48.51-0.232c13.904,5.529,25.403,2.374,34.498-9.467c13.904,5.529,25.403,2.373,34.498-9.469
|
||||
c18.986,7.496,38.788-4.634,41.743-24.507c14.807-2.175,23.181-10.663,25.126-25.466c14.805-2.174,23.179-10.662,25.124-25.466
|
||||
c20.129-3.009,31.456-23.313,24.06-42.031c11.729-9.289,14.733-20.83,9.011-34.619c11.729-9.29,14.733-20.83,9.009-34.621
|
||||
C488.343,265.032,492.901,251.525,489.61,239.538C488.111,234.068,490.546,242.945,489.61,239.538z M469.511,262.109
|
||||
c-1.674,1.221-3.365,2.419-5.073,3.591c-1.555-4.101-2.273-7.857-2.19-11.283c1.733,2.103,3.829,3.519,6.286,4.248
|
||||
C468.756,259.786,469.073,260.932,469.511,262.109z M460.954,268.154c-11.331,8.958-14.583,20.638-8.947,34.379
|
||||
c-11.731,9.291-14.734,20.831-9.011,34.62c-6.114,4.3-9.83,9.647-11.145,16.041c-4.93,4.451-7.697,10.45-8.303,17.999
|
||||
c-14.291,2.086-22.952,10.571-24.948,25.288c-14.806,2.175-23.18,10.663-25.124,25.466c-7.542,0.709-13.504,3.558-17.888,8.55
|
||||
c-6.362,1.404-11.649,5.187-15.859,11.348c-13.417-5.348-25.163-2.338-34.258,9.401c-13.904-5.529-25.403-2.374-34.498,9.467
|
||||
c-6.842-3.159-13.393-3.689-19.648-1.592c-6.29-2.029-12.841-1.417-19.653,1.832c-8.95-11.334-20.629-14.594-34.373-8.968
|
||||
c-9.284-11.736-20.822-14.746-34.615-9.029c-4.285-6.12-9.619-9.835-16-11.146c-4.441-4.938-10.438-7.711-17.989-8.32
|
||||
c-2.07-14.294-10.548-22.964-25.262-24.974c-2.159-14.809-10.64-23.192-25.441-25.151c-0.699-7.543-3.542-13.508-8.529-17.896
|
||||
c-1.396-6.378-5.179-11.681-11.347-15.904c5.357-13.412,2.354-25.161-9.38-34.263c5.539-13.9,2.389-25.403-9.446-34.504
|
||||
c3.168-6.855,3.699-13.415,1.592-19.683c2.034-6.301,1.425-12.862-1.827-19.684c11.334-8.952,14.591-20.632,8.961-34.375
|
||||
c11.733-9.286,14.742-20.825,9.024-34.617c6.12-4.297,9.836-9.644,11.151-16.039c4.932-4.446,7.701-10.444,8.308-17.994
|
||||
c14.292-2.081,22.956-10.563,24.958-25.279c14.806-2.168,23.184-10.654,25.134-25.457c7.549-0.704,13.515-3.553,17.897-8.549
|
||||
c6.371-1.391,11.664-5.172,15.879-11.344c13.413,5.356,25.16,2.352,34.261-9.385c13.901,5.536,25.402,2.385,34.503-9.451
|
||||
c6.806,3.16,13.32,3.704,19.546,1.635c6.26,1.996,12.778,1.372,19.551-1.873c8.957,11.331,20.639,14.584,34.38,8.951
|
||||
c9.288,11.731,20.828,14.736,34.617,9.013c4.293,6.111,9.632,9.824,16.017,11.141c4.446,4.938,10.445,7.712,17.999,8.322
|
||||
c2.076,14.293,10.556,22.958,25.271,24.965c2.164,14.807,10.647,23.187,25.45,25.141c0.7,7.543,3.547,13.507,8.535,17.892
|
||||
c1.39,6.38,5.173,11.68,11.353,15.899c-5.352,13.416-2.344,25.161,9.394,34.259c-5.532,13.904-2.379,25.404,9.461,34.5
|
||||
c-3.165,6.854-3.693,13.415-1.586,19.682C457.088,254.771,457.7,261.334,460.954,268.154z M454.747,366.533
|
||||
c-2.197,1.695-4.749,2.419-7.656,2.17c-0.098-4.453,1.825-7.746,5.769-9.874C454.355,361.248,454.984,363.815,454.747,366.533
|
||||
C454.1,367.041,454.847,365.758,454.747,366.533z M431.516,359.994c0.43,2.72,1.531,5.018,3.304,6.894
|
||||
c-0.349,1.049-0.634,2.161-0.836,3.354c-2.062,0.218-4.124,0.408-6.19,0.57C428.494,366.507,429.743,362.91,431.516,359.994
|
||||
C431.894,362.185,429.743,362.91,431.516,359.994z M439.431,365.847c0.675-2.472,2.204-3.328,4.589-2.569
|
||||
c0.767,2.087,0.158,3.504-1.824,4.25C441.199,367.088,440.277,366.526,439.431,365.847
|
||||
C439.937,364.822,440.277,366.526,439.431,365.847z M449.429,355.128c-0.277,5.455-6.212,3.387-2.922-1.52
|
||||
C447.569,353.988,448.543,354.498,449.429,355.128C449.389,355.898,448.543,354.498,449.429,355.128z M441.608,355.404
|
||||
c-0.342,1.311-0.396,2.453-0.178,3.436c-2.035,0.821-3.602,2.168-4.699,4.043c-1.343-2.067-1.771-4.584-1.248-7.57
|
||||
c2.207-1.806,4.569-2.633,7.089-2.492C442.167,353.66,441.839,354.519,441.608,355.404
|
||||
C441.267,356.715,441.839,354.519,441.608,355.404z M366.444,453.315c-1.771-0.22-3.445-0.85-5.023-1.876
|
||||
c2.102-3.916,5.386-5.88,9.855-5.89c0.142,2.85-0.543,5.403-2.058,7.661C368.316,453.363,367.394,453.408,366.444,453.315
|
||||
C364.673,453.096,367.394,453.408,366.444,453.315z M351.325,442.617c0.065,0.412,0.149,0.813,0.238,1.21
|
||||
c-0.801,0.716-1.578,1.515-2.326,2.417c-1.894-0.841-3.775-1.71-5.644-2.604c2.699-3.3,5.511-5.75,8.43-7.39
|
||||
C351.329,438.259,351.087,440.379,351.325,442.617C351.391,443.029,351.087,440.379,351.325,442.617z M356.113,445.194
|
||||
c1.834-1.831,3.6-1.817,5.3,0.045c-0.379,2.171-1.606,3.103-3.681,2.795C357.066,447.157,356.525,446.211,356.113,445.194
|
||||
C357.078,444.548,356.525,446.211,356.113,445.194z M370.083,440.679c-2.979,4.649-7.115-0.108-1.809-2.717
|
||||
C369.013,438.806,369.617,439.711,370.083,440.679C369.655,441.348,369.617,439.711,370.083,440.679z M363.144,437.056
|
||||
c-0.994,1.007-1.626,2.012-1.912,3.015c-2.157-0.259-4.171,0.153-6.042,1.236c-0.189-2.469,0.654-4.868,2.544-7.197
|
||||
c2.849-0.521,5.334-0.1,7.474,1.233C364.461,435.855,363.768,436.422,363.144,437.056
|
||||
C362.149,438.063,363.768,436.422,363.144,437.056z M253.333,484.456c-0.59,0.46-1.222,0.83-1.891,1.125
|
||||
c-2.562-1.032-4.468-2.855-5.715-5.47c2.32,0.487,4.173-0.107,5.54-1.824c1.216,1.804,3.151,2.401,5.802,1.801
|
||||
C256.183,481.745,254.942,483.203,253.333,484.456C252.743,484.916,254.942,483.203,253.333,484.456z M237.712,469.514
|
||||
c-1.219-1.676-2.415-3.367-3.588-5.074c4.079-1.546,7.817-2.262,11.229-2.187c-2.107,1.737-3.525,3.836-4.255,6.297
|
||||
C239.995,468.771,238.869,469.084,237.712,469.514z M244.278,475.357c-0.135-1.112-0.123-2.222,0.041-3.327
|
||||
c2.439-0.623,3.921,0.275,4.444,2.695C247.381,476.395,245.887,476.604,244.278,475.357
|
||||
C244.143,474.245,244.947,475.708,244.278,475.357z M258.527,475.299c-4.777,2.398-5.926-3.675-0.163-3.336
|
||||
C258.579,473.09,258.628,474.202,258.527,475.299C257.866,475.631,258.628,474.202,258.527,475.299z M254.465,468.619
|
||||
c-1.36,0.373-2.407,0.925-3.157,1.646c-1.714-1.341-3.649-2.024-5.805-2.046c1.092-2.203,3.029-3.837,5.833-4.891
|
||||
c2.67,0.996,4.57,2.614,5.722,4.845C256.172,468.245,255.308,468.389,254.465,468.619
|
||||
C253.104,468.992,255.308,468.389,254.465,468.619z M133.296,454.687c-1.699-2.204-2.42-4.763-2.162-7.68
|
||||
c4.446-0.052,7.745,1.884,9.894,5.808C138.601,454.313,136.023,454.937,133.296,454.687
|
||||
C132.789,454.038,134.081,454.79,133.296,454.687z M142.475,449.066c-3.266-0.853-0.052-5.181,3.779-2.593
|
||||
c-0.38,1.058-0.886,2.025-1.514,2.906C143.958,449.342,143.195,449.254,142.475,449.066
|
||||
C141.186,448.729,143.195,449.254,142.475,449.066z M136.592,443.968c-2.103,0.767-3.526,0.146-4.27-1.863
|
||||
c0.44-0.986,1-1.899,1.677-2.74C136.49,440.039,137.354,441.573,136.592,443.968C135.416,444.687,137.294,442.785,136.592,443.968z
|
||||
M132.962,434.755c-1.041-0.346-2.143-0.628-3.325-0.832c-0.216-2.061-0.405-4.122-0.564-6.188
|
||||
c4.296,0.704,7.886,1.952,10.798,3.721C137.146,431.883,134.844,432.983,132.962,434.755
|
||||
C131.922,434.409,133.208,434.535,132.962,434.755z M147.05,442.539c-1.879-1.003-3.885-1.394-6.021-1.169
|
||||
c-0.825-2.035-2.177-3.604-4.057-4.703c2.074-1.341,4.599-1.76,7.592-1.227C146.37,437.65,147.194,440.018,147.05,442.539
|
||||
C146.201,442.126,147.194,440.018,147.05,442.539z M64.594,365.062c-1.146-1.808-2.719-3.129-4.72-3.965
|
||||
c0.267-2.155-0.137-4.168-1.213-6.039c2.465-0.185,4.861,0.66,7.185,2.55C66.358,360.448,65.931,362.929,64.594,365.062
|
||||
C64.085,364.32,65.931,362.929,64.594,365.062z M46.729,369.045c-0.447-2.761,0.15-5.352,1.788-7.771
|
||||
c3.934,2.081,5.884,5.36,5.849,9.836C51.526,371.244,48.981,370.556,46.729,369.045C46.582,368.151,47.294,369.449,46.729,369.045z
|
||||
M56.113,358.788c0.265,0.965-0.205,1.786-1.403,2.459c-2.161-0.376-3.09-1.593-2.792-3.649c0.883-0.67,1.835-1.213,2.855-1.625
|
||||
C55.411,356.929,55.861,357.867,56.113,358.788C56.378,359.753,55.861,357.867,56.113,358.788z M57.441,368.534
|
||||
c-2.426-2.399,2.53-4.466,4.531-0.411c-0.849,0.739-1.761,1.344-2.737,1.809C58.58,369.51,57.967,369.054,57.441,368.534
|
||||
C56.493,367.598,57.967,369.054,57.441,368.534z M57.348,351.193c-0.407,0.064-0.803,0.146-1.196,0.231
|
||||
c-0.722-0.81-1.526-1.597-2.44-2.355c0.843-1.893,1.713-3.771,2.608-5.641c3.311,2.712,5.766,5.538,7.404,8.471
|
||||
C61.715,351.201,59.591,350.955,57.348,351.193C56.94,351.258,59.591,350.955,57.348,351.193z M31.837,256.82
|
||||
c-0.102-2.115-0.808-4.024-2.117-5.728c1.352-1.703,2.043-3.628,2.072-5.776c2.197,1.089,3.828,3.019,4.881,5.808
|
||||
C35.677,253.779,34.063,255.674,31.837,256.82C31.764,255.954,34.063,255.674,31.837,256.82z M28.05,258.127
|
||||
c-1.137,0.215-2.259,0.264-3.366,0.158C22.348,253.559,28.361,252.444,28.05,258.127C26.913,258.342,28.105,257.118,28.05,258.127z
|
||||
M27.73,247.093c-0.252,0.968-1.068,1.447-2.442,1.432c-1.657-1.361-1.877-2.835-0.662-4.427c1.125-0.138,2.245-0.128,3.36,0.038
|
||||
C28.045,245.223,27.96,246.209,27.73,247.093C27.478,248.061,27.96,246.209,27.73,247.093z M21.76,251.061
|
||||
c-1.814,1.205-2.43,3.124-1.85,5.762c-2.475-1.315-4.297-3.18-5.466-5.595c1.034-2.544,2.85-4.437,5.447-5.68
|
||||
C19.424,247.857,20.029,249.702,21.76,251.061C19.945,252.266,20.029,249.702,21.76,251.061z M32.504,241.271
|
||||
c-0.345-0.132-0.688-0.244-1.032-0.356c-0.223-1.121-0.539-2.266-0.976-3.443c1.675-1.22,3.367-2.416,5.075-3.589
|
||||
c1.553,4.101,2.269,7.856,2.187,11.282C36.353,243.509,34.606,242.207,32.504,241.271C32.16,241.139,34.606,242.207,32.504,241.271
|
||||
z M45.3,133.057c2.198-1.694,4.751-2.417,7.659-2.168c0.095,4.453-1.829,7.745-5.772,9.874
|
||||
C45.692,138.344,45.063,135.776,45.3,133.057C45.95,132.549,45.201,133.833,45.3,133.057z M68.532,139.602
|
||||
c-0.431-2.72-1.532-5.018-3.303-6.895c0.35-1.048,0.635-2.159,0.838-3.352c2.06-0.218,4.124-0.407,6.189-0.568
|
||||
C71.553,133.092,70.303,136.687,68.532,139.602C68.155,137.412,70.303,136.687,68.532,139.602z M60.618,133.747
|
||||
c-0.675,2.473-2.205,3.33-4.59,2.57c-0.767-2.089-0.157-3.505,1.828-4.25C58.85,132.506,59.771,133.066,60.618,133.747
|
||||
C60.11,134.771,59.771,133.066,60.618,133.747z M50.617,144.464c0.278-5.457,6.213-3.387,2.92,1.52
|
||||
C52.475,145.604,51.502,145.095,50.617,144.464C50.656,143.693,51.502,145.095,50.617,144.464z M58.437,144.19
|
||||
c0.342-1.311,0.396-2.454,0.179-3.437c2.035-0.821,3.602-2.167,4.701-4.042c1.343,2.068,1.771,4.586,1.246,7.571
|
||||
c-2.208,1.806-4.571,2.632-7.091,2.492C57.877,145.935,58.206,145.075,58.437,144.19C58.778,142.879,58.206,145.075,58.437,144.19z
|
||||
M133.637,46.308c1.769,0.221,3.442,0.85,5.019,1.875c-2.081,3.933-5.358,5.889-9.833,5.867c-0.14-2.842,0.546-5.39,2.056-7.643
|
||||
C131.775,46.257,132.693,46.216,133.637,46.308C135.406,46.528,132.693,46.216,133.637,46.308z M148.75,57.011
|
||||
c-0.065-0.409-0.147-0.808-0.234-1.203c0.807-0.72,1.591-1.523,2.347-2.434c1.893,0.843,3.774,1.712,5.643,2.607
|
||||
c-2.708,3.305-5.528,5.757-8.454,7.396C148.745,61.372,148.989,59.25,148.75,57.011C148.685,56.602,148.989,59.25,148.75,57.011z
|
||||
M138.687,54.374c0.375-2.162,1.593-3.093,3.652-2.792c0.67,0.882,1.212,1.832,1.627,2.852
|
||||
C142.137,56.251,140.378,56.23,138.687,54.374C138.653,52.996,139.359,55.573,138.687,54.374z M130.008,58.917
|
||||
c2.969-4.607,7.086,0.126,1.813,2.731C131.08,60.8,130.474,59.89,130.008,58.917C130.432,58.259,130.474,59.89,130.008,58.917z
|
||||
M136.932,62.567c0.998-1.011,1.632-2.02,1.917-3.027c2.155,0.264,4.166-0.143,6.037-1.221c0.188,2.466-0.654,4.863-2.54,7.188
|
||||
c-2.844,0.517-5.325,0.093-7.46-1.24C135.625,63.758,136.311,63.195,136.932,62.567C137.93,61.557,136.311,63.195,136.932,62.567z
|
||||
M262.188,30.146c1.221,1.675,2.417,3.367,3.591,5.073c-3.997,1.516-7.666,2.235-11.023,2.195c2.12-1.75,3.546-3.866,4.277-6.348
|
||||
C260.062,30.846,261.111,30.546,262.188,30.146z M255.854,24.434c0.116,1.062,0.098,2.12-0.059,3.173
|
||||
c-2.548,0.716-4.103-0.173-4.661-2.667C252.596,23.213,254.168,23.045,255.854,24.434C255.971,25.496,255.107,24.02,255.854,24.434
|
||||
z M250.936,15.321c1.459,1.106,2.613,2.537,3.473,4.277c-3.848,2.188-7.718,2.2-11.608,0.036c1.338-2.548,3.252-4.413,5.741-5.594
|
||||
C249.377,14.358,250.177,14.777,250.936,15.321C252.395,16.427,250.177,14.777,250.936,15.321z M241.356,24.482
|
||||
c5.014-2.644,6.241,3.691,0.174,3.206C241.327,26.606,241.271,25.538,241.356,24.482C242.092,24.094,241.271,25.538,241.356,24.482
|
||||
z M245.645,31.046c1.298-0.356,2.312-0.874,3.053-1.547c1.755,1.316,3.723,1.968,5.907,1.956c-1.106,2.228-3.076,3.876-5.936,4.926
|
||||
c-2.723-0.991-4.657-2.622-5.823-4.878C243.803,31.438,244.738,31.293,245.645,31.046
|
||||
C246.943,30.689,244.738,31.293,245.645,31.046z M366.616,44.931c1.694,2.199,2.415,4.753,2.161,7.664
|
||||
c-4.453,0.083-7.743-1.846-9.873-5.788C361.326,45.313,363.897,44.688,366.616,44.931C367.122,45.577,365.837,44.83,366.616,44.931
|
||||
z M357.435,50.547c3.277,0.853,0.053,5.169-3.758,2.606c0.381-1.061,0.89-2.033,1.521-2.917
|
||||
C355.97,50.276,356.724,50.362,357.435,50.547C358.725,50.883,356.724,50.362,357.435,50.547z M363.34,55.654
|
||||
c2.093-0.765,3.512-0.153,4.256,1.838c-0.441,0.991-1.002,1.911-1.684,2.755C363.438,59.573,362.579,58.042,363.34,55.654
|
||||
C364.516,54.937,362.639,56.837,363.34,55.654z M366.949,64.859c1.047,0.349,2.158,0.634,3.349,0.837
|
||||
c0.217,2.061,0.406,4.124,0.566,6.189c-4.306-0.704-7.899-1.956-10.816-3.729C362.77,67.729,365.07,66.629,366.949,64.859
|
||||
C367.996,65.208,366.706,65.077,366.949,64.859z M352.882,57.086c1.879,0.998,3.886,1.382,6.02,1.152
|
||||
c0.82,2.037,2.167,3.605,4.042,4.706c-2.07,1.339-4.591,1.763-7.58,1.234C353.562,61.969,352.738,59.606,352.882,57.086
|
||||
C353.727,57.495,352.738,59.606,352.882,57.086z M435.363,134.533c1.147,1.807,2.721,3.128,4.723,3.964
|
||||
c-0.266,2.155,0.139,4.168,1.216,6.04c-2.466,0.185-4.862-0.66-7.187-2.549C433.602,139.146,434.029,136.667,435.363,134.533
|
||||
C435.874,135.273,434.029,136.667,435.363,134.533z M453.23,130.545c0.446,2.761-0.148,5.352-1.786,7.773
|
||||
c-3.934-2.083-5.885-5.363-5.855-9.839C448.433,128.344,450.978,129.033,453.23,130.545
|
||||
C453.379,131.438,452.666,130.14,453.23,130.545z M443.849,140.804c-0.265-0.965,0.203-1.786,1.401-2.459
|
||||
c2.162,0.375,3.094,1.593,2.792,3.651c-0.882,0.669-1.833,1.211-2.854,1.625C444.552,142.664,444.1,141.726,443.849,140.804
|
||||
C443.584,139.839,444.1,141.726,443.849,140.804z M442.519,131.06c2.427,2.397-2.527,4.466-4.532,0.411
|
||||
c0.849-0.74,1.76-1.345,2.736-1.81C441.377,130.083,441.99,130.539,442.519,131.06C443.466,131.997,441.99,130.539,442.519,131.06z
|
||||
M442.618,148.401c0.406-0.064,0.803-0.146,1.194-0.233c0.722,0.81,1.528,1.595,2.439,2.353c-0.843,1.893-1.71,3.774-2.605,5.644
|
||||
c-3.311-2.711-5.766-5.536-7.406-8.468C438.251,148.394,440.374,148.639,442.618,148.401
|
||||
C443.024,148.337,440.374,148.639,442.618,148.401z M468.166,242.763c0.102,2.114,0.809,4.023,2.118,5.726
|
||||
c-1.353,1.703-2.043,3.628-2.071,5.776c-2.198-1.089-3.829-3.017-4.883-5.805C464.326,245.803,465.939,243.909,468.166,242.763
|
||||
C468.238,243.627,465.939,243.909,468.166,242.763z M476.149,253.498c-0.175,0.672-0.435,1.332-0.771,1.984
|
||||
c-1.123,0.138-2.243,0.129-3.359-0.036c-0.603-2.411,0.296-3.874,2.696-4.39C475.928,251.714,476.402,252.53,476.149,253.498
|
||||
C475.975,254.17,476.402,252.53,476.149,253.498z M471.951,241.455c1.136-0.215,2.26-0.264,3.367-0.16
|
||||
C477.654,246.02,471.644,247.136,471.951,241.455C473.087,241.239,471.896,242.463,471.951,241.455z M478.242,248.519
|
||||
c1.815-1.205,2.431-3.126,1.85-5.762c2.475,1.314,4.299,3.179,5.468,5.594c-1.035,2.543-2.851,4.437-5.447,5.681
|
||||
C480.579,251.721,479.975,249.876,478.242,248.519C480.058,247.314,479.975,249.876,478.242,248.519z M485.748,240.598
|
||||
c0.167,0.605,0.28,1.192,0.371,1.772c-2.457-2.532-5.281-4.113-8.477-4.745c-0.972-1.352-2.202-2.738-3.714-4.163
|
||||
c0.777-1.99,1.726-3.894,2.847-5.708C481.521,231.81,484.514,236.093,485.748,240.598
|
||||
C485.915,241.203,484.514,236.093,485.748,240.598z M476.288,206.097c3.291,12.004-5.675,21.071-7.843,32.085
|
||||
c-2.506,0.713-4.615,2.171-6.329,4.374c-0.919-15.736,17.797-29.625,2.353-43.594c0.668-1.992,1.64-3.814,2.913-5.468
|
||||
C472.084,197.393,475.054,201.593,476.288,206.097C478.007,212.37,475.054,201.593,476.288,206.097z M466.353,215.306
|
||||
c-3.676-3.315-4.778-7.336-3.307-12.063C466.723,206.559,467.826,210.58,466.353,215.306
|
||||
C464.448,213.404,467.025,212.698,466.353,215.306z M466.827,171.597c4.686,17.082-18.379,32.757-1.653,47.924
|
||||
c-0.842,1.894-1.711,3.774-2.606,5.643c-24.937-20.419,12.444-41.858-7.56-60.702c0.728-1.884,1.62-3.684,2.672-5.402
|
||||
C462.456,162.59,465.505,166.771,466.827,171.597C468.548,177.87,465.505,166.771,466.827,171.597z M456.895,180.806
|
||||
c-3.679-3.314-4.782-7.335-3.31-12.063C457.264,172.058,458.365,176.079,456.895,180.806
|
||||
C454.988,178.905,457.611,178.36,456.895,180.806z M453.244,158.979c-5.104,8.958-5.746,18.594,2.469,26.042
|
||||
c-0.842,1.894-1.71,3.774-2.605,5.643c-20.078-16.438-2.635-29.18-1.165-46.748c2.4-2.17,4.048-4.937,4.943-8.301
|
||||
C459.791,143.399,456.931,152.117,453.244,158.979C452.078,161.026,457.713,150.661,453.244,158.979z M449.556,123.937
|
||||
c0.376,0.371,0.72,0.747,1.04,1.128c-3.41-0.906-6.662-0.82-9.761,0.258c-1.469-0.643-3.154-1.198-5.082-1.652
|
||||
c-0.323-2.113-0.454-4.236-0.393-6.368C441.501,118.441,446.233,120.654,449.556,123.937
|
||||
C449.932,124.308,446.233,120.654,449.556,123.937z M410.09,92.338c23.104,3.926,17.816,21.903,23.235,38.054
|
||||
c-1.814,1.883-2.903,4.221-3.265,7.012c-8.625-13.164,0.569-34.512-19.759-38.874C409.885,96.471,409.813,94.406,410.09,92.338z
|
||||
M420.11,111.739c-4.843-1.031-7.81-3.962-8.898-8.791C416.055,103.978,419.021,106.909,420.11,111.739
|
||||
C417.511,111.045,419.388,109.144,420.11,111.739z M398.657,73.654c12.601,12.449,0.472,37.557,22.539,42.325
|
||||
c0.219,2.06,0.406,4.123,0.567,6.189c-31.808-5.207-10.162-42.472-36.91-48.78c-0.312-1.996-0.44-4-0.389-6.014
|
||||
C390.367,68.042,395.098,70.138,398.657,73.654C403.283,78.225,395.098,70.138,398.657,73.654z M394.662,86.598
|
||||
c-4.845-1.03-7.81-3.96-8.898-8.791C390.606,78.837,393.572,81.768,394.662,86.598C392.063,85.904,394.058,84.121,394.662,86.598z
|
||||
M380.583,69.523c0.059,10.311,4.327,18.975,15.165,21.314c0.218,2.061,0.405,4.124,0.566,6.19
|
||||
c-25.539-4.183-16.927-23.875-24.357-39.825c1.001-3.046,1.103-6.23,0.304-9.553C378.513,52.993,380.345,61.795,380.583,69.523
|
||||
C380.598,71.878,380.291,60.085,380.583,69.523z M359.958,40.857c0.595,0.155,1.15,0.344,1.688,0.548
|
||||
c-3.482,0.854-6.313,2.526-8.489,5.014c-1.608,0.179-3.361,0.544-5.28,1.123c-1.337-1.667-2.512-3.438-3.526-5.316
|
||||
C350.233,40.136,355.438,39.681,359.958,40.857C360.553,41.012,355.438,39.681,359.958,40.857z M325.339,31.844
|
||||
c11.964,3.115,15.404,15.274,23.74,22.676c-0.649,2.529-0.464,5.09,0.559,7.682c-13.919-7.169-16.654-30.061-36.38-23.674
|
||||
c-1.394-1.573-2.489-3.324-3.285-5.253C315.697,31.144,320.817,30.667,325.339,31.844
|
||||
C331.633,33.482,320.817,30.667,325.339,31.844z M328.363,45.047c-4.707,1.534-8.742,0.483-12.104-3.151
|
||||
C320.967,40.363,325.001,41.413,328.363,45.047C325.765,45.75,326.438,43.164,328.363,45.047z M290.719,22.83
|
||||
c17.138,4.462,19.223,32.273,40.709,25.344c1.22,1.674,2.416,3.366,3.59,5.074c-30.139,11.424-30.068-31.67-56.38-23.733
|
||||
c-1.269-1.571-2.385-3.241-3.349-5.01C280.731,22.125,285.877,21.569,290.719,22.83C297.013,24.469,285.877,21.569,290.719,22.83z
|
||||
M293.744,36.034c-4.709,1.534-8.743,0.483-12.105-3.152C286.347,31.348,290.382,32.399,293.744,36.034
|
||||
C291.145,36.736,291.981,34.193,293.744,36.034z M273.008,28.307c5.214,8.896,13.247,14.256,23.8,10.853
|
||||
c1.221,1.674,2.417,3.366,3.59,5.074c-24.087,9.131-26.61-12.031-40.905-22.183c-0.66-3.173-2.194-6.006-4.602-8.497
|
||||
C262.959,15.058,268.938,21.752,273.008,28.307C274.198,30.339,268.027,20.284,273.008,28.307z M240.949,13.903
|
||||
c0.496-0.135,0.981-0.244,1.459-0.33c-2.546,2.519-4.131,5.409-4.755,8.672c-1.25,0.935-2.529,2.084-3.842,3.477
|
||||
c-1.991-0.778-3.894-1.728-5.708-2.849C232.161,18.127,236.444,15.137,240.949,13.903
|
||||
C241.445,13.768,236.444,15.137,240.949,13.903z M206.447,23.354c11.878-3.254,20.93,5.487,31.794,7.798
|
||||
c0.716,2.533,2.184,4.666,4.405,6.398c-15.64,0.726-29.424-17.75-43.336-2.378c-1.992-0.669-3.814-1.641-5.467-2.915
|
||||
C197.741,27.556,201.941,24.588,206.447,23.354C212.721,21.636,201.941,24.588,206.447,23.354z M215.653,33.291
|
||||
c-3.315,3.677-7.336,4.778-12.063,3.304C206.905,32.918,210.926,31.817,215.653,33.291
|
||||
C213.751,35.195,213.045,32.618,215.653,33.291z M171.944,32.805c17.083-4.679,32.752,18.389,47.923,1.667
|
||||
c1.893,0.843,3.774,1.711,5.643,2.607c-20.427,24.93-41.857-12.457-60.704,7.544c-1.884-0.729-3.684-1.621-5.402-2.674
|
||||
C162.936,37.175,167.119,34.127,171.944,32.805C178.217,31.087,167.119,34.127,171.944,32.805z M181.151,42.742
|
||||
c-3.316,3.677-7.337,4.778-12.064,3.305C172.402,42.37,176.424,41.269,181.151,42.742
|
||||
C179.249,44.646,178.705,42.025,181.151,42.742z M137.442,42.256c17.163-4.701,32.897,18.228,47.923,1.667
|
||||
c1.893,0.843,3.773,1.712,5.642,2.607c-16.441,20.068-29.183,2.633-46.75,1.151c-2.174-2.4-4.945-4.046-8.312-4.939
|
||||
C136.421,42.565,136.917,42.4,137.442,42.256C143.714,40.538,136.917,42.4,137.442,42.256z M124.283,50.081
|
||||
c0.367-0.372,0.741-0.714,1.118-1.032c-0.9,3.408-0.81,6.66,0.269,9.758c-0.641,1.469-1.195,3.151-1.648,5.078
|
||||
c-2.113,0.324-4.235,0.454-6.367,0.393C118.791,58.138,121.002,53.405,124.283,50.081C124.65,49.708,121.002,53.405,124.283,50.081
|
||||
z M99.149,75.537c8.712-8.823,20.997-5.665,31.594-9.228c1.885,1.814,4.227,2.899,7.021,3.256
|
||||
c-13.161,8.638-34.518-0.557-38.875,19.776c-2.06,0.417-4.124,0.489-6.192,0.215C93.717,83.533,95.868,78.861,99.149,75.537
|
||||
C103.719,70.909,95.868,78.861,99.149,75.537z M112.095,79.529c-1.03,4.842-3.959,7.81-8.788,8.9
|
||||
C104.336,83.587,107.265,80.62,112.095,79.529C111.402,82.129,109.5,80.252,112.095,79.529z M74.016,100.994
|
||||
c12.444-12.604,37.558-0.482,42.318-22.553c2.06-0.218,4.124-0.407,6.189-0.569c-5.197,31.81-42.47,10.175-48.769,36.926
|
||||
c-1.995,0.312-4,0.442-6.014,0.39C68.407,109.287,70.501,104.554,74.016,100.994C78.586,96.365,70.501,104.554,74.016,100.994z
|
||||
M86.961,104.986c-1.03,4.843-3.959,7.81-8.789,8.901C79.202,109.044,82.131,106.077,86.961,104.986
|
||||
C86.268,107.586,84.485,105.589,86.961,104.986z M69.891,119.068c10.311-0.063,18.973-4.331,21.31-15.17
|
||||
c2.061-0.218,4.125-0.407,6.19-0.568c-4.175,25.553-23.882,16.925-39.83,24.375c-3.047-1.001-6.232-1.098-9.556-0.292
|
||||
C53.331,121.148,62.169,119.31,69.891,119.068C72.247,119.054,60.453,119.364,69.891,119.068z M41.238,139.707
|
||||
c0.154-0.591,0.342-1.143,0.544-1.676c0.857,3.476,2.529,6.301,5.015,8.475c0.177,1.61,0.543,3.365,1.122,5.284
|
||||
c-1.668,1.337-3.44,2.513-5.318,3.526C40.514,149.431,40.06,144.227,41.238,139.707C41.392,139.116,40.06,144.227,41.238,139.707z
|
||||
M32.213,174.323c3.121-11.968,15.288-15.404,22.692-23.743c2.531,0.647,5.092,0.458,7.684-0.567
|
||||
c-7.165,13.934-30.078,16.656-23.695,36.393c-1.574,1.394-3.325,2.488-5.253,3.285C31.511,183.964,31.035,178.842,32.213,174.323
|
||||
C33.854,168.029,31.035,178.842,32.213,174.323z M45.779,177.859c-0.295,1.131-1.468,2.979-3.516,5.546
|
||||
c-1.532-4.708-0.48-8.743,3.156-12.104C46.12,173.9,46.241,176.086,45.779,177.859C45.484,178.99,46.241,176.086,45.779,177.859z
|
||||
M23.189,208.939c4.469-17.138,32.279-19.21,25.356-40.7c1.675-1.22,3.366-2.416,5.075-3.589
|
||||
c11.415,30.142-31.679,30.059-23.75,56.372c-1.571,1.269-3.242,2.384-5.011,3.347C22.481,218.927,21.928,213.781,23.189,208.939
|
||||
C24.83,202.646,21.928,213.781,23.189,208.939z M36.754,212.476c-0.294,1.131-1.467,2.978-3.516,5.547
|
||||
c-1.532-4.708-0.48-8.743,3.156-12.104C37.095,208.517,37.217,210.702,36.754,212.476C36.46,213.607,37.217,210.702,36.754,212.476
|
||||
z M28.661,226.653c8.897-5.212,14.259-13.245,10.86-23.797c1.675-1.22,3.367-2.417,5.075-3.589
|
||||
c9.231,24.373-12.441,26.609-22.421,41.222c-3.119,0.672-5.898,2.211-8.336,4.617C15.189,236.904,22.042,230.759,28.661,226.653
|
||||
C30.694,225.462,20.637,231.63,28.661,226.653z M14.253,258.978c-0.165-0.604-0.28-1.189-0.371-1.768
|
||||
c2.457,2.531,5.282,4.112,8.476,4.745c0.971,1.351,2.201,2.737,3.712,4.162c-0.778,1.99-1.729,3.894-2.85,5.708
|
||||
C18.476,267.767,15.486,263.483,14.253,258.978C14.088,258.373,15.486,263.483,14.253,258.978z M23.699,293.481
|
||||
c-3.288-12.01,5.69-21.064,7.855-32.081c2.506-0.714,4.616-2.17,6.332-4.373c0.909,15.734-17.808,29.621-2.37,43.593
|
||||
c-0.669,1.993-1.641,3.816-2.916,5.468C27.899,302.188,24.933,297.987,23.699,293.481
|
||||
C21.981,287.208,24.933,297.987,23.699,293.481z M33.637,284.276c3.676,3.316,4.777,7.338,3.303,12.064
|
||||
C33.263,293.024,32.162,289.003,33.637,284.276C35.541,286.179,32.964,286.885,33.637,284.276z M33.146,327.986
|
||||
c-4.678-17.086,18.393-32.75,1.673-47.924c0.844-1.894,1.713-3.774,2.608-5.643c24.928,20.43-12.464,41.855,7.536,60.705
|
||||
c-0.729,1.883-1.621,3.684-2.674,5.4C37.514,336.993,34.466,332.812,33.146,327.986C31.428,321.712,34.466,332.812,33.146,327.986z
|
||||
M43.083,318.781c3.677,3.315,4.778,7.336,3.303,12.063C42.71,327.527,41.609,323.507,43.083,318.781
|
||||
C44.987,320.683,42.366,321.226,43.083,318.781z M46.724,340.609c5.109-8.957,5.753-18.591-2.458-26.043
|
||||
c0.843-1.894,1.712-3.773,2.608-5.642c20.069,16.442,2.625,29.184,1.144,46.751c-2.4,2.17-4.048,4.936-4.944,8.3
|
||||
C40.166,356.197,43.039,347.463,46.724,340.609C47.891,338.563,42.252,348.925,46.724,340.609z M50.401,375.655
|
||||
c-0.376-0.372-0.719-0.749-1.04-1.131c3.407,0.906,6.66,0.821,9.758-0.255c1.47,0.645,3.156,1.199,5.086,1.655
|
||||
c0.323,2.112,0.452,4.235,0.388,6.368C58.454,381.152,53.722,378.938,50.401,375.655C50.025,375.283,53.722,378.938,50.401,375.655
|
||||
z M89.855,407.268c-23.108-3.935-17.803-21.913-23.222-38.063c1.815-1.884,2.903-4.221,3.265-7.012
|
||||
c8.625,13.169-0.582,34.511,19.747,38.884C90.062,403.136,90.132,405.199,89.855,407.268z M79.841,387.864
|
||||
c4.842,1.032,7.807,3.963,8.895,8.793C83.894,395.625,80.929,392.693,79.841,387.864C82.441,388.56,80.563,390.458,79.841,387.864z
|
||||
M101.281,425.956c-12.594-12.452-0.458-37.56-22.524-42.332c-0.217-2.062-0.406-4.125-0.565-6.191
|
||||
c31.805,5.222,10.147,42.479,36.893,48.793c0.31,1.996,0.439,4,0.386,6.014C109.57,431.571,104.84,429.474,101.281,425.956
|
||||
C96.656,421.383,104.84,429.474,101.281,425.956z M105.282,413.014c4.842,1.033,7.807,3.963,8.896,8.794
|
||||
C109.334,420.774,106.369,417.844,105.282,413.014C107.882,413.709,105.883,415.49,105.282,413.014z M119.353,430.093
|
||||
c-0.054-10.311-4.32-18.975-15.156-21.319c-0.217-2.061-0.404-4.124-0.564-6.189c25.515,4.184,16.932,23.853,24.33,39.803
|
||||
c-1.005,3.049-1.111,6.236-0.318,9.562C121.411,446.604,119.589,437.809,119.353,430.093
|
||||
C119.341,427.738,119.643,439.53,119.353,430.093z M139.948,458.755c-0.585-0.152-1.133-0.337-1.662-0.539
|
||||
c3.486-0.856,6.319-2.532,8.5-5.023c1.599-0.179,3.341-0.543,5.245-1.116c1.337,1.667,2.513,3.442,3.525,5.319
|
||||
C149.671,459.48,144.467,459.936,139.948,458.755C139.362,458.603,144.467,459.936,139.948,458.755z M174.563,467.786
|
||||
c-11.95-3.12-15.399-15.26-23.71-22.673c0.65-2.53,0.465-5.093-0.557-7.688c13.9,7.186,16.631,30.059,36.352,23.682
|
||||
c1.392,1.575,2.486,3.327,3.282,5.255C184.203,468.489,179.083,468.965,174.563,467.786
|
||||
C168.268,466.144,179.083,468.965,174.563,467.786z M171.544,454.58c4.709-1.531,8.743-0.479,12.104,3.158
|
||||
C178.939,459.269,174.904,458.216,171.544,454.58C174.143,453.88,173.468,456.464,171.544,454.58z M209.178,476.816
|
||||
c-17.142-4.472-19.2-32.28-40.696-25.364c-1.219-1.675-2.415-3.367-3.588-5.074c30.143-11.413,30.053,31.684,56.367,23.76
|
||||
c1.268,1.571,2.384,3.242,3.347,5.012C219.164,477.525,214.019,478.08,209.178,476.816
|
||||
C202.884,475.175,214.019,478.08,209.178,476.816z M206.159,463.609c4.708-1.53,8.743-0.479,12.103,3.158
|
||||
C213.554,468.3,209.52,467.248,206.159,463.609C208.758,462.911,207.92,465.452,206.159,463.609z M226.892,471.348
|
||||
c-5.211-8.897-13.241-14.262-23.795-10.863c-1.22-1.676-2.416-3.367-3.588-5.077c24.323-9.204,26.604,12.368,41.154,22.384
|
||||
c0.67,3.134,2.209,5.926,4.618,8.374C237.1,484.773,230.995,477.965,226.892,471.348
|
||||
C225.701,469.315,231.868,479.372,226.892,471.348z M259.169,485.759c-0.585,0.161-1.153,0.273-1.714,0.363
|
||||
c2.534-2.47,4.116-5.308,4.749-8.517c1.33-0.966,2.695-2.179,4.097-3.668c1.99,0.777,3.896,1.726,5.711,2.846
|
||||
C267.956,481.53,263.674,484.522,259.169,485.759C258.584,485.92,263.674,484.522,259.169,485.759z M293.666,476.29
|
||||
c-11.976,3.288-21.042-5.629-32.024-7.825c-0.714-2.51-2.174-4.623-4.378-6.342c15.712-0.876,29.587,17.778,43.536,2.347
|
||||
c1.992,0.668,3.815,1.639,5.468,2.912C302.37,472.087,298.171,475.055,293.666,476.29
|
||||
C287.396,478.012,298.171,475.055,293.666,476.29z M284.455,466.358c3.316-3.678,7.336-4.781,12.063-3.31
|
||||
C293.204,466.728,289.184,467.829,284.455,466.358C286.357,464.454,287.064,467.03,284.455,466.358z M328.166,466.824
|
||||
c-17.081,4.688-32.761-18.375-47.925-1.646c-1.894-0.841-3.774-1.709-5.644-2.604c20.413-24.941,41.861,12.435,60.7-7.573
|
||||
c1.884,0.728,3.684,1.618,5.403,2.671C337.172,462.449,332.99,465.5,328.166,466.824C321.893,468.545,332.99,465.5,328.166,466.824
|
||||
z M318.954,456.891c3.315-3.679,7.335-4.781,12.063-3.31C327.702,457.259,323.683,458.363,318.954,456.891
|
||||
C320.855,454.986,321.4,457.606,318.954,456.891z M362.663,457.356c-17.159,4.709-32.908-18.214-47.925-1.645
|
||||
c-1.892-0.843-3.773-1.711-5.643-2.604c16.414-20.055,29.162-2.678,46.714-1.178c2.176,2.406,4.95,4.058,8.324,4.949
|
||||
C363.667,457.055,363.18,457.215,362.663,457.356C356.392,459.078,363.18,457.215,362.663,457.356z M375.795,449.539
|
||||
c-0.359,0.364-0.724,0.701-1.093,1.012c0.894-3.412,0.8-6.669-0.28-9.771c0.633-1.46,1.181-3.133,1.63-5.046
|
||||
c2.112-0.323,4.235-0.454,6.366-0.395C381.284,441.479,379.075,446.214,375.795,449.539
|
||||
C375.436,449.903,379.075,446.214,375.795,449.539z M400.92,424.072c-8.699,8.818-20.977,5.681-31.566,9.231
|
||||
c-1.887-1.818-4.23-2.904-7.03-3.258c13.161-8.625,34.502,0.55,38.853-19.778c2.06-0.418,4.123-0.491,6.191-0.217
|
||||
C406.348,416.075,404.2,420.747,400.92,424.072C396.352,428.702,404.2,420.747,400.92,424.072z M387.973,420.085
|
||||
c1.028-4.843,3.956-7.811,8.786-8.904C395.729,416.023,392.803,418.992,387.973,420.085
|
||||
C388.665,417.485,390.567,419.361,387.973,420.085z M426.045,398.606c-12.44,12.609-37.558,0.494-42.312,22.568
|
||||
c-2.061,0.218-4.124,0.407-6.189,0.57c5.187-31.81,42.471-10.19,48.755-36.943c1.995-0.313,4.001-0.443,6.015-0.393
|
||||
C431.65,390.312,429.557,395.044,426.045,398.606C421.476,403.236,429.557,395.044,426.045,398.606z M413.097,394.619
|
||||
c1.028-4.843,3.957-7.811,8.785-8.905C420.854,390.558,417.927,393.526,413.097,394.619
|
||||
C413.789,392.019,415.573,394.014,413.097,394.619z M430.162,380.53c-10.312,0.063-18.97,4.342-21.305,15.178
|
||||
c-2.061,0.218-4.122,0.408-6.188,0.57c4.166-25.546,23.874-16.94,39.82-24.391c3.048,0.999,6.233,1.095,9.557,0.288
|
||||
C446.725,378.444,437.881,380.287,430.162,380.53C427.808,380.545,439.601,380.231,430.162,380.53z M458.809,359.88
|
||||
c-0.152,0.592-0.34,1.146-0.544,1.68c-0.859-3.476-2.531-6.3-5.018-8.474c-0.177-1.609-0.544-3.365-1.123-5.285
|
||||
c1.667-1.337,3.439-2.514,5.315-3.527C459.529,350.157,459.986,355.36,458.809,359.88
|
||||
C458.656,360.472,459.986,355.36,458.809,359.88z M467.82,325.261c-3.115,11.969-15.282,15.411-22.684,23.752
|
||||
c-2.529-0.646-5.091-0.456-7.683,0.569c7.158-13.936,30.071-16.669,23.681-36.401c1.573-1.394,3.323-2.488,5.251-3.286
|
||||
C468.518,315.619,468.996,320.74,467.82,325.261C466.182,331.556,468.996,320.74,467.82,325.261z M454.253,321.729
|
||||
c0.294-1.132,1.466-2.979,3.514-5.548c1.533,4.707,0.482,8.741-3.151,12.104C453.914,325.688,453.791,323.504,454.253,321.729
|
||||
C454.547,320.598,453.791,323.504,454.253,321.729z M476.83,290.64c-4.463,17.141-32.27,19.222-25.341,40.71
|
||||
c-1.674,1.222-3.364,2.419-5.072,3.592c-11.429-30.137,31.667-30.07,23.727-56.382c1.572-1.268,3.242-2.384,5.011-3.349
|
||||
C477.533,280.652,478.091,285.798,476.83,290.64C475.19,296.936,478.091,285.798,476.83,290.64z M463.264,287.109
|
||||
c0.293-1.131,1.466-2.979,3.514-5.548c1.533,4.708,0.482,8.742-3.15,12.104C462.924,291.067,462.802,288.883,463.264,287.109
|
||||
C463.557,285.979,462.802,288.883,463.264,287.109z M471.352,272.93c-8.896,5.216-14.254,13.248-10.851,23.801
|
||||
c-1.675,1.22-3.367,2.416-5.074,3.591c-9.243-24.374,12.434-26.61,22.404-41.232c3.119-0.674,5.897-2.212,8.335-4.617
|
||||
C484.805,262.68,477.979,268.813,471.352,272.93C469.32,274.121,479.373,267.948,471.352,272.93z"/>
|
||||
</g>
|
||||
</g>
|
||||
<text x="320" y="336">PACKAGE_NAME</text>
|
||||
</svg>
|
After Width: | Height: | Size: 36 KiB |
@ -1027,9 +1027,9 @@ BOOST_AUTO_TEST_CASE(test_FormatSubVersion)
|
||||
std::vector<std::string> comments2;
|
||||
comments2.push_back(std::string("comment1"));
|
||||
comments2.push_back(SanitizeString(std::string("Comment2; .,_?@-; !\"#$%&'()*+/<=>[]\\^`{|}~"), SAFE_CHARS_UA_COMMENT)); // Semicolon is discouraged but not forbidden by BIP-0014
|
||||
BOOST_CHECK_EQUAL(FormatSubVersion("Test", 99900, std::vector<std::string>()),std::string("/Test:9.99.0/"));
|
||||
BOOST_CHECK_EQUAL(FormatSubVersion("Test", 99900, comments),std::string("/Test:9.99.0(comment1)/"));
|
||||
BOOST_CHECK_EQUAL(FormatSubVersion("Test", 99900, comments2),std::string("/Test:9.99.0(comment1; Comment2; .,_?@-; )/"));
|
||||
BOOST_CHECK_EQUAL(FormatSubVersion("Test", 99900, std::vector<std::string>(), true),std::string("/Test:9.99.0/"));
|
||||
BOOST_CHECK_EQUAL(FormatSubVersion("Test", 99900, comments, true),std::string("/Test:9.99.0(comment1)/"));
|
||||
BOOST_CHECK_EQUAL(FormatSubVersion("Test", 99900, comments2, true),std::string("/Test:9.99.0(comment1; Comment2; .,_?@-; )/"));
|
||||
}
|
||||
|
||||
BOOST_AUTO_TEST_CASE(test_ParseFixedPoint)
|
||||
|
@ -38,7 +38,7 @@ class IncludeConfTest(BitcoinTestFramework):
|
||||
self.log.info("-includeconf works from config file. subversion should end with 'main; relative)/'")
|
||||
|
||||
subversion = self.nodes[0].getnetworkinfo()["subversion"]
|
||||
assert subversion.endswith("main; relative)/")
|
||||
assert "main; relative)" in subversion
|
||||
|
||||
self.log.info("-includeconf cannot be used as command-line arg")
|
||||
self.stop_node(0)
|
||||
@ -57,7 +57,7 @@ class IncludeConfTest(BitcoinTestFramework):
|
||||
self.start_node(0)
|
||||
|
||||
subversion = self.nodes[0].getnetworkinfo()["subversion"]
|
||||
assert subversion.endswith("main; relative)/")
|
||||
assert "main; relative)" in subversion
|
||||
self.stop_node(0, expected_stderr="warning: -includeconf cannot be used from included files; ignoring -includeconf=relative2.conf")
|
||||
|
||||
self.log.info("-includeconf cannot contain invalid arg")
|
||||
@ -82,7 +82,7 @@ class IncludeConfTest(BitcoinTestFramework):
|
||||
self.start_node(0)
|
||||
|
||||
subversion = self.nodes[0].getnetworkinfo()["subversion"]
|
||||
assert subversion.endswith("main; relative; relative2)/")
|
||||
assert "main; relative; relative2)" in subversion
|
||||
|
||||
if __name__ == '__main__':
|
||||
IncludeConfTest().main()
|
||||
|
@ -18,12 +18,12 @@ class UacommentTest(BitcoinTestFramework):
|
||||
|
||||
def run_test(self):
|
||||
self.log.info("test multiple -uacomment")
|
||||
test_uacomment = self.nodes[0].getnetworkinfo()["subversion"][-12:-1]
|
||||
assert_equal(test_uacomment, "(testnode0)")
|
||||
test_uacomment = self.nodes[0].getnetworkinfo()["subversion"]
|
||||
assert "(testnode0)" in test_uacomment
|
||||
|
||||
self.restart_node(0, ["-uacomment=foo"])
|
||||
foo_uacomment = self.nodes[0].getnetworkinfo()["subversion"][-17:-1]
|
||||
assert_equal(foo_uacomment, "(testnode0; foo)")
|
||||
foo_uacomment = self.nodes[0].getnetworkinfo()["subversion"]
|
||||
assert "(testnode0; foo)" in foo_uacomment
|
||||
|
||||
self.log.info("test -uacomment max length")
|
||||
self.stop_node(0)
|
||||
|
Loading…
Reference in New Issue
Block a user