Merge pull request #179685 from Mic92/nearcore
nearcore: 1.27.0 -> 1.28.0
This commit is contained in:
commit
cf5a599904
@ -0,0 +1,42 @@
|
||||
From 14635f8a87423f7682e22c4d4bc34551cfe1d10d Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
|
||||
Date: Thu, 30 Jun 2022 07:33:44 +0000
|
||||
Subject: [PATCH] make near-test-contracts optional
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
|
||||
---
|
||||
Cargo.lock | 1 -
|
||||
tools/state-viewer/Cargo.toml | 2 +-
|
||||
2 files changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index e1d8b2a83..3317587f5 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -5253,7 +5253,6 @@ dependencies = [
|
||||
"near-primitives",
|
||||
"near-primitives-core",
|
||||
"near-store",
|
||||
- "near-test-contracts",
|
||||
"nearcore",
|
||||
"node-runtime",
|
||||
"once_cell",
|
||||
diff --git a/tools/state-viewer/Cargo.toml b/tools/state-viewer/Cargo.toml
|
||||
index 02346bf71..51cfc4cb5 100644
|
||||
--- a/tools/state-viewer/Cargo.toml
|
||||
+++ b/tools/state-viewer/Cargo.toml
|
||||
@@ -30,7 +30,7 @@ near-network = { path = "../../chain/network" }
|
||||
near-primitives = { path = "../../core/primitives" }
|
||||
near-primitives-core = { path = "../../core/primitives-core" }
|
||||
near-store = { path = "../../core/store" }
|
||||
-near-test-contracts = { path = "../../runtime/near-test-contracts" }
|
||||
+#near-test-contracts = { path = "../../runtime/near-test-contracts" }
|
||||
nearcore = { path = "../../nearcore" }
|
||||
node-runtime = { path = "../../runtime/runtime" }
|
||||
|
||||
--
|
||||
2.36.1
|
||||
|
@ -4,7 +4,7 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nearcore";
|
||||
version = "1.27.0";
|
||||
version = "1.28.0";
|
||||
|
||||
# https://github.com/near/nearcore/tags
|
||||
src = fetchFromGitHub {
|
||||
@ -12,10 +12,12 @@ rustPlatform.buildRustPackage rec {
|
||||
repo = "nearcore";
|
||||
# there is also a branch for this version number, so we need to be explicit
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-B9HqUa0mBSvsCPzxPt4NqpV99rV4lmQ9Q/z9lxob9oM=";
|
||||
|
||||
sha256 = "sha256-DRVlD74XTYgy3GeUd/7OIl2aie8nEJLmrmmkwPRkrA8=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-6GIt3J6y/O8XaHQJKRSPRgK2XbghMLif4e2Btdww9Ng=";
|
||||
cargoSha256 = "sha256-hTqje17EdVkgqReuLnizaK3cBJuqXJXC6x5NuoKJLbs=";
|
||||
cargoPatches = [ ./0001-make-near-test-contracts-optional.patch ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace neard/build.rs \
|
||||
|
Loading…
Reference in New Issue
Block a user