diff --git a/Cargo.lock b/Cargo.lock index 495664fe6c..0ffefb3a22 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -398,6 +398,12 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "476e9cd489f9e121e02ffa6014a8ef220ecb15c05ed23fc34cca13925dc283fb" +[[package]] +name = "bs58" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" + [[package]] name = "bstr" version = "0.2.13" @@ -3951,7 +3957,7 @@ dependencies = [ "Inflector", "base64 0.12.3", "bincode", - "bs58", + "bs58 0.4.0", "bv", "lazy_static", "serde", @@ -4224,7 +4230,7 @@ version = "1.8.0" dependencies = [ "Inflector", "bincode", - "bs58", + "bs58 0.4.0", "chrono", "clap 2.33.3", "console 0.14.1", @@ -4307,7 +4313,7 @@ dependencies = [ "assert_matches", "base64 0.13.0", "bincode", - "bs58", + "bs58 0.4.0", "clap 2.33.3", "indicatif", "jsonrpc-core", @@ -4357,7 +4363,7 @@ dependencies = [ "base64 0.12.3", "bincode", "blake3", - "bs58", + "bs58 0.4.0", "bv", "byteorder", "chrono", @@ -4542,7 +4548,7 @@ version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f81ac3925c8995d935d3af27390cf7b748a81837a29feb75a00e115f40dae6dc" dependencies = [ - "bs58", + "bs58 0.3.1", "bv", "generic-array 0.14.3", "log 0.4.11", @@ -4560,7 +4566,7 @@ dependencies = [ name = "solana-frozen-abi" version = "1.8.0" dependencies = [ - "bs58", + "bs58 0.4.0", "bv", "generic-array 0.14.3", "log 0.4.11", @@ -4709,7 +4715,7 @@ dependencies = [ name = "solana-keygen" version = "1.8.0" dependencies = [ - "bs58", + "bs58 0.4.0", "clap 2.33.3", "dirs-next", "num_cpus", @@ -4783,7 +4789,7 @@ name = "solana-ledger-tool" version = "1.8.0" dependencies = [ "assert_cmd", - "bs58", + "bs58 0.4.0", "bytecount", "clap 2.33.3", "csv", @@ -5030,7 +5036,7 @@ dependencies = [ "bincode", "borsh", "borsh-derive", - "bs58", + "bs58 0.3.1", "bv", "curve25519-dalek 2.1.0", "hex", @@ -5062,7 +5068,7 @@ dependencies = [ "blake3", "borsh", "borsh-derive", - "bs58", + "bs58 0.4.0", "bv", "curve25519-dalek 2.1.0", "hex", @@ -5145,7 +5151,7 @@ dependencies = [ name = "solana-rpc" version = "1.8.0" dependencies = [ - "bs58", + "bs58 0.4.0", "crossbeam-channel 0.4.4", "jsonrpc-core", "jsonrpc-core-client", @@ -5235,7 +5241,7 @@ version = "1.8.0" dependencies = [ "assert_matches", "bincode", - "bs58", + "bs58 0.4.0", "bv", "byteorder", "chrono", @@ -5284,7 +5290,7 @@ version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c805f1e32677f8ec0cc0b2f470833a0d5ab0922f068e52be3a4a93b468c9c70" dependencies = [ - "bs58", + "bs58 0.3.1", "proc-macro2 1.0.24", "quote 1.0.6", "rustversion", @@ -5295,7 +5301,7 @@ dependencies = [ name = "solana-sdk-macro" version = "1.8.0" dependencies = [ - "bs58", + "bs58 0.4.0", "proc-macro2 1.0.24", "quote 1.0.6", "rustversion", @@ -5406,7 +5412,7 @@ name = "solana-storage-proto" version = "1.8.0" dependencies = [ "bincode", - "bs58", + "bs58 0.4.0", "prost", "serde", "serde_derive", @@ -5500,7 +5506,7 @@ dependencies = [ "Inflector", "base64 0.12.3", "bincode", - "bs58", + "bs58 0.4.0", "lazy_static", "serde", "serde_derive", diff --git a/account-decoder/Cargo.toml b/account-decoder/Cargo.toml index 7ebade0873..994b9b56ca 100644 --- a/account-decoder/Cargo.toml +++ b/account-decoder/Cargo.toml @@ -12,7 +12,7 @@ edition = "2018" [dependencies] base64 = "0.12.3" bincode = "1.3.1" -bs58 = "0.3.1" +bs58 = "0.4.0" bv = "0.11.1" Inflector = "0.11.4" lazy_static = "1.4.0" diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 821056b5be..69caf6fff3 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -11,7 +11,7 @@ documentation = "https://docs.rs/solana-cli" [dependencies] bincode = "1.3.1" -bs58 = "0.3.1" +bs58 = "0.4.0" chrono = { version = "0.4.11", features = ["serde"] } clap = "2.33.1" criterion-stats = "0.3.0" diff --git a/client/Cargo.toml b/client/Cargo.toml index 6d94c58bcc..f66e15ebd5 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -12,7 +12,7 @@ edition = "2018" [dependencies] base64 = "0.13.0" bincode = "1.3.1" -bs58 = "0.3.1" +bs58 = "0.4.0" clap = "2.33.0" indicatif = "0.15.0" jsonrpc-core = "17.0.0" diff --git a/core/Cargo.toml b/core/Cargo.toml index f6b848f8e1..fc620bd5d4 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -19,7 +19,7 @@ base64 = "0.12.3" bincode = "1.3.1" blake3 = "0.3.7" bv = { version = "0.11.1", features = ["serde"] } -bs58 = "0.3.1" +bs58 = "0.4.0" byteorder = "1.3.4" chrono = { version = "0.4.11", features = ["serde"] } core_affinity = "0.5.10" diff --git a/frozen-abi/Cargo.toml b/frozen-abi/Cargo.toml index 1b850fc0d3..de36a0dc45 100644 --- a/frozen-abi/Cargo.toml +++ b/frozen-abi/Cargo.toml @@ -10,7 +10,7 @@ license = "Apache-2.0" edition = "2018" [dependencies] -bs58 = "0.3.1" +bs58 = "0.4.0" bv = { version = "0.11.1", features = ["serde"] } log = "0.4.11" serde = "1.0.122" diff --git a/keygen/Cargo.toml b/keygen/Cargo.toml index 24147ba947..d3d7f4dd7b 100644 --- a/keygen/Cargo.toml +++ b/keygen/Cargo.toml @@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-keygen" edition = "2018" [dependencies] -bs58 = "0.3.1" +bs58 = "0.4.0" clap = "2.33" dirs-next = "2.0.0" num_cpus = "1.13.0" diff --git a/ledger-tool/Cargo.toml b/ledger-tool/Cargo.toml index 0034466408..3c6cbbe583 100644 --- a/ledger-tool/Cargo.toml +++ b/ledger-tool/Cargo.toml @@ -10,7 +10,7 @@ homepage = "https://solana.com/" documentation = "https://docs.rs/solana-ledger-tool" [dependencies] -bs58 = "0.3.1" +bs58 = "0.4.0" bytecount = "0.6.0" clap = "2.33.1" csv = "1.1.3" diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock index b1dfad2e7f..3258431877 100644 --- a/programs/bpf/Cargo.lock +++ b/programs/bpf/Cargo.lock @@ -266,6 +266,12 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "476e9cd489f9e121e02ffa6014a8ef220ecb15c05ed23fc34cca13925dc283fb" +[[package]] +name = "bs58" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" + [[package]] name = "bumpalo" version = "3.3.0" @@ -442,22 +448,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "console" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a50aab2529019abfabfa93f1e6c41ef392f91fbf179b347a7e96abb524884a08" -dependencies = [ - "encode_unicode", - "lazy_static", - "libc", - "regex", - "terminal_size", - "unicode-width", - "winapi 0.3.8", - "winapi-util", -] - [[package]] name = "console" version = "0.14.1" @@ -1394,7 +1384,7 @@ version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7baab56125e25686df467fe470785512329883aab42696d661247aca2a2896e4" dependencies = [ - "console 0.13.0", + "console 0.14.1", "lazy_static", "number_prefix", "regex", @@ -2696,7 +2686,7 @@ dependencies = [ "Inflector", "base64 0.12.3", "bincode", - "bs58", + "bs58 0.4.0", "bv", "lazy_static", "serde", @@ -3117,7 +3107,7 @@ version = "1.8.0" dependencies = [ "base64 0.13.0", "bincode", - "bs58", + "bs58 0.4.0", "clap", "indicatif", "jsonrpc-core", @@ -3206,7 +3196,7 @@ version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f81ac3925c8995d935d3af27390cf7b748a81837a29feb75a00e115f40dae6dc" dependencies = [ - "bs58", + "bs58 0.3.1", "bv", "generic-array 0.14.3", "log", @@ -3224,7 +3214,7 @@ dependencies = [ name = "solana-frozen-abi" version = "1.8.0" dependencies = [ - "bs58", + "bs58 0.4.0", "bv", "generic-array 0.14.3", "log", @@ -3330,7 +3320,7 @@ dependencies = [ "bincode", "borsh", "borsh-derive", - "bs58", + "bs58 0.3.1", "bv", "curve25519-dalek 2.1.0", "hex", @@ -3361,7 +3351,7 @@ dependencies = [ "blake3", "borsh", "borsh-derive", - "bs58", + "bs58 0.4.0", "bv", "curve25519-dalek 2.1.0", "hex", @@ -3491,7 +3481,7 @@ version = "1.8.0" dependencies = [ "assert_matches", "bincode", - "bs58", + "bs58 0.4.0", "bv", "byteorder 1.3.4", "chrono", @@ -3538,7 +3528,7 @@ version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c805f1e32677f8ec0cc0b2f470833a0d5ab0922f068e52be3a4a93b468c9c70" dependencies = [ - "bs58", + "bs58 0.3.1", "proc-macro2 1.0.24", "quote 1.0.6", "rustversion", @@ -3549,7 +3539,7 @@ dependencies = [ name = "solana-sdk-macro" version = "1.8.0" dependencies = [ - "bs58", + "bs58 0.4.0", "proc-macro2 1.0.24", "quote 1.0.6", "rustversion", @@ -3596,7 +3586,7 @@ dependencies = [ "Inflector", "base64 0.12.3", "bincode", - "bs58", + "bs58 0.4.0", "lazy_static", "serde", "serde_derive", diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index ae6876b9a6..5427519304 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-rpc" edition = "2018" [dependencies] -bs58 = "0.3.1" +bs58 = "0.4.0" crossbeam-channel = "0.4" jsonrpc-core = "17.0.0" jsonrpc-core-client = { version = "17.0.0", features = ["ipc", "ws"] } diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml index 8680ef3d7f..a48a376ef9 100644 --- a/sdk/Cargo.toml +++ b/sdk/Cargo.toml @@ -39,7 +39,7 @@ full = [ [dependencies] assert_matches = { version = "1.3.0", optional = true } bincode = "1.3.1" -bs58 = "0.3.1" +bs58 = "0.4.0" bv = { version = "0.11.1", features = ["serde"] } byteorder = { version = "1.3.4", optional = true } chrono = { version = "0.4", optional = true } diff --git a/sdk/macro/Cargo.toml b/sdk/macro/Cargo.toml index 1f16aaff8e..2c77276467 100644 --- a/sdk/macro/Cargo.toml +++ b/sdk/macro/Cargo.toml @@ -13,7 +13,7 @@ edition = "2018" proc-macro = true [dependencies] -bs58 = "0.3.0" +bs58 = "0.4.0" proc-macro2 = "1.0.19" quote = "1.0" syn = { version = "1.0", features = ["full", "extra-traits"] } diff --git a/sdk/program/Cargo.toml b/sdk/program/Cargo.toml index 1513b28bbf..83c27d9cfc 100644 --- a/sdk/program/Cargo.toml +++ b/sdk/program/Cargo.toml @@ -13,7 +13,7 @@ edition = "2018" bincode = "1.3.1" borsh = "0.8.1" borsh-derive = "0.8.1" -bs58 = "0.3.1" +bs58 = "0.4.0" bv = { version = "0.11.1", features = ["serde"] } hex = "0.4.2" itertools = "0.9.0" diff --git a/storage-proto/Cargo.toml b/storage-proto/Cargo.toml index 653f43c2a8..aae1537e52 100644 --- a/storage-proto/Cargo.toml +++ b/storage-proto/Cargo.toml @@ -11,7 +11,7 @@ edition = "2018" [dependencies] bincode = "1.2.1" -bs58 = "0.3.1" +bs58 = "0.4.0" prost = "0.7.0" serde = "1.0.122" serde_derive = "1.0.103" diff --git a/transaction-status/Cargo.toml b/transaction-status/Cargo.toml index 8cc853a2d6..490942607d 100644 --- a/transaction-status/Cargo.toml +++ b/transaction-status/Cargo.toml @@ -12,7 +12,7 @@ edition = "2018" [dependencies] base64 = "0.12.3" bincode = "1.3.1" -bs58 = "0.3.1" +bs58 = "0.4.0" Inflector = "0.11.4" lazy_static = "1.4.0" serde = "1.0.122"