diff --git a/README.md b/README.md index b49cc59de..9dbc7b225 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Flux 7.0.1 +# Flux 7.1.0 [![Build Status](https://app.travis-ci.com/RunOnFlux/fluxd.svg?branch=master)](https://app.travis-ci.com/github/RunOnFlux/fluxd) What is Flux? diff --git a/configure.ac b/configure.ac index 541f53f4b..59b508223 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N) AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 7) -define(_CLIENT_VERSION_MINOR, 0) -define(_CLIENT_VERSION_REVISION, 1) +define(_CLIENT_VERSION_MINOR, 1) +define(_CLIENT_VERSION_REVISION, 0) define(_CLIENT_VERSION_BUILD, 50) define(_ZC_BUILD_VAL, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, m4_incr(_CLIENT_VERSION_BUILD), m4_eval(_CLIENT_VERSION_BUILD < 50), 1, m4_eval(_CLIENT_VERSION_BUILD - 24), m4_eval(_CLIENT_VERSION_BUILD == 50), 1, , m4_eval(_CLIENT_VERSION_BUILD - 50))) define(_CLIENT_VERSION_SUFFIX, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, _CLIENT_VERSION_REVISION-beta$1, m4_eval(_CLIENT_VERSION_BUILD < 50), 1, _CLIENT_VERSION_REVISION-rc$1, m4_eval(_CLIENT_VERSION_BUILD == 50), 1, _CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION-$1))) diff --git a/contrib/debian/changelog b/contrib/debian/changelog index f71fe5776..479021056 100644 --- a/contrib/debian/changelog +++ b/contrib/debian/changelog @@ -1,3 +1,9 @@ +flux (7.1.0) stable; urgency=medium + + * 7.1.0 release. + + -- Zel Foundation Tue, 30 Jan 2024 22:44:15 +0800 + flux (7.0.1) stable; urgency=medium * 7.0.1 release. diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index ed31c0df2..b69caa490 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -1,5 +1,5 @@ --- -name: "flux-7.0.1" +name: "flux-7.1.0" enable_cache: true distro: "debian" suites: diff --git a/doc/authors.md b/doc/authors.md index f3128e4f8..3ed2b9579 100644 --- a/doc/authors.md +++ b/doc/authors.md @@ -1,8 +1,8 @@ Flux Contributors ================== -Jeremy "Blondfrogs" Anderson (176) -Tadeas Kmenta (66) +Jeremy "Blondfrogs" Anderson (178) +Tadeas Kmenta (67) Tom Moulton (38) Miles Manley (18) Cabecinha84 (7) diff --git a/doc/man/flux-cli.1 b/doc/man/flux-cli.1 index a6d9d90ac..ecca88844 100644 --- a/doc/man/flux-cli.1 +++ b/doc/man/flux-cli.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.13. -.TH FLUX-CLI "1" "December 2023" "flux-cli v7.0.1-fa7d74506" "User Commands" +.TH FLUX-CLI "1" "January 2024" "flux-cli v7.1.0-e4f62a6be" "User Commands" .SH NAME -flux-cli \- manual page for flux-cli v7.0.1-fa7d74506 +flux-cli \- manual page for flux-cli v7.1.0-e4f62a6be .SH DESCRIPTION -Flux RPC client version v7.0.1\-fa7d74506 +Flux RPC client version v7.1.0\-e4f62a6be .PP In order to ensure you are adequately protecting your privacy when using Flux, please see . diff --git a/doc/man/flux-tx.1 b/doc/man/flux-tx.1 index 1d4b11f8b..4a26edd88 100644 --- a/doc/man/flux-tx.1 +++ b/doc/man/flux-tx.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.13. -.TH FLUX-TX "1" "December 2023" "flux-tx v7.0.1-fa7d74506" "User Commands" +.TH FLUX-TX "1" "January 2024" "flux-tx v7.1.0-e4f62a6be" "User Commands" .SH NAME -flux-tx \- manual page for flux-tx v7.0.1-fa7d74506 +flux-tx \- manual page for flux-tx v7.1.0-e4f62a6be .SH DESCRIPTION -Flux flux\-tx utility version v7.0.1\-fa7d74506 +Flux flux\-tx utility version v7.1.0\-e4f62a6be .SS "Usage:" .TP flux\-tx [options] [commands] diff --git a/doc/man/fluxd.1 b/doc/man/fluxd.1 index 6578f85db..5059f4549 100644 --- a/doc/man/fluxd.1 +++ b/doc/man/fluxd.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.13. -.TH FLUXD "1" "December 2023" "fluxd v7.0.1-fa7d74506" "User Commands" +.TH FLUXD "1" "January 2024" "fluxd v7.1.0-e4f62a6be" "User Commands" .SH NAME -fluxd \- manual page for fluxd v7.0.1-fa7d74506 +fluxd \- manual page for fluxd v7.1.0-e4f62a6be .SH DESCRIPTION -Flux Daemon version v7.0.1\-fa7d74506 +Flux Daemon version v7.1.0\-e4f62a6be .PP In order to ensure you are adequately protecting your privacy when using Flux, please see . @@ -423,6 +423,16 @@ Send mined coins to a specific single address .IP Require that mined blocks use a coinbase address in the local wallet (default: 1) +.HP +\fB\-defaultchangeaddressmainnet\fR +.IP +Default Change address to be used when sendmany rpc call is used +(Mainnet Only) +.HP +\fB\-defaultchangeaddresstestnet\fR +.IP +Default Change address to be used when sendmany rpc call is used +(Testnet Only) .PP RPC server options: .HP diff --git a/doc/release-notes/release-notes-7.1.0.md b/doc/release-notes/release-notes-7.1.0.md new file mode 100644 index 000000000..ee7b4ad72 --- /dev/null +++ b/doc/release-notes/release-notes-7.1.0.md @@ -0,0 +1,15 @@ +Changelog +========= + +Tadeas Kmenta (3): + add on.tags: true + make-release.py: Versioning changes for 7.1.0. + make-release.py: Updated manpages for 7.1.0. + +Tadeas Kmenta (1): + read zelnode.conf file first + +Jeremy "Blondfrogs" Anderson (2): + Fix pathing logic + Add ability for users to set a default change address + diff --git a/src/clientversion.h b/src/clientversion.h index c8efc5f24..4139844ff 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -17,8 +17,8 @@ //! These need to be macros, as clientversion.cpp's and bitcoin*-res.rc's voodoo requires it #define CLIENT_VERSION_MAJOR 7 -#define CLIENT_VERSION_MINOR 0 -#define CLIENT_VERSION_REVISION 1 +#define CLIENT_VERSION_MINOR 1 +#define CLIENT_VERSION_REVISION 0 #define CLIENT_VERSION_BUILD 50 //! Set to true for release, false for prerelease or test build diff --git a/src/config/bitcoin-config.h b/src/config/bitcoin-config.h index ee61e455f..929a86ac3 100644 --- a/src/config/bitcoin-config.h +++ b/src/config/bitcoin-config.h @@ -18,10 +18,10 @@ #define CLIENT_VERSION_MAJOR 7 /* Minor version */ -#define CLIENT_VERSION_MINOR 0 +#define CLIENT_VERSION_MINOR 1 /* Build revision */ -#define CLIENT_VERSION_REVISION 1 +#define CLIENT_VERSION_REVISION 0 /* Version is release */ #define COPYRIGHT_YEAR 2022 @@ -290,7 +290,7 @@ #define PACKAGE_NAME "Flux" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "Flux 7.0.1" +#define PACKAGE_STRING "Flux 7.1.0" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "flux" @@ -299,7 +299,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "7.0.1" +#define PACKAGE_VERSION "7.1.0" /* Define to necessary symbol if this constant uses a non-standard name on your system. */ diff --git a/src/deprecation.h b/src/deprecation.h index 53bb78d73..39d7cb5bd 100644 --- a/src/deprecation.h +++ b/src/deprecation.h @@ -11,7 +11,7 @@ // * Shut down 52 weeks' worth of blocks after the estimated release block height. // * A warning is shown during the 2 weeks' worth of blocks prior to shut down. -static const int APPROX_RELEASE_HEIGHT = 1540000; +static const int APPROX_RELEASE_HEIGHT = 1570000; static const int WEEKS_UNTIL_DEPRECATION = 52; static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 30);