Update ttl ledger entry option

Author: elizabethengelman

cmd/crates/soroban-test/tests/it/integration/ledger/entry.rs

@@ -372,47 +372,21 @@ async fn ledger_entry_ttl() {
     )
     .await;
 
-    let storage_key = "COUNTER";
-    let storage_key_xdr = ScVal::Symbol(storage_key.try_into().unwrap())
-        .to_xdr_base64(Limits::none())
-        .unwrap();
-    println!("storage key: {}", storage_key_xdr);
-
-    // update contract storage
-    sandbox
-        .invoke_with_test(&["--id", &contract_id, "--", "inc"])
-        .await
-        .unwrap();
-
-    // get the data's TTL
+    // get the contract's TTL
     let output = sandbox
         .new_assert_cmd("ledger")
         .arg("entry")
         .arg("fetch")
         .arg("--network")
         .arg("testnet")
         .arg("--ttl")
-        .arg(storage_key_xdr)
+        .arg(contract_id)
         .assert()
         .success()
         .stdout_as_str();
     let parsed_output: FullLedgerEntries =
         serde_json::from_str(&output).expect("Failed to parse JSON");
     assert!(!parsed_output.entries.is_empty());
-
-    // let parsed_key_xdr_output: FullLedgerEntries = serde_json::from_str(&key_xdr_output).expect("Failed to parse JSON");
-    // assert!(!parsed_key_xdr_output.entries.is_empty());
-
-    // let expected_contract_data_key = expected_contract_ledger_key(&contract_id, storage_key).await;
-
-    // assert_eq!(parsed_key_output.entries[0].key, expected_contract_data_key);
-    // assert!(matches!(parsed_key_output.entries[0].val, LedgerEntryData::ContractData{ .. }));
-
-    // assert_eq!(parsed_key_xdr_output.entries[0].key, expected_contract_data_key);
-    // assert!(matches!(parsed_key_xdr_output.entries[0].val, LedgerEntryData::ContractData{ .. }));
-
-    // // the output should be the same regardless of key format
-    // assert_eq!(parsed_key_output.entries, parsed_key_xdr_output.entries);
 }
 
 // Helper Fns

cmd/soroban-cli/src/commands/ledger/entry/fetch.rs

@@ -12,9 +12,13 @@ use crate::config::network::Network;
 use crate::rpc::{self};
 use crate::{config, xdr};
 use clap::{command, Parser};
-use hex::FromHexError;
+use hex::{FromHex, FromHexError};
 use soroban_spec_tools::utils::padded_hex_from_str;
-use stellar_strkey::ed25519::PublicKey as Ed25519PublicKey;
+use stellar_strkey::Strkey;
+use stellar_strkey::{
+    Contract,
+    ed25519::PublicKey as Ed25519PublicKey
+};
 use stellar_xdr::curr::{
     AccountId, AlphaNum12, AlphaNum4, AssetCode12, AssetCode4,
     ClaimableBalanceId::ClaimableBalanceIdTypeV0, ConfigSettingId, ContractDataDurability, Hash,
@@ -189,9 +193,28 @@ impl Cmd {
 
         if let Some(ttl) = &self.ttl {
             for x in ttl {
-                let hash = Hash(padded_hex_from_str(x, 32)?.try_into().unwrap());
+                let bytes: [u8; 32] = if x.starts_with('C') && x.len() == 56 {
+                    // Contract ID (StrKey-encoded)
+                    if let stellar_strkey::Strkey::Contract(Contract(contract_id)) = Strkey::from_string(x).unwrap() {
+                        contract_id
+                    } else {
+                        //todo: handle this error
+                        panic!("Invalid StrKey type, expected Contract");
+                    }
+                } else {
+                    // Hex-encoded 32-byte hash
+                    let clean = x.trim_start_matches("0x");
+                    let vec = Vec::from_hex(clean)?;
+                    if vec.len() != 32 {
+                        panic!("Expected 32-byte hash, got {} bytes", vec.len())
+                    }
+                    vec.try_into().unwrap()
+                };
+
+                let hash = Hash(bytes);
                 let key = LedgerKey::Ttl(LedgerKeyTtl { key_hash: hash });
                 ledger_keys.push(key);
+
             }
         }