Merge pull request #230 from RunOnFlux/release-v7.0.0

Release v7.0.0
RunOnFlux · Nov 29, 2023 · 444a845 · 444a845
2 parents 465bebd + 15ca15f
commit 444a845
Show file tree

Hide file tree

Showing 12 changed files with 80 additions and 23 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Flux 6.2.0
+# Flux 7.0.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
@@ -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, 2)
+define(_CLIENT_VERSION_MAJOR, 7)
+define(_CLIENT_VERSION_MINOR, 0)
 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)))

diff --git a/contrib/debian/changelog b/contrib/debian/changelog
@@ -1,3 +1,9 @@
+flux (7.0.0) stable; urgency=medium
+
+  * 7.0.0 release.
+
+ -- Zel Foundation <info@zel.cash>  Wed, 29 Nov 2023 23:45:29 +0800
+
 flux (6.2.0) stable; urgency=medium
 
   * 6.2.0 release.

diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
@@ -1,5 +1,5 @@
 ---
-name: "flux-6.2.0"
+name: "flux-7.0.0"
 enable_cache: true
 distro: "debian"
 suites:

diff --git a/doc/authors.md b/doc/authors.md
@@ -1,9 +1,9 @@
 Flux Contributors
 ==================
 
-Jeremy "Blondfrogs" Anderson (141)
-Tadeas Kmenta (63)
-Tom Moulton (36)
+Jeremy "Blondfrogs" Anderson (175)
+Tadeas Kmenta (64)
+Tom Moulton (38)
 Miles Manley (18)
 Cabecinha84 (7)
 Jack Grigg (4)

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

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

diff --git 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" "May 2023" "fluxd v6.2.0-116f5c160" "User Commands"
+.TH FLUXD "1" "November 2023" "fluxd v7.0.0-488624ab4" "User Commands"
 .SH NAME
-fluxd \- manual page for fluxd v6.2.0-116f5c160
+fluxd \- manual page for fluxd v7.0.0-488624ab4
 .SH DESCRIPTION
-Flux Daemon version v6.2.0\-116f5c160
+Flux Daemon version v7.0.0\-488624ab4
 .PP
 In order to ensure you are adequately protecting your privacy when using Flux,
 please see <https://github.com/RunOnFlux/fluxd/>.

diff --git a/doc/release-notes/release-notes-7.0.0.md b/doc/release-notes/release-notes-7.0.0.md
@@ -0,0 +1,51 @@
+Changelog
+=========
+
+Tadeas Kmenta (3):
+      Update .travis.yml
+      make-release.py: Versioning changes for 7.0.0.
+      make-release.py: Updated manpages for 7.0.0.
+
+Tadeas Kmenta (1):
+      update download url
+
+Tom Moulton (2):
+      Revert "Revert "Patch boost thread_data for ubuntu 21.10 build""
+      Updated test code to use additional coins to test limits of MAX_MONEY all GTests now pass again 100%
+
+Jeremy "Blondfrogs" Anderson (34):
+      Start P2SH fluxnodes
+      Add support for new fluxnode tx format, create fork code
+      Add all core checks for P2SH nodes
+      Add Google Test for P2SH nodes
+      Tests, and fixes
+      Add better logging
+      Make comparison == instead of XOR
+      Build rpc calls for building, signing, sending p2shnode start transactions
+      Add descriptions to new rpc calls
+      Update timestamp to match block hash timestamp
+      Remove XOR
+      Rename 1
+      Rename 2
+      Rename 3
+      Remove collateralpubkey in p2sh start txes
+      Remove collateralpub req when p2sh, add additional checks
+      Add latest benchmark key
+      Set new testnet chainparams for 1 minute blocks
+      Add new testnet block into chainparams
+      upgrade.cpp
+      Update proto version, and testnet blockchain checks
+      Add rawtransaction json
+      Remove maptxheighttracker, add some logging
+      Remove DosHeights tracker map
+      Make a uint so we can use the 8th bit
+      Not change type, do bitmask check
+      Update timestamp for new publickey
+      Flux defaults to version 5 tx
+      Fix rpc bug, fix regtest
+      GTests now pass 100%
+      Update MAX_MONEY to correct value
+      Createconfirmationtransaction now gets fluxbench sign, and broadcasts
+      Final timestamp, blockheight for P2SH Fork
+      add back inital blockchain sync check
+
diff --git a/src/clientversion.h b/src/clientversion.h
@@ -16,8 +16,8 @@
  */
 
 //! 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 2
+#define CLIENT_VERSION_MAJOR 7
+#define CLIENT_VERSION_MINOR 0
 #define CLIENT_VERSION_REVISION 0
 #define CLIENT_VERSION_BUILD 50
 

diff --git a/src/config/bitcoin-config.h b/src/config/bitcoin-config.h
@@ -15,10 +15,10 @@
 #define CLIENT_VERSION_IS_RELEASE true
 
 /* Major version */
-#define CLIENT_VERSION_MAJOR 6
+#define CLIENT_VERSION_MAJOR 7
 
 /* Minor version */
-#define CLIENT_VERSION_MINOR 2
+#define CLIENT_VERSION_MINOR 0
 
 /* 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.2.0"
+#define PACKAGE_STRING "Flux 7.0.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.2.0"
+#define PACKAGE_VERSION "7.0.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
@@ -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 = 1380000;
+static const int APPROX_RELEASE_HEIGHT = 1525000;
 static const int WEEKS_UNTIL_DEPRECATION = 52;
 static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 30);