From aa45a6e61149c5eb9a217a9dfd253cd7b5faf8ee Mon Sep 17 00:00:00 2001
From: Alfonso Acosta <alfonso@stellar.org>
Date: Mon, 11 Sep 2023 23:28:48 +0200
Subject: [PATCH] cli: Remove explicit decoding depths

---
 cmd/soroban-cli/src/rpc/mod.rs             | 14 ++++++------
 cmd/soroban-cli/src/utils/contract_spec.rs | 26 ++++++----------------
 2 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/cmd/soroban-cli/src/rpc/mod.rs b/cmd/soroban-cli/src/rpc/mod.rs
index 0e97964827..e1e05b7d89 100644
--- a/cmd/soroban-cli/src/rpc/mod.rs
+++ b/cmd/soroban-cli/src/rpc/mod.rs
@@ -4,7 +4,11 @@ use jsonrpsee_core::params::ObjectParams;
 use jsonrpsee_core::{self, client::ClientT, rpc_params};
 use jsonrpsee_http_client::{HeaderMap, HttpClient, HttpClientBuilder};
 use serde_aux::prelude::{deserialize_default_from_null, deserialize_number_from_string};
+<<<<<<< Updated upstream
 use soroban_env_host::xdr::DepthLimitedRead;
+=======
+use soroban_env_host::xdr::SorobanAuthorizedFunction;
+>>>>>>> Stashed changes
 use soroban_env_host::xdr::{
     self, AccountEntry, AccountId, ContractDataEntry, DiagnosticEvent, Error as XdrError,
     LedgerEntryData, LedgerFootprint, LedgerKey, LedgerKeyAccount, PublicKey, ReadXdr,
@@ -519,9 +523,8 @@ soroban config identity fund {address} --helper-url <url>"#
             ));
         }
         let ledger_entry = &entries[0];
-        let mut depth_limit_read = DepthLimitedRead::new(ledger_entry.xdr.as_bytes(), 100);
         if let LedgerEntryData::Account(entry) =
-            LedgerEntryData::read_xdr_base64(&mut depth_limit_read)?
+            LedgerEntryData::from_xdr_base64(ledger_entry.xdr.as_bytes())?
         {
             tracing::trace!(account=?entry);
             Ok(entry)
@@ -550,11 +553,8 @@ soroban config identity fund {address} --helper-url <url>"#
             let error = error_result_xdr
                 .ok_or(Error::MissingError)
                 .and_then(|x| {
-                    TransactionResult::read_xdr_base64(&mut DepthLimitedRead::new(
-                        x.as_bytes(),
-                        100,
-                    ))
-                    .map_err(|_| Error::InvalidResponse)
+                    TransactionResult::from_xdr_base64(x.as_bytes())
+                        .map_err(|_| Error::InvalidResponse)
                 })
                 .map(|r| r.result);
             tracing::error!(?error);
diff --git a/cmd/soroban-cli/src/utils/contract_spec.rs b/cmd/soroban-cli/src/utils/contract_spec.rs
index da67bedc48..de7272995c 100644
--- a/cmd/soroban-cli/src/utils/contract_spec.rs
+++ b/cmd/soroban-cli/src/utils/contract_spec.rs
@@ -1,14 +1,11 @@
 use base64::{engine::general_purpose::STANDARD as base64, Engine as _};
-use std::{
-    fmt::Display,
-    io::{self, Cursor},
-};
+use std::{fmt::Display, io};
 
 use soroban_env_host::xdr::{
-    self, DepthLimitedRead, ReadXdr, ScEnvMetaEntry, ScMetaEntry, ScMetaV0, ScSpecEntry,
-    ScSpecFunctionV0, ScSpecUdtEnumV0, ScSpecUdtErrorEnumV0, ScSpecUdtStructV0, ScSpecUdtUnionV0,
-    StringM, WriteXdr,
+    self, ReadXdr, ScEnvMetaEntry, ScMetaEntry, ScMetaV0, ScSpecEntry, ScSpecFunctionV0,
+    ScSpecUdtEnumV0, ScSpecUdtErrorEnumV0, ScSpecUdtStructV0, ScSpecUdtUnionV0, StringM, WriteXdr,
 };
+use soroban_sdk::xdr::VecM;
 
 pub struct ContractSpec {
     pub env_meta_base64: Option<String>,
@@ -59,10 +56,7 @@ impl ContractSpec {
         let mut env_meta_base64 = None;
         let env_meta = if let Some(env_meta) = env_meta {
             env_meta_base64 = Some(base64.encode(env_meta));
-            let cursor = Cursor::new(env_meta);
-            let mut depth_limit_read = DepthLimitedRead::new(cursor, 100);
-            ScEnvMetaEntry::read_xdr_iter(&mut depth_limit_read)
-                .collect::<Result<Vec<_>, xdr::Error>>()?
+            VecM::<ScEnvMetaEntry>::from_xdr(env_meta)?.into()
         } else {
             vec![]
         };
@@ -70,10 +64,7 @@ impl ContractSpec {
         let mut meta_base64 = None;
         let meta = if let Some(meta) = meta {
             meta_base64 = Some(base64.encode(meta));
-            let cursor = Cursor::new(meta);
-            let mut depth_limit_read = DepthLimitedRead::new(cursor, 100);
-            ScMetaEntry::read_xdr_iter(&mut depth_limit_read)
-                .collect::<Result<Vec<_>, xdr::Error>>()?
+            VecM::<ScMetaEntry>::from_xdr(meta)?.into()
         } else {
             vec![]
         };
@@ -81,10 +72,7 @@ impl ContractSpec {
         let mut spec_base64 = None;
         let spec = if let Some(spec) = spec {
             spec_base64 = Some(base64.encode(spec));
-            let cursor = Cursor::new(spec);
-            let mut depth_limit_read = DepthLimitedRead::new(cursor, 100);
-            ScSpecEntry::read_xdr_iter(&mut depth_limit_read)
-                .collect::<Result<Vec<_>, xdr::Error>>()?
+            VecM::<ScSpecEntry>::from_xdr(spec)?.into()
         } else {
             vec![]
         };