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
near · Sep 8, 2021 · e974f15 · e974f15
1 parent 08d9a0c
commit e974f15
Show file tree

Hide file tree

Showing 28 changed files with 78 additions and 123 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -5,7 +5,7 @@ authors = ["Near Inc <[email protected]>"]
 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
@@ -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
@@ -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
@@ -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" }