add target for addrv2

Makefile

@@ -1,6 +1,6 @@
 CXX      =  clang++
 CC       =  clang
-SOURCES :=  targets/script.cpp targets/psbt.cpp targets/bech32.cpp targets/tx_des.cpp targets/miniscript_string.cpp targets/block_des.cpp targets/prefilledtransaction.cpp
+SOURCES :=  targets/addrv2.cpp targets/script.cpp targets/psbt.cpp targets/bech32.cpp targets/tx_des.cpp targets/miniscript_string.cpp targets/block_des.cpp targets/prefilledtransaction.cpp
 INCLUDES =  dependencies/ dependencies/bitcoin/src/ dependencies/bitcoin/src/secp256k1/include
 LIB_DIR  =  dependencies/bitcoin/src/ dependencies/bitcoin/src/.libs dependencies/bitcoin/src/secp256k1/.libs rust_bitcoin_lib/target/debug btcd_lib
 OBJS    :=  $(patsubst %.cpp, build/%.o, $(SOURCES))

btcd_lib/wrapper.go

@@ -2,11 +2,13 @@ package main
 
 import "C"
 import (
+	"bytes"
 	"unsafe"
 
 	"github.com/btcsuite/btcd/blockchain"
 	"github.com/btcsuite/btcd/btcutil"
 	"github.com/btcsuite/btcd/btcutil/bech32"
+	"github.com/btcsuite/btcd/wire"
 )
 
 //export go_btcd_des_block
@@ -50,6 +52,24 @@ func go_btcd_bech32(cinput *C.uchar, len C.int) *C.char {
 	return C.CString("")
 }
 
+//export go_btcd_addrv2
+func go_btcd_addrv2(cinput *C.uchar, datalen C.int, count *C.ulonglong) bool {
+	data := C.GoBytes(unsafe.Pointer(cinput), datalen)
+	r := bytes.NewReader(data)
+	m := &wire.MsgAddrV2{}
+	err := m.BtcDecode(r, 0, 0)
+
+	actual_count := 0
+	for i := 0; i < len(m.AddrList); i++ {
+		if m.AddrList[i].Addr != nil {
+			actual_count++
+		}
+	}
+	*count = C.ulonglong(actual_count)
+
+	return err == nil
+}
+
 func main() {
 
 }

fuzzer.cpp

@@ -13,6 +13,7 @@
 #include "targets/bech32.h"
 #include "targets/psbt.h"
 #include "targets/script.h"
+#include "targets/addrv2.h"
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
     FuzzedDataProvider provider(data, size);
@@ -34,6 +35,8 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         Psbt(provider);
     } else if (target == "script") {
         Script(provider);
+    } else if (target == "addrv2") {
+        Addrv2(provider);
     }
 
     return 0; // Values other than 0 and -1 are reserved for future use.

rust_bitcoin_lib/rust_bitcoin_lib.h

@@ -1,8 +1,9 @@
 #include <string>
 
 extern bool rust_miniscript_from_str(const char* miniscript_str);
-extern bool rust_bitcoin_script(const char* miniscript_str);
-extern char* rust_bitcoin_psbt(const char* miniscript_str);
+extern bool rust_bitcoin_script(const uint8_t *data, size_t len);
+extern char* rust_bitcoin_psbt(const uint8_t *data, size_t len);
 extern char* rust_miniscript_from_str_check_key(const char* miniscript_str);
 extern char* rust_bitcoin_des_block(const uint8_t *data, size_t len);
 extern char* rust_bitcoin_prefilledtransaction(const uint8_t *data, size_t len);
+extern bool rust_bitcoin_addrv2(uint8_t *data, size_t len, uint64_t *count);

rust_bitcoin_lib/src/lib.rs

@@ -118,6 +118,23 @@ pub unsafe extern "C" fn rust_bitcoin_script(data: *const u8, len: usize) -> boo
     }
 }
 
+#[no_mangle]
+pub unsafe extern "C" fn rust_bitcoin_addrv2(data: *const u8, len: usize, actual_count: *mut u64) -> bool {
+    // Safety: Ensure that the data pointer is valid for the given length
+    let data_slice = slice::from_raw_parts(data, len);
+
+    let addr: Result<(Vec<bitcoin::p2p::address::AddrV2Message>, usize), _> = encode::deserialize_partial(data_slice);
+    match addr {
+        Err(_) => {
+            false
+        },
+        Ok(vec_addr) => {
+            *actual_count = vec_addr.0.len() as u64;
+            return true
+        }
+    }
+}
+
 #[no_mangle]
 pub unsafe extern "C" fn rust_miniscript_from_str_check_key(input: *const c_char) -> *mut c_char {
     let Ok(desc) = c_str_to_str(input) else {

targets/addrv2.cpp

@@ -0,0 +1,49 @@
+#include <fuzzer/FuzzedDataProvider.h>
+#include <string>
+#include <iostream>
+#include <optional>
+#include <stdio.h>
+
+#include "addrv2.h"
+#include "bitcoin/src/protocol.h"
+#include "bitcoin/src/streams.h"
+
+extern "C" bool rust_bitcoin_addrv2(uint8_t *data, size_t len, uint64_t *count);
+extern "C" bool go_btcd_addrv2(uint8_t *data, size_t len, uint64_t *count);
+
+std::optional<uint64_t> Core(Span<const uint8_t> buffer) 
+{
+    std::vector<CAddress> addrs;
+    DataStream ds{buffer};
+    try {
+        ds >> CAddress::V2_NETWORK(addrs);
+        if (addrs.size() > 1000) return false;
+        for (auto& addr : addrs) if (!addr.IsValid()) return false;
+    } catch (const std::ios_base::failure&) {
+        return false;
+    }
+
+    return addrs.size();
+}
+
+void Addrv2(FuzzedDataProvider& provider)
+{
+    std::vector<uint8_t> buffer{provider.ConsumeRemainingBytes<uint8_t>()};
+    uint64_t count_rust = 0, count_btcd = 0;
+    bool rust_bitcoin{rust_bitcoin_addrv2(buffer.data(), buffer.size(), &count_rust)};
+    bool btcd{go_btcd_addrv2(buffer.data(), buffer.size(), &count_btcd)};
+    std::optional<uint64_t> core{Core(buffer)};
+
+    if (core.has_value() && *core > 0) {
+        assert(rust_bitcoin);
+        assert(btcd);
+        assert(*core == count_rust);
+        // btcd excludes i2p and cjdns
+        assert(*core >= count_btcd);
+    }
+
+    if (!core.has_value()) {
+        assert(!rust_bitcoin);
+        assert(!btcd);
+    }
+}

targets/addrv2.h

@@ -0,0 +1,7 @@
+#ifndef NET_ADDRESS_H
+#define NET_ADDRESS_H
+
+#include <fuzzer/FuzzedDataProvider.h>
+
+void Addrv2(FuzzedDataProvider& provider);
+#endif