milksad
/
rust-bitcoin-unsafe-fast
14
0
Fork 0
Code Issues Pull Requests Activity

Merge rust-bitcoin/rust-bitcoin#4448: bitcoin: remove torv2 support 

53d32c9e4f bitcoin: remove torv2 support (Bruno Garcia)

Pull request description:

  This PR removes support to TorV2 since it's deprecated and no longer useful to have it.

ACKs for top commit:
  apoelstra:
    ACK 53d32c9e4f0ef0f3b2c7d4dcba42e3ac5344f78a; successfully ran local tests
  tcharding:
    ACK 53d32c9e4f

Tree-SHA512: 69a2ba399d5eac7f132519ab83362fbd8739d9e975795e441cefa75896ddbf4041db2125ffde51316f9ad69aa0b62c8b226ccff042b0dae6d3c615826bc339f4
This commit is contained in:
merge-script 2025-05-06 02:50:48 +00:00
parent 723cf91060 53d32c9e4f
commit 2d93c8e5d1
No known key found for this signature in database
GPG Key ID: C588D63CE41B97C1
1 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
bitcoin/src/p2p/address.rs
View File

@ -128,8 +128,6 @@ pub enum AddrV2 {
Ipv4(Ipv4Addr), Ipv4(Ipv4Addr),
/// IPV6 /// IPV6
Ipv6(Ipv6Addr), Ipv6(Ipv6Addr),
/// TORV2
TorV2([u8; 10]),
/// TORV3 /// TORV3
TorV3([u8; 32]), TorV3([u8; 32]),
/// I2P /// I2P
@ -152,7 +150,6 @@ impl Encodable for AddrV2 {
Ok(match *self { Ok(match *self {
AddrV2::Ipv4(ref addr) => encode_addr(w, 1, &addr.octets())?, AddrV2::Ipv4(ref addr) => encode_addr(w, 1, &addr.octets())?,
AddrV2::Ipv6(ref addr) => encode_addr(w, 2, &addr.octets())?, AddrV2::Ipv6(ref addr) => encode_addr(w, 2, &addr.octets())?,
AddrV2::TorV2(ref bytes) => encode_addr(w, 3, bytes)?,
AddrV2::TorV3(ref bytes) => encode_addr(w, 4, bytes)?, AddrV2::TorV3(ref bytes) => encode_addr(w, 4, bytes)?,
AddrV2::I2p(ref bytes) => encode_addr(w, 5, bytes)?, AddrV2::I2p(ref bytes) => encode_addr(w, 5, bytes)?,
AddrV2::Cjdns(ref addr) => encode_addr(w, 6, &addr.octets())?, AddrV2::Cjdns(ref addr) => encode_addr(w, 6, &addr.octets())?,
@ -195,13 +192,7 @@ impl Decodable for AddrV2 {
addr[0], addr[1], addr[2], addr[3], addr[4], addr[5], addr[6], addr[7], addr[0], addr[1], addr[2], addr[3], addr[4], addr[5], addr[6], addr[7],
)) ))
} }
3 => {
if len != 10 {
return Err(consensus::parse_failed_error("invalid TorV2 address"));
}
let id = Decodable::consensus_decode(r)?;
AddrV2::TorV2(id)
}
4 => { 4 => {
if len != 32 { if len != 32 {
return Err(consensus::parse_failed_error("invalid TorV3 address")); return Err(consensus::parse_failed_error("invalid TorV3 address"));
@ -399,9 +390,6 @@ mod test {
AddrV2::Ipv6("1a1b:2a2b:3a3b:4a4b:5a5b:6a6b:7a7b:8a8b".parse::<Ipv6Addr>().unwrap()); AddrV2::Ipv6("1a1b:2a2b:3a3b:4a4b:5a5b:6a6b:7a7b:8a8b".parse::<Ipv6Addr>().unwrap());
assert_eq!(serialize(&ip), hex!("02101a1b2a2b3a3b4a4b5a5b6a6b7a7b8a8b")); assert_eq!(serialize(&ip), hex!("02101a1b2a2b3a3b4a4b5a5b6a6b7a7b8a8b"));
let ip = AddrV2::TorV2(FromHex::from_hex("f1f2f3f4f5f6f7f8f9fa").unwrap());
assert_eq!(serialize(&ip), hex!("030af1f2f3f4f5f6f7f8f9fa"));
let ip = AddrV2::TorV3( let ip = AddrV2::TorV3(
FromHex::from_hex("53cd5648488c4707914182655b7664034e09e66f7e8cbf1084e654eb56c5bd88") FromHex::from_hex("53cd5648488c4707914182655b7664034e09e66f7e8cbf1084e654eb56c5bd88")
.unwrap(), .unwrap(),
@ -460,13 +448,6 @@ mod test {
// Invalid IPv6, contains embedded TORv2. // Invalid IPv6, contains embedded TORv2.
assert!(deserialize::<AddrV2>(&hex!("0210fd87d87eeb430102030405060708090a")).is_err()); assert!(deserialize::<AddrV2>(&hex!("0210fd87d87eeb430102030405060708090a")).is_err());
// Valid TORv2.
let ip: AddrV2 = deserialize(&hex!("030af1f2f3f4f5f6f7f8f9fa")).unwrap();
assert_eq!(ip, AddrV2::TorV2(FromHex::from_hex("f1f2f3f4f5f6f7f8f9fa").unwrap()));
// Invalid TORv2, with bogus length.
assert!(deserialize::<AddrV2>(&hex!("030700")).is_err());
// Valid TORv3. // Valid TORv3.
let ip: AddrV2 = deserialize(&hex!( let ip: AddrV2 = deserialize(&hex!(
"042079bcc625184b05194975c28b66b66b0469f7f6556fb1ac3189a79b40dda32f1f" "042079bcc625184b05194975c28b66b66b0469f7f6556fb1ac3189a79b40dda32f1f"