Skip to content

Body Validation Fallback #143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Dsorken merged 1 commit into from
May 29, 2025
Merged

Body Validation Fallback #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 38 additions & 10 deletions core/src/main/java/samba/network/history/HistoryNetwork.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@

import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
Expand Down Expand Up @@ -449,17 +450,44 @@ private Optional<ContentBlockHeader> getAssociatedBlockHeader(
if (blockHeaderBytes.isPresent()) {
return ContentUtil.createBlockHeaderfromSszBytes(blockHeaderBytes.get());
}

Optional<FindContentResult> searchResult = getContent(blockHeaderKey, DEFAULT_TIMEOUT);
if (searchResult.isPresent()) {
Optional<ContentBlockHeader> blockHeader =
ContentUtil.createBlockHeaderfromSszBytes(
Bytes.fromHexString(searchResult.get().getContent()));
this.store(
blockHeaderKeySsz, blockHeader.get().getSszBytes()); // Store newly located block header
return blockHeader;
int SEARCH_ATTEMPTS = 3;
Set<NodeRecord> excludedNodes = new HashSet<>();
for (int i = 0; i < SEARCH_ATTEMPTS; i++) {
RecursiveLookupTaskFindContent task =
new RecursiveLookupTaskFindContent(
this,
blockHeaderKey.getSszBytes(),
this.discv5Client.getHomeNodeRecord().getNodeId(),
getFoundNodes(blockHeaderKey),
DEFAULT_TIMEOUT);
Optional<FindContentResult> searchResult = task.execute().join();

if (searchResult.isPresent()) {
Optional<ContentBlockHeader> blockHeader =
ContentUtil.createBlockHeaderfromSszBytes(
Bytes.fromHexString(searchResult.get().getContent()));
if (this.store(blockHeaderKeySsz, blockHeader.get().getSszBytes())) {
LOG.debug(
"Found and stored block header for content key {}: {}",
contentKey,
blockHeaderKey.getSszBytes().toHexString());
this.gossip(
task.getInterestedNodes(),
blockHeaderKey.getSszBytes(),
Bytes.fromHexString(searchResult.get().getContent())); // POKE Mechanism
return blockHeader; // Store newly located block header
}
LOG.debug(
"Found Header for content key {} invalid, trying other peers",
contentKey,
blockHeaderKey);
}
if (task.getRespondingNode().isPresent()) excludedNodes.add(task.getRespondingNode().get());
}

LOG.debug(
"Could not find associated block header for content key {} after {} attempts",
contentKey,
SEARCH_ATTEMPTS);
return Optional.empty();
} catch (Exception e) {
LOG.debug("Error when retrieving associated block header for {}", contentKey, e);
Expand Down
28 changes: 25 additions & 3 deletions core/src/main/java/samba/services/search/RecursiveLookupTaskFindContent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import samba.domain.messages.requests.FindContent;
import samba.network.history.HistoryNetwork;

import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Optional;
Expand Down Expand Up @@ -36,18 +37,31 @@ public class RecursiveLookupTaskFindContent {
private Optional<FindContentResult> content = Optional.empty();
private final int timeout;
private final Set<NodeRecord> interestedNodes = new HashSet<>();
private final Set<NodeRecord> excludedNodes = new HashSet<>();
private Optional<NodeRecord> respondingNode;

public RecursiveLookupTaskFindContent(
final HistoryNetwork historyNetwork,
final Bytes contentKey,
final Bytes homeNodeId,
final Set<NodeRecord> foundNodes,
final int timeout) {
this(historyNetwork, contentKey, homeNodeId, foundNodes, Set.of(), timeout);
}

public RecursiveLookupTaskFindContent(
final HistoryNetwork historyNetwork,
final Bytes contentKey,
final Bytes homeNodeId,
final Set<NodeRecord> foundNodes,
final Set<NodeRecord> excludedNodes,
final int timeout) {
this.historyNetwork = historyNetwork;
this.contentKey = contentKey;
this.queriedNodeIds.add(homeNodeId);
this.foundNodes.addAll(foundNodes);
this.timeout = timeout;
this.excludedNodes.addAll(excludedNodes);
}

public CompletableFuture<Optional<FindContentResult>> execute() {
Expand All @@ -61,6 +75,7 @@ private synchronized void sendRequests() {
return;
}
if (content.isPresent()) {
LOG.error("No nodes left to query");
future.complete(content);
return;
}
Expand All @@ -72,7 +87,7 @@ private synchronized void sendRequests() {
.collect(Collectors.toList());

if (nodesToQuery.isEmpty()) {
future.completeExceptionally(new RuntimeException("No nodes left to query."));
future.complete(content);
return;
}

Expand All @@ -99,14 +114,17 @@ private void queryPeer(final NodeRecord peer) {
LOG.debug("Node {} returned empty result", peer.getNodeId());
} else {
FindContentResult contentResult = result.get();
if (contentResult.getContent() != null) {
if (contentResult.getContent() != null && !excludedNodes.contains(peer)) {
this.respondingNode = Optional.of(peer);
content = Optional.of(contentResult);
future.complete(content);
return;
}
// Add nodes to foundNodes and continue searching
foundNodes.addAll(
contentResult.getEnrs().stream()
Optional.ofNullable(contentResult.getEnrs())
.orElseGet(Collections::emptyList)
.stream()
.map(historyNetwork::nodeRecordFromEnr)
.flatMap(Optional::stream)
.filter(node -> !queriedNodeIds.contains(node.getNodeId()))
Expand All @@ -133,4 +151,8 @@ private void queryPeer(final NodeRecord peer) {
public Set<NodeRecord> getInterestedNodes() {
return interestedNodes;
}

public Optional<NodeRecord> getRespondingNode() {
return respondingNode;
}
}
Loading