Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

Fix fee mismatch on snapshot deserialize (bp #12697)#12753

Merged
mergify[bot] merged 1 commit intov1.3from
mergify/bp/v1.3/pr-12697
Oct 12, 2020
Merged

Fix fee mismatch on snapshot deserialize (bp #12697)#12753
mergify[bot] merged 1 commit intov1.3from
mergify/bp/v1.3/pr-12697

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Oct 9, 2020

This is an automated backport of pull request #12697 done by Mergify

Cherry-pick of c879e7c has failed:

On branch mergify/bp/v1.3/pr-12697
Your branch is up to date with 'origin/v1.3'.

You are currently cherry-picking commit c879e7c1a.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	modified:   core/tests/bank_forks.rs
	modified:   explorer/wasm/src/stake_account.rs
	modified:   runtime/src/blockhash_queue.rs
	modified:   runtime/src/epoch_stakes.rs
	modified:   runtime/src/serde_snapshot/tests.rs
	modified:   sdk/src/fee_calculator.rs
	modified:   sdk/src/hard_forks.rs
	modified:   sdk/src/stake_history.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   runtime/src/bank.rs

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

@mergify mergify Bot added the conflicts label Oct 9, 2020
@codecov
Copy link
Copy Markdown

codecov Bot commented Oct 9, 2020

Codecov Report

Merging #12753 into v1.3 will decrease coverage by 0.0%.
The diff coverage is 93.6%.

@@           Coverage Diff            @@
##            v1.3   #12753     +/-   ##
========================================
- Coverage   81.9%    81.8%   -0.1%     
========================================
  Files        359      359             
  Lines      83501    83538     +37     
========================================
- Hits       68398    68395      -3     
- Misses     15103    15143     +40     

@carllin carllin force-pushed the mergify/bp/v1.3/pr-12697 branch from 0e95c64 to a95be16 Compare October 9, 2020 19:12
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Oct 9, 2020
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Oct 9, 2020

automerge label removed due to a CI failure

@mergify mergify Bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Oct 9, 2020
@carllin carllin force-pushed the mergify/bp/v1.3/pr-12697 branch from a95be16 to ce7bc5d Compare October 12, 2020 10:14
@mergify mergify Bot removed the automerge Merge this Pull Request automatically once CI passes label Oct 12, 2020
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Oct 12, 2020

automerge label removed due to a CI failure

@carllin carllin force-pushed the mergify/bp/v1.3/pr-12697 branch from ce7bc5d to ab606c6 Compare October 12, 2020 10:22
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Oct 12, 2020
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Oct 12, 2020

automerge label removed due to a CI failure

@mergify mergify Bot removed the automerge Merge this Pull Request automatically once CI passes label Oct 12, 2020
Co-authored-by: Carl Lin <carl@solana.com>
(cherry picked from commit c879e7c)
@carllin carllin force-pushed the mergify/bp/v1.3/pr-12697 branch from ab606c6 to 860373e Compare October 12, 2020 10:25
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Oct 12, 2020
@mergify mergify Bot merged commit edf59cc into v1.3 Oct 12, 2020
@mergify mergify Bot deleted the mergify/bp/v1.3/pr-12697 branch October 12, 2020 11:34
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

automerge Merge this Pull Request automatically once CI passes conflicts

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant