enchantments

eigerco · Feb 18, 2025 · 342e5d4 · 342e5d4
1 parent 4386735
commit 342e5d4
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 12 deletions.
diff --git a/ampd/src/aleo/http_client.rs b/ampd/src/aleo/http_client.rs
@@ -7,7 +7,7 @@ use aleo_utils::block_processor::IdValuePair;
 use aleo_utils::json_like;
 use aleo_utils::string_encoder::StringEncoder;
 use async_trait::async_trait;
-use error_stack::{ensure, report, Report, Result, ResultExt};
+use error_stack::{ensure, Report, Result, ResultExt};
 use mockall::automock;
 use router_api::ChainName;
 use serde::{Deserialize, Serialize};
@@ -20,8 +20,6 @@ use crate::url::Url;
 
 #[derive(Error, Debug)]
 pub enum Error {
-    #[error("failed to create client")]
-    Client,
     #[error("Request error")]
     Request,
     #[error("Transaction '{0}' not found")]

diff --git a/ampd/src/handlers/aleo_verify_msg.rs b/ampd/src/handlers/aleo_verify_msg.rs
@@ -1,5 +1,4 @@
 use std::collections::{HashMap, HashSet};
-use std::str::FromStr;
 
 use aleo_types::address::Address as AleoAddress;
 use aleo_types::transition::Transition;
@@ -63,6 +62,7 @@ where
     pub fn new(
         verifier: TMAddress,
         voting_verifier_contract: TMAddress,
+        chain: ChainName,
         aleo_client: C,
         latest_block_height: Receiver<u64>,
         gateway_contract: String,
@@ -72,7 +72,7 @@ where
             voting_verifier_contract,
             http_client: aleo_client,
             latest_block_height,
-            chain: ChainName::from_str("aleo-2").unwrap(),
+            chain,
             gateway_contract,
         }
     }

diff --git a/ampd/src/lib.rs b/ampd/src/lib.rs
@@ -244,6 +244,7 @@ where
                         handlers::aleo_verify_msg::Handler::new(
                             verifier.clone(),
                             cosmwasm_contract,
+                            chain.name,
                             client,
                             self.block_height_monitor.latest_block_height(),
                             gateway_contract,

diff --git a/contracts/multisig/src/signing.rs b/contracts/multisig/src/signing.rs
@@ -85,7 +85,7 @@ pub fn validate_session_signature(
                 )
             },
         )
-        .map_err(|e| ContractError::InvalidSignature {
+        .map_err(|_| ContractError::InvalidSignature {
             session_id: session.id,
             signer: signer.into(),
         })?;

diff --git a/contracts/voting-verifier/src/contract.rs b/contracts/voting-verifier/src/contract.rs
@@ -19,7 +19,6 @@ mod query;
 
 const CONTRACT_NAME: &str = env!("CARGO_PKG_NAME");
 const CONTRACT_VERSION: &str = env!("CARGO_PKG_VERSION");
-const BASE_VERSION: &str = "1.0.0";
 
 #[cfg_attr(not(feature = "library"), entry_point)]
 pub fn instantiate(

diff --git a/packages/aleo-gateway/src/payload_digest.rs b/packages/aleo-gateway/src/payload_digest.rs
@@ -1,6 +1,6 @@
 use aleo_types::address::Address;
 use error_stack::Report;
-use multisig::verifier_set::{self, VerifierSet};
+use multisig::verifier_set::VerifierSet;
 
 use crate::{AleoValue, Error};
 

diff --git a/packages/aleo-gateway/src/proof.rs b/packages/aleo-gateway/src/proof.rs
@@ -1,12 +1,9 @@
-use std::ptr::addr_of_mut;
-
 use aleo_types::address::Address;
 use error_stack::Report;
 use multisig::msg::SignerWithSig;
 use multisig::verifier_set::VerifierSet;
 
 use crate::raw_signature::RawSignature;
-use crate::weighted_signers::WeightedSigners;
 use crate::{AleoValue, Error};
 
 #[derive(Clone, Debug)]

diff --git a/packages/axelar-wasm-std/Cargo.toml b/packages/axelar-wasm-std/Cargo.toml
@@ -58,7 +58,7 @@ valuable = { version = "0.1.0", features = ["derive"] }
 assert_ok = { workspace = true }
 cw-multi-test = { workspace = true }
 goldie = { workspace = true }
-hex = { workspace = true, default-features = false }
+hex = { workspace = true }
 rand = { workspace = true }
 
 [lints]