Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/28.x' into 28.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
gruve-p committed Aug 31, 2024
2 parents 6e0ca81 + 88f0419 commit 46bad38
Show file tree
Hide file tree
Showing 38 changed files with 146 additions and 338 deletions.
8 changes: 4 additions & 4 deletions configure.ac
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
AC_PREREQ([2.69])
define(_CLIENT_VERSION_MAJOR, 27)
define(_CLIENT_VERSION_MINOR, 99)
define(_CLIENT_VERSION_MAJOR, 28)
define(_CLIENT_VERSION_MINOR, 0)
define(_CLIENT_VERSION_BUILD, 0)
define(_CLIENT_VERSION_RC, 0)
define(_CLIENT_VERSION_IS_RELEASE, false)
define(_CLIENT_VERSION_RC, 1)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2024)
define(_COPYRIGHT_HOLDERS,[The %s developers])
define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Groestlcoin Core]])
Expand Down
6 changes: 3 additions & 3 deletions contrib/seeds/makeseeds.py
Original file line number Diff line number Diff line change
Expand Up @@ -229,12 +229,12 @@ def main():
# Require service bit 1.
ips = [ip for ip in ips if (ip['service'] & 1) == 1]
print(f'{ip_stats(ips):s} Require service bit 1', file=sys.stderr)
# Require at least 50% 30-day uptime for clearnet, 10% for onion and i2p.
# Require at least 50% 30-day uptime for clearnet, onion and i2p; 10% for cjdns
req_uptime = {
'ipv4': 50,
'ipv6': 50,
'onion': 10,
'i2p' : 10,
'onion': 50,
'i2p': 50,
'cjdns': 10,
}
ips = [ip for ip in ips if ip['uptime'] > req_uptime[ip['net']]]
Expand Down
43 changes: 0 additions & 43 deletions contrib/seeds/nodes_main_manual.txt

This file was deleted.

2 changes: 2 additions & 0 deletions doc/bips.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ BIPs that are implemented by Groestlcoin Core:
[PR 21686](https://github.com/bitcoin/bitcoin/pull/21686)).
* [`BIP 350`](https://github.com/bitcoin/bips/blob/master/bip-0350.mediawiki): Addresses for native v1+ segregated Witness outputs use Bech32m instead of Bech32 as of **v22.0** ([PR 20861](https://github.com/bitcoin/bitcoin/pull/20861)).
* [`BIP 371`](https://github.com/bitcoin/bips/blob/master/bip-0371.mediawiki): Taproot fields for PSBT as of **v24.0** ([PR 22558](https://github.com/bitcoin/bitcoin/pull/22558)).
* [`BIP 379`](https://github.com/bitcoin/bips/blob/master/bip-0379.md): Miniscript was partially implemented in **v24.0** ([PR 24148](https://github.com/bitcoin/bitcoin/pull/24148)), and fully implemented as of **v26.0** ([PR 27255](https://github.com/bitcoin/bitcoin/pull/27255)).
* [`BIP 380`](https://github.com/bitcoin/bips/blob/master/bip-0380.mediawiki)
[`381`](https://github.com/bitcoin/bips/blob/master/bip-0381.mediawiki)
[`382`](https://github.com/bitcoin/bips/blob/master/bip-0382.mediawiki)
Expand All @@ -70,4 +71,5 @@ BIPs that are implemented by Groestlcoin Core:
[`385`](https://github.com/bitcoin/bips/blob/master/bip-0385.mediawiki):
Output Script Descriptors, and most of Script Expressions are implemented as of **v0.17.0** ([PR 13697](https://github.com/bitcoin/bitcoin/pull/13697)).
* [`BIP 386`](https://github.com/bitcoin/bips/blob/master/bip-0386.mediawiki): tr() Output Script Descriptors are implemented as of **v22.0** ([PR 22051](https://github.com/bitcoin/bitcoin/pull/22051)).
* [`BIP 387`](https://github.com/bitcoin/bips/blob/master/bip-0387.mediawiki): Tapscript Multisig Output Script Descriptors are implemented as of **v24.0** ([PR 24043](https://github.com/bitcoin/bitcoin/pull/24043)).
* [`BIP 431`](https://github.com/bitcoin/bips/blob/master/bip-0431.mediawiki): transactions with nVersion=3 are standard and treated as Topologically Restricted Until Confirmation as of **v28.0** ([PR 29496](https://github.com/bitcoin/bitcoin/pull/29496)).
10 changes: 9 additions & 1 deletion doc/man/groestlcoin-cli.1
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,12 @@
.SH NAME
groestlcoin-cli \- manual page for groestlcoin-cli

This is a placeholder file. Please follow the instructions in \fIcontrib/devtools/README.md\fR to generate the manual pages after a release.
Please contribute if you find Bitcoin Core useful. Visit
<https://bitcoincore.org/> for further information about the software.
The source code is available from <https://github.com/bitcoin/bitcoin>.

This is experimental software.
Distributed under the MIT software license, see the accompanying file COPYING
or <https://opensource.org/licenses/MIT>
.SH "SEE ALSO"
bitcoind(1), bitcoin-cli(1), bitcoin-tx(1), bitcoin-wallet(1), bitcoin-util(1), bitcoin-qt(1)
10 changes: 9 additions & 1 deletion doc/man/groestlcoin-qt.1
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,12 @@
.SH NAME
groestlcoin-qt \- manual page for groestlcoin-qt

This is a placeholder file. Please follow the instructions in \fIcontrib/devtools/README.md\fR to generate the manual pages after a release.
Please contribute if you find Bitcoin Core useful. Visit
<https://bitcoincore.org/> for further information about the software.
The source code is available from <https://github.com/bitcoin/bitcoin>.

This is experimental software.
Distributed under the MIT software license, see the accompanying file COPYING
or <https://opensource.org/licenses/MIT>
.SH "SEE ALSO"
bitcoind(1), bitcoin-cli(1), bitcoin-tx(1), bitcoin-wallet(1), bitcoin-util(1), bitcoin-qt(1)
10 changes: 9 additions & 1 deletion doc/man/groestlcoin-tx.1
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,12 @@
.SH NAME
groestlcoin-tx \- manual page for groestlcoin-tx

This is a placeholder file. Please follow the instructions in \fIcontrib/devtools/README.md\fR to generate the manual pages after a release.
Please contribute if you find Bitcoin Core useful. Visit
<https://bitcoincore.org/> for further information about the software.
The source code is available from <https://github.com/bitcoin/bitcoin>.

This is experimental software.
Distributed under the MIT software license, see the accompanying file COPYING
or <https://opensource.org/licenses/MIT>
.SH "SEE ALSO"
bitcoind(1), bitcoin-cli(1), bitcoin-tx(1), bitcoin-wallet(1), bitcoin-util(1), bitcoin-qt(1)
10 changes: 9 additions & 1 deletion doc/man/groestlcoind.1
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,12 @@
.SH NAME
groestlcoind \- manual page for groestlcoind

This is a placeholder file. Please follow the instructions in \fIcontrib/devtools/README.md\fR to generate the manual pages after a release.
Please contribute if you find Bitcoin Core useful. Visit
<https://bitcoincore.org/> for further information about the software.
The source code is available from <https://github.com/bitcoin/bitcoin>.

This is experimental software.
Distributed under the MIT software license, see the accompanying file COPYING
or <https://opensource.org/licenses/MIT>
.SH "SEE ALSO"
bitcoind(1), bitcoin-cli(1), bitcoin-tx(1), bitcoin-wallet(1), bitcoin-util(1), bitcoin-qt(1)
6 changes: 0 additions & 6 deletions doc/release-28984.md

This file was deleted.

21 changes: 0 additions & 21 deletions doc/release-notes-22729.md

This file was deleted.

6 changes: 0 additions & 6 deletions doc/release-notes-27101.md

This file was deleted.

2 changes: 0 additions & 2 deletions doc/release-notes-27114.md

This file was deleted.

8 changes: 0 additions & 8 deletions doc/release-notes-27307.md

This file was deleted.

6 changes: 0 additions & 6 deletions doc/release-notes-27375.md

This file was deleted.

2 changes: 0 additions & 2 deletions doc/release-notes-27679.md

This file was deleted.

6 changes: 0 additions & 6 deletions doc/release-notes-28052.md

This file was deleted.

5 changes: 0 additions & 5 deletions doc/release-notes-29091-29165.md

This file was deleted.

11 changes: 0 additions & 11 deletions doc/release-notes-29496.md

This file was deleted.

8 changes: 0 additions & 8 deletions doc/release-notes-29612.md

This file was deleted.

10 changes: 0 additions & 10 deletions doc/release-notes-29775.md

This file was deleted.

8 changes: 0 additions & 8 deletions doc/release-notes-29845.md

This file was deleted.

6 changes: 0 additions & 6 deletions doc/release-notes-29987.md

This file was deleted.

7 changes: 0 additions & 7 deletions doc/release-notes-30058.md

This file was deleted.

6 changes: 0 additions & 6 deletions doc/release-notes-30192.md

This file was deleted.

8 changes: 0 additions & 8 deletions doc/release-notes-30212.md

This file was deleted.

7 changes: 0 additions & 7 deletions doc/release-notes-30275.md

This file was deleted.

10 changes: 0 additions & 10 deletions doc/release-notes-30352.md

This file was deleted.

6 changes: 0 additions & 6 deletions doc/release-notes-30482.md

This file was deleted.

4 changes: 0 additions & 4 deletions doc/release-notes-30493.md

This file was deleted.

4 changes: 0 additions & 4 deletions doc/release-notes-30647.md

This file was deleted.

Loading

0 comments on commit 46bad38

Please sign in to comment.