Skip to content

Commit

Permalink
Merge branch '2.0' into update-wallet-event
Browse files Browse the repository at this point in the history
  • Loading branch information
Brord van Wierst authored Dec 19, 2023
2 parents 0ec222a + d28122a commit 7d8806a
Show file tree
Hide file tree
Showing 24 changed files with 652 additions and 677 deletions.
249 changes: 113 additions & 136 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 }
url = { version = "2.4.1", default-features = false, features = ["serde"] }
zeroize = { version = "1.7.0", default-features = false }

Expand Down
2 changes: 1 addition & 1 deletion bindings/nodejs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Security -->

## 1.1.4 - 2023-MM-DD
## 1.1.4 - 2023-12-07

### Added

Expand Down
4 changes: 2 additions & 2 deletions bindings/nodejs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ iota-sdk-bindings-core = { path = "../core", default-features = false, features
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.18.0", default-features = false }
once_cell = { version = "1.19.0", default-features = false }
serde_json = { version = "1.0.108", default-features = false }
thiserror = { version = "1.0.49", default-features = false }
tokio = { version = "1.34.0", default-features = false }
tokio = { version = "1.35.0", default-features = false }

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

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

1 change: 1 addition & 0 deletions bindings/nodejs/examples/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"@ethereumjs/tx": "^4.1.2",
"@ethereumjs/util": "^8.0.6",
"typescript": "^4.6.3",
"undici-types": "^6.0.1",
"web3": "^1.10.0"
},
"resolutions": {
Expand Down
7 changes: 6 additions & 1 deletion bindings/nodejs/examples/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@

"@iota/sdk@file:../":
"resolved" "file:.."
"version" "1.1.3"
"version" "1.1.4"
dependencies:
"@types/node" "^18.15.12"
"class-transformer" "^0.5.1"
Expand Down Expand Up @@ -2272,6 +2272,11 @@
"resolved" "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz"
"version" "1.1.1"

"undici-types@^6.0.1":
"integrity" "sha512-i9dNdkCziyqGpFxhatR9LITcInbFWh+ExlWkrZQpZHje8FfCcJKgps0IbmMd7D1o8c8syG4pIOV+aKIoC9JEyA=="
"resolved" "https://registry.npmjs.org/undici-types/-/undici-types-6.0.1.tgz"
"version" "6.0.1"

"universalify@^0.1.0":
"integrity" "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
"resolved" "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz"
Expand Down
Loading

0 comments on commit 7d8806a

Please sign in to comment.