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

Update Cadence 1.0 branch #5102

Merged
merged 2,800 commits into from
Dec 14, 2023
Merged

Conversation

turbolent
Copy link
Member

janezpodhostnik and others added 30 commits November 29, 2023 19:25
Add EVM transactions to FVM benchmark tests
[Networking] GossipSub Spam Mitigation- Dynamic Decay Speed
Co-authored-by: Peter Argue <89119817+peterargue@users.noreply.github.com>
Co-authored-by: Peter Argue <89119817+peterargue@users.noreply.github.com>
…gisters

[Access] Make RegisterID request size configurable
@turbolent turbolent requested review from dsainati1 and SupunS and removed request for gomisha December 14, 2023 03:37
@turbolent
Copy link
Member Author

@onflow/flow-execution-and-verification @onflow/flow-collection-and-consensus can you please review the changes made to your respective components look correct? Maybe best to review the changes between master and this PR, i.e. master...bastian/update-stable-cadence-3

Copy link
Member

@zhangchiqing zhangchiqing left a comment

Choose a reason for hiding this comment

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

I reviewed the diff. The changes look good to me.

Copy link
Contributor

@dsainati1 dsainati1 left a comment

Choose a reason for hiding this comment

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

Conflict resolution looks good to me!

@turbolent turbolent merged commit 4c4527a into feature/stable-cadence Dec 14, 2023
51 checks passed
@turbolent turbolent deleted the bastian/update-stable-cadence-3 branch December 14, 2023 19:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.