From 909d10ad1718823afde0270ac2bebd02d073e0cb Mon Sep 17 00:00:00 2001 From: Maksym Zavershynskyi <35039879+nearmax@users.noreply.github.com> Date: Fri, 6 Mar 2020 09:55:22 -0800 Subject: [PATCH] Bump Borsh and runtime version (#2232) * Bump Borsh version * Nit * Bump Borsh versions * Bump borsh more --- Cargo.lock | 114 ++++++++++--------- chain/chain/Cargo.toml | 2 +- chain/chunks/Cargo.toml | 2 +- chain/client/Cargo.toml | 2 +- chain/epoch_manager/Cargo.toml | 2 +- chain/jsonrpc/Cargo.toml | 2 +- chain/network/Cargo.toml | 2 +- chain/pool/Cargo.toml | 2 +- core/crypto/Cargo.toml | 2 +- core/primitives/Cargo.toml | 2 +- core/store/Cargo.toml | 2 +- genesis-tools/genesis-populate/Cargo.toml | 2 +- near/Cargo.toml | 2 +- pytest/empty-contract-rs/Cargo.toml | 2 +- runtime/near-runtime-fees/Cargo.toml | 2 +- runtime/near-vm-errors/Cargo.toml | 4 +- runtime/near-vm-logic/Cargo.toml | 6 +- runtime/near-vm-runner-standalone/Cargo.toml | 8 +- runtime/near-vm-runner/Cargo.toml | 8 +- runtime/runtime-params-estimator/Cargo.toml | 2 +- runtime/runtime/Cargo.toml | 2 +- test-utils/loadtester/Cargo.toml | 2 +- test-utils/state-viewer/Cargo.toml | 2 +- test-utils/testlib/Cargo.toml | 2 +- 24 files changed, 95 insertions(+), 83 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d0313d2bbc1..ba3da7568bc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -525,24 +525,35 @@ dependencies = [ [[package]] name = "borsh" -version = "0.2.10" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "borsh-derive 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "borsh-derive 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "borsh-derive" -version = "0.2.10" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "borsh-derive-internal 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "borsh-derive-internal 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "borsh-schema-derive-internal 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "borsh-derive-internal" -version = "0.2.10" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "borsh-schema-derive-internal" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1296,7 +1307,7 @@ dependencies = [ name = "genesis-populate" version = "0.1.0" dependencies = [ - "borsh 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "borsh 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", "indicatif 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1712,7 +1723,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "loadtester" version = "0.1.0" dependencies = [ - "borsh 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "borsh 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1898,7 +1909,7 @@ name = "near" version = "0.4.13" dependencies = [ "actix 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "borsh 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "borsh 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1938,7 +1949,7 @@ dependencies = [ name = "near-chain" version = "0.1.0" dependencies = [ - "borsh 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "borsh 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "cached 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1977,7 +1988,7 @@ name = "near-chunks" version = "0.1.0" dependencies = [ "actix 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "borsh 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "borsh 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "cached 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2000,7 +2011,7 @@ version = "0.1.0" dependencies = [ "actix 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "ansi_term 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", - "borsh 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "borsh 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "cached 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2032,7 +2043,7 @@ version = "0.1.0" dependencies = [ "arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "blake2 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", - "borsh 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "borsh 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "bs58 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "curve25519-dalek 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2055,7 +2066,7 @@ dependencies = [ name = "near-epoch-manager" version = "0.0.1" dependencies = [ - "borsh 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "borsh 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "cached 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "ethereum-types 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2079,7 +2090,7 @@ dependencies = [ "actix-web 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "ansi_term 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "borsh 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "borsh 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2132,7 +2143,7 @@ version = "0.1.0" dependencies = [ "actix 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "bencher 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "borsh 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "borsh 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "cached 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2163,7 +2174,7 @@ dependencies = [ name = "near-pool" version = "0.1.0" dependencies = [ - "borsh 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "borsh 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "near-crypto 0.1.0", "near-primitives 0.1.0", "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2177,7 +2188,7 @@ dependencies = [ "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "bencher 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "borsh 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "borsh 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "bs58 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2187,7 +2198,7 @@ dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "near-crypto 0.1.0", "near-rpc-error-macro 0.1.0", - "near-vm-errors 0.4.5", + "near-vm-errors 0.5.0", "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "reed-solomon-erasure 4.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2227,14 +2238,14 @@ name = "near-runtime-configs" version = "0.1.0" dependencies = [ "near-primitives 0.1.0", - "near-runtime-fees 0.4.5", - "near-vm-logic 0.4.5", + "near-runtime-fees 0.5.0", + "near-vm-logic 0.5.0", "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "near-runtime-fees" -version = "0.4.5" +version = "0.5.0" dependencies = [ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2244,7 +2255,7 @@ name = "near-store" version = "0.1.0" dependencies = [ "bencher 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "borsh 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "borsh 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "cached 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "elastic-array 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2274,21 +2285,21 @@ dependencies = [ [[package]] name = "near-vm-errors" -version = "0.4.5" +version = "0.5.0" dependencies = [ - "borsh 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "borsh 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "near-rpc-error-macro 0.1.0", "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "near-vm-logic" -version = "0.4.5" +version = "0.5.0" dependencies = [ "bs58 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "near-runtime-fees 0.4.5", - "near-vm-errors 0.4.5", + "near-runtime-fees 0.5.0", + "near-vm-errors 0.5.0", "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", "sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2297,14 +2308,14 @@ dependencies = [ [[package]] name = "near-vm-runner" -version = "0.4.5" +version = "0.5.0" dependencies = [ "assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "bencher 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "cached 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "near-runtime-fees 0.4.5", - "near-vm-errors 0.4.5", - "near-vm-logic 0.4.5", + "near-runtime-fees 0.5.0", + "near-vm-errors 0.5.0", + "near-vm-logic 0.5.0", "parity-wasm 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)", "pwasm-utils 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "wabt 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2315,12 +2326,12 @@ dependencies = [ [[package]] name = "near-vm-runner-standalone" -version = "0.4.5" +version = "0.5.0" dependencies = [ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", - "near-runtime-fees 0.4.5", - "near-vm-logic 0.4.5", - "near-vm-runner 0.4.5", + "near-runtime-fees 0.5.0", + "near-vm-logic 0.5.0", + "near-vm-runner 0.5.0", "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2375,7 +2386,7 @@ dependencies = [ "assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "borsh 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "borsh 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "cached 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "genesis-populate 0.1.0", @@ -2386,11 +2397,11 @@ dependencies = [ "near-metrics 0.1.0", "near-primitives 0.1.0", "near-runtime-configs 0.1.0", - "near-runtime-fees 0.4.5", + "near-runtime-fees 0.5.0", "near-store 0.1.0", - "near-vm-errors 0.4.5", - "near-vm-logic 0.4.5", - "near-vm-runner 0.4.5", + "near-vm-errors 0.5.0", + "near-vm-logic 0.5.0", + "near-vm-runner 0.5.0", "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "rocksdb 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3065,7 +3076,7 @@ dependencies = [ name = "runtime-params-estimator" version = "0.1.0" dependencies = [ - "borsh 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "borsh 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", "csv 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "gnuplot 0.0.32 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3073,10 +3084,10 @@ dependencies = [ "near 0.4.13", "near-crypto 0.1.0", "near-primitives 0.1.0", - "near-runtime-fees 0.4.5", + "near-runtime-fees 0.5.0", "near-store 0.1.0", - "near-vm-logic 0.4.5", - "near-vm-runner 0.4.5", + "near-vm-logic 0.5.0", + "near-vm-runner 0.5.0", "node-runtime 0.0.1", "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "rand_xorshift 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3351,7 +3362,7 @@ name = "state-viewer" version = "0.1.0" dependencies = [ "ansi_term 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", - "borsh 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "borsh 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", "hex 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "near 0.4.13", @@ -3490,7 +3501,7 @@ version = "0.1.0" dependencies = [ "actix 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "borsh 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "borsh 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3505,9 +3516,9 @@ dependencies = [ "near-jsonrpc-client 0.1.0", "near-network 0.1.0", "near-primitives 0.1.0", - "near-runtime-fees 0.4.5", + "near-runtime-fees 0.5.0", "near-store 0.1.0", - "near-vm-errors 0.4.5", + "near-vm-errors 0.5.0", "node-runtime 0.0.1", "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "reqwest 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4220,9 +4231,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum blake2b_simd 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)" = "5850aeee1552f495dd0250014cf64b82b7c8879a89d83b33bbdace2cc4f63182" "checksum block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" "checksum block-padding 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" -"checksum borsh 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "6c56bce1ed0585bf13a971d3465844ee399a4b0a7380d6f7d7723bd46dbfbefb" -"checksum borsh-derive 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "fab0f75397d5ded3f928adb67bcc01458c397b100be3a9f9d99e26bd72f9e83e" -"checksum borsh-derive-internal 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "63ca09b14500c8c634d8e98ffcdb6c1fa8a40300b87027d4f996d6077c339ed4" +"checksum borsh 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "717f7624d2c96606fbe135628db9c5d9b6ae849a457f144fefd43f06f9e57fe7" +"checksum borsh-derive 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ab4784139b55c9769437ebbe8f8ea04101338fd019fbb47eaa14ee2f2aca08a9" +"checksum borsh-derive-internal 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dfc281792ea95315eb9ce1abd42889613fb8d54321b72ce98537359144791ef8" +"checksum borsh-schema-derive-internal 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c4b157ea99f839321d9a5f62f2442c38e4dea0d07a053c17d0cf441186bca57a" "checksum brotli-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4445dea95f4c2b41cde57cc9fee236ae4dbae88d8fcbdb4750fc1bb5d86aaecd" "checksum brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0cb036c3eade309815c15ddbacec5b22c4d1f3983a774ab2eac2e3e9ea85568e" "checksum bs58 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b170cd256a3f9fa6b9edae3e44a7dfdfc77e8124dbc3e2612d75f9c3e2396dae" diff --git a/chain/chain/Cargo.toml b/chain/chain/Cargo.toml index 2d8ff9c7bd6..73f77224dc3 100644 --- a/chain/chain/Cargo.toml +++ b/chain/chain/Cargo.toml @@ -17,7 +17,7 @@ serde_derive = "1.0" cached = "0.11.0" lazy_static = "1.4" -borsh = "0.2.10" +borsh = "0.5.0" near-chain-configs = { path = "../../core/chain-configs" } near-crypto = { path = "../../core/crypto" } diff --git a/chain/chunks/Cargo.toml b/chain/chunks/Cargo.toml index 2ba19fb6381..c5494bf4283 100644 --- a/chain/chunks/Cargo.toml +++ b/chain/chunks/Cargo.toml @@ -10,7 +10,7 @@ futures = "0.3" rand = "0.7" chrono = "0.4.6" log = "0.4" -borsh = "0.2.10" +borsh = "0.5.0" serde = "1.0" serde_derive = "1.0" cached = "0.11.0" diff --git a/chain/client/Cargo.toml b/chain/client/Cargo.toml index f7dc1f56012..718164ef2d3 100644 --- a/chain/client/Cargo.toml +++ b/chain/client/Cargo.toml @@ -18,7 +18,7 @@ sysinfo = "0.10.5" strum = { version = "0.16.0", features = ["derive"] } cached = "0.11.0" lazy_static = "1.4" -borsh = "0.2.10" +borsh = "0.5.0" reed-solomon-erasure = "4" near-crypto = { path = "../../core/crypto" } diff --git a/chain/epoch_manager/Cargo.toml b/chain/epoch_manager/Cargo.toml index bfdbf75de3c..3dced53b330 100644 --- a/chain/epoch_manager/Cargo.toml +++ b/chain/epoch_manager/Cargo.toml @@ -10,7 +10,7 @@ edition = "2018" protocol_defining_rand = { package = "rand", version = "0.6.5" } log = "0.4" cached = "0.11.0" -borsh = "0.2.10" +borsh = "0.5.0" rand = "0.7" serde = "1.0" serde_derive = "1.0" diff --git a/chain/jsonrpc/Cargo.toml b/chain/jsonrpc/Cargo.toml index c2228e9936b..ce4ddba9080 100644 --- a/chain/jsonrpc/Cargo.toml +++ b/chain/jsonrpc/Cargo.toml @@ -21,7 +21,7 @@ serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" validator = "0.10" uuid = { version = "~0.8", features = ["v4"] } -borsh = "0.2.10" +borsh = "0.5.0" near-chain-configs = { path = "../../core/chain-configs" } near-crypto = { path = "../../core/crypto" } diff --git a/chain/network/Cargo.toml b/chain/network/Cargo.toml index 299943587aa..75ba578be5c 100644 --- a/chain/network/Cargo.toml +++ b/chain/network/Cargo.toml @@ -20,7 +20,7 @@ byteorder = "1.2" lazy_static = "1.4" tracing = "0.1" -borsh = "0.2.10" +borsh = "0.5.0" cached = "0.11.0" near-chain-configs = { path = "../../core/chain-configs" } diff --git a/chain/pool/Cargo.toml b/chain/pool/Cargo.toml index 72ed29f0368..40b822abe31 100644 --- a/chain/pool/Cargo.toml +++ b/chain/pool/Cargo.toml @@ -8,4 +8,4 @@ edition = "2018" near-crypto = { path = "../../core/crypto" } near-primitives = { path = "../../core/primitives" } rand = "0.7" -borsh = "0.2.10" \ No newline at end of file +borsh = "0.5.0" \ No newline at end of file diff --git a/core/crypto/Cargo.toml b/core/crypto/Cargo.toml index 7ef45d38212..4f4a98728d2 100644 --- a/core/crypto/Cargo.toml +++ b/core/crypto/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" [dependencies] arrayref = "0.3" blake2 = "0.8" -borsh = "0.2.10" +borsh = "0.5.0" bs58 = "0.3" c2-chacha = "0.2" curve25519-dalek = "2" diff --git a/core/primitives/Cargo.toml b/core/primitives/Cargo.toml index d569cf2e974..92694a0614e 100644 --- a/core/primitives/Cargo.toml +++ b/core/primitives/Cargo.toml @@ -25,7 +25,7 @@ reed-solomon-erasure = "4" jemallocator = { version = "0.3.0", optional = true } actix = "0.9.0" -borsh = "0.2.10" +borsh = "0.5.0" near-crypto = { path = "../crypto" } near-vm-errors = { path = "../../runtime/near-vm-errors" } diff --git a/core/store/Cargo.toml b/core/store/Cargo.toml index 0f1419f6855..78d8f5981a3 100644 --- a/core/store/Cargo.toml +++ b/core/store/Cargo.toml @@ -14,7 +14,7 @@ cached = "0.11.0" log = "0.4" num_cpus = "1.11" -borsh = "0.2.10" +borsh = "0.5.0" near-crypto = { path = "../crypto" } near-primitives = { path = "../primitives" } diff --git a/genesis-tools/genesis-populate/Cargo.toml b/genesis-tools/genesis-populate/Cargo.toml index fa2123d61b1..579456cece1 100644 --- a/genesis-tools/genesis-populate/Cargo.toml +++ b/genesis-tools/genesis-populate/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Near Inc "] edition = "2018" [dependencies] -borsh = "0.2.10" +borsh = "0.5.0" byteorder = "1.2" indicatif = "0.13.0" clap = "2.33.0" diff --git a/near/Cargo.toml b/near/Cargo.toml index 249bf24567c..4a94d395ed1 100644 --- a/near/Cargo.toml +++ b/near/Cargo.toml @@ -21,7 +21,7 @@ serde_derive = "1.0" serde_json = "1.0" lazy_static = "1.4" dirs = "2.0.2" -borsh = "0.2.10" +borsh = "0.5.0" tracing = "0.1" tracing-subscriber = "0.1.6" diff --git a/pytest/empty-contract-rs/Cargo.toml b/pytest/empty-contract-rs/Cargo.toml index 1b82b80e0b2..f7e3b4f249c 100644 --- a/pytest/empty-contract-rs/Cargo.toml +++ b/pytest/empty-contract-rs/Cargo.toml @@ -11,7 +11,7 @@ crate-type = ["cdylib", "rlib"] serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" near-bindgen = { git = "https://github.com/nearprotocol/near-bindgen", branch = "master"} -borsh = "0.2.10" +borsh = "0.5.0" wee_alloc = "0.4.5" [profile.release] diff --git a/runtime/near-runtime-fees/Cargo.toml b/runtime/near-runtime-fees/Cargo.toml index 1e7a50533e0..c270337a0cc 100644 --- a/runtime/near-runtime-fees/Cargo.toml +++ b/runtime/near-runtime-fees/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "near-runtime-fees" -version = "0.4.5" +version = "0.5.0" authors = ["Near Inc "] edition = "2018" license = "Apache-2.0" diff --git a/runtime/near-vm-errors/Cargo.toml b/runtime/near-vm-errors/Cargo.toml index 3920357a861..ff300f17f1f 100644 --- a/runtime/near-vm-errors/Cargo.toml +++ b/runtime/near-vm-errors/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "near-vm-errors" -version = "0.4.5" +version = "0.5.0" authors = ["Near Inc "] edition = "2018" license = "Apache-2.0" @@ -13,7 +13,7 @@ Error that can occur inside Near Runtime encapsulated in a separate crate. Might """ [dependencies] -borsh = "0.2.10" +borsh = "0.5.0" near-rpc-error-macro = { path = "../../tools/rpctypegen/macro", version = "0.1.0" } serde = { version = "1.0", features = ["derive"] } diff --git a/runtime/near-vm-logic/Cargo.toml b/runtime/near-vm-logic/Cargo.toml index 7b482be33f7..aad80a24de7 100644 --- a/runtime/near-vm-logic/Cargo.toml +++ b/runtime/near-vm-logic/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "near-vm-logic" -version = "0.4.5" +version = "0.5.0" authors = ["Near Inc "] edition = "2018" license = "Apache-2.0" @@ -16,8 +16,8 @@ This crate implements the specification of the interface that Near blockchain ex byteorder = "1.2" bs58 = "0.3" serde = { version = "1.0", features = ["derive"] } -near-runtime-fees = { path = "../near-runtime-fees", version = "0.4.5" } -near-vm-errors = { path = "../near-vm-errors", version = "0.4.5" } +near-runtime-fees = { path = "../near-runtime-fees", version = "0.5.0" } +near-vm-errors = { path = "../near-vm-errors", version = "0.5.0" } [dev-dependencies] serde_json = {version= "1.0", features= ["preserve_order"]} diff --git a/runtime/near-vm-runner-standalone/Cargo.toml b/runtime/near-vm-runner-standalone/Cargo.toml index 5b45a968971..26182a55c4e 100644 --- a/runtime/near-vm-runner-standalone/Cargo.toml +++ b/runtime/near-vm-runner-standalone/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "near-vm-runner-standalone" -version = "0.4.5" +version = "0.5.0" authors = ["Near Inc "] edition = "2018" license = "Apache-2.0" @@ -21,6 +21,6 @@ to make sure it has expected behavior once deployed to the blockchain. [dependencies] serde_json = "1.0" clap = "2.33.0" -near-vm-logic = { path = "../near-vm-logic", version = "0.4.5"} -near-vm-runner = { path = "../near-vm-runner", version = "0.4.5" } -near-runtime-fees = { path = "../near-runtime-fees", version = "0.4.5" } +near-vm-logic = { path = "../near-vm-logic", version = "0.5.0"} +near-vm-runner = { path = "../near-vm-runner", version = "0.5.0" } +near-runtime-fees = { path = "../near-runtime-fees", version = "0.5.0" } diff --git a/runtime/near-vm-runner/Cargo.toml b/runtime/near-vm-runner/Cargo.toml index dd8a2edcdf3..a838a2858f8 100644 --- a/runtime/near-vm-runner/Cargo.toml +++ b/runtime/near-vm-runner/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "near-vm-runner" -version = "0.4.5" +version = "0.5.0" authors = ["Near Inc "] edition = "2018" license = "Apache-2.0" @@ -16,9 +16,9 @@ This crate implements the specification of the interface that Near blockchain ex cached = "0.11.0" wasmer-runtime = { version = "0.13.1", features = ["default-backend-singlepass"], default-features = false } wasmer-runtime-core = { version = "0.13.1" } -near-runtime-fees = { path="../near-runtime-fees", version = "0.4.5" } -near-vm-logic = { path="../near-vm-logic", version = "0.4.5", default-features = false, features = []} -near-vm-errors = { path = "../near-vm-errors", version = "0.4.5" } +near-runtime-fees = { path="../near-runtime-fees", version = "0.5.0" } +near-vm-logic = { path="../near-vm-logic", version = "0.5.0", default-features = false, features = []} +near-vm-errors = { path = "../near-vm-errors", version = "0.5.0" } pwasm-utils = "0.12.0" parity-wasm = "0.41.0" wasmparser = "0.44" diff --git a/runtime/runtime-params-estimator/Cargo.toml b/runtime/runtime-params-estimator/Cargo.toml index a4cf216df60..f6c22fc6a23 100644 --- a/runtime/runtime-params-estimator/Cargo.toml +++ b/runtime/runtime-params-estimator/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Near Inc "] edition = "2018" [dependencies] -borsh = "0.2.10" +borsh = "0.5.0" indicatif = {version = "0.13.0", features = ["with_rayon"]} rayon = "1.1" tempdir = "0.3.7" diff --git a/runtime/runtime/Cargo.toml b/runtime/runtime/Cargo.toml index 86bed87eb49..d9875a6ed2a 100644 --- a/runtime/runtime/Cargo.toml +++ b/runtime/runtime/Cargo.toml @@ -17,7 +17,7 @@ sha2 = "0.8" sha3 = "0.8" lazy_static = "1.4" -borsh = "0.2.10" +borsh = "0.5.0" cached = "0.11.0" near-crypto = { path = "../../core/crypto" } diff --git a/test-utils/loadtester/Cargo.toml b/test-utils/loadtester/Cargo.toml index b2d1e94dd44..80112f16343 100644 --- a/test-utils/loadtester/Cargo.toml +++ b/test-utils/loadtester/Cargo.toml @@ -16,7 +16,7 @@ serde_json = "1.0.0" reqwest = { version = "0.10", features = ["rustls-tls", "blocking", "json"] } git-version = "0.3.2" byteorder = "1.2" -borsh = "0.2.10" +borsh = "0.5.0" near-crypto = { path = "../../core/crypto" } near-primitives = { path = "../../core/primitives" } diff --git a/test-utils/state-viewer/Cargo.toml b/test-utils/state-viewer/Cargo.toml index c411c0ef1c0..4f6f1961b7e 100644 --- a/test-utils/state-viewer/Cargo.toml +++ b/test-utils/state-viewer/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" clap = "2.32.0" hex = "0.4" ansi_term = "0.12.0" -borsh = "0.2.10" +borsh = "0.5.0" near-chain-configs = { path = "../../core/chain-configs" } near-crypto = { path = "../../core/crypto" } diff --git a/test-utils/testlib/Cargo.toml b/test-utils/testlib/Cargo.toml index 85eb404e9b0..365bfa7fbf4 100644 --- a/test-utils/testlib/Cargo.toml +++ b/test-utils/testlib/Cargo.toml @@ -20,7 +20,7 @@ byteorder = "1.2" tempdir = "0.3" assert_matches = "1.3.0" -borsh = "0.2.10" +borsh = "0.5.0" near-chain-configs = { path = "../../core/chain-configs" } near-crypto = { path = "../../core/crypto" }