Merge branch '2.0' into chore/bindings-cleanup-is-alive

iotaledger · Dec 4, 2023 · 5b7da91 · 5b7da91
2 parents ab6fb3d + e794536
commit 5b7da91
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/sdk/src/types/api/core.rs b/sdk/src/types/api/core.rs
@@ -307,7 +307,7 @@ impl IssuanceBlockHeaderResponse {
 #[serde(rename_all = "camelCase")]
 pub struct CongestionResponse {
     /// The slot index for which the congestion estimate is provided.
-    pub slot_index: SlotIndex,
+    pub slot: SlotIndex,
     /// Indicates if a node is ready to issue a block in a current congestion or should wait.
     pub ready: bool,
     /// The cost in mana for issuing a block in a current congestion estimated based on RMC and slot index.

diff --git a/sdk/src/wallet/core/builder.rs b/sdk/src/wallet/core/builder.rs
@@ -259,6 +259,9 @@ where
             #[cfg(feature = "storage")]
             storage_manager: tokio::sync::RwLock::new(storage_manager),
         };
+        #[cfg(feature = "storage")]
+        let wallet_data = wallet_data.unwrap_or_else(|| WalletData::new(self.bip_path, address, self.alias.clone()));
+        #[cfg(not(feature = "storage"))]
         let wallet_data = WalletData::new(self.bip_path, address, self.alias.clone());
         let wallet = Wallet {
             inner: Arc::new(wallet_inner),