Merge branch '2.0' into nodejs-core-api

iotaledger · Jan 8, 2024 · d9339ce · d9339ce
2 parents 1b906ea + bf43541
commit d9339ce
Show file tree

Hide file tree

Showing 127 changed files with 6,665 additions and 6,653 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,8 +3,7 @@ resolver = "2"
 members = [
 	"bindings/core",
 	"bindings/nodejs",
-	# TODO: issue #1423
-	#"bindings/python",
+	"bindings/python",
 	"bindings/wasm",
 	"cli",
 	"sdk",

diff --git a/bindings/core/Cargo.toml b/bindings/core/Cargo.toml
@@ -28,8 +28,8 @@ prefix-hex = { version = "0.7.1", default-features = false }
 primitive-types = { version = "0.12.2", default-features = false }
 serde = { version = "1.0.193", default-features = false }
 serde_json = { version = "1.0.108", default-features = false }
-thiserror = { version = "1.0.50", default-features = false }
-tokio = { version = "1.34.0", default-features = false }
+thiserror = { version = "1.0.51", default-features = false }
+tokio = { version = "1.35.0", default-features = false }
 url = { version = "2.4.1", default-features = false, features = ["serde"] }
 zeroize = { version = "1.7.0", default-features = false }
 

diff --git a/bindings/core/src/method/utils.rs b/bindings/core/src/method/utils.rs
@@ -76,7 +76,7 @@ pub enum UtilsMethod {
     ComputeNftId { output_id: OutputId },
     /// Computes the output ID from transaction id and output index
     ComputeOutputId { id: TransactionId, index: u16 },
-    /// Computes a tokenId from the aliasId, serial number and token scheme type.
+    /// Computes a tokenId from the accountId, serial number and token scheme type.
     #[serde(rename_all = "camelCase")]
     ComputeTokenId {
         account_id: AccountId,

diff --git a/bindings/nodejs/CHANGELOG.md b/bindings/nodejs/CHANGELOG.md
@@ -19,7 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Security -->
 
-## 1.1.4 - 2023-MM-DD
+## 1.1.4 - 2023-12-07
 
 ### Added
 

diff --git a/bindings/nodejs/Cargo.toml b/bindings/nodejs/Cargo.toml
@@ -32,10 +32,10 @@ iota-sdk-bindings-core = { path = "../core", default-features = false, features
 log = { version = "0.4.20", default-features = false }
 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 }
+once_cell = { version = "1.19.0", default-features = false }
 serde_json = { version = "1.0.108", default-features = false }
 thiserror = { version = "1.0.49", default-features = false }
-tokio = { version = "1.34.0", default-features = false }
+tokio = { version = "1.35.0", default-features = false }
 
 [build-dependencies]
 napi-build = { version = "2.0.1", default-features = false }

diff --git a/bindings/nodejs/examples/package-lock.json b/bindings/nodejs/examples/package-lock.json
diff --git a/bindings/nodejs/examples/package.json b/bindings/nodejs/examples/package.json
@@ -18,6 +18,7 @@
         "@ethereumjs/tx": "^4.1.2",
         "@ethereumjs/util": "^8.0.6",
         "typescript": "^4.6.3",
+        "undici-types": "^6.0.1",
         "web3": "^1.10.0"
     },
     "resolutions": {

diff --git a/bindings/nodejs/examples/yarn.lock b/bindings/nodejs/examples/yarn.lock
@@ -236,7 +236,7 @@
 
 "@iota/sdk@file:../":
   "resolved" "file:.."
-  "version" "1.1.3"
+  "version" "1.1.4"
   dependencies:
     "@types/node" "^18.15.12"
     "class-transformer" "^0.5.1"
@@ -2272,6 +2272,11 @@
   "resolved" "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz"
   "version" "1.1.1"
 
+"undici-types@^6.0.1":
+  "integrity" "sha512-i9dNdkCziyqGpFxhatR9LITcInbFWh+ExlWkrZQpZHje8FfCcJKgps0IbmMd7D1o8c8syG4pIOV+aKIoC9JEyA=="
+  "resolved" "https://registry.npmjs.org/undici-types/-/undici-types-6.0.1.tgz"
+  "version" "6.0.1"
+
 "universalify@^0.1.0":
   "integrity" "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
   "resolved" "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz"