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.

Sign up for GitHub

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

Jump to bottom

consensus/bor: handle blockalloc balance changes #1074

Merged
merged 4 commits into from
Dec 1, 2023
Merged

consensus/bor: handle blockalloc balance changes #1074

merged 4 commits into from
Dec 1, 2023

Conversation

anshalshukla
Copy link
Contributor

Description

The blockalloc balances are not getting updated after HF.

Changes

  • Bugfix (non-breaking change that solves an issue)
  • Hotfix (change that solves an urgent issue, and requires immediate attention)
  • New feature (non-breaking change that adds functionality)
  • Breaking change (change that is not backwards-compatible and/or changes current functionality)
  • Changes only for a subset of nodes

Breaking changes

Please complete this section if any breaking changes have been made, otherwise delete it

Nodes audience

In case this PR includes changes that must be applied only to a subset of nodes, please specify how you handled it (e.g. by adding a flag with a default value...)

Checklist

  • I have added at least 2 reviewer or the whole pos-v1 team
  • I have added sufficient documentation in code
  • I will be resolving comments - if any - by pushing each fix in a separate commit and linking the commit hash in the comment reply
  • Created a task in Jira and informed the team for implementation in Erigon client (if applicable)
  • Includes RPC methods changes, and the Notion documentation has been updated

Cross repository changes

  • This PR requires changes to heimdall
    • In case link the PR here:
  • This PR requires changes to matic-cli
    • In case link the PR here:

Testing

  • I have added unit tests
  • I have added tests to CI
  • I have tested this code manually on local environment
  • I have tested this code manually on remote devnet using express-cli
  • I have tested this code manually on mumbai
  • I have created new e2e tests into express-cli

Manual tests

Please complete this section with the steps you performed if you ran manual tests for this functionality, otherwise delete it

Additional comments

Please post additional comments in this section if you have them, otherwise delete it

@anshalshukla anshalshukla changed the base branch from master to develop November 6, 2023 19:22
0xsharma
0xsharma approved these changes Nov 6, 2023
View reviewed changes
Copy link
Contributor

@0xsharma 0xsharma left a comment

Choose a reason for hiding this comment

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

LGTM ✅

@codecov Codecov
Copy link

codecov bot commented Nov 7, 2023 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (bc338be) 57.09% compared to head (74d42cb) 56.00%.
Report is 333 commits behind head on develop.

Additional details and impacted files 
@@             Coverage Diff             @@
##           develop    #1074      +/-   ##
===========================================
- Coverage    57.09%   56.00%   -1.10%     
===========================================
  Files          650      658       +8     
  Lines       118277   114449    -3828     
===========================================
- Hits         67533    64094    -3439     
+ Misses       46868    46495     -373     
+ Partials      3876     3860      -16

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

@anshalshukla anshalshukla requested a review from a team November 16, 2023 08:41
marcello33
marcello33 approved these changes Nov 16, 2023
View reviewed changes
Copy link
Contributor

@marcello33 marcello33 left a comment

Choose a reason for hiding this comment

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

LGTM. Shall we maybe add a test for it?

@manav2401 manav2401 changed the title Blockalloc balance consensus/bor: handle blockalloc balance changes Nov 30, 2023
@anshalshukla anshalshukla merged commit 1065e21 into develop Dec 1, 2023
13 of 14 checks passed
Woodpile37 added a commit to Woodpile37/bor that referenced this pull request Jan 10, 2024
@Woodpile37
Squashed commit of the following:
702e23d 
commit dac4c40
Author: Vaibhav Jindal <[email protected]>
Date:   Mon Dec 18 15:38:12 2023 +0530

    Removed the check for milestoneID in the GetVoteOnHash()

commit 8b2f024
Author: Pratik Patil <[email protected]>
Date:   Fri Dec 15 12:49:11 2023 +0530

    test all default flags added via config file (maticnetwork#1105)

commit 2be2789
Merge: db5b398 18c8802
Author: Arpit Temani <[email protected]>
Date:   Tue Dec 12 10:57:53 2023 +0530

    Merge pull request maticnetwork#1085 from bbaktaeho/fix/eth_api

    internal/ethapi: fix GetTransactionReceiptsByBlock method

commit db5b398
Author: marcello33 <[email protected]>
Date:   Fri Dec 8 06:56:23 2023 +0100

    Update matic-cli in CI (maticnetwork#1103)

commit abab36b
Merge: 1065e21 073d75c
Author: Arpit Temani <[email protected]>
Date:   Wed Dec 6 10:46:55 2023 +0530

    Merge pull request maticnetwork#1098 from maticnetwork/arpit/fix-shadowfork

    allow unprotected txns

commit 073d75c
Merge: 4e3e1de 9682679
Author: Arpit Temani <[email protected]>
Date:   Sun Dec 3 17:17:30 2023 +0530

    Merge branch 'arpit/fix-shadowfork' of github.com:maticnetwork/bor into arpit/fix-shadowfork

commit 4e3e1de
Author: Arpit Temani <[email protected]>
Date:   Sun Dec 3 17:16:37 2023 +0530

    added log

commit 9682679
Author: Arpit Temani <[email protected]>
Date:   Sun Dec 3 17:14:57 2023 +0530

    Update core/txpool/validation.go

    Co-authored-by: Raneet Debnath <[email protected]>

commit 1065e21
Author: Anshal Shukla <[email protected]>
Date:   Fri Dec 1 11:39:58 2023 +0530

    consensus/bor: handle blockalloc balance changes (maticnetwork#1074)

    * fix: set balance in blockalloc

    * chg: don't update balance if not zero

    * fix: lint

    * fix logic, add test cases

commit 91ff270
Author: Arpit Temani <[email protected]>
Date:   Thu Nov 30 15:35:46 2023 +0530

    allow unprotected txns

commit 18c8802
Author: bbaktaeho <[email protected]>
Date:   Fri Nov 17 19:34:50 2023 +0900

    fix: lint

commit 7714cd8
Author: bbaktaeho <[email protected]>
Date:   Thu Nov 16 23:04:53 2023 +0900

    fix GetTransactionReceiptsByBlock
anshalshukla added a commit that referenced this pull request Mar 28, 2024
@anshalshukla
consensus/bor: handle blockalloc balance changes (#1074)
f506350 
* fix: set balance in blockalloc

* chg: don't update balance if not zero

* fix: lint

* fix logic, add test cases
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@manav2401 manav2401 manav2401 approved these changes

@marcello33 marcello33 marcello33 approved these changes

@0xsharma 0xsharma 0xsharma approved these changes

@temaniarpit27 temaniarpit27 Awaiting requested review from temaniarpit27

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@anshalshukla @0xsharma @marcello33 @manav2401