Skip to content

Commit

Permalink
Merge branch 'develop' into feat/cli/ledger-nano-support
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex6323 authored Jan 8, 2024
2 parents 1af13b9 + 0da084d commit 2146605
Show file tree
Hide file tree
Showing 9 changed files with 93 additions and 95 deletions.
147 changes: 68 additions & 79 deletions Cargo.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions bindings/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
zeroize = { version = "1.7.0", default-features = false }

[dev-dependencies]
Expand Down
4 changes: 2 additions & 2 deletions bindings/nodejs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ neon = { version = "0.10.1", default-features = false, features = [
"event-queue-api",
"promise-api",
] }
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 }
tokio = { version = "1.34.0", default-features = false }
tokio = { version = "1.35.0", default-features = false }

[profile.production]
codegen-units = 1
Expand Down
6 changes: 6 additions & 0 deletions bindings/python/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Security -->

## 1.1.3 - 202Y-MM-DD

### Added

- Optional `max_parallel_api_requests` to `Client` constructor;

## 1.1.2 - 2023-12-01

### Added
Expand Down
4 changes: 2 additions & 2 deletions bindings/python/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ iota-sdk-bindings-core = { path = "../core", default-features = false, features
] }

futures = { version = "0.3.29", default-features = false }
once_cell = { version = "1.18.0", default-features = false }
once_cell = { version = "1.19.0", default-features = false }
pyo3 = { version = "0.20.0", default-features = false, features = [
"macros",
"extension-module",
] }
serde_json = { version = "1.0.108", default-features = false }
tokio = { version = "1.34.0", default-features = false }
tokio = { version = "1.35.0", default-features = false }
3 changes: 3 additions & 0 deletions bindings/python/iota_sdk/client/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ def __init__(
local_pow: Optional[bool] = None,
fallback_to_local_pow: Optional[bool] = None,
pow_worker_count: Optional[int] = None,
max_parallel_api_requests: Optional[int] = None,
client_handle=None
):
"""Initialize the IOTA Client.
Expand Down Expand Up @@ -92,6 +93,8 @@ def __init__(
Fallback to local proof of work if the node doesn't support remote PoW.
pow_worker_count :
The amount of threads to be used for proof of work.
max_parallel_api_requests :
Set maximum parallel API requests.
client_handle :
An instance of a node client.
"""
Expand Down
2 changes: 1 addition & 1 deletion bindings/wasm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ console_error_panic_hook = { version = "0.1.7", default-features = false }
js-sys = { version = "0.3.66", default-features = false, features = [] }
log = { version = "0.4.20", default-features = false }
serde_json = { version = "1.0.108", default-features = false }
tokio = { version = "1.34.0", default-features = false, features = ["sync"] }
tokio = { version = "1.35.0", default-features = false, features = ["sync"] }
wasm-bindgen = { version = "0.2.89", default-features = false, features = [
"spans",
"std",
Expand Down
8 changes: 4 additions & 4 deletions cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ iota-sdk = { path = "../sdk", default-features = false, features = [
] }

chrono = { version = "0.4.31", default-features = false, features = ["std"] }
clap = { version = "4.4.10", default-features = false, features = [
clap = { version = "4.4.11", default-features = false, features = [
"std",
"color",
"help",
Expand All @@ -36,7 +36,7 @@ clap = { version = "4.4.10", default-features = false, features = [
"derive",
"env",
] }
colored = { version = "2.0.4", default-features = false }
colored = { version = "2.1.0", default-features = false }
dialoguer = { version = "0.11.0", default-features = false, features = [
"password",
] }
Expand All @@ -47,8 +47,8 @@ log = { version = "0.4.20", default-features = false }
prefix-hex = { version = "0.7.1", default-features = false, features = ["std"] }
rustyline = { version = "13.0.0", features = ["derive"] }
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, features = ["fs"] }
thiserror = { version = "1.0.51", default-features = false }
tokio = { version = "1.35.0", default-features = false, features = ["fs"] }
zeroize = { version = "1.7.0", default-features = false }

[target.'cfg(target_os = "windows")'.dependencies]
Expand Down
10 changes: 5 additions & 5 deletions sdk/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ iota-ledger-nano = { version = "1.0.1", default-features = false, optional = tru
iota_stronghold = { version = "2.0.0", default-features = false, optional = true }
log = { version = "0.4.20", default-features = false, optional = true }
num_cpus = { version = "1.16.0", default-features = false, optional = true }
once_cell = { version = "1.18.0", default-features = false, optional = true }
once_cell = { version = "1.19.0", default-features = false, optional = true }
rand = { version = "0.8.5", default-features = false, features = [
"min_const_gen",
], optional = true }
Expand All @@ -87,7 +87,7 @@ rumqttc = { version = "0.23.0", default-features = false, features = [
"websocket",
], optional = true }
serde_repr = { version = "0.1.17", default-features = false, optional = true }
thiserror = { version = "1.0.50", default-features = false, optional = true }
thiserror = { version = "1.0.51", default-features = false, optional = true }
time = { version = "0.3.30", default-features = false, features = [
"serde",
"macros",
Expand All @@ -100,7 +100,7 @@ zeroize = { version = "1.7.0", default-features = false, features = [
], optional = true }

[target.'cfg(not(target_family = "wasm"))'.dependencies]
tokio = { version = "1.34.0", default-features = false, features = [
tokio = { version = "1.35.0", default-features = false, features = [
"macros",
"rt-multi-thread",
"time",
Expand All @@ -116,7 +116,7 @@ instant = { version = "0.1.12", default-features = false, features = [
"wasm-bindgen",
], optional = true }
lazy_static = { version = "1.4.0", default-features = false }
tokio = { version = "1.34.0", default-features = false, features = [
tokio = { version = "1.35.0", default-features = false, features = [
"macros",
"rt",
"time",
Expand All @@ -132,7 +132,7 @@ pretty_assertions = { version = "1.4.0", default-features = false, features = [

dotenvy = { version = "0.15.7", default-features = false }
fern-logger = { version = "0.5.0", default-features = false }
tokio = { version = "1.34.0", default-features = false, features = [
tokio = { version = "1.35.0", default-features = false, features = [
"macros",
"rt",
"rt-multi-thread",
Expand Down

0 comments on commit 2146605

Please sign in to comment.