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

feat(discv5): open dns for discv5 #7328

Merged
merged 18 commits into from
Mar 27, 2024
Merged

feat(discv5): open dns for discv5 #7328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
2cd4d6c
Interface between signed and unsigned node record types
emhane Mar 25, 2024
ebdc17f
Make dns generic over node record type
emhane Mar 25, 2024
0beb236
Fix lint
emhane Mar 25, 2024
8ab3f4b
Checkout dns crate from main
emhane Mar 26, 2024
ab23ed2
Add enr field to dns update
emhane Mar 26, 2024
6eb80d2
Clean up test
emhane Mar 27, 2024
b96fb42
Use ref to enr in conversion from node record
emhane Mar 27, 2024
c782849
Enable reuse of method to get fork id
emhane Mar 27, 2024
918b2af
Use invalid url error for missing ip and ports
emhane Mar 27, 2024
6c89757
Make udp port missing error have precedence over tcp port missing error
emhane Mar 27, 2024
84542fd
Remove use of TryFrom impl for node record and of func to get fork id
emhane Mar 27, 2024
cf3fc87
fixup! Remove use of TryFrom impl for node record and of func to get …
emhane Mar 27, 2024
420c882
Fix lint
emhane Mar 27, 2024
dfcf0db
Remove whitespace
emhane Mar 27, 2024
7569d36
Move fork id errors to own error enum
emhane Mar 27, 2024
727b5d1
Fix merge conflicts with remote
emhane Mar 27, 2024
49d8b68
Remove generalisation of conversion from enr to node record
emhane Mar 27, 2024
0e4693c
fixup! Remove generalisation of conversion from enr to node record
emhane Mar 27, 2024
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
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion crates/net/dns/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,8 @@ pub struct DnsNodeRecordUpdate {
pub node_record: NodeRecord,
/// The forkid of the node, if present in the ENR
pub fork_id: Option<ForkId>,
/// Original [`Enr`].
pub enr: Enr<SecretKey>,
}

/// Commands sent from [DnsDiscoveryHandle] to [DnsDiscoveryService]
Expand Down Expand Up @@ -403,7 +405,7 @@ fn convert_enr_node_record(enr: &Enr<SecretKey>) -> Option<DnsNodeRecordUpdate>
let mut maybe_fork_id = enr.get(b"eth")?;
let fork_id = ForkId::decode(&mut maybe_fork_id).ok();

Some(DnsNodeRecordUpdate { node_record, fork_id })
Some(DnsNodeRecordUpdate { node_record, fork_id, enr: enr.clone() })
}

#[cfg(test)]
Expand Down
1 change: 1 addition & 0 deletions crates/rpc/rpc-types/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ alloy-rpc-engine-types = { workspace = true, features = ["jsonrpsee-types"] }
ethereum_ssz_derive = { version = "0.5", optional = true }
ethereum_ssz = { version = "0.5", optional = true }
alloy-genesis.workspace = true
enr = { workspace = true, features = ["serde", "rust-secp256k1"] }

# misc
thiserror.workspace = true
Expand Down
Loading