From 7aa1e7afbff4e468681ca0a805d72e80e9774d3f Mon Sep 17 00:00:00 2001 From: Daniel Melero Martinez Date: Mon, 18 Sep 2023 20:50:17 +0200 Subject: [PATCH 1/5] Fix: nodejs broken install command for windows (#1251) --- bindings/nodejs/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bindings/nodejs/package.json b/bindings/nodejs/package.json index 8893283c0b..0471b271cd 100644 --- 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" }, From ba38c55f0455b102a5ec32739568819b29a91995 Mon Sep 17 00:00:00 2001 From: Thoralf-M <46689931+Thoralf-M@users.noreply.github.com> Date: Tue, 19 Sep 2023 12:12:20 +0200 Subject: [PATCH 2/5] Fix wheel path (#1258) --- .github/workflows/bindings-python-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bindings-python-publish.yml b/.github/workflows/bindings-python-publish.yml index 1bc832619f..fbf928fa25 100644 --- 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 From 64413fa8a90d9271d99498b7bdc2126b983bc0db Mon Sep 17 00:00:00 2001 From: Thoralf-M <46689931+Thoralf-M@users.noreply.github.com> Date: Tue, 19 Sep 2023 13:51:37 +0200 Subject: [PATCH 3/5] Fix comment and bump version, add dependencies (#1259) --- Cargo.lock | 2 +- bindings/python/CHANGELOG.md | 6 ++++++ bindings/python/Cargo.toml | 2 +- bindings/python/iota_sdk/types/send_params.py | 4 +++- bindings/python/pyproject.toml | 1 + bindings/python/setup.py | 2 +- 6 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d2d368b24f..fefaa67e95 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1716,7 +1716,7 @@ dependencies = [ [[package]] name = "iota-sdk-python" -version = "1.0.2" +version = "1.0.3" dependencies = [ "futures", "iota-sdk-bindings-core", diff --git a/bindings/python/CHANGELOG.md b/bindings/python/CHANGELOG.md index 1ada400f33..5dfeea1196 100644 --- a/bindings/python/CHANGELOG.md +++ b/bindings/python/CHANGELOG.md @@ -19,6 +19,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Security --> +## 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 index a71e89e167..d6257d7cec 100644 --- 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 index df1fe5bc1a..d2af0f603e 100644 --- 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 index 620d7bfc9d..2ebc287ebd 100644 --- 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"] \ No newline at end of file diff --git a/bindings/python/setup.py b/bindings/python/setup.py index e709f935d0..70be8a1d84 100644 --- 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", From c396be929554782756a39dffaa114d23cf85ef2d Mon Sep 17 00:00:00 2001 From: Thoralf-M <46689931+Thoralf-M@users.noreply.github.com> Date: Wed, 20 Sep 2023 16:20:04 +0200 Subject: [PATCH 4/5] Fix potential problem with binary_search_by_key() (#1274) * Fix potential problem with binary_search_by_key() * Changelog entry --- cli/CHANGELOG.md | 6 ++++++ cli/src/command/account.rs | 11 ++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md index bba6480056..593c427f13 100644 --- a/cli/CHANGELOG.md +++ b/cli/CHANGELOG.md @@ -19,6 +19,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Security --> +## 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/src/command/account.rs b/cli/src/command/account.rs index eea411c7ae..3dac765145 100644 --- a/cli/src/command/account.rs +++ b/cli/src/command/account.rs @@ -878,11 +878,12 @@ async fn print_address(account: &Account, address: &AccountAddress) -> Result<() let addresses = account.addresses_with_unspent_outputs().await?; let current_time = iota_sdk::utils::unix_timestamp_now().as_secs() as u32; - if let Ok(index) = addresses.binary_search_by_key(&(address.key_index(), address.internal()), |a| { - (a.key_index(), a.internal()) - }) { + if let Some(address) = addresses + .iter() + .find(|a| a.key_index() == address.key_index() && a.internal() == address.internal()) + { let mut address_amount = 0; - for output_id in addresses[index].output_ids() { + for output_id in address.output_ids() { if let Some(output_data) = account.get_output(output_id).await { // Output might be associated with the address, but can't unlocked by it, so we check that here let (required_address, _) = @@ -905,7 +906,7 @@ async fn print_address(account: &Account, address: &AccountAddress) -> Result<() } log = format!( "{log}\nOutputs: {:#?}\nBase coin amount: {}\n", - addresses[index].output_ids(), + address.output_ids(), address_amount ); } else { From e29475a1427269abbf5d89ecb3fd9b74bb66fab3 Mon Sep 17 00:00:00 2001 From: Thibault Martinez Date: Fri, 22 Sep 2023 10:41:26 +0200 Subject: [PATCH 5/5] Fix tungstenite audit (#1286) --- Cargo.lock | 60 +++++++++++++++++------------------ bindings/core/Cargo.toml | 2 +- cli/Cargo.toml | 4 +-- sdk/Cargo.toml | 2 +- sdk/src/types/fuzz/Cargo.toml | 2 +- 5 files changed, 35 insertions(+), 35 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fefaa67e95..fd7c74eced 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -40,9 +40,9 @@ dependencies = [ [[package]] name = "aes-gcm" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "209b47e8954a928e1d72e86eca7000ebb6655fe1436d33eefc2201cad027e237" +checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" dependencies = [ "aead", "aes", @@ -65,9 +65,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.5" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" +checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" dependencies = [ "memchr", ] @@ -467,9 +467,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.3" +version = "4.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84ed82781cea27b43c9b106a979fe450a13a31aab0500595fb3fc06616de08e6" +checksum = "b1d7b8d5ec32af0fadc644bf1fd509a688c2103b185644bb1e29d164e0703136" dependencies = [ "clap_builder", "clap_derive", @@ -477,9 +477,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.2" +version = "4.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08" +checksum = "5179bb514e4d7c2051749d8fcefa2ed6d06a9f4e6d69faf3805f5d80b8cf8d56" dependencies = [ "anstream", "anstyle", @@ -680,9 +680,9 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.1.0" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622178105f911d937a42cdb140730ba4a3ed2becd8ae6ce39c7d28b5d75d4588" +checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c" dependencies = [ "cfg-if", "cpufeatures", @@ -936,7 +936,7 @@ version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d9ce6874da5d4415896cd45ffbc4d1cfc0c4f9c079427bd870742c30f2f65a9" dependencies = [ - "curve25519-dalek 4.1.0", + "curve25519-dalek 4.1.1", "ed25519", "hashbrown 0.14.0", "hex", @@ -1363,9 +1363,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "hex" @@ -2183,9 +2183,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "packable" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d99ae55c2e3dc657f87a74d549bfe44187dba690310738d384454b8101f7c0f8" +checksum = "11259b086696fc9256f790485d8f14f11f0fa60a60351af9693e3d49fd24fdb6" dependencies = [ "autocfg", "packable-derive", @@ -2766,9 +2766,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.13" +version = "0.38.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662" +checksum = "747c788e9ce8e92b12cd485c49ddf90723550b654b32508f979b71a7b1ecda4f" dependencies = [ "bitflags 2.4.0", "errno", @@ -2785,7 +2785,7 @@ checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", "ring", - "rustls-webpki 0.101.5", + "rustls-webpki 0.101.6", "sct", ] @@ -2822,9 +2822,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.101.5" +version = "0.101.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45a27e3b59326c16e23d30aeb7a36a24cc0d29e71d68ff611cdfb4a01d013bed" +checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe" dependencies = [ "ring", "untrusted", @@ -3015,9 +3015,9 @@ dependencies = [ [[package]] name = "sha1" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if", "cpufeatures", @@ -3068,9 +3068,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" [[package]] name = "snafu" @@ -3383,9 +3383,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" dependencies = [ "bytes", "futures-core", @@ -3517,9 +3517,9 @@ dependencies = [ [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "unindent" @@ -3727,9 +3727,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ "winapi", ] diff --git a/bindings/core/Cargo.toml b/bindings/core/Cargo.toml index 622989e74d..339198725d 100644 --- 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/cli/Cargo.toml b/cli/Cargo.toml index f93dccd3bc..ad1609fa72 100644 --- 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/sdk/Cargo.toml b/sdk/Cargo.toml index 08739e6769..35696679bc 100644 --- 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 index 43f256a55c..44190bc39e 100644 --- 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]