diff --git a/Cargo.lock b/Cargo.lock index 0a34c89838..4bf973d7e7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -98,6 +98,12 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" +[[package]] +name = "arrayvec" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4dc07131ffa69b8072d35f5007352af944213cde02545e2103680baed38fcd" + [[package]] name = "ascii" version = "0.9.3" @@ -308,7 +314,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a" dependencies = [ "arrayref", - "arrayvec", + "arrayvec 0.5.1", "constant_time_eq", ] @@ -319,7 +325,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b64485778c4f16a6a5a9d335e80d449ac6c70cdd6a06d2af18a6f6f775a125b3" dependencies = [ "arrayref", - "arrayvec", + "arrayvec 0.5.1", "cc", "cfg-if 0.1.10", "constant_time_eq", @@ -327,6 +333,21 @@ dependencies = [ "digest 0.9.0", ] +[[package]] +name = "blake3" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcd555c66291d5f836dbb6883b48660ece810fe25a31f3bdfb911945dff2691f" +dependencies = [ + "arrayref", + "arrayvec 0.7.1", + "cc", + "cfg-if 1.0.0", + "constant_time_eq", + "crypto-mac 0.11.0", + "digest 0.9.0", +] + [[package]] name = "block-buffer" version = "0.7.3" @@ -2191,7 +2212,7 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" dependencies = [ - "arrayvec", + "arrayvec 0.5.1", "bitflags", "cfg-if 1.0.0", "ryu", @@ -4411,7 +4432,7 @@ dependencies = [ "ahash 0.7.4", "base64 0.12.3", "bincode", - "blake3", + "blake3 1.0.0", "bs58 0.4.0", "bv", "byteorder", @@ -5103,7 +5124,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3bfe6a5dfc5372c0a946018ecdd8115e38af78cea8275bac48cf3d105c6b1fb3" dependencies = [ "bincode", - "blake3", + "blake3 0.3.8", "borsh", "borsh-derive", "bs58 0.3.1", @@ -5137,7 +5158,7 @@ version = "1.8.0" dependencies = [ "assert_matches", "bincode", - "blake3", + "blake3 1.0.0", "borsh", "borsh-derive", "bs58 0.4.0", @@ -5274,7 +5295,7 @@ dependencies = [ "arrayref", "assert_matches", "bincode", - "blake3", + "blake3 1.0.0", "bv", "byteorder", "bzip2", diff --git a/core/Cargo.toml b/core/Cargo.toml index e9a05dd418..0025d606ef 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -17,7 +17,7 @@ codecov = { repository = "solana-labs/solana", branch = "master", service = "git ahash = "0.7.4" base64 = "0.12.3" bincode = "1.3.3" -blake3 = "0.3.8" +blake3 = "1.0.0" bv = { version = "0.11.1", features = ["serde"] } bs58 = "0.4.0" byteorder = "1.4.3" diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock index 722a21b5bc..3da672208e 100644 --- a/programs/bpf/Cargo.lock +++ b/programs/bpf/Cargo.lock @@ -75,6 +75,12 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" +[[package]] +name = "arrayvec" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4dc07131ffa69b8072d35f5007352af944213cde02545e2103680baed38fcd" + [[package]] name = "ascii" version = "0.9.3" @@ -169,7 +175,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b64485778c4f16a6a5a9d335e80d449ac6c70cdd6a06d2af18a6f6f775a125b3" dependencies = [ "arrayref", - "arrayvec", + "arrayvec 0.5.1", "cc", "cfg-if 0.1.10", "constant_time_eq", @@ -177,6 +183,21 @@ dependencies = [ "digest 0.9.0", ] +[[package]] +name = "blake3" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcd555c66291d5f836dbb6883b48660ece810fe25a31f3bdfb911945dff2691f" +dependencies = [ + "arrayref", + "arrayvec 0.7.1", + "cc", + "cfg-if 1.0.0", + "constant_time_eq", + "crypto-mac 0.11.0", + "digest 0.9.0", +] + [[package]] name = "block-buffer" version = "0.9.0" @@ -2711,7 +2732,7 @@ dependencies = [ name = "solana-bpf-rust-sha" version = "1.8.0" dependencies = [ - "blake3", + "blake3 1.0.0", "solana-program 1.8.0", ] @@ -3023,7 +3044,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3bfe6a5dfc5372c0a946018ecdd8115e38af78cea8275bac48cf3d105c6b1fb3" dependencies = [ "bincode", - "blake3", + "blake3 0.3.8", "borsh", "borsh-derive", "bs58 0.3.1", @@ -3056,7 +3077,7 @@ name = "solana-program" version = "1.8.0" dependencies = [ "bincode", - "blake3", + "blake3 1.0.0", "borsh", "borsh-derive", "bs58 0.4.0", @@ -3141,7 +3162,7 @@ version = "1.8.0" dependencies = [ "arrayref", "bincode", - "blake3", + "blake3 1.0.0", "bv", "byteorder 1.4.3", "bzip2", diff --git a/programs/bpf/rust/sha/Cargo.toml b/programs/bpf/rust/sha/Cargo.toml index 17ee599856..f40f6be6ca 100644 --- a/programs/bpf/rust/sha/Cargo.toml +++ b/programs/bpf/rust/sha/Cargo.toml @@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-sha" edition = "2018" [dependencies] -blake3 = "0.3.7" +blake3 = "1.0.0" solana-program = { path = "../../../../sdk/program", version = "=1.8.0" } [lib] diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index f3bfd1924c..c43ae4d3b2 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -12,7 +12,7 @@ edition = "2018" [dependencies] arrayref = "0.3.6" bincode = "1.3.3" -blake3 = "0.3.8" +blake3 = "1.0.0" bv = { version = "0.11.1", features = ["serde"] } byteorder = "1.4.3" bzip2 = "0.4.3" diff --git a/sdk/program/Cargo.toml b/sdk/program/Cargo.toml index e4b2b5825d..3e8f814e7e 100644 --- a/sdk/program/Cargo.toml +++ b/sdk/program/Cargo.toml @@ -12,7 +12,7 @@ edition = "2018" [dependencies] bincode = "1.3.1" -blake3 = "0.3.7" +blake3 = { version = "1.0.0", features = ["traits-preview"] } borsh = "0.9.1" borsh-derive = "0.9.1" bs58 = "0.4.0"