Merge branch 'develop' into merge-develop-1.1-5

iotaledger · Sep 22, 2023 · ca21be0 · ca21be0
2 parents 3347676 + e29475a
commit ca21be0
Show file tree

Hide file tree

Showing 14 changed files with 61 additions and 45 deletions.
diff --git a/.github/workflows/bindings-python-publish.yml b/.github/workflows/bindings-python-publish.yml
@@ -130,7 +130,7 @@ jobs:
             pip install -r requirements-dev.txt 
             pip install patchelf
             pip install maturin
-            maturin build --out ../../../dist --profile=production
+            maturin build --out ../../dist --profile=production
 
       - name: Upload wheels
         uses: actions/upload-artifact@v3

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bindings/core/Cargo.toml b/bindings/core/Cargo.toml
@@ -23,7 +23,7 @@ iota-crypto = { version = "0.23.0", default-features = false, features = [
     "bip44",
 ] }
 log = { version = "0.4.20", default-features = false }
-packable = { version = "0.8.2", default-features = false }
+packable = { version = "0.8.3", default-features = false }
 prefix-hex = { version = "0.7.1", default-features = false }
 primitive-types = { version = "0.12.1", default-features = false }
 serde = { version = "1.0.188", default-features = false }

diff --git a/bindings/nodejs/package.json b/bindings/nodejs/package.json
@@ -18,7 +18,7 @@
         "prebuild-windows-arm64": "prebuild --runtime napi --target 6 --prepack 'yarn run neon-build-windows-arm64' --strip --arch arm64",
         "neon-build-windows-arm64": "cargo-cp-artifact -ac iota-sdk-nodejs ./index.node -- cargo build --profile=production --message-format=json-render-diagnostics --target aarch64-pc-windows-msvc && node -e \"require('./scripts/move-artifact.js')()\"",
         "rebuild": "node scripts/neon-build && tsc && node scripts/strip.js",
-        "install": "prebuild-install --runtime napi --tag-prefix='iota-sdk-nodejs-v' && tsc || npm run rebuild",
+        "install": "prebuild-install --runtime napi --tag-prefix=iota-sdk-nodejs-v && tsc || npm run rebuild",
         "test": "jest",
         "create-api-docs": "typedoc ./lib/index.ts --githubPages false --disableSources --excludePrivate --excludeInternal --plugin typedoc-plugin-markdown --theme markdown --hideBreadcrumbs --entryDocument api_ref.md --readme none --hideGenerator --sort source-order"
     },

diff --git a/bindings/python/CHANGELOG.md b/bindings/python/CHANGELOG.md
@@ -30,6 +30,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `Client::output_ids()` method;
 - `QueryParameter::unlockable_by_address` field;
 
+## 1.0.3 - 2023-09-19
+
+### Fixed
+
+- Wheel upload;
+
 ## 1.0.2 - 2023-09-12
 
 ### Added

diff --git a/bindings/python/Cargo.toml b/bindings/python/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-sdk-python"
-version = "1.0.2"
+version = "1.0.3"
 authors = ["IOTA Stiftung"]
 edition = "2021"
 description = "Python bindings for the IOTA SDK library"

diff --git a/bindings/python/iota_sdk/types/send_params.py b/bindings/python/iota_sdk/types/send_params.py
@@ -16,7 +16,9 @@ class SendParams():
         address: The address to send to.
         amount: The amount to send.
         returnAddress: The address to return the funds to if not claimed.
-        expiration: The expiration timestamp until funds can be claimed.
+        expiration: Expiration in seconds, after which the output will be available for the sender again, if not spent by the
+        receiver already. The expiration will only be used if one is necessary given the provided amount. If an
+        expiration is needed but not provided, it will default to one day.
     """
     address: str
     amount: str

diff --git a/bindings/python/pyproject.toml b/bindings/python/pyproject.toml
@@ -4,6 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "iota-sdk"
+dependencies = ["dacite >= 1.8.1", "pyhumps >= 3.8.0"]
 
 [tool.maturin]
 python-packages = ["iota_sdk"]
diff --git a/bindings/python/setup.py b/bindings/python/setup.py
@@ -22,7 +22,7 @@ def get_py_version_cfgs():
 
 setup(
     name="iota_sdk",
-    version="1.0.2",
+    version="1.0.3",
     classifiers=[
         "License :: SPDX-License-Identifier ::  Apache-2.0",
         "Intended Audience :: Developers",

diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md
@@ -39,6 +39,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `print_account_help` changed to `AccountCli::print_help`;
 - `AccountCommand::Addresses` now prints an overview that includes NTs, NFTs, Aliases and Foundries;
 
+## 1.0.1 - 2023-MM-DD
+
+### Fixed
+
+- Potential bug in the addresses command;
+
 ## 1.0.0 - 2023-07-27
 
 First release of the `cli-wallet`.
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -21,8 +21,8 @@ iota-sdk = { path = "../sdk", default-features = false, features = [
     "participation",
 ] }
 
-chrono = { version = "0.4.29", default-features = false, features = ["std"] }
-clap = { version = "4.4.2", default-features = false, features = [
+chrono = { version = "0.4.31", default-features = false, features = ["std"] }
+clap = { version = "4.4.4", default-features = false, features = [
     "std",
     "color",
     "help",

diff --git a/cli/src/command/account.rs b/cli/src/command/account.rs
@@ -933,10 +933,11 @@ async fn print_address(account: &Account, address: &AccountAddress) -> Result<()
     let mut aliases = Vec::new();
     let mut foundries = Vec::new();
 
-    if let Ok(index) = addresses.binary_search_by_key(&(address.key_index(), address.internal()), |a| {
-        (a.key_index(), a.internal())
-    }) {
-        output_ids = addresses[index].output_ids().as_slice();
+    if let Some(address) = addresses
+        .iter()
+        .find(|a| a.key_index() == address.key_index() && a.internal() == address.internal())
+    {
+        output_ids = address.output_ids().as_slice();
 
         for output_id in output_ids {
             if let Some(output_data) = account.get_output(output_id).await {

diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml
@@ -43,7 +43,7 @@ iterator-sorted = { version = "0.1.0", default-features = false }
 itertools = { version = "0.11.0", default-features = false, features = [
     "use_alloc",
 ] }
-packable = { version = "0.8.2", default-features = false, features = [
+packable = { version = "0.8.3", default-features = false, features = [
     "primitive-types",
 ] }
 prefix-hex = { version = "0.7.1", default-features = false, features = [

diff --git a/sdk/src/types/fuzz/Cargo.toml b/sdk/src/types/fuzz/Cargo.toml
@@ -12,7 +12,7 @@ cargo-fuzz = true
 iota-types = { path = "..", default-features = false }
 
 libfuzzer-sys = { version = "0.4.7", default-features = false }
-packable = { version = "0.8.2", default-features = false }
+packable = { version = "0.8.3", default-features = false }
 
 # Prevent this from interfering with workspaces
 [workspace]