Adapt to recent changes in env

Cargo.toml

@@ -42,17 +42,17 @@ soroban-token-sdk = { version = "20.0.0-rc2", path = "soroban-token-sdk" }
 [workspace.dependencies.soroban-env-common]
 version = "20.0.0-rc2"
 git = "https://github.com/stellar/rs-soroban-env"
-rev = "44cba6a72cd2cca9594de492298eea1a7ed0e031"
+rev = "511337e0fc1f38cc0aaefe3616d39dcdf3e05ccb"
 
 [workspace.dependencies.soroban-env-guest]
 version = "20.0.0-rc2"
 git = "https://github.com/stellar/rs-soroban-env"
-rev = "44cba6a72cd2cca9594de492298eea1a7ed0e031"
+rev = "511337e0fc1f38cc0aaefe3616d39dcdf3e05ccb"
 
 [workspace.dependencies.soroban-env-host]
 version = "20.0.0-rc2"
 git = "https://github.com/stellar/rs-soroban-env"
-rev = "44cba6a72cd2cca9594de492298eea1a7ed0e031"
+rev = "511337e0fc1f38cc0aaefe3616d39dcdf3e05ccb"
 
 [workspace.dependencies.stellar-strkey]
 version = "0.0.7"
@@ -62,7 +62,7 @@ rev = "e6ba45c60c16de28c7522586b80ed0150157df73"
 [workspace.dependencies.stellar-xdr]
 version = "20.0.0-rc1"
 git = "https://github.com/stellar/rs-stellar-xdr"
-rev = "d5ce0c9e7aa83461773a6e81662067f35d39e4c1"
+rev = "c9d24eb4fae1f9968f6620e06750c1fce7a5d6c3"
 default-features = false
 features = ["curr"]
 

soroban-sdk-macros/src/derive_enum.rs

@@ -3,6 +3,7 @@ use proc_macro2::{Literal, TokenStream as TokenStream2};
 use quote::{format_ident, quote};
 use syn::{spanned::Spanned, Attribute, DataEnum, Error, Fields, Ident, Path, Visibility};
 
+use stellar_xdr::curr as stellar_xdr;
 use stellar_xdr::{
     Error as XdrError, ScSpecEntry, ScSpecTypeDef, ScSpecUdtUnionCaseTupleV0, ScSpecUdtUnionCaseV0,
     ScSpecUdtUnionCaseVoidV0, ScSpecUdtUnionV0, StringM, VecM, WriteXdr, SCSYMBOL_LIMIT,

soroban-sdk-macros/src/derive_enum_int.rs

@@ -1,6 +1,7 @@
 use itertools::MultiUnzip;
 use proc_macro2::TokenStream as TokenStream2;
 use quote::{format_ident, quote};
+use stellar_xdr::curr as stellar_xdr;
 use stellar_xdr::{ScSpecUdtEnumV0, StringM};
 use syn::{spanned::Spanned, Attribute, DataEnum, Error, ExprLit, Ident, Lit, Path, Visibility};
 

soroban-sdk-macros/src/derive_error_enum_int.rs

@@ -1,6 +1,7 @@
 use itertools::MultiUnzip;
 use proc_macro2::TokenStream as TokenStream2;
 use quote::{format_ident, quote};
+use stellar_xdr::curr as stellar_xdr;
 use stellar_xdr::{ScSpecEntry, ScSpecUdtErrorEnumCaseV0, ScSpecUdtErrorEnumV0, StringM, WriteXdr};
 use syn::{spanned::Spanned, Attribute, DataEnum, Error, ExprLit, Ident, Lit, Path};
 

soroban-sdk-macros/src/derive_spec_fn.rs

@@ -1,5 +1,6 @@
 use proc_macro2::TokenStream as TokenStream2;
 use quote::{format_ident, quote};
+use stellar_xdr::curr as stellar_xdr;
 use stellar_xdr::{
     ScSpecEntry, ScSpecFunctionInputV0, ScSpecFunctionV0, ScSpecTypeDef, ScSymbol, StringM, VecM,
     WriteXdr, SCSYMBOL_LIMIT,

soroban-sdk-macros/src/derive_struct.rs

@@ -3,6 +3,7 @@ use proc_macro2::{Literal, TokenStream as TokenStream2};
 use quote::{format_ident, quote};
 use syn::{Attribute, DataStruct, Error, Ident, Path, Visibility};
 
+use stellar_xdr::curr as stellar_xdr;
 use stellar_xdr::{
     ScSpecEntry, ScSpecTypeDef, ScSpecUdtStructFieldV0, ScSpecUdtStructV0, StringM, WriteXdr,
     SCSYMBOL_LIMIT,

soroban-sdk-macros/src/derive_struct_tuple.rs

@@ -3,6 +3,7 @@ use proc_macro2::{Literal, TokenStream as TokenStream2};
 use quote::{format_ident, quote};
 use syn::{Attribute, DataStruct, Error, Ident, Path, Visibility};
 
+use stellar_xdr::curr as stellar_xdr;
 use stellar_xdr::{
     ScSpecEntry, ScSpecTypeDef, ScSpecUdtStructFieldV0, ScSpecUdtStructV0, StringM, WriteXdr,
 };

soroban-sdk-macros/src/lib.rs

@@ -37,6 +37,7 @@ use syn_ext::HasFnsItem;
 
 use soroban_spec_rust::{generate_from_wasm, GenerateFromFileError};
 
+use stellar_xdr::curr as stellar_xdr;
 use stellar_xdr::{ScMetaEntry, ScMetaV0, StringM, WriteXdr};
 
 use soroban_env_common::Symbol;

soroban-sdk-macros/src/map_type.rs

@@ -1,3 +1,4 @@
+use stellar_xdr::curr as stellar_xdr;
 use stellar_xdr::{
     ScSpecTypeBytesN, ScSpecTypeDef, ScSpecTypeMap, ScSpecTypeOption, ScSpecTypeResult,
     ScSpecTypeTuple, ScSpecTypeUdt, ScSpecTypeVec,

soroban-sdk/src/env.rs

@@ -328,57 +328,6 @@ impl Env {
         internal::Env::require_auth(self, address.to_object()).unwrap_infallible();
     }
 
-    /// Returns the contract call stack as a [`Vec`]
-    /// of `(contract_id, function_name)`.
-    ///
-    /// ### Examples
-    /// ```
-    /// use soroban_sdk::{contract, contractimpl, log, Env, Symbol};
-    ///
-    /// #[contract]
-    /// pub struct Contract;
-    ///
-    /// #[contractimpl]
-    /// impl Contract {
-    ///     pub fn hello(env: Env) {
-    ///         let stack = env.call_stack();
-    ///         assert_eq!(stack.len(), 1);
-    ///
-    ///         let outer = stack.get_unchecked(0);
-    ///         log!(&env, "{}", outer);
-    ///     }
-    /// }
-    /// #[test]
-    /// fn test() {
-    /// # }
-    /// # #[cfg(feature = "testutils")]
-    /// # fn main() {
-    ///     let env = Env::default();
-    ///     let contract_id = env.register_contract(None, Contract);
-    ///     let client = ContractClient::new(&env, &contract_id);
-    ///     client.hello();
-    /// }
-    /// # #[cfg(not(feature = "testutils"))]
-    /// # fn main() { }
-    /// ```
-    pub fn call_stack(&self) -> Vec<(Address, crate::Symbol)> {
-        // TODO: Change host fn to return Addresses, so that contracts do not
-        // need to iterate over the call stack and do conversion.
-        let stack = internal::Env::get_current_call_stack(self).unwrap_infallible();
-
-        let stack =
-            unsafe { Vec::<(AddressObject, crate::Symbol)>::unchecked_new(self.clone(), stack) };
-
-        let mut stack_with_addresses = Vec::new(self);
-        for (ao, sym) in stack.iter() {
-            unsafe {
-                stack_with_addresses.push_back((Address::unchecked_new(self.clone(), ao), sym))
-            };
-        }
-
-        stack_with_addresses
-    }
-
     /// Invokes a function of a contract that is registered in the [Env].
     ///
     /// # Panics

soroban-sdk/src/tests.rs

@@ -5,7 +5,6 @@ mod auth;
 mod budget;
 mod contract_add_i32;
 mod contract_assert;
-mod contract_call_stack;
 mod contract_docs;
 mod contract_invoke;
 mod contract_overlapping_type_fn_names;

soroban-sdk/src/tests/contract_add_i32.rs

@@ -1,5 +1,6 @@
 use crate as soroban_sdk;
 use soroban_sdk::{contract, contractimpl, Env};
+use stellar_xdr::curr as stellar_xdr;
 use stellar_xdr::{ReadXdr, ScSpecEntry, ScSpecFunctionInputV0, ScSpecFunctionV0, ScSpecTypeDef};
 
 #[contract]

soroban-sdk/src/tests/contract_docs.rs

@@ -1,6 +1,7 @@
 mod fn_ {
     use crate as soroban_sdk;
     use soroban_sdk::{contract, contractimpl, Env};
+    use stellar_xdr::curr as stellar_xdr;
     use stellar_xdr::{ReadXdr, ScSpecEntry, ScSpecFunctionV0};
 
     #[contract]
@@ -38,6 +39,7 @@ mod fn_ {
 mod struct_ {
     use crate as soroban_sdk;
     use soroban_sdk::contracttype;
+    use stellar_xdr::curr as stellar_xdr;
     use stellar_xdr::{ReadXdr, ScSpecEntry, ScSpecUdtStructFieldV0, ScSpecUdtStructV0};
 
     /// S holds a and
@@ -81,6 +83,7 @@ mod struct_ {
 mod struct_tuple {
     use crate as soroban_sdk;
     use soroban_sdk::contracttype;
+    use stellar_xdr::curr as stellar_xdr;
     use stellar_xdr::{ReadXdr, ScSpecEntry, ScSpecUdtStructFieldV0, ScSpecUdtStructV0};
 
     /// S holds two u64s.
@@ -122,6 +125,7 @@ mod struct_tuple {
 mod enum_ {
     use crate as soroban_sdk;
     use soroban_sdk::contracttype;
+    use stellar_xdr::curr as stellar_xdr;
     use stellar_xdr::{
         ReadXdr, ScSpecEntry, ScSpecUdtUnionCaseTupleV0, ScSpecUdtUnionCaseV0,
         ScSpecUdtUnionCaseVoidV0, ScSpecUdtUnionV0,
@@ -173,6 +177,7 @@ mod enum_ {
 mod enum_int {
     use crate as soroban_sdk;
     use soroban_sdk::contracttype;
+    use stellar_xdr::curr as stellar_xdr;
     use stellar_xdr::{ReadXdr, ScSpecEntry, ScSpecUdtEnumCaseV0, ScSpecUdtEnumV0};
 
     /// E has variants A and B.
@@ -215,6 +220,7 @@ mod enum_int {
 mod enum_error_int {
     use crate as soroban_sdk;
     use soroban_sdk::contracterror;
+    use stellar_xdr::curr as stellar_xdr;
     use stellar_xdr::{ReadXdr, ScSpecEntry, ScSpecUdtErrorEnumCaseV0, ScSpecUdtErrorEnumV0};
 
     /// E has variants A and B.

soroban-sdk/src/tests/contract_invoke.rs

@@ -40,7 +40,7 @@ fn test_try_invoke() {
     assert_eq!(
         res,
         Err(Ok(soroban_sdk::Error::from_type_and_code(
-            ScErrorType::WasmVm,
+            ScErrorType::Context,
             ScErrorCode::InvalidAction
         )))
     );

soroban-sdk/src/tests/contract_udt_struct.rs

@@ -2,6 +2,7 @@ use crate as soroban_sdk;
 use soroban_sdk::{
     contract, contractimpl, contracttype, map, symbol_short, ConversionError, Env, TryFromVal,
 };
+use stellar_xdr::curr as stellar_xdr;
 use stellar_xdr::{
     ReadXdr, ScSpecEntry, ScSpecFunctionInputV0, ScSpecFunctionV0, ScSpecTypeDef, ScSpecTypeTuple,
     ScSpecTypeUdt,

soroban-sdk/src/tests/contract_udt_struct_tuple.rs

@@ -3,6 +3,7 @@ use soroban_sdk::{
     contract, contractimpl, contracttype, vec, ConversionError, Env, IntoVal, TryFromVal,
     TryIntoVal, Val, Vec,
 };
+use stellar_xdr::curr as stellar_xdr;
 use stellar_xdr::{
     ReadXdr, ScSpecEntry, ScSpecFunctionInputV0, ScSpecFunctionV0, ScSpecTypeDef, ScSpecTypeTuple,
     ScSpecTypeUdt,

soroban-sdk/src/tests/contractimport.rs

@@ -1,5 +1,6 @@
 use crate as soroban_sdk;
 use soroban_sdk::{contract, contractimpl, Address, BytesN, Env};
+use stellar_xdr::curr as stellar_xdr;
 use stellar_xdr::{ScSpecEntry, ScSpecFunctionInputV0, ScSpecFunctionV0, ScSpecTypeDef};
 
 mod addcontract {

soroban-sdk/src/tests/token_spec.rs

@@ -4,6 +4,7 @@ use soroban_sdk::{
     token::{StellarAssetSpec, SPEC_XDR_INPUT, SPEC_XDR_LEN},
     xdr::{Error, ReadXdr, ScSpecEntry},
 };
+use stellar_xdr::curr as stellar_xdr;
 use stellar_xdr::DepthLimitedRead;
 
 extern crate std;

soroban-spec-rust/src/lib.rs

@@ -6,7 +6,8 @@ use std::{fs, io};
 use proc_macro2::TokenStream;
 use quote::quote;
 use sha2::{Digest, Sha256};
-use stellar_xdr::{self, ScSpecEntry};
+use stellar_xdr::curr as stellar_xdr;
+use stellar_xdr::ScSpecEntry;
 use syn::Error;
 
 use soroban_spec::read::{from_wasm, FromWasmError};

soroban-spec-rust/src/trait.rs

@@ -1,5 +1,6 @@
 use proc_macro2::TokenStream;
 use quote::{format_ident, quote};
+use stellar_xdr::curr as stellar_xdr;
 use stellar_xdr::ScSpecFunctionV0;
 
 use super::types::generate_type_ident;

soroban-spec-rust/src/types.rs

@@ -1,5 +1,6 @@
 use proc_macro2::{Literal, TokenStream};
 use quote::{format_ident, quote};
+use stellar_xdr::curr as stellar_xdr;
 use stellar_xdr::{
     ScSpecTypeDef, ScSpecUdtEnumV0, ScSpecUdtErrorEnumV0, ScSpecUdtStructV0, ScSpecUdtUnionV0,
 };