From e974f1565feb77d77871fb09b207b4919fd3b4a0 Mon Sep 17 00:00:00 2001 From: Austin Abell Date: Wed, 8 Sep 2021 07:44:43 -0400 Subject: [PATCH] chore: bump borsh version (#4730) Closes #4603 I think the zeropool_bn borsh version still needs to be updated. I'm still tracking down which fork is being published from because it doesn't seem to be the near or aurora fork of bn (can someone save me time and point in right direction?). What I'm confused about is why the cargo-deny doesn't fail when specifying 0.9 borsh and checking ban conditions --- Cargo.lock | 48 +++++------ 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-primitives/Cargo.toml | 2 +- chain/network/Cargo.toml | 2 +- chain/pool/Cargo.toml | 2 +- core/account-id/Cargo.toml | 2 +- core/account-id/fuzz/Cargo.toml | 2 +- core/crypto/Cargo.toml | 2 +- core/primitives-core/Cargo.toml | 2 +- core/primitives/Cargo.toml | 2 +- core/store/Cargo.toml | 2 +- deny.toml | 10 +-- genesis-tools/genesis-populate/Cargo.toml | 2 +- integration-tests/Cargo.toml | 2 +- nearcore/Cargo.toml | 2 +- runtime/near-vm-errors/Cargo.toml | 2 +- runtime/near-vm-logic/Cargo.toml | 2 +- runtime/near-vm-runner/Cargo.toml | 2 +- runtime/runtime-params-estimator/Cargo.toml | 2 +- runtime/runtime/Cargo.toml | 2 +- test-utils/loadtester/Cargo.toml | 2 +- test-utils/runtime-tester/fuzz/Cargo.lock | 93 ++++++--------------- test-utils/state-viewer/Cargo.toml | 2 +- test-utils/testlib/Cargo.toml | 2 +- 28 files changed, 78 insertions(+), 123 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ac27701abd1..ab74a9fea9a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1845,7 +1845,7 @@ dependencies = [ name = "genesis-populate" version = "0.1.0" dependencies = [ - "borsh 0.8.1", + "borsh 0.9.0", "byteorder", "clap 2.33.3", "indicatif 0.15.0", @@ -2244,7 +2244,7 @@ dependencies = [ "actix", "actix-rt", "assert_matches", - "borsh 0.8.1", + "borsh 0.9.0", "cached", "chrono", "funty", @@ -2487,7 +2487,7 @@ checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" name = "loadtester" version = "0.1.0" dependencies = [ - "borsh 0.8.1", + "borsh 0.9.0", "byteorder", "clap 2.33.3", "env_logger", @@ -2681,7 +2681,7 @@ dependencies = [ name = "near-account-id" version = "0.1.0" dependencies = [ - "borsh 0.8.1", + "borsh 0.9.0", "paperclip", "serde", "serde_json", @@ -2699,7 +2699,7 @@ dependencies = [ name = "near-chain" version = "0.1.0" dependencies = [ - "borsh 0.8.1", + "borsh 0.9.0", "cached", "chrono", "delay-detector", @@ -2757,7 +2757,7 @@ name = "near-chunks" version = "0.1.0" dependencies = [ "actix", - "borsh 0.8.1", + "borsh 0.9.0", "cached", "chrono", "futures", @@ -2789,7 +2789,7 @@ dependencies = [ "actix", "actix-rt", "ansi_term 0.12.1", - "borsh 0.8.1", + "borsh 0.9.0", "cached", "chrono", "delay-detector", @@ -2847,7 +2847,7 @@ version = "0.1.0" dependencies = [ "arrayref", "blake2", - "borsh 0.8.1", + "borsh 0.9.0", "bs58", "c2-chacha", "curve25519-dalek", @@ -2872,7 +2872,7 @@ dependencies = [ name = "near-epoch-manager" version = "0.0.1" dependencies = [ - "borsh 0.8.1", + "borsh 0.9.0", "cached", "chrono", "log", @@ -2919,7 +2919,7 @@ dependencies = [ "actix-http", "actix-web", "awc", - "borsh 0.8.1", + "borsh 0.9.0", "easy-ext", "futures", "lazy_static", @@ -3013,7 +3013,7 @@ version = "0.1.0" dependencies = [ "actix", "bencher", - "borsh 0.8.1", + "borsh 0.9.0", "byteorder", "bytes", "bytesize", @@ -3049,7 +3049,7 @@ name = "near-network-primitives" version = "0.1.0" dependencies = [ "actix", - "borsh 0.8.1", + "borsh 0.9.0", "chrono", "near-crypto", "near-primitives", @@ -3090,7 +3090,7 @@ dependencies = [ name = "near-pool" version = "0.1.0" dependencies = [ - "borsh 0.8.1", + "borsh 0.9.0", "near-crypto", "near-primitives", "rand 0.7.3", @@ -3102,7 +3102,7 @@ version = "0.1.0" dependencies = [ "base64 0.13.0", "bencher", - "borsh 0.8.1", + "borsh 0.9.0", "bs58", "byteorder", "chrono", @@ -3131,7 +3131,7 @@ name = "near-primitives-core" version = "0.1.0" dependencies = [ "base64 0.11.0", - "borsh 0.8.1", + "borsh 0.9.0", "bs58", "derive_more", "hex", @@ -3216,7 +3216,7 @@ name = "near-store" version = "2.2.0" dependencies = [ "bencher", - "borsh 0.8.1", + "borsh 0.9.0", "byteorder", "bytesize", "cached", @@ -3265,7 +3265,7 @@ dependencies = [ name = "near-vm-errors" version = "3.0.0" dependencies = [ - "borsh 0.8.1", + "borsh 0.9.0", "hex", "near-account-id", "near-rpc-error-macro", @@ -3277,7 +3277,7 @@ name = "near-vm-logic" version = "3.0.0" dependencies = [ "base64 0.13.0", - "borsh 0.8.1", + "borsh 0.9.0", "bs58", "byteorder", "hex", @@ -3301,7 +3301,7 @@ dependencies = [ "anyhow", "assert_matches", "base64 0.13.0", - "borsh 0.8.1", + "borsh 0.9.0", "cached", "near-primitives", "near-test-contracts", @@ -3354,7 +3354,7 @@ dependencies = [ "actix-web", "actix_derive", "awc", - "borsh 0.8.1", + "borsh 0.9.0", "byteorder", "chrono", "delay-detector", @@ -3434,7 +3434,7 @@ version = "3.0.0" dependencies = [ "assert_matches", "base64 0.11.0", - "borsh 0.8.1", + "borsh 0.9.0", "byteorder", "hex", "indicatif 0.13.0", @@ -4397,7 +4397,7 @@ name = "runtime-params-estimator" version = "3.0.0" dependencies = [ "anyhow", - "borsh 0.8.1", + "borsh 0.9.0", "cfg-if 1.0.0", "chrono", "clap 3.0.0-beta.2", @@ -4810,7 +4810,7 @@ name = "state-viewer" version = "0.1.0" dependencies = [ "ansi_term 0.12.1", - "borsh 0.8.1", + "borsh 0.9.0", "clap 2.33.3", "near-chain", "near-chain-configs", @@ -5051,7 +5051,7 @@ dependencies = [ "actix", "actix-rt", "assert_matches", - "borsh 0.8.1", + "borsh 0.9.0", "byteorder", "clap 2.33.3", "futures", diff --git a/chain/chain/Cargo.toml b/chain/chain/Cargo.toml index badc48e0809..b4933a1deb6 100644 --- a/chain/chain/Cargo.toml +++ b/chain/chain/Cargo.toml @@ -19,7 +19,7 @@ thiserror = "1.0" strum = "0.20" rayon = "1.5" -borsh = "0.8.1" +borsh = "0.9" near-chain-configs = { path = "../../core/chain-configs" } near-chain-primitives = { path = "../chain-primitives" } diff --git a/chain/chunks/Cargo.toml b/chain/chunks/Cargo.toml index f9c93e0a7e9..4ae3aeed51f 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.8.1" +borsh = "0.9" serde = { version = "1", features = [ "derive" ] } cached = "0.23" reed-solomon-erasure = "4" diff --git a/chain/client/Cargo.toml b/chain/client/Cargo.toml index 6d75ce6f651..827d2c2e44e 100644 --- a/chain/client/Cargo.toml +++ b/chain/client/Cargo.toml @@ -19,7 +19,7 @@ sysinfo = { git = "https://github.com/near/sysinfo", rev = "3cb97ee79a02754407d2 strum = { version = "0.20", features = ["derive"] } cached = "0.23" lazy_static = "1.4" -borsh = "0.8.1" +borsh = "0.9" reed-solomon-erasure = "4" num-rational = "0.3" linked-hash-map = "0.5.3" diff --git a/chain/epoch_manager/Cargo.toml b/chain/epoch_manager/Cargo.toml index 31a0e9f9324..aba7debf416 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", default-features = false } log = "0.4" cached = "0.23" -borsh = "0.8.1" +borsh = "0.9" rand = "0.7" serde = { version = "1", features = [ "derive" ] } serde_json = "1" diff --git a/chain/jsonrpc/Cargo.toml b/chain/jsonrpc/Cargo.toml index 44b3b38fcaf..82f4abfef41 100644 --- a/chain/jsonrpc/Cargo.toml +++ b/chain/jsonrpc/Cargo.toml @@ -19,7 +19,7 @@ serde = { version = "1", features = ["derive"] } serde_json = "1" validator = "0.12" tracing = "0.1.13" -borsh = "0.8.1" +borsh = "0.9" near-chain-configs = { path = "../../core/chain-configs" } near-crypto = { path = "../../core/crypto" } diff --git a/chain/network-primitives/Cargo.toml b/chain/network-primitives/Cargo.toml index 46d8028bad2..2f15635a29f 100644 --- a/chain/network-primitives/Cargo.toml +++ b/chain/network-primitives/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" actix = "=0.11.0-beta.2" tokio = { version = "1.1", features = ["full"] } chrono = { version = "0.4.4", features = ["serde"] } -borsh = "0.8.1" +borsh = "0.9" serde = { version = "1", features = [ "derive" ] } strum = { version = "0.20", features = ["derive"] } tracing = "0.1.13" diff --git a/chain/network/Cargo.toml b/chain/network/Cargo.toml index 12047365376..ed0cd4e36e8 100644 --- a/chain/network/Cargo.toml +++ b/chain/network/Cargo.toml @@ -21,7 +21,7 @@ near-rust-allocator-proxy = "0.2.9" bytesize = "1.0.1" conqueue = "0.4.0" -borsh = "0.8.1" +borsh = "0.9" cached = "0.23" near-network-primitives = { path = "../network-primitives" } diff --git a/chain/pool/Cargo.toml b/chain/pool/Cargo.toml index 8f10602e101..a83dc078e3b 100644 --- a/chain/pool/Cargo.toml +++ b/chain/pool/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" [dependencies] rand = "0.7" -borsh = "0.8.1" +borsh = "0.9" near-crypto = { path = "../../core/crypto" } near-primitives = { path = "../../core/primitives" } diff --git a/core/account-id/Cargo.toml b/core/account-id/Cargo.toml index 6e2c69ec620..b7b47106f3f 100644 --- a/core/account-id/Cargo.toml +++ b/core/account-id/Cargo.toml @@ -13,7 +13,7 @@ default = ["borsh", "serde"] internal_unstable = [] [dependencies] -borsh = { version = "0.8.1", optional = true } +borsh = { version = "0.9", optional = true } serde = { version = "1", optional = true } [dependencies.paperclip] diff --git a/core/account-id/fuzz/Cargo.toml b/core/account-id/fuzz/Cargo.toml index abf61d5ad81..0cd2dc27ecf 100644 --- a/core/account-id/fuzz/Cargo.toml +++ b/core/account-id/fuzz/Cargo.toml @@ -11,7 +11,7 @@ cargo-fuzz = true [dependencies] libfuzzer-sys = "0.4" -borsh = "0.8.1" +borsh = "0.9" serde_json = "1" [dependencies.near-account-id] diff --git a/core/crypto/Cargo.toml b/core/crypto/Cargo.toml index 0bf10defd78..02ca3b0cbd5 100644 --- a/core/crypto/Cargo.toml +++ b/core/crypto/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" [dependencies] arrayref = "0.3" blake2 = "0.9.1" -borsh = "0.8.1" +borsh = "0.9" bs58 = "0.4" c2-chacha = "0.3" curve25519-dalek = "3" diff --git a/core/primitives-core/Cargo.toml b/core/primitives-core/Cargo.toml index 5a150985cc0..6098c1732c4 100644 --- a/core/primitives-core/Cargo.toml +++ b/core/primitives-core/Cargo.toml @@ -12,7 +12,7 @@ This crate provides the core set of primitives used by other nearcore crates inc [dependencies] base64 = "0.11" -borsh = "0.8.1" +borsh = "0.9" bs58 = "0.4" hex = "0.4" derive_more = "0.99.3" diff --git a/core/primitives/Cargo.toml b/core/primitives/Cargo.toml index 65d2f366664..d7fe986c9dd 100644 --- a/core/primitives/Cargo.toml +++ b/core/primitives/Cargo.toml @@ -30,7 +30,7 @@ hex = "0.4" num-rational = { version = "0.3", features = ["serde"] } primitive-types = "0.10" -borsh = "0.8.1" +borsh = "0.9" near-primitives-core = { path = "../primitives-core" } near-crypto = { path = "../crypto" } diff --git a/core/store/Cargo.toml b/core/store/Cargo.toml index 2a90e747fc1..8daf9de3136 100644 --- a/core/store/Cargo.toml +++ b/core/store/Cargo.toml @@ -20,7 +20,7 @@ rand = "0.7" strum = { version = "0.20", features = ["derive"] } fs2 = "0.4" tracing = "0.1" -borsh = "0.8.1" +borsh = "0.9" thiserror = "1" smart-default = "0.6" diff --git a/deny.toml b/deny.toml index c67ba4b98d9..898141d3e6a 100644 --- a/deny.toml +++ b/deny.toml @@ -99,11 +99,11 @@ skip = [ # hashbrown uses an older version { name = "ahash", version = "=0.4.7" }, - # zeropool-bn use borsh 0.8.1 - { name = "borsh", version = "=0.8.1" }, - { name = "borsh-derive", version = "=0.8.1" }, - { name = "borsh-derive-internal", version = "=0.8.1" }, - { name = "borsh-schema-derive-internal", version = "=0.8.1" }, + # zeropool-bn use borsh 0.9.0 + { name = "borsh", version = "=0.9.0" }, + { name = "borsh-derive", version = "=0.9.0" }, + { name = "borsh-derive-internal", version = "=0.9.0" }, + { name = "borsh-schema-derive-internal", version = "=0.9.0" }, # rocksdb (transitively through clang-sys) uses this as a build # dependency which conflicts with 0.6.7 that wasmer-engine-native diff --git a/genesis-tools/genesis-populate/Cargo.toml b/genesis-tools/genesis-populate/Cargo.toml index 70ec6df3957..789808b0334 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.8.1" +borsh = "0.9" byteorder = "1.2" indicatif = "0.15.0" clap = "2.33.0" diff --git a/integration-tests/Cargo.toml b/integration-tests/Cargo.toml index 7248224b4a5..67d5acc3f45 100644 --- a/integration-tests/Cargo.toml +++ b/integration-tests/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" actix = "=0.11.0-beta.2" actix-rt = "2" assert_matches = "1.3" -borsh = "0.8.1" +borsh = "0.9" cached = "0.23" chrono = { version = "0.4.4", features = ["serde"] } funty = "=1.1.0" # Pin dependency to avoid compilation errors: https://github.com/myrrlyn/funty/issues/3 diff --git a/nearcore/Cargo.toml b/nearcore/Cargo.toml index c311eff3e42..7bbc62356f3 100644 --- a/nearcore/Cargo.toml +++ b/nearcore/Cargo.toml @@ -20,7 +20,7 @@ rayon = "1.5" serde = { version = "1", features = ["derive"] } serde_json = "1" dirs = "3" -borsh = "0.8.1" +borsh = "0.9" thiserror = "1.0" tracing = "0.1.13" smart-default = "0.6" diff --git a/runtime/near-vm-errors/Cargo.toml b/runtime/near-vm-errors/Cargo.toml index 7ab14aadedd..32a57fae281 100644 --- a/runtime/near-vm-errors/Cargo.toml +++ b/runtime/near-vm-errors/Cargo.toml @@ -16,7 +16,7 @@ Error that can occur inside Near Runtime encapsulated in a separate crate. Might hex = "0.4" serde = { version = "1", features = ["derive"] } -borsh = "0.8.1" +borsh = "0.9" near-account-id = { path = "../../core/account-id" } near-rpc-error-macro = { path = "../../tools/rpctypegen/macro", version = "0.1.0" } diff --git a/runtime/near-vm-logic/Cargo.toml b/runtime/near-vm-logic/Cargo.toml index e114702f83e..c6ae456328f 100644 --- a/runtime/near-vm-logic/Cargo.toml +++ b/runtime/near-vm-logic/Cargo.toml @@ -14,7 +14,7 @@ This crate implements the specification of the interface that Near blockchain ex [dependencies] base64 = "0.13" -borsh = "0.8.1" +borsh = "0.9" bs58 = "0.4" byteorder = "1.2" ripemd160 = "0.9.0" diff --git a/runtime/near-vm-runner/Cargo.toml b/runtime/near-vm-runner/Cargo.toml index 5463cf3eafb..61c87cddb61 100644 --- a/runtime/near-vm-runner/Cargo.toml +++ b/runtime/near-vm-runner/Cargo.toml @@ -13,7 +13,7 @@ This crate implements the specification of the interface that Near blockchain ex """ [dependencies] -borsh = "0.8.1" +borsh = "0.9" serde = { version = "1", features = ["derive"] } wasmer-runtime = { version = "0.18.0", features = ["default-backend-singlepass"], default-features = false, package = "wasmer-runtime-near", optional = true } wasmer-runtime-core = { version = "0.18.2", package = "wasmer-runtime-core-near", optional = true} diff --git a/runtime/runtime-params-estimator/Cargo.toml b/runtime/runtime-params-estimator/Cargo.toml index e2d5a75496f..cc4f9f3b76f 100644 --- a/runtime/runtime-params-estimator/Cargo.toml +++ b/runtime/runtime-params-estimator/Cargo.toml @@ -17,7 +17,7 @@ gnuplot = "0.0.37" serde_json = "1" csv = "1.1.3" clap = "=3.0.0-beta.2" -borsh = "0.8.1" +borsh = "0.9" num-rational = "0.3" anyhow = "1" chrono = "0.4" diff --git a/runtime/runtime/Cargo.toml b/runtime/runtime/Cargo.toml index 2929a27060c..afd8174442e 100644 --- a/runtime/runtime/Cargo.toml +++ b/runtime/runtime/Cargo.toml @@ -20,7 +20,7 @@ hex = "0.4.2" rayon = "1.5" thiserror = "1.0" -borsh = "0.8.1" +borsh = "0.9" near-chain-configs = { path = "../../core/chain-configs" } near-crypto = { path = "../../core/crypto" } diff --git a/test-utils/loadtester/Cargo.toml b/test-utils/loadtester/Cargo.toml index 968ada39778..7764bdcfc1a 100644 --- a/test-utils/loadtester/Cargo.toml +++ b/test-utils/loadtester/Cargo.toml @@ -17,7 +17,7 @@ reqwest = { version = "0.11", features = ["rustls-tls", "blocking", "json"] } git-version = "0.3.2" byteorder = "1.2" -borsh = "0.8.1" +borsh = "0.9" integration-tests = { path = "../../integration-tests" } near-crypto = { path = "../../core/crypto" } diff --git a/test-utils/runtime-tester/fuzz/Cargo.lock b/test-utils/runtime-tester/fuzz/Cargo.lock index 7ec97983ab8..f319d7be755 100644 --- a/test-utils/runtime-tester/fuzz/Cargo.lock +++ b/test-utils/runtime-tester/fuzz/Cargo.lock @@ -567,63 +567,29 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" -[[package]] -name = "borsh" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09a7111f797cc721407885a323fb071636aee57f750b1a4ddc27397eba168a74" -dependencies = [ - "borsh-derive 0.8.2", - "hashbrown 0.9.1", -] - [[package]] name = "borsh" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "18dda7dc709193c0d86a1a51050a926dc3df1cf262ec46a23a25dba421ea1924" dependencies = [ - "borsh-derive 0.9.1", + "borsh-derive", "hashbrown 0.9.1", ] -[[package]] -name = "borsh-derive" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "307f3740906bac2c118a8122fe22681232b244f1369273e45f1156b45c43d2dd" -dependencies = [ - "borsh-derive-internal 0.8.2", - "borsh-schema-derive-internal 0.8.2", - "proc-macro-crate 0.1.5", - "proc-macro2", - "syn", -] - [[package]] name = "borsh-derive" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "684155372435f578c0fa1acd13ebbb182cc19d6b38b64ae7901da4393217d264" dependencies = [ - "borsh-derive-internal 0.9.1", - "borsh-schema-derive-internal 0.9.1", + "borsh-derive-internal", + "borsh-schema-derive-internal", "proc-macro-crate 0.1.5", "proc-macro2", "syn", ] -[[package]] -name = "borsh-derive-internal" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2104c73179359431cc98e016998f2f23bc7a05bc53e79741bcba705f30047bc" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "borsh-derive-internal" version = "0.9.1" @@ -635,17 +601,6 @@ dependencies = [ "syn", ] -[[package]] -name = "borsh-schema-derive-internal" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae29eb8418fcd46f723f8691a2ac06857d31179d33d2f2d91eb13967de97c728" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "borsh-schema-derive-internal" version = "0.9.1" @@ -2135,7 +2090,7 @@ checksum = "0debeb9fcf88823ea64d64e4a815ab1643f33127d995978e099942ce38f25238" name = "near-account-id" version = "0.1.0" dependencies = [ - "borsh 0.8.2", + "borsh", "serde", ] @@ -2151,7 +2106,7 @@ dependencies = [ name = "near-chain" version = "0.1.0" dependencies = [ - "borsh 0.8.2", + "borsh", "cached", "chrono", "failure", @@ -2207,7 +2162,7 @@ name = "near-chunks" version = "0.1.0" dependencies = [ "actix", - "borsh 0.8.2", + "borsh", "cached", "chrono", "futures", @@ -2238,7 +2193,7 @@ dependencies = [ "actix", "actix-rt", "ansi_term 0.12.1", - "borsh 0.8.2", + "borsh", "cached", "chrono", "futures", @@ -2292,7 +2247,7 @@ version = "0.1.0" dependencies = [ "arrayref", "blake2", - "borsh 0.8.2", + "borsh", "bs58", "c2-chacha", "curve25519-dalek", @@ -2315,7 +2270,7 @@ dependencies = [ name = "near-epoch-manager" version = "0.0.1" dependencies = [ - "borsh 0.8.2", + "borsh", "cached", "log", "near-chain", @@ -2341,7 +2296,7 @@ dependencies = [ "actix-http", "actix-web", "awc", - "borsh 0.8.2", + "borsh", "easy-ext", "futures", "lazy_static", @@ -2419,7 +2374,7 @@ name = "near-network" version = "0.1.0" dependencies = [ "actix", - "borsh 0.8.2", + "borsh", "byteorder", "bytes", "bytesize", @@ -2450,7 +2405,7 @@ name = "near-network-primitives" version = "0.1.0" dependencies = [ "actix", - "borsh 0.8.2", + "borsh", "chrono", "near-crypto", "near-primitives", @@ -2491,7 +2446,7 @@ dependencies = [ name = "near-pool" version = "0.1.0" dependencies = [ - "borsh 0.8.2", + "borsh", "near-crypto", "near-primitives", "rand 0.7.3", @@ -2502,7 +2457,7 @@ name = "near-primitives" version = "0.1.0" dependencies = [ "base64 0.13.0", - "borsh 0.8.2", + "borsh", "bs58", "byteorder", "chrono", @@ -2531,7 +2486,7 @@ name = "near-primitives-core" version = "0.1.0" dependencies = [ "base64 0.11.0", - "borsh 0.8.2", + "borsh", "bs58", "derive_more", "hex", @@ -2585,7 +2540,7 @@ dependencies = [ name = "near-store" version = "2.2.0" dependencies = [ - "borsh 0.8.2", + "borsh", "byteorder", "bytesize", "cached", @@ -2633,7 +2588,7 @@ dependencies = [ name = "near-vm-errors" version = "3.0.0" dependencies = [ - "borsh 0.8.2", + "borsh", "hex", "near-account-id", "near-rpc-error-macro", @@ -2645,7 +2600,7 @@ name = "near-vm-logic" version = "3.0.0" dependencies = [ "base64 0.13.0", - "borsh 0.8.2", + "borsh", "bs58", "byteorder", "near-account-id", @@ -2664,7 +2619,7 @@ name = "near-vm-runner" version = "3.0.0" dependencies = [ "anyhow", - "borsh 0.8.2", + "borsh", "cached", "near-primitives", "near-vm-errors", @@ -2695,7 +2650,7 @@ dependencies = [ "actix-web", "actix_derive", "awc", - "borsh 0.8.2", + "borsh", "byteorder", "chrono", "dirs", @@ -2746,7 +2701,7 @@ dependencies = [ name = "node-runtime" version = "3.0.0" dependencies = [ - "borsh 0.8.2", + "borsh", "byteorder", "hex", "lazy_static", @@ -4009,7 +3964,7 @@ dependencies = [ "actix", "actix-rt", "assert_matches", - "borsh 0.8.2", + "borsh", "byteorder", "clap", "futures", @@ -4662,7 +4617,7 @@ checksum = "2cf26de331c8ef4257bef33649b4665535b105c927ab2e00715f17891362efe8" dependencies = [ "bincode", "blake3", - "borsh 0.9.1", + "borsh", "cc", "digest 0.8.1", "errno", @@ -4705,7 +4660,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f6edd0ba6c0bcf9b279186d4dbe81649dda3e5ef38f586865943de4dcd653f8" dependencies = [ "bincode", - "borsh 0.9.1", + "borsh", "byteorder", "dynasm", "dynasmrt", diff --git a/test-utils/state-viewer/Cargo.toml b/test-utils/state-viewer/Cargo.toml index 3f309f99e01..6f2ba72dbe4 100644 --- a/test-utils/state-viewer/Cargo.toml +++ b/test-utils/state-viewer/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" [dependencies] ansi_term = "0.12" -borsh = "0.8.1" +borsh = "0.9" clap = "2.33" tracing = "0.1" diff --git a/test-utils/testlib/Cargo.toml b/test-utils/testlib/Cargo.toml index 0a92c65c867..b768019444c 100644 --- a/test-utils/testlib/Cargo.toml +++ b/test-utils/testlib/Cargo.toml @@ -19,7 +19,7 @@ assert_matches = "1.3" num-rational = "0.3" hex = "0.4" -borsh = "0.8.1" +borsh = "0.9" near-actix-test-utils = { path = "../actix-test-utils" } near-logger-utils = { path = "../../test-utils/logger" }