Skip to content

v3.1: runtime: Relax program data account check in migration (backport of #9891)#9998

Merged
febo merged 2 commits intov3.1from
mergify/bp/v3.1/pr-9891
Jan 16, 2026
Merged

v3.1: runtime: Relax program data account check in migration (backport of #9891)#9998
febo merged 2 commits intov3.1from
mergify/bp/v3.1/pr-9891

Conversation

@mergify
Copy link

@mergify mergify bot commented Jan 13, 2026

Problem

SIMD-0444 enables runtime-level program migrations when the target program data accounts is already funded, which currently it is not possible.

Summary of Changes

This PR adds a feature gate for SIMD-0444 and updates the migration validation to allow pre-funded program data accounts.


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

* Add feature gate

* Add tests

* Improve test coverage

* Add zero-lamports tests back

(cherry picked from commit 5390905)

# Conflicts:
#	feature-set/src/lib.rs
@mergify mergify bot added the conflicts label Jan 13, 2026
@mergify mergify bot requested a review from a team as a code owner January 13, 2026 20:55
@mergify mergify bot added the conflicts label Jan 13, 2026
@mergify mergify bot assigned febo Jan 13, 2026
@mergify
Copy link
Author

mergify bot commented Jan 13, 2026

Cherry-pick of 5390905 has failed:

On branch mergify/bp/v3.1/pr-9891
Your branch is up to date with 'origin/v3.1'.

You are currently cherry-picking commit 5390905a3.
  (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/bank/builtins/core_bpf_migration/mod.rs
	modified:   runtime/src/bank/builtins/core_bpf_migration/target_bpf_v2.rs
	modified:   runtime/src/bank/builtins/core_bpf_migration/target_builtin.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   feature-set/src/lib.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

@codecov-commenter
Copy link

Codecov Report

❌ Patch coverage is 98.64499% with 5 lines in your changes missing coverage. Please review.
✅ Project coverage is 83.2%. Comparing base (cf659c3) to head (3264688).
⚠️ Report is 1 commits behind head on v3.1.

Additional details and impacted files
@@           Coverage Diff            @@
##             v3.1    #9998    +/-   ##
========================================
  Coverage    83.2%    83.2%            
========================================
  Files         865      865            
  Lines      376142   376458   +316     
========================================
+ Hits       313144   313484   +340     
+ Misses      62998    62974    -24     
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@t-nelson
Copy link

who needs to sme here? we want this in before tomorrow so it lands in the mb upgrade candidate

@steviez steviez requested a review from buffalojoec January 15, 2026 22:49
@febo febo merged commit 06f22ea into v3.1 Jan 16, 2026
44 checks passed
@febo febo deleted the mergify/bp/v3.1/pr-9891 branch January 16, 2026 15:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants