Skip to content

[pull] master from bitcoin:master #169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 3 commits into from
Jun 11, 2026
+17 −5
Merged

[pull] master from bitcoin:master #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b14d7c3
BIP-434: Add reference implementation, bump to 1.0.0, mark complete
ajtowns Jun 11, 2026
50eaa0d
process: Check for pre-1.0 versions in complete/deployed bips
ajtowns Jun 11, 2026
40cd7b4
Merge pull request #2197 from ajtowns/202606-434-complete
jonatack Jun 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.mediawiki
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1436,13 +1436,13 @@ users (see also: [https://en.bitcoin.it/wiki/Economic_majority economic majority
| Gregory Sanders
| Informational
| Draft
|-
|- style="background-color: #ffffcf"
| [[bip-0434.md|434]]
| Peer Services
| Peer Feature Negotiation
| Anthony Towns
| Specification
| Draft
| Complete
|-
| [[bip-0440.mediawiki|440]]
| Consensus (soft fork)
Expand Down
10 changes: 8 additions & 2 deletions bip-0434.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
Layer: Peer Services
Title: Peer Feature Negotiation
Authors: Anthony Towns <aj@erisian.com.au>
Status: Draft
Status: Complete
Type: Specification
Assigned: 2026-01-14
License: BSD-2-Clause
Discussion: 2025-12-19: https://gnusha.org/pi/bitcoindev/aUUXLgEUCgGb122o@erisian.com.au/T/#u
2020-08-21: https://gnusha.org/pi/bitcoindev/20200821023647.7eat4goqqrtaqnna@erisian.com.au/
Version: 0.1.0
Version: 1.0.0
```

## Abstract
Expand Down Expand Up @@ -286,6 +286,11 @@ that prefer to fully validate each message received:
* Sending unknown messages after `verack` is explicitly forbidden,
in so far as that is possible.

## Reference implementation

This feature was implemented in Bitcoin Core [PR#35221][PR#35221],
which may be used as a reference implementation.

## Backward compatibility

Clients specifying a version number prior to `70017` remain fully
Expand Down Expand Up @@ -327,6 +332,7 @@ advertised even to peers that do not support the features in question.
[PR#20564]: https://github.com/bitcoin/bitcoin/pull/20564
[PR#9720]: https://github.com/bitcoin/bitcoin/pull/9720
[PR#19723]: https://github.com/bitcoin/bitcoin/pull/19723
[PR#35221]: https://github.com/bitcoin/bitcoin/pull/35221
[btcd#1812]: https://github.com/btcsuite/btcd/pull/1812
[btcd#1661]: https://github.com/btcsuite/btcd/issues/1661
[permless-extensible]: https://github.com/bitcoin/bitcoin/pull/20564#issuecomment-738456560
Expand Down
8 changes: 7 additions & 1 deletion scripts/buildtable.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
}
}
my %found;
my ($title, $authors, $status, $type, $layer);
my ($title, $authors, $status, $version, $type, $layer);
my ($field, $val, @field_order, $continuation);
while (<$F>) {
last if ($is_markdown && m[^```$]);
Expand Down Expand Up @@ -208,6 +208,7 @@
$val =~ m/^(\S[^<@>]*\S) \<[^@>]*\@[\w.]+\.\w+\>$/ or die "Malformed $field line in $fn";
} elsif (exists $VersionField{$field}) {
$val =~ m/^(\d+\.\d+\.\d+)$/ or die "Malformed $field line in $fn";
$version = $val;
} elsif (not exists $MiscField{$field}) {
die "Unknown field $field in $fn";
}
Expand All @@ -228,6 +229,11 @@
if (defined $ValidStatus{$status}) {
print " style=\"" . $ValidStatus{$status} . "\"";
}
if (defined $version and $version =~ m/^0+[.]/) {
if ($status eq "Complete" or $status eq "Deployed") {
die "$fn marked as $status despite pre-1.0 version ($version)";
}
}
print "\n";
print "| [[${fn}|${bipnum}]]\n";
if ($include_layer) {
Expand Down
Loading