From eaf3763215c0f58513bfac0408ec8a573123e71d Mon Sep 17 00:00:00 2001 From: Lucas Fernandes Nogueira Date: Wed, 31 Mar 2021 19:22:41 -0300 Subject: [PATCH] feat(stronghold): check if mnemonic is already set, closes #409 (#486) --- .changes/stronghold-mnemonic-check.md | 5 + Cargo.lock | 295 +++++++++++----------- Cargo.toml | 4 +- bindings/java/native/Cargo.lock | 213 ++++++++-------- bindings/nodejs/native/Cargo.lock | 311 +++++++++++------------ bindings/python/native/Cargo.lock | 339 ++++++++++++-------------- src/storage/mod.rs | 4 +- src/stronghold.rs | 9 +- 8 files changed, 587 insertions(+), 593 deletions(-) create mode 100644 .changes/stronghold-mnemonic-check.md diff --git a/.changes/stronghold-mnemonic-check.md b/.changes/stronghold-mnemonic-check.md new file mode 100644 index 000000000..46cf41132 --- /dev/null +++ b/.changes/stronghold-mnemonic-check.md @@ -0,0 +1,5 @@ +--- +"nodejs-binding": patch +--- + +Prevent overwriting the Stronghold mnemonic by throwing an error. diff --git a/Cargo.lock b/Cargo.lock index f6b89060c..312740bbe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -95,9 +95,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.39" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cddc5f91628367664cc7c69714ff08deee8a3efc54623011c772544d7b2767" +checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b" [[package]] name = "arc-swap" @@ -133,7 +133,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d0864d84b8e07b145449be9a8537db86bf9de5ce03b913214694643b4743502" dependencies = [ "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -175,7 +175,7 @@ checksum = "36ea56748e10732c49404c153638a15ec3d6211ec5ff35d9bb20e13b93576adf" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -258,20 +258,20 @@ dependencies = [ "chrono", "fern", "log", - "serde 1.0.124", + "serde 1.0.125", "thiserror", ] [[package]] name = "bee-common" version = "0.3.1-alpha" -source = "git+https://github.com/iotaledger/bee.git?branch=dev#a65bfad5dfdc8aa46d34b6b58899007a43d72340" +source = "git+https://github.com/iotaledger/bee.git?branch=dev#04f456b550a7c7113fa726b6c2e2b8fab6322059" dependencies = [ "autocfg", "chrono", "fern", "log", - "serde 1.0.124", + "serde 1.0.125", "thiserror", ] @@ -290,9 +290,9 @@ dependencies = [ [[package]] name = "bee-crypto" version = "0.2.0-alpha" -source = "git+https://github.com/iotaledger/bee.git?branch=dev#a65bfad5dfdc8aa46d34b6b58899007a43d72340" +source = "git+https://github.com/iotaledger/bee.git?branch=dev#04f456b550a7c7113fa726b6c2e2b8fab6322059" dependencies = [ - "bee-ternary 0.4.1-alpha", + "bee-ternary 0.4.2-alpha", "byteorder", "lazy_static", "thiserror", @@ -321,7 +321,7 @@ dependencies = [ "hex", "iota-crypto 0.3.0 (git+https://github.com/iotaledger/crypto.rs?rev=c3bf565eba62d0b81144174c2ff917bfde282e49)", "ref-cast", - "serde 1.0.124", + "serde 1.0.125", "thiserror", ] @@ -337,7 +337,7 @@ dependencies = [ "libp2p", "log", "rand 0.8.3", - "serde 1.0.124", + "serde 1.0.125", "thiserror", "tokio", "tokio-stream", @@ -350,7 +350,7 @@ version = "0.1.0-alpha" source = "git+https://github.com/iotaledger/bee.git?rev=217b5944b5e17fe5800955d212cfe8dddd992482#217b5944b5e17fe5800955d212cfe8dddd992482" dependencies = [ "bee-crypto 0.2.0-alpha (git+https://github.com/iotaledger/bee.git?branch=dev)", - "bee-ternary 0.4.1-alpha", + "bee-ternary 0.4.2-alpha", "iota-crypto 0.3.0 (git+https://github.com/iotaledger/crypto.rs?rev=c3bf565eba62d0b81144174c2ff917bfde282e49)", "thiserror", ] @@ -374,14 +374,14 @@ dependencies = [ "bee-pow", "bee-protocol", "hex", - "serde 1.0.124", + "serde 1.0.125", "serde_json", ] [[package]] name = "bee-runtime" version = "0.1.1-alpha" -source = "git+https://github.com/iotaledger/bee.git?branch=dev#a65bfad5dfdc8aa46d34b6b58899007a43d72340" +source = "git+https://github.com/iotaledger/bee.git?branch=dev#04f456b550a7c7113fa726b6c2e2b8fab6322059" dependencies = [ "async-trait", "bee-storage", @@ -393,11 +393,11 @@ dependencies = [ [[package]] name = "bee-storage" version = "0.2.0-alpha" -source = "git+https://github.com/iotaledger/bee.git?branch=dev#a65bfad5dfdc8aa46d34b6b58899007a43d72340" +source = "git+https://github.com/iotaledger/bee.git?branch=dev#04f456b550a7c7113fa726b6c2e2b8fab6322059" dependencies = [ "async-trait", "futures", - "serde 1.0.124", + "serde 1.0.125", ] [[package]] @@ -411,8 +411,8 @@ dependencies = [ [[package]] name = "bee-ternary" -version = "0.4.1-alpha" -source = "git+https://github.com/iotaledger/bee.git?branch=dev#a65bfad5dfdc8aa46d34b6b58899007a43d72340" +version = "0.4.2-alpha" +source = "git+https://github.com/iotaledger/bee.git?branch=dev#04f456b550a7c7113fa726b6c2e2b8fab6322059" dependencies = [ "autocfg", "num-traits 0.2.14", @@ -425,7 +425,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d175dfa69e619905c4c3cdb7c3c203fa3bdd5d51184e3afdb2742c0280493772" dependencies = [ "byteorder", - "serde 1.0.124", + "serde 1.0.125", ] [[package]] @@ -593,7 +593,7 @@ dependencies = [ "libc", "num-integer", "num-traits 0.2.14", - "serde 1.0.124", + "serde 1.0.125", "time", "winapi", ] @@ -636,7 +636,7 @@ dependencies = [ "lazy_static", "nom", "rust-ini", - "serde 1.0.124", + "serde 1.0.125", "serde-hjson", "serde_json", "toml", @@ -826,7 +826,7 @@ dependencies = [ "curve25519-dalek", "ed25519", "rand 0.7.3", - "serde 1.0.124", + "serde 1.0.125", "sha2 0.9.3", "zeroize", ] @@ -876,7 +876,7 @@ checksum = "1e94aa31f7c0dc764f57896dc615ddd76fc13b0d5dca7eb6cc5e018a5a09ec06" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -1032,7 +1032,7 @@ dependencies = [ "proc-macro-hack", "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -1123,7 +1123,7 @@ dependencies = [ "proc-macro-error", "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -1144,9 +1144,9 @@ checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce" [[package]] name = "h2" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d832b01df74254fe364568d6ddc294443f61cbec82816b60904303af87efae78" +checksum = "fc018e188373e2777d0ef2467ebff62a08e66c3f5857b23c8fbec3018210dc00" dependencies = [ "bytes", "fnv", @@ -1281,9 +1281,9 @@ checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" [[package]] name = "hyper" -version = "0.14.4" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8e946c2b1349055e0b72ae281b238baf1a3ea7307c7e9f9d64673bdd9c26ac7" +checksum = "8bf09f61b52cfcf4c00de50df88ae423d6c02354e385a86341133b5338630ad1" dependencies = [ "bytes", "futures-channel", @@ -1295,8 +1295,8 @@ dependencies = [ "httparse", "httpdate", "itoa", - "pin-project 1.0.5", - "socket2 0.3.19", + "pin-project 1.0.6", + "socket2 0.4.0", "tokio", "tower-service", "tracing", @@ -1412,14 +1412,14 @@ dependencies = [ "chrono", "futures", "hex", - "iota-crypto 0.3.0 (git+https://github.com/iotaledger/crypto.rs?rev=b849861b86c3f7357b7477de4253b7352b363627)", + "iota-crypto 0.3.0 (git+https://github.com/iotaledger/crypto.rs.git?rev=b849861b86c3f7357b7477de4253b7352b363627)", "log", "num_cpus", "once_cell", "regex", "reqwest", "rumqttc", - "serde 1.0.124", + "serde 1.0.125", "serde_json", "thiserror", "tokio", @@ -1440,20 +1440,15 @@ dependencies = [ [[package]] name = "iota-crypto" version = "0.3.0" -source = "git+https://github.com/iotaledger/crypto.rs?rev=b849861b86c3f7357b7477de4253b7352b363627#b849861b86c3f7357b7477de4253b7352b363627" +source = "git+https://github.com/iotaledger/crypto.rs.git?rev=b849861b86c3f7357b7477de4253b7352b363627#b849861b86c3f7357b7477de4253b7352b363627" dependencies = [ - "aead", "blake2", - "chacha20poly1305 0.7.1", "digest 0.9.0", "ed25519-zebra", - "generic-array 0.14.4", "getrandom 0.2.2", "hmac 0.10.1", - "pbkdf2", - "serde 1.0.124", + "serde 1.0.125", "sha2 0.9.3", - "unicode-normalization", ] [[package]] @@ -1461,20 +1456,35 @@ name = "iota-crypto" version = "0.3.0" source = "git+https://github.com/iotaledger/crypto.rs?rev=c3bf565eba62d0b81144174c2ff917bfde282e49#c3bf565eba62d0b81144174c2ff917bfde282e49" dependencies = [ + "blake2", + "digest 0.9.0", + "ed25519-zebra", +] + +[[package]] +name = "iota-crypto" +version = "0.4.2" +source = "git+https://github.com/iotaledger/crypto.rs?branch=dev#5fea3481907da9bb333a31012aab0df01009cb37" +dependencies = [ + "aead", "blake2", "chacha20poly1305 0.7.1", "digest 0.9.0", "ed25519-zebra", + "generic-array 0.14.4", "getrandom 0.2.2", "hmac 0.10.1", + "pbkdf2", + "serde 1.0.125", "sha2 0.9.3", + "unicode-normalization", "x25519-dalek", ] [[package]] name = "iota-ledger" version = "0.1.0" -source = "git+https://github.com/iotaledger/ledger.rs?branch=develop#cb80630e94e954742c6ebb88d25c8d019323fbe8" +source = "git+https://github.com/iotaledger/ledger.rs?branch=develop#ca29577e60157270f11d3e4763151715865ca358" dependencies = [ "bech32 0.7.3", "enum-iterator", @@ -1485,22 +1495,22 @@ dependencies = [ "ledger-transport-hid", "ledger-transport-tcp", "log", - "serde 1.0.124", + "serde 1.0.125", "thiserror", "trait-async", ] [[package]] name = "iota-stronghold" -version = "0.2.0" -source = "git+https://github.com/iotaledger/stronghold.rs?rev=b8904ff0df9c963980ae148815ad56c40588d84a#b8904ff0df9c963980ae148815ad56c40588d84a" +version = "0.3.0" +source = "git+https://github.com/iotaledger/stronghold.rs?rev=7e3c02412b4d8657e62bc0b14862443d2f1f1f63#7e3c02412b4d8657e62bc0b14862443d2f1f1f63" dependencies = [ "anyhow", "bincode", "futures", - "iota-crypto 0.3.0 (git+https://github.com/iotaledger/crypto.rs?rev=b849861b86c3f7357b7477de4253b7352b363627)", + "iota-crypto 0.4.2", "riker", - "serde 1.0.124", + "serde 1.0.125", "stronghold-engine", "stronghold-utils", "thiserror", @@ -1521,7 +1531,7 @@ dependencies = [ "getset", "hex", "iota-core", - "iota-crypto 0.3.0 (git+https://github.com/iotaledger/crypto.rs?rev=b849861b86c3f7357b7477de4253b7352b363627)", + "iota-crypto 0.4.2", "iota-ledger", "iota-stronghold", "log", @@ -1531,7 +1541,7 @@ dependencies = [ "riker", "rusqlite", "rusty-fork", - "serde 1.0.124", + "serde 1.0.125", "serde_json", "serde_repr", "slog", @@ -1564,9 +1574,9 @@ checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" [[package]] name = "js-sys" -version = "0.3.49" +version = "0.3.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc15e39392125075f60c95ba416f5381ff6c3a948ff02ab12464715adf56c821" +checksum = "2d99f9e3e84b8f67f846ef5b4cbbc3b1c29f6c759fcbce6f01aa0e73d932a24c" dependencies = [ "wasm-bindgen", ] @@ -1594,7 +1604,7 @@ dependencies = [ "ledger-apdu", "ledger-transport-hid", "ledger-transport-tcp", - "serde 1.0.124", + "serde 1.0.125", "thiserror", "trait-async", "wasm-bindgen", @@ -1626,7 +1636,7 @@ dependencies = [ "hex", "ledger-apdu", "log", - "serde 1.0.124", + "serde 1.0.125", "thiserror", ] @@ -1645,9 +1655,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4aede83fc3617411dc6993bc8c70919750c1c257c6ca6a502aed6e0e2394ae" +checksum = "56d855069fafbb9b344c0f962150cd2c1187975cb1c22c1522c240d8c4986714" [[package]] name = "libp2p" @@ -1670,7 +1680,7 @@ dependencies = [ "libp2p-yamux", "parity-multiaddr", "parking_lot", - "pin-project 1.0.5", + "pin-project 1.0.6", "smallvec", "wasm-timer", ] @@ -1695,7 +1705,7 @@ dependencies = [ "multistream-select", "parity-multiaddr", "parking_lot", - "pin-project 1.0.5", + "pin-project 1.0.6", "prost", "prost-build", "rand 0.7.3", @@ -1799,7 +1809,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c564ebaa36a64839f51eaddb0243aaaa29ce64affb56129193cc3248b72af273" dependencies = [ "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -1904,7 +1914,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" dependencies = [ "cfg-if 1.0.0", - "serde 1.0.124", + "serde 1.0.125", ] [[package]] @@ -1937,9 +1947,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2182a122f3b7f3f5329cb1972cee089ba2459a0a80a56935e6e674f096f8d839" +checksum = "cf80d3e903b34e0bd7282b218398aec54e082c840d9baf8339e0080a0c542956" dependencies = [ "libc", "log", @@ -1950,11 +1960,10 @@ dependencies = [ [[package]] name = "miow" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897" +checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" dependencies = [ - "socket2 0.3.19", "winapi", ] @@ -1990,7 +1999,7 @@ dependencies = [ "proc-macro-error", "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", "synstructure", ] @@ -2009,7 +2018,7 @@ dependencies = [ "bytes", "futures", "log", - "pin-project 1.0.5", + "pin-project 1.0.6", "smallvec", "unsigned-varint 0.7.0", ] @@ -2188,7 +2197,7 @@ dependencies = [ "data-encoding", "multihash", "percent-encoding", - "serde 1.0.124", + "serde 1.0.125", "static_assertions", "unsigned-varint 0.7.0", "url", @@ -2233,9 +2242,9 @@ checksum = "acbf547ad0c65e31259204bd90935776d1c693cec2f4ff7abb7a1bbbd40dfe58" [[package]] name = "pbkdf2" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "297e1dad0e9de7af53235b833761351bf6bda57d6acb4f263b61a2ddf674f1dc" +checksum = "bf916dd32dd26297907890d99dc2740e33f6bd9073965af4ccff2967962f5508" dependencies = [ "crypto-mac 0.10.0", ] @@ -2258,42 +2267,42 @@ dependencies = [ [[package]] name = "pin-project" -version = "0.4.27" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffbc8e94b38ea3d2d8ba92aea2983b503cd75d0888d75b86bb37970b5698e15" +checksum = "918192b5c59119d51e0cd221f4d49dde9112824ba717369e903c97d076083d0f" dependencies = [ - "pin-project-internal 0.4.27", + "pin-project-internal 0.4.28", ] [[package]] name = "pin-project" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96fa8ebb90271c4477f144354485b8068bd8f6b78b428b01ba892ca26caf0b63" +checksum = "bc174859768806e91ae575187ada95c91a29e96a98dc5d2cd9a1fed039501ba6" dependencies = [ - "pin-project-internal 1.0.5", + "pin-project-internal 1.0.6", ] [[package]] name = "pin-project-internal" -version = "0.4.27" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65ad2ae56b6abe3a1ee25f15ee605bacadb9a764edaba9c2bf4103800d4a1895" +checksum = "3be26700300be6d9d23264c73211d8190e755b6b5ca7a1b28230025511b52a5e" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] name = "pin-project-internal" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "758669ae3558c6f74bd2a18b41f7ac0b5a195aea6639d6a9b5e5d1ad5ba24c0b" +checksum = "a490329918e856ed1b083f244e3bfe2d8c4f336407e4ea9e1a9f479ff09049e5" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -2378,7 +2387,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", "version_check", ] @@ -2461,7 +2470,7 @@ dependencies = [ "itertools", "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -2615,7 +2624,7 @@ checksum = "4c38e3aecd2b21cb3959637b883bb3714bc7e43f0268b9a29d3743ee3e55cdd2" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -2669,7 +2678,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "rustls", - "serde 1.0.124", + "serde 1.0.125", "serde_json", "serde_urlencoded", "tokio", @@ -2750,11 +2759,11 @@ dependencies = [ [[package]] name = "runtime" -version = "0.2.0" -source = "git+https://github.com/iotaledger/stronghold.rs?rev=b8904ff0df9c963980ae148815ad56c40588d84a#b8904ff0df9c963980ae148815ad56c40588d84a" +version = "0.3.0" +source = "git+https://github.com/iotaledger/stronghold.rs?rev=7e3c02412b4d8657e62bc0b14862443d2f1f1f63#7e3c02412b4d8657e62bc0b14862443d2f1f1f63" dependencies = [ "libsodium-sys", - "serde 1.0.124", + "serde 1.0.125", ] [[package]] @@ -2825,7 +2834,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4da5fcb054c46f5a5dff833b129285a93d3f0179531735e6c866e8cc307d2020" dependencies = [ "futures", - "pin-project 0.4.27", + "pin-project 0.4.28", "static_assertions", ] @@ -2863,9 +2872,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.1.2" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d493c5f39e02dfb062cd8f33301f90f9b13b650e8c1b1d0fd75c19dd64bff69d" +checksum = "3670b1d2fdf6084d192bc71ead7aabe6c06aa2ea3fbd9cc3ac111fa5c2b1bd84" dependencies = [ "bitflags", "core-foundation", @@ -2876,9 +2885,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee48cdde5ed250b0d3252818f646e174ab414036edb884dde62d80a3ac6082d" +checksum = "3676258fd3cfe2c9a0ec99ce3038798d847ce3e4bb17746373eb9f0f1ac16339" dependencies = [ "core-foundation-sys", "libc", @@ -2907,9 +2916,9 @@ checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8" [[package]] name = "serde" -version = "1.0.124" +version = "1.0.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd761ff957cb2a45fbb9ab3da6512de9de55872866160b23c25f1a841e99d29f" +checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171" dependencies = [ "serde_derive", ] @@ -2929,13 +2938,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.124" +version = "1.0.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1800f7693e94e186f5e25a28291ae1570da908aff7d97a095dec1e56ff99069b" +checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -2946,7 +2955,7 @@ checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" dependencies = [ "itoa", "ryu", - "serde 1.0.124", + "serde 1.0.125", ] [[package]] @@ -2957,7 +2966,7 @@ checksum = "2dc6b7951b17b051f3210b063f12cc17320e2fe30ae05b0fe2a3abb068551c76" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -2978,7 +2987,7 @@ dependencies = [ "form_urlencoded", "itoa", "ryu", - "serde 1.0.124", + "serde 1.0.125", ] [[package]] @@ -3063,12 +3072,12 @@ checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" [[package]] name = "snapshot" -version = "0.2.0" -source = "git+https://github.com/iotaledger/stronghold.rs?rev=b8904ff0df9c963980ae148815ad56c40588d84a#b8904ff0df9c963980ae148815ad56c40588d84a" +version = "0.3.0" +source = "git+https://github.com/iotaledger/stronghold.rs?rev=7e3c02412b4d8657e62bc0b14862443d2f1f1f63#7e3c02412b4d8657e62bc0b14862443d2f1f1f63" dependencies = [ "dirs-next", "hex", - "iota-crypto 0.3.0 (git+https://github.com/iotaledger/crypto.rs?rev=c3bf565eba62d0b81144174c2ff917bfde282e49)", + "iota-crypto 0.4.2", "thiserror", ] @@ -3125,12 +3134,12 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "store" -version = "0.2.0" -source = "git+https://github.com/iotaledger/stronghold.rs?rev=b8904ff0df9c963980ae148815ad56c40588d84a#b8904ff0df9c963980ae148815ad56c40588d84a" +version = "0.3.0" +source = "git+https://github.com/iotaledger/stronghold.rs?rev=7e3c02412b4d8657e62bc0b14862443d2f1f1f63#7e3c02412b4d8657e62bc0b14862443d2f1f1f63" dependencies = [ "once_cell", "paste", - "serde 1.0.124", + "serde 1.0.125", ] [[package]] @@ -3145,8 +3154,8 @@ dependencies = [ [[package]] name = "stronghold-engine" -version = "0.2.0" -source = "git+https://github.com/iotaledger/stronghold.rs?rev=b8904ff0df9c963980ae148815ad56c40588d84a#b8904ff0df9c963980ae148815ad56c40588d84a" +version = "0.3.0" +source = "git+https://github.com/iotaledger/stronghold.rs?rev=7e3c02412b4d8657e62bc0b14862443d2f1f1f63#7e3c02412b4d8657e62bc0b14862443d2f1f1f63" dependencies = [ "runtime", "snapshot", @@ -3156,8 +3165,8 @@ dependencies = [ [[package]] name = "stronghold-utils" -version = "0.1.0" -source = "git+https://github.com/iotaledger/stronghold.rs?rev=b8904ff0df9c963980ae148815ad56c40588d84a#b8904ff0df9c963980ae148815ad56c40588d84a" +version = "0.2.0" +source = "git+https://github.com/iotaledger/stronghold.rs?rev=7e3c02412b4d8657e62bc0b14862443d2f1f1f63#7e3c02412b4d8657e62bc0b14862443d2f1f1f63" dependencies = [ "futures", "rand 0.8.3", @@ -3189,9 +3198,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.64" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fd9d1e9976102a03c542daa2eff1b43f9d72306342f3f8b3ed5fb8908195d6f" +checksum = "6498a9efc342871f91cc2d0d694c674368b4ceb40f62b65a7a08c3792935e702" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", @@ -3206,7 +3215,7 @@ checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", "unicode-xid 0.2.1", ] @@ -3241,7 +3250,7 @@ checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -3306,7 +3315,7 @@ checksum = "caf7b11a536f46a809a8a9f0bb4237020f70ecbf115b842360afb127ea2fda57" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -3361,7 +3370,7 @@ version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" dependencies = [ - "serde 1.0.124", + "serde 1.0.125", ] [[package]] @@ -3398,7 +3407,7 @@ checksum = "dfe8c654712ee594c93b7222d98b4e61c7e003aec49e73877edac607a213699d" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -3491,7 +3500,7 @@ dependencies = [ "idna", "matches", "percent-encoding", - "serde 1.0.124", + "serde 1.0.125", ] [[package]] @@ -3505,13 +3514,13 @@ dependencies = [ [[package]] name = "vault" -version = "0.2.0" -source = "git+https://github.com/iotaledger/stronghold.rs?rev=b8904ff0df9c963980ae148815ad56c40588d84a#b8904ff0df9c963980ae148815ad56c40588d84a" +version = "0.3.0" +source = "git+https://github.com/iotaledger/stronghold.rs?rev=7e3c02412b4d8657e62bc0b14862443d2f1f1f63#7e3c02412b4d8657e62bc0b14862443d2f1f1f63" dependencies = [ "anyhow", - "iota-crypto 0.3.0 (git+https://github.com/iotaledger/crypto.rs?rev=b849861b86c3f7357b7477de4253b7352b363627)", + "iota-crypto 0.4.2", "runtime", - "serde 1.0.124", + "serde 1.0.125", "thiserror", ] @@ -3578,36 +3587,36 @@ checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" [[package]] name = "wasm-bindgen" -version = "0.2.72" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fe8f61dba8e5d645a4d8132dc7a0a66861ed5e1045d2c0ed940fab33bac0fbe" +checksum = "83240549659d187488f91f33c0f8547cbfef0b2088bc470c116d1d260ef623d9" dependencies = [ "cfg-if 1.0.0", - "serde 1.0.124", + "serde 1.0.125", "serde_json", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.72" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046ceba58ff062da072c7cb4ba5b22a37f00a302483f7e2a6cdc18fedbdc1fd3" +checksum = "ae70622411ca953215ca6d06d3ebeb1e915f0f6613e3b495122878d7ebec7dae" dependencies = [ "bumpalo", "lazy_static", "log", "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.22" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73157efb9af26fb564bb59a009afd1c7c334a44db171d280690d0c3faaec3468" +checksum = "81b8b767af23de6ac18bf2168b690bed2902743ddf0fb39252e36f9e2bfc63ea" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -3617,9 +3626,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.72" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ef9aa01d36cda046f797c57959ff5f3c615c9cc63997a8d545831ec7976819b" +checksum = "3e734d91443f177bfdb41969de821e15c516931c3c3db3d318fa1b68975d0f6f" dependencies = [ "quote 1.0.9", "wasm-bindgen-macro-support", @@ -3627,22 +3636,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.72" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96eb45c1b2ee33545a813a92dbb53856418bf7eb54ab34f7f7ff1448a5b3735d" +checksum = "d53739ff08c8a68b0fdbcd54c372b8ab800b1449ab3c9d706503bc7dd1621b2c" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.72" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7148f4696fb4960a346eaa60bbfb42a1ac4ebba21f750f75fc1375b098d5ffa" +checksum = "d9a543ae66aa233d14bb765ed9af4a33e81b8b58d1584cf1b47ff8cd0b9e4489" [[package]] name = "wasm-timer" @@ -3661,9 +3670,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.49" +version = "0.3.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59fe19d70f5dacc03f6e46777213facae5ac3801575d56ca6cbd4c93dcd12310" +checksum = "a905d57e488fec8861446d3393670fb50d27a262344013181c2cdf9fff5481be" dependencies = [ "js-sys", "wasm-bindgen", @@ -3699,12 +3708,12 @@ dependencies = [ [[package]] name = "which" -version = "4.0.2" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87c14ef7e1b8b8ecfc75d5eca37949410046e66f15d185c01d70824f1f8111ef" +checksum = "b55551e42cbdf2ce2bedd2203d0cc08dba002c27510f86dab6d0ce304cba3dfe" dependencies = [ + "either", "libc", - "thiserror", ] [[package]] @@ -3789,6 +3798,6 @@ checksum = "c3f369ddb18862aba61aa49bf31e74d29f0f162dec753063200e1dc084345d16" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", "synstructure", ] diff --git a/Cargo.toml b/Cargo.toml index 79a8f459a..2c2bacef6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,7 +30,7 @@ url = { version = "2.2", features = [ "serde" ] } zeroize = { version = "1.2", features = ["zeroize_derive"] } # stronghold -iota-stronghold = { git = "https://github.com/iotaledger/stronghold.rs", rev = "b8904ff0df9c963980ae148815ad56c40588d84a" } +iota-stronghold = { git = "https://github.com/iotaledger/stronghold.rs", rev = "7e3c02412b4d8657e62bc0b14862443d2f1f1f63" } riker = "0.4" slog = "2.7" @@ -39,7 +39,7 @@ iota-ledger = { git = "https://github.com/iotaledger/ledger.rs", branch = "devel [dependencies.iota-crypto] git = "https://github.com/iotaledger/crypto.rs" -rev = "b849861b86c3f7357b7477de4253b7352b363627" +branch = "dev" features = ["random", "sha", "pbkdf", "hmac", "bip39", "bip39-en", "chacha", "blake2b", "slip10"] [dev-dependencies] diff --git a/bindings/java/native/Cargo.lock b/bindings/java/native/Cargo.lock index 3595c5d72..0229562b4 100644 --- a/bindings/java/native/Cargo.lock +++ b/bindings/java/native/Cargo.lock @@ -104,9 +104,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.39" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cddc5f91628367664cc7c69714ff08deee8a3efc54623011c772544d7b2767" +checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b" [[package]] name = "arc-swap" @@ -142,7 +142,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d0864d84b8e07b145449be9a8537db86bf9de5ce03b913214694643b4743502" dependencies = [ "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -252,7 +252,7 @@ checksum = "36ea56748e10732c49404c153638a15ec3d6211ec5ff35d9bb20e13b93576adf" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -348,7 +348,7 @@ dependencies = [ [[package]] name = "bee-common" version = "0.3.1-alpha" -source = "git+https://github.com/iotaledger/bee.git?branch=dev#a65bfad5dfdc8aa46d34b6b58899007a43d72340" +source = "git+https://github.com/iotaledger/bee.git?branch=dev#04f456b550a7c7113fa726b6c2e2b8fab6322059" dependencies = [ "autocfg", "chrono", @@ -373,9 +373,9 @@ dependencies = [ [[package]] name = "bee-crypto" version = "0.2.0-alpha" -source = "git+https://github.com/iotaledger/bee.git?branch=dev#a65bfad5dfdc8aa46d34b6b58899007a43d72340" +source = "git+https://github.com/iotaledger/bee.git?branch=dev#04f456b550a7c7113fa726b6c2e2b8fab6322059" dependencies = [ - "bee-ternary 0.4.1-alpha", + "bee-ternary 0.4.2-alpha", "byteorder", "lazy_static", "thiserror", @@ -411,11 +411,13 @@ dependencies = [ [[package]] name = "bee-message" version = "0.1.0-alpha" -source = "git+https://github.com/iotaledger/bee.git?branch=chrysalis-pt-2#91308f225bccffb8a9c522c0cd1b4ae357467166" +source = "git+https://github.com/iotaledger/bee.git?branch=chrysalis-pt-2#738443ccd080cad892f9694f1191e61a2275f1d1" dependencies = [ "bech32 0.8.0", "bee-common 0.3.1-alpha (git+https://github.com/iotaledger/bee.git?branch=dev)", "bee-pow 0.1.0-alpha (git+https://github.com/iotaledger/bee.git?branch=chrysalis-pt-2)", + "bee-ternary 0.4.2-alpha", + "bytemuck", "digest 0.9.0", "hex", "iota-crypto 0.3.0 (git+https://github.com/iotaledger/crypto.rs?rev=c3bf565eba62d0b81144174c2ff917bfde282e49)", @@ -448,7 +450,7 @@ version = "0.1.0-alpha" source = "git+https://github.com/iotaledger/bee.git?rev=217b5944b5e17fe5800955d212cfe8dddd992482#217b5944b5e17fe5800955d212cfe8dddd992482" dependencies = [ "bee-crypto 0.2.0-alpha (git+https://github.com/iotaledger/bee.git?branch=dev)", - "bee-ternary 0.4.1-alpha", + "bee-ternary 0.4.2-alpha", "iota-crypto 0.3.0 (git+https://github.com/iotaledger/crypto.rs?rev=c3bf565eba62d0b81144174c2ff917bfde282e49)", "thiserror", ] @@ -456,10 +458,10 @@ dependencies = [ [[package]] name = "bee-pow" version = "0.1.0-alpha" -source = "git+https://github.com/iotaledger/bee.git?branch=chrysalis-pt-2#91308f225bccffb8a9c522c0cd1b4ae357467166" +source = "git+https://github.com/iotaledger/bee.git?branch=chrysalis-pt-2#738443ccd080cad892f9694f1191e61a2275f1d1" dependencies = [ "bee-crypto 0.2.0-alpha (git+https://github.com/iotaledger/bee.git?branch=dev)", - "bee-ternary 0.4.1-alpha", + "bee-ternary 0.4.2-alpha", "iota-crypto 0.3.0 (git+https://github.com/iotaledger/crypto.rs?rev=c3bf565eba62d0b81144174c2ff917bfde282e49)", "thiserror", ] @@ -490,7 +492,7 @@ dependencies = [ [[package]] name = "bee-runtime" version = "0.1.1-alpha" -source = "git+https://github.com/iotaledger/bee.git?branch=dev#a65bfad5dfdc8aa46d34b6b58899007a43d72340" +source = "git+https://github.com/iotaledger/bee.git?branch=dev#04f456b550a7c7113fa726b6c2e2b8fab6322059" dependencies = [ "async-trait", "bee-storage", @@ -502,7 +504,7 @@ dependencies = [ [[package]] name = "bee-storage" version = "0.2.0-alpha" -source = "git+https://github.com/iotaledger/bee.git?branch=dev#a65bfad5dfdc8aa46d34b6b58899007a43d72340" +source = "git+https://github.com/iotaledger/bee.git?branch=dev#04f456b550a7c7113fa726b6c2e2b8fab6322059" dependencies = [ "async-trait", "futures", @@ -520,11 +522,12 @@ dependencies = [ [[package]] name = "bee-ternary" -version = "0.4.1-alpha" -source = "git+https://github.com/iotaledger/bee.git?branch=dev#a65bfad5dfdc8aa46d34b6b58899007a43d72340" +version = "0.4.2-alpha" +source = "git+https://github.com/iotaledger/bee.git?branch=dev#04f456b550a7c7113fa726b6c2e2b8fab6322059" dependencies = [ "autocfg", "num-traits 0.2.14", + "serde 1.0.125", ] [[package]] @@ -649,6 +652,12 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" +[[package]] +name = "bytemuck" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bed57e2090563b83ba8f83366628ce535a7584c9afa4c9fc0612a03925c6df58" + [[package]] name = "byteorder" version = "1.3.4" @@ -1058,7 +1067,7 @@ checksum = "1e94aa31f7c0dc764f57896dc615ddd76fc13b0d5dca7eb6cc5e018a5a09ec06" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -1139,7 +1148,7 @@ dependencies = [ "smallvec", "smol_str", "strum", - "syn 1.0.64", + "syn 1.0.67", "which 3.1.1", ] @@ -1232,7 +1241,7 @@ dependencies = [ "proc-macro-hack", "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -1323,7 +1332,7 @@ dependencies = [ "proc-macro-error", "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -1496,9 +1505,9 @@ dependencies = [ [[package]] name = "hyper" -version = "0.14.4" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8e946c2b1349055e0b72ae281b238baf1a3ea7307c7e9f9d64673bdd9c26ac7" +checksum = "8bf09f61b52cfcf4c00de50df88ae423d6c02354e385a86341133b5338630ad1" dependencies = [ "bytes", "futures-channel", @@ -1511,7 +1520,7 @@ dependencies = [ "httpdate", "itoa", "pin-project 1.0.6", - "socket2 0.3.19", + "socket2 0.4.0", "tokio", "tower-service", "tracing", @@ -1614,7 +1623,7 @@ dependencies = [ "chrono", "futures", "hex", - "iota-crypto 0.3.0 (git+https://github.com/iotaledger/crypto.rs?rev=b849861b86c3f7357b7477de4253b7352b363627)", + "iota-crypto 0.3.0 (git+https://github.com/iotaledger/crypto.rs.git?rev=b849861b86c3f7357b7477de4253b7352b363627)", "log", "num_cpus", "once_cell", @@ -1642,20 +1651,15 @@ dependencies = [ [[package]] name = "iota-crypto" version = "0.3.0" -source = "git+https://github.com/iotaledger/crypto.rs?rev=b849861b86c3f7357b7477de4253b7352b363627#b849861b86c3f7357b7477de4253b7352b363627" +source = "git+https://github.com/iotaledger/crypto.rs.git?rev=b849861b86c3f7357b7477de4253b7352b363627#b849861b86c3f7357b7477de4253b7352b363627" dependencies = [ - "aead", "blake2", - "chacha20poly1305 0.7.1", "digest 0.9.0", "ed25519-zebra", - "generic-array 0.14.4", "getrandom 0.2.2", "hmac 0.10.1", - "pbkdf2", "serde 1.0.125", "sha2 0.9.3", - "unicode-normalization", ] [[package]] @@ -1663,20 +1667,35 @@ name = "iota-crypto" version = "0.3.0" source = "git+https://github.com/iotaledger/crypto.rs?rev=c3bf565eba62d0b81144174c2ff917bfde282e49#c3bf565eba62d0b81144174c2ff917bfde282e49" dependencies = [ + "blake2", + "digest 0.9.0", + "ed25519-zebra", +] + +[[package]] +name = "iota-crypto" +version = "0.4.2" +source = "git+https://github.com/iotaledger/crypto.rs?branch=dev#5fea3481907da9bb333a31012aab0df01009cb37" +dependencies = [ + "aead", "blake2", "chacha20poly1305 0.7.1", "digest 0.9.0", "ed25519-zebra", + "generic-array 0.14.4", "getrandom 0.2.2", "hmac 0.10.1", + "pbkdf2", + "serde 1.0.125", "sha2 0.9.3", + "unicode-normalization", "x25519-dalek", ] [[package]] name = "iota-ledger" version = "0.1.0" -source = "git+https://github.com/iotaledger/ledger.rs?branch=develop#cb80630e94e954742c6ebb88d25c8d019323fbe8" +source = "git+https://github.com/iotaledger/ledger.rs?branch=develop#ca29577e60157270f11d3e4763151715865ca358" dependencies = [ "bech32 0.7.3", "enum-iterator", @@ -1694,13 +1713,13 @@ dependencies = [ [[package]] name = "iota-stronghold" -version = "0.2.0" -source = "git+https://github.com/iotaledger/stronghold.rs?rev=b8904ff0df9c963980ae148815ad56c40588d84a#b8904ff0df9c963980ae148815ad56c40588d84a" +version = "0.3.0" +source = "git+https://github.com/iotaledger/stronghold.rs?rev=7e3c02412b4d8657e62bc0b14862443d2f1f1f63#7e3c02412b4d8657e62bc0b14862443d2f1f1f63" dependencies = [ "anyhow", "bincode", "futures", - "iota-crypto 0.3.0 (git+https://github.com/iotaledger/crypto.rs?rev=b849861b86c3f7357b7477de4253b7352b363627)", + "iota-crypto 0.4.2", "riker", "serde 1.0.125", "stronghold-engine", @@ -1722,7 +1741,7 @@ dependencies = [ "getset", "hex", "iota-core", - "iota-crypto 0.3.0 (git+https://github.com/iotaledger/crypto.rs?rev=b849861b86c3f7357b7477de4253b7352b363627)", + "iota-crypto 0.4.2", "iota-ledger", "iota-stronghold", "log", @@ -1803,9 +1822,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "js-sys" -version = "0.3.49" +version = "0.3.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc15e39392125075f60c95ba416f5381ff6c3a948ff02ab12464715adf56c821" +checksum = "2d99f9e3e84b8f67f846ef5b4cbbc3b1c29f6c759fcbce6f01aa0e73d932a24c" dependencies = [ "wasm-bindgen", ] @@ -1890,9 +1909,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8916b1f6ca17130ec6568feccee27c156ad12037880833a3b842a823236502e7" +checksum = "56d855069fafbb9b344c0f962150cd2c1187975cb1c22c1522c240d8c4986714" [[package]] name = "libloading" @@ -2054,7 +2073,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c564ebaa36a64839f51eaddb0243aaaa29ce64affb56129193cc3248b72af273" dependencies = [ "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -2244,7 +2263,7 @@ dependencies = [ "proc-macro-error", "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", "synstructure", ] @@ -2436,9 +2455,9 @@ checksum = "acbf547ad0c65e31259204bd90935776d1c693cec2f4ff7abb7a1bbbd40dfe58" [[package]] name = "pbkdf2" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "297e1dad0e9de7af53235b833761351bf6bda57d6acb4f263b61a2ddf674f1dc" +checksum = "bf916dd32dd26297907890d99dc2740e33f6bd9073965af4ccff2967962f5508" dependencies = [ "crypto-mac 0.10.0", ] @@ -2467,11 +2486,11 @@ dependencies = [ [[package]] name = "pin-project" -version = "0.4.27" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffbc8e94b38ea3d2d8ba92aea2983b503cd75d0888d75b86bb37970b5698e15" +checksum = "918192b5c59119d51e0cd221f4d49dde9112824ba717369e903c97d076083d0f" dependencies = [ - "pin-project-internal 0.4.27", + "pin-project-internal 0.4.28", ] [[package]] @@ -2485,13 +2504,13 @@ dependencies = [ [[package]] name = "pin-project-internal" -version = "0.4.27" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65ad2ae56b6abe3a1ee25f15ee605bacadb9a764edaba9c2bf4103800d4a1895" +checksum = "3be26700300be6d9d23264c73211d8190e755b6b5ca7a1b28230025511b52a5e" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -2502,7 +2521,7 @@ checksum = "a490329918e856ed1b083f244e3bfe2d8c4f336407e4ea9e1a9f479ff09049e5" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -2587,7 +2606,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", "version_check", ] @@ -2657,7 +2676,7 @@ dependencies = [ "prost", "prost-types", "tempfile", - "which 4.0.2", + "which 4.1.0", ] [[package]] @@ -2670,7 +2689,7 @@ dependencies = [ "itertools", "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -2824,7 +2843,7 @@ checksum = "4c38e3aecd2b21cb3959637b883bb3714bc7e43f0268b9a29d3743ee3e55cdd2" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -2956,8 +2975,8 @@ dependencies = [ [[package]] name = "runtime" -version = "0.2.0" -source = "git+https://github.com/iotaledger/stronghold.rs?rev=b8904ff0df9c963980ae148815ad56c40588d84a#b8904ff0df9c963980ae148815ad56c40588d84a" +version = "0.3.0" +source = "git+https://github.com/iotaledger/stronghold.rs?rev=7e3c02412b4d8657e62bc0b14862443d2f1f1f63#7e3c02412b4d8657e62bc0b14862443d2f1f1f63" dependencies = [ "libsodium-sys", "serde 1.0.125", @@ -3025,7 +3044,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4da5fcb054c46f5a5dff833b129285a93d3f0179531735e6c866e8cc307d2020" dependencies = [ "futures", - "pin-project 0.4.27", + "pin-project 0.4.28", "static_assertions", ] @@ -3111,7 +3130,7 @@ checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -3133,7 +3152,7 @@ checksum = "2dc6b7951b17b051f3210b063f12cc17320e2fe30ae05b0fe2a3abb068551c76" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -3279,12 +3298,12 @@ checksum = "6ca0f7ce3a29234210f0f4f0b56f8be2e722488b95cb522077943212da3b32eb" [[package]] name = "snapshot" -version = "0.2.0" -source = "git+https://github.com/iotaledger/stronghold.rs?rev=b8904ff0df9c963980ae148815ad56c40588d84a#b8904ff0df9c963980ae148815ad56c40588d84a" +version = "0.3.0" +source = "git+https://github.com/iotaledger/stronghold.rs?rev=7e3c02412b4d8657e62bc0b14862443d2f1f1f63#7e3c02412b4d8657e62bc0b14862443d2f1f1f63" dependencies = [ "dirs-next", "hex", - "iota-crypto 0.3.0 (git+https://github.com/iotaledger/crypto.rs?rev=c3bf565eba62d0b81144174c2ff917bfde282e49)", + "iota-crypto 0.4.2", "thiserror", ] @@ -3341,8 +3360,8 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "store" -version = "0.2.0" -source = "git+https://github.com/iotaledger/stronghold.rs?rev=b8904ff0df9c963980ae148815ad56c40588d84a#b8904ff0df9c963980ae148815ad56c40588d84a" +version = "0.3.0" +source = "git+https://github.com/iotaledger/stronghold.rs?rev=7e3c02412b4d8657e62bc0b14862443d2f1f1f63#7e3c02412b4d8657e62bc0b14862443d2f1f1f63" dependencies = [ "once_cell", "paste", @@ -3361,8 +3380,8 @@ dependencies = [ [[package]] name = "stronghold-engine" -version = "0.2.0" -source = "git+https://github.com/iotaledger/stronghold.rs?rev=b8904ff0df9c963980ae148815ad56c40588d84a#b8904ff0df9c963980ae148815ad56c40588d84a" +version = "0.3.0" +source = "git+https://github.com/iotaledger/stronghold.rs?rev=7e3c02412b4d8657e62bc0b14862443d2f1f1f63#7e3c02412b4d8657e62bc0b14862443d2f1f1f63" dependencies = [ "runtime", "snapshot", @@ -3372,8 +3391,8 @@ dependencies = [ [[package]] name = "stronghold-utils" -version = "0.1.0" -source = "git+https://github.com/iotaledger/stronghold.rs?rev=b8904ff0df9c963980ae148815ad56c40588d84a#b8904ff0df9c963980ae148815ad56c40588d84a" +version = "0.2.0" +source = "git+https://github.com/iotaledger/stronghold.rs?rev=7e3c02412b4d8657e62bc0b14862443d2f1f1f63#7e3c02412b4d8657e62bc0b14862443d2f1f1f63" dependencies = [ "futures", "rand 0.8.3", @@ -3404,7 +3423,7 @@ dependencies = [ "heck", "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -3432,9 +3451,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.64" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fd9d1e9976102a03c542daa2eff1b43f9d72306342f3f8b3ed5fb8908195d6f" +checksum = "6498a9efc342871f91cc2d0d694c674368b4ceb40f62b65a7a08c3792935e702" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", @@ -3449,7 +3468,7 @@ checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", "unicode-xid 0.2.1", ] @@ -3502,7 +3521,7 @@ checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -3567,7 +3586,7 @@ checksum = "caf7b11a536f46a809a8a9f0bb4237020f70ecbf115b842360afb127ea2fda57" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -3649,7 +3668,7 @@ checksum = "dfe8c654712ee594c93b7222d98b4e61c7e003aec49e73877edac607a213699d" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -3762,11 +3781,11 @@ dependencies = [ [[package]] name = "vault" -version = "0.2.0" -source = "git+https://github.com/iotaledger/stronghold.rs?rev=b8904ff0df9c963980ae148815ad56c40588d84a#b8904ff0df9c963980ae148815ad56c40588d84a" +version = "0.3.0" +source = "git+https://github.com/iotaledger/stronghold.rs?rev=7e3c02412b4d8657e62bc0b14862443d2f1f1f63#7e3c02412b4d8657e62bc0b14862443d2f1f1f63" dependencies = [ "anyhow", - "iota-crypto 0.3.0 (git+https://github.com/iotaledger/crypto.rs?rev=b849861b86c3f7357b7477de4253b7352b363627)", + "iota-crypto 0.4.2", "runtime", "serde 1.0.125", "thiserror", @@ -3843,9 +3862,9 @@ checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" [[package]] name = "wasm-bindgen" -version = "0.2.72" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fe8f61dba8e5d645a4d8132dc7a0a66861ed5e1045d2c0ed940fab33bac0fbe" +checksum = "83240549659d187488f91f33c0f8547cbfef0b2088bc470c116d1d260ef623d9" dependencies = [ "cfg-if 1.0.0", "serde 1.0.125", @@ -3855,24 +3874,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.72" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046ceba58ff062da072c7cb4ba5b22a37f00a302483f7e2a6cdc18fedbdc1fd3" +checksum = "ae70622411ca953215ca6d06d3ebeb1e915f0f6613e3b495122878d7ebec7dae" dependencies = [ "bumpalo", "lazy_static", "log", "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.22" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73157efb9af26fb564bb59a009afd1c7c334a44db171d280690d0c3faaec3468" +checksum = "81b8b767af23de6ac18bf2168b690bed2902743ddf0fb39252e36f9e2bfc63ea" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -3882,9 +3901,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.72" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ef9aa01d36cda046f797c57959ff5f3c615c9cc63997a8d545831ec7976819b" +checksum = "3e734d91443f177bfdb41969de821e15c516931c3c3db3d318fa1b68975d0f6f" dependencies = [ "quote 1.0.9", "wasm-bindgen-macro-support", @@ -3892,22 +3911,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.72" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96eb45c1b2ee33545a813a92dbb53856418bf7eb54ab34f7f7ff1448a5b3735d" +checksum = "d53739ff08c8a68b0fdbcd54c372b8ab800b1449ab3c9d706503bc7dd1621b2c" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.72" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7148f4696fb4960a346eaa60bbfb42a1ac4ebba21f750f75fc1375b098d5ffa" +checksum = "d9a543ae66aa233d14bb765ed9af4a33e81b8b58d1584cf1b47ff8cd0b9e4489" [[package]] name = "wasm-timer" @@ -3926,9 +3945,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.49" +version = "0.3.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59fe19d70f5dacc03f6e46777213facae5ac3801575d56ca6cbd4c93dcd12310" +checksum = "a905d57e488fec8861446d3393670fb50d27a262344013181c2cdf9fff5481be" dependencies = [ "js-sys", "wasm-bindgen", @@ -3973,12 +3992,12 @@ dependencies = [ [[package]] name = "which" -version = "4.0.2" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87c14ef7e1b8b8ecfc75d5eca37949410046e66f15d185c01d70824f1f8111ef" +checksum = "b55551e42cbdf2ce2bedd2203d0cc08dba002c27510f86dab6d0ce304cba3dfe" dependencies = [ + "either", "libc", - "thiserror", ] [[package]] @@ -4072,6 +4091,6 @@ checksum = "c3f369ddb18862aba61aa49bf31e74d29f0f162dec753063200e1dc084345d16" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", "synstructure", ] diff --git a/bindings/nodejs/native/Cargo.lock b/bindings/nodejs/native/Cargo.lock index f55c5ae1c..ff1e3578e 100644 --- a/bindings/nodejs/native/Cargo.lock +++ b/bindings/nodejs/native/Cargo.lock @@ -95,9 +95,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.39" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cddc5f91628367664cc7c69714ff08deee8a3efc54623011c772544d7b2767" +checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b" [[package]] name = "arc-swap" @@ -133,7 +133,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d0864d84b8e07b145449be9a8537db86bf9de5ce03b913214694643b4743502" dependencies = [ "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -175,7 +175,7 @@ checksum = "36ea56748e10732c49404c153638a15ec3d6211ec5ff35d9bb20e13b93576adf" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -252,20 +252,20 @@ dependencies = [ "chrono", "fern", "log", - "serde 1.0.124", + "serde 1.0.125", "thiserror", ] [[package]] name = "bee-common" version = "0.3.1-alpha" -source = "git+https://github.com/iotaledger/bee.git?branch=dev#a65bfad5dfdc8aa46d34b6b58899007a43d72340" +source = "git+https://github.com/iotaledger/bee.git?branch=dev#04f456b550a7c7113fa726b6c2e2b8fab6322059" dependencies = [ "autocfg", "chrono", "fern", "log", - "serde 1.0.124", + "serde 1.0.125", "thiserror", ] @@ -284,9 +284,9 @@ dependencies = [ [[package]] name = "bee-crypto" version = "0.2.0-alpha" -source = "git+https://github.com/iotaledger/bee.git?branch=dev#a65bfad5dfdc8aa46d34b6b58899007a43d72340" +source = "git+https://github.com/iotaledger/bee.git?branch=dev#04f456b550a7c7113fa726b6c2e2b8fab6322059" dependencies = [ - "bee-ternary 0.4.1-alpha", + "bee-ternary 0.4.2-alpha", "byteorder", "lazy_static", "thiserror", @@ -315,7 +315,7 @@ dependencies = [ "hex", "iota-crypto 0.3.0 (git+https://github.com/iotaledger/crypto.rs?rev=c3bf565eba62d0b81144174c2ff917bfde282e49)", "ref-cast", - "serde 1.0.124", + "serde 1.0.125", "thiserror", ] @@ -331,7 +331,7 @@ dependencies = [ "libp2p", "log", "rand 0.8.3", - "serde 1.0.124", + "serde 1.0.125", "thiserror", "tokio", "tokio-stream", @@ -344,7 +344,7 @@ version = "0.1.0-alpha" source = "git+https://github.com/iotaledger/bee.git?rev=217b5944b5e17fe5800955d212cfe8dddd992482#217b5944b5e17fe5800955d212cfe8dddd992482" dependencies = [ "bee-crypto 0.2.0-alpha (git+https://github.com/iotaledger/bee.git?branch=dev)", - "bee-ternary 0.4.1-alpha", + "bee-ternary 0.4.2-alpha", "iota-crypto 0.3.0 (git+https://github.com/iotaledger/crypto.rs?rev=c3bf565eba62d0b81144174c2ff917bfde282e49)", "thiserror", ] @@ -368,14 +368,14 @@ dependencies = [ "bee-pow", "bee-protocol", "hex", - "serde 1.0.124", + "serde 1.0.125", "serde_json", ] [[package]] name = "bee-runtime" version = "0.1.1-alpha" -source = "git+https://github.com/iotaledger/bee.git?branch=dev#a65bfad5dfdc8aa46d34b6b58899007a43d72340" +source = "git+https://github.com/iotaledger/bee.git?branch=dev#04f456b550a7c7113fa726b6c2e2b8fab6322059" dependencies = [ "async-trait", "bee-storage", @@ -387,11 +387,11 @@ dependencies = [ [[package]] name = "bee-storage" version = "0.2.0-alpha" -source = "git+https://github.com/iotaledger/bee.git?branch=dev#a65bfad5dfdc8aa46d34b6b58899007a43d72340" +source = "git+https://github.com/iotaledger/bee.git?branch=dev#04f456b550a7c7113fa726b6c2e2b8fab6322059" dependencies = [ "async-trait", "futures", - "serde 1.0.124", + "serde 1.0.125", ] [[package]] @@ -405,8 +405,8 @@ dependencies = [ [[package]] name = "bee-ternary" -version = "0.4.1-alpha" -source = "git+https://github.com/iotaledger/bee.git?branch=dev#a65bfad5dfdc8aa46d34b6b58899007a43d72340" +version = "0.4.2-alpha" +source = "git+https://github.com/iotaledger/bee.git?branch=dev#04f456b550a7c7113fa726b6c2e2b8fab6322059" dependencies = [ "autocfg", "num-traits 0.2.14", @@ -419,7 +419,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d175dfa69e619905c4c3cdb7c3c203fa3bdd5d51184e3afdb2742c0280493772" dependencies = [ "byteorder", - "serde 1.0.124", + "serde 1.0.125", ] [[package]] @@ -587,7 +587,7 @@ dependencies = [ "libc", "num-integer", "num-traits 0.2.14", - "serde 1.0.124", + "serde 1.0.125", "time", "winapi", ] @@ -630,7 +630,7 @@ dependencies = [ "lazy_static", "nom", "rust-ini", - "serde 1.0.124", + "serde 1.0.125", "serde-hjson", "serde_json", "toml", @@ -697,16 +697,6 @@ dependencies = [ "subtle 2.4.0", ] -[[package]] -name = "crypto-mac" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58bcd97a54c7ca5ce2f6eb16f6bede5b0ab5f0055fedc17d2f0b4466e21671ca" -dependencies = [ - "generic-array 0.14.4", - "subtle 2.4.0", -] - [[package]] name = "crypto-mac" version = "0.10.0" @@ -820,7 +810,7 @@ dependencies = [ "curve25519-dalek", "ed25519", "rand 0.7.3", - "serde 1.0.124", + "serde 1.0.125", "sha2 0.9.3", "zeroize", ] @@ -1001,7 +991,7 @@ dependencies = [ "proc-macro-hack", "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -1092,7 +1082,7 @@ dependencies = [ "proc-macro-error", "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -1113,9 +1103,9 @@ checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce" [[package]] name = "h2" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d832b01df74254fe364568d6ddc294443f61cbec82816b60904303af87efae78" +checksum = "fc018e188373e2777d0ef2467ebff62a08e66c3f5857b23c8fbec3018210dc00" dependencies = [ "bytes", "fnv", @@ -1182,16 +1172,6 @@ dependencies = [ "digest 0.8.1", ] -[[package]] -name = "hmac" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deae6d9dbb35ec2c502d62b8f7b1c000a0822c3b0794ba36b3149c0a1c840dff" -dependencies = [ - "crypto-mac 0.9.1", - "digest 0.9.0", -] - [[package]] name = "hmac" version = "0.10.1" @@ -1249,9 +1229,9 @@ checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" [[package]] name = "hyper" -version = "0.14.4" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8e946c2b1349055e0b72ae281b238baf1a3ea7307c7e9f9d64673bdd9c26ac7" +checksum = "8bf09f61b52cfcf4c00de50df88ae423d6c02354e385a86341133b5338630ad1" dependencies = [ "bytes", "futures-channel", @@ -1263,8 +1243,8 @@ dependencies = [ "httparse", "httpdate", "itoa", - "pin-project 1.0.5", - "socket2 0.3.19", + "pin-project 1.0.6", + "socket2 0.4.0", "tokio", "tower-service", "tracing", @@ -1367,14 +1347,14 @@ dependencies = [ "chrono", "futures", "hex", - "iota-crypto 0.3.0 (git+https://github.com/iotaledger/crypto.rs?rev=b849861b86c3f7357b7477de4253b7352b363627)", + "iota-crypto 0.3.0 (git+https://github.com/iotaledger/crypto.rs.git?rev=b849861b86c3f7357b7477de4253b7352b363627)", "log", "num_cpus", "once_cell", "regex", "reqwest", "rumqttc", - "serde 1.0.124", + "serde 1.0.125", "serde_json", "thiserror", "tokio", @@ -1395,20 +1375,15 @@ dependencies = [ [[package]] name = "iota-crypto" version = "0.3.0" -source = "git+https://github.com/iotaledger/crypto.rs?rev=b849861b86c3f7357b7477de4253b7352b363627#b849861b86c3f7357b7477de4253b7352b363627" +source = "git+https://github.com/iotaledger/crypto.rs.git?rev=b849861b86c3f7357b7477de4253b7352b363627#b849861b86c3f7357b7477de4253b7352b363627" dependencies = [ - "aead", "blake2", - "chacha20poly1305 0.7.1", "digest 0.9.0", "ed25519-zebra", - "generic-array 0.14.4", "getrandom 0.2.2", "hmac 0.10.1", - "pbkdf2", - "serde 1.0.124", + "serde 1.0.125", "sha2 0.9.3", - "unicode-normalization", ] [[package]] @@ -1416,27 +1391,42 @@ name = "iota-crypto" version = "0.3.0" source = "git+https://github.com/iotaledger/crypto.rs?rev=c3bf565eba62d0b81144174c2ff917bfde282e49#c3bf565eba62d0b81144174c2ff917bfde282e49" dependencies = [ + "blake2", + "digest 0.9.0", + "ed25519-zebra", +] + +[[package]] +name = "iota-crypto" +version = "0.4.2" +source = "git+https://github.com/iotaledger/crypto.rs?branch=dev#5fea3481907da9bb333a31012aab0df01009cb37" +dependencies = [ + "aead", "blake2", "chacha20poly1305 0.7.1", "digest 0.9.0", "ed25519-zebra", + "generic-array 0.14.4", "getrandom 0.2.2", "hmac 0.10.1", + "pbkdf2", + "serde 1.0.125", "sha2 0.9.3", + "unicode-normalization", "x25519-dalek", ] [[package]] name = "iota-stronghold" -version = "0.2.0" -source = "git+https://github.com/iotaledger/stronghold.rs?rev=b8904ff0df9c963980ae148815ad56c40588d84a#b8904ff0df9c963980ae148815ad56c40588d84a" +version = "0.3.0" +source = "git+https://github.com/iotaledger/stronghold.rs?rev=7e3c02412b4d8657e62bc0b14862443d2f1f1f63#7e3c02412b4d8657e62bc0b14862443d2f1f1f63" dependencies = [ "anyhow", "bincode", "futures", - "iota-crypto 0.3.0 (git+https://github.com/iotaledger/crypto.rs?rev=b849861b86c3f7357b7477de4253b7352b363627)", + "iota-crypto 0.4.2", "riker", - "serde 1.0.124", + "serde 1.0.125", "stronghold-engine", "stronghold-utils", "thiserror", @@ -1456,17 +1446,16 @@ dependencies = [ "getset", "hex", "iota-core", - "iota-crypto 0.3.0 (git+https://github.com/iotaledger/crypto.rs?rev=b849861b86c3f7357b7477de4253b7352b363627)", + "iota-crypto 0.4.2", "iota-stronghold", "log", "once_cell", "rand 0.8.3", "riker", "rusqlite", - "serde 1.0.124", + "serde 1.0.125", "serde_json", "serde_repr", - "slip10", "slog", "thiserror", "tokio", @@ -1488,7 +1477,7 @@ dependencies = [ "neon-serde", "once_cell", "rand 0.8.3", - "serde 1.0.124", + "serde 1.0.125", "serde_json", "serde_repr", "tokio", @@ -1518,9 +1507,9 @@ checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" [[package]] name = "js-sys" -version = "0.3.49" +version = "0.3.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc15e39392125075f60c95ba416f5381ff6c3a948ff02ab12464715adf56c821" +checksum = "2d99f9e3e84b8f67f846ef5b4cbbc3b1c29f6c759fcbce6f01aa0e73d932a24c" dependencies = [ "wasm-bindgen", ] @@ -1546,9 +1535,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4aede83fc3617411dc6993bc8c70919750c1c257c6ca6a502aed6e0e2394ae" +checksum = "56d855069fafbb9b344c0f962150cd2c1187975cb1c22c1522c240d8c4986714" [[package]] name = "libp2p" @@ -1571,7 +1560,7 @@ dependencies = [ "libp2p-yamux", "parity-multiaddr", "parking_lot", - "pin-project 1.0.5", + "pin-project 1.0.6", "smallvec", "wasm-timer", ] @@ -1596,7 +1585,7 @@ dependencies = [ "multistream-select", "parity-multiaddr", "parking_lot", - "pin-project 1.0.5", + "pin-project 1.0.6", "prost", "prost-build", "rand 0.7.3", @@ -1700,7 +1689,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c564ebaa36a64839f51eaddb0243aaaa29ce64affb56129193cc3248b72af273" dependencies = [ "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -1805,7 +1794,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" dependencies = [ "cfg-if 1.0.0", - "serde 1.0.124", + "serde 1.0.125", ] [[package]] @@ -1838,9 +1827,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2182a122f3b7f3f5329cb1972cee089ba2459a0a80a56935e6e674f096f8d839" +checksum = "cf80d3e903b34e0bd7282b218398aec54e082c840d9baf8339e0080a0c542956" dependencies = [ "libc", "log", @@ -1851,11 +1840,10 @@ dependencies = [ [[package]] name = "miow" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897" +checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" dependencies = [ - "socket2 0.3.19", "winapi", ] @@ -1891,7 +1879,7 @@ dependencies = [ "proc-macro-error", "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", "synstructure", ] @@ -1910,7 +1898,7 @@ dependencies = [ "bytes", "futures", "log", - "pin-project 1.0.5", + "pin-project 1.0.6", "smallvec", "unsigned-varint 0.7.0", ] @@ -1967,7 +1955,7 @@ dependencies = [ "neon", "neon-runtime", "num", - "serde 1.0.124", + "serde 1.0.125", ] [[package]] @@ -2125,7 +2113,7 @@ dependencies = [ "data-encoding", "multihash", "percent-encoding", - "serde 1.0.124", + "serde 1.0.125", "static_assertions", "unsigned-varint 0.7.0", "url", @@ -2170,9 +2158,9 @@ checksum = "acbf547ad0c65e31259204bd90935776d1c693cec2f4ff7abb7a1bbbd40dfe58" [[package]] name = "pbkdf2" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "297e1dad0e9de7af53235b833761351bf6bda57d6acb4f263b61a2ddf674f1dc" +checksum = "bf916dd32dd26297907890d99dc2740e33f6bd9073965af4ccff2967962f5508" dependencies = [ "crypto-mac 0.10.0", ] @@ -2195,42 +2183,42 @@ dependencies = [ [[package]] name = "pin-project" -version = "0.4.27" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffbc8e94b38ea3d2d8ba92aea2983b503cd75d0888d75b86bb37970b5698e15" +checksum = "918192b5c59119d51e0cd221f4d49dde9112824ba717369e903c97d076083d0f" dependencies = [ - "pin-project-internal 0.4.27", + "pin-project-internal 0.4.28", ] [[package]] name = "pin-project" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96fa8ebb90271c4477f144354485b8068bd8f6b78b428b01ba892ca26caf0b63" +checksum = "bc174859768806e91ae575187ada95c91a29e96a98dc5d2cd9a1fed039501ba6" dependencies = [ - "pin-project-internal 1.0.5", + "pin-project-internal 1.0.6", ] [[package]] name = "pin-project-internal" -version = "0.4.27" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65ad2ae56b6abe3a1ee25f15ee605bacadb9a764edaba9c2bf4103800d4a1895" +checksum = "3be26700300be6d9d23264c73211d8190e755b6b5ca7a1b28230025511b52a5e" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] name = "pin-project-internal" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "758669ae3558c6f74bd2a18b41f7ac0b5a195aea6639d6a9b5e5d1ad5ba24c0b" +checksum = "a490329918e856ed1b083f244e3bfe2d8c4f336407e4ea9e1a9f479ff09049e5" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -2315,7 +2303,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", "version_check", ] @@ -2398,7 +2386,7 @@ dependencies = [ "itertools", "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -2546,7 +2534,7 @@ checksum = "4c38e3aecd2b21cb3959637b883bb3714bc7e43f0268b9a29d3743ee3e55cdd2" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -2598,7 +2586,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "rustls", - "serde 1.0.124", + "serde 1.0.125", "serde_json", "serde_urlencoded", "tokio", @@ -2678,11 +2666,11 @@ dependencies = [ [[package]] name = "runtime" -version = "0.2.0" -source = "git+https://github.com/iotaledger/stronghold.rs?rev=b8904ff0df9c963980ae148815ad56c40588d84a#b8904ff0df9c963980ae148815ad56c40588d84a" +version = "0.3.0" +source = "git+https://github.com/iotaledger/stronghold.rs?rev=7e3c02412b4d8657e62bc0b14862443d2f1f1f63#7e3c02412b4d8657e62bc0b14862443d2f1f1f63" dependencies = [ "libsodium-sys", - "serde 1.0.124", + "serde 1.0.125", ] [[package]] @@ -2741,7 +2729,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4da5fcb054c46f5a5dff833b129285a93d3f0179531735e6c866e8cc307d2020" dependencies = [ "futures", - "pin-project 0.4.27", + "pin-project 0.4.28", "static_assertions", ] @@ -2790,9 +2778,9 @@ checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8" [[package]] name = "serde" -version = "1.0.124" +version = "1.0.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd761ff957cb2a45fbb9ab3da6512de9de55872866160b23c25f1a841e99d29f" +checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171" dependencies = [ "serde_derive", ] @@ -2812,13 +2800,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.124" +version = "1.0.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1800f7693e94e186f5e25a28291ae1570da908aff7d97a095dec1e56ff99069b" +checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -2829,7 +2817,7 @@ checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" dependencies = [ "itoa", "ryu", - "serde 1.0.124", + "serde 1.0.125", ] [[package]] @@ -2840,7 +2828,7 @@ checksum = "2dc6b7951b17b051f3210b063f12cc17320e2fe30ae05b0fe2a3abb068551c76" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -2861,7 +2849,7 @@ dependencies = [ "form_urlencoded", "itoa", "ryu", - "serde 1.0.124", + "serde 1.0.125", ] [[package]] @@ -2910,17 +2898,6 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" -[[package]] -name = "slip10" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00606a5ef176f987d1d4c8dd59b5e8554d5ff27749730d58d656c7741d96a2a8" -dependencies = [ - "ed25519-dalek", - "hmac 0.9.0", - "sha2 0.9.3", -] - [[package]] name = "slog" version = "2.7.0" @@ -2957,12 +2934,12 @@ checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" [[package]] name = "snapshot" -version = "0.2.0" -source = "git+https://github.com/iotaledger/stronghold.rs?rev=b8904ff0df9c963980ae148815ad56c40588d84a#b8904ff0df9c963980ae148815ad56c40588d84a" +version = "0.3.0" +source = "git+https://github.com/iotaledger/stronghold.rs?rev=7e3c02412b4d8657e62bc0b14862443d2f1f1f63#7e3c02412b4d8657e62bc0b14862443d2f1f1f63" dependencies = [ "dirs-next", "hex", - "iota-crypto 0.3.0 (git+https://github.com/iotaledger/crypto.rs?rev=c3bf565eba62d0b81144174c2ff917bfde282e49)", + "iota-crypto 0.4.2", "thiserror", ] @@ -3019,12 +2996,12 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "store" -version = "0.2.0" -source = "git+https://github.com/iotaledger/stronghold.rs?rev=b8904ff0df9c963980ae148815ad56c40588d84a#b8904ff0df9c963980ae148815ad56c40588d84a" +version = "0.3.0" +source = "git+https://github.com/iotaledger/stronghold.rs?rev=7e3c02412b4d8657e62bc0b14862443d2f1f1f63#7e3c02412b4d8657e62bc0b14862443d2f1f1f63" dependencies = [ "once_cell", "paste", - "serde 1.0.124", + "serde 1.0.125", ] [[package]] @@ -3039,8 +3016,8 @@ dependencies = [ [[package]] name = "stronghold-engine" -version = "0.2.0" -source = "git+https://github.com/iotaledger/stronghold.rs?rev=b8904ff0df9c963980ae148815ad56c40588d84a#b8904ff0df9c963980ae148815ad56c40588d84a" +version = "0.3.0" +source = "git+https://github.com/iotaledger/stronghold.rs?rev=7e3c02412b4d8657e62bc0b14862443d2f1f1f63#7e3c02412b4d8657e62bc0b14862443d2f1f1f63" dependencies = [ "runtime", "snapshot", @@ -3050,8 +3027,8 @@ dependencies = [ [[package]] name = "stronghold-utils" -version = "0.1.0" -source = "git+https://github.com/iotaledger/stronghold.rs?rev=b8904ff0df9c963980ae148815ad56c40588d84a#b8904ff0df9c963980ae148815ad56c40588d84a" +version = "0.2.0" +source = "git+https://github.com/iotaledger/stronghold.rs?rev=7e3c02412b4d8657e62bc0b14862443d2f1f1f63#7e3c02412b4d8657e62bc0b14862443d2f1f1f63" dependencies = [ "futures", "rand 0.8.3", @@ -3083,9 +3060,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.64" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fd9d1e9976102a03c542daa2eff1b43f9d72306342f3f8b3ed5fb8908195d6f" +checksum = "6498a9efc342871f91cc2d0d694c674368b4ceb40f62b65a7a08c3792935e702" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", @@ -3100,7 +3077,7 @@ checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", "unicode-xid 0.2.1", ] @@ -3135,7 +3112,7 @@ checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -3200,7 +3177,7 @@ checksum = "caf7b11a536f46a809a8a9f0bb4237020f70ecbf115b842360afb127ea2fda57" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -3245,7 +3222,7 @@ version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" dependencies = [ - "serde 1.0.124", + "serde 1.0.125", ] [[package]] @@ -3364,7 +3341,7 @@ dependencies = [ "idna", "matches", "percent-encoding", - "serde 1.0.124", + "serde 1.0.125", ] [[package]] @@ -3378,13 +3355,13 @@ dependencies = [ [[package]] name = "vault" -version = "0.2.0" -source = "git+https://github.com/iotaledger/stronghold.rs?rev=b8904ff0df9c963980ae148815ad56c40588d84a#b8904ff0df9c963980ae148815ad56c40588d84a" +version = "0.3.0" +source = "git+https://github.com/iotaledger/stronghold.rs?rev=7e3c02412b4d8657e62bc0b14862443d2f1f1f63#7e3c02412b4d8657e62bc0b14862443d2f1f1f63" dependencies = [ "anyhow", - "iota-crypto 0.3.0 (git+https://github.com/iotaledger/crypto.rs?rev=b849861b86c3f7357b7477de4253b7352b363627)", + "iota-crypto 0.4.2", "runtime", - "serde 1.0.124", + "serde 1.0.125", "thiserror", ] @@ -3442,36 +3419,36 @@ checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" [[package]] name = "wasm-bindgen" -version = "0.2.72" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fe8f61dba8e5d645a4d8132dc7a0a66861ed5e1045d2c0ed940fab33bac0fbe" +checksum = "83240549659d187488f91f33c0f8547cbfef0b2088bc470c116d1d260ef623d9" dependencies = [ "cfg-if 1.0.0", - "serde 1.0.124", + "serde 1.0.125", "serde_json", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.72" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046ceba58ff062da072c7cb4ba5b22a37f00a302483f7e2a6cdc18fedbdc1fd3" +checksum = "ae70622411ca953215ca6d06d3ebeb1e915f0f6613e3b495122878d7ebec7dae" dependencies = [ "bumpalo", "lazy_static", "log", "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.22" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73157efb9af26fb564bb59a009afd1c7c334a44db171d280690d0c3faaec3468" +checksum = "81b8b767af23de6ac18bf2168b690bed2902743ddf0fb39252e36f9e2bfc63ea" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -3481,9 +3458,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.72" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ef9aa01d36cda046f797c57959ff5f3c615c9cc63997a8d545831ec7976819b" +checksum = "3e734d91443f177bfdb41969de821e15c516931c3c3db3d318fa1b68975d0f6f" dependencies = [ "quote 1.0.9", "wasm-bindgen-macro-support", @@ -3491,22 +3468,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.72" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96eb45c1b2ee33545a813a92dbb53856418bf7eb54ab34f7f7ff1448a5b3735d" +checksum = "d53739ff08c8a68b0fdbcd54c372b8ab800b1449ab3c9d706503bc7dd1621b2c" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.72" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7148f4696fb4960a346eaa60bbfb42a1ac4ebba21f750f75fc1375b098d5ffa" +checksum = "d9a543ae66aa233d14bb765ed9af4a33e81b8b58d1584cf1b47ff8cd0b9e4489" [[package]] name = "wasm-timer" @@ -3525,9 +3502,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.49" +version = "0.3.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59fe19d70f5dacc03f6e46777213facae5ac3801575d56ca6cbd4c93dcd12310" +checksum = "a905d57e488fec8861446d3393670fb50d27a262344013181c2cdf9fff5481be" dependencies = [ "js-sys", "wasm-bindgen", @@ -3563,12 +3540,12 @@ dependencies = [ [[package]] name = "which" -version = "4.0.2" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87c14ef7e1b8b8ecfc75d5eca37949410046e66f15d185c01d70824f1f8111ef" +checksum = "b55551e42cbdf2ce2bedd2203d0cc08dba002c27510f86dab6d0ce304cba3dfe" dependencies = [ + "either", "libc", - "thiserror", ] [[package]] @@ -3653,6 +3630,6 @@ checksum = "c3f369ddb18862aba61aa49bf31e74d29f0f162dec753063200e1dc084345d16" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", "synstructure", ] diff --git a/bindings/python/native/Cargo.lock b/bindings/python/native/Cargo.lock index b631d949e..6cbacbd35 100644 --- a/bindings/python/native/Cargo.lock +++ b/bindings/python/native/Cargo.lock @@ -95,9 +95,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.39" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cddc5f91628367664cc7c69714ff08deee8a3efc54623011c772544d7b2767" +checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b" [[package]] name = "arc-swap" @@ -133,7 +133,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d0864d84b8e07b145449be9a8537db86bf9de5ce03b913214694643b4743502" dependencies = [ "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -175,7 +175,7 @@ checksum = "36ea56748e10732c49404c153638a15ec3d6211ec5ff35d9bb20e13b93576adf" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -258,20 +258,20 @@ dependencies = [ "chrono", "fern", "log", - "serde 1.0.124", + "serde 1.0.125", "thiserror", ] [[package]] name = "bee-common" version = "0.3.1-alpha" -source = "git+https://github.com/iotaledger/bee.git?branch=dev#a65bfad5dfdc8aa46d34b6b58899007a43d72340" +source = "git+https://github.com/iotaledger/bee.git?branch=dev#04f456b550a7c7113fa726b6c2e2b8fab6322059" dependencies = [ "autocfg", "chrono", "fern", "log", - "serde 1.0.124", + "serde 1.0.125", "thiserror", ] @@ -290,9 +290,9 @@ dependencies = [ [[package]] name = "bee-crypto" version = "0.2.0-alpha" -source = "git+https://github.com/iotaledger/bee.git?branch=dev#a65bfad5dfdc8aa46d34b6b58899007a43d72340" +source = "git+https://github.com/iotaledger/bee.git?branch=dev#04f456b550a7c7113fa726b6c2e2b8fab6322059" dependencies = [ - "bee-ternary 0.4.1-alpha", + "bee-ternary 0.4.2-alpha", "byteorder", "lazy_static", "thiserror", @@ -321,7 +321,7 @@ dependencies = [ "hex", "iota-crypto 0.3.0 (git+https://github.com/iotaledger/crypto.rs?rev=c3bf565eba62d0b81144174c2ff917bfde282e49)", "ref-cast", - "serde 1.0.124", + "serde 1.0.125", "thiserror", ] @@ -337,7 +337,7 @@ dependencies = [ "libp2p", "log", "rand 0.8.3", - "serde 1.0.124", + "serde 1.0.125", "thiserror", "tokio", "tokio-stream", @@ -350,7 +350,7 @@ version = "0.1.0-alpha" source = "git+https://github.com/iotaledger/bee.git?rev=217b5944b5e17fe5800955d212cfe8dddd992482#217b5944b5e17fe5800955d212cfe8dddd992482" dependencies = [ "bee-crypto 0.2.0-alpha (git+https://github.com/iotaledger/bee.git?branch=dev)", - "bee-ternary 0.4.1-alpha", + "bee-ternary 0.4.2-alpha", "iota-crypto 0.3.0 (git+https://github.com/iotaledger/crypto.rs?rev=c3bf565eba62d0b81144174c2ff917bfde282e49)", "thiserror", ] @@ -374,14 +374,14 @@ dependencies = [ "bee-pow", "bee-protocol", "hex", - "serde 1.0.124", + "serde 1.0.125", "serde_json", ] [[package]] name = "bee-runtime" version = "0.1.1-alpha" -source = "git+https://github.com/iotaledger/bee.git?branch=dev#a65bfad5dfdc8aa46d34b6b58899007a43d72340" +source = "git+https://github.com/iotaledger/bee.git?branch=dev#04f456b550a7c7113fa726b6c2e2b8fab6322059" dependencies = [ "async-trait", "bee-storage", @@ -393,11 +393,11 @@ dependencies = [ [[package]] name = "bee-storage" version = "0.2.0-alpha" -source = "git+https://github.com/iotaledger/bee.git?branch=dev#a65bfad5dfdc8aa46d34b6b58899007a43d72340" +source = "git+https://github.com/iotaledger/bee.git?branch=dev#04f456b550a7c7113fa726b6c2e2b8fab6322059" dependencies = [ "async-trait", "futures", - "serde 1.0.124", + "serde 1.0.125", ] [[package]] @@ -411,8 +411,8 @@ dependencies = [ [[package]] name = "bee-ternary" -version = "0.4.1-alpha" -source = "git+https://github.com/iotaledger/bee.git?branch=dev#a65bfad5dfdc8aa46d34b6b58899007a43d72340" +version = "0.4.2-alpha" +source = "git+https://github.com/iotaledger/bee.git?branch=dev#04f456b550a7c7113fa726b6c2e2b8fab6322059" dependencies = [ "autocfg", "num-traits 0.2.14", @@ -425,7 +425,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d175dfa69e619905c4c3cdb7c3c203fa3bdd5d51184e3afdb2742c0280493772" dependencies = [ "byteorder", - "serde 1.0.124", + "serde 1.0.125", ] [[package]] @@ -593,7 +593,7 @@ dependencies = [ "libc", "num-integer", "num-traits 0.2.14", - "serde 1.0.124", + "serde 1.0.125", "time", "winapi", ] @@ -636,7 +636,7 @@ dependencies = [ "lazy_static", "nom", "rust-ini", - "serde 1.0.124", + "serde 1.0.125", "serde-hjson", "serde_json", "toml", @@ -703,16 +703,6 @@ dependencies = [ "subtle 2.4.0", ] -[[package]] -name = "crypto-mac" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58bcd97a54c7ca5ce2f6eb16f6bede5b0ab5f0055fedc17d2f0b4466e21671ca" -dependencies = [ - "generic-array 0.14.4", - "subtle 2.4.0", -] - [[package]] name = "crypto-mac" version = "0.10.0" @@ -725,12 +715,12 @@ dependencies = [ [[package]] name = "ctor" -version = "0.1.19" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8f45d9ad417bcef4817d614a501ab55cdd96a6fdb24f49aab89a54acfd66b19" +checksum = "5e98e2ad1a782e33928b96fc3948e7c355e5af34ba4de7670fe8bac2a3b2006d" dependencies = [ "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -781,7 +771,7 @@ checksum = "0badda90b0a13ab90be340324d663f36d88ab5f689b7e5e8eea68304f736b815" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -841,7 +831,7 @@ dependencies = [ "curve25519-dalek", "ed25519", "rand 0.7.3", - "serde 1.0.124", + "serde 1.0.125", "sha2 0.9.3", "zeroize", ] @@ -891,7 +881,7 @@ checksum = "1e94aa31f7c0dc764f57896dc615ddd76fc13b0d5dca7eb6cc5e018a5a09ec06" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -1032,7 +1022,7 @@ dependencies = [ "proc-macro-hack", "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -1123,7 +1113,7 @@ dependencies = [ "proc-macro-error", "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -1144,7 +1134,7 @@ checksum = "1a5bcf1bbeab73aa4cf2fde60a846858dc036163c7c33bec309f8d17de785479" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -1155,9 +1145,9 @@ checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce" [[package]] name = "h2" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d832b01df74254fe364568d6ddc294443f61cbec82816b60904303af87efae78" +checksum = "fc018e188373e2777d0ef2467ebff62a08e66c3f5857b23c8fbec3018210dc00" dependencies = [ "bytes", "fnv", @@ -1235,16 +1225,6 @@ dependencies = [ "digest 0.8.1", ] -[[package]] -name = "hmac" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deae6d9dbb35ec2c502d62b8f7b1c000a0822c3b0794ba36b3149c0a1c840dff" -dependencies = [ - "crypto-mac 0.9.1", - "digest 0.9.0", -] - [[package]] name = "hmac" version = "0.10.1" @@ -1302,9 +1282,9 @@ checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" [[package]] name = "hyper" -version = "0.14.4" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8e946c2b1349055e0b72ae281b238baf1a3ea7307c7e9f9d64673bdd9c26ac7" +checksum = "8bf09f61b52cfcf4c00de50df88ae423d6c02354e385a86341133b5338630ad1" dependencies = [ "bytes", "futures-channel", @@ -1316,8 +1296,8 @@ dependencies = [ "httparse", "httpdate", "itoa", - "pin-project 1.0.5", - "socket2 0.3.19", + "pin-project 1.0.6", + "socket2 0.4.0", "tokio", "tower-service", "tracing", @@ -1416,7 +1396,7 @@ dependencies = [ "proc-macro-hack", "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", "unindent", ] @@ -1448,7 +1428,7 @@ checksum = "75c094e94816723ab936484666968f5b58060492e880f3c8d00489a1e244fa51" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -1465,14 +1445,14 @@ dependencies = [ "chrono", "futures", "hex", - "iota-crypto 0.3.0 (git+https://github.com/iotaledger/crypto.rs?rev=b849861b86c3f7357b7477de4253b7352b363627)", + "iota-crypto 0.3.0 (git+https://github.com/iotaledger/crypto.rs.git?rev=b849861b86c3f7357b7477de4253b7352b363627)", "log", "num_cpus", "once_cell", "regex", "reqwest", "rumqttc", - "serde 1.0.124", + "serde 1.0.125", "serde_json", "thiserror", "tokio", @@ -1493,20 +1473,15 @@ dependencies = [ [[package]] name = "iota-crypto" version = "0.3.0" -source = "git+https://github.com/iotaledger/crypto.rs?rev=b849861b86c3f7357b7477de4253b7352b363627#b849861b86c3f7357b7477de4253b7352b363627" +source = "git+https://github.com/iotaledger/crypto.rs.git?rev=b849861b86c3f7357b7477de4253b7352b363627#b849861b86c3f7357b7477de4253b7352b363627" dependencies = [ - "aead", "blake2", - "chacha20poly1305 0.7.1", "digest 0.9.0", "ed25519-zebra", - "generic-array 0.14.4", "getrandom 0.2.2", "hmac 0.10.1", - "pbkdf2", - "serde 1.0.124", + "serde 1.0.125", "sha2 0.9.3", - "unicode-normalization", ] [[package]] @@ -1514,20 +1489,35 @@ name = "iota-crypto" version = "0.3.0" source = "git+https://github.com/iotaledger/crypto.rs?rev=c3bf565eba62d0b81144174c2ff917bfde282e49#c3bf565eba62d0b81144174c2ff917bfde282e49" dependencies = [ + "blake2", + "digest 0.9.0", + "ed25519-zebra", +] + +[[package]] +name = "iota-crypto" +version = "0.4.2" +source = "git+https://github.com/iotaledger/crypto.rs?branch=dev#5fea3481907da9bb333a31012aab0df01009cb37" +dependencies = [ + "aead", "blake2", "chacha20poly1305 0.7.1", "digest 0.9.0", "ed25519-zebra", + "generic-array 0.14.4", "getrandom 0.2.2", "hmac 0.10.1", + "pbkdf2", + "serde 1.0.125", "sha2 0.9.3", + "unicode-normalization", "x25519-dalek", ] [[package]] name = "iota-ledger" version = "0.1.0" -source = "git+https://github.com/iotaledger/ledger.rs?branch=develop#cb80630e94e954742c6ebb88d25c8d019323fbe8" +source = "git+https://github.com/iotaledger/ledger.rs?branch=develop#ca29577e60157270f11d3e4763151715865ca358" dependencies = [ "bech32 0.7.3", "enum-iterator", @@ -1538,22 +1528,22 @@ dependencies = [ "ledger-transport-hid", "ledger-transport-tcp", "log", - "serde 1.0.124", + "serde 1.0.125", "thiserror", "trait-async", ] [[package]] name = "iota-stronghold" -version = "0.2.0" -source = "git+https://github.com/iotaledger/stronghold.rs?rev=b8904ff0df9c963980ae148815ad56c40588d84a#b8904ff0df9c963980ae148815ad56c40588d84a" +version = "0.3.0" +source = "git+https://github.com/iotaledger/stronghold.rs?rev=7e3c02412b4d8657e62bc0b14862443d2f1f1f63#7e3c02412b4d8657e62bc0b14862443d2f1f1f63" dependencies = [ "anyhow", "bincode", "futures", - "iota-crypto 0.3.0 (git+https://github.com/iotaledger/crypto.rs?rev=b849861b86c3f7357b7477de4253b7352b363627)", + "iota-crypto 0.4.2", "riker", - "serde 1.0.124", + "serde 1.0.125", "stronghold-engine", "stronghold-utils", "thiserror", @@ -1573,7 +1563,7 @@ dependencies = [ "getset", "hex", "iota-core", - "iota-crypto 0.3.0 (git+https://github.com/iotaledger/crypto.rs?rev=b849861b86c3f7357b7477de4253b7352b363627)", + "iota-crypto 0.4.2", "iota-ledger", "iota-stronghold", "log", @@ -1581,10 +1571,9 @@ dependencies = [ "rand 0.8.3", "riker", "rusqlite", - "serde 1.0.124", + "serde 1.0.125", "serde_json", "serde_repr", - "slip10", "slog", "thiserror", "tokio", @@ -1604,7 +1593,7 @@ dependencies = [ "iota-wallet", "once_cell", "pyo3", - "serde 1.0.124", + "serde 1.0.125", "serde_json", "tokio", "url", @@ -1633,9 +1622,9 @@ checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" [[package]] name = "js-sys" -version = "0.3.49" +version = "0.3.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc15e39392125075f60c95ba416f5381ff6c3a948ff02ab12464715adf56c821" +checksum = "2d99f9e3e84b8f67f846ef5b4cbbc3b1c29f6c759fcbce6f01aa0e73d932a24c" dependencies = [ "wasm-bindgen", ] @@ -1663,7 +1652,7 @@ dependencies = [ "ledger-apdu", "ledger-transport-hid", "ledger-transport-tcp", - "serde 1.0.124", + "serde 1.0.125", "thiserror", "trait-async", "wasm-bindgen", @@ -1695,7 +1684,7 @@ dependencies = [ "hex", "ledger-apdu", "log", - "serde 1.0.124", + "serde 1.0.125", "thiserror", ] @@ -1714,9 +1703,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4aede83fc3617411dc6993bc8c70919750c1c257c6ca6a502aed6e0e2394ae" +checksum = "56d855069fafbb9b344c0f962150cd2c1187975cb1c22c1522c240d8c4986714" [[package]] name = "libp2p" @@ -1739,7 +1728,7 @@ dependencies = [ "libp2p-yamux", "parity-multiaddr", "parking_lot", - "pin-project 1.0.5", + "pin-project 1.0.6", "smallvec", "wasm-timer", ] @@ -1764,7 +1753,7 @@ dependencies = [ "multistream-select", "parity-multiaddr", "parking_lot", - "pin-project 1.0.5", + "pin-project 1.0.6", "prost", "prost-build", "rand 0.7.3", @@ -1868,7 +1857,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c564ebaa36a64839f51eaddb0243aaaa29ce64affb56129193cc3248b72af273" dependencies = [ "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -1973,7 +1962,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" dependencies = [ "cfg-if 1.0.0", - "serde 1.0.124", + "serde 1.0.125", ] [[package]] @@ -2006,9 +1995,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2182a122f3b7f3f5329cb1972cee089ba2459a0a80a56935e6e674f096f8d839" +checksum = "cf80d3e903b34e0bd7282b218398aec54e082c840d9baf8339e0080a0c542956" dependencies = [ "libc", "log", @@ -2019,11 +2008,10 @@ dependencies = [ [[package]] name = "miow" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897" +checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" dependencies = [ - "socket2 0.3.19", "winapi", ] @@ -2059,7 +2047,7 @@ dependencies = [ "proc-macro-error", "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", "synstructure", ] @@ -2078,7 +2066,7 @@ dependencies = [ "bytes", "futures", "log", - "pin-project 1.0.5", + "pin-project 1.0.6", "smallvec", "unsigned-varint 0.7.0", ] @@ -2206,7 +2194,7 @@ dependencies = [ "data-encoding", "multihash", "percent-encoding", - "serde 1.0.124", + "serde 1.0.125", "static_assertions", "unsigned-varint 0.7.0", "url", @@ -2270,9 +2258,9 @@ dependencies = [ [[package]] name = "pbkdf2" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "297e1dad0e9de7af53235b833761351bf6bda57d6acb4f263b61a2ddf674f1dc" +checksum = "bf916dd32dd26297907890d99dc2740e33f6bd9073965af4ccff2967962f5508" dependencies = [ "crypto-mac 0.10.0", ] @@ -2295,42 +2283,42 @@ dependencies = [ [[package]] name = "pin-project" -version = "0.4.27" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffbc8e94b38ea3d2d8ba92aea2983b503cd75d0888d75b86bb37970b5698e15" +checksum = "918192b5c59119d51e0cd221f4d49dde9112824ba717369e903c97d076083d0f" dependencies = [ - "pin-project-internal 0.4.27", + "pin-project-internal 0.4.28", ] [[package]] name = "pin-project" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96fa8ebb90271c4477f144354485b8068bd8f6b78b428b01ba892ca26caf0b63" +checksum = "bc174859768806e91ae575187ada95c91a29e96a98dc5d2cd9a1fed039501ba6" dependencies = [ - "pin-project-internal 1.0.5", + "pin-project-internal 1.0.6", ] [[package]] name = "pin-project-internal" -version = "0.4.27" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65ad2ae56b6abe3a1ee25f15ee605bacadb9a764edaba9c2bf4103800d4a1895" +checksum = "3be26700300be6d9d23264c73211d8190e755b6b5ca7a1b28230025511b52a5e" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] name = "pin-project-internal" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "758669ae3558c6f74bd2a18b41f7ac0b5a195aea6639d6a9b5e5d1ad5ba24c0b" +checksum = "a490329918e856ed1b083f244e3bfe2d8c4f336407e4ea9e1a9f479ff09049e5" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -2415,7 +2403,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", "version_check", ] @@ -2498,7 +2486,7 @@ dependencies = [ "itertools", "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -2536,7 +2524,7 @@ checksum = "a47f2c300ceec3e58064fd5f8f5b61230f2ffd64bde4970c81fdd0563a2db1bb" dependencies = [ "pyo3-macros-backend", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -2547,7 +2535,7 @@ checksum = "87b097e5d84fcbe3e167f400fbedd657820a375b034c78bd852050749a575d66" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -2685,7 +2673,7 @@ checksum = "4c38e3aecd2b21cb3959637b883bb3714bc7e43f0268b9a29d3743ee3e55cdd2" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -2737,7 +2725,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "rustls", - "serde 1.0.124", + "serde 1.0.125", "serde_json", "serde_urlencoded", "tokio", @@ -2817,11 +2805,11 @@ dependencies = [ [[package]] name = "runtime" -version = "0.2.0" -source = "git+https://github.com/iotaledger/stronghold.rs?rev=b8904ff0df9c963980ae148815ad56c40588d84a#b8904ff0df9c963980ae148815ad56c40588d84a" +version = "0.3.0" +source = "git+https://github.com/iotaledger/stronghold.rs?rev=7e3c02412b4d8657e62bc0b14862443d2f1f1f63#7e3c02412b4d8657e62bc0b14862443d2f1f1f63" dependencies = [ "libsodium-sys", - "serde 1.0.124", + "serde 1.0.125", ] [[package]] @@ -2880,7 +2868,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4da5fcb054c46f5a5dff833b129285a93d3f0179531735e6c866e8cc307d2020" dependencies = [ "futures", - "pin-project 0.4.27", + "pin-project 0.4.28", "static_assertions", ] @@ -2929,9 +2917,9 @@ checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8" [[package]] name = "serde" -version = "1.0.124" +version = "1.0.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd761ff957cb2a45fbb9ab3da6512de9de55872866160b23c25f1a841e99d29f" +checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171" dependencies = [ "serde_derive", ] @@ -2951,13 +2939,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.124" +version = "1.0.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1800f7693e94e186f5e25a28291ae1570da908aff7d97a095dec1e56ff99069b" +checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -2968,7 +2956,7 @@ checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" dependencies = [ "itoa", "ryu", - "serde 1.0.124", + "serde 1.0.125", ] [[package]] @@ -2979,7 +2967,7 @@ checksum = "2dc6b7951b17b051f3210b063f12cc17320e2fe30ae05b0fe2a3abb068551c76" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -3000,7 +2988,7 @@ dependencies = [ "form_urlencoded", "itoa", "ryu", - "serde 1.0.124", + "serde 1.0.125", ] [[package]] @@ -3049,17 +3037,6 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" -[[package]] -name = "slip10" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00606a5ef176f987d1d4c8dd59b5e8554d5ff27749730d58d656c7741d96a2a8" -dependencies = [ - "ed25519-dalek", - "hmac 0.9.0", - "sha2 0.9.3", -] - [[package]] name = "slog" version = "2.7.0" @@ -3096,12 +3073,12 @@ checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" [[package]] name = "snapshot" -version = "0.2.0" -source = "git+https://github.com/iotaledger/stronghold.rs?rev=b8904ff0df9c963980ae148815ad56c40588d84a#b8904ff0df9c963980ae148815ad56c40588d84a" +version = "0.3.0" +source = "git+https://github.com/iotaledger/stronghold.rs?rev=7e3c02412b4d8657e62bc0b14862443d2f1f1f63#7e3c02412b4d8657e62bc0b14862443d2f1f1f63" dependencies = [ "dirs-next", "hex", - "iota-crypto 0.3.0 (git+https://github.com/iotaledger/crypto.rs?rev=c3bf565eba62d0b81144174c2ff917bfde282e49)", + "iota-crypto 0.4.2", "thiserror", ] @@ -3158,12 +3135,12 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "store" -version = "0.2.0" -source = "git+https://github.com/iotaledger/stronghold.rs?rev=b8904ff0df9c963980ae148815ad56c40588d84a#b8904ff0df9c963980ae148815ad56c40588d84a" +version = "0.3.0" +source = "git+https://github.com/iotaledger/stronghold.rs?rev=7e3c02412b4d8657e62bc0b14862443d2f1f1f63#7e3c02412b4d8657e62bc0b14862443d2f1f1f63" dependencies = [ "once_cell", "paste 1.0.5", - "serde 1.0.124", + "serde 1.0.125", ] [[package]] @@ -3178,8 +3155,8 @@ dependencies = [ [[package]] name = "stronghold-engine" -version = "0.2.0" -source = "git+https://github.com/iotaledger/stronghold.rs?rev=b8904ff0df9c963980ae148815ad56c40588d84a#b8904ff0df9c963980ae148815ad56c40588d84a" +version = "0.3.0" +source = "git+https://github.com/iotaledger/stronghold.rs?rev=7e3c02412b4d8657e62bc0b14862443d2f1f1f63#7e3c02412b4d8657e62bc0b14862443d2f1f1f63" dependencies = [ "runtime", "snapshot", @@ -3189,8 +3166,8 @@ dependencies = [ [[package]] name = "stronghold-utils" -version = "0.1.0" -source = "git+https://github.com/iotaledger/stronghold.rs?rev=b8904ff0df9c963980ae148815ad56c40588d84a#b8904ff0df9c963980ae148815ad56c40588d84a" +version = "0.2.0" +source = "git+https://github.com/iotaledger/stronghold.rs?rev=7e3c02412b4d8657e62bc0b14862443d2f1f1f63#7e3c02412b4d8657e62bc0b14862443d2f1f1f63" dependencies = [ "futures", "rand 0.8.3", @@ -3222,9 +3199,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.64" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fd9d1e9976102a03c542daa2eff1b43f9d72306342f3f8b3ed5fb8908195d6f" +checksum = "6498a9efc342871f91cc2d0d694c674368b4ceb40f62b65a7a08c3792935e702" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", @@ -3239,7 +3216,7 @@ checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", "unicode-xid 0.2.1", ] @@ -3274,7 +3251,7 @@ checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -3339,7 +3316,7 @@ checksum = "caf7b11a536f46a809a8a9f0bb4237020f70ecbf115b842360afb127ea2fda57" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -3384,7 +3361,7 @@ version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" dependencies = [ - "serde 1.0.124", + "serde 1.0.125", ] [[package]] @@ -3421,7 +3398,7 @@ checksum = "dfe8c654712ee594c93b7222d98b4e61c7e003aec49e73877edac607a213699d" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", ] [[package]] @@ -3520,7 +3497,7 @@ dependencies = [ "idna", "matches", "percent-encoding", - "serde 1.0.124", + "serde 1.0.125", ] [[package]] @@ -3534,13 +3511,13 @@ dependencies = [ [[package]] name = "vault" -version = "0.2.0" -source = "git+https://github.com/iotaledger/stronghold.rs?rev=b8904ff0df9c963980ae148815ad56c40588d84a#b8904ff0df9c963980ae148815ad56c40588d84a" +version = "0.3.0" +source = "git+https://github.com/iotaledger/stronghold.rs?rev=7e3c02412b4d8657e62bc0b14862443d2f1f1f63#7e3c02412b4d8657e62bc0b14862443d2f1f1f63" dependencies = [ "anyhow", - "iota-crypto 0.3.0 (git+https://github.com/iotaledger/crypto.rs?rev=b849861b86c3f7357b7477de4253b7352b363627)", + "iota-crypto 0.4.2", "runtime", - "serde 1.0.124", + "serde 1.0.125", "thiserror", ] @@ -3598,36 +3575,36 @@ checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" [[package]] name = "wasm-bindgen" -version = "0.2.72" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fe8f61dba8e5d645a4d8132dc7a0a66861ed5e1045d2c0ed940fab33bac0fbe" +checksum = "83240549659d187488f91f33c0f8547cbfef0b2088bc470c116d1d260ef623d9" dependencies = [ "cfg-if 1.0.0", - "serde 1.0.124", + "serde 1.0.125", "serde_json", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.72" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046ceba58ff062da072c7cb4ba5b22a37f00a302483f7e2a6cdc18fedbdc1fd3" +checksum = "ae70622411ca953215ca6d06d3ebeb1e915f0f6613e3b495122878d7ebec7dae" dependencies = [ "bumpalo", "lazy_static", "log", "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.22" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73157efb9af26fb564bb59a009afd1c7c334a44db171d280690d0c3faaec3468" +checksum = "81b8b767af23de6ac18bf2168b690bed2902743ddf0fb39252e36f9e2bfc63ea" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -3637,9 +3614,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.72" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ef9aa01d36cda046f797c57959ff5f3c615c9cc63997a8d545831ec7976819b" +checksum = "3e734d91443f177bfdb41969de821e15c516931c3c3db3d318fa1b68975d0f6f" dependencies = [ "quote 1.0.9", "wasm-bindgen-macro-support", @@ -3647,22 +3624,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.72" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96eb45c1b2ee33545a813a92dbb53856418bf7eb54ab34f7f7ff1448a5b3735d" +checksum = "d53739ff08c8a68b0fdbcd54c372b8ab800b1449ab3c9d706503bc7dd1621b2c" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.72" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7148f4696fb4960a346eaa60bbfb42a1ac4ebba21f750f75fc1375b098d5ffa" +checksum = "d9a543ae66aa233d14bb765ed9af4a33e81b8b58d1584cf1b47ff8cd0b9e4489" [[package]] name = "wasm-timer" @@ -3681,9 +3658,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.49" +version = "0.3.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59fe19d70f5dacc03f6e46777213facae5ac3801575d56ca6cbd4c93dcd12310" +checksum = "a905d57e488fec8861446d3393670fb50d27a262344013181c2cdf9fff5481be" dependencies = [ "js-sys", "wasm-bindgen", @@ -3719,12 +3696,12 @@ dependencies = [ [[package]] name = "which" -version = "4.0.2" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87c14ef7e1b8b8ecfc75d5eca37949410046e66f15d185c01d70824f1f8111ef" +checksum = "b55551e42cbdf2ce2bedd2203d0cc08dba002c27510f86dab6d0ce304cba3dfe" dependencies = [ + "either", "libc", - "thiserror", ] [[package]] @@ -3809,6 +3786,6 @@ checksum = "c3f369ddb18862aba61aa49bf31e74d29f0f162dec753063200e1dc084345d16" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.64", + "syn 1.0.67", "synstructure", ] diff --git a/src/storage/mod.rs b/src/storage/mod.rs index b7363d76f..eb7b1c2d3 100644 --- a/src/storage/mod.rs +++ b/src/storage/mod.rs @@ -403,9 +403,9 @@ pub(crate) fn decrypt_record(record: &str, encryption_key: &[u8; 32]) -> crate:: encryption_key.try_into().unwrap(), &nonce.try_into().unwrap(), &[], - tag.as_slice().try_into().unwrap(), - &ct, &mut pt, + &ct, + tag.as_slice().try_into().unwrap(), ) .map_err(|e| crate::Error::RecordDecrypt(format!("{:?}", e)))?; diff --git a/src/stronghold.rs b/src/stronghold.rs index d007b6fc4..e9830ec95 100644 --- a/src/stronghold.rs +++ b/src/stronghold.rs @@ -293,6 +293,8 @@ pub enum Error { PasswordNotSet, #[error("invalid address or account index {0}")] TryFromIntError(#[from] TryFromIntError), + #[error("the mnemonic was already stored")] + MnemonicAlreadyStored, } pub type Result = std::result::Result; @@ -515,12 +517,17 @@ pub async fn store_mnemonic(snapshot_path: &Path, mnemonic: String) -> Result<() check_snapshot(&mut runtime, snapshot_path, None).await?; load_private_data_actor(&mut runtime, snapshot_path, None).await?; + let mnemonic_location = Location::generic(SECRET_VAULT_PATH, SEED_RECORD_PATH); + if runtime.stronghold.record_exists(mnemonic_location.clone()).await { + return Err(Error::MnemonicAlreadyStored); + } + let res = runtime .stronghold .runtime_exec(Procedure::BIP39Recover { mnemonic, passphrase: None, - output: Location::generic(SECRET_VAULT_PATH, SEED_RECORD_PATH), + output: mnemonic_location, hint: RecordHint::new("wallet.rs-seed").unwrap(), }) .await;