Skip to content

Commit

Permalink
Merge branch '2.0' into is_network_healthy
Browse files Browse the repository at this point in the history
  • Loading branch information
@thibault-martinez
thibault-martinez authored Mar 22, 2024
2 parents 98efbc1 + cccf191 commit 89046b7
Show file tree
Hide file tree
Showing 8 changed files with 321 additions and 288 deletions.
499 changes: 265 additions & 234 deletions Cargo.lock
View file

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions bindings/core/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,26 +15,26 @@ iota-sdk = { path = "../../sdk", default-features = false, features = [
"tls",
] }

backtrace = { version = "0.3.69", default-features = false, features = ["std"] }
backtrace = { version = "0.3.70", 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.30", default-features = false }
iota-crypto = { version = "0.23.1", default-features = false, features = [
"slip10",
"bip44",
] }
log = { version = "0.4.20", default-features = false }
log = { version = "0.4.21", default-features = false }
packable = { version = "0.11.0", default-features = false, features = [
"primitive-types",
] }
prefix-hex = { version = "0.7.1", default-features = false }
primitive-types = { version = "0.12.2", default-features = false }
serde = { version = "1.0.196", default-features = false }
serde_json = { version = "1.0.113", default-features = false }
strum = { version = "0.26.1", default-features = false, features = ["derive"] }
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"] }
serde = { version = "1.0.197", default-features = false }
serde_json = { version = "1.0.114", default-features = false }
strum = { version = "0.26.2", default-features = false, features = ["derive"] }
thiserror = { version = "1.0.58", default-features = false }
tokio = { version = "1.36.0", default-features = false }
url = { version = "2.5.0", default-features = false, features = ["serde"] }
zeroize = { version = "1.7.0", default-features = false }

[dev-dependencies]
Expand Down
16 changes: 8 additions & 8 deletions bindings/nodejs/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ crate-type = ["cdylib"]
doc = false

[dependencies]
async-trait = { version = "0.1.73", default-features = false }
async-trait = { version = "0.1.78", default-features = false }
iota-sdk-bindings-core = { path = "../core", default-features = false, features = [
"events",
"ledger_nano",
Expand All @@ -29,16 +29,16 @@ iota-sdk-bindings-core = { path = "../core", default-features = false, features
"mqtt",
"private_key_secret_manager",
] }
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 }
log = { version = "0.4.21", default-features = false }
napi = { version = "2.16.0", default-features = false, features = ["async"] }
napi-derive = { version = "2.16.0", default-features = false }
once_cell = { version = "1.19.0", default-features = false }
serde_json = { version = "1.0.113", default-features = false }
thiserror = { version = "1.0.49", default-features = false }
tokio = { version = "1.35.1", default-features = false }
serde_json = { version = "1.0.114", default-features = false }
thiserror = { version = "1.0.58", default-features = false }
tokio = { version = "1.36.0", default-features = false }

[build-dependencies]
napi-build = { version = "2.0.1", default-features = false }
napi-build = { version = "2.1.2", default-features = false }

[profile.production]
codegen-units = 1
Expand Down
6 changes: 3 additions & 3 deletions bindings/nodejs/lib/types/wallet/event.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import type { OutputData } from './output';
import { InclusionState } from './transaction';
import { InputSigningData, Remainder } from '../client';
import { Transaction, SignedTransactionPayload, TransactionId } from '../block';
import { OutputResponse } from '../models';
import { OutputWithMetadata } from '../models';
import { HexEncodedString } from '../utils';

/**
Expand Down Expand Up @@ -59,7 +59,7 @@ class LedgerAddressGenerationWalletEvent extends WalletEvent {
class NewOutputWalletEvent extends WalletEvent {
output: OutputData;
transaction?: SignedTransactionPayload;
transactionInputs?: OutputResponse[];
transactionInputs?: OutputWithMetadata[];

/**
* @param output The new output.
Expand All @@ -69,7 +69,7 @@ class NewOutputWalletEvent extends WalletEvent {
constructor(
output: OutputData,
transaction?: SignedTransactionPayload,
transactionInputs?: OutputResponse[],
transactionInputs?: OutputWithMetadata[],
) {
super(WalletEventType.NewOutput);
this.output = output;
Expand Down
6 changes: 3 additions & 3 deletions bindings/python/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ iota-sdk-bindings-core = { path = "../core", default-features = false, features

futures = { version = "0.3.30", default-features = false }
once_cell = { version = "1.19.0", default-features = false }
pyo3 = { version = "0.20.2", default-features = false, features = [
pyo3 = { version = "0.20.3", default-features = false, features = [
"macros",
"extension-module",
] }
serde_json = { version = "1.0.113", default-features = false }
tokio = { version = "1.35.1", default-features = false }
serde_json = { version = "1.0.114", default-features = false }
tokio = { version = "1.36.0", default-features = false }
10 changes: 5 additions & 5 deletions bindings/wasm/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,16 @@ 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.67", default-features = false, features = [] }
log = { version = "0.4.20", default-features = false }
serde_json = { version = "1.0.113", default-features = false }
tokio = { version = "1.35.1", default-features = false, features = ["sync"] }
js-sys = { version = "0.3.69", default-features = false, features = [] }
log = { version = "0.4.21", default-features = false }
serde_json = { version = "1.0.114", default-features = false }
tokio = { version = "1.36.0", default-features = false, features = ["sync"] }
wasm-bindgen = { version = "0.2.92", default-features = false, features = [
"spans",
"std",
"serde-serialize",
] }
wasm-bindgen-futures = { version = "0.4.40", default-features = false }
wasm-bindgen-futures = { version = "0.4.42", default-features = false }
wasm-logger = { version = "0.2.0", default-features = false }

[target.'cfg(all(target_arch = "wasm32", not(target_os = "wasi")))'.dependencies]
Expand Down
20 changes: 11 additions & 9 deletions cli/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ iota-sdk = { path = "../sdk", default-features = false, features = [
"ledger_nano",
] }

chrono = { version = "0.4.33", default-features = false, features = ["std"] }
clap = { version = "4.4.18", default-features = false, features = [
chrono = { version = "0.4.35", default-features = false, features = ["std"] }
clap = { version = "4.5.3", default-features = false, features = [
"std",
"color",
"help",
Expand All @@ -41,15 +41,17 @@ dialoguer = { version = "0.11.0", default-features = false, features = [
"password",
] }
dotenvy = { version = "0.15.7", default-features = false }
eyre = { version = "0.6.12", default-features = false, features = ["auto-install"] }
eyre = { version = "0.6.12", default-features = false, features = [
"auto-install",
] }
fern-logger = { version = "0.5.0", default-features = false }
log = { version = "0.4.20", default-features = false }
log = { version = "0.4.21", 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.113", default-features = false }
strum = { version = "0.26.1", default-features = false, features = ["derive"] }
thiserror = { version = "1.0.56", default-features = false }
tokio = { version = "1.35.1", default-features = false, features = ["fs"] }
rustyline = { version = "14.0.0", features = ["derive"] }
serde_json = { version = "1.0.114", default-features = false }
strum = { version = "0.26.2", default-features = false, features = ["derive"] }
thiserror = { version = "1.0.58", default-features = false }
tokio = { version = "1.36.0", default-features = false, features = ["fs"] }
zeroize = { version = "1.7.0", default-features = false }

[target.'cfg(target_os = "windows")'.dependencies]
Expand Down
36 changes: 18 additions & 18 deletions sdk/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ rustdoc-args = ["--cfg", "docsrs"]
[dependencies]
# Mandatory dependencies
bech32 = { version = "0.11.0", default-features = false, features = ["alloc"] }
bitflags = { version = "2.4.2", default-features = false }
bitflags = { version = "2.5.0", default-features = false }
derive_more = { version = "0.99.17", default-features = false, features = [
"from",
"from_str",
Expand Down Expand Up @@ -52,16 +52,16 @@ prefix-hex = { version = "0.7.1", default-features = false, features = [
"primitive-types",
] }
primitive-types = { version = "0.12.2", default-features = false }
serde = { version = "1.0.196", default-features = false, features = ["derive"] }
serde_json = { version = "1.0.113", default-features = false, features = [
serde = { version = "1.0.197", default-features = false, features = ["derive"] }
serde_json = { version = "1.0.114", default-features = false, features = [
"alloc",
] }
strum = { version = "0.26.1", default-features = false, features = ["derive"] }
strum = { version = "0.26.2", default-features = false, features = ["derive"] }

# Optional dependencies
anymap = { version = "0.12.1", default-features = false, optional = true }
async-trait = { version = "0.1.77", default-features = false, optional = true }
bs58 = { version = "0.5.0", default-features = false, optional = true }
async-trait = { version = "0.1.78", default-features = false, optional = true }
bs58 = { version = "0.5.1", default-features = false, optional = true }
fern-logger = { version = "0.5.0", default-features = false, optional = true }
futures = { version = "0.3.30", default-features = false, features = [
"thread-pool",
Expand All @@ -71,26 +71,26 @@ iota-ledger-nano = { version = "1.0.4-alpha.3", default-features = false, featur
"nova",
], optional = true }
iota_stronghold = { version = "2.0.0", default-features = false, optional = true }
log = { version = "0.4.20", default-features = false, optional = true }
log = { version = "0.4.21", 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 }
regex = { version = "1.10.3", default-features = false, features = [
"unicode-perl",
], optional = true }
reqwest = { version = "0.11.23", default-features = false, features = [
reqwest = { version = "0.12.0", default-features = false, features = [
"json",
], optional = true }
rocksdb = { version = "0.21.0", default-features = false, features = [
rocksdb = { version = "0.22.0", default-features = false, features = [
"lz4",
], optional = true }
rumqttc = { version = "0.23.0", default-features = false, features = [
rumqttc = { version = "0.24.0", default-features = false, features = [
"websocket",
], optional = true }
serde_repr = { version = "0.1.18", default-features = false, optional = true }
thiserror = { version = "1.0.56", default-features = false, optional = true }
time = { version = "0.3.31", default-features = false, features = [
thiserror = { version = "1.0.58", default-features = false, optional = true }
time = { version = "0.3.34", default-features = false, features = [
"serde",
"macros",
], optional = true }
Expand All @@ -102,7 +102,7 @@ zeroize = { version = "1.7.0", default-features = false, features = [
], optional = true }

[target.'cfg(not(target_family = "wasm"))'.dependencies]
tokio = { version = "1.35.1", default-features = false, features = [
tokio = { version = "1.36.0", default-features = false, features = [
"macros",
"rt-multi-thread",
"time",
Expand All @@ -118,13 +118,13 @@ 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.35.1", default-features = false, features = [
tokio = { version = "1.36.0", default-features = false, features = [
"macros",
"rt",
"time",
"sync",
], optional = true }
wasm-bindgen-futures = { version = "0.4.40", default-features = false, optional = true }
wasm-bindgen-futures = { version = "0.4.42", default-features = false, optional = true }

[dev-dependencies]
iota-sdk = { path = ".", default-features = false, features = ["rand"] }
Expand All @@ -136,9 +136,9 @@ dotenvy = { version = "0.15.7", default-features = false }
fern-logger = { version = "0.5.0", default-features = false }
num_cpus = { version = "1.16.0", default-features = false }
once_cell = { version = "1.19.0", default-features = false }
regex = { version = "1.10.2", default-features = false }
time = { version = "0.3.31", default-features = false }
tokio = { version = "1.35.1", default-features = false, features = [
regex = { version = "1.10.3", default-features = false }
time = { version = "0.3.34", default-features = false }
tokio = { version = "1.36.0", default-features = false, features = [
"macros",
"rt",
"rt-multi-thread",
Expand Down

0 comments on commit 89046b7

Please sign in to comment.