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

feat(merge): merge master into develop #5325

Merged
merged 18 commits into from
Jul 1, 2023
Merged

feat(merge): merge master into develop #5325

merged 18 commits into from
Jul 1, 2023

Conversation

forfreeday
Copy link
Contributor

What does this PR do?

Why are these changes required?

This PR has been tested by:

  • Unit Tests
  • Manual Testing

Follow up

Extra details

halibobo1205 and others added 18 commits June 15, 2023 16:19
feat(freezeV2): modify CancelAllUnfreezeV2 return info
feat(protocol): remove deprecated shell for protobuf
fix(net):prefer to get blockId from khaosdb in SyncService
fix(net):update libp2p from test-v2.0.0 to v2.0.0
…overy

fix(freezeV2): optimize resource usage recovery logic
feat(net):update libp2p version to v1.2.0
…-343-g959e0199de

update a new version. version name:GreatVoyage-v4.7.1.1-343-g959e0199…
@forfreeday forfreeday merged commit dcd0ebd into develop Jul 1, 2023
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.

6 participants