Skip to content

Commit 3407d64

Browse files
Merge master into staging (#1511)
* Give more money to test.near (#1467) * Give more money to test.near * Bump version * Reset state and bump version (#1499) * Bump version for Borsh (#1502) * Fix boot node in start_testnet.py (#1505) * Reduce total supply and adjust parameters (#1508)
1 parent 908daf8 commit 3407d64

File tree

18 files changed

+74543
-16831
lines changed

18 files changed

+74543
-16831
lines changed

Cargo.lock

+70-35
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

chain/chain/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ serde_derive = "1.0"
1515
cached = "0.9.0"
1616
lazy_static = "1.4"
1717

18-
borsh = "0.2.5"
18+
borsh = "0.2.7"
1919

2020
near-crypto = { path = "../../core/crypto" }
2121
near-primitives = { path = "../../core/primitives" }

chain/client/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ serde_json = "1.0"
1818
sysinfo = "0.9.0"
1919
cached = "0.9.0"
2020
lazy_static = "1.4"
21-
borsh = "0.2.5"
21+
borsh = "0.2.7"
2222

2323
near-crypto = { path = "../../core/crypto" }
2424
near-primitives = { path = "../../core/primitives" }

chain/jsonrpc/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ serde = { version = "1.0", features = ["derive"] }
2323
tokio = "0.1.15"
2424
uuid = { version = "~0.6", features = ["v4"] }
2525

26-
borsh = "0.2.5"
26+
borsh = "0.2.7"
2727

2828
async-utils = { path = "../../async-utils" }
2929
near-crypto = { path = "../../core/crypto" }

chain/network/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ reed-solomon-erasure = "3.1.1"
1818
byteorder = "1.2"
1919
lazy_static = "1.4"
2020

21-
borsh = "0.2.5"
21+
borsh = "0.2.7"
2222
cached = "0.9.0"
2323

2424
near-crypto = { path = "../../core/crypto" }
@@ -37,4 +37,4 @@ testlib = { path = "../../test-utils/testlib" }
3737

3838
[[bench]]
3939
name = "graph"
40-
harness = false
40+
harness = false

core/crypto/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ sodiumoxide = "0.2.5"
99
eth-secp256k1 = { git = "https://github.com/paritytech/rust-secp256k1" }
1010

1111
bs58 = "0.2.4"
12-
borsh = "0.2.5"
12+
borsh = "0.2.7"
1313
serde = "1.0"
1414
serde_derive = "1.0"
1515
serde_json = "1.0"

core/primitives/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ log = "0.4"
2525
reed-solomon-erasure = "3.1.1"
2626
jemallocator = { version = "0.3.0", optional = true }
2727

28-
borsh = "0.2.5"
28+
borsh = "0.2.7"
2929

3030
near-crypto = { path = "../crypto" }
3131

core/store/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ serde_derive = "1.0"
1515
cached = "0.9.0"
1616
log = "0.4"
1717

18-
borsh = "0.2.5"
18+
borsh = "0.2.7"
1919

2020
near-crypto = { path = "../crypto" }
2121
near-primitives = { path = "../primitives" }

genesis-tools/genesis-populate/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ authors = ["Near Inc <hello@nearprotocol.com>"]
55
edition = "2018"
66

77
[dependencies]
8-
borsh = "0.2.5"
8+
borsh = "0.2.7"
99
byteorder = "1.2"
1010
indicatif = "0.12.0"
1111
clap = "2.33.0"

near/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "near"
3-
version = "0.4.0"
3+
version = "0.4.1"
44
authors = ["Near Inc <hello@nearprotocol.com>"]
55
edition = "2018"
66

@@ -22,7 +22,7 @@ serde_json = "1.0"
2222
dirs = "1.0.5"
2323
lazy_static = "1.4"
2424

25-
borsh = "0.2.5"
25+
borsh = "0.2.7"
2626

2727
near-crypto = { path = "../core/crypto" }
2828
near-primitives = { path = "../core/primitives" }

0 commit comments

Comments
 (0)