From f575d03bec5d2719a1bf80cb5759c4517e3ede5e Mon Sep 17 00:00:00 2001 From: Tiago Carvalho Date: Wed, 28 Feb 2024 13:11:08 +0000 Subject: [PATCH 1/3] Downgrade nightly toolchain to `2024-02-10` --- rust-nightly-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-nightly-version b/rust-nightly-version index 99d5905d98..2dbd8cea78 100644 --- a/rust-nightly-version +++ b/rust-nightly-version @@ -1 +1 @@ -nightly-2024-02-20 +nightly-2024-02-10 From c033f2afa53237647af51bf9b2b9bbc0da39dedd Mon Sep 17 00:00:00 2001 From: Tiago Carvalho Date: Wed, 28 Feb 2024 13:11:35 +0000 Subject: [PATCH 2/3] Appease clippy --- crates/apps/src/lib/client/utils.rs | 6 ++---- crates/tests/src/vm_host_env/tx.rs | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/crates/apps/src/lib/client/utils.rs b/crates/apps/src/lib/client/utils.rs index 07643104f1..24a9591098 100644 --- a/crates/apps/src/lib/client/utils.rs +++ b/crates/apps/src/lib/client/utils.rs @@ -236,9 +236,6 @@ pub async fn join_network( }); // Try to find validator data when using a pre-genesis validator - let validator_alias = validator_alias_and_pre_genesis_wallet - .as_ref() - .map(|(alias, _wallet)| alias.clone()); let validator_keys = validator_alias_and_pre_genesis_wallet.as_ref().map( |(_alias, wallet)| { let tendermint_node_key: common::SecretKey = @@ -247,7 +244,8 @@ pub async fn join_network( (tendermint_node_key, consensus_key) }, ); - let node_mode = if validator_alias.is_some() { + let is_validator = validator_alias_and_pre_genesis_wallet.is_some(); + let node_mode = if is_validator { TendermintMode::Validator } else { TendermintMode::Full diff --git a/crates/tests/src/vm_host_env/tx.rs b/crates/tests/src/vm_host_env/tx.rs index 3f67644fb2..7ef5a5e418 100644 --- a/crates/tests/src/vm_host_env/tx.rs +++ b/crates/tests/src/vm_host_env/tx.rs @@ -28,9 +28,8 @@ use crate::vp::TestVpEnv; static mut CTX: Ctx = unsafe { Ctx::new() }; /// Tx execution context provides access to host env functions -#[allow(static_mut_refs)] pub fn ctx() -> &'static mut Ctx { - unsafe { &mut CTX } + unsafe { &mut *std::ptr::addr_of_mut!(CTX) } } /// This module combines the native host function implementations from From 6c5f43eb3776eec37dd4f0fed2252dffb6de81bb Mon Sep 17 00:00:00 2001 From: Tiago Carvalho Date: Wed, 28 Feb 2024 13:21:17 +0000 Subject: [PATCH 3/3] Changelog for #2761 --- .../unreleased/bug-fixes/2761-downgrade-nightly-toolchain.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .changelog/unreleased/bug-fixes/2761-downgrade-nightly-toolchain.md diff --git a/.changelog/unreleased/bug-fixes/2761-downgrade-nightly-toolchain.md b/.changelog/unreleased/bug-fixes/2761-downgrade-nightly-toolchain.md new file mode 100644 index 0000000000..7f1dc4a486 --- /dev/null +++ b/.changelog/unreleased/bug-fixes/2761-downgrade-nightly-toolchain.md @@ -0,0 +1,2 @@ +- Downgrade nightly toolchain to `2024-02-10`. + ([\#2761](https://github.com/anoma/namada/pull/2761))