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

Testnet merge back to mainnet #787

Merged
merged 15 commits into from
Dec 31, 2024
Merged

Conversation

benjamin202410
Copy link
Collaborator

@benjamin202410 benjamin202410 commented Dec 31, 2024

Proposed changes

Testnet has testing optimize mining time. And it's time to merge into master release to mainnet.

Types of changes

What types of changes does your code introduce to XDC network?
Put an in the boxes that apply

  • Bugfix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation Update (if none of the other choices apply)
  • Regular KTLO or any of the maintaince work. e.g code style
  • CICD Improvement

Impacted Components

Which part of the codebase this PR will touch base on,

Put an in the boxes that apply

  • Consensus
  • Account
  • Network
  • Geth
  • Smart Contract
  • External components
  • Not sure (Please specify below)

Checklist

Put an in the boxes once you have confirmed below actions (or provide reasons on not doing so) that

  • This PR has sufficient test coverage (unit/integration test) OR I have provided reason in the PR description for not having test coverage
  • Provide an end-to-end test plan in the PR description on how to manually test it on the devnet/testnet.
  • Tested the backwards compatibility.
  • Tested with XDC nodes running this version co-exist with those running the previous version.
  • Relevant documentation has been updated as part of this PR
  • N/A

liam.lai and others added 15 commits November 19, 2024 00:56
* add buffer channel to unlock deadlock

* add buffer channel to unlock deadlock

* close channel

---------

Co-authored-by: liam.lai <liam.lai@us>
…asternode-counts-issue

Fix tc cross epoch different masternode counts issue
* fix only timeout round exists in next epoch

* bump version

---------

Co-authored-by: liam.lai <liam.lai@us>
* get right tc epoch

* fix debug message

* merge test

* merge test

---------

Co-authored-by: liam.lai <liam.lai@us>
@benjamin202410 benjamin202410 merged commit af09344 into master Dec 31, 2024
80 checks passed
@benjamin202410 benjamin202410 deleted the release-br-v2.4.6-beta1 branch December 31, 2024 07:05
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.

3 participants