Fix widespread merge corruption in main and add feed-stake TTL expiration/restoration tests.#643
Merged
Sadeequ merged 1 commit intoJul 26, 2026
Conversation
…tion/restoration tests main did not compile: colliding merges over the repo's history had left duplicate/broken function bodies, missing types, and dead references across src/lib.rs, storage.rs, admin.rs, consensus.rs, validation.rs, fees.rs, and slashing.rs. Reconstructed each conflicted or dropped piece by tracing it back through git history (storage-rent-expiry StellarFlow-Network#522, corridor-weight/liquidity-depth gates, escrow penalties, bundle processing) instead of guessing, and fixed two correctness bugs surfaced while testing: - auth::require_multisig read SIGNERS_KEY as a Map when it's actually stored as a plain u32 counter elsewhere, causing a host crash. - Several tuple-struct storage keys (StakeKey, SignerKey, RevokedSignerKey, NodeProfileKey) serialized identically regardless of type name, so registering a signer could make an unrelated address read back as "revoked". Converted them to namespaced enums. Added the actual requested test coverage: dedicated tests simulating feed-stake key expiration via env.ledger().set() manipulation, and verifying that a validator profile update before expiry restores the entry and extends its TTL rather than granting permanent immunity. 234/234 tests passing. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
|
@Thomson-dev Great news! 🎉 Based on an automated assessment of this PR, the linked Wave issue(s) no longer count against your application limits. You can now already apply to more issues while waiting for a review of this PR. Keep up the great work! 🚀 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #629
main did not compile: colliding merges over the repo's history had left duplicate/broken function bodies, missing types, and dead references across src/lib.rs, storage.rs, admin.rs, consensus.rs, validation.rs, fees.rs, and slashing.rs. Reconstructed each conflicted or dropped piece by tracing it back through git history (storage-rent-expiry #522, corridor-weight/liquidity-depth gates, escrow penalties, bundle processing) instead of guessing, and fixed two correctness bugs surfaced while testing:
Added the actual requested test coverage: dedicated tests simulating feed-stake key expiration via env.ledger().set() manipulation, and verifying that a validator profile update before expiry restores the entry and extends its TTL rather than granting permanent immunity.
234/234 tests passing.