Merge branch '2.0' into update-wallet-event

iotaledger · Dec 22, 2023 · 5adbd54 · 5adbd54
2 parents 7d8806a + e8de1e8
commit 5adbd54
Show file tree

Hide file tree

Showing 92 changed files with 6,063 additions and 6,029 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/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,