Fix contract restore panic when restoring a missing entry - #2660
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
Prevents contract restore from panicking when a requested ledger entry does not exist.
Changes:
- Safely handles empty ledger-entry results with
LedgerEntryNotFound. - Adds an integration regression test verifying clean failure without panic.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
cmd/soroban-cli/src/commands/contract/restore.rs |
Replaces unsafe indexing with checked access. |
cmd/crates/soroban-test/tests/it/integration/hello_world.rs |
Tests restoration of a nonexistent entry. |
leighmcculloch
enabled auto-merge (squash)
July 28, 2026 03:49
fnando
approved these changes
Jul 28, 2026
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
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.
What
Guard
stellar contract restoreagainst the same "index out of bounds" panic that #2657 fixed inextend: the no-op path unconditionally indexedentry.entries[0], which panics if the post-transaction fetch returns no entries. It now errors with "Ledger entry not found" instead.Why
restorecarried the identical unguarded indexing asextend(see #2599), so this applies the same.first().ok_or(Error::LedgerEntryNotFound)?fix. Unlike extend, restoring a non-existent entry fails cleanly at simulation ("Missing entry to restore") before reaching the no-op path, so this guard is defensive hardening for the narrower case where the fetch after a no-op comes back empty (e.g. the entry was evicted in the meantime). The regression test asserts the non-existent-entry case fails cleanly at simulation without panicking.Known limitations
The empty-fetch-after-no-op case itself isn't covered by an integration test since simulation catches the straightforward missing-entry scenario first.