Skip to content

FNet: named current future protocol as "fnet1"#6113

Merged
onetechnical merged 1 commit intoalgorand:dev/experimental-incentivesfrom
tasosbit:tasosbit/proto-fnet-v1
Aug 28, 2024
Merged

FNet: named current future protocol as "fnet1"#6113
onetechnical merged 1 commit intoalgorand:dev/experimental-incentivesfrom
tasosbit:tasosbit/proto-fnet-v1

Conversation

@tasosbit
Copy link
Copy Markdown
Contributor

Hardcoding the current future protocol as fnet1 to prevent inconsistent views of the protocol in AF FNet

Experimental / Not to be merged to main

@CLAassistant
Copy link
Copy Markdown

CLAassistant commented Aug 28, 2024

CLA assistant check
All committers have signed the CLA.

@tasosbit tasosbit force-pushed the tasosbit/proto-fnet-v1 branch from 1766f1b to fc4c2bf Compare August 28, 2024 17:50

// vFNetX are like vAlphaX but for AF's FNet
// vFnet1
vFnet1 := vFuture
Copy link
Copy Markdown
Contributor

@cce cce Aug 28, 2024

Choose a reason for hiding this comment

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

vFuture can receive changes as part of the development process until the next consensus release, so defining vFnet1 here as a copy of vFuture does not pin it down as firmly as if you started from a copy of the last consensus release (v39).

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I'm aware re: future, the idea here was to update the code to fix fnet1 to the current values for now, and when we need fnet2 to shadow the next future, fnet1 would be defined explicitly from v39 as you say.
The FNet nodes will track from this dev branch, so updates to future on main will not affect them until we update the branch

Copy link
Copy Markdown
Contributor

@cce cce Aug 28, 2024

Choose a reason for hiding this comment

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

oh I was confused because this PR is set to merge to master — so you are going to cut a dev branch of master after this?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I think you want to pin down fnet1 to last consensus version + the items you want to include, because you won't automatically include new vFuture items when the software gets upgraded. We're not upgrading it wily nily here, but if you rebase on master you'll have to tear down and rebuild the network. (This may be fine for your purposes.)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Oh, this should not target master, good catch @cce

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

yep - sorry about that, changed the base to dev/experimental-incentives

@tasosbit
Copy link
Copy Markdown
Contributor Author

tasosbit commented Aug 28, 2024

Is this CircleCI test failure expected? It failed on TestP2PwsStreamHandlerDedup. Might be related to some maintenance they are doing atmo.

Can someone with privileges resubmit the job?

@codecov
Copy link
Copy Markdown

codecov bot commented Aug 28, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 56.27%. Comparing base (4990077) to head (fc4c2bf).
Report is 1 commits behind head on dev/experimental-incentives.

Additional details and impacted files
@@                     Coverage Diff                      @@
##           dev/experimental-incentives    #6113   +/-   ##
============================================================
  Coverage                        56.27%   56.27%           
============================================================
  Files                              490      490           
  Lines                            69710    69712    +2     
============================================================
+ Hits                             39230    39233    +3     
+ Misses                           27817    27815    -2     
- Partials                          2663     2664    +1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@tasosbit tasosbit changed the base branch from master to dev/experimental-incentives August 28, 2024 18:54
@onetechnical onetechnical merged commit 93e1f82 into algorand:dev/experimental-incentives Aug 28, 2024
@urtho
Copy link
Copy Markdown
Contributor

urtho commented Aug 29, 2024

Can we get conduit support for fnet1 🙏

@tasosbit tasosbit mentioned this pull request Oct 31, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants