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

Start saving/loading prior_roots(_with_hash) to snapshot (backport #23844)#24074

Merged
mergify[bot] merged 1 commit intov1.10from
mergify/bp/v1.10/pr-23844
Apr 2, 2022
Merged

Start saving/loading prior_roots(_with_hash) to snapshot (backport #23844)#24074
mergify[bot] merged 1 commit intov1.10from
mergify/bp/v1.10/pr-23844

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Apr 2, 2022

This began life as an automated backport.
@jeffwashington modified it to just deserialize the new fields.


This is an automatic backport of pull request #23844 done by Mergify.


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 automerge Merge this Pull Request automatically once CI passes label Apr 2, 2022
@jeffwashington jeffwashington force-pushed the mergify/bp/v1.10/pr-23844 branch from c5c2c05 to a67496f Compare April 2, 2022 02:24
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Apr 2, 2022
@solana-grimes
Copy link
Copy Markdown
Contributor

😱 New commits were pushed while the automerge label was present.

…ut does load them.

Original:
Start saving/loading prior_roots(_with_hash) to snapshot (#23844)

    * Start saving/loading prior_roots(_with_hash) to snapshot

    * Update runtime/src/accounts_index.rs

    Co-authored-by: Michael Vines <mvines@gmail.com>

    * Update runtime/src/accounts_index.rs

    Co-authored-by: Michael Vines <mvines@gmail.com>

    * update comment

    Co-authored-by: Michael Vines <mvines@gmail.com>
    (cherry picked from commit 396b49a)
@jeffwashington jeffwashington force-pushed the mergify/bp/v1.10/pr-23844 branch from a67496f to 32a01ef Compare April 2, 2022 03:04
Copy link
Copy Markdown
Contributor

@brooksprumo brooksprumo left a comment

Choose a reason for hiding this comment

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

lgtm

Testing/Validation

I built ledger-tool with this PR and was successfully able to run solana-ledger-tool verify against a v1.11 snapshot (which previously failed with a v1.10 ledger-tool).

I also cherry-picked this PR on top of v1.9.14 with the same results as 👆

Lastly, I tested this PR against a "legacy" snapshot to ensure we didn't break anything inadvertently. Ledger-tool was successful again.

@jeffwashington jeffwashington added automerge Merge this Pull Request automatically once CI passes v1.9 labels Apr 2, 2022
@mergify mergify Bot removed the automerge Merge this Pull Request automatically once CI passes label Apr 2, 2022
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Apr 2, 2022

automerge label removed due to a CI failure

@jeffwashington jeffwashington added the automerge Merge this Pull Request automatically once CI passes label Apr 2, 2022
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Apr 2, 2022

automerge label removed due to a CI failure

@mergify mergify Bot removed the automerge Merge this Pull Request automatically once CI passes label Apr 2, 2022
@jeffwashington jeffwashington added the automerge Merge this Pull Request automatically once CI passes label Apr 2, 2022
@mergify mergify Bot merged commit b157a91 into v1.10 Apr 2, 2022
mergify Bot added a commit that referenced this pull request Apr 2, 2022
…ut does load them. (#24074)

Original:
Start saving/loading prior_roots(_with_hash) to snapshot (#23844)

    * Start saving/loading prior_roots(_with_hash) to snapshot

    * Update runtime/src/accounts_index.rs

    Co-authored-by: Michael Vines <mvines@gmail.com>

    * Update runtime/src/accounts_index.rs

    Co-authored-by: Michael Vines <mvines@gmail.com>

    * update comment

    Co-authored-by: Michael Vines <mvines@gmail.com>
    (cherry picked from commit 396b49a)

Co-authored-by: Jeff Washington (jwash) <wash678@gmail.com>
(cherry picked from commit b157a91)
@mergify mergify Bot deleted the mergify/bp/v1.10/pr-23844 branch April 2, 2022 17:22
jeffwashington pushed a commit that referenced this pull request Apr 8, 2022
…ut does load them. (#24074) (#24078)

Original:
Start saving/loading prior_roots(_with_hash) to snapshot (#23844)

    * Start saving/loading prior_roots(_with_hash) to snapshot

    * Update runtime/src/accounts_index.rs

    Co-authored-by: Michael Vines <mvines@gmail.com>

    * Update runtime/src/accounts_index.rs

    Co-authored-by: Michael Vines <mvines@gmail.com>

    * update comment

    Co-authored-by: Michael Vines <mvines@gmail.com>
    (cherry picked from commit 396b49a)

Co-authored-by: Jeff Washington (jwash) <wash678@gmail.com>
(cherry picked from commit b157a91)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants