[0.28] Backport d0cb5167

[DashCoreAutoGuix]

Cherry-pick d0cb516 to 0.28

[DashCoreAutoGuix]

@coderabbitai

[coderabbitai]

Tip

For best results, initiate chat on the files or code changes.

🧩 Analysis chain

I'll help you with this PR, but I need to gather some context first to understand what we're working with.

---

🏁 Script executed:

#!/bin/bash
# Fetch PR details using GitHub CLI
gh pr view 9 --json title,body,additions,deletions,changedFiles,baseRefName,headRefName,state

# List files changed in this PR
git diff --name-status HEAD~1 HEAD

# Check for README or other documentation in the repo
ls -la
cat README.md || echo "README.md not found"

Length of output: 6921

---

I need to gather some more information about this PR to provide proper assistance.

---

🏁 Script executed:

#!/bin/bash
# Check current branch and commit
git branch -v
git log -1 --pretty=format:"%h %s %an %ad" --date=short

# List recent commits
git log --pretty=format:"%h %s %an %ad" --date=short -n 5

# Look for any recent changes
find . -type f -not -path "*/\.git*" -mtime -7 | grep -v "node_modules" | head -n 20

# Check if there are any local branches that might be related to PR #9
git branch -a | grep -i "pr" || echo "No PR-related branches found"

# Try to get a better understanding of the codebase structure
ls -la src/

Length of output: 15799

---

@DashCoreAutoGuix I see we're working with PR #9 that integrates Bitcoin PR bitcoin#30230, which adds an I2P fuzzing harness to the codebase. Let me gather more specific details about the changes.

---

🏁 Script executed:

#!/bin/bash
# Get information about the I2P related files
echo "Looking at existing I2P implementation files:"
find . -name "*i2p*" -type f | grep -v test

echo -e "\nLooking at fuzzing directory to find the new I2P harness:"
find . -path "*/test/fuzz*" -type d

echo -e "\nExamining the commit that was merged:"
git show --name-status af8531960

echo -e "\nChecking for files modified in this branch compared to develop:"
git diff --name-status develop

Length of output: 74335

---

@DashCoreAutoGuix I see we're working with PR #9 that integrates Bitcoin PR bitcoin#30230, which adds an I2P (Invisible Internet Project) fuzzing harness to the codebase. Let me check the specific changes in this PR to provide better assistance.

---

🏁 Script executed:

#!/bin/bash
# Look for the new I2P fuzzing harness files
find ./src/test/fuzz -name "*i2p*" -type f

# Check the git log for more context about the specific changes
git log --stat -1 

Length of output: 68

---

@DashCoreAutoGuix I've found that PR #9 adds a new I2P fuzzing harness file at ./src/test/fuzz/i2p.cpp. Let me examine this file and the related I2P implementation to provide more details.

---

🏁 Script executed:

#!/bin/bash
# Examine the new I2P fuzzing harness file
cat ./src/test/fuzz/i2p.cpp

# Let's also look at the existing I2P implementation files for context
echo -e "\n\n=== I2P IMPLEMENTATION ===\n"
head -n 20 ./src/i2p.h

# Check if there are any additional test files that might be related
echo -e "\n\n=== RELATED TEST FILES ===\n"
find ./src/test -name "*sock*" -type f | grep -v obj

Length of output: 2688

---

@DashCoreAutoGuix I can provide details about PR #9 which integrates Bitcoin PR bitcoin#30230. This PR adds a new I2P fuzzing harness in src/test/fuzz/i2p.cpp.

The I2P fuzzing harness improves the testing of the I2P implementation by:

1. Setting mock time at the beginning of each iteration to make the tests more stable (since GetTime is called at various points in the I2P code)
2. Deleting the private key file at the end of each iteration, ensuring that each test run is independent by generating a new key each time
3. Utilizing a FuzzedSock implementation to simulate network conditions for I2P sessions

The fuzzer tests critical I2P functionality:

• Session creation with a private key
• Listening for incoming connections
• Accepting connections
• Handling connection data
• Initiating outbound connections

This addition makes the codebase more robust by helping to detect potential issues in the I2P implementation, which is an important privacy-enhancing feature for network communication.

Would you like more details about any specific aspect of this PR?

[DashCoreAutoGuix]

@coderabbitai

Can you provide why this PR doesn't build, and provide a patch to fix it?

[coderabbitai]

Tip

For best results, initiate chat on the files or code changes.

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
# Check if there are any build logs available
find . -name "*.log" | grep -i build || echo "No build logs found"

# Look at the i2p fuzzing code that was added
cat ./src/test/fuzz/i2p.cpp

# Check compile_commands.json if available for build configuration
find . -name "compile_commands.json" || echo "No compile_commands.json found"

# Let's also check if there are any CI logs or output
find . -name "*ci*" -type f | grep -i log || echo "No CI logs found"

# Compare with nearby fuzzing test files to see patterns
find ./src/test/fuzz -type f -name "*.cpp" | grep -v i2p | head -n 3

Length of output: 2287

---

🏁 Script executed:

#!/bin/bash
# First, check if the i2p.h header exists
cat ./src/i2p.h || echo "i2p.h not found"

# Examine the test/fuzz/util/net.h which might contain FuzzedSock definition
cat ./src/test/fuzz/util/net.h || echo "net.h not found"

# Check if there are any build files or makefiles that might give clues
ls -la ./src/Makefile* || echo "No Makefiles found in src/"

# Look at one of the other fuzzing tests to compare
cat ./src/test/fuzz/asmap.cpp | head -n 20

# Let's try to compile the i2p.cpp file and see what errors we get
g++ -c ./src/test/fuzz/i2p.cpp -I./src -o /tmp/i2p.o 2>&1 || echo "Compilation failed"

Length of output: 12667

---

🏁 Script executed:

#!/bin/bash
# Let's check if there's a FuzzedSock class definition in the codebase
find ./src -type f -name "*.h" -o -name "*.cpp" | xargs grep -l "class FuzzedSock" || echo "FuzzedSock class not found"

# Check the test_fuzz Makefile to see how fuzzing tests are built
cat ./src/Makefile.test_fuzz.include

# Check if there's any documentation about setting up fuzzing tests
find ./doc -name "*fuzz*" -type f || echo "No fuzzing documentation found"

# Let's check if there are any other files in the test/fuzz/util directory
ls -la ./src/test/fuzz/util/

# Examine the build system for Bitcoin Core in the PR
cat ./configure.ac | grep -A 10 "fuzz" || echo "No fuzzing configuration found in configure.ac"

Length of output: 5694

---

🏁 Script executed:

#!/bin/bash
# Let's check the FuzzedSock class definition in util.h
cat ./src/test/fuzz/util.h | grep -A 30 "class FuzzedSock"

# Let's also check the fuzzing documentation
cat ./doc/fuzzing.md

# Check if i2p.cpp is mentioned in any build files
find ./src -name "Makefile*" | xargs grep -l "i2p.cpp" || echo "i2p.cpp not mentioned in any Makefile"

# Let's look at common structure of other fuzz test files
ls -la ./src/test/fuzz/*.cpp | head -n 5

Length of output: 24057

---

🏁 Script executed:

#!/bin/bash
# Check the Makefiles to see what might be missing
cat ./src/Makefile.am | grep -A 10 "i2p.cpp" || echo "i2p.cpp not found in Makefile.am"

# Check the net.cpp util code that should handle FuzzedSock
cat ./src/test/fuzz/util.cpp | grep -A 5 -B 5 "FuzzedSock" || echo "FuzzedSock not found in util.cpp"

# Check the ConsumeTime function since it's used in the i2p.cpp file
find ./src -type f -name "*.h" -o -name "*.cpp" | xargs grep -l "ConsumeTime" | head -n 5

# Let's check the implementation of the ConsumeTime function
cat ./src/test/fuzz/util.h | grep -A 10 "ConsumeTime" || echo "ConsumeTime not found in util.h"

Length of output: 6142

---

@DashCoreAutoGuix I've identified why PR #9 doesn't build and can provide a fix.

The issue is that the I2P fuzzing harness from Bitcoin PR bitcoin#30230 is trying to use methods that aren't implemented in the Dash codebase. Specifically, the harness calls RecvUntilTerminator and SendComplete methods on socket objects, but these methods aren't defined in the Sock or FuzzedSock classes in Dash.

Here's a patch to fix the build issue:

diff --git a/src/util/sock.h b/src/util/sock.h
index 1357e2d..ca54b92 100644
--- a/src/util/sock.h
+++ b/src/util/sock.h
@@ -7,6 +7,7 @@
 
 #include <compat.h>
 #include <netaddress.h>
+#include <threadinterrupt.h>
 
 #include <chrono>
 #include <memory>
@@ -108,6 +109,16 @@ class Sock
      */
     virtual bool AddrLocalIP(CService& addr) const;
 
+    /**
+     * Receive data from the socket until a terminator character is encountered.
+     */
+    virtual std::string RecvUntilTerminator(char terminator, std::chrono::milliseconds timeout, CThreadInterrupt& interrupt, size_t max_size) const;
+
+    /**
+     * Send data to the socket and verify that it was all sent.
+     */
+    virtual void SendComplete(const std::string& data, std::chrono::milliseconds timeout, CThreadInterrupt& interrupt) const;
+
 protected:
     /**
      * Underlying socket file descriptor.
diff --git a/src/util/sock.cpp b/src/util/sock.cpp
index d22bf14..fe3c3d8 100644
--- a/src/util/sock.cpp
+++ b/src/util/sock.cpp
@@ -289,4 +289,29 @@ bool Sock::AddrLocalIP(CService& addr) const
     return true;
 }
 
+std::string Sock::RecvUntilTerminator(char terminator, std::chrono::milliseconds timeout, CThreadInterrupt& interrupt, size_t max_size) const
+{
+    std::string result;
+    result.reserve(max_size);
+    
+    char buffer[1];
+    while (result.size() < max_size) {
+        ssize_t n = Recv(buffer, sizeof(buffer), 0);
+        if (n <= 0) break;
+        result.push_back(buffer[0]);
+        if (buffer[0] == terminator) break;
+    }
+    
+    return result;
+}
+
+void Sock::SendComplete(const std::string& data, std::chrono::milliseconds timeout, CThreadInterrupt& interrupt) const
+{
+    size_t sent = 0;
+    while (sent < data.size()) {
+        ssize_t n = Send(data.data() + sent, data.size() - sent, 0);
+        if (n <= 0) throw std::runtime_error("Failed to send complete data");
+        sent += n;
+    }
+}
+
 } // namespace
diff --git a/src/test/fuzz/util.h b/src/test/fuzz/util.h
index 18f5a2c..b0dc9a4 100644
--- a/src/test/fuzz/util.h
+++ b/src/test/fuzz/util.h
@@ -165,6 +165,23 @@ class FuzzedSock : public Sock
     bool IsConnected(std::string& errmsg) const override;
 
     bool AddrLocalIP(CService& addr) const override;
+
+    /**
+     * Receive data from the socket until a terminator character is encountered.
+     */
+    std::string RecvUntilTerminator(char terminator, std::chrono::milliseconds timeout, CThreadInterrupt& interrupt, size_t max_size) const override
+    {
+        // Implementation for fuzzing
+        return m_fuzzed_data_provider.ConsumeRandomLengthString(max_size);
+    }
+
+    /**
+     * Send data to the socket and verify that it was all sent.
+     */
+    void SendComplete(const std::string& data, std::chrono::milliseconds timeout, CThreadInterrupt& interrupt) const override
+    {
+        // Implementation for fuzzing
+    }
 };
 
 [[nodiscard]] inline FuzzedFileProvider ConsumeFile(FuzzedDataProvider& fuzzed_data_provider) noexcept

This patch:

1. Adds the missing method declarations to the Sock base class
2. Provides basic implementations of these methods in sock.cpp
3. Adds fuzz-safe override implementations to the FuzzedSock class

The issue arose because the I2P fuzzing harness was imported from Bitcoin, which has these methods implemented, but they weren't included in the PR to Dash.