Skip to content

Commit 444a845

Browse files
TheTrunkTheTrunk
authored
Merge pull request #230 from RunOnFlux/release-v7.0.0
Release v7.0.0
2 parents 465bebd + 15ca15f commit 444a845

File tree

12 files changed

+80
-23
lines changed

12 files changed

+80
-23
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Flux 6.2.0
1+
# Flux 7.0.0
22
[![Build Status](https://app.travis-ci.com/RunOnFlux/fluxd.svg?branch=master)](https://app.travis-ci.com/github/RunOnFlux/fluxd)
33

44
What is Flux?

‎configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
22
AC_PREREQ([2.60])
3-
define(_CLIENT_VERSION_MAJOR, 6)
4-
define(_CLIENT_VERSION_MINOR, 2)
3+
define(_CLIENT_VERSION_MAJOR, 7)
4+
define(_CLIENT_VERSION_MINOR, 0)
55
define(_CLIENT_VERSION_REVISION, 0)
66
define(_CLIENT_VERSION_BUILD, 50)
77
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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
flux (7.0.0) stable; urgency=medium
2+
3+
* 7.0.0 release.
4+
5+
-- Zel Foundation <info@zel.cash> Wed, 29 Nov 2023 23:45:29 +0800
6+
17
flux (6.2.0) stable; urgency=medium
28

39
* 6.2.0 release.

‎contrib/gitian-descriptors/gitian-linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
name: "flux-6.2.0"
2+
name: "flux-7.0.0"
33
enable_cache: true
44
distro: "debian"
55
suites:

‎doc/authors.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
Flux Contributors
22
==================
33

4-
Jeremy "Blondfrogs" Anderson (141)
5-
Tadeas Kmenta (63)
6-
Tom Moulton (36)
4+
Jeremy "Blondfrogs" Anderson (175)
5+
Tadeas Kmenta (64)
6+
Tom Moulton (38)
77
Miles Manley (18)
88
Cabecinha84 (7)
99
Jack Grigg (4)

‎doc/man/flux-cli.1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.13.
2-
.TH FLUX-CLI "1" "May 2023" "flux-cli v6.2.0-116f5c160" "User Commands"
2+
.TH FLUX-CLI "1" "November 2023" "flux-cli v7.0.0-488624ab4" "User Commands"
33
.SH NAME
4-
flux-cli \- manual page for flux-cli v6.2.0-116f5c160
4+
flux-cli \- manual page for flux-cli v7.0.0-488624ab4
55
.SH DESCRIPTION
6-
Flux RPC client version v6.2.0\-116f5c160
6+
Flux RPC client version v7.0.0\-488624ab4
77
.PP
88
In order to ensure you are adequately protecting your privacy when using Flux,
99
please see <https://github.com/RunOnFlux/fluxd/>.

‎doc/man/flux-tx.1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.13.
2-
.TH FLUX-TX "1" "May 2023" "flux-tx v6.2.0-116f5c160" "User Commands"
2+
.TH FLUX-TX "1" "November 2023" "flux-tx v7.0.0-488624ab4" "User Commands"
33
.SH NAME
4-
flux-tx \- manual page for flux-tx v6.2.0-116f5c160
4+
flux-tx \- manual page for flux-tx v7.0.0-488624ab4
55
.SH DESCRIPTION
6-
Flux flux\-tx utility version v6.2.0\-116f5c160
6+
Flux flux\-tx utility version v7.0.0\-488624ab4
77
.SS "Usage:"
88
.TP
99
flux\-tx [options] <hex\-tx> [commands]

‎doc/man/fluxd.1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.13.
2-
.TH FLUXD "1" "May 2023" "fluxd v6.2.0-116f5c160" "User Commands"
2+
.TH FLUXD "1" "November 2023" "fluxd v7.0.0-488624ab4" "User Commands"
33
.SH NAME
4-
fluxd \- manual page for fluxd v6.2.0-116f5c160
4+
fluxd \- manual page for fluxd v7.0.0-488624ab4
55
.SH DESCRIPTION
6-
Flux Daemon version v6.2.0\-116f5c160
6+
Flux Daemon version v7.0.0\-488624ab4
77
.PP
88
In order to ensure you are adequately protecting your privacy when using Flux,
99
please see <https://github.com/RunOnFlux/fluxd/>.

‎doc/release-notes/release-notes-7.0.0.md

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
Changelog
2+
=========
3+
4+
Tadeas Kmenta (3):
5+
Update .travis.yml
6+
make-release.py: Versioning changes for 7.0.0.
7+
make-release.py: Updated manpages for 7.0.0.
8+
9+
Tadeas Kmenta (1):
10+
update download url
11+
12+
Tom Moulton (2):
13+
Revert "Revert "Patch boost thread_data for ubuntu 21.10 build""
14+
Updated test code to use additional coins to test limits of MAX_MONEY all GTests now pass again 100%
15+
16+
Jeremy "Blondfrogs" Anderson (34):
17+
Start P2SH fluxnodes
18+
Add support for new fluxnode tx format, create fork code
19+
Add all core checks for P2SH nodes
20+
Add Google Test for P2SH nodes
21+
Tests, and fixes
22+
Add better logging
23+
Make comparison == instead of XOR
24+
Build rpc calls for building, signing, sending p2shnode start transactions
25+
Add descriptions to new rpc calls
26+
Update timestamp to match block hash timestamp
27+
Remove XOR
28+
Rename 1
29+
Rename 2
30+
Rename 3
31+
Remove collateralpubkey in p2sh start txes
32+
Remove collateralpub req when p2sh, add additional checks
33+
Add latest benchmark key
34+
Set new testnet chainparams for 1 minute blocks
35+
Add new testnet block into chainparams
36+
upgrade.cpp
37+
Update proto version, and testnet blockchain checks
38+
Add rawtransaction json
39+
Remove maptxheighttracker, add some logging
40+
Remove DosHeights tracker map
41+
Make a uint so we can use the 8th bit
42+
Not change type, do bitmask check
43+
Update timestamp for new publickey
44+
Flux defaults to version 5 tx
45+
Fix rpc bug, fix regtest
46+
GTests now pass 100%
47+
Update MAX_MONEY to correct value
48+
Createconfirmationtransaction now gets fluxbench sign, and broadcasts
49+
Final timestamp, blockheight for P2SH Fork
50+
add back inital blockchain sync check
51+

‎src/clientversion.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
*/
1717

1818
//! These need to be macros, as clientversion.cpp's and bitcoin*-res.rc's voodoo requires it
19-
#define CLIENT_VERSION_MAJOR 6
20-
#define CLIENT_VERSION_MINOR 2
19+
#define CLIENT_VERSION_MAJOR 7
20+
#define CLIENT_VERSION_MINOR 0
2121
#define CLIENT_VERSION_REVISION 0
2222
#define CLIENT_VERSION_BUILD 50
2323

0 commit comments

Comments
 (0)