Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge develop into 1.1 #1288

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/bindings-python-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
62 changes: 31 additions & 31 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bindings/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
2 changes: 1 addition & 1 deletion bindings/nodejs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
6 changes: 6 additions & 0 deletions bindings/python/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion bindings/python/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 3 additions & 1 deletion bindings/python/iota_sdk/types/send_params.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions bindings/python/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
2 changes: 1 addition & 1 deletion bindings/python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 6 additions & 0 deletions cli/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
4 changes: 2 additions & 2 deletions cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
9 changes: 5 additions & 4 deletions cli/src/command/account.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion sdk/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
2 changes: 1 addition & 1 deletion sdk/src/types/fuzz/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
Loading