neard: 1.35.0 -> 1.36.0

ZentriaMC · Oct 31, 2023 · 8c9cabf · 8c9cabf
1 parent 9c30c9c
commit 8c9cabf
Show file tree

Hide file tree

Showing 3 changed files with 257 additions and 5 deletions.
diff --git a/flake.nix b/flake.nix
@@ -46,7 +46,7 @@
       in
       rec {
         packages.neard = pkgs.callPackage ./neard.nix {
-          rustPlatform = mkRustPlatform "stable" "1.69.0";
+          rustPlatform = mkRustPlatform "stable" "1.71.0";
           inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation DiskArbitration Foundation IOKit Security;
         };
 

diff --git a/neard.nix b/neard.nix
@@ -18,7 +18,7 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "neard";
-  version = "1.35.0";
+  version = "1.36.0";
 
   buildInputs = [
     llvm
@@ -41,11 +41,11 @@ rustPlatform.buildRustPackage rec {
     owner = "near";
     repo = "nearcore";
     rev = "refs/tags/${version}";
-    hash = "sha256-YmF22F9JqP03azRp30gmt/DhtacQIBcHutlnjHgJPFk=";
+    hash = "sha256-PPrDvXsHOkB29xX51BmP7PWyWBaZDvwXqStRRnoc81k=";
   };
 
-  cargoPatches = [ ./patches/1.35.0/0001-Make-near-test-contracts-optional.patch ];
-  cargoHash = "sha256-EW52V5TZR4qi/6Q0ML16kTG1qecWQTV0CHyhPIgQiho=";
+  cargoPatches = [ ./patches/1.36.0/0001-Make-near-test-contracts-optional.patch ];
+  cargoHash = "sha256-jH2r2dDilzY/2ojuf1lVMeuXoBybyy2Fa+x8eAwPtjY=";
 
   postPatch = ''
     substituteInPlace neard/build.rs \

diff --git a/patches/1.36.0/0001-Make-near-test-contracts-optional.patch b/patches/1.36.0/0001-Make-near-test-contracts-optional.patch
@@ -0,0 +1,252 @@
+From 0464a16fadee693952ce05e15f014f6e2b211a62 Mon Sep 17 00:00:00 2001
+From: Mark Vainomaa <[email protected]>
+Date: Tue, 9 May 2023 17:35:30 +0300
+Subject: [PATCH] Make near-test-contracts optional
+
+---
+ Cargo.lock                                  | 22 ---------------------
+ genesis-tools/genesis-populate/Cargo.toml   |  2 +-
+ integration-tests/Cargo.toml                |  2 +-
+ runtime/near-vm-runner/Cargo.toml           |  2 +-
+ runtime/near-vm-runner/fuzz/Cargo.toml      |  2 +-
+ runtime/runtime-params-estimator/Cargo.toml |  2 +-
+ runtime/runtime/Cargo.toml                  |  2 +-
+ test-utils/runtime-tester/Cargo.toml        |  2 +-
+ test-utils/testlib/Cargo.toml               |  2 +-
+ tools/amend-genesis/Cargo.toml              |  2 +-
+ tools/state-viewer/Cargo.toml               |  2 +-
+ 11 files changed, 10 insertions(+), 32 deletions(-)
+
+diff --git a/Cargo.lock b/Cargo.lock
+index 1c48b578f..973ae8459 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -2382,7 +2382,6 @@ dependencies = [
+  "near-epoch-manager",
+  "near-primitives",
+  "near-store",
+- "near-test-contracts",
+  "nearcore",
+  "tempfile",
+ ]
+@@ -2817,7 +2816,6 @@ dependencies = [
+  "near-stdx",
+  "near-store",
+  "near-telemetry",
+- "near-test-contracts",
+  "near-undo-block",
+  "near-vm-runner",
+  "nearcore",
+@@ -3425,7 +3423,6 @@ dependencies = [
+  "near-primitives",
+  "near-primitives-core",
+  "near-store",
+- "near-test-contracts",
+  "nearcore",
+  "node-runtime",
+  "num-rational",
+@@ -4313,18 +4310,6 @@ dependencies = [
+  "tracing",
+ ]
+
+-[[package]]
+-name = "near-test-contracts"
+-version = "1.36.0"
+-dependencies = [
+- "arbitrary",
+- "once_cell",
+- "rand 0.8.5",
+- "wasm-encoder 0.27.0",
+- "wasm-smith",
+- "wat",
+-]
+-
+ [[package]]
+ name = "near-undo-block"
+ version = "1.36.0"
+@@ -4435,7 +4420,6 @@ dependencies = [
+  "near-primitives",
+  "near-primitives-core",
+  "near-stdx",
+- "near-test-contracts",
+  "near-vm-compiler",
+  "near-vm-compiler-singlepass",
+  "near-vm-engine",
+@@ -4480,7 +4464,6 @@ dependencies = [
+  "arbitrary",
+  "libfuzzer-sys",
+  "near-primitives",
+- "near-test-contracts",
+  "near-vm-runner",
+  "wasm-smith",
+  "wasmprinter",
+@@ -4718,7 +4701,6 @@ dependencies = [
+  "near-o11y",
+  "near-primitives",
+  "near-store",
+- "near-test-contracts",
+  "near-vm-runner",
+  "num-bigint 0.3.3",
+  "num-rational",
+@@ -5885,7 +5867,6 @@ dependencies = [
+  "near-o11y",
+  "near-primitives",
+  "near-store",
+- "near-test-contracts",
+  "near-vm-runner",
+  "nearcore",
+  "node-runtime",
+@@ -5917,7 +5898,6 @@ dependencies = [
+  "near-o11y",
+  "near-primitives",
+  "near-store",
+- "near-test-contracts",
+  "nearcore",
+  "serde",
+  "serde_json",
+@@ -6605,7 +6585,6 @@ dependencies = [
+  "near-primitives",
+  "near-primitives-core",
+  "near-store",
+- "near-test-contracts",
+  "nearcore",
+  "node-runtime",
+  "once_cell",
+@@ -6825,7 +6804,6 @@ dependencies = [
+  "near-chain-configs",
+  "near-crypto",
+  "near-primitives",
+- "near-test-contracts",
+  "node-runtime",
+  "once_cell",
+ ]
+diff --git a/genesis-tools/genesis-populate/Cargo.toml b/genesis-tools/genesis-populate/Cargo.toml
+index c42163181..cf59923fa 100644
+--- a/genesis-tools/genesis-populate/Cargo.toml
++++ b/genesis-tools/genesis-populate/Cargo.toml
+@@ -21,7 +21,7 @@ near-epoch-manager.workspace = true
+ near-primitives.workspace = true
+ near-store.workspace = true
+ near-chain.workspace = true
+-near-test-contracts.workspace = true
++#near-test-contracts.workspace = true
+
+ [features]
+ nightly_protocol = [
+diff --git a/integration-tests/Cargo.toml b/integration-tests/Cargo.toml
+index 040e19acd..31cd4d1a2 100644
+--- a/integration-tests/Cargo.toml
++++ b/integration-tests/Cargo.toml
+@@ -50,7 +50,7 @@ near-primitives-core.workspace = true
+ near-store.workspace = true
+ near-o11y.workspace = true
+ near-telemetry.workspace = true
+-near-test-contracts.workspace = true
++#near-test-contracts.workspace = true
+ near-performance-metrics.workspace = true
+ near-undo-block.workspace = true
+ near-vm-runner.workspace = true
+diff --git a/runtime/near-vm-runner/Cargo.toml b/runtime/near-vm-runner/Cargo.toml
+index d61eac7d4..8233dbb17 100644
+--- a/runtime/near-vm-runner/Cargo.toml
++++ b/runtime/near-vm-runner/Cargo.toml
+@@ -67,7 +67,7 @@ bolero.workspace = true
+ expect-test.workspace = true
+ hex.workspace = true
+ near-primitives.workspace = true
+-near-test-contracts.workspace = true
++#near-test-contracts.workspace = true
+ rand.workspace = true
+ serde_json = { workspace = true, features = ["preserve_order"] }
+ wasm-smith.workspace = true
+diff --git a/runtime/near-vm-runner/fuzz/Cargo.toml b/runtime/near-vm-runner/fuzz/Cargo.toml
+index 9127527c5..a1da8d3a7 100644
+--- a/runtime/near-vm-runner/fuzz/Cargo.toml
++++ b/runtime/near-vm-runner/fuzz/Cargo.toml
+@@ -18,7 +18,7 @@ wasm-smith.workspace = true
+ wasmprinter.workspace = true
+
+ near-primitives.workspace = true
+-near-test-contracts.workspace = true
++#near-test-contracts.workspace = true
+ near-vm-runner.workspace = true
+
+ [[bin]]
+diff --git a/runtime/runtime-params-estimator/Cargo.toml b/runtime/runtime-params-estimator/Cargo.toml
+index 3055c9f38..1e496bb2c 100644
+--- a/runtime/runtime-params-estimator/Cargo.toml
++++ b/runtime/runtime-params-estimator/Cargo.toml
+@@ -43,7 +43,7 @@ near-fmt.workspace = true
+ near-o11y.workspace = true
+ near-primitives.workspace = true
+ near-store.workspace = true
+-near-test-contracts.workspace = true
++#near-test-contracts.workspace = true
+ near-vm-runner = { workspace = true, features = ["clap"] }
+ nearcore.workspace = true
+ node-runtime.workspace = true
+diff --git a/runtime/runtime/Cargo.toml b/runtime/runtime/Cargo.toml
+index 9321c338d..76ff321ff 100644
+--- a/runtime/runtime/Cargo.toml
++++ b/runtime/runtime/Cargo.toml
+@@ -66,5 +66,5 @@ tempfile.workspace = true
+
+ near-chain-configs.workspace = true
+ near-store = { workspace = true, features = ["test_features"] }
+-near-test-contracts.workspace = true
++#near-test-contracts.workspace = true
+ testlib.workspace = true
+diff --git a/test-utils/runtime-tester/Cargo.toml b/test-utils/runtime-tester/Cargo.toml
+index 20a9614e6..5bfb8d1a4 100644
+--- a/test-utils/runtime-tester/Cargo.toml
++++ b/test-utils/runtime-tester/Cargo.toml
+@@ -26,7 +26,7 @@ nearcore.workspace = true
+ near-primitives.workspace = true
+ near-store.workspace = true
+ near-o11y.workspace = true
+-near-test-contracts.workspace = true
++#near-test-contracts.workspace = true
+
+ [dev-dependencies]
+ testlib.workspace = true
+diff --git a/test-utils/testlib/Cargo.toml b/test-utils/testlib/Cargo.toml
+index 1ba085379..ef83bee02 100644
+--- a/test-utils/testlib/Cargo.toml
++++ b/test-utils/testlib/Cargo.toml
+@@ -15,7 +15,7 @@ near-chain-configs.workspace = true
+ near-chain.workspace = true
+ near-crypto.workspace = true
+ near-primitives.workspace = true
+-near-test-contracts.workspace = true
++#near-test-contracts.workspace = true
+ node-runtime.workspace = true
+
+ [features]
+diff --git a/tools/amend-genesis/Cargo.toml b/tools/amend-genesis/Cargo.toml
+index aaddc473d..c36bf09b9 100644
+--- a/tools/amend-genesis/Cargo.toml
++++ b/tools/amend-genesis/Cargo.toml
+@@ -26,6 +26,6 @@ near-network.workspace = true
+ near-primitives.workspace = true
+ near-primitives-core.workspace = true
+ near-store.workspace = true
+-near-test-contracts.workspace = true
++#near-test-contracts.workspace = true
+ nearcore.workspace = true
+ node-runtime.workspace = true
+diff --git a/tools/state-viewer/Cargo.toml b/tools/state-viewer/Cargo.toml
+index d376fb2da..80fea961c 100644
+--- a/tools/state-viewer/Cargo.toml
++++ b/tools/state-viewer/Cargo.toml
+@@ -41,7 +41,7 @@ near-o11y.workspace = true
+ near-primitives-core.workspace = true
+ near-primitives.workspace = true
+ near-store.workspace = true
+-near-test-contracts.workspace = true
++#near-test-contracts.workspace = true
+ nearcore.workspace = true
+ node-runtime.workspace = true
+
+-- 
+2.42.0
+