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.

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

chore: add fleet ENRs to the list of discv5 nodes #5184

Merged
merged 2 commits into from
May 26, 2024
Merged

Conversation

richard-ramos
Copy link
Member

@richard-ramos richard-ramos commented May 17, 2024

I noticed that we were using the same nodes/dnsdiscovery URLs for both the WakuNodes and DiscV5Bootstrap nodes when setting up the default config. While that's okay, for discv5 i also suggest adding the ENRs, for the scenarios in which dnsdiscovery fails for some reason.

With this change, discv5 will use the fixed list of enrs, and eventually, once we get a response from dnsDiscovery, discv5 will be reseeded with both the static bootnodes from the configuration and the new ones obtained from dnsDiscovery. (This is to handle cases in which the list of enrs change).

@richard-ramos richard-ramos added the status-waku-integ All issues relating to the Status Waku integration. label May 17, 2024
@status-im-auto
Copy link
Member

status-im-auto commented May 17, 2024

Jenkins Builds

Click to see older builds (12)
Commit #️⃣ Finished (UTC) Duration Platform Result
✖️ 8b4005a #1 2024-05-17 17:41:54 ~1 min tests 📄log
✔️ 8b4005a #1 2024-05-17 17:44:48 ~4 min linux 📦zip
✔️ 8b4005a #1 2024-05-17 17:45:18 ~4 min ios 📦zip
✔️ 8b4005a #1 2024-05-17 17:46:22 ~5 min android 📦aar
12d9153 #2 2024-05-21 12:57:16 ~29 sec android 📄log
12d9153 #2 2024-05-21 12:57:26 ~34 sec linux 📄log
12d9153 #2 2024-05-21 12:57:32 ~44 sec ios 📄log
✖️ 12d9153 #2 2024-05-21 12:58:04 ~1 min tests 📄log
✖️ f0abc35 #3 2024-05-21 13:03:52 ~1 min tests 📄log
✔️ f0abc35 #3 2024-05-21 13:05:13 ~3 min android 📦aar
✔️ f0abc35 #3 2024-05-21 13:05:27 ~3 min ios 📦zip
✔️ f0abc35 #3 2024-05-21 13:06:02 ~4 min linux 📦zip
Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ 5e03511 #4 2024-05-26 20:49:56 ~3 min ios 📦zip
✔️ 5e03511 #4 2024-05-26 20:50:19 ~4 min linux 📦zip
✔️ 5e03511 #4 2024-05-26 20:51:00 ~4 min android 📦aar
✔️ 5e03511 #4 2024-05-26 21:30:11 ~44 min tests 📄log

@richard-ramos richard-ramos changed the title chore: add fleet ENRs to the list of discv5 nodes and remove wakuv2.fleets chore: add fleet ENRs to the list of discv5 nodes May 21, 2024
Copy link
Contributor

@chaitanyaprem chaitanyaprem left a comment

Choose a reason for hiding this comment

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

LGTM
apart from a Minor comment

WakuNodes: {
"enrtree://AI4W5N5IFEUIHF5LESUAOSMV6TKWF2MB6GU2YK7PU4TYUGUNOCEPW@boot.staging.shards.nodes.status.im",
},
DiscV5BootstrapNodes: {
Copy link
Contributor

Choose a reason for hiding this comment

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

Why not use the config from config/cli/fleets-<name>.json rather than again hardcoding in the code?

Copy link
Member Author

Choose a reason for hiding this comment

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

it's a good question. These .json files seem to be used only when running status-go as a service. I imagine we could refactor status-go so the default values come from the config files instead of having them hardcoded.
wdyt, @cammellos ?

Copy link
Member

Choose a reason for hiding this comment

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

I don't mind myself, I don't see the value of having them in JSON files to be honest if they are only used in a single place, this looks more explicit to me and doesn't require a go generate (not sure if that's the case with the JSON files), but no strong opinion on my side

Copy link
Member Author

Choose a reason for hiding this comment

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

would you say it's better to get rid of the json files instead?

@richard-ramos richard-ramos merged commit 94e5431 into develop May 26, 2024
10 of 12 checks passed
@richard-ramos richard-ramos deleted the discv5 branch May 26, 2024 23:16
chaitanyaprem pushed a commit that referenced this pull request May 28, 2024
* chore_: add fleet ENRs to the list of discv5 nodes
* fix_: handle scenario in which there are dnsDiscoveryURLs and enrs in the DiscV5Bootnode list
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
status-waku-integ All issues relating to the Status Waku integration.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants