diff --git a/CHANGELOG.md b/CHANGELOG.md index 87f3384f738..096b4826311 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## 1.4.1 + +### Bug Fixes + +- [BESU-25](https://jira.hyperledger.org/browse/BESU-25) Use v5 Devp2p when pinging [\#392](https://github.com/hyperledger/besu/pull/392) + + ## 1.4.0 RC-1 ### Additions and Improvements diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PingPacketData.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PingPacketData.java index a3fba289a0f..214115e8a10 100644 --- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PingPacketData.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PingPacketData.java @@ -22,8 +22,8 @@ public class PingPacketData implements PacketData { - /* Fixed value that represents we're using v4 of the P2P discovery protocol. */ - private static final int VERSION = 4; + /* Fixed value that represents we're using v5 of the P2P discovery protocol. */ + private static final int VERSION = 5; /* Source. */ private final Endpoint from; diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryPacketPcapSedesTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryPacketPcapSedesTest.java index ba4366d01ef..29c0aae6946 100644 --- a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryPacketPcapSedesTest.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryPacketPcapSedesTest.java @@ -90,7 +90,8 @@ public void serializeDeserialize() { ping.getTo().getTcpPort().ifPresent(p -> assertThat(p).isPositive()); ping.getFrom().getTcpPort().ifPresent(p -> assertThat(p).isPositive()); assertThat(ping.getExpiration()).isPositive(); - break; + // because of the version upgrade the ping packet won't re-serialize, so we're done + return; case PONG: assertThat(packet.getPacketData(PongPacketData.class)).isPresent();