From 7ed2cf30a52cc93bed6f8ba432c4ed63f086a656 Mon Sep 17 00:00:00 2001 From: Tyera Eulberg Date: Fri, 25 Jun 2021 14:43:04 -0600 Subject: [PATCH] Bump borsh from 0.8.1 to 0.9.0 (#18230) --- Cargo.lock | 63 +++++++++++++++++++++++++++----- banks-client/Cargo.toml | 4 +- programs/bpf/Cargo.lock | 81 ++++++++++++++++++++++++++++------------- sdk/program/Cargo.toml | 4 +- 4 files changed, 113 insertions(+), 39 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5a096015585ba8..d766311a481270 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -353,7 +353,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", ] @@ -363,8 +373,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", @@ -381,6 +404,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" @@ -392,6 +426,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" @@ -3963,8 +4008,8 @@ name = "solana-banks-client" version = "1.7.4" 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", @@ -4950,8 +4995,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", @@ -4983,8 +5028,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", diff --git a/banks-client/Cargo.toml b/banks-client/Cargo.toml index 82680192d65978..9a427427e3b6c1 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.7.4" } diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock index b4963111a8c3f9..ac151c3386c6de 100644 --- a/programs/bpf/Cargo.lock +++ b/programs/bpf/Cargo.lock @@ -221,7 +221,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", ] @@ -231,8 +241,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", @@ -249,6 +272,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" @@ -260,6 +294,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" @@ -442,22 +487,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 +1423,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", @@ -2726,8 +2755,8 @@ name = "solana-banks-client" version = "1.7.4" 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", @@ -3348,8 +3377,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", @@ -3380,8 +3409,8 @@ version = "1.7.4" dependencies = [ "bincode", "blake3", - "borsh", - "borsh-derive", + "borsh 0.9.0", + "borsh-derive 0.9.0", "bs58", "bv", "curve25519-dalek 2.1.0", diff --git a/sdk/program/Cargo.toml b/sdk/program/Cargo.toml index cb63bc48c61ea9..b1e8d554647acf 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"