apply fmt and clippy

Author: zargarzadehm

core/Cargo.toml

@@ -14,40 +14,37 @@ edition = "2021"
 
 [dependencies]
 yaml-rust = "0.4.4"
-reqwest = { version = "0.11", features = ["blocking"] }
-url = { version = "2.2", features = ["serde"] }
-serde = { version = "1.0", features = ["derive"] }
-serde_yaml = "0.9"
+reqwest = { version = "0.11.27", features = ["blocking"] }
+url = { version = "2.5.4", features = ["serde"] }
+serde = { version = "1.0.219", features = ["derive"] }
+serde_yaml = "0.9.27"
 json = "0.12.4"
-serde_json = "1.0.57"
-thiserror = "1.0.20"
-anyhow = "1.0.32"
+serde_json = "1.0.140"
+thiserror = "1.0.69"
+anyhow = "1.0.97"
 base16 = "0.2.1"
-base64 = "0.13.0"
-log = "0.4.11"
-log-panics = "2.0.0"
-log4rs = "1.2.0"
-crossbeam = "0.8"
-tokio = { version = "1", features = ["full"] }
-tower-http = { version = "0.3.0", features = ["cors"] }
-axum = "0.6"
+base64 = "0.13.1"
+log = "0.4.27"
+log-panics = "2.1.0"
+log4rs = "1.3.0"
+crossbeam = "0.8.4"
+tokio = { version = "1.44.1", features = ["full"] }
+tower-http = { version = "0.3.5", features = ["cors"] }
+axum = "0.6.20"
 ergo-lib = { workspace = true }
 ergo-node-interface = { version = "0.5.0" }
-derive_more = "0.99"
-clap = { version = "4.2.4", features = ["derive"] }
+derive_more = "0.99.19"
+clap = { version = "4.5.35", features = ["derive"] }
 exitcode = "1.1.2"
-lazy_static = "1.4.0"
-once_cell = "1.15.0"
-futures = "0.3"
-prometheus = "0.13"
+lazy_static = "1.5.0"
+once_cell = "1.21.3"
+futures = "0.3.31"
+prometheus = "0.13.4"
 
 [dev-dependencies]
 ergo-lib = { workspace = true, features = ["arbitrary"] }
 proptest = { version = "1.0.0" }
-proptest-derive = { version = "0.3.0" }
 sigma-test-util = { version = "0.3.0" }
 ergo-chain-sim = { version = "0.1.0", path = "../ergo-chain-sim" }
-env_logger = { version = "0.10.0" }
-tokio-test = { version = "0.4" }
-pretty_assertions = { workspace = true }
-expect-test = "1.0.1"
+env_logger = { version = "0.10.2" }
+tokio-test = { version = "0.4.4" }

core/src/cli_commands/vote_update_pool.rs

@@ -72,12 +72,11 @@ pub fn vote_update_pool(
     let change_network_address = ORACLE_CONFIG.get_change_address().clone();
     let network_prefix = change_network_address.network();
     let new_pool_box_address_hash = Digest32::try_from(new_pool_box_address_hash_str)?;
-    let ballot_token_owner =
-        if let Address::P2Pk(ballot_token_owner) = oracle_address.address() {
-            ballot_token_owner.h
-        } else {
-            return Err(VoteUpdatePoolError::IncorrectBallotTokenOwnerAddress.into());
-        };
+    let ballot_token_owner = if let Address::P2Pk(ballot_token_owner) = oracle_address.address() {
+        ballot_token_owner.h
+    } else {
+        return Err(VoteUpdatePoolError::IncorrectBallotTokenOwnerAddress.into());
+    };
     let context = if let Some(local_ballot_box) = local_ballot_box_source.get_ballot_box()? {
         log::debug!("Found local ballot box");
         // Note: the ballot box contains the ballot token, but the box is guarded by the contract,

core/src/oracle_config.rs

@@ -5,27 +5,23 @@ use std::{
 };
 
 use anyhow::Context;
+use ergo_lib::ergotree_ir::chain::address::NetworkPrefix;
 use ergo_lib::wallet::ext_secret_key::ExtSecretKey;
 use ergo_lib::wallet::mnemonic::Mnemonic;
 use ergo_lib::wallet::secret_key::SecretKey;
 use ergo_lib::{
     ergotree_ir::chain::address::NetworkAddress,
     ergotree_ir::{
-        chain::{
-            address::{Address},
-            ergo_box::box_value::BoxValue,
-        },
+        chain::{address::Address, ergo_box::box_value::BoxValue},
         sigma_protocol::sigma_boolean::ProveDlog,
     },
     wallet::tx_builder::{self, SUGGESTED_TX_FEE},
 };
-use ergo_lib::ergotree_ir::chain::address::NetworkPrefix;
 use log::LevelFilter;
 use once_cell::sync;
 use reqwest::Url;
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
-use base16;
 
 use crate::explorer_api::explorer_url::default_explorer_api_url;
 
@@ -70,9 +66,8 @@ impl OracleConfig {
 
     /// Returns network prefix (mainnet/testnet) from config
     pub fn get_network_prefix(&self) -> NetworkPrefix {
-        self.network_prefix.unwrap_or_else(|| {
-            Self::network_prefix(&self.oracle_network).unwrap()
-        })
+        self.network_prefix
+            .unwrap_or_else(|| Self::network_prefix(&self.oracle_network).unwrap())
     }
 
     /// Sets oracle address for testing purposes only
@@ -99,9 +94,10 @@ impl OracleConfig {
     fn set_mnemonic_secret(&mut self) -> Result<(), OracleConfigFileError> {
         // Try environment variable ORACLE_WALLET_SECRET
         if let Ok(secret) = std::env::var("ORACLE_WALLET_SECRET") {
-            let secret_bytes = base16::decode(&secret)
-                .map_err(|e| OracleConfigFileError::MnemonicError(format!("Invalid hex format: {}", e)))?;
-            
+            let secret_bytes = base16::decode(&secret).map_err(|e| {
+                OracleConfigFileError::MnemonicError(format!("Invalid hex format: {}", e))
+            })?;
+
             if let Ok(secret_key) = SecretKey::from_bytes(&secret_bytes) {
                 self.oracle_secret_key = Some(secret_key);
                 return Ok(());
@@ -110,9 +106,10 @@ impl OracleConfig {
 
         // Try config's oracle_secret
         if let Some(secret) = &self.oracle_secret {
-            let secret_bytes = base16::decode(secret)
-                .map_err(|e| OracleConfigFileError::MnemonicError(format!("Invalid hex format in config: {}", e)))?;
-            
+            let secret_bytes = base16::decode(secret).map_err(|e| {
+                OracleConfigFileError::MnemonicError(format!("Invalid hex format in config: {}", e))
+            })?;
+
             if let Ok(secret_key) = SecretKey::from_bytes(&secret_bytes) {
                 self.oracle_secret_key = Some(secret_key);
                 return Ok(());
@@ -138,14 +135,18 @@ impl OracleConfig {
         Err(OracleConfigFileError::MissingMnemonicSecret)
     }
 
-    fn derive_secret_from_mnemonic(&self, mnemonic: &str) -> Result<SecretKey, OracleConfigFileError> {
+    fn derive_secret_from_mnemonic(
+        &self,
+        mnemonic: &str,
+    ) -> Result<SecretKey, OracleConfigFileError> {
         let seed = Mnemonic::to_seed(mnemonic, "");
         let ext_sk = ExtSecretKey::derive_master(seed)
             .map_err(|e| OracleConfigFileError::MnemonicError(e.to_string()))?;
 
         // bip-32 path for the first key
         let path = "m/44'/429'/0'/0/0";
-        let secret_key = ext_sk.derive(path.parse().unwrap())
+        let secret_key = ext_sk
+            .derive(path.parse().unwrap())
             .map_err(|e| OracleConfigFileError::MnemonicError(e.to_string()))?
             .secret_key();
 
@@ -158,9 +159,16 @@ impl OracleConfig {
         let network_prefix = self.get_network_prefix();
         let oracle_address = NetworkAddress::new(
             network_prefix,
-            &self.oracle_secret_key.clone().unwrap().get_address_from_public_image(),
+            &self
+                .oracle_secret_key
+                .clone()
+                .unwrap()
+                .get_address_from_public_image(),
+        );
+        log::info!(
+            "Oracle Address derived from secret: {}",
+            oracle_address.to_base58()
         );
-        log::info!("Oracle Address derived from secret: {}", oracle_address.to_base58());
         Ok(oracle_address)
     }
 
@@ -175,15 +183,19 @@ impl OracleConfig {
         ))?;
         let mut config =
             Self::load_from_str(&config_str).context("failed to parse oracle config file")?;
-        
+
         // Set network prefix
-        config.network_prefix = Some(Self::network_prefix(&config.oracle_network)
-            .context("failed to parse network prefix")?);
+        config.network_prefix = Some(
+            Self::network_prefix(&config.oracle_network)
+                .context("failed to parse network prefix")?,
+        );
 
         // Derive oracle address from mnemonic
-        config.oracle_address = Some(config
-                                         .derive_oracle_address()
-                                         .context("failed to derive oracle address from mnemonic")?);
+        config.oracle_address = Some(
+            config
+                .derive_oracle_address()
+                .context("failed to derive oracle address from mnemonic")?,
+        );
 
         if config.change_address.is_none() {
             config.change_address = Some(config.oracle_address.clone().unwrap());

rust-toolchain

@@ -1 +1 @@
-1.81.0
+1.82.0