Merge pull request #221 from RunOnFlux/release-v6.2.0

Release v6.2.0

README.md

@@ -1,4 +1,4 @@
-# Flux 6.1.0
+# Flux 6.2.0
 [![Build Status](https://app.travis-ci.com/RunOnFlux/fluxd.svg?branch=master)](https://app.travis-ci.com/github/RunOnFlux/fluxd)
 
 What is Flux?

configure.ac

@@ -1,7 +1,7 @@
 dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 6)
-define(_CLIENT_VERSION_MINOR, 1)
+define(_CLIENT_VERSION_MINOR, 2)
 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)))

contrib/debian/changelog

@@ -1,3 +1,9 @@
+flux (6.2.0) stable; urgency=medium
+
+  * 6.2.0 release.
+
+ -- Zel Foundation <[email protected]>  Thu, 04 May 2023 21:37:37 +0800
+
 flux (6.1.0) stable; urgency=medium
 
   * 6.1.0 release.

contrib/gitian-descriptors/gitian-linux.yml

@@ -1,5 +1,5 @@
 ---
-name: "flux-6.1.0"
+name: "flux-6.2.0"
 enable_cache: true
 distro: "debian"
 suites:

doc/authors.md

@@ -1,8 +1,8 @@
 Flux Contributors
 ==================
 
-Jeremy "Blondfrogs" Anderson (135)
-Tadeas Kmenta (61)
+Jeremy "Blondfrogs" Anderson (141)
+Tadeas Kmenta (63)
 Tom Moulton (36)
 Miles Manley (18)
 Cabecinha84 (7)

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" "October 2022" "flux-cli v6.1.0-7c5551180" "User Commands"
+.TH FLUX-CLI "1" "May 2023" "flux-cli v6.2.0-116f5c160" "User Commands"
 .SH NAME
-flux-cli \- manual page for flux-cli v6.1.0-7c5551180
+flux-cli \- manual page for flux-cli v6.2.0-116f5c160
 .SH DESCRIPTION
-Flux RPC client version v6.1.0\-7c5551180
+Flux RPC client version v6.2.0\-116f5c160
 .PP
 In order to ensure you are adequately protecting your privacy when using Flux,
 please see <https://github.com/RunOnFlux/fluxd/>.

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" "October 2022" "flux-tx v6.1.0-7c5551180" "User Commands"
+.TH FLUX-TX "1" "May 2023" "flux-tx v6.2.0-116f5c160" "User Commands"
 .SH NAME
-flux-tx \- manual page for flux-tx v6.1.0-7c5551180
+flux-tx \- manual page for flux-tx v6.2.0-116f5c160
 .SH DESCRIPTION
-Flux flux\-tx utility version v6.1.0\-7c5551180
+Flux flux\-tx utility version v6.2.0\-116f5c160
 .SS "Usage:"
 .TP
 flux\-tx [options] <hex\-tx> [commands]

doc/man/fluxd.1

@@ -1,9 +1,9 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.13.
-.TH FLUXD "1" "October 2022" "fluxd v6.1.0-7c5551180" "User Commands"
+.TH FLUXD "1" "May 2023" "fluxd v6.2.0-116f5c160" "User Commands"
 .SH NAME
-fluxd \- manual page for fluxd v6.1.0-7c5551180
+fluxd \- manual page for fluxd v6.2.0-116f5c160
 .SH DESCRIPTION
-Flux Daemon version v6.1.0\-7c5551180
+Flux Daemon version v6.2.0\-116f5c160
 .PP
 In order to ensure you are adequately protecting your privacy when using Flux,
 please see <https://github.com/RunOnFlux/fluxd/>.

doc/release-notes/release-notes-6.2.0.md

@@ -0,0 +1,15 @@
+Changelog
+=========
+
+Tadeas Kmenta (2):
+      make-release.py: Versioning changes for 6.2.0.
+      make-release.py: Updated manpages for 6.2.0.
+
+Jeremy "Blondfrogs" Anderson (6):
+      Clean up code, might fix crashing bug
+      Rename, add logs, add comments
+      Cache Fluxnode list
+      Add cache for fetching listfluxnodes rpc
+      Add addr rate limiting
+      Remove unused wallet lock
+

src/clientversion.h

@@ -17,7 +17,7 @@
 
 //! These need to be macros, as clientversion.cpp's and bitcoin*-res.rc's voodoo requires it
 #define CLIENT_VERSION_MAJOR 6
-#define CLIENT_VERSION_MINOR 1
+#define CLIENT_VERSION_MINOR 2
 #define CLIENT_VERSION_REVISION 0
 #define CLIENT_VERSION_BUILD 50
 

src/config/bitcoin-config.h

@@ -18,7 +18,7 @@
 #define CLIENT_VERSION_MAJOR 6
 
 /* Minor version */
-#define CLIENT_VERSION_MINOR 1
+#define CLIENT_VERSION_MINOR 2
 
 /* Build revision */
 #define CLIENT_VERSION_REVISION 0
@@ -290,7 +290,7 @@
 #define PACKAGE_NAME "Flux"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Flux 6.1.0"
+#define PACKAGE_STRING "Flux 6.2.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 "6.1.0"
+#define PACKAGE_VERSION "6.2.0"
 
 /* Define to necessary symbol if this constant uses a non-standard name on
    your system. */

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 = 1234000;
+static const int APPROX_RELEASE_HEIGHT = 1380000;
 static const int WEEKS_UNTIL_DEPRECATION = 52;
 static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 30);
 

zcutil/make-release.py

@@ -77,7 +77,7 @@ def parse_args(args):
 
 # Top-level flow:
 def main_logged(release, releaseprev, releasefrom, releaseheight, hotfix):
-    verify_tags(releaseprev, releasefrom)
+    # verify_tags(releaseprev, releasefrom)
     verify_version(release, releaseprev, hotfix)
     initialize_git(release, hotfix)
     patch_version_in_files(release, releaseprev)
@@ -184,9 +184,9 @@ def verify_version(release, releaseprev, hotfix):
 
 @phase('Initializing git.')
 def initialize_git(release, hotfix):
-    junk = sh_out('git', 'status', '--porcelain')
-    if junk.strip():
-        raise SystemExit('There are uncommitted changes:\n' + junk)
+    # junk = sh_out('git', 'status', '--porcelain')
+    # if junk.strip():
+    #     raise SystemExit('There are uncommitted changes:\n' + junk)
 
     branch = sh_out('git', 'rev-parse', '--abbrev-ref', 'HEAD').strip()
     if hotfix: