Remove excess features (#1278)

* Remove excess features

* move utils

* wasm

bindings/core/Cargo.toml

@@ -30,6 +30,9 @@ serde = { version = "1.0.188", default-features = false }
 serde_json = { version = "1.0.107", default-features = false }
 thiserror = { version = "1.0.48", default-features = false }
 tokio = { version = "1.32.0", default-features = false }
+url = { version = "2.4.1", default-features = false, features = [
+    "serde",
+] }
 zeroize = { version = "1.6.0", default-features = false }
 
 [features]

bindings/core/src/method/wallet.rs

@@ -17,9 +17,9 @@ use iota_sdk::{
         },
         ClientOptions,
     },
-    Url,
 };
 use serde::{Deserialize, Serialize};
+use url::Url;
 
 use crate::method::account::AccountMethod;
 #[cfg(feature = "stronghold")]

sdk/Cargo.toml

@@ -138,20 +138,19 @@ tokio = { version = "1.32.0", default-features = false, features = [
 [features]
 default = ["client", "wallet", "tls"]
 
-irc_27 = ["url", "serde"]
-irc_30 = ["url", "serde"]
-ledger_nano = ["iota-ledger-nano"]
-mqtt = ["std", "regex", "rumqttc", "dep:once_cell"]
+irc_27 = ["serde", "dep:url"]
+irc_30 = ["serde", "dep:url"]
+ledger_nano = ["dep:iota-ledger-nano"]
+mqtt = ["std", "tls", "dep:regex", "dep:rumqttc", "dep:once_cell"]
 participation = ["storage"]
-rand = ["dep:rand"]
-rocksdb = ["dep:rocksdb", "storage"]
+rocksdb = ["storage", "dep:rocksdb"]
 serde = [
-    "serde_repr",
     "hashbrown/serde",
     "packable/serde",
     "primitive-types/serde_no_std",
     "iota-crypto/serde",
     "zeroize?/serde",
+    "dep:serde_repr",
 ]
 std = [
     "packable/std",
@@ -167,34 +166,34 @@ std = [
 ]
 storage = ["iota-crypto/chacha", "dep:time", "dep:anymap", "dep:once_cell"]
 stronghold = [
-    "iota_stronghold",
     "iota-crypto/chacha",
+    "dep:iota_stronghold",
     "dep:time",
     "dep:anymap",
     "dep:once_cell",
 ]
 tls = ["reqwest?/rustls-tls", "rumqttc?/use-rustls"]
 events = []
-private_key_secret_manager = ["bs58"]
+private_key_secret_manager = ["dep:bs58"]
 
 client = [
-    "async-trait",
-    "futures",
-    "instant",
+    "std",
+    "serde",
     "iota-crypto/bip39",
     "iota-crypto/bip39-en",
     "iota-crypto/bip44",
     "iota-crypto/keccak",
     "iota-crypto/random",
     "iota-crypto/slip10",
-    "log",
-    "reqwest",
-    "serde",
-    "std",
-    "thiserror",
-    "tokio",
-    "url",
-    "zeroize",
+    "dep:async-trait",
+    "dep:futures",
+    "dep:instant",
+    "dep:log",
+    "dep:reqwest",
+    "dep:thiserror",
+    "dep:tokio",
+    "dep:url",
+    "dep:zeroize",
 ]
 wallet = ["client"]
 

sdk/examples/wallet/participation.rs

@@ -19,8 +19,9 @@
 use iota_sdk::{
     client::node_manager::node::Node,
     wallet::{account::types::participation::ParticipationEventRegistrationOptions, Result},
-    Url, Wallet,
+    Wallet,
 };
+use url::Url;
 
 // The node that runs the participation plugin
 const PARTICPATION_NODE_URL: &str = "https://api.testnet.shimmer.network";

sdk/src/client/api/high_level.rs

@@ -11,7 +11,7 @@ use crate::{
         constants::FIVE_MINUTES_IN_SECONDS,
         error::{Error, Result},
         node_api::indexer::query_parameters::QueryParameter,
-        Client,
+        unix_timestamp_now, Client,
     },
     types::block::{
         address::Bech32Address,
@@ -22,7 +22,6 @@ use crate::{
         slot::SlotIndex,
         BlockId,
     },
-    utils::unix_timestamp_now,
 };
 
 impl Client {

sdk/src/client/core.rs

@@ -107,7 +107,7 @@ impl ClientInner {
         // request the node info every time, so we don't create invalid transactions/blocks.
         #[cfg(target_family = "wasm")]
         {
-            let current_time = crate::utils::unix_timestamp_now().as_secs() as u32;
+            let current_time = crate::client::unix_timestamp_now().as_secs() as u32;
             if let Some(last_sync) = *self.last_sync.lock().await {
                 if current_time < last_sync {
                     return Ok(self.network_info.read().await.clone());

sdk/src/client/node_manager/node.rs

@@ -4,8 +4,7 @@
 use std::hash::Hash;
 
 use serde::{Deserialize, Serialize};
-
-use crate::Url;
+use url::Url;
 
 /// Node authentication object.
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, Hash)]

sdk/src/client/utils.rs

@@ -197,3 +197,9 @@ impl Password {
         self.0.as_bytes()
     }
 }
+
+pub fn unix_timestamp_now() -> core::time::Duration {
+    instant::SystemTime::now()
+        .duration_since(instant::SystemTime::UNIX_EPOCH)
+        .expect("time went backwards")
+}

sdk/src/lib.rs

@@ -27,8 +27,6 @@ pub mod utils;
 pub use crypto;
 pub use packable;
 pub use primitive_types::U256;
-#[cfg(feature = "url")]
-pub use url::Url;
 
 #[cfg(feature = "wallet")]
 pub type Wallet = self::wallet::Wallet<client::secret::SecretManager>;

sdk/src/utils/mod.rs

@@ -3,10 +3,3 @@
 
 #[cfg(feature = "serde")]
 pub mod serde;
-
-#[cfg(feature = "instant")]
-pub fn unix_timestamp_now() -> core::time::Duration {
-    instant::SystemTime::now()
-        .duration_since(instant::SystemTime::UNIX_EPOCH)
-        .expect("time went backwards")
-}

sdk/src/wallet/account/operations/syncing/mod.rs

@@ -58,7 +58,7 @@ where
         let syc_start_time = instant::Instant::now();
 
         // Prevent syncing the account multiple times simultaneously
-        let time_now = crate::utils::unix_timestamp_now().as_millis();
+        let time_now = crate::client::unix_timestamp_now().as_millis();
         let mut last_synced = self.last_synced.lock().await;
         log::debug!("[SYNC] last time synced before {}ms", time_now - *last_synced);
         if !options.force_syncing && time_now - *last_synced < MIN_SYNC_INTERVAL {
@@ -86,7 +86,7 @@ where
 
         let balance = self.balance().await?;
         // Update last_synced mutex
-        let time_now = crate::utils::unix_timestamp_now().as_millis();
+        let time_now = crate::client::unix_timestamp_now().as_millis();
         *last_synced = time_now;
         log::debug!("[SYNC] finished syncing in {:.2?}", syc_start_time.elapsed());
         Ok(balance)

sdk/src/wallet/account/operations/syncing/transactions.rs

@@ -2,12 +2,11 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{
-    client::secret::SecretManage,
+    client::{secret::SecretManage, unix_timestamp_now},
     types::{
         api::core::response::TransactionState,
         block::{input::Input, output::OutputId, BlockId},
     },
-    utils::unix_timestamp_now,
     wallet::account::{
         types::{InclusionState, Transaction},
         Account, AccountDetails,

sdk/src/wallet/account/operations/transaction/mod.rs

@@ -174,7 +174,7 @@ where
             payload: signed_transaction_data.transaction_payload,
             block_id,
             network_id,
-            timestamp: crate::utils::unix_timestamp_now().as_millis(),
+            timestamp: crate::client::unix_timestamp_now().as_millis(),
             inclusion_state: InclusionState::Pending,
             incoming: false,
             note: options.and_then(|o| o.note),

sdk/src/wallet/core/operations/client.rs

@@ -3,6 +3,8 @@
 
 use std::collections::{HashMap, HashSet};
 
+use url::Url;
+
 use super::storage::SaveLoadWallet;
 use crate::{
     client::{
@@ -14,7 +16,6 @@ use crate::{
         Client, ClientBuilder,
     },
     wallet::{Wallet, WalletBuilder},
-    Url,
 };
 
 impl<S: 'static + SecretManage> Wallet<S> {

sdk/tests/wallet/backup_restore.rs

@@ -11,8 +11,8 @@ use iota_sdk::{
         secret::{mnemonic::MnemonicSecretManager, stronghold::StrongholdSecretManager, SecretManager},
     },
     wallet::{ClientOptions, Result, Wallet},
-    Url,
 };
+use url::Url;
 
 use crate::wallet::common::{setup, tear_down, NODE_LOCAL, NODE_OTHER};
 

sdk/tests/wallet/core.rs

@@ -7,7 +7,6 @@ use iota_sdk::{
     client::constants::SHIMMER_COIN_TYPE,
     client::node_manager::node::{Node, NodeDto},
     wallet::Error,
-    Url,
 };
 use iota_sdk::{
     client::{
@@ -17,6 +16,7 @@ use iota_sdk::{
     types::block::address::Bech32Address,
     wallet::{ClientOptions, Result, Wallet},
 };
+use url::Url;
 
 #[cfg(feature = "storage")]
 use crate::wallet::common::NODE_OTHER;