Single account wallet

Cargo.toml

@@ -1,10 +1,11 @@
 [workspace]
 resolver = "2"
 members = [
-	"bindings/core",
-	"bindings/nodejs",
-	"bindings/python",
-	"bindings/wasm",
+	# TODO: uncomment and fix step by step
+	#"bindings/core",
+	#"bindings/nodejs",
+	#"bindings/python",
+	#"bindings/wasm",
 	"cli",
 	"sdk",
 ]

bindings/core/src/error.rs

@@ -4,7 +4,7 @@
 use packable::error::UnexpectedEOF;
 use serde::{ser::SerializeMap, Serialize, Serializer};
 
-pub use super::{method::AccountMethod, response::Response};
+pub use super::{method::WalletMethod, response::Response};
 
 /// Result type of the bindings core crate.
 pub type Result<T> = std::result::Result<T, Error>;

bindings/core/src/lib.rs

@@ -26,7 +26,7 @@ pub use self::method_handler::listen_mqtt;
 pub use self::method_handler::CallMethod;
 pub use self::{
     error::{Error, Result},
-    method::{AccountMethod, ClientMethod, SecretManagerMethod, UtilsMethod, WalletMethod},
+    method::{WalletMethod, ClientMethod, SecretManagerMethod, UtilsMethod, WalletMethod},
     method_handler::{call_client_method, call_secret_manager_method, call_utils_method, call_wallet_method},
     response::Response,
 };
@@ -43,7 +43,8 @@ pub fn init_logger(config: String) -> std::result::Result<(), fern_logger::Error
 pub struct WalletOptions {
     pub storage_path: Option<String>,
     pub client_options: Option<ClientOptions>,
-    pub coin_type: Option<u32>,
+    // TODO: replace
+    // pub coin_type: Option<u32>,
     #[derivative(Debug(format_with = "OmittedDebug::omitted_fmt"))]
     pub secret_manager: Option<SecretManagerDto>,
 }
@@ -59,10 +60,11 @@ impl WalletOptions {
         self
     }
 
-    pub fn with_coin_type(mut self, coin_type: impl Into<Option<u32>>) -> Self {
-        self.coin_type = coin_type.into();
-        self
-    }
+    // TODO: replace
+    // pub fn with_coin_type(mut self, coin_type: impl Into<Option<u32>>) -> Self {
+    //     self.coin_type = coin_type.into();
+    //     self
+    // }
 
     pub fn with_secret_manager(mut self, secret_manager: impl Into<Option<SecretManagerDto>>) -> Self {
         self.secret_manager = secret_manager.into();
@@ -72,8 +74,9 @@ impl WalletOptions {
     pub async fn build(self) -> iota_sdk::wallet::Result<Wallet> {
         log::debug!("wallet options: {self:?}");
         let mut builder = Wallet::builder()
-            .with_client_options(self.client_options)
-            .with_coin_type(self.coin_type);
+            .with_client_options(self.client_options);
+            // TODO: replace
+            // .with_coin_type(self.coin_type);
 
         #[cfg(feature = "storage")]
         if let Some(storage_path) = &self.storage_path {

bindings/core/src/method/account.rs

@@ -32,7 +32,7 @@ use serde::{Deserialize, Serialize};
 #[derive(Clone, Debug, Serialize, Deserialize)]
 #[serde(tag = "name", content = "data", rename_all = "camelCase")]
 #[non_exhaustive]
-pub enum AccountMethod {
+pub enum WalletMethod {
     /// List addresses.
     /// Expected response: [`Addresses`](crate::Response::Addresses)
     Addresses,

bindings/core/src/method/mod.rs

@@ -8,6 +8,6 @@ mod utils;
 mod wallet;
 
 pub use self::{
-    account::AccountMethod, client::ClientMethod, secret_manager::SecretManagerMethod, utils::UtilsMethod,
+    account::WalletMethod, client::ClientMethod, secret_manager::SecretManagerMethod, utils::UtilsMethod,
     wallet::WalletMethod,
 };

bindings/core/src/method/wallet.rs

@@ -21,7 +21,7 @@ use iota_sdk::{
 };
 use serde::{Deserialize, Serialize};
 
-use crate::method::account::AccountMethod;
+use crate::method::account::WalletMethod;
 #[cfg(feature = "stronghold")]
 use crate::OmittedDebug;
 
@@ -34,32 +34,43 @@ pub enum WalletMethod {
     /// Creates an account.
     /// Expected response: [`Account`](crate::Response::Account)
     #[serde(rename_all = "camelCase")]
-    CreateAccount {
+    Create {
+        /// The wallet index.
+        index: Option<u32>
         /// The account alias.
         alias: Option<String>,
         /// The bech32 HRP.
         bech32_hrp: Option<Hrp>,
         /// BIP44 addresses.
         addresses: Option<Vec<Bip44Address>>,
     },
-    /// Read account.
-    /// Expected response: [`Account`](crate::Response::Account)
-    #[serde(rename_all = "camelCase")]
-    GetAccount { account_id: AccountIdentifier },
-    /// Return the account indexes.
-    /// Expected response: [`AccountIndexes`](crate::Response::AccountIndexes)
-    GetAccountIndexes,
-    /// Read accounts.
-    /// Expected response: [`Accounts`](crate::Response::Accounts)
-    GetAccounts,
+
+    // TODO: remove
+    // /// Read account.
+    // /// Expected response: [`Account`](crate::Response::Account)
+    // #[serde(rename_all = "camelCase")]
+    // GetAccount { account_id: AccountIdentifier },
+
+    // TODO: change to `GetAccountIndex`
+    // /// Return the account indexes.
+    // /// Expected response: [`AccountIndexes`](crate::Response::AccountIndexes)
+    // GetAccountIndexes,
+
+
+    // TODO: remove
+    // /// Read accounts.
+    // /// Expected response: [`Accounts`](crate::Response::Accounts)
+    // GetAccounts,
+
+
     /// Consume an account method.
     /// Returns [`Response`](crate::Response)
     #[serde(rename_all = "camelCase")]
-    CallAccountMethod {
+    CallMethod {
         /// The account identifier.
         account_id: AccountIdentifier,
         /// The account method to call.
-        method: AccountMethod,
+        method: WalletMethod,
     },
     /// Backup storage. Password must be the current one, when Stronghold is used as SecretManager.
     /// Expected response: [`Ok`](crate::Response::Ok)