Fix merge conflict

[open-junius]

Description

Related Issue(s)

• Closes #[issue number]

Type of Change

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to not work as expected)
• Documentation update
• Other (please describe):

Breaking Change

If this PR introduces a breaking change, please provide a detailed description of the impact and the migration path for existing applications.

Checklist

• I have performed a self-review of my own code
• I have commented my code, particularly in hard-to-understand areas
• I have run ./scripts/fix_rust.sh to ensure my code is formatted and linted correctly
• I have made corresponding changes to the documentation
• My changes generate no new warnings
• I have added tests that prove my fix is effective or that my feature works
• New and existing unit tests pass locally with my changes
• Any dependent changes have been merged and published in downstream modules

Screenshots (if applicable)

Please include any relevant screenshots or GIFs that demonstrate the changes made.

Additional Notes

Please provide any additional information or context that may be helpful for reviewers.

[github-actions]

🛡️ AI Review — Skeptic (security review)

VERDICT: SAFE

BASELINE scrutiny: open-junius has repository write permission, a >2-year-old account, substantial contribution history, and prior merged subtensor PRs; branch fix-merge-conflict targets devnet-ready.

Reviewed the full prefetched diff and contributor signals. The PR only adjusts pallets/subtensor/src/staking/order_swap.rs and bumps runtime/src/lib.rs spec_version; it does not touch .github/ai-review/*, .github/copilot-instructions.md, dependencies, build scripts, or lockfiles.

Findings

No findings.

Conclusion

No malicious behavior or security vulnerability found in the static diff. The removed stake-operation-limit calls do not correspond to active helper definitions in the reviewed tree, while the remaining staking paths still enforce subnet existence, hotkey existence, balance/stake availability, lock availability, and safe arithmetic patterns relevant to this hunk.

---

🔍 AI Review — Auditor (domain review)

VERDICT: 👍

Established contributor by history; no direct gittensor allowlist match found, but author has substantial recent subtensor activity (LIKELY).

The Auditor proposed a replacement PR description, but the current body is non-trivial; not overwriting. Maintainers: ask the Auditor to regenerate if you want it.

The PR is a small merge-conflict cleanup in order_swap: it aligns the call to stake_into_subnet with the current six-argument signature and removes stale stake-operation-limit calls that no longer exist in this worktree. It also bumps runtime/src/lib.rs spec_version from 416 to 417, which is appropriate for a runtime-affecting change on devnet-ready.

The existing PR body is template-only, so I generated a proposed replacement body for the post-script to apply. No duplicate PR is a better candidate; the only complete overlap is the author's larger precompile/order work (#2685), while this PR is just the merge-conflict/runtime-version follow-up needed on the current target branch.

No build/test run was needed: the diff is limited to resolving obsolete call sites and a version bump, and the surrounding call graph confirms stake_into_subnet now takes six arguments while stake-operation-limit helpers are absent from the current tree.

Findings

No findings.

Conclusion

Approve. The changes are narrowly scoped, consistent with the current staking API, and include the required runtime spec-version bump.

[github-actions]

🔄 AI review updated — Skeptic: SAFE Auditor: 👍

[open-junius]

duplicated with #2720