Skip to content

Commit 1147e72

Browse files
committed
Merge bitcoin#30827: [28.x] Further backports and rc2
06a7df7 doc: Generate manpages (Ava Chow) 5315886 build: Bump to 28.0rc2 (Ava Chow) ff95cb3 streams: remove AutoFile::Get() entirely (Pieter Wuille) 8229e98 streams: cache file position within AutoFile (Pieter Wuille) 1b853fd qt: Translations update (Hennadii Stepanov) 674dded gui: fix crash when closing wallet (furszy) d39262e test: Wait for local services to update in feature_assumeutxo (Fabian Jahr) b329ed7 test: add coverage for assumeUTXO honest peers disconnection (furszy) c6b5db1 assumeUTXO: fix peers disconnection during sync (furszy) 598415b test: Work around boost compilation error (MarcoFalke) Pull request description: * bitcoin#30834 * bitcoin#30807 * bitcoin#30880 * bitcoin-core/gui#835 * bitcoin#30899 * bitcoin#30884 ACKs for top commit: stickies-v: ACK 06a7df7 hebasto: ACK 06a7df7, I've backported the listed PRs locally. The only merge conflict I faced was in bitcoin#30807. It was trivial to resolve. Tree-SHA512: 779d734b50fdce379a20865ba30c969def028963ba51da0f497ddf1b5375e1f6166365295f226c1a07bab8be0c1aa0a6a3296fc6acd9fcf17bcc4874aac980a6
2 parents fa46088 + 06a7df7 commit 1147e72

37 files changed

+817
-129
lines changed

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
22
define(_CLIENT_VERSION_MAJOR, 28)
33
define(_CLIENT_VERSION_MINOR, 0)
44
define(_CLIENT_VERSION_BUILD, 0)
5-
define(_CLIENT_VERSION_RC, 1)
5+
define(_CLIENT_VERSION_RC, 2)
66
define(_CLIENT_VERSION_IS_RELEASE, true)
77
define(_COPYRIGHT_YEAR, 2024)
88
define(_COPYRIGHT_HOLDERS,[The %s developers])

doc/man/bitcoin-cli.1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2-
.TH BITCOIN-CLI "1" "August 2024" "bitcoin-cli v28.0.0rc1" "User Commands"
2+
.TH BITCOIN-CLI "1" "September 2024" "bitcoin-cli v28.0.0rc2" "User Commands"
33
.SH NAME
4-
bitcoin-cli \- manual page for bitcoin-cli v28.0.0rc1
4+
bitcoin-cli \- manual page for bitcoin-cli v28.0.0rc2
55
.SH SYNOPSIS
66
.B bitcoin-cli
77
[\fI\,options\/\fR] \fI\,<command> \/\fR[\fI\,params\/\fR] \fI\,Send command to Bitcoin Core\/\fR
@@ -15,7 +15,7 @@ bitcoin-cli \- manual page for bitcoin-cli v28.0.0rc1
1515
.B bitcoin-cli
1616
[\fI\,options\/\fR] \fI\,help <command> Get help for a command\/\fR
1717
.SH DESCRIPTION
18-
Bitcoin Core RPC client version v28.0.0rc1
18+
Bitcoin Core RPC client version v28.0.0rc2
1919
.SH OPTIONS
2020
.HP
2121
\-?

doc/man/bitcoin-qt.1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2-
.TH BITCOIN-QT "1" "August 2024" "bitcoin-qt v28.0.0rc1" "User Commands"
2+
.TH BITCOIN-QT "1" "September 2024" "bitcoin-qt v28.0.0rc2" "User Commands"
33
.SH NAME
4-
bitcoin-qt \- manual page for bitcoin-qt v28.0.0rc1
4+
bitcoin-qt \- manual page for bitcoin-qt v28.0.0rc2
55
.SH SYNOPSIS
66
.B bitcoin-qt
77
[\fI\,command-line options\/\fR] [\fI\,URI\/\fR]
88
.SH DESCRIPTION
9-
Bitcoin Core version v28.0.0rc1
9+
Bitcoin Core version v28.0.0rc2
1010
.PP
1111
Optional URI is a Bitcoin address in BIP21 URI format.
1212
.SH OPTIONS

doc/man/bitcoin-tx.1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2-
.TH BITCOIN-TX "1" "August 2024" "bitcoin-tx v28.0.0rc1" "User Commands"
2+
.TH BITCOIN-TX "1" "September 2024" "bitcoin-tx v28.0.0rc2" "User Commands"
33
.SH NAME
4-
bitcoin-tx \- manual page for bitcoin-tx v28.0.0rc1
4+
bitcoin-tx \- manual page for bitcoin-tx v28.0.0rc2
55
.SH SYNOPSIS
66
.B bitcoin-tx
77
[\fI\,options\/\fR] \fI\,<hex-tx> \/\fR[\fI\,commands\/\fR] \fI\,Update hex-encoded bitcoin transaction\/\fR
88
.br
99
.B bitcoin-tx
1010
[\fI\,options\/\fR] \fI\,-create \/\fR[\fI\,commands\/\fR] \fI\,Create hex-encoded bitcoin transaction\/\fR
1111
.SH DESCRIPTION
12-
Bitcoin Core bitcoin\-tx utility version v28.0.0rc1
12+
Bitcoin Core bitcoin\-tx utility version v28.0.0rc2
1313
.SH OPTIONS
1414
.HP
1515
\-?

doc/man/bitcoin-util.1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2-
.TH BITCOIN-UTIL "1" "August 2024" "bitcoin-util v28.0.0rc1" "User Commands"
2+
.TH BITCOIN-UTIL "1" "September 2024" "bitcoin-util v28.0.0rc2" "User Commands"
33
.SH NAME
4-
bitcoin-util \- manual page for bitcoin-util v28.0.0rc1
4+
bitcoin-util \- manual page for bitcoin-util v28.0.0rc2
55
.SH SYNOPSIS
66
.B bitcoin-util
77
[\fI\,options\/\fR] [\fI\,commands\/\fR] \fI\,Do stuff\/\fR
88
.SH DESCRIPTION
9-
Bitcoin Core bitcoin\-util utility version v28.0.0rc1
9+
Bitcoin Core bitcoin\-util utility version v28.0.0rc2
1010
.SH OPTIONS
1111
.HP
1212
\-?

doc/man/bitcoin-wallet.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.49.3.
2-
.TH BITCOIN-WALLET "1" "August 2024" "bitcoin-wallet v28.0.0rc1" "User Commands"
2+
.TH BITCOIN-WALLET "1" "September 2024" "bitcoin-wallet v28.0.0rc2" "User Commands"
33
.SH NAME
4-
bitcoin-wallet \- manual page for bitcoin-wallet v28.0.0rc1
4+
bitcoin-wallet \- manual page for bitcoin-wallet v28.0.0rc2
55
.SH DESCRIPTION
6-
Bitcoin Core bitcoin\-wallet version v28.0.0rc1
6+
Bitcoin Core bitcoin\-wallet version v28.0.0rc2
77
.PP
88
bitcoin\-wallet is an offline tool for creating and interacting with Bitcoin Core wallet files.
99
By default bitcoin\-wallet will act on wallets in the default mainnet wallet directory in the datadir.

doc/man/bitcoind.1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2-
.TH BITCOIND "1" "August 2024" "bitcoind v28.0.0rc1" "User Commands"
2+
.TH BITCOIND "1" "September 2024" "bitcoind v28.0.0rc2" "User Commands"
33
.SH NAME
4-
bitcoind \- manual page for bitcoind v28.0.0rc1
4+
bitcoind \- manual page for bitcoind v28.0.0rc2
55
.SH SYNOPSIS
66
.B bitcoind
77
[\fI\,options\/\fR] \fI\,Start Bitcoin Core\/\fR
88
.SH DESCRIPTION
9-
Bitcoin Core version v28.0.0rc1
9+
Bitcoin Core version v28.0.0rc2
1010
.SH OPTIONS
1111
.HP
1212
\-?

src/addrdb.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ bool SerializeFileDB(const std::string& prefix, const fs::path& path, const Data
7373
remove(pathTmp);
7474
return false;
7575
}
76-
if (!FileCommit(fileout.Get())) {
76+
if (!fileout.Commit()) {
7777
fileout.fclose();
7878
remove(pathTmp);
7979
LogError("%s: Failed to flush file %s\n", __func__, fs::PathToString(pathTmp));

src/bench/streams_findbyte.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ static void FindByte(benchmark::Bench& bench)
1919
uint8_t data[file_size] = {0};
2020
data[file_size-1] = 1;
2121
file << data;
22-
std::rewind(file.Get());
22+
file.seek(0, SEEK_SET);
2323
BufferedFile bf{file, /*nBufSize=*/file_size + 1, /*nRewindIn=*/file_size};
2424

2525
bench.run([&] {

src/index/blockfilterindex.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ bool BlockFilterIndex::CustomCommit(CDBBatch& batch)
151151
LogError("%s: Failed to open filter file %d\n", __func__, pos.nFile);
152152
return false;
153153
}
154-
if (!FileCommit(file.Get())) {
154+
if (!file.Commit()) {
155155
LogError("%s: Failed to commit filter file %d\n", __func__, pos.nFile);
156156
return false;
157157
}
@@ -201,11 +201,11 @@ size_t BlockFilterIndex::WriteFilterToDisk(FlatFilePos& pos, const BlockFilter&
201201
LogPrintf("%s: Failed to open filter file %d\n", __func__, pos.nFile);
202202
return 0;
203203
}
204-
if (!TruncateFile(last_file.Get(), pos.nPos)) {
204+
if (!last_file.Truncate(pos.nPos)) {
205205
LogPrintf("%s: Failed to truncate filter file %d\n", __func__, pos.nFile);
206206
return 0;
207207
}
208-
if (!FileCommit(last_file.Get())) {
208+
if (!last_file.Commit()) {
209209
LogPrintf("%s: Failed to commit filter file %d\n", __func__, pos.nFile);
210210
return 0;
211211
}

0 commit comments

Comments
 (0)