feat: update rust to 1.93 and improve code structure with new lints (#109)

aleksuss · web-flow · commit 5e64e2071360 · 2026-03-02T15:30:33.000Z
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,7 +2,7 @@
 version = "0.1.0"
 authors = ["Aurora Labs <hello@aurora.dev>"]
 edition = "2024"
-rust-version = "1.86.0"
+rust-version = "1.93.0"
 homepage = "https://github.com/aurora-is-near/aurora-cli-rs"
 repository = "https://github.com/aurora-is-near/aurora-cli-rs"
 readme = "README.md"
@@ -14,6 +14,14 @@ members = [
     "sdk"
 ]
 
+[workspace.lints.clippy]
+all = { level = "deny", priority = -1 }
+pedantic = { level = "deny", priority = -1 }
+nursery = { level = "deny", priority = -1 }
+missing_errors_doc = "allow"
+missing_panics_doc = "allow"
+result_large_err = "allow" # TODO: Remove this when we have better error types in place
+
 [workspace.dependencies]
 anyhow = "1"
 aurora-engine-precompiles = { version = "2", features = ["std"] }
@@ -45,4 +53,4 @@ serde_json = "1"
 shadow-rs = "1"
 thiserror = "2"
 tokio = { version = "1", features = ["full"] }
-toml = "0.9"
+toml = "1"
diff --git a/README.md b/README.md
@@ -10,13 +10,13 @@
 <br />
 
 [![CI](https://github.com/aurora-is-near/aurora-cli-rs/actions/workflows/rust.yml/badge.svg?branch=main)](https://github.com/aurora-is-near/aurora-cli-rs/actions/workflows/rust.yml)
-![rust 1.70.0+ required](https://img.shields.io/badge/rust-1.70.0+-blue.svg?label=MSRV)
+![rust 1.93.0+ required](https://img.shields.io/badge/rust-1.93.0+-blue.svg?label=MSRV)
 
 ## What is Engine?
 
 [Aurora](https://doc.aurora.dev/getting-started/aurora-engine/) is an Ethereum Virtual Machine (EVM)
-project built on the NEAR Protocol, that provides a solution for developers to deploy their apps
-on an Ethereum-compatible, high-throughput, scalable and future-safe platform, with low transaction costs
+project built on the NEAR Protocol that provides a solution for developers to deploy their apps
+on an Ethereum-compatible, high-throughput, scalable, and future-safe platform, with low transaction costs
 for their users. Engine is the Aurora's implementation for it.
 
 ## What is Aurora CLI?
@@ -51,7 +51,7 @@ smart contract and will be interacting with it.
 
 ### **Requirements**
 
-- Rust 1.75.0 or newer
+- Rust 1.93.0 or newer
 - Python3
 
 First what we need to do is to install `aurora-cli`:
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -17,6 +17,9 @@ path = "src/lib.rs"
 name = "aurora-cli"
 path = "src/main.rs"
 
+[lints]
+workspace = true
+
 [features]
 default = ["simple"]
 simple = ["toml"]
diff --git a/cli/src/cli/advanced/aurora.rs b/cli/src/cli/advanced/aurora.rs
@@ -3,7 +3,8 @@ use aurora_engine_types::types::Address;
 use aurora_engine_types::{U256, types::Wei};
 use clap::Subcommand;
 
-use crate::{client::AuroraClient, config::Config, utils};
+use crate::cli::advanced::Config;
+use crate::{client::AuroraClient, utils};
 
 #[derive(Subcommand)]
 pub enum Command {
diff --git a/cli/src/cli/advanced/config.rs b/cli/src/cli/advanced/config.rs
@@ -1,5 +1,4 @@
 use serde::{Deserialize, Serialize};
-#[cfg(feature = "advanced")]
 use std::path::Path;
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
@@ -11,7 +10,6 @@ pub struct Config {
     pub evm_secret_key: Option<String>,
 }
 
-#[cfg(feature = "advanced")]
 impl Config {
     pub fn from_file<P: AsRef<Path>>(path: P) -> anyhow::Result<Self> {
         std::fs::File::open(path)
diff --git a/cli/src/cli/advanced/mod.rs b/cli/src/cli/advanced/mod.rs
@@ -1,8 +1,9 @@
 use clap::{Parser, Subcommand};
 
-use crate::config::{Config, Network};
+use crate::cli::advanced::config::{Config, Network};
 
 pub mod aurora;
+pub mod config;
 pub mod erc20;
 pub mod near;
 pub mod process_tx_data;
diff --git a/cli/src/cli/advanced/near.rs b/cli/src/cli/advanced/near.rs
@@ -1,7 +1,3 @@
-use crate::{
-    config::{Config, Network},
-    utils,
-};
 use aurora_engine_types::borsh::BorshDeserialize;
 use aurora_engine_types::parameters::connector::PauseEthConnectorArgs;
 use aurora_engine_types::parameters::engine::{
@@ -24,6 +20,9 @@ use near_primitives::{
 };
 use std::{path::Path, str::FromStr};
 
+use crate::cli::advanced::{Config, Network};
+use crate::utils;
+
 /// Chain ID for Aurora localnet, per the documentation on
 /// <https://doc.aurora.dev/getting-started/network-endpoints>
 #[allow(clippy::unreadable_literal)]
@@ -252,6 +251,7 @@ pub enum InitCommand {
     },
 }
 
+#[allow(clippy::too_many_lines)]
 pub async fn execute_command(
     command: Command,
     client: &NearClient,
@@ -638,7 +638,7 @@ pub async fn execute_command(
                 key_file
                     .write_to_file(&key_path)
                     .expect("Failed to write Aurora access key file");
-                println!("Aurora access key written to {key_path:?}");
+                println!("Aurora access key written to {}", key_path.display());
             }
             InitCommand::LocalConfig {
                 nearcore_config_path,
diff --git a/cli/src/cli/advanced/solidity.rs b/cli/src/cli/advanced/solidity.rs
@@ -87,7 +87,7 @@ impl Solidity {
     }
 }
 
-fn read_arg(arg: Option<&str>, stdin_arg: Option<bool>) -> Cow<str> {
+fn read_arg(arg: Option<&str>, stdin_arg: Option<bool>) -> Cow<'_, str> {
     arg.map_or_else(
         || match stdin_arg {
             Some(true) => {
diff --git a/cli/src/cli/simple/command/silo.rs b/cli/src/cli/simple/command/silo.rs
@@ -205,7 +205,7 @@ impl Display for FixedGas {
         let value = self
             .0
             .fixed_gas
-            .map_or("none".to_string(), |cost| cost.to_string());
+            .map_or_else(|| "none".to_string(), |cost| cost.to_string());
         f.write_str(&value)
     }
 }
diff --git a/cli/src/cli/simple/mod.rs b/cli/src/cli/simple/mod.rs
@@ -461,6 +461,7 @@ impl FromStr for WithdrawSerialization {
     }
 }
 
+#[allow(clippy::too_many_lines)]
 pub async fn run(args: Cli) -> anyhow::Result<()> {
     let near_rpc = parse_near_rpc(&args.network)?;
     let client = crate::client::Client::new(&near_rpc, &args.engine, args.near_key_path);
diff --git a/cli/src/client/aurora.rs b/cli/src/client/aurora.rs
@@ -25,6 +25,7 @@ pub struct AuroraClient {
 
 impl AuroraClient {
     #[allow(clippy::used_underscore_binding)]
+    #[must_use]
     pub fn new(url: &str, near_url: &str, engine_account: &str) -> Self {
         let inner = reqwest::Client::new();
         Self {
diff --git a/cli/src/client/mod.rs b/cli/src/client/mod.rs
@@ -35,6 +35,7 @@ pub struct Context {
 
 #[cfg(feature = "simple")]
 impl Context {
+    #[must_use]
     pub const fn new(
         client: Client,
         output_format: OutputFormat,
@@ -59,6 +60,7 @@ pub struct Client {
 
 #[cfg(feature = "simple")]
 impl Client {
+    #[must_use]
     pub fn new(near_rpc: &str, engine_account: &str, signer_key_path: Option<String>) -> Self {
         Self {
             near_rpc: near_rpc.to_string(),
@@ -67,6 +69,7 @@ impl Client {
         }
     }
 
+    #[must_use]
     pub fn near(&self) -> NearClient {
         NearClient::new(
             &self.near_rpc,
diff --git a/cli/src/client/near.rs b/cli/src/client/near.rs
@@ -641,6 +641,7 @@ impl NearClient {
     }
 
     #[cfg(feature = "simple")]
+    #[must_use]
     pub fn with_engine_account_id(self, account_id: &AccountId) -> Self {
         Self {
             engine_account_id: account_id.to_owned(),
@@ -650,6 +651,7 @@ impl NearClient {
 
     #[cfg(feature = "simple")]
     #[allow(dead_code)]
+    #[must_use]
     pub fn with_signer(self, signer_key_path: Option<String>) -> Self {
         Self {
             signer_key_path,
diff --git a/cli/src/eth_method.rs b/cli/src/eth_method.rs
@@ -13,6 +13,7 @@ pub enum EthMethod {
 }
 
 impl EthMethod {
+    #[must_use]
     pub const fn name(&self) -> &str {
         match &self {
             Self::GetChainId => "net_version",
@@ -26,6 +27,7 @@ impl EthMethod {
         }
     }
 
+    #[must_use]
     pub fn params(&self) -> Vec<String> {
         match &self {
             Self::GetChainId => Vec::new(),
diff --git a/cli/src/lib.rs b/cli/src/lib.rs
@@ -1,6 +1,5 @@
 pub mod cli;
 pub mod client;
-pub mod config;
 #[cfg(feature = "advanced")]
 pub mod eth_method;
 #[cfg(feature = "advanced")]
diff --git a/cli/src/main.rs b/cli/src/main.rs
@@ -1,15 +1,7 @@
-#![deny(clippy::all, clippy::pedantic, clippy::nursery)]
-#![allow(
-    clippy::too_many_lines,
-    clippy::module_name_repetitions,
-    clippy::needless_raw_string_hashes
-)]
-
 use clap::Parser;
 
 mod cli;
 mod client;
-mod config;
 #[cfg(feature = "advanced")]
 mod eth_method;
 #[cfg(feature = "advanced")]
diff --git a/cli/src/transaction_reader/aggregator.rs b/cli/src/transaction_reader/aggregator.rs
@@ -308,6 +308,7 @@ impl Aggregator for GasComparison {
     }
 }
 
+#[allow(dead_code)]
 pub struct Pair<A1: Aggregator, A2: Aggregator> {
     a1: Option<A1>,
     a2: Option<A2>,
diff --git a/cli/src/transaction_reader/filter.rs b/cli/src/transaction_reader/filter.rs
@@ -40,6 +40,7 @@ impl Filter for MinNearGasUsed {
     }
 }
 
+#[allow(dead_code)]
 pub struct MaxNearGasUsed(pub u128);
 
 impl Filter for MaxNearGasUsed {
@@ -50,6 +51,7 @@ impl Filter for MaxNearGasUsed {
     }
 }
 
+#[allow(dead_code)]
 pub struct MinEvmGasUsed(pub u64);
 
 impl Filter for MinEvmGasUsed {
@@ -61,6 +63,7 @@ impl Filter for MinEvmGasUsed {
     }
 }
 
+#[allow(dead_code)]
 pub struct MaxEvmGasUsed(pub u64);
 
 impl Filter for MaxEvmGasUsed {
diff --git a/cli/src/transaction_reader/mod.rs b/cli/src/transaction_reader/mod.rs
@@ -26,6 +26,7 @@ pub struct TxData {
 }
 
 impl TxData {
+    #[must_use]
     pub fn from_value(value: &Value) -> Option<Self> {
         let status = get_tx_status(value)?;
         let gas_profile = get_gas_profile(value)?;
diff --git a/cli/src/utils/mod.rs b/cli/src/utils/mod.rs
@@ -35,6 +35,7 @@ pub fn secret_key_from_hex(key: &str) -> anyhow::Result<SecretKey> {
         .map_err(|e| anyhow::anyhow!("Couldn't create secret key from hex: {e}"))
 }
 
+#[must_use]
 pub fn sign_transaction(
     tx: TransactionLegacy,
     chain_id: u64,
@@ -124,6 +125,7 @@ struct KeyFileWithoutPublicKey {
 /// Converts NEAR into yocto. 1NEAR == 10^24 yocto.
 #[cfg(feature = "simple")]
 #[allow(clippy::cast_possible_truncation, clippy::cast_sign_loss)]
+#[must_use]
 pub fn near_to_yocto(near: f64) -> u128 {
     (near * 1_000_000.0) as u128 * 1_000_000_000_000_000_000
 }
diff --git a/rust-toolchain b/rust-toolchain
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.86.0"
+channel = "1.93.0"
 components = [ "clippy", "rustfmt" ]
diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml
@@ -9,6 +9,9 @@ homepage.workspace = true
 repository.workspace = true
 readme.workspace = true
 
+[lints]
+workspace = true
+
 [dependencies]
 anyhow.workspace = true
 aurora-engine-types = { workspace = true, features = ["std", "impl-serde"] }
diff --git a/sdk/src/aurora/contract/mod.rs b/sdk/src/aurora/contract/mod.rs
@@ -1,3 +1,4 @@
+use aurora_engine_types::parameters::engine::SubmitResult;
 use aurora_engine_types::types::{Address, EthGas};
 use borsh::BorshDeserialize;
 use near_primitives::types::AccountId;
@@ -16,6 +17,12 @@ impl ContractMethodResponse for () {
     }
 }
 
+impl ContractMethodResponse for SubmitResult {
+    fn parse(rsp: Vec<u8>) -> Result<Self, Error> {
+        Self::try_from_slice(&rsp).map_err(Into::into)
+    }
+}
+
 impl ContractMethodResponse for AccountId {
     fn parse(rsp: Vec<u8>) -> Result<Self, Error> {
         Self::try_from_slice(&rsp).map_err(Into::into)
diff --git a/sdk/src/aurora/contract/write.rs b/sdk/src/aurora/contract/write.rs
@@ -1,15 +1,14 @@
-use std::io;
-
 use aurora_engine_types::{
     parameters::{
         connector::{
             MirrorErc20TokenArgs, SetErc20MetadataArgs, SetEthConnectorContractAccountArgs,
         },
-        engine::DeployErc20TokenArgs,
+        engine::{DeployErc20TokenArgs, SubmitArgs, SubmitResult},
         silo::{FixedGasArgs, SiloParamsArgs, WhitelistArgs, WhitelistStatusArgs},
     },
     types::Address,
 };
+use std::io;
 
 use crate::ContractMethod as ContractMethodDerive;
 use crate::aurora::{ContractMethod, error::Error};
@@ -89,6 +88,13 @@ pub struct SetWhitelistStatus {
     pub args: WhitelistStatusArgs,
 }
 
+#[derive(ContractMethodDerive)]
+#[contract_method(method = "submit_with_args", response = SubmitResult)]
+pub struct SubmitWithArgs {
+    #[contract_param(serialize_as = "borsh")]
+    pub args: SubmitArgs,
+}
+
 pub struct DeployERC20 {
     pub args: DeployErc20TokenArgs,
 }
@@ -100,7 +106,7 @@ impl ContractMethod for DeployERC20 {
         "deploy_erc20_token"
     }
 
-    fn params(&self) -> Result<Vec<u8>, std::io::Error> {
+    fn params(&self) -> Result<Vec<u8>, io::Error> {
         borsh::to_vec(&self.args)
     }
 
diff --git a/sdk/src/aurora/mod.rs b/sdk/src/aurora/mod.rs
diff --git a/sdk/src/lib.rs b/sdk/src/lib.rs
diff --git a/sdk/src/near/client.rs b/sdk/src/near/client.rs
diff --git a/sdk/src/near/operations.rs b/sdk/src/near/operations.rs

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ impl Solidity {`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`
`90`		`-fn read_arg(arg: Option<&str>, stdin_arg: Option<bool>) -> Cow<str> {`
	`90`	`+fn read_arg(arg: Option<&str>, stdin_arg: Option<bool>) -> Cow<'_, str> {`
`91`	`91`	`arg.map_or_else(`
`92`	`92`	`\|\| match stdin_arg {`
`93`	`93`	`Some(true) => {`
Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ impl Display for FixedGas {`
`205`	`205`	`let value = self`
`206`	`206`	`.0`
`207`	`207`	`.fixed_gas`
`208`		`- .map_or("none".to_string(), \|cost\| cost.to_string());`
	`208`	`+ .map_or_else(\|\| "none".to_string(), \|cost\| cost.to_string());`
`209`	`209`	`f.write_str(&value)`
`210`	`210`	`}`
`211`	`211`	`}`