Skip to content

Commit

Permalink
Merge pull request #166 from cryptapus/myriadcoin.master.dev
Browse files Browse the repository at this point in the history
Myriadcoin 0.18.1
  • Loading branch information
cryptapus committed Aug 9, 2019
2 parents de3eab4 + bd9fcb9 commit accff60
Show file tree
Hide file tree
Showing 119 changed files with 23,006 additions and 1,083 deletions.
2 changes: 1 addition & 1 deletion .python-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.4.9
3.5.6
78 changes: 78 additions & 0 deletions build_msvc/libbitcoin_qt/libbitcoin_qt.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,12 @@
<None Include="..\..\src\qt\locale\bitcoin_bg_BG.ts">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\..\src\qt\locale\bitcoin_bn.ts">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\..\src\qt\locale\bitcoin_bs.ts">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\..\src\qt\locale\bitcoin_ca.ts">
<DeploymentContent>true</DeploymentContent>
</None>
Expand All @@ -88,6 +94,9 @@
<None Include="..\..\src\qt\locale\bitcoin_cs.ts">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\..\src\qt\locale\bitcoin_cs_CZ.ts">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\..\src\qt\locale\bitcoin_cy.ts">
<DeploymentContent>true</DeploymentContent>
</None>
Expand All @@ -97,6 +106,9 @@
<None Include="..\..\src\qt\locale\bitcoin_de.ts">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\..\src\qt\locale\bitcoin_de_DE.ts">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\..\src\qt\locale\bitcoin_el.ts">
<DeploymentContent>true</DeploymentContent>
</None>
Expand All @@ -106,6 +118,9 @@
<None Include="..\..\src\qt\locale\bitcoin_en.ts">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\..\src\qt\locale\bitcoin_en_AU.ts">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\..\src\qt\locale\bitcoin_en_GB.ts">
<DeploymentContent>true</DeploymentContent>
</None>
Expand All @@ -115,6 +130,9 @@
<None Include="..\..\src\qt\locale\bitcoin_es.ts">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\..\src\qt\locale\bitcoin_es_419.ts">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\..\src\qt\locale\bitcoin_es_AR.ts">
<DeploymentContent>true</DeploymentContent>
</None>
Expand Down Expand Up @@ -157,6 +175,9 @@
<None Include="..\..\src\qt\locale\bitcoin_fi.ts">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\..\src\qt\locale\bitcoin_fil.ts">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\..\src\qt\locale\bitcoin_fr.ts">
<DeploymentContent>true</DeploymentContent>
</None>
Expand All @@ -172,6 +193,12 @@
<None Include="..\..\src\qt\locale\bitcoin_he.ts">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\..\src\qt\locale\bitcoin_he_IL.ts">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\..\src\qt\locale\bitcoin_hi.ts">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\..\src\qt\locale\bitcoin_hi_IN.ts">
<DeploymentContent>true</DeploymentContent>
</None>
Expand All @@ -181,6 +208,9 @@
<None Include="..\..\src\qt\locale\bitcoin_hu.ts">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\..\src\qt\locale\bitcoin_hu_HU.ts">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\..\src\qt\locale\bitcoin_id.ts">
<DeploymentContent>true</DeploymentContent>
</None>
Expand All @@ -205,6 +235,9 @@
<None Include="..\..\src\qt\locale\bitcoin_kk_KZ.ts">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\..\src\qt\locale\bitcoin_km_KH.ts">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\..\src\qt\locale\bitcoin_ko.ts">
<DeploymentContent>true</DeploymentContent>
</None>
Expand Down Expand Up @@ -235,24 +268,48 @@
<None Include="..\..\src\qt\locale\bitcoin_mn.ts">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\..\src\qt\locale\bitcoin_mr_IN.ts">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\..\src\qt\locale\bitcoin_ms.ts">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\..\src\qt\locale\bitcoin_ms_MY.ts">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\..\src\qt\locale\bitcoin_my.ts">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\..\src\qt\locale\bitcoin_nb.ts">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\..\src\qt\locale\bitcoin_nb_NO.ts">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\..\src\qt\locale\bitcoin_ne.ts">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\..\src\qt\locale\bitcoin_nl.ts">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\..\src\qt\locale\bitcoin_nl_BE.ts">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\..\src\qt\locale\bitcoin_nl_NL.ts">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\..\src\qt\locale\bitcoin_pam.ts">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\..\src\qt\locale\bitcoin_pl.ts">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\..\src\qt\locale\bitcoin_pl_PL.ts">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\..\src\qt\locale\bitcoin_pt.ts">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\..\src\qt\locale\bitcoin_pt_BR.ts">
<DeploymentContent>true</DeploymentContent>
</None>
Expand All @@ -271,9 +328,15 @@
<None Include="..\..\src\qt\locale\bitcoin_ru_RU.ts">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\..\src\qt\locale\bitcoin_si.ts">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\..\src\qt\locale\bitcoin_sk.ts">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\..\src\qt\locale\bitcoin_sk_SK.ts">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\..\src\qt\locale\bitcoin_sl_SI.ts">
<DeploymentContent>true</DeploymentContent>
</None>
Expand All @@ -298,6 +361,15 @@
<None Include="..\..\src\qt\locale\bitcoin_ta.ts">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\..\src\qt\locale\bitcoin_ta_IN.ts">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\..\src\qt\locale\bitcoin_te.ts">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\..\src\qt\locale\bitcoin_th.ts">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\..\src\qt\locale\bitcoin_th_TH.ts">
<DeploymentContent>true</DeploymentContent>
</None>
Expand All @@ -310,6 +382,9 @@
<None Include="..\..\src\qt\locale\bitcoin_uk.ts">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\..\src\qt\locale\bitcoin_uk_UA.ts">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\..\src\qt\locale\bitcoin_ur_PK.ts">
<DeploymentContent>true</DeploymentContent>
</None>
Expand All @@ -322,6 +397,9 @@
<None Include="..\..\src\qt\locale\bitcoin_vi_VN.ts">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\..\src\qt\locale\bitcoin_zh-Hans.ts">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\..\src\qt\locale\bitcoin_zh.ts">
<DeploymentContent>true</DeploymentContent>
</None>
Expand Down
6 changes: 5 additions & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 0)
define(_CLIENT_VERSION_MINOR, 18)
define(_CLIENT_VERSION_REVISION, 0)
define(_CLIENT_VERSION_REVISION, 1)
define(_CLIENT_VERSION_BUILD, 0)
define(_CLIENT_VERSION_RC, 0)
define(_CLIENT_VERSION_IS_RELEASE, false)
Expand Down Expand Up @@ -725,6 +725,10 @@ if test x$TARGET_OS != xwindows; then
AX_CHECK_COMPILE_FLAG([-fPIC],[PIC_FLAGS="-fPIC"])
fi

# All versions of gcc that we commonly use for building are subject to bug
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90348. To work around that, set
# -fstack-reuse=none for all gcc builds. (Only gcc understands this flag)
AX_CHECK_COMPILE_FLAG([-fstack-reuse=none],[HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -fstack-reuse=none"])
if test x$use_hardening != xno; then
use_hardening=yes
AX_CHECK_COMPILE_FLAG([-Wstack-protector],[HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -Wstack-protector"])
Expand Down
2 changes: 1 addition & 1 deletion doc/dependencies.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ These are the dependencies currently used by Bitcoin Core. You can find instruct
| OpenSSL | [1.0.1k](https://www.openssl.org/source) | | Yes | | |
| PCRE | | | | | [Yes](https://github.com/bitcoin/bitcoin/blob/master/depends/packages/qt.mk#L66) |
| protobuf | [2.6.1](https://github.com/google/protobuf/releases) | | No | | |
| Python (tests) | | [3.4](https://www.python.org/downloads) | | | |
| Python (tests) | | [3.5](https://www.python.org/downloads) | | | |
| qrencode | [3.4.4](https://fukuchi.org/works/qrencode) | | No | | |
| Qt | [5.9.7](https://download.qt.io/official_releases/qt/) | [5.5.1](https://github.com/bitcoin/bitcoin/issues/13478) | No | | |
| XCB | | | | | [Yes](https://github.com/bitcoin/bitcoin/blob/master/depends/packages/qt.mk#L87) (Linux only) |
Expand Down
6 changes: 6 additions & 0 deletions doc/man/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,9 @@ endif
if BUILD_BITCOIN_TX
dist_man1_MANS+=bitcoin-tx.1
endif

if ENABLE_WALLET
if BUILD_BITCOIN_WALLET
dist_man1_MANS+=bitcoin-wallet.1
endif
endif
6 changes: 3 additions & 3 deletions doc/man/bitcoin-cli.1
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
.TH BITCOIN-CLI "1" "March 2019" "bitcoin-cli v0.18.0.0" "User Commands"
.TH BITCOIN-CLI "1" "August 2019" "bitcoin-cli v0.18.1.0" "User Commands"
.SH NAME
bitcoin-cli \- manual page for bitcoin-cli v0.18.0.0
bitcoin-cli \- manual page for bitcoin-cli v0.18.1.0
.SH SYNOPSIS
.B bitcoin-cli
[\fI\,options\/\fR] \fI\,<command> \/\fR[\fI\,params\/\fR] \fI\,Send command to Bitcoin Core\/\fR
Expand All @@ -15,7 +15,7 @@ bitcoin-cli \- manual page for bitcoin-cli v0.18.0.0
.B bitcoin-cli
[\fI\,options\/\fR] \fI\,help <command> Get help for a command\/\fR
.SH DESCRIPTION
Bitcoin Core RPC client version v0.18.0.0
Bitcoin Core RPC client version v0.18.1.0
.SH OPTIONS
.HP
\-?
Expand Down
20 changes: 12 additions & 8 deletions doc/man/bitcoin-qt.1
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
.TH BITCOIN-QT "1" "March 2019" "bitcoin-qt v0.18.0.0" "User Commands"
.TH BITCOIN-QT "1" "August 2019" "bitcoin-qt v0.18.1.0" "User Commands"
.SH NAME
bitcoin-qt \- manual page for bitcoin-qt v0.18.0.0
bitcoin-qt \- manual page for bitcoin-qt v0.18.1.0
.SH SYNOPSIS
.B bitcoin-qt
[\fI\,command-line options\/\fR]
.SH DESCRIPTION
Bitcoin Core version v0.18.0.0 (64\-bit)
Bitcoin Core version v0.18.1.0 (64\-bit)
.SH OPTIONS
.HP
\-?
Expand Down Expand Up @@ -41,6 +41,11 @@ Extra transactions to keep in memory for compact block reconstructions
.IP
Specify blocks directory (default: <datadir>/blocks)
.HP
\fB\-blocksonly\fR
.IP
Whether to reject transactions from network peers. Transactions from the
wallet or RPC are not affected. (default: 0)
.HP
\fB\-conf=\fR<file>
.IP
Specify configuration file. Relative paths will be prefixed by datadir
Expand Down Expand Up @@ -292,9 +297,7 @@ Bind to given address and whitelist peers connecting to it. Use
.IP
Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or
CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple
times. Whitelisted peers cannot be DoS banned and their
transactions are always relayed, even if they are already in the
mempool, useful e.g. for a gateway
times. Whitelisted peers cannot be DoS banned
.PP
Wallet options:
.HP
Expand Down Expand Up @@ -519,8 +522,9 @@ mining and transaction creation (default: 0.00001)
.HP
\fB\-whitelistforcerelay\fR
.IP
Force relay of transactions from whitelisted peers even if they violate
local relay policy (default: 0)
Force relay of transactions from whitelisted peers even if the
transactions were already in the mempool or violate local relay
policy (default: 0)
.HP
\fB\-whitelistrelay\fR
.IP
Expand Down
6 changes: 3 additions & 3 deletions doc/man/bitcoin-tx.1
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
.TH BITCOIN-TX "1" "March 2019" "bitcoin-tx v0.18.0.0" "User Commands"
.TH BITCOIN-TX "1" "August 2019" "bitcoin-tx v0.18.1.0" "User Commands"
.SH NAME
bitcoin-tx \- manual page for bitcoin-tx v0.18.0.0
bitcoin-tx \- manual page for bitcoin-tx v0.18.1.0
.SH SYNOPSIS
.B bitcoin-tx
[\fI\,options\/\fR] \fI\,<hex-tx> \/\fR[\fI\,commands\/\fR] \fI\,Update hex-encoded bitcoin transaction\/\fR
.br
.B bitcoin-tx
[\fI\,options\/\fR] \fI\,-create \/\fR[\fI\,commands\/\fR] \fI\,Create hex-encoded bitcoin transaction\/\fR
.SH DESCRIPTION
Bitcoin Core bitcoin\-tx utility version v0.18.0.0
Bitcoin Core bitcoin\-tx utility version v0.18.1.0
.SH OPTIONS
.HP
\-?
Expand Down
6 changes: 3 additions & 3 deletions doc/man/bitcoin-wallet.1
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
.TH BITCOIN-WALLET "1" "March 2019" "bitcoin-wallet v0.18.0.0" "User Commands"
.TH BITCOIN-WALLET "1" "August 2019" "bitcoin-wallet v0.18.1.0" "User Commands"
.SH NAME
bitcoin-wallet \- manual page for bitcoin-wallet v0.18.0.0
bitcoin-wallet \- manual page for bitcoin-wallet v0.18.1.0
.SH DESCRIPTION
Bitcoin Core bitcoin\-wallet version v0.18.0.0
Bitcoin Core bitcoin\-wallet version v0.18.1.0
.PP
wallet\-tool is an offline tool for creating and interacting with Bitcoin Core wallet files.
By default wallet\-tool will act on wallets in the default mainnet wallet directory in the datadir.
Expand Down
20 changes: 12 additions & 8 deletions doc/man/bitcoind.1
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
.TH BITCOIND "1" "March 2019" "bitcoind v0.18.0.0" "User Commands"
.TH BITCOIND "1" "August 2019" "bitcoind v0.18.1.0" "User Commands"
.SH NAME
bitcoind \- manual page for bitcoind v0.18.0.0
bitcoind \- manual page for bitcoind v0.18.1.0
.SH SYNOPSIS
.B bitcoind
[\fI\,options\/\fR] \fI\,Start Bitcoin Core Daemon\/\fR
.SH DESCRIPTION
Bitcoin Core Daemon version v0.18.0.0
Bitcoin Core Daemon version v0.18.1.0
.SH OPTIONS
.HP
\-?
Expand Down Expand Up @@ -41,6 +41,11 @@ Extra transactions to keep in memory for compact block reconstructions
.IP
Specify blocks directory (default: <datadir>/blocks)
.HP
\fB\-blocksonly\fR
.IP
Whether to reject transactions from network peers. Transactions from the
wallet or RPC are not affected. (default: 0)
.HP
\fB\-conf=\fR<file>
.IP
Specify configuration file. Relative paths will be prefixed by datadir
Expand Down Expand Up @@ -292,9 +297,7 @@ Bind to given address and whitelist peers connecting to it. Use
.IP
Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or
CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple
times. Whitelisted peers cannot be DoS banned and their
transactions are always relayed, even if they are already in the
mempool, useful e.g. for a gateway
times. Whitelisted peers cannot be DoS banned
.PP
Wallet options:
.HP
Expand Down Expand Up @@ -519,8 +522,9 @@ mining and transaction creation (default: 0.00001)
.HP
\fB\-whitelistforcerelay\fR
.IP
Force relay of transactions from whitelisted peers even if they violate
local relay policy (default: 0)
Force relay of transactions from whitelisted peers even if the
transactions were already in the mempool or violate local relay
policy (default: 0)
.HP
\fB\-whitelistrelay\fR
.IP
Expand Down
Loading

0 comments on commit accff60

Please sign in to comment.