feat(p2p): add anchor file for discovery state by Rjected · Pull Request #11 · paradigmxyz/reth

Rjected · 2022-10-03T20:30:33Z

Adds a struct called Anchor which represents two types of peers that the node might want to persist:

A "static" peer list, which are user specified. This list shouldn't be overwritten by the node.
A "discovered" peer list, which would be modified by the node and populated with active peers.

Also introduces PersistentAnchor which can load from a TOML file, saving to a file on drop

This will be used in case the node restarts, so discovery can start off with peers that are likely to be active.

todo:

change static peer type to include IPs instead of, or in addition to ENRs?
- Going to keep them as ENRs for now unless there is an explicit reason to allow IPs in the static peer list
enforce one-to-one mapping between IP and key
temp toml file tests

onbjerg

Just nits. Re: IP vs ENR for static peers, I don't sway strongly either way but I would prefer that we keep ENR instead of replacing it entirely with IP

crates/net/p2p/src/anchor.rs

Co-authored-by: Bjerg <onbjerg@users.noreply.github.com>

* fix error due to lack of read option * fix empty and nonexistent file error

Rjected · 2022-10-06T19:41:52Z

need to check out why tests are failing, looks like I need to change the tests to work in the CI environment, then the only thing blocking this is the upstream PR, will continue with other p2p stuff in the meantime

gakonst · 2022-10-06T19:53:30Z

Ah this? sigp/enr#6. I pinged sigp about it.

Rjected · 2022-10-06T19:55:07Z

yeah that, cool!

gakonst · 2022-10-07T20:48:55Z

@Rjected PR is merged^

crates/net/p2p/src/anchor.rs

mattsse · 2022-10-08T08:41:07Z

crates/net/p2p/src/anchor.rs

+    /// The File handle for the anchor
+    file: File,


should we store the path instead of the file?

yeah the path should work and is the input for new_from_file anyways

* change new_from_file to explicitly include logic for opening existing files, rather than calling out to from_toml * remove from_toml because new_from_file handles existing files properly with only a path. It is not possible to obtain a Path from a File anyways, its only purpose was to accept a File type

mattsse · 2022-10-10T16:14:16Z

crates/net/p2p/src/anchor.rs

-    /// The File handle for the anchor
-    file: File,
+    /// The Path to store the anchor file
+    path: &'a Path,


I'd recommend allocating a PathBuf here to get rid of the lifetimes.

makes sense, just changed

mattsse

lgtm

Resolution checkpoint Resolution checkpoint paradigmxyz#2 Resolution checkpoint paradigmxyz#3 x Resolution checkpoint paradigmxyz#4 Resolution checkpoint paradigmxyz#5 Resolution checkpoint paradigmxyz#6 Resolution checkpoint paradigmxyz#7 Resolution checkpoint paradigmxyz#8 Resolve checkpoint paradigmxyz#9 (transaction primitive) Resolve checkpoint paradigmxyz#10 (rpc api transactions) Resolve checkpoint paradigmxyz#11 (building w/o feature flag) Start review Compiling with and without `optimism` feature flag Remove `DepositTx` from txpool mock tests, they never go into the txpool fmt code lint fix signature tests Co-authored-by: nicolas <48695862+merklefruit@users.noreply.github.com> Use free CI runners (revert before upstream) Co-authored-by: refcell <abigger87@gmail.com> Signature test fixes Co-authored-by refcell <abigger87@gmail.com> Fix Receipt proptest Co-authored-by BB <brian.t.bland@gmail.com> lint Fix variable-length compact for txtype/transaction Co-authored-by: Brian Bland <brian.t.bland@gmail.com> Fix basefee tests Remove unnecessary rpc deps Co-authored-by: Brian Bland <brian.t.bland@gmail.com> Co-authored-by: refcell <abigger87@gmail.com> Co-authored-by: nicolas <48695862+merklefruit@users.noreply.github.com> Co-authored-by: Roberto <bayardo@alum.mit.edu>

…z#11) - Implement `block_hash` (refer to `revm::State<DB>::block_hash`) for `PartitionDB` & `SchedulerDB` - Implement generating read write set for each txn after transact

* eip7928 patches * fixes * fixes * msrv

…hancements (paradigmxyz#11) Add new Tectonic modules integrating post-quantum cryptographic features: - Extend crate structure with Tectonic-specific components (chainspec, cli, hardforks, EVM). - Implement Tectonic chain specifications (`TECTONIC_DEV`, `TECTONIC_TEST`, `TECTONIC_DEMO`) using tectonic-themed hardforks (Amur, Burma, Cocos, Danakil). - Add chain spec parser for custom genesis configurations. - Improve Falcon-512 signature precompiles in EVM including test vectors and benchmarks.

onbjerg reviewed Oct 4, 2022

View reviewed changes

crates/net/p2p/src/anchor.rs Outdated Show resolved Hide resolved

crates/net/p2p/src/anchor.rs Outdated Show resolved Hide resolved

crates/net/p2p/src/anchor.rs Outdated Show resolved Hide resolved

crates/net/p2p/src/anchor.rs Outdated Show resolved Hide resolved

mattsse reviewed Oct 4, 2022

View reviewed changes

crates/net/p2p/src/anchor.rs Outdated Show resolved Hide resolved

crates/net/p2p/src/anchor.rs Outdated Show resolved Hide resolved

crates/net/p2p/src/anchor.rs Outdated Show resolved Hide resolved

mattsse reviewed Oct 6, 2022

View reviewed changes

crates/net/p2p/src/anchor.rs Outdated Show resolved Hide resolved

Rjected and others added 9 commits October 6, 2022 12:44

feat(p2p): add anchor file for discovery state

35ca74f

move rustdoc and improve error messages

e6a62b9

Co-authored-by: Bjerg <onbjerg@users.noreply.github.com>

add temp file tests and log drop error

34c9c6f

* fix error due to lack of read option * fix empty and nonexistent file error

remove redundant new

5eee279

replace println with tracing

c1260e0

show underlying error in custom error message

319524c

chore: cargo fmt

fd4f0c9

change AsRef<Path> to &Path

0284175

remove ineffective dedups

d9347a6

Rjected force-pushed the dan/p2p-anchor branch from 389734e to d9347a6 Compare October 6, 2022 16:45

chore: cargo fmt

64a752a

Rjected added 3 commits October 7, 2022 17:26

switch out Vec<Enr<K>> for HashSet<Enr<K>>

f4d5e24

cargo fmt

95f8ef1

use tempdir instead of of std::env::temp_dir

925be64

mattsse requested changes Oct 8, 2022

View reviewed changes

mattsse reviewed Oct 10, 2022

View reviewed changes

use PathBuf instead of Path

a67730d

mattsse approved these changes Oct 10, 2022

View reviewed changes

Rjected merged commit 230e9ef into main Oct 10, 2022

Rjected deleted the dan/p2p-anchor branch October 10, 2022 17:02

anonymousGiga added a commit to anonymousGiga/reth that referenced this pull request Feb 20, 2024

update for revm dependencies (paradigmxyz#11)

f887830

mattsse mentioned this pull request Jan 24, 2025

test: Add ValidBlocks and InvalidBlocks blockchain tests #13969

Merged

jenpaff pushed a commit that referenced this pull request Oct 6, 2025

feat: eip7928 patches (#11)

3275939

* eip7928 patches * fixes * fixes * msrv

Conversation

Rjected commented Oct 3, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

onbjerg left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Rjected commented Oct 6, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

gakonst commented Oct 6, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Rjected commented Oct 6, 2022

Uh oh!

gakonst commented Oct 7, 2022

Uh oh!

Uh oh!

Uh oh!

mattsse Oct 8, 2022

Choose a reason for hiding this comment

Uh oh!

Rjected Oct 10, 2022

Choose a reason for hiding this comment

Uh oh!

mattsse Oct 10, 2022

Choose a reason for hiding this comment

Uh oh!

Rjected Oct 10, 2022

Choose a reason for hiding this comment

Uh oh!

mattsse left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Rjected commented Oct 3, 2022 •

edited

Loading

Rjected commented Oct 6, 2022 •

edited

Loading

gakonst commented Oct 6, 2022 •

edited

Loading