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

Transfer v0.5.1 fixes to upstream #760

Merged
merged 6 commits into from
Sep 27, 2022
Merged

Transfer v0.5.1 fixes to upstream #760

merged 6 commits into from
Sep 27, 2022

Conversation

0xAleksaOpacic
Copy link
Contributor

@0xAleksaOpacic 0xAleksaOpacic commented Sep 26, 2022

Description

We had to release 0.5.1 version without all functionalities added into the develop after 0.5. For this we've checked out separate branch release/0.5.1 1 commit before BLS efforts and added 4 fixes. No we need to merge these fixes into the develop

Changes include

  • 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)

Checklist

  • I have assigned this PR to myself
  • I have added at least 1 reviewer
  • I have added the relevant labels
  • I have updated the official documentation
  • I have added sufficient documentation in code

Testing

  • I have tested this code with the official test suite
  • I have tested this code manually

dbrajovic and others added 5 commits September 7, 2022 10:55
* Remove dangling pointers in the subscription struct

* Remove leftover log
* Add e2e test to make sure transaction have set from field

* Recover tx from field before writing block into storage

* Recover tx from field if it's not set in JSON-RPC

* Fix lint error

* Fix lint error

* Fix lint error

* Move recovering from address to blockchain

* Removed unused code

* Fix missing tests

* Fix typo
* Disable seal configuration but keep CLI flag for sealing in order to remove it in the next minor release

* Add unadopted count in account queue in order to clean up inactive transactions in non-validator's TxPool

* Fix lint error

* Fix lint error

* Fix lint error

* Make Sealing() unexported in TxPool

* Rename unadopted to skips in AccountQueue of TxPool

* Add resetSkips and incrementSkips in AccountQueue

* Fix updateUnadoptedCounts and rename to updateAccountSkipsCounts

* Fixed updateAccountSkipsCounts

* Fix lint error

* Fix lint error occured after merging base branch

* Rename local var in updateAccountSkipsCounts
* add test

* Prune lower transactions on promoting

* Fix pruning in Promote

* Fix failed test

Co-authored-by: kourin <kourin.code@gmail.com>
@0xAleksaOpacic 0xAleksaOpacic added the feature New update to Polygon Edge label Sep 26, 2022
@0xAleksaOpacic 0xAleksaOpacic self-assigned this Sep 26, 2022
@zivkovicmilos zivkovicmilos marked this pull request as draft September 26, 2022 07:54
@zivkovicmilos zivkovicmilos changed the title Merge Release/0.5.1 into develop Transfer v0.5.1 fixes to upstream Sep 26, 2022
@0xAleksaOpacic 0xAleksaOpacic marked this pull request as ready for review September 26, 2022 11:29
@0xAleksaOpacic 0xAleksaOpacic marked this pull request as draft September 26, 2022 11:37
@0xAleksaOpacic 0xAleksaOpacic marked this pull request as ready for review September 26, 2022 11:40
@codecov
Copy link

codecov bot commented Sep 26, 2022

Codecov Report

Merging #760 (e17a949) into develop (7975703) will increase coverage by 0.31%.
The diff coverage is 82.03%.

@@             Coverage Diff             @@
##           develop     #760      +/-   ##
===========================================
+ Coverage    52.46%   52.77%   +0.31%     
===========================================
  Files          130      130              
  Lines        17069    17144      +75     
===========================================
+ Hits          8955     9048      +93     
+ Misses        7469     7451      -18     
  Partials       645      645              
Impacted Files Coverage Δ
consensus/ibft/ibft.go 1.60% <0.00%> (-0.01%) ⬇️
consensus/ibft/transport.go 0.00% <0.00%> (ø)
txpool/txpool.go 72.95% <72.58%> (-0.38%) ⬇️
blockchain/blockchain.go 53.24% <88.88%> (+1.62%) ⬆️
txpool/account.go 94.87% <97.22%> (-0.08%) ⬇️
blockchain/subscription.go 82.50% <100.00%> (+10.50%) ⬆️
blockchain/testing.go 60.29% <100.00%> (+0.99%) ⬆️
txpool/queue.go 80.62% <100.00%> (+0.15%) ⬆️
... and 5 more

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

Copy link
Contributor

@Kourin1996 Kourin1996 left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@zivkovicmilos zivkovicmilos left a comment

Choose a reason for hiding this comment

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

Looks good 💯

@0xAleksaOpacic 0xAleksaOpacic merged commit 6b93e54 into develop Sep 27, 2022
@github-actions github-actions bot locked and limited conversation to collaborators Sep 27, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
feature New update to Polygon Edge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants