rust: 1.68.2 -> 1.69.0

Cargo.toml

@@ -361,4 +361,4 @@ opt-level = 3
 [workspace.package]
 edition = "2021"
 authors = ["Near Inc <hello@nearprotocol.com>"]
-rust-version = "1.68.2"
+rust-version = "1.69.0"

runtime/near-vm-runner/src/near_vm_runner.rs

@@ -237,7 +237,7 @@ impl NearVmConfig {
 //  major version << 6
 //  minor version
 const VM_CONFIG: NearVmConfig = NearVmConfig {
-    seed: (2 << 10) | (0 << 6) | 0,
+    seed: (2 << 10) | (1 << 6) | 0,
     engine: NearVmEngine::Universal,
     compiler: NearVmCompiler::Singlepass,
 };

runtime/near-vm-runner/src/tests/cache.rs

@@ -124,13 +124,13 @@ fn test_wasmer2_artifact_output_stability() {
     ];
     let mut got_prepared_hashes = Vec::with_capacity(seeds.len());
     let compiled_hashes = [
-        5254981150840481178,
-        15529260255496677612,
-        407257192602619216,
-        10913823971520273759,
-        17423008210698923502,
-        7011050181604188333,
-        15514788595649734538,
+        16241863964906842660,
+        9891733092817574479,
+        10697830987582926315,
+        8841851979868162585,
+        10549554738494211661,
+        11197084127324548219,
+        6788687979647989853,
     ];
     let mut got_compiled_hashes = Vec::with_capacity(seeds.len());
     for seed in seeds {
@@ -197,13 +197,13 @@ fn test_near_vm_artifact_output_stability() {
     ];
     let mut got_prepared_hashes = Vec::with_capacity(seeds.len());
     let compiled_hashes = [
-        10351663297260604629,
-        13937571770370186345,
-        9438649787181538636,
-        17513376043726020657,
-        8030854424152836681,
-        8449792361847063954,
-        2655860096455618118,
+        13406898264102036990,
+        357008982248812492,
+        10171838574337806556,
+        8933666767302544249,
+        9580084654030896497,
+        6856335382562175488,
+        17700820009951734912,
     ];
     let mut got_compiled_hashes = Vec::with_capacity(seeds.len());
     for seed in seeds {

runtime/near-vm-runner/src/wasmer2_runner.rs

@@ -233,7 +233,7 @@ impl Wasmer2Config {
 //  major version << 6
 //  minor version
 const WASMER2_CONFIG: Wasmer2Config = Wasmer2Config {
-    seed: (1 << 10) | (9 << 6) | 0,
+    seed: (1 << 10) | (10 << 6) | 0,
     engine: WasmerEngine::Universal,
     compiler: WasmerCompiler::Singlepass,
 };

runtime/near-vm/tests/lib/compiler-test-derive/src/lib.rs

@@ -1,15 +1,7 @@
-#[cfg(not(test))]
-extern crate proc_macro;
-#[cfg(not(test))]
 use proc_macro::TokenStream;
-#[cfg(test)]
-use proc_macro2::TokenStream;
 use quote::quote;
 use std::path::PathBuf;
-#[cfg(not(test))]
 use syn::parse;
-#[cfg(test)]
-use syn::parse2 as parse;
 use syn::*;
 
 mod ignores;
@@ -132,6 +124,3 @@ pub fn compiler_test(attrs: TokenStream, input: TokenStream) -> TokenStream {
     };
     x.into()
 }
-
-#[cfg(test)]
-mod tests;

runtime/runtime-params-estimator/emu-cost/Dockerfile

@@ -1,5 +1,5 @@
 # our local base image
-FROM rust:1.68.2
+FROM rust:1.69.0
 
 LABEL description="Container for builds"
 

rust-toolchain.toml

@@ -2,6 +2,6 @@
 # This specifies the version of Rust we use to build.
 # Individual crates in the workspace may support a lower version, as indicated by `rust-version` field in each crate's `Cargo.toml`.
 # The version specified below, should be at least as high as the maximum `rust-version` within the workspace.
-channel = "1.68.2"
+channel = "1.69.0"
 components = [ "rustfmt" ]
 targets = [ "wasm32-unknown-unknown" ]