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

Fix provide service miner overcharge deposit bug #331

Merged
merged 5 commits into from
May 15, 2019

Conversation

xq262144
Copy link
Contributor

No description provided.

@codecov
Copy link

codecov bot commented May 15, 2019

Codecov Report

Merging #331 into develop will increase coverage by 0.02%.
The diff coverage is 64.7%.

@@             Coverage Diff             @@
##           develop     #331      +/-   ##
===========================================
+ Coverage     80.5%   80.52%   +0.02%     
===========================================
  Files          173      173              
  Lines        12278    12284       +6     
===========================================
+ Hits          9884     9892       +8     
+ Misses        1657     1648       -9     
- Partials       737      744       +7

Copy link
Contributor

@auxten auxten 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

@leventeliu leventeliu left a comment

Choose a reason for hiding this comment

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

LGTM.

@leventeliu leventeliu merged commit d564308 into develop May 15, 2019
@laodouya laodouya deleted the bugfix/provide_service branch May 15, 2019 06:42
@@ -723,7 +723,7 @@ func (c *Chain) replaceAndSwitchToBranch(
for _, b := range newIrres {
txCount += b.txCount
for _, tx := range b.load().Transactions {
if err := c.immutable.apply(tx); err != nil {
if err := c.immutable.apply(tx, newBranch.head.height); err != nil {
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe b.height here?

@xq262144 xq262144 restored the bugfix/provide_service branch May 15, 2019 06:45
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.

None yet

3 participants