Skip to content

Fix/restore #2199

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.

Sign up for GitHub

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

Merged
elizabethengelman merged 8 commits into from
Sep 15, 2025
Merged

Fix/restore #2199

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b95b688
Add another parse_changes case to match
elizabethengelman Sep 10, 2025
afd7339
Temporarily comment out test_parse_changes_invalid_two_changes
elizabethengelman Sep 10, 2025
cf5b7a8
Refactor parse_changes in restore
elizabethengelman Sep 11, 2025
8a64ec1
Fmt & clippy
elizabethengelman Sep 11, 2025
2dbf690
Merge branch 'main' into fix/restore
elizabethengelman Sep 11, 2025
7bd5c86
Address PR feedback
elizabethengelman Sep 11, 2025
b43b994
Merge branch 'main' into fix/restore
elizabethengelman Sep 11, 2025
9fabdf1
Merge branch 'main' into fix/restore
elizabethengelman Sep 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
172 changes: 62 additions & 110 deletions cmd/soroban-cli/src/commands/contract/restore.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,40 +239,9 @@ impl NetworkRunnable for Cmd {
}

fn parse_changes(changes: &[LedgerEntryChange]) -> Option<u32> {
match changes.len() {
// Handle case with 2 changes (original expected format)
2 => match (&changes[0], &changes[1]) {
(
LedgerEntryChange::State(_),
LedgerEntryChange::Restored(LedgerEntry {
data:
LedgerEntryData::Ttl(TtlEntry {
live_until_ledger_seq,
..
}),
..
})
| LedgerEntryChange::Updated(LedgerEntry {
data:
LedgerEntryData::Ttl(TtlEntry {
live_until_ledger_seq,
..
}),
..
})
| LedgerEntryChange::Created(LedgerEntry {
data:
LedgerEntryData::Ttl(TtlEntry {
live_until_ledger_seq,
..
}),
..
}),
) => Some(*live_until_ledger_seq),
_ => None,
},
// Handle case with 1 change (single "Restored" type change)
1 => match &changes[0] {
changes
.iter()
.filter_map(|change| match change {
LedgerEntryChange::Restored(LedgerEntry {
data:
LedgerEntryData::Ttl(TtlEntry {
Expand All @@ -298,15 +267,18 @@ fn parse_changes(changes: &[LedgerEntryChange]) -> Option<u32> {
..
}) => Some(*live_until_ledger_seq),
_ => None,
},
_ => None,
}
})
.max()
}

#[cfg(test)]
mod tests {
use super::*;
use crate::xdr::{Hash, LedgerEntry, LedgerEntryChange, LedgerEntryData, TtlEntry};
use crate::xdr::{
ContractDataDurability::Persistent, ContractDataEntry, ContractId, Hash, LedgerEntry,
LedgerEntryChange, LedgerEntryData, ScAddress, ScSymbol, ScVal, SequenceNumber, StringM,
TtlEntry,
};

#[test]
fn test_parse_changes_two_changes_restored() {
Expand All @@ -333,6 +305,39 @@ mod tests {
assert_eq!(result, Some(12345));
}

#[test]
fn test_parse_two_changes_that_had_expired() {
let ttl_entry = TtlEntry {
live_until_ledger_seq: 55555,
key_hash: Hash([0; 32]),
};

let counter = "COUNTER".parse::<StringM<32>>().unwrap();
let contract_data_entry = ContractDataEntry {
ext: ExtensionPoint::default(),
contract: ScAddress::Contract(ContractId(Hash([0; 32]))),
key: ScVal::Symbol(ScSymbol(counter)),
durability: Persistent,
val: ScVal::U32(1),
};

let changes = vec![
LedgerEntryChange::Restored(LedgerEntry {
data: LedgerEntryData::Ttl(ttl_entry.clone()),
last_modified_ledger_seq: 37429,
ext: crate::xdr::LedgerEntryExt::V0,
}),
LedgerEntryChange::Restored(LedgerEntry {
data: LedgerEntryData::ContractData(contract_data_entry.clone()),
last_modified_ledger_seq: 37429,
ext: crate::xdr::LedgerEntryExt::V0,
}),
];

let result = parse_changes(&changes);
assert_eq!(result, Some(55555));
}

#[test]
fn test_parse_changes_two_changes_updated() {
// Test the original expected format with 2 changes, but second change is Updated
Expand Down Expand Up @@ -439,25 +444,27 @@ mod tests {

#[test]
fn test_parse_changes_invalid_two_changes() {
// Test invalid 2-change format (first change is not State)
let ttl_entry = TtlEntry {
live_until_ledger_seq: 55555,
key_hash: Hash([0; 32]),
};

let changes = vec![
LedgerEntryChange::Restored(LedgerEntry {
data: LedgerEntryData::Ttl(ttl_entry.clone()),
last_modified_ledger_seq: 0,
ext: crate::xdr::LedgerEntryExt::V0,
}),
LedgerEntryChange::Restored(LedgerEntry {
data: LedgerEntryData::Ttl(ttl_entry),
last_modified_ledger_seq: 0,
ext: crate::xdr::LedgerEntryExt::V0,
// Test invalid 2-change format (not TTL data)
let not_ttl_change = LedgerEntryChange::Restored(LedgerEntry {
data: LedgerEntryData::Account(crate::xdr::AccountEntry {
account_id: crate::xdr::AccountId(crate::xdr::PublicKey::PublicKeyTypeEd25519(
crate::xdr::Uint256([0; 32]),
)),
balance: 0,
seq_num: SequenceNumber(0),
num_sub_entries: 0,
inflation_dest: None,
flags: 0,
home_domain: crate::xdr::String32::default(),
thresholds: crate::xdr::Thresholds::default(),
signers: crate::xdr::VecM::default(),
ext: crate::xdr::AccountEntryExt::V0,
}),
];
last_modified_ledger_seq: 0,
ext: crate::xdr::LedgerEntryExt::V0,
});

let changes = vec![not_ttl_change.clone(), not_ttl_change];
let result = parse_changes(&changes);
assert_eq!(result, None);
}
Expand Down Expand Up @@ -496,59 +503,4 @@ mod tests {
let result = parse_changes(&changes);
assert_eq!(result, None);
}

#[test]
fn test_parse_changes_three_changes() {
// Test with 3 changes (should return None)
let ttl_entry = TtlEntry {
live_until_ledger_seq: 66666,
key_hash: Hash([0; 32]),
};

let changes = vec![
LedgerEntryChange::State(LedgerEntry {
data: LedgerEntryData::Ttl(ttl_entry.clone()),
last_modified_ledger_seq: 0,
ext: crate::xdr::LedgerEntryExt::V0,
}),
LedgerEntryChange::Restored(LedgerEntry {
data: LedgerEntryData::Ttl(ttl_entry.clone()),
last_modified_ledger_seq: 0,
ext: crate::xdr::LedgerEntryExt::V0,
}),
LedgerEntryChange::Updated(LedgerEntry {
data: LedgerEntryData::Ttl(ttl_entry),
last_modified_ledger_seq: 0,
ext: crate::xdr::LedgerEntryExt::V0,
}),
];

let result = parse_changes(&changes);
assert_eq!(result, None);
}

#[test]
fn test_parse_changes_mixed_invalid_types() {
// Test with mixed valid and invalid change types
let ttl_entry = TtlEntry {
live_until_ledger_seq: 77777,
key_hash: Hash([0; 32]),
};

let changes = vec![
LedgerEntryChange::State(LedgerEntry {
data: LedgerEntryData::Ttl(ttl_entry.clone()),
last_modified_ledger_seq: 0,
ext: crate::xdr::LedgerEntryExt::V0,
}),
LedgerEntryChange::State(LedgerEntry {
data: LedgerEntryData::Ttl(ttl_entry),
last_modified_ledger_seq: 0,
ext: crate::xdr::LedgerEntryExt::V0,
}),
];

let result = parse_changes(&changes);
assert_eq!(result, None);
}
}