Skip to content
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

Jump to bottom

chore: add p2p-circuit component to multiaddr that supports it #1531

Closed
wants to merge 1 commit into from
Closed

chore: add p2p-circuit component to multiaddr that supports it #1531

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
11 changes: 10 additions & 1 deletion packages/enr/src/multiaddrs_codec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,16 @@ export function decodeMultiaddrs(bytes: Uint8Array): Multiaddr[] {
const multiaddrBytes = bytes.slice(index, index + size);
index += size;

multiaddrs.push(multiaddr(multiaddrBytes));
let ma = multiaddr(multiaddrBytes);

// if the multiaddr contains `p2p`, it means that it supports `p2p-circuit`
Copy link
Collaborator

@fryorcraken fryorcraken Sep 5, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please provide the full explanation as referred in the description of the PR (that p2p-circuit is not encoded due to space constraint in the ENR, in what form are multiaddr encoded and what is the valid final form of the multiaddr).

// this is avoided from the ENR to save space
// we should add it
if (ma.toString().includes("/p2p/")) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should handle particular case because to me it seems possible to accidentally get p2p/p2p-circuit or something.

if (hasP2p && isPeerId(left) && isPeerId(right)) {
  ...
}

Correct me here if I am wrong.

ma = multiaddr(ma.toString() + "/p2p-circuit/");
}

multiaddrs.push(ma);
}
return multiaddrs;
}
Expand Down
Loading