chore: bump tiny-bip39 from 0.8.0 to 0.8.1 (#20136)

* chore: bump tiny-bip39 from 0.8.0 to 0.8.1

Bumps [tiny-bip39](https://github.com/maciejhirsz/tiny-bip39) from 0.8.0 to 0.8.1.
- [Release notes](https://github.com/maciejhirsz/tiny-bip39/releases)
- [Changelog](https://github.com/maciejhirsz/tiny-bip39/blob/master/CHANGELOG.md)
- [Commits](https://github.com/maciejhirsz/tiny-bip39/compare/v0.8.0...v0.8.1)

---
updated-dependencies:
- dependency-name: tiny-bip39
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* [auto-commit] Update all Cargo lock files

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot-buildkite <anatoly+githubjenkins@solana.io>
(cherry picked from commit 038d77347a)

# Conflicts:
#	Cargo.lock
#	clap-utils/Cargo.toml
#	cli/Cargo.toml
#	keygen/Cargo.toml
#	sdk/Cargo.toml
This commit is contained in:
dependabot[bot]
2021-09-23 10:31:14 -06:00
committed by Justin Starry
parent 2d0c0bc8ba
commit 66a9e6bcb4
6 changed files with 140 additions and 66 deletions

167
Cargo.lock generated
View File

@ -871,24 +871,19 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
[[package]]
name = "crypto-mac"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5"
dependencies = [
"generic-array 0.12.3",
"subtle 1.0.0",
]
[[package]]
name = "crypto-mac"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab"
dependencies = [
<<<<<<< HEAD
"generic-array 0.14.3",
"subtle 2.2.2",
=======
"generic-array 0.14.4",
"subtle",
>>>>>>> 038d77347 (chore: bump tiny-bip39 from 0.8.0 to 0.8.1 (#20136))
]
[[package]]
@ -897,8 +892,13 @@ version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "58bcd97a54c7ca5ce2f6eb16f6bede5b0ab5f0055fedc17d2f0b4466e21671ca"
dependencies = [
<<<<<<< HEAD
"generic-array 0.14.3",
"subtle 2.2.2",
=======
"generic-array 0.14.4",
"subtle",
>>>>>>> 038d77347 (chore: bump tiny-bip39 from 0.8.0 to 0.8.1 (#20136))
]
[[package]]
@ -907,8 +907,13 @@ version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4857fd85a0c34b3c3297875b747c1e02e06b6a0ea32dd892d8192b9ce0813ea6"
dependencies = [
<<<<<<< HEAD
"generic-array 0.14.3",
"subtle 2.2.2",
=======
"generic-array 0.14.4",
"subtle",
>>>>>>> 038d77347 (chore: bump tiny-bip39 from 0.8.0 to 0.8.1 (#20136))
]
[[package]]
@ -952,7 +957,7 @@ dependencies = [
"byteorder",
"digest 0.8.1",
"rand_core 0.5.1",
"subtle 2.2.2",
"subtle",
"zeroize",
]
@ -965,7 +970,7 @@ dependencies = [
"byteorder",
"digest 0.9.0",
"rand_core 0.5.1",
"subtle 2.2.2",
"subtle",
"zeroize",
]
@ -1138,7 +1143,11 @@ dependencies = [
"rand 0.7.3",
"serde",
"serde_bytes",
<<<<<<< HEAD
"sha2 0.9.2",
=======
"sha2",
>>>>>>> 038d77347 (chore: bump tiny-bip39 from 0.8.0 to 0.8.1 (#20136))
"zeroize",
]
@ -1152,7 +1161,11 @@ dependencies = [
"ed25519-dalek",
"failure",
"hmac 0.9.0",
<<<<<<< HEAD
"sha2 0.9.2",
=======
"sha2",
>>>>>>> 038d77347 (chore: bump tiny-bip39 from 0.8.0 to 0.8.1 (#20136))
]
[[package]]
@ -1686,16 +1699,6 @@ version = "0.6.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "12cb882ccb290b8646e554b157ab0b71e64e8d5bef775cd66b6531e52d302669"
[[package]]
name = "hmac"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5dcb5e64cda4c23119ab41ba960d1e170a774c8e4b9d9e6a9bc18aabf5e59695"
dependencies = [
"crypto-mac 0.7.0",
"digest 0.8.1",
]
[[package]]
name = "hmac"
version = "0.8.1"
@ -1923,7 +1926,14 @@ version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "19a8a95243d5a0398cae618ec29477c6e3cb631152be5c19481f80bc71559754"
dependencies = [
<<<<<<< HEAD
"bytes 0.5.4",
=======
"cfg-if 1.0.0",
"js-sys",
"wasm-bindgen",
"web-sys",
>>>>>>> 038d77347 (chore: bump tiny-bip39 from 0.8.0 to 0.8.1 (#20136))
]
[[package]]
@ -2246,7 +2256,30 @@ dependencies = [
"libsecp256k1-gen-genmult",
"rand 0.7.3",
"serde",
<<<<<<< HEAD
"sha2 0.9.2",
=======
"sha2",
"typenum",
]
[[package]]
name = "libsecp256k1"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c9d220bc1feda2ac231cb78c3d26f27676b8cf82c96971f7aeef3d0cf2797c73"
dependencies = [
"arrayref",
"base64 0.12.3",
"digest 0.9.0",
"hmac-drbg",
"libsecp256k1-core",
"libsecp256k1-gen-ecmult",
"libsecp256k1-gen-genmult",
"rand 0.7.3",
"serde",
"sha2",
>>>>>>> 038d77347 (chore: bump tiny-bip39 from 0.8.0 to 0.8.1 (#20136))
"typenum",
]
@ -2258,7 +2291,7 @@ checksum = "4ee11012b293ea30093c129173cac4335513064094619f4639a25b310fd33c11"
dependencies = [
"crunchy",
"digest 0.9.0",
"subtle 2.2.2",
"subtle",
]
[[package]]
@ -2640,9 +2673,9 @@ checksum = "9cbca9424c482ee628fa549d9c812e2cd22f1180b9222c9200fdfa6eb31aecb2"
[[package]]
name = "once_cell"
version = "1.5.2"
version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0"
checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56"
dependencies = [
"parking_lot 0.11.0",
]
@ -2846,16 +2879,6 @@ dependencies = [
"syn 1.0.60",
]
[[package]]
name = "pbkdf2"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "006c038a43a45995a9670da19e67600114740e8511d4333bf97a56e66a7542d9"
dependencies = [
"byteorder",
"crypto-mac 0.7.0",
]
[[package]]
name = "pbkdf2"
version = "0.4.0"
@ -3870,6 +3893,7 @@ checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
[[package]]
name = "sha2"
<<<<<<< HEAD
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a256f46ea78a0c0d9ff00077504903ac881a1dafdc20da66545699e7776b3e69"
@ -3883,6 +3907,9 @@ dependencies = [
[[package]]
name = "sha2"
version = "0.9.2"
=======
version = "0.9.8"
>>>>>>> 038d77347 (chore: bump tiny-bip39 from 0.8.0 to 0.8.1 (#20136))
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e7aab86fe2149bad8c507606bdb3f4ef5e7b2380eb92350f56122cca72a42a8"
dependencies = [
@ -4281,7 +4308,7 @@ dependencies = [
"solana-sdk",
"tempfile",
"thiserror",
"tiny-bip39 0.8.0",
"tiny-bip39",
"uriparse",
"url 2.2.0",
]
@ -4330,8 +4357,12 @@ dependencies = [
"spl-memo",
"tempfile",
"thiserror",
<<<<<<< HEAD
"tiny-bip39 0.7.3",
"url 2.2.0",
=======
"tiny-bip39",
>>>>>>> 038d77347 (chore: bump tiny-bip39 from 0.8.0 to 0.8.1 (#20136))
]
[[package]]
@ -4616,9 +4647,15 @@ dependencies = [
"rustc_version",
"serde",
"serde_derive",
<<<<<<< HEAD
"sha2 0.9.2",
"solana-frozen-abi-macro 1.6.27",
"solana-logger 1.6.27",
=======
"sha2",
"solana-frozen-abi-macro 1.7.6",
"solana-logger 1.7.6",
>>>>>>> 038d77347 (chore: bump tiny-bip39 from 0.8.0 to 0.8.1 (#20136))
"thiserror",
]
@ -4636,9 +4673,15 @@ dependencies = [
"rustc_version",
"serde",
"serde_derive",
<<<<<<< HEAD
"sha2 0.9.2",
"solana-frozen-abi-macro 1.7.1",
"solana-logger 1.7.1",
=======
"sha2",
"solana-frozen-abi-macro 1.8.0",
"solana-logger 1.8.0",
>>>>>>> 038d77347 (chore: bump tiny-bip39 from 0.8.0 to 0.8.1 (#20136))
"thiserror",
]
@ -4749,7 +4792,7 @@ dependencies = [
"solana-remote-wallet",
"solana-sdk",
"solana-version",
"tiny-bip39 0.7.3",
"tiny-bip39",
]
[[package]]
@ -4783,7 +4826,11 @@ dependencies = [
"rustc_version",
"serde",
"serde_bytes",
<<<<<<< HEAD
"sha2 0.9.2",
=======
"sha2",
>>>>>>> 038d77347 (chore: bump tiny-bip39 from 0.8.0 to 0.8.1 (#20136))
"solana-account-decoder",
"solana-bpf-loader-program",
"solana-budget-program",
@ -5080,8 +5127,12 @@ dependencies = [
"serde",
"serde_bytes",
"serde_derive",
<<<<<<< HEAD
"serde_json",
"sha2 0.9.2",
=======
"sha2",
>>>>>>> 038d77347 (chore: bump tiny-bip39 from 0.8.0 to 0.8.1 (#20136))
"sha3",
"solana-frozen-abi 1.6.27",
"solana-frozen-abi-macro 1.6.27",
@ -5115,7 +5166,12 @@ dependencies = [
"serde",
"serde_bytes",
"serde_derive",
<<<<<<< HEAD
"sha2 0.9.2",
=======
"serde_json",
"sha2",
>>>>>>> 038d77347 (chore: bump tiny-bip39 from 0.8.0 to 0.8.1 (#20136))
"sha3",
"solana-frozen-abi 1.7.1",
"solana-frozen-abi-macro 1.7.1",
@ -5294,7 +5350,11 @@ dependencies = [
"serde_bytes",
"serde_derive",
"serde_json",
<<<<<<< HEAD
"sha2 0.9.2",
=======
"sha2",
>>>>>>> 038d77347 (chore: bump tiny-bip39 from 0.8.0 to 0.8.1 (#20136))
"sha3",
"solana-crate-features",
"solana-frozen-abi 1.6.27",
@ -5303,7 +5363,7 @@ dependencies = [
"solana-program 1.6.27",
"solana-sdk-macro 1.6.27",
"thiserror",
"tiny-bip39 0.7.3",
"tiny-bip39",
"uriparse",
]
@ -5806,12 +5866,6 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
[[package]]
name = "subtle"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee"
[[package]]
name = "subtle"
version = "2.2.2"
@ -6066,33 +6120,22 @@ dependencies = [
[[package]]
name = "tiny-bip39"
version = "0.7.3"
version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b0165e045cc2ae1660270ca65e1676dbaab60feb0f91b10f7d0665e9b47e31f2"
dependencies = [
"failure",
"hmac 0.7.1",
"once_cell",
"pbkdf2 0.3.0",
"rand 0.7.3",
"rustc-hash",
"sha2 0.8.2",
"unicode-normalization",
]
[[package]]
name = "tiny-bip39"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9e44c4759bae7f1032e286a7ef990bd9ed23fe831b7eeba0beb97484c2e59b8"
checksum = "524daa5624d9d4ffb5a0625971d35205b882111daa6b6338a7a6c578a3c36928"
dependencies = [
"anyhow",
"hmac 0.8.1",
"once_cell",
"parking_lot 0.11.2",
"pbkdf2 0.4.0",
"rand 0.7.3",
"rustc-hash",
<<<<<<< HEAD
"sha2 0.9.2",
=======
"sha2",
>>>>>>> 038d77347 (chore: bump tiny-bip39 from 0.8.0 to 0.8.1 (#20136))
"thiserror",
"unicode-normalization",
"zeroize",

View File

@ -11,11 +11,19 @@ edition = "2018"
[dependencies]
clap = "2.33.0"
<<<<<<< HEAD
rpassword = "4.0"
solana-remote-wallet = { path = "../remote-wallet", version = "=1.6.27" }
solana-sdk = { path = "../sdk", version = "=1.6.27" }
thiserror = "1.0.21"
tiny-bip39 = "0.8.0"
=======
rpassword = "5.0"
solana-remote-wallet = { path = "../remote-wallet", version = "=1.8.0" }
solana-sdk = { path = "../sdk", version = "=1.8.0" }
thiserror = "1.0.29"
tiny-bip39 = "0.8.1"
>>>>>>> 038d77347 (chore: bump tiny-bip39 from 0.8.0 to 0.8.1 (#20136))
uriparse = "0.6.3"
url = "2.1.0"
chrono = "0.4"

View File

@ -47,9 +47,14 @@ solana-transaction-status = { path = "../transaction-status", version = "=1.6.27
solana-version = { path = "../version", version = "=1.6.27" }
solana-vote-program = { path = "../programs/vote", version = "=1.6.27" }
spl-memo = { version = "=3.0.1", features = ["no-entrypoint"] }
<<<<<<< HEAD
thiserror = "1.0.21"
tiny-bip39 = "0.7.0"
url = "2.1.1"
=======
thiserror = "1.0.29"
tiny-bip39 = "0.8.1"
>>>>>>> 038d77347 (chore: bump tiny-bip39 from 0.8.0 to 0.8.1 (#20136))
[dev-dependencies]
solana-core = { path = "../core", version = "=1.6.27" }

View File

@ -14,12 +14,21 @@ bs58 = "0.3.1"
clap = "2.33"
dirs-next = "2.0.0"
num_cpus = "1.13.0"
<<<<<<< HEAD
solana-clap-utils = { path = "../clap-utils", version = "=1.6.27" }
solana-cli-config = { path = "../cli-config", version = "=1.6.27" }
solana-remote-wallet = { path = "../remote-wallet", version = "=1.6.27" }
solana-sdk = { path = "../sdk", version = "=1.6.27" }
solana-version = { path = "../version", version = "=1.6.27" }
tiny-bip39 = "0.7.0"
=======
solana-clap-utils = { path = "../clap-utils", version = "=1.8.0" }
solana-cli-config = { path = "../cli-config", version = "=1.8.0" }
solana-remote-wallet = { path = "../remote-wallet", version = "=1.8.0" }
solana-sdk = { path = "../sdk", version = "=1.8.0" }
solana-version = { path = "../version", version = "=1.8.0" }
tiny-bip39 = "0.8.1"
>>>>>>> 038d77347 (chore: bump tiny-bip39 from 0.8.0 to 0.8.1 (#20136))
[[bin]]
name = "solana-keygen"

View File

@ -1356,6 +1356,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec"
dependencies = [
"cfg-if 1.0.0",
"js-sys",
"wasm-bindgen",
"web-sys",
]
[[package]]
@ -1817,9 +1820,9 @@ checksum = "9cbca9424c482ee628fa549d9c812e2cd22f1180b9222c9200fdfa6eb31aecb2"
[[package]]
name = "once_cell"
version = "1.5.2"
version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0"
checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56"
dependencies = [
"parking_lot 0.11.1",
]
@ -3891,13 +3894,14 @@ dependencies = [
[[package]]
name = "tiny-bip39"
version = "0.8.0"
version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9e44c4759bae7f1032e286a7ef990bd9ed23fe831b7eeba0beb97484c2e59b8"
checksum = "524daa5624d9d4ffb5a0625971d35205b882111daa6b6338a7a6c578a3c36928"
dependencies = [
"anyhow",
"hmac 0.8.1",
"once_cell",
"parking_lot",
"pbkdf2 0.4.0",
"rand 0.7.3",
"rustc-hash",

View File

@ -80,8 +80,13 @@ thiserror = "1.0"
uriparse = "0.6.3"
[dev-dependencies]
<<<<<<< HEAD
curve25519-dalek = "2.1.0"
tiny-bip39 = "0.7.0"
=======
curve25519-dalek = "3.2.0"
tiny-bip39 = "0.8.1"
>>>>>>> 038d77347 (chore: bump tiny-bip39 from 0.8.0 to 0.8.1 (#20136))
[build-dependencies]
rustc_version = "0.2"