Skip to content

Commit eb83661

Browse files
jamesdorfmanjamesdorfman
authored
Merge pull request #1215 from psgreco/elements-22_1_1_rc1
elements-22.1.1-rc1
2 parents 5548997 + d45c79e commit eb83661

34 files changed

+582
-169
lines changed

‎.cirrus.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,8 @@ task:
202202

203203
task:
204204
name: 'macOS 11 native [gui] [no depends]'
205+
# Intel macos is not supported anymore by cirrus, and elements doesn't build for arm64 yet
206+
only_if: false
205207
brew_install_script:
206208
- brew install boost libevent berkeley-db4 qt@5 miniupnpc libnatpmp ccache zeromq qrencode sqlite libtool automake pkg-config gnu-getopt
207209
<< : *GLOBAL_TASK_TEMPLATE

‎configure.ac‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
AC_PREREQ([2.69])
22
define(_CLIENT_VERSION_MAJOR, 22)
33
define(_CLIENT_VERSION_MINOR, 1)
4-
define(_CLIENT_VERSION_BUILD, 0)
5-
define(_CLIENT_VERSION_RC, 0)
4+
define(_CLIENT_VERSION_BUILD, 1)
5+
define(_CLIENT_VERSION_RC, 1)
66
define(_CLIENT_VERSION_IS_RELEASE, true)
7-
define(_COPYRIGHT_YEAR, 2022)
7+
define(_COPYRIGHT_YEAR, 2023)
88
define(_COPYRIGHT_HOLDERS,[The %s developers])
99
define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Elements Project]])
1010
AC_INIT([Elements Core],m4_join([.], _CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MINOR, _CLIENT_VERSION_BUILD)m4_if(_CLIENT_VERSION_RC, [0], [], [rc]_CLIENT_VERSION_RC),[https://github.com/ElementsProject/elements/issues],[elements],[https://elementsproject.org/])

‎contrib/review-prs.py‎

Lines changed: 162 additions & 67 deletions
Large diffs are not rendered by default.

‎doc/man/elements-cli.1‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2.
2-
.TH ELEMENTS-CLI "1" "December 2022" "elements-cli v22.1.0" "User Commands"
1+
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2+
.TH ELEMENTS-CLI "1" "February 2023" "elements-cli v22.1.1" "User Commands"
33
.SH NAME
4-
elements-cli \- manual page for elements-cli v22.1.0
4+
elements-cli \- manual page for elements-cli v22.1.1
55
.SH SYNOPSIS
66
.B elements-cli
77
[\fI\,options\/\fR] \fI\,<command> \/\fR[\fI\,params\/\fR] \fI\,Send command to Elements Core\/\fR
@@ -15,7 +15,7 @@ elements-cli \- manual page for elements-cli v22.1.0
1515
.B elements-cli
1616
[\fI\,options\/\fR] \fI\,help <command> Get help for a command\/\fR
1717
.SH DESCRIPTION
18-
Elements Core RPC client version v22.1.0
18+
Elements Core RPC client version v22.1.1
1919
.SH OPTIONS
2020
.HP
2121
\-?

‎doc/man/elements-qt.1‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2.
2-
.TH ELEMENTS-QT "1" "December 2022" "elements-qt v22.1.0" "User Commands"
1+
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2+
.TH ELEMENTS-QT "1" "February 2023" "elements-qt v22.1.1" "User Commands"
33
.SH NAME
4-
elements-qt \- manual page for elements-qt v22.1.0
4+
elements-qt \- manual page for elements-qt v22.1.1
55
.SH SYNOPSIS
66
.B elements-qt
77
[\fI\,command-line options\/\fR]
88
.SH DESCRIPTION
9-
Elements Core version v22.1.0
9+
Elements Core version v22.1.1
1010
.SH OPTIONS
1111
.HP
1212
\-?
@@ -166,6 +166,13 @@ Execute command on startup.
166166
Create new files with system default permissions, instead of umask 077
167167
(only effective with disabled wallet functionality)
168168
.HP
169+
\fB\-trim_headers\fR
170+
.IP
171+
Trim old headers in memory (by default older than 2 epochs), removing
172+
blocksigning and dynafed\-related fields. Saves memory, but blocks
173+
us from serving blocks or headers to peers, and removes trimmed
174+
fields from some JSON RPC outputs. (default: false)
175+
.HP
169176
\fB\-txindex\fR
170177
.IP
171178
Maintain a full transaction index, used by the getrawtransaction rpc

‎doc/man/elements-tx.1‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2.
2-
.TH ELEMENTS-TX "1" "December 2022" "elements-tx v22.1.0" "User Commands"
1+
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2+
.TH ELEMENTS-TX "1" "February 2023" "elements-tx v22.1.1" "User Commands"
33
.SH NAME
4-
elements-tx \- manual page for elements-tx v22.1.0
4+
elements-tx \- manual page for elements-tx v22.1.1
55
.SH SYNOPSIS
66
.B elements-tx
77
[\fI\,options\/\fR] \fI\,<hex-tx> \/\fR[\fI\,commands\/\fR] \fI\,Update hex-encoded Elements transaction\/\fR
88
.br
99
.B elements-tx
1010
[\fI\,options\/\fR] \fI\,-create \/\fR[\fI\,commands\/\fR] \fI\,Create hex-encoded Elements transaction\/\fR
1111
.SH DESCRIPTION
12-
Elements Core elements\-tx utility version v22.1.0
12+
Elements Core elements\-tx utility version v22.1.1
1313
.SH OPTIONS
1414
.HP
1515
\-?

‎doc/man/elements-util.1‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2.
2-
.TH ELEMENTS-UTIL "1" "December 2022" "elements-util v22.1.0" "User Commands"
1+
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2+
.TH ELEMENTS-UTIL "1" "February 2023" "elements-util v22.1.1" "User Commands"
33
.SH NAME
4-
elements-util \- manual page for elements-util v22.1.0
4+
elements-util \- manual page for elements-util v22.1.1
55
.SH SYNOPSIS
66
.B elements-util
77
[\fI\,options\/\fR] [\fI\,commands\/\fR] \fI\,Do stuff\/\fR
88
.SH DESCRIPTION
9-
Elements Core elements\-util utility version v22.1.0
9+
Elements Core elements\-util utility version v22.1.1
1010
.SH OPTIONS
1111
.HP
1212
\-?

‎doc/man/elements-wallet.1‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2.
2-
.TH ELEMENTS-WALLET "1" "December 2022" "elements-wallet v22.1.0" "User Commands"
1+
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2+
.TH ELEMENTS-WALLET "1" "February 2023" "elements-wallet v22.1.1" "User Commands"
33
.SH NAME
4-
elements-wallet \- manual page for elements-wallet v22.1.0
4+
elements-wallet \- manual page for elements-wallet v22.1.1
55
.SH DESCRIPTION
6-
Elements Core elements\-wallet version v22.1.0
6+
Elements Core elements\-wallet version v22.1.1
77
.PP
88
elements\-wallet is an offline tool for creating and interacting with Elements Core wallet files.
99
By default elements\-wallet will act on wallets in the default mainnet wallet directory in the datadir.

‎doc/man/elementsd.1‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2.
2-
.TH ELEMENTSD "1" "December 2022" "elementsd v22.1.0" "User Commands"
1+
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2+
.TH ELEMENTSD "1" "February 2023" "elementsd v22.1.1" "User Commands"
33
.SH NAME
4-
elementsd \- manual page for elementsd v22.1.0
4+
elementsd \- manual page for elementsd v22.1.1
55
.SH SYNOPSIS
66
.B elementsd
77
[\fI\,options\/\fR] \fI\,Start Elements Core\/\fR
88
.SH DESCRIPTION
9-
Elements Core version v22.1.0
9+
Elements Core version v22.1.1
1010
Copyright \(co 2009\-2022 The Elements Project developers
1111
Copyright \(co 2009\-2022 The Bitcoin Core developers
1212
.PP
@@ -177,6 +177,13 @@ Execute command on startup.
177177
Create new files with system default permissions, instead of umask 077
178178
(only effective with disabled wallet functionality)
179179
.HP
180+
\fB\-trim_headers\fR
181+
.IP
182+
Trim old headers in memory (by default older than 2 epochs), removing
183+
blocksigning and dynafed\-related fields. Saves memory, but blocks
184+
us from serving blocks or headers to peers, and removes trimmed
185+
fields from some JSON RPC outputs. (default: false)
186+
.HP
180187
\fB\-txindex\fR
181188
.IP
182189
Maintain a full transaction index, used by the getrawtransaction rpc

‎src/block_proof.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
bool CheckChallenge(const CBlockHeader& block, const CBlockIndex& indexLast, const Consensus::Params& params)
1414
{
1515
if (g_signed_blocks) {
16-
return block.proof.challenge == indexLast.proof.challenge;
16+
return block.proof.challenge == indexLast.get_proof().challenge;
1717
} else {
1818
return block.nBits == GetNextWorkRequired(&indexLast, &block, params);
1919
}

0 commit comments

Comments
 (0)