merge-script 2f2c9144ba Merge rust-bitcoin/rust-bitcoin#4526: feat(p2p): add AddrV2 <> IpAddr conversions ... 3c920d1acb fix(p2p): Remove `SocketAddr::V6` <> `AddrV2::Cjdns` conversions (Erick Cestari) 2c236ae24f fuzz: Add p2p address round-trip fuzzing test (Erick Cestari) 7ad89df392 test(p2p): add tests for `AddrV2` <> `IpAddr` conversions (Erick Cestari) e8a9a89e25 feat(p2p): add `AddrV2` <> `IpAddr` conversions (Erick Cestari) Pull request description: This PR adds conversion traits between `AddrV2` and standard IP types, inspired by #4519. ### Changelog - Implement `From<IpAddr>` for `AddrV2`. - Implement `From<Ipv4Addr>` for `AddrV2`. - Implement `From<Ipv6Addr>` for `AddrV2.` - Implement `TryFrom<AddrV2>` for `IpAddr`. - Implement `TryFrom<AddrV2>` for `Ipv4Addr`. - Implement `TryFrom<AddrV2>` for `Ipv6Addr`. - Implement `AddrV2ToIpAddrError` enum and it's `fmt::Display`. - Implement `AddrV2ToIpv4AddrError` enum and it's `fmt::Display`. - Implement `AddrV2ToIpv6AddrError` enum and it's `fmt::Display`. - Renamed `AddrV2ConversionError` to `AddrV2ToSocketAddrError` - Tests for `TryFrom` conversions. ACKs for top commit: apoelstra: ACK 3c920d1acb23d84976c0b8e632d8f1068ebbd1fd; successfully ran local tests tcharding: ACK 3c920d1acb Tree-SHA512: 6bc8007252ac78fba8dff5de59bbd4134f0dc1f801cdf23676b9b1ea256558cb7ddca81f932cccba7fc34e70d204184f0f9e5f18e4485bd922196fb5f78fd588		2025-05-23 14:56:21 +00:00
..
contrib	Remove rust-ordered dependency	2025-02-18 13:36:07 +11:00
embedded	chore: remove unused cortex-m dependency from embedded Cargo.toml files in bitcoin and hashes modules.	2025-04-05 18:25:41 +08:00
examples	Finalize the script hex APIs	2025-05-08 15:12:05 +10:00
src	Merge rust-bitcoin/rust-bitcoin#4526: feat(p2p): add AddrV2 <> IpAddr conversions	2025-05-23 14:56:21 +00:00
tests	Merge rust-bitcoin/rust-bitcoin#4410: Wrap secp256k1::XOnlyPublicKey to improve error handling	2025-05-07 17:01:31 +00:00
CHANGELOG.md	Fix broken changelog links	2025-05-05 12:19:13 +03:00
Cargo.toml	bitcoin: Add a script encoding example	2025-04-28 13:38:12 +10:00