[P2P] KISS 2 - Peer discovery [Merge me after #520] - (Issues: #416, #429) by deblasis · Pull Request #521 · pokt-network/pocket

deblasis · 2023-02-16T23:05:31Z

Description

This PR has been extracted from #491 and is, hopefully, more digestible from a code-review and scope point of view.

The main goal is to remove hardcoded nodes and move towards a more dynamic environment.

It's also highlighting the potential entry points for subsequent P2P work

The code leverages the abstractions added recently (currentHeightProvider and addressBookProvider) to fetch the data from an RPC endpoint.

Issue

Fixes #416
Fixes #429

Type of change

Please mark the relevant option(s):

List of changes

CLI

Updated CLI to use to source the address book and the current height from the RPC server leveraging the rpcAddressBookProvider and rpcCurrentHeightProvider respectively and the bus for dependency injection

P2P

Modules embed base_modules.IntegratableModule and base_modules.InterruptableModule for DRYness
Deprecated debugAddressBookProvider
Added rpcAddressBookProvider to source the address book from the RPC server
Leveraging bus for dependency injection of the addressBookProvider and currentHeightProvider
Deprecated debugCurrentHeightProvider
Added rpcCurrentHeightProvider to source the current height from the RPC server
Fixed raintree to use the currentHeightProvider instead of consensus (that was what we wanted to avoid in the first place)
Added getAddrBookDelta to calculate changes to the address book between heights and update the internal state and componentry accordingly
Reacting to ConsensusNewHeightEventType to update the address book
Updated tests

RPC

Updated RPC to expose the node's address book via GET /v1/p2p/staked_actors_address_book

Testing

make develop_test
LocalNet w/ all of the steps outlined in the README

Required Checklist

I have performed a self-review of my own code
I have commented my code, particularly in hard-to-understand areas
I have tested my changes using the available tooling
I have updated the corresponding CHANGELOG

If Applicable Checklist

I have updated the corresponding README(s); local and/or global
I have added tests that prove my fix is effective or that my feature works
I have added, or updated, mermaid.js diagrams in the corresponding README(s)
I have added, or updated, documentation and mermaid.js diagrams in shared/docs/* if I updated shared/*README(s)

…ndor/mock/etc changes

Co-authored-by: Daniel Olshansky <olshansky@pokt.network>

app/client/cli/debug.go

Olshansk

Left a couple comments (nothing blocking) but PTAL before merging! Again, 🙏 for splitting this!!!!

app/client/cli/debug.go

app/client/cli/utils.go

Olshansk · 2023-02-17T04:25:38Z

rpc/v1/openapi.yaml

@@ -1,6 +1,6 @@
 openapi: 3.0.3


You need to run generate_cli_commands_docs so the docs are updated

generate_cli_commands_docs updates docs for the CLI. (this has to be ran in the PR that adds the non_interactive flag if I didn't do that already. Noted.

In here I have already ran make generate_rpc_openapi before adding the handlers for the new endpoint

rpc/handlers.go

p2p/providers/addrbook_provider/rpc/provider.go

p2p/addrbook_delta_test.go

p2p/providers/addrbook_provider/rpc/provider.go

p2p/providers/current_height_provider/rpc/provider.go

Co-authored-by: Daniel Olshansky <olshansky@pokt.network>

This reverts commit facca64.

…-network/pocket into issue/416-kiss-peer-discovery-light

…-discovery-light Signed-off-by: Alessandro De Blasis <alex@deblasis.net>

… (#522) ## Description This PR has been extracted from #491 and is, hopefully, more digestible from a code-review and scope point of view. ## Issue Fixes #490 ## Type of change Please mark the relevant option(s): - [x] New feature, functionality or library - [ ] Bug fix - [ ] Code health or cleanup - [ ] Major breaking change - [ ] Documentation - [ ] Other  ## List of changes - When nodes are added/removed from the Kubernetes Localnet, we stake/unstake them automatically - We achieve the above by dogfooding our own CLI inside Kubernetes ## Testing - [x] `make develop_test` - [x] [LocalNet](https://github.com/pokt-network/pocket/blob/main/docs/development/README.md) w/ all of the steps outlined in the `README` ## Required Checklist - [x] I have performed a self-review of my own code - [x] I have commented my code, particularly in hard-to-understand areas - [x] I have tested my changes using the available tooling - [x] I have updated the corresponding CHANGELOG ### If Applicable Checklist - [ ] I have updated the corresponding README(s); local and/or global - [ ] I have added tests that prove my fix is effective or that my feature works - [ ] I have added, or updated, [mermaid.js](https://mermaid-js.github.io) diagrams in the corresponding README(s) - [ ] I have added, or updated, documentation and [mermaid.js](https://mermaid-js.github.io) diagrams in `shared/docs/*` if I updated `shared/*`README(s) --------- Signed-off-by: Alessandro De Blasis <alex@deblasis.net> Co-authored-by: Dmitry Knyazev <okdas@users.noreply.github.com> Co-authored-by: Daniel Olshansky <olshansky@pokt.network> Co-authored-by: Dmitry K <okdas@pm.me> Co-authored-by: Daniel Olshansky <olshansky.daniel@gmail.com>

* pokt/main: [Infra] KISS 3 - Cluster Manager [Merge me after #521] - (Issues: #490) (#522) Refactor/fix state sync logs (#515) [P2P] KISS 2 - Peer discovery [Merge me after #520] - (Issues: #416, #429) (#521) [Core] KISS 1 - Finite State Machine [Merge me first] - (Issue: #499) (#520) [CLI] Stake command bugfix (#518) [CLI] Cannot run make localnet_client_debug: Cannot initialise the keybase with the validator keys: Unable to find YAML file (#517) Fix the link shown by `make go_doc` Fixed duplicate GITHUB_WIKI tag [Documentation] Update Devlog Formatting (#512) [Docs & Bugs] Minor fixes post keybase changes (#513) [Utility] Foundational bugs, tests, code cleanup and improvements (1 / 2) (#503) [Tooling] Integrate Keybase w/ CLI (Issue #484 ) (#501) update devlog2.md update devlog2.md Update devlog1.md

okdas and others added 30 commits November 11, 2022 17:04

tilt + PO + localnet

f7a82ba

--wip-- [skip ci]

62683a5

--wip-- [skip ci]

67132eb

observability stack

764c722

--wip-- [skip ci]

c2c0fd5

grafana is auto provisioned with observability stack

2960669

--wip-- [skip ci]

1455a40

stabilizing tilt

ca9ebeb

--wip-- [skip ci]

1fd8bb1

more changes to grafana, tilt and docs

048947c

more docs

2fb9f04

let tilt ignore the same stuff as git, so it wont get triggered by ve…

e66bd74

…ndor/mock/etc changes

note about changing pocket-operator code

cc95782

Merge branch 'main' into dk-localnet-pocket-operator

5198b1d

Update Makefile

f0aa697

Co-authored-by: Daniel Olshansky <olshansky@pokt.network>

Update Makefile

8b50310

Co-authored-by: Daniel Olshansky <olshansky@pokt.network>

Update Makefile

52a44d7

Co-authored-by: Daniel Olshansky <olshansky@pokt.network>

requested changes so far

846ba6c

more requested changes

558768e

Merge branch 'main' into dk-localnet-pocket-operator

03f3ba3

some requested changes

5b824af

Merge branch 'main' into dk-localnet-pocket-operator

d53eded

add mermaid diagram

5225c3e

clarify location of the config files

b2cb5af

--wip-- [skip ci]

80d790d

localnet without operator

c94cb4f

Merge branch 'main' into dk-localnet-pocket-operator

78f09da

latest config

372bb6c

Merge branch 'main' into dk-localnet-pocket-operator

b92bc03

fully working operatorless localnet

1b103d7

deblasis added 3 commits February 16, 2023 22:50

refactor(cli): using cli context to pass the bus around

25910ab

chore(cli): unused import 🧹

8af0a90

docs(shared): changelogs

6baf43b

deblasis self-assigned this Feb 16, 2023

deblasis added p2p P2P specific changes client work needed to interface with the node (rpc, cli, etc..) core Core infrastructure - protocol related labels Feb 16, 2023

deblasis added this to the M1: Pocket PoS (Proof of Stake) milestone Feb 16, 2023

deblasis requested a review from Olshansk February 16, 2023 23:21

This was linked to issues Feb 16, 2023

[P2P] Implement KISS peer discovery for LocalNet #416

Closed

[P2P] Refactor CreateWithProvider using the new bus based DI #429

Closed

deblasis changed the title ~~[P2P] KISS - Peer discovery [Merge me after #520] - (Issues: #416, #429)~~ [P2P] KISS 2 - Peer discovery [Merge me after #520] - (Issues: #416, #429) Feb 17, 2023

deblasis commented Feb 17, 2023

View reviewed changes

app/client/cli/debug.go Show resolved Hide resolved

Olshansk approved these changes Feb 17, 2023

View reviewed changes

deblasis and others added 6 commits February 17, 2023 10:06

Update app/client/cli/utils.go

facca64

Co-authored-by: Daniel Olshansky <olshansky@pokt.network>

Update p2p/providers/addrbook_provider/rpc/provider.go

1a32c58

Co-authored-by: Daniel Olshansky <olshansky@pokt.network>

Revert "Update app/client/cli/utils.go"

b09edc2

This reverts commit facca64.

Merge branch 'issue/416-kiss-peer-discovery-light' of github.com:pokt…

918c466

…-network/pocket into issue/416-kiss-peer-discovery-light

refactor(rpc): updated getProtocolActorGetter for readability

c981eed

refactor(p2p): style in providers

06bb8d9

Base automatically changed from issue/499-fsm to main February 17, 2023 10:20

deblasis added 3 commits February 17, 2023 10:35

Merge remote-tracking branch 'upstream/main' into issue/416-kiss-peer…

c305aa6

…-discovery-light Signed-off-by: Alessandro De Blasis <alex@deblasis.net>

fix(consensus): typo

f863e65

chore(p2p): providers readability improvement

96c1e0e

deblasis mentioned this pull request Feb 17, 2023

KISS Peer discovery, KISS Bootstrapping, Nodes auto-stake/unstake via K8S cluster-manager, Node Finite state machine - Issues #416, #490, #429, #498, #499 #491

Closed

16 tasks

deblasis merged commit a90d766 into main Feb 17, 2023

Olshansk deleted the issue/416-kiss-peer-discovery-light branch February 17, 2023 18:51

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[P2P] KISS 2 - Peer discovery [Merge me after #520] - (Issues: #416, #429)#521

[P2P] KISS 2 - Peer discovery [Merge me after #520] - (Issues: #416, #429)#521
deblasis merged 241 commits intomainfrom
issue/416-kiss-peer-discovery-light

deblasis commented Feb 16, 2023 •

edited

Loading

Uh oh!

Uh oh!

Olshansk left a comment

Uh oh!

Uh oh!

Uh oh!

Olshansk Feb 17, 2023

Uh oh!

deblasis Feb 17, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

deblasis commented Feb 16, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Issue

Type of change

List of changes

CLI

P2P

RPC

Testing

Required Checklist

If Applicable Checklist

Uh oh!

Uh oh!

Olshansk left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Olshansk Feb 17, 2023

Choose a reason for hiding this comment

Uh oh!

deblasis Feb 17, 2023

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

deblasis commented Feb 16, 2023 •

edited

Loading