Merge branch '2.0' into semantic-optional-unlocks

iotaledger · Nov 9, 2023 · f622674 · f622674
2 parents 3f67968 + 544311a
commit f622674
Show file tree

Hide file tree

Showing 120 changed files with 6,765 additions and 5,663 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,8 +2,7 @@
 resolver = "2"
 members = [
 	"bindings/core",
-	# TODO: issue #1424
-	#"bindings/nodejs",
+	"bindings/nodejs",
 	# TODO: issue #1423
 	#"bindings/python",
 	# TODO: issue #1425

diff --git a/bindings/core/src/lib.rs b/bindings/core/src/lib.rs
@@ -17,6 +17,7 @@ use fern_logger::{logger_init, LoggerConfig, LoggerOutputConfigBuilder};
 pub use iota_sdk;
 use iota_sdk::{
     client::secret::{SecretManager, SecretManagerDto},
+    types::block::address::Bech32Address,
     wallet::{ClientOptions, Wallet},
 };
 use serde::Deserialize;
@@ -42,21 +43,23 @@ pub fn init_logger(config: String) -> std::result::Result<(), fern_logger::Error
 #[derivative(Debug)]
 #[serde(rename_all = "camelCase")]
 pub struct WalletOptions {
-    pub storage_path: Option<String>,
-    pub client_options: Option<ClientOptions>,
+    pub address: Option<Bech32Address>,
+    pub alias: Option<String>,
     pub bip_path: Option<Bip44>,
+    pub client_options: Option<ClientOptions>,
     #[derivative(Debug(format_with = "OmittedDebug::omitted_fmt"))]
     pub secret_manager: Option<SecretManagerDto>,
+    pub storage_path: Option<String>,
 }
 
 impl WalletOptions {
-    pub fn with_storage_path(mut self, storage_path: impl Into<Option<String>>) -> Self {
-        self.storage_path = storage_path.into();
+    pub fn with_address(mut self, address: impl Into<Option<Bech32Address>>) -> Self {
+        self.address = address.into();
         self
     }
 
-    pub fn with_client_options(mut self, client_options: impl Into<Option<ClientOptions>>) -> Self {
-        self.client_options = client_options.into();
+    pub fn with_alias(mut self, alias: impl Into<Option<String>>) -> Self {
+        self.alias = alias.into();
         self
     }
 
@@ -65,16 +68,28 @@ impl WalletOptions {
         self
     }
 
+    pub fn with_client_options(mut self, client_options: impl Into<Option<ClientOptions>>) -> Self {
+        self.client_options = client_options.into();
+        self
+    }
+
     pub fn with_secret_manager(mut self, secret_manager: impl Into<Option<SecretManagerDto>>) -> Self {
         self.secret_manager = secret_manager.into();
         self
     }
 
+    pub fn with_storage_path(mut self, storage_path: impl Into<Option<String>>) -> Self {
+        self.storage_path = storage_path.into();
+        self
+    }
+
     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_bip_path(self.bip_path);
+            .with_address(self.address)
+            .with_alias(self.alias)
+            .with_bip_path(self.bip_path)
+            .with_client_options(self.client_options);
 
         #[cfg(feature = "storage")]
         if let Some(storage_path) = &self.storage_path {

diff --git a/bindings/core/src/method/wallet.rs b/bindings/core/src/method/wallet.rs
@@ -43,6 +43,9 @@ use crate::OmittedDebug;
 #[serde(tag = "name", content = "data", rename_all = "camelCase")]
 #[non_exhaustive]
 pub enum WalletMethod {
+    /// Returns the accounts of the wallet.
+    /// Expected response: [`OutputsData`](crate::Response::OutputsData)
+    Accounts,
     /// Backup storage. Password must be the current one, when Stronghold is used as SecretManager.
     /// Expected response: [`Ok`](crate::Response::Ok)
     #[cfg(feature = "stronghold")]
@@ -188,6 +191,9 @@ pub enum WalletMethod {
     /// Returns the implicit account creation address of the wallet if it is Ed25519 based.
     /// Expected response: [`Bech32Address`](crate::Response::Bech32Address)
     ImplicitAccountCreationAddress,
+    /// Returns the implicit accounts of the wallet.
+    /// Expected response: [`OutputsData`](crate::Response::OutputsData)
+    ImplicitAccounts,
     /// Returns all incoming transactions of the wallet
     /// Expected response:
     /// [`Transactions`](crate::Response::Transactions)

diff --git a/bindings/core/src/method_handler/wallet.rs b/bindings/core/src/method_handler/wallet.rs
@@ -22,6 +22,10 @@ use crate::{method::WalletMethod, response::Response, Result};
 /// Call a wallet method.
 pub(crate) async fn call_wallet_method_internal(wallet: &Wallet, method: WalletMethod) -> Result<Response> {
     let response = match method {
+        WalletMethod::Accounts => {
+            let accounts = wallet.accounts().await;
+            Response::OutputsData(accounts.iter().map(OutputDataDto::from).collect())
+        }
         #[cfg(feature = "stronghold")]
         WalletMethod::Backup { destination, password } => {
             wallet.backup(destination, password).await?;
@@ -206,12 +210,16 @@ pub(crate) async fn call_wallet_method_internal(wallet: &Wallet, method: WalletM
             let implicit_account_creation_address = wallet.implicit_account_creation_address().await?;
             Response::Bech32Address(implicit_account_creation_address)
         }
+        WalletMethod::ImplicitAccounts => {
+            let implicit_accounts = wallet.implicit_accounts().await;
+            Response::OutputsData(implicit_accounts.iter().map(OutputDataDto::from).collect())
+        }
         WalletMethod::IncomingTransactions => {
             let transactions = wallet.incoming_transactions().await;
             Response::Transactions(transactions.iter().map(TransactionWithMetadataDto::from).collect())
         }
         WalletMethod::Outputs { filter_options } => {
-            let outputs = wallet.outputs(filter_options).await?;
+            let outputs = wallet.outputs(filter_options).await;
             Response::OutputsData(outputs.iter().map(OutputDataDto::from).collect())
         }
         WalletMethod::PendingTransactions => {
@@ -394,7 +402,7 @@ pub(crate) async fn call_wallet_method_internal(wallet: &Wallet, method: WalletM
             Response::Transactions(transactions.iter().map(TransactionWithMetadataDto::from).collect())
         }
         WalletMethod::UnspentOutputs { filter_options } => {
-            let outputs = wallet.unspent_outputs(filter_options).await?;
+            let outputs = wallet.unspent_outputs(filter_options).await;
             Response::OutputsData(outputs.iter().map(OutputDataDto::from).collect())
         }
     };

diff --git a/bindings/core/tests/secrets_debug.rs b/bindings/core/tests/secrets_debug.rs
@@ -26,6 +26,6 @@ fn method_interface_secrets_debug() {
     let wallet_options = WalletOptions::default().with_secret_manager(SecretManagerDto::Placeholder);
     assert_eq!(
         format!("{:?}", wallet_options),
-        "WalletOptions { storage_path: None, client_options: None, bip_path: None, secret_manager: Some(<omitted>) }"
+        "WalletOptions { address: None, alias: None, bip_path: None, client_options: None, secret_manager: Some(<omitted>), storage_path: None }"
     );
 }
diff --git a/bindings/nodejs/Cargo.toml b/bindings/nodejs/Cargo.toml
@@ -18,6 +18,7 @@ crate-type = ["cdylib"]
 doc = false
 
 [dependencies]
+async-trait = { version = "0.1.73", default-features = false }
 iota-sdk-bindings-core = { path = "../core", default-features = false, features = [
     "events",
     "ledger_nano",
@@ -28,17 +29,17 @@ iota-sdk-bindings-core = { path = "../core", default-features = false, features
     "mqtt",
     "private_key_secret_manager",
 ] }
-
 log = { version = "0.4.20", default-features = false }
-neon = { version = "0.10.1", default-features = false, features = [
-    "napi-6",
-    "event-queue-api",
-    "promise-api",
-] }
+napi = { version = "2.13.3", default-features = false, features = ["async"] }
+napi-derive = { version = "2.13.0", default-features = false }
 once_cell = { version = "1.18.0", default-features = false }
 serde_json = { version = "1.0.107", default-features = false }
+thiserror = { version = "1.0.49", default-features = false }
 tokio = { version = "1.33.0", default-features = false }
 
+[build-dependencies]
+napi-build = { version = "2.0.1", default-features = false }
+
 [profile.production]
 codegen-units = 1
 inherits = "release"

diff --git a/bindings/nodejs/README.md b/bindings/nodejs/README.md
@@ -73,8 +73,7 @@ If you have already installed the project and only want to run the build, run th
 npm run build
 ```
 
-This command uses the [cargo-cp-artifact](https://github.com/neon-bindings/cargo-cp-artifact) utility to run the Rust
-build and copy the built library into `./build/Release/index.node`.
+This command uses the napi build utility to run the Rust build and copy the built library into `./build/Release/index.node`.
 Prebuild requires that the binary is in `build/Release` as though it was built with node-gyp.
 
 ## Client Usage

diff --git a/bindings/nodejs/build.rs b/bindings/nodejs/build.rs
@@ -0,0 +1,8 @@
+// Copyright 2023 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+extern crate napi_build;
+
+fn main() {
+    napi_build::setup();
+}
diff --git a/bindings/nodejs/examples/package-lock.json b/bindings/nodejs/examples/package-lock.json
diff --git a/bindings/nodejs/examples/yarn.lock b/bindings/nodejs/examples/yarn.lock
@@ -679,11 +679,6 @@ call-bind@^1.0.0, call-bind@^1.0.2:
     function-bind "^1.1.1"
     get-intrinsic "^1.0.2"
 
-cargo-cp-artifact@^0.1.6:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/cargo-cp-artifact/-/cargo-cp-artifact-0.1.8.tgz#353814f49f6aa76601a4bcb3ea5f3071180b90de"
-  integrity sha512-3j4DaoTrsCD1MRkTF2Soacii0Nx7UHCce0EwUf4fHnggwiE4fbmF2AbnfzayR36DF8KGadfh7M/Yfy625kgPlA==
-
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
@@ -888,9 +883,9 @@ [email protected]:
   integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==
 
 detect-libc@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz#e1897aa88fa6ad197862937fbc0441ef352ee0cd"
-  integrity sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.2.tgz#8ccf2ba9315350e1241b88d0ac3b0e1fbd99605d"
+  integrity sha512-UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw==
 
 diff@^4.0.1:
   version "4.0.2"
@@ -1797,9 +1792,9 @@ next-tick@^1.1.0:
   integrity sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==
 
 node-abi@^3.3.0:
-  version "3.45.0"
-  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.45.0.tgz#f568f163a3bfca5aacfce1fbeee1fa2cc98441f5"
-  integrity sha512-iwXuFrMAcFVi/ZoZiqq8BzAdsLw9kxDfTC0HMyjXfSL/6CSDAGD5UmR7azrAgWV1zKYq7dUUMj4owusBWKLsiQ==
+  version "3.51.0"
+  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.51.0.tgz#970bf595ef5a26a271307f8a4befa02823d4e87d"
+  integrity sha512-SQkEP4hmNWjlniS5zdnfIXTk1x7Ome85RDzHlTbBtzE97Gfwz/Ipw4v/Ryk20DWIy3yCNVLVlGKApCnmvYoJbA==
   dependencies:
     semver "^7.3.5"
 
@@ -2129,9 +2124,9 @@ secp256k1@^4.0.1:
     node-gyp-build "^4.2.0"
 
 semver@^7.3.5:
-  version "7.5.2"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.2.tgz#5b851e66d1be07c1cdaf37dfc856f543325a2beb"
-  integrity sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==
+  version "7.5.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
+  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
   dependencies:
     lru-cache "^6.0.0"