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

Serialize lamports per signature (backport #25364)#25805

Merged
mergify[bot] merged 1 commit intov1.10from
mergify/bp/v1.10/pr-25364
Jun 22, 2022
Merged

Serialize lamports per signature (backport #25364)#25805
mergify[bot] merged 1 commit intov1.10from
mergify/bp/v1.10/pr-25364

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Jun 6, 2022

This is an automatic backport of pull request #25364 done by Mergify.
Cherry-pick of 8caced6 has failed:

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

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

Changes to be committed:
	modified:   runtime/src/bank.rs
	modified:   runtime/src/genesis_utils.rs
	modified:   sdk/program/src/fee_calculator.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   runtime/src/serde_snapshot.rs
	both modified:   runtime/src/serde_snapshot/newer.rs
	both modified:   runtime/src/serde_snapshot/tests.rs

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/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.com

@mergify mergify Bot added the conflicts label Jun 6, 2022
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Jun 6, 2022
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Jun 6, 2022

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 Jun 6, 2022
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Jun 7, 2022

automerge label removed due to a CI failure

@codecov
Copy link
Copy Markdown

codecov Bot commented Jun 7, 2022

Codecov Report

Merging #25805 (8caced6) into v1.10 (54c405a) will increase coverage by 0.6%.
The diff coverage is 48.9%.

❗ Current head 8caced6 differs from pull request most recent head 59f5d67. Consider uploading reports for the commit 59f5d67 to get more accurate results

@@            Coverage Diff            @@
##            v1.10   #25805     +/-   ##
=========================================
+ Coverage    81.4%    82.1%   +0.6%     
=========================================
  Files         597      628     +31     
  Lines      163041   171471   +8430     
=========================================
+ Hits       132837   140878   +8041     
- Misses      30204    30593    +389     

@AshwinSekar AshwinSekar force-pushed the mergify/bp/v1.10/pr-25364 branch 2 times, most recently from 6f264e9 to 30d5dc6 Compare June 7, 2022 03:33
@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 Jun 7, 2022
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Jun 7, 2022

automerge label removed due to a CI failure

@AshwinSekar AshwinSekar force-pushed the mergify/bp/v1.10/pr-25364 branch from 30d5dc6 to f932d4e Compare June 7, 2022 15:35
@brooksprumo
Copy link
Copy Markdown
Contributor

@AshwinSekar Looks like CI is failing here; can you resolve it?

Looks like someone hit this in #26074 due to their v1.10 node downloading a v1.11 snapshot.

@brooksprumo brooksprumo linked an issue Jun 21, 2022 that may be closed by this pull request
@AshwinSekar AshwinSekar force-pushed the mergify/bp/v1.10/pr-25364 branch from f932d4e to 9f01022 Compare June 22, 2022 07:56
@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 Jun 22, 2022
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Jun 22, 2022

automerge label removed due to a CI failure

This allows us to deserialize v1.11 snapshots

Original:
Serialize lamports per signature (#25364)

* Serialize lamports per signature

* Add full snapshot archive test, enable features in previous tests

(cherry picked from commit 8caced6)
@AshwinSekar AshwinSekar force-pushed the mergify/bp/v1.10/pr-25364 branch from 9f01022 to 59f5d67 Compare June 22, 2022 08:34
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Jun 22, 2022
@mergify mergify Bot merged commit f7221e6 into v1.10 Jun 22, 2022
@mergify mergify Bot deleted the mergify/bp/v1.10/pr-25364 branch June 22, 2022 10:11
steviez pushed a commit to steviez/solana that referenced this pull request Jul 4, 2022
Issue solana-labs#25805 backported the ability to deserialize the additional
lamports_per_signature field; this change makes it such that v1.10
clients will serialize the value as well (this was left out of the
initial backport).
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.

Testnet Validator is failing to start

2 participants