From 6b9a529cdaaa6300515e42cc0c8f699b6a75239c Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Fri, 25 Jun 2021 23:10:01 +0000 Subject: [PATCH] Bump borsh from 0.8.1 to 0.9.0 (backport #18230) (#18237) * Bump borsh from 0.8.1 to 0.9.0 (#18230) (cherry picked from commit 7ed2cf30a52cc93bed6f8ba432c4ed63f086a656) # Conflicts: # programs/bpf/Cargo.lock * Fix conflicts Co-authored-by: Tyera Eulberg Co-authored-by: Tyera Eulberg --- Cargo.lock | 63 ++++++++++++++++++++++++----- banks-client/Cargo.toml | 4 +- programs/bpf/Cargo.lock | 87 +++++++++++++++++++++++++++-------------- sdk/program/Cargo.toml | 4 +- 4 files changed, 116 insertions(+), 42 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 390bcc3bcb..c7fc683525 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -351,7 +351,17 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a5a26c53ddf60281f18e7a29b20db7ba3db82a9d81b9650bfaa02d646f50d364" dependencies = [ - "borsh-derive", + "borsh-derive 0.8.1", + "hashbrown 0.9.1", +] + +[[package]] +name = "borsh" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fcabb02816fdadf90866dc9a7824491ccb63d69f55375a266dc03509ac68d36" +dependencies = [ + "borsh-derive 0.9.0", "hashbrown 0.9.1", ] @@ -361,8 +371,21 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b637a47728b78a78cd7f4b85bf06d71ef4221840e059a38f048be2422bf673b2" dependencies = [ - "borsh-derive-internal", - "borsh-schema-derive-internal", + "borsh-derive-internal 0.8.1", + "borsh-schema-derive-internal 0.8.1", + "proc-macro-crate", + "proc-macro2 1.0.24", + "syn 1.0.60", +] + +[[package]] +name = "borsh-derive" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bd16f0729b89f0a212b0e2e1d19cc6593df63f771161a11863967780e2d033d" +dependencies = [ + "borsh-derive-internal 0.9.0", + "borsh-schema-derive-internal 0.9.0", "proc-macro-crate", "proc-macro2 1.0.24", "syn 1.0.60", @@ -379,6 +402,17 @@ dependencies = [ "syn 1.0.60", ] +[[package]] +name = "borsh-derive-internal" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e321a130a3ac4b88eb59a6d670bde11eec9721a397b77e0f2079060e2a1b785" +dependencies = [ + "proc-macro2 1.0.24", + "quote 1.0.6", + "syn 1.0.60", +] + [[package]] name = "borsh-schema-derive-internal" version = "0.8.1" @@ -390,6 +424,17 @@ dependencies = [ "syn 1.0.60", ] +[[package]] +name = "borsh-schema-derive-internal" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15151a485164b319cc7a5160fe4316dc469a27993f71b73d7617dc9032ff0fd7" +dependencies = [ + "proc-macro2 1.0.24", + "quote 1.0.6", + "syn 1.0.60", +] + [[package]] name = "bs58" version = "0.3.1" @@ -3989,8 +4034,8 @@ name = "solana-banks-client" version = "1.6.15" dependencies = [ "bincode", - "borsh", - "borsh-derive", + "borsh 0.9.0", + "borsh-derive 0.9.0", "futures 0.3.8", "mio 0.7.6", "solana-banks-interface", @@ -4944,8 +4989,8 @@ dependencies = [ "assert_matches", "bincode", "blake3", - "borsh", - "borsh-derive", + "borsh 0.9.0", + "borsh-derive 0.9.0", "bs58", "bv", "curve25519-dalek 2.1.0", @@ -4979,8 +5024,8 @@ checksum = "7a2df39c63e21c5b58e2012e7675bed5e8dd5100470ffddedcafb78f5a7e3abe" dependencies = [ "bincode", "blake3", - "borsh", - "borsh-derive", + "borsh 0.8.1", + "borsh-derive 0.8.1", "bs58", "bv", "curve25519-dalek 2.1.0", diff --git a/banks-client/Cargo.toml b/banks-client/Cargo.toml index 84b1d59d33..c66d9821ae 100644 --- a/banks-client/Cargo.toml +++ b/banks-client/Cargo.toml @@ -11,8 +11,8 @@ edition = "2018" [dependencies] bincode = "1.3.1" -borsh = "0.8.1" -borsh-derive = "0.8.1" +borsh = "0.9.0" +borsh-derive = "0.9.0" futures = "0.3" mio = "0.7.6" solana-banks-interface = { path = "../banks-interface", version = "=1.6.15" } diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock index 9d86cfb951..878fad8d3a 100644 --- a/programs/bpf/Cargo.lock +++ b/programs/bpf/Cargo.lock @@ -219,7 +219,17 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a5a26c53ddf60281f18e7a29b20db7ba3db82a9d81b9650bfaa02d646f50d364" dependencies = [ - "borsh-derive", + "borsh-derive 0.8.1", + "hashbrown", +] + +[[package]] +name = "borsh" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fcabb02816fdadf90866dc9a7824491ccb63d69f55375a266dc03509ac68d36" +dependencies = [ + "borsh-derive 0.9.0", "hashbrown", ] @@ -229,8 +239,21 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b637a47728b78a78cd7f4b85bf06d71ef4221840e059a38f048be2422bf673b2" dependencies = [ - "borsh-derive-internal", - "borsh-schema-derive-internal", + "borsh-derive-internal 0.8.1", + "borsh-schema-derive-internal 0.8.1", + "proc-macro-crate", + "proc-macro2 1.0.24", + "syn 1.0.67", +] + +[[package]] +name = "borsh-derive" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bd16f0729b89f0a212b0e2e1d19cc6593df63f771161a11863967780e2d033d" +dependencies = [ + "borsh-derive-internal 0.9.0", + "borsh-schema-derive-internal 0.9.0", "proc-macro-crate", "proc-macro2 1.0.24", "syn 1.0.67", @@ -247,6 +270,17 @@ dependencies = [ "syn 1.0.67", ] +[[package]] +name = "borsh-derive-internal" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e321a130a3ac4b88eb59a6d670bde11eec9721a397b77e0f2079060e2a1b785" +dependencies = [ + "proc-macro2 1.0.24", + "quote 1.0.6", + "syn 1.0.67", +] + [[package]] name = "borsh-schema-derive-internal" version = "0.8.1" @@ -258,6 +292,17 @@ dependencies = [ "syn 1.0.67", ] +[[package]] +name = "borsh-schema-derive-internal" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15151a485164b319cc7a5160fe4316dc469a27993f71b73d7617dc9032ff0fd7" +dependencies = [ + "proc-macro2 1.0.24", + "quote 1.0.6", + "syn 1.0.67", +] + [[package]] name = "bs58" version = "0.3.1" @@ -441,22 +486,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 = "const_fn" version = "0.4.5" @@ -713,7 +742,7 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4aa86af7b19b40ef9cbef761ed411a49f0afa06b7b6dcd3dfe2f96a3c546138" dependencies = [ - "console 0.11.3", + "console", "lazy_static", "tempfile", ] @@ -1384,7 +1413,7 @@ version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7baab56125e25686df467fe470785512329883aab42696d661247aca2a2896e4" dependencies = [ - "console 0.13.0", + "console", "lazy_static", "number_prefix", "regex", @@ -2769,8 +2798,8 @@ name = "solana-banks-client" version = "1.6.15" dependencies = [ "bincode", - "borsh", - "borsh-derive", + "borsh 0.9.0", + "borsh-derive 0.9.0", "futures 0.3.12", "mio 0.7.7", "solana-banks-interface", @@ -3148,7 +3177,7 @@ dependencies = [ "Inflector", "base64 0.13.0", "chrono", - "console 0.11.3", + "console", "humantime", "indicatif", "serde", @@ -3381,8 +3410,8 @@ version = "1.6.15" dependencies = [ "bincode", "blake3", - "borsh", - "borsh-derive", + "borsh 0.9.0", + "borsh-derive 0.9.0", "bs58", "bv", "curve25519-dalek 2.1.0", @@ -3415,8 +3444,8 @@ checksum = "7a2df39c63e21c5b58e2012e7675bed5e8dd5100470ffddedcafb78f5a7e3abe" dependencies = [ "bincode", "blake3", - "borsh", - "borsh-derive", + "borsh 0.8.1", + "borsh-derive 0.8.1", "bs58", "bv", "curve25519-dalek 2.1.0", @@ -3478,7 +3507,7 @@ name = "solana-remote-wallet" version = "1.6.15" dependencies = [ "base32", - "console 0.11.3", + "console", "dialoguer", "hidapi", "log", diff --git a/sdk/program/Cargo.toml b/sdk/program/Cargo.toml index 80da76b37c..60a6a3eccd 100644 --- a/sdk/program/Cargo.toml +++ b/sdk/program/Cargo.toml @@ -11,8 +11,8 @@ edition = "2018" [dependencies] bincode = "1.3.1" -borsh = "0.8.1" -borsh-derive = "0.8.1" +borsh = "0.9.0" +borsh-derive = "0.9.0" bs58 = "0.3.1" bv = { version = "0.11.1", features = ["serde"] } hex = "0.4.2"