Muxed address support for Soroban SDK.

This introduces the `MuxedAddress` type that maps to either `AddressObject` or `MuxedAddressObject`.

Author: dmkozh

Cargo.lock

@@ -24,19 +24,19 @@ soroban-ledger-snapshot = { version = "22.0.7", path = "soroban-ledger-snapshot"
 soroban-token-sdk = { version = "22.0.7", path = "soroban-token-sdk" }
 
 [workspace.dependencies.soroban-env-common]
-version = "=22.1.3"
-#git = "https://github.com/stellar/rs-soroban-env"
-#rev = "bd0c80a1fe171e75f8d745f17975a73927d44ecd"
+version = "=23.0.0"
+git = "https://github.com/stellar/rs-soroban-env"
+rev = "b4a68ce18227b7c9c52850554478e047359160e4"
 
 [workspace.dependencies.soroban-env-guest]
-version = "=22.1.3"
-#git = "https://github.com/stellar/rs-soroban-env"
-#rev = "bd0c80a1fe171e75f8d745f17975a73927d44ecd"
+version = "=23.0.0"
+git = "https://github.com/stellar/rs-soroban-env"
+rev = "b4a68ce18227b7c9c52850554478e047359160e4"
 
 [workspace.dependencies.soroban-env-host]
-version = "=22.1.3"
-#git = "https://github.com/stellar/rs-soroban-env"
-#rev = "bd0c80a1fe171e75f8d745f17975a73927d44ecd"
+version = "=23.0.0"
+git = "https://github.com/stellar/rs-soroban-env"
+rev = "b4a68ce18227b7c9c52850554478e047359160e4"
 
 [workspace.dependencies.stellar-strkey]
 version = "=0.0.9"
@@ -45,8 +45,8 @@ version = "=0.0.9"
 version = "=22.1.0"
 default-features = false
 features = ["curr"]
-#git = "https://github.com/stellar/rs-stellar-xdr"
-#rev = "67be5955a15f1d3a4df83fe86e6ae107f687141b"
+git = "https://github.com/stellar/rs-stellar-xdr"
+rev = "fdd0c4f467ea654c3aaf139e8e914e1c416a39b8"
 
 #[patch.crates-io]
 #soroban-env-common = { path = "../rs-soroban-env/soroban-env-common" }

Cargo.toml

@@ -35,6 +35,7 @@ pub fn map_type(t: &Type, allow_hash: bool) -> Result<ScSpecTypeDef, Error> {
                     "Error" => Ok(ScSpecTypeDef::Error),
                     "Bytes" => Ok(ScSpecTypeDef::Bytes),
                     "Address" => Ok(ScSpecTypeDef::Address),
+                    "MuxedAddress" => Ok(ScSpecTypeDef::MuxedAddress),
                     "Timepoint" => Ok(ScSpecTypeDef::Timepoint),
                     "Duration" => Ok(ScSpecTypeDef::Duration),
                     s => Ok(ScSpecTypeDef::Udt(ScSpecTypeUdt {

soroban-sdk-macros/src/map_type.rs

@@ -55,6 +55,7 @@ impl Debug for Address {
                         let strkey = Strkey::Contract(Contract(contract_id.0));
                         write!(f, "Contract({})", strkey.to_string())?;
                     }
+                    _ => return Err(core::fmt::Error),
                 }
             } else {
                 return Err(core::fmt::Error);

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)]
@@ -354,6 +354,27 @@ impl Env {
         internal::Env::require_auth(self, address.to_object()).unwrap_infallible();
     }
 
+    #[doc(hidden)]
+    pub(crate) fn get_address_from_muxed_address(
+        &self,
+        muxed_address: MuxedAddressObject,
+    ) -> Address {
+        Address::try_from_val(
+            self,
+            &internal::Env::get_address_from_muxed_address(self, muxed_address).unwrap_infallible(),
+        )
+        .unwrap_infallible()
+    }
+
+    #[doc(hidden)]
+    pub(crate) fn get_id_from_muxed_address(&self, muxed_address: MuxedAddressObject) -> u64 {
+        u64::try_from_val(
+            self,
+            &internal::Env::get_id_from_muxed_address(self, muxed_address).unwrap_infallible(),
+        )
+        .unwrap()
+    }
+
     /// Invokes a function of a contract that is registered in the [Env].
     ///
     /// # Panics
@@ -514,7 +535,7 @@ impl Env {
 
         let rf = Rc::new(EmptySnapshotSource());
         let info = internal::LedgerInfo {
-            protocol_version: 22,
+            protocol_version: 23,
             sequence_number: 0,
             timestamp: 0,
             network_id: [0; 32],

soroban-sdk/src/env.rs

@@ -736,6 +736,7 @@ pub mod unwrap;
 mod env;
 
 mod address;
+mod muxed_address;
 mod symbol;
 
 pub use env::{ConversionError, Env};
@@ -797,6 +798,7 @@ mod vec;
 pub use address::Address;
 pub use bytes::{Bytes, BytesN};
 pub use map::Map;
+pub use muxed_address::MuxedAddress;
 pub use symbol::Symbol;
 pub use vec::Vec;
 mod num;