Skip to content

Commit

Permalink
Merge pull request #1811 from thibault-martinez/merge-develop-2.0-11
Browse files Browse the repository at this point in the history
Merge develop into 2.0
  • Loading branch information
thibault-martinez authored Jan 8, 2024
2 parents bf43541 + 460cd99 commit 35fd64d
Show file tree
Hide file tree
Showing 17 changed files with 13,367 additions and 11,337 deletions.
273 changes: 130 additions & 143 deletions Cargo.lock

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions bindings/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ iota-sdk = { path = "../../sdk", default-features = false, features = [
backtrace = { version = "0.3.69", default-features = false, features = ["std"] }
derivative = { version = "2.2.0", default-features = false }
fern-logger = { version = "0.5.0", default-features = false }
futures = { version = "0.3.29", default-features = false }
futures = { version = "0.3.30", default-features = false }
iota-crypto = { version = "0.23.0", default-features = false, features = [
"slip10",
"bip44",
Expand All @@ -26,10 +26,10 @@ log = { version = "0.4.20", default-features = false }
packable = { version = "0.10.0", default-features = false }
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.51", default-features = false }
tokio = { version = "1.35.0", default-features = false }
serde = { version = "1.0.195", default-features = false }
serde_json = { version = "1.0.111", default-features = false }
thiserror = { version = "1.0.56", default-features = false }
tokio = { version = "1.35.1", default-features = false }
url = { version = "2.4.1", default-features = false, features = ["serde"] }
zeroize = { version = "1.7.0", default-features = false }

Expand Down
4 changes: 2 additions & 2 deletions bindings/nodejs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ log = { version = "0.4.20", default-features = false }
napi = { version = "2.13.3", default-features = false, features = ["async"] }
napi-derive = { version = "2.13.0", default-features = false }
once_cell = { version = "1.19.0", default-features = false }
serde_json = { version = "1.0.108", default-features = false }
serde_json = { version = "1.0.111", default-features = false }
thiserror = { version = "1.0.49", default-features = false }
tokio = { version = "1.35.0", default-features = false }
tokio = { version = "1.35.1", default-features = false }

[build-dependencies]
napi-build = { version = "2.0.1", default-features = false }
Expand Down
1,204 changes: 473 additions & 731 deletions bindings/nodejs/examples/package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bindings/nodejs/examples/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"run-example": "ts-node"
},
"dependencies": {
"@iota/sdk": "file:../",
"@iota/sdk": "file:..",
"dotenv": "^16.0.0",
"ts-node": "^10.9.1"
},
Expand Down
5,254 changes: 2,824 additions & 2,430 deletions bindings/nodejs/examples/yarn.lock

Large diffs are not rendered by default.

7,952 changes: 4,853 additions & 3,099 deletions bindings/nodejs/package-lock.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions bindings/nodejs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"author": "IOTA Foundation <[email protected]>",
"license": "Apache-2.0",
"dependencies": {
"@babel/traverse": "^7.23.2",
"@types/node": "^18.15.12",
"class-transformer": "^0.5.1",
"prebuild-install": "^7.1.1",
Expand Down
1,526 changes: 747 additions & 779 deletions bindings/nodejs/yarn.lock

Large diffs are not rendered by default.

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
8 changes: 4 additions & 4 deletions bindings/python/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ iota-sdk-bindings-core = { path = "../core", default-features = false, features
"mqtt",
] }

futures = { version = "0.3.29", default-features = false }
futures = { version = "0.3.30", default-features = false }
once_cell = { version = "1.19.0", default-features = false }
pyo3 = { version = "0.20.0", default-features = false, features = [
pyo3 = { version = "0.20.2", default-features = false, features = [
"macros",
"extension-module",
] }
serde_json = { version = "1.0.108", default-features = false }
tokio = { version = "1.35.0", default-features = false }
serde_json = { version = "1.0.111", default-features = false }
tokio = { version = "1.35.1", 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 @@ -45,6 +45,7 @@ def __init__(
min_quorum_size: Optional[int] = None,
quorum_threshold: Optional[int] = None,
user_agent: Optional[str] = None,
max_parallel_api_requests: Optional[int] = None,
client_handle=None
):
"""Initialize the IOTA Client.
Expand All @@ -70,6 +71,8 @@ def __init__(
% of nodes that have to return the same response so it gets accepted.
user_agent :
The User-Agent header for requests.
max_parallel_api_requests :
Set maximum parallel API requests.
client_handle :
An instance of a node client.
"""
Expand Down
4 changes: 2 additions & 2 deletions bindings/wasm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ iota-sdk-bindings-core = { path = "../core", default-features = false, features
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.35.0", default-features = false, features = ["sync"] }
serde_json = { version = "1.0.111", default-features = false }
tokio = { version = "1.35.1", default-features = false, features = ["sync"] }
wasm-bindgen = { version = "0.2.89", default-features = false, features = [
"spans",
"std",
Expand Down
Loading

0 comments on commit 35fd64d

Please sign in to comment.