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 committed Jan 10, 2024
2 parents 11b641a + 2b44b88 commit fff53e4
Show file tree
Hide file tree
Showing 15 changed files with 11,034 additions and 8,298 deletions.
250 changes: 125 additions & 125 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.8.3", 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 }
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 @@ -36,8 +36,8 @@ neon = { version = "0.10.1", default-features = false, features = [
"promise-api",
] }
once_cell = { version = "1.19.0", default-features = false }
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 }

[profile.production]
codegen-units = 1
Expand Down
123 changes: 79 additions & 44 deletions bindings/nodejs/examples/package-lock.json

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

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:..",
"class-transformer": "^0.5.1",
"dotenv": "^16.0.0",
"ts-node": "^10.9.1"
Expand Down
Loading

0 comments on commit fff53e4

Please sign in to comment.