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(rln-relay): remove wss support from node config #2442

Merged
merged 3 commits into from
Feb 16, 2024
Merged

chore(rln-relay): remove wss support from node config #2442

merged 3 commits into from
Feb 16, 2024

Conversation

rymnc
Copy link
Contributor

@rymnc rymnc commented Feb 16, 2024

Description

Removes wss as a valid configuration to wakunode2, networkmonitor, chat2

Changes

  • added regex match for http/s url
  • added regex match for ws/s url and throws the appropriate error

How to test

  1. Build wakunode2 make -j16 wakunode2
  2. Run wakunode2 with wss -

Screenshot 2024-02-16 at 3 47 47 PM

  1. With an http url, it passes validation

Issue

closes #2434

@rymnc rymnc self-assigned this Feb 16, 2024
@github-actions GitHub Actions
Copy link

This PR may contain changes to configuration options of one of the apps.

If you are introducing a breaking change (i.e. the set of options in latest release would no longer be applicable) make sure the original option is preserved with a deprecation note for 2 following releases before it is actually removed.

Please also make sure the label release-notes is added to make sure any changes to the user interface are properly announced in changelog and release notes.

rymnc
rymnc commented Feb 16, 2024
View reviewed changes
apps/chat2/config_chat2.nim
Comment on lines +3 to +9
confutils, confutils/defs, confutils/std/net,
eth/keys,
libp2p/crypto/crypto,
libp2p/crypto/secp,
nimcrypto/utils,
eth/keys
std/strutils,
regex
Copy link
Contributor Author

Choose a reason for hiding this comment

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

reordered in asc

rymnc
rymnc commented Feb 16, 2024
View reviewed changes
apps/networkmonitor/networkmonitor_config.nim
Comment on lines +5 to +9
chronos,
std/strutils,
stew/results,
stew/shims/net
stew/shims/net,
regex
Copy link
Contributor Author

Choose a reason for hiding this comment

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

reordered in asc

@rymnc rymnc added release-notes Issue/PR needs to be evaluated for inclusion in release notes highlights or upgrade instructions E:RLN on mainnet see https://github.com/waku-org/pm/issues/98 for details labels Feb 16, 2024
@rymnc rymnc requested review from Ivansete-status and alrevuelta and removed request for Ivansete-status February 16, 2024 10:21
@github-actions GitHub Actions
Copy link

github-actions bot commented Feb 16, 2024 •
edited

You can find the image built from this PR at

quay.io/wakuorg/nwaku-pr:2442

Built from 2f0ecd3

alrevuelta
alrevuelta approved these changes Feb 16, 2024
View reviewed changes
Copy link
Contributor

@alrevuelta alrevuelta left a comment

Choose a reason for hiding this comment

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

lgtm.
ensure existing deployments don't break before merging.

@rymnc
Copy link
Contributor Author

rymnc commented Feb 16, 2024 •
edited

will leave this PR open until the appropriate pr has been merged in: status-im/infra-waku#11

@rymnc rymnc mentioned this pull request Feb 16, 2024
Merged
Ivansete-status
Ivansete-status approved these changes Feb 16, 2024
View reviewed changes
Copy link
Collaborator

@Ivansete-status Ivansete-status left a comment

Choose a reason for hiding this comment

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

LGTM! I just added some minor comments :)

apps/chat2/config_chat2.nim
return @[]

proc parseCmdArg*(T: type EthRpcUrl, s: string): T =
var httpPattern = re2"^(https?:\/\/)(?:w{1,3}\.)?[^\s.]+(?:\.[a-z]+)*(?::\d+)?(?![^<]*(?:<\/\w+>|\/?>))"
Copy link
Collaborator

Choose a reason for hiding this comment

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

Shall we have examples of the regex, in a comment? The same applies elsewhere

Copy link
Contributor Author

Choose a reason for hiding this comment

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

will do

Copy link
Contributor Author

Choose a reason for hiding this comment

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

addressed in cd27d28

@rymnc rymnc mentioned this pull request Feb 16, 2024
Merged
@rymnc
Copy link
Contributor Author

rymnc commented Feb 16, 2024

rln docs updated: 8e59705
and in nwaku-compose: waku-org/nwaku-compose#52

@rymnc rymnc merged commit 2060cfa into master Feb 16, 2024
10 checks passed
@rymnc rymnc deleted the remove-wss-rln-relay branch February 16, 2024 13:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alrevuelta alrevuelta alrevuelta approved these changes

@Ivansete-status Ivansete-status Ivansete-status approved these changes

Assignees

@rymnc rymnc

Labels
E:RLN on mainnet see https://github.com/waku-org/pm/issues/98 for details release-notes Issue/PR needs to be evaluated for inclusion in release notes highlights or upgrade instructions
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

chore: Remove support for wss eth endpoint
3 participants
@rymnc @alrevuelta @Ivansete-status