Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Borsh and runtime version #2232

Merged
merged 4 commits into from
Mar 6, 2020
+95 −83
Merged

Bump Borsh and runtime version #2232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
43661c1
Bump Borsh version
Mar 6, 2020
cddf4ec
Nit
Mar 6, 2020
441d921
Bump Borsh versions
Mar 6, 2020
3b6b07b
Bump borsh more
Mar 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
114 changes: 63 additions & 51 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion chain/chain/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion chain/chunks/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion chain/client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion chain/epoch_manager/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion chain/jsonrpc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion chain/network/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion chain/pool/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ edition = "2018"
near-crypto = { path = "../../core/crypto" }
near-primitives = { path = "../../core/primitives" }
rand = "0.7"
borsh = "0.2.10"
borsh = "0.5.0"
2 changes: 1 addition & 1 deletion core/crypto/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion core/primitives/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion core/store/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion genesis-tools/genesis-populate/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ authors = ["Near Inc <[email protected]>"]
edition = "2018"

[dependencies]
borsh = "0.2.10"
borsh = "0.5.0"
byteorder = "1.2"
indicatif = "0.13.0"
clap = "2.33.0"
Expand Down
2 changes: 1 addition & 1 deletion near/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion pytest/empty-contract-rs/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion runtime/near-runtime-fees/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "near-runtime-fees"
version = "0.4.5"
version = "0.5.0"
authors = ["Near Inc <[email protected]>"]
edition = "2018"
license = "Apache-2.0"
Expand Down
4 changes: 2 additions & 2 deletions runtime/near-vm-errors/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "near-vm-errors"
version = "0.4.5"
version = "0.5.0"
authors = ["Near Inc <[email protected]>"]
edition = "2018"
license = "Apache-2.0"
Expand All @@ -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"] }

Expand Down
6 changes: 3 additions & 3 deletions runtime/near-vm-logic/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "near-vm-logic"
version = "0.4.5"
version = "0.5.0"
authors = ["Near Inc <[email protected]>"]
edition = "2018"
license = "Apache-2.0"
Expand All @@ -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"]}
Expand Down
8 changes: 4 additions & 4 deletions runtime/near-vm-runner-standalone/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "near-vm-runner-standalone"
version = "0.4.5"
version = "0.5.0"
authors = ["Near Inc <[email protected]>"]
edition = "2018"
license = "Apache-2.0"
Expand All @@ -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" }
8 changes: 4 additions & 4 deletions runtime/near-vm-runner/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "near-vm-runner"
version = "0.4.5"
version = "0.5.0"
authors = ["Near Inc <[email protected]>"]
edition = "2018"
license = "Apache-2.0"
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion runtime/runtime-params-estimator/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ authors = ["Near Inc <[email protected]>"]
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"
Expand Down
2 changes: 1 addition & 1 deletion runtime/runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion test-utils/loadtester/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion test-utils/state-viewer/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion test-utils/testlib/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down