Bump XDR and env to v23.0.0-rc.1.

This is a minimum necessary SDK change to support protocol 23.

Author: dmkozh

Cargo.lock

@@ -24,25 +24,25 @@ soroban-ledger-snapshot = { version = "22.0.8", path = "soroban-ledger-snapshot"
 soroban-token-sdk = { version = "22.0.8", path = "soroban-token-sdk" }
 
 [workspace.dependencies.soroban-env-common]
-version = "=22.1.3"
+version = "=23.0.0-rc.1"
 #git = "https://github.com/stellar/rs-soroban-env"
 #rev = "bd0c80a1fe171e75f8d745f17975a73927d44ecd"
 
 [workspace.dependencies.soroban-env-guest]
-version = "=22.1.3"
+version = "=23.0.0-rc.1"
 #git = "https://github.com/stellar/rs-soroban-env"
 #rev = "bd0c80a1fe171e75f8d745f17975a73927d44ecd"
 
 [workspace.dependencies.soroban-env-host]
-version = "=22.1.3"
+version = "=23.0.0-rc.1"
 #git = "https://github.com/stellar/rs-soroban-env"
 #rev = "bd0c80a1fe171e75f8d745f17975a73927d44ecd"
 
 [workspace.dependencies.stellar-strkey]
 version = "=0.0.9"
 
 [workspace.dependencies.stellar-xdr]
-version = "=22.1.0"
+version = "=23.0.0-rc.1"
 default-features = false
 features = ["curr"]
 #git = "https://github.com/stellar/rs-stellar-xdr"

Cargo.toml

@@ -51,10 +51,15 @@ impl Debug for Address {
                         let strkey = Strkey::PublicKeyEd25519(ed25519::PublicKey(ed25519));
                         write!(f, "AccountId({})", strkey.to_string())?;
                     }
-                    xdr::ScAddress::Contract(contract_id) => {
+                    xdr::ScAddress::Contract(xdr::ContractId(contract_id)) => {
                         let strkey = Strkey::Contract(Contract(contract_id.0));
                         write!(f, "Contract({})", strkey.to_string())?;
                     }
+                    ScAddress::MuxedAccount(_)
+                    | ScAddress::ClaimableBalance(_)
+                    | ScAddress::LiquidityPool(_) => {
+                        return Err(core::fmt::Error);
+                    }
                 }
             } else {
                 return Err(core::fmt::Error);
@@ -316,7 +321,7 @@ impl Address {
 }
 
 #[cfg(any(not(target_family = "wasm"), test, feature = "testutils"))]
-use crate::env::xdr::Hash;
+use crate::env::xdr::{ContractId, Hash};
 use crate::unwrap::UnwrapOptimized;
 
 #[cfg(any(test, feature = "testutils"))]
@@ -333,7 +338,7 @@ impl crate::testutils::Address for Address {
 
 #[cfg(not(target_family = "wasm"))]
 impl Address {
-    pub(crate) fn contract_id(&self) -> Hash {
+    pub(crate) fn contract_id(&self) -> ContractId {
         let sc_address: ScAddress = self.try_into().unwrap();
         if let ScAddress::Contract(c) = sc_address {
             c
@@ -343,6 +348,6 @@ impl Address {
     }
 
     pub(crate) fn from_contract_id(env: &Env, contract_id: [u8; 32]) -> Self {
-        Self::try_from_val(env, &ScAddress::Contract(Hash(contract_id))).unwrap()
+        Self::try_from_val(env, &ScAddress::Contract(ContractId(Hash(contract_id)))).unwrap()
     }
 }

soroban-sdk/src/address.rs

@@ -122,8 +122,8 @@ use crate::{
 };
 use internal::{
     AddressObject, Bool, BytesObject, DurationObject, I128Object, I256Object, I256Val, I64Object,
-    StorageType, StringObject, Symbol, SymbolObject, TimepointObject, U128Object, U256Object,
-    U256Val, U32Val, U64Object, U64Val, Void,
+    MuxedAddressObject, StorageType, StringObject, Symbol, SymbolObject, TimepointObject,
+    U128Object, U256Object, U256Val, U32Val, U64Object, U64Val, Void,
 };
 
 #[doc(hidden)]
@@ -447,6 +447,12 @@ impl Env {
     pub fn logs(&self) -> Logs {
         Logs::new(self)
     }
+
+    pub(crate) fn check_same_env(&self, other: &Self) {
+        self.env_impl
+            .check_same_env(&other.env_impl)
+            .unwrap_optimized()
+    }
 }
 
 #[doc(hidden)]
@@ -1812,13 +1818,6 @@ impl internal::EnvBase for Env {
         match e {}
     }
 
-    fn check_same_env(&self, other: &Self) -> Result<(), Self::Error> {
-        Ok(self
-            .env_impl
-            .check_same_env(&other.env_impl)
-            .unwrap_optimized())
-    }
-
     fn bytes_copy_from_slice(
         &self,
         b: BytesObject,