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

v2.2: Feature - Adds UpgradeableLoaderInstruction::Migrate (#4661) (backport of #4992) #4998

Merged
merged 1 commit into from
Feb 18, 2025

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Feb 14, 2025

Problem

#4661 was caught in the crossfire during the removal of the SDK crates from this repository.

Summary of Changes

Reverts #4870.


This is an automatic backport of pull request #4992 done by [Mergify](https://mergify.com).

@mergify mergify bot requested a review from a team as a code owner February 14, 2025 20:13
@mergify mergify bot added the conflicts label Feb 14, 2025
Copy link
Author

mergify bot commented Feb 14, 2025

Cherry-pick of 7491134 has failed:

On branch mergify/bp/v2.2/pr-4992
Your branch is up to date with 'origin/v2.2'.

You are currently cherry-picking commit 74911342e.
  (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:   Cargo.lock
	modified:   programs/bpf_loader/Cargo.toml
	modified:   runtime/Cargo.toml
	modified:   runtime/src/bank/tests.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   programs/bpf_loader/src/lib.rs
	both modified:   transaction-status/src/parse_bpf_loader.rs

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Copy link
Author

mergify bot commented Feb 14, 2025

The Firedancer team maintains a line-for-line reimplementation of the
native programs, and until native programs are moved to BPF, those
implementations must exactly match their Agave counterparts.
If this PR represents a change to a native program implementation (not
tests), please include a reviewer from the Firedancer team. And please
keep refactors to a minimum.

@Lichtso
Copy link

Lichtso commented Feb 14, 2025

Needs to be rebased once #4972 is merged.

@Lichtso Lichtso force-pushed the mergify/bp/v2.2/pr-4992 branch 2 times, most recently from 9413453 to f584aaf Compare February 14, 2025 21:45
@Lichtso Lichtso removed the conflicts label Feb 14, 2025
* Adds UpgradeableLoaderInstruction::Migrate.
* Adds test_loader_v3_to_v4_migration.

(cherry picked from commit 7491134)

# Conflicts:
#	programs/bpf_loader/src/lib.rs
#	transaction-status/src/parse_bpf_loader.rs
@Lichtso Lichtso force-pushed the mergify/bp/v2.2/pr-4992 branch from f584aaf to 601039a Compare February 14, 2025 23:15
@Lichtso
Copy link

Lichtso commented Feb 18, 2025

@t-nelson This is the backport which fills the hole we left in this other backport here: #4972 (comment)

Copy link

@t-nelson t-nelson left a comment

Choose a reason for hiding this comment

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

is this flagged for audit? cc/ @willhickey

@willhickey
Copy link

is this flagged for audit? cc/ @willhickey

It is now! I'll get someone looking at it

@Lichtso Lichtso merged commit 59e8e0d into v2.2 Feb 18, 2025
46 checks passed
@Lichtso Lichtso deleted the mergify/bp/v2.2/pr-4992 branch February 18, 2025 18:23
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.

4 participants