Public commit record
40/100 · Thin
What the developer wrote
Authored by soralit
chore: run rust fmt
✓ Subject identifies a change✓ Uses a recognizable type or scope! No meaningful explanatory body
What changed, and why it matters
This commit is purely a code-style cleanup: it runs the Rust formatter (rustfmt) across 32 files. The changes only reformat whitespace, line breaks, import ordering, and similar stylistic details. No program logic, security checks, or behavior were changed.
Recommended action
No security action required. Treat as routine maintenance; standard code-review and CI checks are sufficient.
Security signals we found
No strong security signals were identified.
Evidence from the diff
The diff shows exclusively formatting changes produced by rustfmt. Examples include collapsing or expanding closure chains, reordering use statements, removing blank lines, and wrapping long function signatures. There are no functional modifications, no new code paths, no removed validations, and no changes to constants, algorithms, or error handling semantics.
Changed components
rust/apps/bitcoinrust/apps/ethereumrust/apps/monerorust/apps/nearrust/apps/solanarust/apps/stellarrust/keystorerust/zcash_vendorInspect captured patch +405 / −321
diff --git a/rust/apps/bitcoin/src/addresses/address.rs b/rust/apps/bitcoin/src/addresses/address.rs
index 2550829..52b767e 100644
--- a/rust/apps/bitcoin/src/addresses/address.rs
+++ b/rust/apps/bitcoin/src/addresses/address.rs
@@ -117,15 +117,15 @@ impl Address {
script::Builder::new()
.push_int(0)
.push_slice(pk.wpubkey_hash().map_err(|e| {
- BitcoinError::AddressError(format!(
- "invalid payload for p2shwpkh: {e}"
- ))
+ BitcoinError::AddressError(format!("invalid payload for p2shwpkh: {e}"))
})?);
let script_hash = builder.as_script().script_hash();
let payload = Payload::P2sh { script_hash };
Ok(Address { network, payload })
}
- _ => Err(BitcoinError::AddressError("Invalid network for p2wpkh".to_string())),
+ _ => Err(BitcoinError::AddressError(
+ "Invalid network for p2wpkh".to_string(),
+ )),
}
}
@@ -153,9 +153,8 @@ impl Address {
.first_opcode()
.expect("is_witness_program guarantees len > 4");
- let version = WitnessVersion::try_from(opcode).map_err(|e| {
- BitcoinError::AddressError(format!("invalid witness version: {e}"))
- })?;
+ let version = WitnessVersion::try_from(opcode)
+ .map_err(|e| BitcoinError::AddressError(format!("invalid witness version: {e}")))?;
let program = WitnessProgram::new(version, &script.as_bytes()[2..])?;
Ok(Address {
network,
@@ -164,7 +163,9 @@ impl Address {
},
})
} else {
- Err(BitcoinError::AddressError("unrecognized script".to_string()))
+ Err(BitcoinError::AddressError(
+ "unrecognized script".to_string(),
+ ))
}
}
@@ -338,56 +339,70 @@ impl FromStr for Address {
let (network, payload) = match data[0] {
PUBKEY_ADDRESS_PREFIX_BTC => {
- let pubkey_hash = PubkeyHash::from_slice(&data[1..])
- .map_err(|_| Self::Err::AddressError("failed to get pubkey hash".to_string()))?;
+ let pubkey_hash = PubkeyHash::from_slice(&data[1..]).map_err(|_| {
+ Self::Err::AddressError("failed to get pubkey hash".to_string())
+ })?;
(Network::Bitcoin, Payload::P2pkh { pubkey_hash })
}
PUBKEY_ADDRESS_PREFIX_TEST => {
- let pubkey_hash = PubkeyHash::from_slice(&data[1..])
- .map_err(|_| Self::Err::AddressError("failed to get pubkey hash".to_string()))?;
+ let pubkey_hash = PubkeyHash::from_slice(&data[1..]).map_err(|_| {
+ Self::Err::AddressError("failed to get pubkey hash".to_string())
+ })?;
(Network::BitcoinTestnet, Payload::P2pkh { pubkey_hash })
}
PUBKEY_ADDRESS_PREFIX_DASH => {
- let pubkey_hash = PubkeyHash::from_slice(&data[1..])
- .map_err(|_| Self::Err::AddressError("failed to get pubkey hash".to_string()))?;
+ let pubkey_hash = PubkeyHash::from_slice(&data[1..]).map_err(|_| {
+ Self::Err::AddressError("failed to get pubkey hash".to_string())
+ })?;
(Network::Dash, Payload::P2pkh { pubkey_hash })
}
PUBKEY_ADDRESS_PREFIX_DASH_P2SH => {
- let script_hash = ScriptHash::from_slice(&data[1..])
- .map_err(|_| Self::Err::AddressError("failed to get script hash".to_string()))?;
+ let script_hash = ScriptHash::from_slice(&data[1..]).map_err(|_| {
+ Self::Err::AddressError("failed to get script hash".to_string())
+ })?;
(Network::Dash, Payload::P2sh { script_hash })
}
SCRIPT_ADDRESS_PREFIX_LTC_P2PKH => {
- let pubkey_hash = PubkeyHash::from_slice(&data[1..])
- .map_err(|_| Self::Err::AddressError("failed to get pubkey hash".to_string()))?;
+ let pubkey_hash = PubkeyHash::from_slice(&data[1..]).map_err(|_| {
+ Self::Err::AddressError("failed to get pubkey hash".to_string())
+ })?;
(Network::Litecoin, Payload::P2pkh { pubkey_hash })
}
SCRIPT_ADDRESS_PREFIX_LTC => {
- let script_hash = ScriptHash::from_slice(&data[1..])
- .map_err(|_| Self::Err::AddressError("failed to get script hash".to_string()))?;
+ let script_hash = ScriptHash::from_slice(&data[1..]).map_err(|_| {
+ Self::Err::AddressError("failed to get script hash".to_string())
+ })?;
(Network::Litecoin, Payload::P2sh { script_hash })
}
SCRIPT_ADDRESS_PREFIX_BTC => {
- let script_hash = ScriptHash::from_slice(&data[1..])
- .map_err(|_| Self::Err::AddressError("failed to get script hash".to_string()))?;
+ let script_hash = ScriptHash::from_slice(&data[1..]).map_err(|_| {
+ Self::Err::AddressError("failed to get script hash".to_string())
+ })?;
(Network::Bitcoin, Payload::P2sh { script_hash })
}
SCRIPT_ADDRESS_PREFIX_TEST => {
- let script_hash = ScriptHash::from_slice(&data[1..])
- .map_err(|_| Self::Err::AddressError("failed to get script hash".to_string()))?;
+ let script_hash = ScriptHash::from_slice(&data[1..]).map_err(|_| {
+ Self::Err::AddressError("failed to get script hash".to_string())
+ })?;
(Network::BitcoinTestnet, Payload::P2sh { script_hash })
}
PUBKEY_ADDRESS_PREFIX_DOGE => {
- let pubkey_hash = PubkeyHash::from_slice(&data[1..])
- .map_err(|_| Self::Err::AddressError("failed to get pubkey hash".to_string()))?;
+ let pubkey_hash = PubkeyHash::from_slice(&data[1..]).map_err(|_| {
+ Self::Err::AddressError("failed to get pubkey hash".to_string())
+ })?;
(Network::Dogecoin, Payload::P2pkh { pubkey_hash })
}
SCRIPT_ADDRESS_PREFIX_DOGE => {
- let script_hash = ScriptHash::from_slice(&data[1..])
- .map_err(|_| Self::Err::AddressError("failed to get script hash".to_string()))?;
+ let script_hash = ScriptHash::from_slice(&data[1..]).map_err(|_| {
+ Self::Err::AddressError("failed to get script hash".to_string())
+ })?;
(Network::Dogecoin, Payload::P2sh { script_hash })
}
- _x => return Err(Self::Err::AddressError("invalid address version".to_string())),
+ _x => {
+ return Err(Self::Err::AddressError(
+ "invalid address version".to_string(),
+ ))
+ }
};
Ok(Address { network, payload })
diff --git a/rust/apps/bitcoin/src/addresses/cashaddr.rs b/rust/apps/bitcoin/src/addresses/cashaddr.rs
index b7b1681..6ccb897 100644
--- a/rust/apps/bitcoin/src/addresses/cashaddr.rs
+++ b/rust/apps/bitcoin/src/addresses/cashaddr.rs
@@ -5,13 +5,13 @@ use crate::addresses::constants::PUBKEY_ADDRESS_PREFIX_BCH;
use crate::errors::BitcoinError;
use crate::errors::Result;
use crate::network::Network;
+use alloc::format;
use alloc::string::{String, ToString};
use alloc::vec::Vec;
use bitcoin::address::AddressData as Payload;
use bitcoin::PubkeyHash;
use bitcoin_hashes::Hash;
use core::{fmt, str};
-use alloc::format;
// Prefixes
const DASH_PREFIX: &str = "bitcoincash";
@@ -346,7 +346,7 @@ impl CashAddrCodec {
#[cfg(test)]
mod tests {
use super::*;
-
+
use hex::ToHex;
#[test]
diff --git a/rust/apps/bitcoin/src/addresses/mod.rs b/rust/apps/bitcoin/src/addresses/mod.rs
index f82472a..ab24a94 100644
--- a/rust/apps/bitcoin/src/addresses/mod.rs
+++ b/rust/apps/bitcoin/src/addresses/mod.rs
@@ -21,9 +21,8 @@ use crate::errors::{BitcoinError, Result};
pub fn derive_public_key(xpub: &String, path: String) -> Result<PublicKey> {
let converted_xpub = convert_version(xpub, &Version::Xpub)
.map_err(|_| BitcoinError::AddressError(String::from("xpub is not valid")))?;
- let secp256k1_pubkey = secp256k1::derive_public_key(&converted_xpub, &path).map_err(|_| {
- BitcoinError::AddressError(format!("failed to derive public key {xpub:?}"))
- })?;
+ let secp256k1_pubkey = secp256k1::derive_public_key(&converted_xpub, &path)
+ .map_err(|_| BitcoinError::AddressError(format!("failed to derive public key {xpub:?}")))?;
PublicKey::from_slice(secp256k1_pubkey.serialize().as_slice())
.map_err(|e| BitcoinError::GetKeyError(e.to_string()))
}
diff --git a/rust/apps/bitcoin/src/lib.rs b/rust/apps/bitcoin/src/lib.rs
index 9a0035f..9e01144 100644
--- a/rust/apps/bitcoin/src/lib.rs
+++ b/rust/apps/bitcoin/src/lib.rs
@@ -128,7 +128,7 @@ fn deserialize_psbt(psbt_hex: Vec<u8>) -> Result<Psbt> {
#[cfg(test)]
mod test {
use alloc::vec::Vec;
-
+
use core::str::FromStr;
use app_utils::keystone;
diff --git a/rust/apps/bitcoin/src/multi_sig/address.rs b/rust/apps/bitcoin/src/multi_sig/address.rs
index 43820a1..73eca98 100644
--- a/rust/apps/bitcoin/src/multi_sig/address.rs
+++ b/rust/apps/bitcoin/src/multi_sig/address.rs
@@ -90,10 +90,7 @@ pub fn calculate_multi_address_with_network(
}
fn derive_pub_key(xpub: &String, change: u32, account: u32) -> Result<PublicKey, BitcoinError> {
- derive_public_key(
- xpub,
- format!("m/{change}/{account}"),
- )
+ derive_public_key(xpub, format!("m/{change}/{account}"))
}
fn crate_p2ms_script(pub_keys: &Vec<&PublicKey>, threshold: u32) -> ScriptBuf {
diff --git a/rust/apps/bitcoin/src/multi_sig/mod.rs b/rust/apps/bitcoin/src/multi_sig/mod.rs
index 9b8d69c..ca930c5 100644
--- a/rust/apps/bitcoin/src/multi_sig/mod.rs
+++ b/rust/apps/bitcoin/src/multi_sig/mod.rs
@@ -251,9 +251,7 @@ pub fn export_xpub_by_crypto_account(
)?)
}
_ => {
- return Err(URError::UrEncodeError(format!(
- "not supported path:{path}"
- )));
+ return Err(URError::UrEncodeError(format!("not supported path:{path}")));
}
}
}
diff --git a/rust/apps/bitcoin/src/multi_sig/wallet.rs b/rust/apps/bitcoin/src/multi_sig/wallet.rs
index a993326..2d57123 100644
--- a/rust/apps/bitcoin/src/multi_sig/wallet.rs
+++ b/rust/apps/bitcoin/src/multi_sig/wallet.rs
@@ -233,13 +233,17 @@ fn _parse_plain_wallet_config(content: &str) -> Result<MultiSigWalletConfig, Bit
for xpub_item in wallet.xpub_items.iter() {
let this_network = detect_network(&xpub_item.xpub);
if this_network == Network::TestNet {
- return Err(BitcoinError::MultiSigWalletParseError("we don't support testnet for multisig yet".to_string()));
+ return Err(BitcoinError::MultiSigWalletParseError(
+ "we don't support testnet for multisig yet".to_string(),
+ ));
}
if is_first {
wallet.network = this_network;
is_first = false;
} else if wallet.network != this_network {
- return Err(BitcoinError::MultiSigWalletParseError("xpub networks inconsistent".to_string()));
+ return Err(BitcoinError::MultiSigWalletParseError(
+ "xpub networks inconsistent".to_string(),
+ ));
}
}
@@ -380,7 +384,9 @@ fn process_xpub_and_xfp(
let result1 = xyzpub::convert_version(xpub_item.xpub.clone(), &Version::Xpub)?;
let result2 = xyzpub::convert_version(value, &Version::Xpub)?;
if result1.eq_ignore_ascii_case(&result2) {
- return Err(BitcoinError::MultiSigWalletParseError("found duplicated xpub".to_string()));
+ return Err(BitcoinError::MultiSigWalletParseError(
+ "found duplicated xpub".to_string(),
+ ));
}
}
wallet.xpub_items.push(MultiSigXPubItem {
@@ -543,9 +549,7 @@ pub fn strict_verify_wallet_config(
)?;
let true_xpub =
get_extended_public_key_by_seed(seed, true_derivation).map_err(|e| {
- BitcoinError::MultiSigWalletParseError(format!(
- "Unable to generate xpub, {e}"
- ))
+ BitcoinError::MultiSigWalletParseError(format!("Unable to generate xpub, {e}"))
})?;
let this_xpub = xyzpub::convert_version(&xpub_item.xpub, &Version::Xpub)?;
if !true_xpub.to_string().eq(&this_xpub) {
@@ -560,16 +564,15 @@ pub fn strict_verify_wallet_config(
#[cfg(test)]
mod tests {
-
use alloc::string::ToString;
use crate::multi_sig::wallet::{
- create_wallet, generate_config_data, is_valid_xyzpub,
- parse_bsms_wallet_config, parse_wallet_config, strict_verify_wallet_config,
+ create_wallet, generate_config_data, is_valid_xyzpub, parse_bsms_wallet_config,
+ parse_wallet_config, strict_verify_wallet_config,
};
use crate::multi_sig::{MultiSigXPubInfo, Network};
-
+
use hex;
use ur_registry::bytes::Bytes;
diff --git a/rust/apps/bitcoin/src/transactions/legacy/input.rs b/rust/apps/bitcoin/src/transactions/legacy/input.rs
index f2c39b8..e7fd7c7 100644
--- a/rust/apps/bitcoin/src/transactions/legacy/input.rs
+++ b/rust/apps/bitcoin/src/transactions/legacy/input.rs
@@ -130,9 +130,9 @@ impl TryFrom<Input> for TxIn {
type Error = BitcoinError;
fn try_from(value: protoc::Input) -> Result<Self> {
- let utxo = value
- .utxo
- .ok_or(BitcoinError::InvalidRawTxCryptoBytes("empty utxo".to_string()))?;
+ let utxo = value.utxo.ok_or(BitcoinError::InvalidRawTxCryptoBytes(
+ "empty utxo".to_string(),
+ ))?;
negative_check!("utxo value".to_string(), utxo.value)?;
let utxo_value = utxo.value as u64;
negative_check!("utxo index".to_string(), value.index)?;
diff --git a/rust/apps/bitcoin/src/transactions/legacy/mod.rs b/rust/apps/bitcoin/src/transactions/legacy/mod.rs
index 11e00ea..6471b25 100644
--- a/rust/apps/bitcoin/src/transactions/legacy/mod.rs
+++ b/rust/apps/bitcoin/src/transactions/legacy/mod.rs
@@ -20,14 +20,10 @@ pub fn sign_legacy_tx(tx_data: &mut TxData, seed: &[u8]) -> Result<Vec<u8>> {
let sig_hash = tx_data.signature_hash(index)?;
let message = match sig_hash {
either::Left(s) => Message::from_digest_slice(s.as_ref()).map_err(|_e| {
- BitcoinError::SignFailure(format!(
- "invalid sig hash for input #{index}"
- ))
+ BitcoinError::SignFailure(format!("invalid sig hash for input #{index}"))
})?,
either::Right(r) => Message::from_digest_slice(r.as_ref()).map_err(|_e| {
- BitcoinError::SignFailure(format!(
- "invalid sig hash for input #{index}"
- ))
+ BitcoinError::SignFailure(format!("invalid sig hash for input #{index}"))
})?,
};
let (_, signature) =
diff --git a/rust/apps/bitcoin/src/transactions/legacy/tx_data.rs b/rust/apps/bitcoin/src/transactions/legacy/tx_data.rs
index 4e4e6b7..cdebdd8 100644
--- a/rust/apps/bitcoin/src/transactions/legacy/tx_data.rs
+++ b/rust/apps/bitcoin/src/transactions/legacy/tx_data.rs
@@ -241,11 +241,7 @@ impl TxData {
.map(Right)
} else {
sig_hasher
- .legacy_signature_hash(
- input_index,
- &script,
- EcdsaSighashType::All.to_u32(),
- )
+ .legacy_signature_hash(input_index, &script, EcdsaSighashType::All.to_u32())
.map_err(|_e| {
BitcoinError::SignLegacyTxError(format!(
"invalid sig hash for {script_type:?}"
diff --git a/rust/apps/bitcoin/src/transactions/parsed_tx.rs b/rust/apps/bitcoin/src/transactions/parsed_tx.rs
index 53f16bf..ea2ba17 100644
--- a/rust/apps/bitcoin/src/transactions/parsed_tx.rs
+++ b/rust/apps/bitcoin/src/transactions/parsed_tx.rs
@@ -150,9 +150,7 @@ pub trait TxParser {
) -> Result<ParsedTx> {
let total_input_value = inputs.iter().fold(0, |acc, cur| acc + cur.value);
let total_output_value = outputs.iter().fold(0, |acc, cur| acc + cur.value);
- let has_anyone_can_pay = inputs
- .iter()
- .any(|v| v.ecdsa_sighash_type & 0x80 > 0);
+ let has_anyone_can_pay = inputs.iter().any(|v| v.ecdsa_sighash_type & 0x80 > 0);
let fee = if has_anyone_can_pay {
0
} else {
diff --git a/rust/apps/bitcoin/src/transactions/psbt/parsed_psbt.rs b/rust/apps/bitcoin/src/transactions/psbt/parsed_psbt.rs
index f97edee..8ff92e8 100644
--- a/rust/apps/bitcoin/src/transactions/psbt/parsed_psbt.rs
+++ b/rust/apps/bitcoin/src/transactions/psbt/parsed_psbt.rs
@@ -2,16 +2,18 @@ use crate::errors::{BitcoinError, Result};
use crate::network::Network;
use crate::transactions::parsed_tx::{ParseContext, ParsedInput, ParsedOutput, ParsedTx, TxParser};
use crate::transactions::psbt::wrapped_psbt::WrappedPsbt;
+use alloc::string::ToString;
use alloc::vec::Vec;
use bitcoin::bip32::ChildNumber;
use bitcoin::NetworkKind;
use core::ops::Index;
-use alloc::string::ToString;
impl TxParser for WrappedPsbt {
fn parse(&self, context: Option<&ParseContext>) -> Result<ParsedTx> {
let network = self.determine_network()?;
- let context = context.ok_or(BitcoinError::InvalidParseContext("empty context".to_string()))?;
+ let context = context.ok_or(BitcoinError::InvalidParseContext(
+ "empty context".to_string(),
+ ))?;
let inputs = self
.psbt
.inputs
diff --git a/rust/apps/bitcoin/src/transactions/psbt/wrapped_psbt.rs b/rust/apps/bitcoin/src/transactions/psbt/wrapped_psbt.rs
index 80d0800..ad55cf7 100644
--- a/rust/apps/bitcoin/src/transactions/psbt/wrapped_psbt.rs
+++ b/rust/apps/bitcoin/src/transactions/psbt/wrapped_psbt.rs
@@ -66,7 +66,9 @@ impl GetKey for Keystore {
Err(BitcoinError::GetKeyError("mfp is not match".to_string()))
}
}
- _ => Err(BitcoinError::GetKeyError("get private key by public key is not supported".to_string())),
+ _ => Err(BitcoinError::GetKeyError(
+ "get private key by public key is not supported".to_string(),
+ )),
}
}
}
@@ -408,9 +410,10 @@ impl WrappedPsbt {
.ok_or(BitcoinError::InvalidInput)?;
if fingerprint.eq(&context.master_fingerprint)
- && input.partial_sigs.contains_key(&PublicKey::new(*key)) {
- return Ok(false);
- }
+ && input.partial_sigs.contains_key(&PublicKey::new(*key))
+ {
+ return Ok(false);
+ }
}
Ok(true)
} else {
@@ -596,11 +599,8 @@ impl WrappedPsbt {
.to_string(),
)),
84 => Ok(Some(
- Address::p2wpkh(
- &bitcoin::PublicKey::new(*pubkey),
- network.clone(),
- )?
- .to_string(),
+ Address::p2wpkh(&bitcoin::PublicKey::new(*pubkey), network.clone())?
+ .to_string(),
)),
_ => Ok(None),
},
@@ -650,10 +650,11 @@ impl WrappedPsbt {
index: usize,
context: &ParseContext,
) -> Result<Option<(String, bool)>> {
- if context.multisig_wallet_config.is_some()
- && self.is_taproot_input(input) {
- return Err(BitcoinError::InvalidPsbt("multisig with taproot is not supported".to_string()));
- }
+ if context.multisig_wallet_config.is_some() && self.is_taproot_input(input) {
+ return Err(BitcoinError::InvalidPsbt(
+ "multisig with taproot is not supported".to_string(),
+ ));
+ }
if self.is_taproot_input(input) {
self.get_my_key_path_for_taproot(&input.tap_key_origins, index, "input", context)
} else {
diff --git a/rust/apps/ethereum/src/address.rs b/rust/apps/ethereum/src/address.rs
index e77f1d8..55a8e3b 100644
--- a/rust/apps/ethereum/src/address.rs
+++ b/rust/apps/ethereum/src/address.rs
@@ -53,8 +53,6 @@ mod tests {
use super::*;
extern crate std;
-
-
#[test]
fn test_generate_address() {
diff --git a/rust/apps/ethereum/src/swap.rs b/rust/apps/ethereum/src/swap.rs
index 3b73e2f..73a9861 100644
--- a/rust/apps/ethereum/src/swap.rs
+++ b/rust/apps/ethereum/src/swap.rs
@@ -81,7 +81,9 @@ pub fn parse_swapkit_contract(
}
if vault.is_none() || swap_in_asset.is_none() || swap_in_amount.is_none() || memo.is_none() {
- return Err(EthereumError::InvalidSwapTransaction("Invalid swapkit contract data".to_string()));
+ return Err(EthereumError::InvalidSwapTransaction(
+ "Invalid swapkit contract data".to_string(),
+ ));
}
let swapkit_memo = parse_swapkit_memo(&memo.unwrap())?;
diff --git a/rust/apps/monero/src/key_images.rs b/rust/apps/monero/src/key_images.rs
index 4d64774..446030a 100644
--- a/rust/apps/monero/src/key_images.rs
+++ b/rust/apps/monero/src/key_images.rs
@@ -2,11 +2,8 @@ use crate::errors::{MoneroError, Result};
use crate::key::{generate_key_image_from_priavte_key, KeyPair, PrivateKey, PublicKey};
use crate::outputs::{ExportedTransferDetail, ExportedTransferDetails};
use crate::utils::{
- constants::*,
- decrypt_data_with_pvk, encrypt_data_with_pvk,
- hash::hash_to_scalar,
- sign::generate_ring_signature,
- varinteger::*,
+ constants::*, decrypt_data_with_pvk, encrypt_data_with_pvk, hash::hash_to_scalar,
+ sign::generate_ring_signature, varinteger::*,
};
use alloc::string::{String, ToString};
use alloc::vec;
@@ -307,9 +304,7 @@ pub fn generate_export_ur_data(keypair: KeyPair, request_data: Vec<u8>) -> Resul
let mut key_images: KeyImages = KeyImages(vec![]);
for output in outputs.details.iter() {
- key_images
- .0
- .push(output.key_image(&keypair.clone(), OsRng));
+ key_images.0.push(output.key_image(&keypair.clone(), OsRng));
}
Ok(encrypt_data_with_pvk(
diff --git a/rust/apps/monero/src/transfer.rs b/rust/apps/monero/src/transfer.rs
index d966d65..06d4c55 100644
--- a/rust/apps/monero/src/transfer.rs
+++ b/rust/apps/monero/src/transfer.rs
@@ -19,9 +19,7 @@ use monero_serai::primitives::Decoys;
use monero_serai::ringct::bulletproofs::Bulletproof;
use monero_serai::ringct::clsag::{Clsag, ClsagContext};
use monero_serai::ringct::{RctBase, RctProofs, RctPrunable};
-use monero_serai::transaction::{
- Input, Output, Timelock, Transaction, TransactionPrefix,
-};
+use monero_serai::transaction::{Input, Output, Timelock, Transaction, TransactionPrefix};
use rand_core::OsRng;
use zeroize::Zeroizing;
@@ -315,8 +313,15 @@ impl TxConstructionData {
keccak256(&buffer)[0]
}
- pub fn outputs(&self, keypair: &KeyPair, tx_key: &PrivateKey, additional_keys: &Vec<PrivateKey>, tx_key_pub: &EdwardsPoint) -> InnerOutputs {
- let shared_key_derivations = self.shared_key_derivations(keypair, tx_key, additional_keys, tx_key_pub);
+ pub fn outputs(
+ &self,
+ keypair: &KeyPair,
+ tx_key: &PrivateKey,
+ additional_keys: &Vec<PrivateKey>,
+ tx_key_pub: &EdwardsPoint,
+ ) -> InnerOutputs {
+ let shared_key_derivations =
+ self.shared_key_derivations(keypair, tx_key, additional_keys, tx_key_pub);
let mut res = InnerOutputs::new();
for (dest, shared_key_derivation) in self.splitted_dsts.iter().zip(shared_key_derivations) {
let image = generate_key_image_from_priavte_key(&PrivateKey::new(
@@ -562,9 +567,17 @@ impl UnsignedTx {
UnsignedTx { txes, transfers }
}
-
- pub fn construct_tx(&self, tx: &TxConstructionData, keypair: &KeyPair, tx_key: &PrivateKey, additional_keys: &Vec<PrivateKey>, tx_key_pub: &EdwardsPoint, additional_keys_pub: &Vec<EdwardsPoint>) -> Result<Transaction> {
- let commitments_and_encrypted_amounts = tx.commitments_and_encrypted_amounts(keypair, tx_key, additional_keys, tx_key_pub);
+ pub fn construct_tx(
+ &self,
+ tx: &TxConstructionData,
+ keypair: &KeyPair,
+ tx_key: &PrivateKey,
+ additional_keys: &Vec<PrivateKey>,
+ tx_key_pub: &EdwardsPoint,
+ additional_keys_pub: &Vec<EdwardsPoint>,
+ ) -> Result<Transaction> {
+ let commitments_and_encrypted_amounts =
+ tx.commitments_and_encrypted_amounts(keypair, tx_key, additional_keys, tx_key_pub);
let mut commitments = Vec::with_capacity(tx.splitted_dsts.len());
let mut bp_commitments = Vec::with_capacity(tx.splitted_dsts.len());
let mut encrypted_amounts = Vec::with_capacity(tx.splitted_dsts.len());
@@ -581,16 +594,22 @@ impl UnsignedTx {
}
_ => panic!("unsupported RctType"),
})
- .expect(
- "couldn't prove BP(+)s for this many payments despite checking in constructor?",
- )
+ .expect("couldn't prove BP(+)s for this many payments despite checking in constructor?")
};
let tx = Transaction::V2 {
prefix: TransactionPrefix {
additional_timelock: Timelock::None,
inputs: tx.inputs(keypair)?.get_inputs(),
- outputs: tx.outputs(keypair, tx_key, additional_keys, tx_key_pub).get_outputs(),
- extra: tx.extra(keypair, tx_key, additional_keys, tx_key_pub, additional_keys_pub),
+ outputs: tx
+ .outputs(keypair, tx_key, additional_keys, tx_key_pub)
+ .get_outputs(),
+ extra: tx.extra(
+ keypair,
+ tx_key,
+ additional_keys,
+ tx_key_pub,
+ additional_keys_pub,
+ ),
},
proofs: Some(RctProofs {
base: RctBase {
@@ -613,11 +632,20 @@ impl UnsignedTx {
let mut penging_tx = vec![];
let mut tx_key_images = vec![];
for unsigned_tx in self.txes.iter() {
- let (tx_key, additional_keys, tx_key_pub, additional_keys_pub) = unsigned_tx.transaction_keys();
-
- let tx = self.construct_tx(unsigned_tx, keypair, &tx_key, &additional_keys, &tx_key_pub, &additional_keys_pub)?;
-
- let mask_sum = unsigned_tx.sum_output_masks(keypair, &tx_key, &additional_keys, &tx_key_pub);
+ let (tx_key, additional_keys, tx_key_pub, additional_keys_pub) =
+ unsigned_tx.transaction_keys();
+
+ let tx = self.construct_tx(
+ unsigned_tx,
+ keypair,
+ &tx_key,
+ &additional_keys,
+ &tx_key_pub,
+ &additional_keys_pub,
+ )?;
+
+ let mask_sum =
+ unsigned_tx.sum_output_masks(keypair, &tx_key, &additional_keys, &tx_key_pub);
let inputs = unsigned_tx.inputs(keypair)?;
let mut clsag_signs = Vec::with_capacity(inputs.0.len());
for (i, input) in inputs.0.iter().enumerate() {
@@ -701,7 +729,11 @@ impl UnsignedTx {
key_images_str
};
- for item in unsigned_tx.outputs(keypair, &tx_key, &additional_keys, &tx_key_pub).0.iter() {
+ for item in unsigned_tx
+ .outputs(keypair, &tx_key, &additional_keys, &tx_key_pub)
+ .0
+ .iter()
+ {
tx_key_images.push((PublicKey::new(item.output.key), item.key_image));
}
@@ -720,7 +752,6 @@ impl UnsignedTx {
unsigned_tx.clone(),
// PrivateKey::default(),
));
-
}
for transfer in self.transfers.details.iter() {
@@ -781,7 +812,7 @@ pub fn sign_tx(keypair: KeyPair, request_data: Vec<u8>) -> Result<Vec<u8>> {
#[cfg(test)]
mod tests {
use super::*;
-
+
use alloc::vec;
use core::ops::Deref;
use curve25519_dalek::edwards::EdwardsPoint;
diff --git a/rust/apps/monero/src/transfer_key.rs b/rust/apps/monero/src/transfer_key.rs
index 867df39..51ce253 100644
--- a/rust/apps/monero/src/transfer_key.rs
+++ b/rust/apps/monero/src/transfer_key.rs
@@ -77,7 +77,13 @@ impl TxConstructionData {
dest == &self.change_dts
}
- fn ecdhs(&self, keypair: &KeyPair, tx_key: &PrivateKey, additional_keys: &Vec<PrivateKey>, tx_key_pub: &EdwardsPoint) -> Vec<EdwardsPoint> {
+ fn ecdhs(
+ &self,
+ keypair: &KeyPair,
+ tx_key: &PrivateKey,
+ additional_keys: &Vec<PrivateKey>,
+ tx_key_pub: &EdwardsPoint,
+ ) -> Vec<EdwardsPoint> {
let mut res = Vec::with_capacity(self.splitted_dsts.len());
for (i, dest) in self.splitted_dsts.iter().enumerate() {
let key_to_use = if dest.is_subaddress {
@@ -100,7 +106,13 @@ impl TxConstructionData {
res
}
- fn payment_id_xors(&self, keypair: &KeyPair, tx_key: &PrivateKey, additional_keys: &Vec<PrivateKey>, tx_key_pub: &EdwardsPoint) -> Vec<[u8; 8]> {
+ fn payment_id_xors(
+ &self,
+ keypair: &KeyPair,
+ tx_key: &PrivateKey,
+ additional_keys: &Vec<PrivateKey>,
+ tx_key_pub: &EdwardsPoint,
+ ) -> Vec<[u8; 8]> {
let mut res = Vec::with_capacity(self.splitted_dsts.len());
for ecdh in self.ecdhs(keypair, tx_key, additional_keys, tx_key_pub) {
res.push(SharedKeyDerivations::payment_id_xor(Zeroizing::new(ecdh)));
@@ -108,7 +120,14 @@ impl TxConstructionData {
res
}
- pub fn extra(&self, keypair: &KeyPair, tx_key: &PrivateKey, additional_keys: &Vec<PrivateKey>, tx_key_pub: &EdwardsPoint, additional_keys_pub: &Vec<EdwardsPoint>) -> Vec<u8> {
+ pub fn extra(
+ &self,
+ keypair: &KeyPair,
+ tx_key: &PrivateKey,
+ additional_keys: &Vec<PrivateKey>,
+ tx_key_pub: &EdwardsPoint,
+ additional_keys_pub: &Vec<EdwardsPoint>,
+ ) -> Vec<u8> {
let payment_id_xors = self.payment_id_xors(keypair, tx_key, additional_keys, tx_key_pub);
let mut extra = Extra::new(*tx_key_pub, additional_keys_pub.clone());
if self.splitted_dsts.len() == 2 {
@@ -154,7 +173,8 @@ impl TxConstructionData {
additional_keys: &Vec<PrivateKey>,
tx_key_pub: &EdwardsPoint,
) -> Vec<(Commitment, EncryptedAmount)> {
- let shared_key_derivations = self.shared_key_derivations(keypair, tx_key, additional_keys, tx_key_pub);
+ let shared_key_derivations =
+ self.shared_key_derivations(keypair, tx_key, additional_keys, tx_key_pub);
let mut res = Vec::with_capacity(self.splitted_dsts.len());
for (dest, shared_key_derivation) in self.splitted_dsts.iter().zip(shared_key_derivations) {
@@ -170,7 +190,13 @@ impl TxConstructionData {
res
}
- pub fn sum_output_masks(&self, keypair: &KeyPair, tx_key: &PrivateKey, additional_keys: &Vec<PrivateKey>, tx_key_pub: &EdwardsPoint) -> Scalar {
+ pub fn sum_output_masks(
+ &self,
+ keypair: &KeyPair,
+ tx_key: &PrivateKey,
+ additional_keys: &Vec<PrivateKey>,
+ tx_key_pub: &EdwardsPoint,
+ ) -> Scalar {
self.commitments_and_encrypted_amounts(keypair, tx_key, additional_keys, tx_key_pub)
.into_iter()
.map(|(commitment, _)| commitment.mask)
diff --git a/rust/apps/near/src/account_id/serde.rs b/rust/apps/near/src/account_id/serde.rs
index 8e06890..9f0c806 100644
--- a/rust/apps/near/src/account_id/serde.rs
+++ b/rust/apps/near/src/account_id/serde.rs
@@ -17,9 +17,8 @@ impl<'de> de::Deserialize<'de> for AccountId {
D: de::Deserializer<'de>,
{
let account_id = Box::<str>::deserialize(deserializer)?;
- AccountId::validate(&account_id).map_err(|err| {
- de::Error::custom(format!("invalid value: \"{account_id}\", {err}"))
- })?;
+ AccountId::validate(&account_id)
+ .map_err(|err| de::Error::custom(format!("invalid value: \"{account_id}\", {err}")))?;
Ok(AccountId(account_id))
}
}
diff --git a/rust/apps/near/src/primitives_core/hash.rs b/rust/apps/near/src/primitives_core/hash.rs
index b0baa88..761d538 100644
--- a/rust/apps/near/src/primitives_core/hash.rs
+++ b/rust/apps/near/src/primitives_core/hash.rs
@@ -160,7 +160,9 @@ mod tests {
#[test]
fn test_deserialize_not_base58() {
let encoded = "\"---\"";
- if let Ok(CryptoHash(_)) = serde_json::from_str(encoded) { assert!(false, "should have failed") }
+ if let Ok(CryptoHash(_)) = serde_json::from_str(encoded) {
+ assert!(false, "should have failed")
+ }
}
#[test]
diff --git a/rust/apps/solana/src/compact.rs b/rust/apps/solana/src/compact.rs
index 5231a8c..f97ae54 100644
--- a/rust/apps/solana/src/compact.rs
+++ b/rust/apps/solana/src/compact.rs
@@ -1,8 +1,8 @@
use crate::errors::{Result, SolanaError};
use crate::read::Read;
-use alloc::vec::Vec;
-use alloc::vec;
use alloc::string::ToString;
+use alloc::vec;
+use alloc::vec::Vec;
pub struct Compact<T> {
compact_length: u32,
diff --git a/rust/apps/solana/src/lib.rs b/rust/apps/solana/src/lib.rs
index ecd04f6..a618fd1 100644
--- a/rust/apps/solana/src/lib.rs
+++ b/rust/apps/solana/src/lib.rs
@@ -31,8 +31,7 @@ pub mod structs;
pub mod utils;
pub fn parse_message(tx_hex: Vec<u8>, from_key: &String) -> errors::Result<SolanaMessage> {
let raw_message = hex::encode(tx_hex.clone());
- let mut utf8_message =
- String::from_utf8(tx_hex).unwrap_or_else(|_| "".to_string());
+ let mut utf8_message = String::from_utf8(tx_hex).unwrap_or_else(|_| "".to_string());
if app_utils::is_cjk(&utf8_message) {
utf8_message = "".to_string();
}
@@ -57,8 +56,6 @@ mod tests {
use hex::{FromHex, ToHex};
use ur_registry::solana::sol_sign_request::SolSignRequest;
-
-
use super::*;
#[test]
diff --git a/rust/apps/solana/src/resolvers/stake.rs b/rust/apps/solana/src/resolvers/stake.rs
index 23c9ba3..e6f107a 100644
--- a/rust/apps/solana/src/resolvers/stake.rs
+++ b/rust/apps/solana/src/resolvers/stake.rs
@@ -70,7 +70,8 @@ fn resolve_initialize(
lockup: Lockup,
) -> Result<SolanaDetail> {
let method_name = "Initialize".to_string();
- let stake_account = accounts.first()
+ let stake_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.stake_account"
)))?
@@ -109,7 +110,8 @@ fn resolve_authorize(
stake_authorize: StakeAuthorize,
) -> Result<SolanaDetail> {
let method_name = "Authorize".to_string();
- let stake_account = accounts.first()
+ let stake_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.stake_account"
)))?
@@ -122,7 +124,9 @@ fn resolve_authorize(
.to_string();
let old_authority_pubkey = accounts
.get(2)
- .ok_or(SolanaError::AccountNotFound("Authorize.old_authority_pubkey".to_string()))?
+ .ok_or(SolanaError::AccountNotFound(
+ "Authorize.old_authority_pubkey".to_string(),
+ ))?
.to_string();
let lockup_authority_pubkey = accounts.get(3).unwrap_or(&"".to_string()).to_string();
let new_authority_pubkey = pubkey.to_string();
@@ -149,7 +153,8 @@ fn resolve_authorize(
fn resolve_delegate_stake(accounts: Vec<String>) -> Result<SolanaDetail> {
let method_name = "DelegateStake".to_string();
- let stake_account = accounts.first()
+ let stake_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.stake_account"
)))?
@@ -202,7 +207,8 @@ fn resolve_delegate_stake(accounts: Vec<String>) -> Result<SolanaDetail> {
fn resolve_split(accounts: Vec<String>, lamports: u64) -> Result<SolanaDetail> {
let method_name = "Split".to_string();
- let stake_account = accounts.first()
+ let stake_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.stake_account"
)))?
@@ -236,7 +242,8 @@ fn resolve_split(accounts: Vec<String>, lamports: u64) -> Result<SolanaDetail> {
fn resolve_withdraw(accounts: Vec<String>, lamports: u64) -> Result<SolanaDetail> {
let method_name = "Withdraw".to_string();
- let stake_account = accounts.first()
+ let stake_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.stake_account"
)))?
@@ -286,7 +293,8 @@ fn resolve_withdraw(accounts: Vec<String>, lamports: u64) -> Result<SolanaDetail
fn resolve_deactivate(accounts: Vec<String>) -> Result<SolanaDetail> {
let method_name = "Deactivate".to_string();
- let delegated_stake_account = accounts.first()
+ let delegated_stake_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.delegated_stake_account"
)))?
@@ -318,7 +326,8 @@ fn resolve_deactivate(accounts: Vec<String>) -> Result<SolanaDetail> {
fn resolve_set_lockup(accounts: Vec<String>, lockup: LockupArgs) -> Result<SolanaDetail> {
let method_name = "SetLockup".to_string();
- let stake_account = accounts.first()
+ let stake_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.stake_account"
)))?
@@ -351,7 +360,8 @@ fn resolve_set_lockup(accounts: Vec<String>, lockup: LockupArgs) -> Result<Solan
fn resolve_merge(accounts: Vec<String>) -> Result<SolanaDetail> {
let method_name = "Merge".to_string();
- let destination_stake_account = accounts.first()
+ let destination_stake_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.destination_stake_account"
)))?
@@ -400,7 +410,8 @@ fn resolve_authorize_with_seed(
args: AuthorizeWithSeedArgs,
) -> Result<SolanaDetail> {
let method_name = "AuthorizeWithSeed".to_string();
- let stake_account = accounts.first()
+ let stake_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.stake_account"
)))?
@@ -446,7 +457,8 @@ fn resolve_authorize_with_seed(
fn resolve_initialize_checked(accounts: Vec<String>) -> Result<SolanaDetail> {
let method_name = "InitializeChecked".to_string();
- let stake_account = accounts.first()
+ let stake_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.stake_account"
)))?
@@ -488,7 +500,8 @@ fn resolve_authorize_checked(
stake_authorize: StakeAuthorize,
) -> Result<SolanaDetail> {
let method_name = "AuthorizeChecked".to_string();
- let stake_account = accounts.first()
+ let stake_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.stake_account"
)))?
@@ -538,7 +551,8 @@ fn resolve_authorize_checked_with_seed(
args: AuthorizeCheckedWithSeedArgs,
) -> Result<SolanaDetail> {
let method_name = "AuthorizeCheckedWithSeed".to_string();
- let stake_account = accounts.first()
+ let stake_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.stake_account"
)))?
@@ -594,7 +608,8 @@ fn resolve_set_lockup_checked(
args: LockupCheckedArgs,
) -> Result<SolanaDetail> {
let method_name = "SetLockupChecked".to_string();
- let stake_account = accounts.first()
+ let stake_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.stake_account"
)))?
diff --git a/rust/apps/solana/src/resolvers/system.rs b/rust/apps/solana/src/resolvers/system.rs
index 739f05d..395f841 100644
--- a/rust/apps/solana/src/resolvers/system.rs
+++ b/rust/apps/solana/src/resolvers/system.rs
@@ -69,7 +69,8 @@ fn resolve_create_account(
owner: Pubkey,
) -> Result<SolanaDetail> {
let method_name = "CreateAccount".to_string();
- let funding_account = accounts.first()
+ let funding_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(
"CreateAccount.funding_account".to_string(),
))?
@@ -100,9 +101,11 @@ fn resolve_create_account(
fn resolve_assign(accounts: Vec<String>, owner: Pubkey) -> Result<SolanaDetail> {
let method_name = "Assign".to_string();
- let account = accounts.first().ok_or(SolanaError::AccountNotFound(format!(
- "{method_name}.account"
- )))?;
+ let account = accounts
+ .first()
+ .ok_or(SolanaError::AccountNotFound(format!(
+ "{method_name}.account"
+ )))?;
let new_owner = owner.to_string();
Ok(SolanaDetail {
common: CommonDetail {
@@ -118,10 +121,9 @@ fn resolve_assign(accounts: Vec<String>, owner: Pubkey) -> Result<SolanaDetail>
fn resolve_transfer(accounts: Vec<String>, lamports: u64) -> Result<SolanaDetail> {
let method_name = "Transfer".to_string();
- let from = accounts.first()
- .ok_or(SolanaError::AccountNotFound(format!(
- "{method_name}.from"
- )))?
+ let from = accounts
+ .first()
+ .ok_or(SolanaError::AccountNotFound(format!("{method_name}.from")))?
.to_string();
let to = accounts
.get(1)
@@ -148,7 +150,8 @@ fn resolve_create_account_with_seed(
owner: Pubkey,
) -> Result<SolanaDetail> {
let method_name = "CreateAccountWithSeed".to_string();
- let funding_account = accounts.first()
+ let funding_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.funding_account"
)))?
@@ -186,7 +189,8 @@ fn resolve_create_account_with_seed(
fn resolve_advance_nonce_account(accounts: Vec<String>) -> Result<SolanaDetail> {
let method_name = "AdvanceNonceAccount".to_string();
- let nonce_account = accounts.first()
+ let nonce_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.nonce_account"
)))?
@@ -218,7 +222,8 @@ fn resolve_advance_nonce_account(accounts: Vec<String>) -> Result<SolanaDetail>
fn resolve_withdraw_nonce_account(accounts: Vec<String>, lamports: u64) -> Result<SolanaDetail> {
let method_name = "WithdrawNonceAccount".to_string();
- let nonce_account = accounts.first()
+ let nonce_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.nonce_account"
)))?
@@ -266,7 +271,8 @@ fn resolve_withdraw_nonce_account(accounts: Vec<String>, lamports: u64) -> Resul
fn resolve_initialize_nonce_account(accounts: Vec<String>, pubkey: Pubkey) -> Result<SolanaDetail> {
let method_name = "InitializeNonceAccount".to_string();
- let nonce_account = accounts.first()
+ let nonce_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.nonce_account"
)))?
@@ -302,7 +308,8 @@ fn resolve_initialize_nonce_account(accounts: Vec<String>, pubkey: Pubkey) -> Re
fn resolve_authorize_nonce_account(accounts: Vec<String>, pubkey: Pubkey) -> Result<SolanaDetail> {
let method_name = "AuthorizeNonceAccount".to_string();
- let nonce_account = accounts.first()
+ let nonce_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.nonce_account"
)))?
@@ -331,7 +338,8 @@ fn resolve_authorize_nonce_account(accounts: Vec<String>, pubkey: Pubkey) -> Res
fn resolve_allocate(accounts: Vec<String>, space: u64) -> Result<SolanaDetail> {
let method_name = "Allocate".to_string();
- let new_account = accounts.first()
+ let new_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.account"
)))?
@@ -356,7 +364,8 @@ fn resolve_allocate_with_seed(
space: u64,
) -> Result<SolanaDetail> {
let method_name = "AllocateWithSeed".to_string();
- let allocated_account = accounts.first()
+ let allocated_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.allocated_account"
)))?
@@ -393,7 +402,8 @@ fn resolve_assign_with_seed(
base_pubkey: Pubkey,
) -> Result<SolanaDetail> {
let method_name = "AssignWithSeed".to_string();
- let assigned_account = accounts.first()
+ let assigned_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.assigned_account"
)))?
@@ -426,10 +436,9 @@ fn resolve_transfer_with_seed(
from_owner: Pubkey,
) -> Result<SolanaDetail> {
let method_name = "TransferWithSeed".to_string();
- let from = accounts.first()
- .ok_or(SolanaError::AccountNotFound(format!(
- "{method_name}.from"
- )))?
+ let from = accounts
+ .first()
+ .ok_or(SolanaError::AccountNotFound(format!("{method_name}.from")))?
.to_string();
let from_base_pubkey = accounts
.get(1)
@@ -463,7 +472,8 @@ fn resolve_transfer_with_seed(
fn resolve_upgrade_nonce_account(accounts: Vec<String>) -> Result<SolanaDetail> {
let method_name = "UpgradeNonceAccount".to_string();
- let nonce_account = accounts.first()
+ let nonce_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(
"UpgradeNonceAccount.nonce_account".to_string(),
))?
diff --git a/rust/apps/solana/src/resolvers/token.rs b/rust/apps/solana/src/resolvers/token.rs
index 1e10f65..ddc7821 100644
--- a/rust/apps/solana/src/resolvers/token.rs
+++ b/rust/apps/solana/src/resolvers/token.rs
@@ -82,10 +82,9 @@ fn initialize_mint(
freeze_authority_pubkey: COption<Pubkey>,
) -> Result<SolanaDetail> {
let method_name = "InitializeMint";
- let mint = accounts.first()
- .ok_or(SolanaError::AccountNotFound(format!(
- "{method_name}.mint"
- )))?
+ let mint = accounts
+ .first()
+ .ok_or(SolanaError::AccountNotFound(format!("{method_name}.mint")))?
.to_string();
let sysver_rent = accounts
.get(1)
@@ -115,22 +114,19 @@ fn initialize_mint(
fn initialize_account(accounts: Vec<String>) -> Result<SolanaDetail> {
let method_name = "InitializeAccount";
- let account = accounts.first()
+ let account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.account"
)))?
.to_string();
let mint = accounts
.get(1)
- .ok_or(SolanaError::AccountNotFound(format!(
- "{method_name}.mint"
- )))?
+ .ok_or(SolanaError::AccountNotFound(format!("{method_name}.mint")))?
.to_string();
let owner = accounts
.get(2)
- .ok_or(SolanaError::AccountNotFound(format!(
- "{method_name}.owner"
- )))?
+ .ok_or(SolanaError::AccountNotFound(format!("{method_name}.owner")))?
.to_string();
let sysver_rent = accounts
.get(3)
@@ -155,7 +151,8 @@ fn initialize_account(accounts: Vec<String>) -> Result<SolanaDetail> {
fn initialize_multisig(accounts: Vec<String>, m: u8) -> Result<SolanaDetail> {
let method_name = "InitializeMultisig";
- let multisig_account = accounts.first()
+ let multisig_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.multisig_account"
)))?
@@ -185,7 +182,8 @@ fn initialize_multisig(accounts: Vec<String>, m: u8) -> Result<SolanaDetail> {
fn transfer(accounts: Vec<String>, amount: u64) -> Result<SolanaDetail> {
let method_name = "Transfer";
- let source_account = accounts.first()
+ let source_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.source_account"
)))?
@@ -200,9 +198,7 @@ fn transfer(accounts: Vec<String>, amount: u64) -> Result<SolanaDetail> {
if is_multisig(&accounts, 3) {
let owner = accounts
.get(2)
- .ok_or(SolanaError::AccountNotFound(format!(
- "{method_name}.owner"
- )))?
+ .ok_or(SolanaError::AccountNotFound(format!("{method_name}.owner")))?
.to_string();
let signers = Some(accounts[3..].to_vec());
return Ok(SolanaDetail {
@@ -241,7 +237,8 @@ fn transfer(accounts: Vec<String>, amount: u64) -> Result<SolanaDetail> {
fn approve(accounts: Vec<String>, amount: u64) -> Result<SolanaDetail> {
let method_name = "Approve";
- let source_account = accounts.first()
+ let source_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.source_account"
)))?
@@ -256,9 +253,7 @@ fn approve(accounts: Vec<String>, amount: u64) -> Result<SolanaDetail> {
if is_multisig(&accounts, 3) {
let owner = accounts
.get(2)
- .ok_or(SolanaError::AccountNotFound(format!(
- "{method_name}.owner"
- )))?
+ .ok_or(SolanaError::AccountNotFound(format!("{method_name}.owner")))?
.to_string();
let signers = Some(accounts[3..].to_vec());
return Ok(SolanaDetail {
@@ -277,9 +272,7 @@ fn approve(accounts: Vec<String>, amount: u64) -> Result<SolanaDetail> {
}
let owner = accounts
.get(2)
- .ok_or(SolanaError::AccountNotFound(format!(
- "{method_name}.owner"
- )))?
+ .ok_or(SolanaError::AccountNotFound(format!("{method_name}.owner")))?
.to_string();
Ok(SolanaDetail {
common: CommonDetail {
@@ -299,7 +292,8 @@ fn approve(accounts: Vec<String>, amount: u64) -> Result<SolanaDetail> {
fn revoke(accounts: Vec<String>) -> Result<SolanaDetail> {
let method_name = "Revoke";
- let source_account = accounts.first()
+ let source_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.source_account"
)))?
@@ -307,9 +301,7 @@ fn revoke(accounts: Vec<String>) -> Result<SolanaDetail> {
if is_multisig(&accounts, 2) {
let owner = accounts
.get(1)
- .ok_or(SolanaError::AccountNotFound(format!(
- "{method_name}.owner"
- )))?
+ .ok_or(SolanaError::AccountNotFound(format!("{method_name}.owner")))?
.to_string();
let signers = Some(accounts[2..].to_vec());
return Ok(SolanaDetail {
@@ -326,9 +318,7 @@ fn revoke(accounts: Vec<String>) -> Result<SolanaDetail> {
}
let owner = accounts
.get(1)
- .ok_or(SolanaError::AccountNotFound(format!(
- "{method_name}.owner"
- )))?
+ .ok_or(SolanaError::AccountNotFound(format!("{method_name}.owner")))?
.to_string();
Ok(SolanaDetail {
common: CommonDetail {
@@ -350,7 +340,8 @@ fn set_authority(
) -> Result<SolanaDetail> {
let method_name = "SetAuthority";
- let account = accounts.first()
+ let account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.account"
)))?
@@ -411,10 +402,9 @@ fn set_authority(
fn mint_to(accounts: Vec<String>, amount: u64) -> Result<SolanaDetail> {
let method_name = "MintTo";
- let mint = accounts.first()
- .ok_or(SolanaError::AccountNotFound(format!(
- "{method_name}.mint"
- )))?
+ let mint = accounts
+ .first()
+ .ok_or(SolanaError::AccountNotFound(format!("{method_name}.mint")))?
.to_string();
let mint_to_account = accounts
.get(1)
@@ -470,24 +460,21 @@ fn mint_to(accounts: Vec<String>, amount: u64) -> Result<SolanaDetail> {
fn burn(accounts: Vec<String>, amount: u64) -> Result<SolanaDetail> {
let method_name = "Burn";
- let account = accounts.first()
+ let account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.account"
)))?
.to_string();
let mint = accounts
.get(1)
- .ok_or(SolanaError::AccountNotFound(format!(
- "{method_name}.mint"
- )))?
+ .ok_or(SolanaError::AccountNotFound(format!("{method_name}.mint")))?
.to_string();
let amount = amount.to_string();
if is_multisig(&accounts, 3) {
let owner = accounts
.get(2)
- .ok_or(SolanaError::AccountNotFound(format!(
- "{method_name}.owner"
- )))?
+ .ok_or(SolanaError::AccountNotFound(format!("{method_name}.owner")))?
.to_string();
let signers = Some(accounts[3..].to_vec());
Ok(SolanaDetail {
@@ -506,9 +493,7 @@ fn burn(accounts: Vec<String>, amount: u64) -> Result<SolanaDetail> {
} else {
let owner = accounts
.get(2)
- .ok_or(SolanaError::AccountNotFound(format!(
- "{method_name}.owner"
- )))?
+ .ok_or(SolanaError::AccountNotFound(format!("{method_name}.owner")))?
.to_string();
Ok(SolanaDetail {
common: CommonDetail {
@@ -528,7 +513,8 @@ fn burn(accounts: Vec<String>, amount: u64) -> Result<SolanaDetail> {
fn close_account(accounts: Vec<String>) -> Result<SolanaDetail> {
let method_name = "CloseAccount";
- let account = accounts.first()
+ let account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.account"
)))?
@@ -542,9 +528,7 @@ fn close_account(accounts: Vec<String>) -> Result<SolanaDetail> {
if is_multisig(&accounts, 3) {
let owner = accounts
.get(2)
- .ok_or(SolanaError::AccountNotFound(format!(
- "{method_name}.owner"
- )))?
+ .ok_or(SolanaError::AccountNotFound(format!("{method_name}.owner")))?
.to_string();
let signers = Some(accounts[3..].to_vec());
Ok(SolanaDetail {
@@ -562,7 +546,9 @@ fn close_account(accounts: Vec<String>) -> Result<SolanaDetail> {
} else {
let owner = accounts
.get(2)
- .ok_or(SolanaError::AccountNotFound("CloseAccount.owner".to_string()))?
+ .ok_or(SolanaError::AccountNotFound(
+ "CloseAccount.owner".to_string(),
+ ))?
.to_string();
Ok(SolanaDetail {
common: CommonDetail {
@@ -581,16 +567,15 @@ fn close_account(accounts: Vec<String>) -> Result<SolanaDetail> {
fn freeze_account(accounts: Vec<String>) -> Result<SolanaDetail> {
let method_name = "FreezeAccount";
- let account = accounts.first()
+ let account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.account"
)))?
.to_string();
let mint = accounts
.get(1)
- .ok_or(SolanaError::AccountNotFound(format!(
- "{method_name}.mint"
- )))?
+ .ok_or(SolanaError::AccountNotFound(format!("{method_name}.mint")))?
.to_string();
if is_multisig(&accounts, 3) {
let mint_freeze_authority_pubkey = accounts
@@ -636,16 +621,15 @@ fn freeze_account(accounts: Vec<String>) -> Result<SolanaDetail> {
fn thaw_account(accounts: Vec<String>) -> Result<SolanaDetail> {
let method_name = "ThawAccount";
- let account = accounts.first()
+ let account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.account"
)))?
.to_string();
let mint = accounts
.get(1)
- .ok_or(SolanaError::AccountNotFound(format!(
- "{method_name}.mint"
- )))?
+ .ok_or(SolanaError::AccountNotFound(format!("{method_name}.mint")))?
.to_string();
if is_multisig(&accounts, 3) {
let mint_freeze_authority_pubkey = accounts
@@ -692,16 +676,15 @@ fn thaw_account(accounts: Vec<String>) -> Result<SolanaDetail> {
fn transfer_checked(accounts: Vec<String>, decimals: u8, amount: u64) -> Result<SolanaDetail> {
let method_name = "TransferChecked";
if is_multisig(&accounts, 4) {
- let account = accounts.first()
+ let account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.account"
)))?
.to_string();
let mint = accounts
.get(1)
- .ok_or(SolanaError::AccountNotFound(format!(
- "{method_name}.mint"
- )))?
+ .ok_or(SolanaError::AccountNotFound(format!("{method_name}.mint")))?
.to_string();
let recipient = accounts
.get(2)
@@ -711,9 +694,7 @@ fn transfer_checked(accounts: Vec<String>, decimals: u8, amount: u64) -> Result<
.to_string();
let owner = accounts
.get(3)
- .ok_or(SolanaError::AccountNotFound(format!(
- "{method_name}.owner"
- )))?
+ .ok_or(SolanaError::AccountNotFound(format!("{method_name}.owner")))?
.to_string();
let signers = Some(accounts[4..].to_vec());
let amount = amount.to_string();
@@ -733,16 +714,15 @@ fn transfer_checked(accounts: Vec<String>, decimals: u8, amount: u64) -> Result<
}),
})
} else {
- let account = accounts.first()
+ let account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.account"
)))?
.to_string();
let mint = accounts
.get(1)
- .ok_or(SolanaError::AccountNotFound(format!(
- "{method_name}.mint"
- )))?
+ .ok_or(SolanaError::AccountNotFound(format!("{method_name}.mint")))?
.to_string();
let recipient = accounts
.get(2)
@@ -752,9 +732,7 @@ fn transfer_checked(accounts: Vec<String>, decimals: u8, amount: u64) -> Result<
.to_string();
let owner = accounts
.get(3)
- .ok_or(SolanaError::AccountNotFound(format!(
- "{method_name}.owner"
- )))?
+ .ok_or(SolanaError::AccountNotFound(format!("{method_name}.owner")))?
.to_string();
let amount = amount.to_string();
Ok(SolanaDetail {
@@ -778,16 +756,15 @@ fn transfer_checked(accounts: Vec<String>, decimals: u8, amount: u64) -> Result<
fn approve_checked(accounts: Vec<String>, decimals: u8, amount: u64) -> Result<SolanaDetail> {
let method_name = "ApproveChecked";
if is_multisig(&accounts, 4) {
- let account = accounts.first()
+ let account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.account"
)))?
.to_string();
let mint = accounts
.get(1)
- .ok_or(SolanaError::AccountNotFound(format!(
- "{method_name}.mint"
- )))?
+ .ok_or(SolanaError::AccountNotFound(format!("{method_name}.mint")))?
.to_string();
let delegate = accounts
.get(2)
@@ -797,9 +774,7 @@ fn approve_checked(accounts: Vec<String>, decimals: u8, amount: u64) -> Result<S
.to_string();
let owner = accounts
.get(3)
- .ok_or(SolanaError::AccountNotFound(format!(
- "{method_name}.owner"
- )))?
+ .ok_or(SolanaError::AccountNotFound(format!("{method_name}.owner")))?
.to_string();
let signers = Some(accounts[4..].to_vec());
let amount = amount.to_string();
@@ -819,16 +794,15 @@ fn approve_checked(accounts: Vec<String>, decimals: u8, amount: u64) -> Result<S
}),
})
} else {
- let account = accounts.first()
+ let account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.account"
)))?
.to_string();
let mint = accounts
.get(1)
- .ok_or(SolanaError::AccountNotFound(format!(
- "{method_name}.mint"
- )))?
+ .ok_or(SolanaError::AccountNotFound(format!("{method_name}.mint")))?
.to_string();
let delegate = accounts
.get(2)
@@ -838,9 +812,7 @@ fn approve_checked(accounts: Vec<String>, decimals: u8, amount: u64) -> Result<S
.to_string();
let owner = accounts
.get(3)
- .ok_or(SolanaError::AccountNotFound(format!(
- "{method_name}.owner"
- )))?
+ .ok_or(SolanaError::AccountNotFound(format!("{method_name}.owner")))?
.to_string();
let amount = amount.to_string();
Ok(SolanaDetail {
@@ -863,10 +835,9 @@ fn approve_checked(accounts: Vec<String>, decimals: u8, amount: u64) -> Result<S
fn mint_to_checked(accounts: Vec<String>, decimals: u8, amount: u64) -> Result<SolanaDetail> {
let method_name = "MintToChecked";
- let mint = accounts.first()
- .ok_or(SolanaError::AccountNotFound(format!(
- "{method_name}.mint"
- )))?
+ let mint = accounts
+ .first()
+ .ok_or(SolanaError::AccountNotFound(format!("{method_name}.mint")))?
.to_string();
let mint_to_account = accounts
.get(1)
@@ -923,24 +894,21 @@ fn mint_to_checked(accounts: Vec<String>, decimals: u8, amount: u64) -> Result<S
fn burn_checked(accounts: Vec<String>, decimals: u8, amount: u64) -> Result<SolanaDetail> {
let method_name = "BurnChecked";
- let account = accounts.first()
+ let account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.account"
)))?
.to_string();
let mint = accounts
.get(1)
- .ok_or(SolanaError::AccountNotFound(format!(
- "{method_name}.mint"
- )))?
+ .ok_or(SolanaError::AccountNotFound(format!("{method_name}.mint")))?
.to_string();
let amount = amount.to_string();
if is_multisig(&accounts, 3) {
let owner = accounts
.get(2)
- .ok_or(SolanaError::AccountNotFound(format!(
- "{method_name}.owner"
- )))?
+ .ok_or(SolanaError::AccountNotFound(format!("{method_name}.owner")))?
.to_string();
let signers = Some(accounts[3..].to_vec());
Ok(SolanaDetail {
@@ -960,9 +928,7 @@ fn burn_checked(accounts: Vec<String>, decimals: u8, amount: u64) -> Result<Sola
} else {
let owner = accounts
.get(2)
- .ok_or(SolanaError::AccountNotFound(format!(
- "{method_name}.owner"
- )))?
+ .ok_or(SolanaError::AccountNotFound(format!("{method_name}.owner")))?
.to_string();
Ok(SolanaDetail {
common: CommonDetail {
@@ -983,16 +949,15 @@ fn burn_checked(accounts: Vec<String>, decimals: u8, amount: u64) -> Result<Sola
fn initialize_account_2(accounts: Vec<String>, owner: Pubkey) -> Result<SolanaDetail> {
let method_name = "InitializeAccount2";
- let account = accounts.first()
+ let account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.account"
)))?
.to_string();
let mint = accounts
.get(1)
- .ok_or(SolanaError::AccountNotFound(format!(
- "{method_name}.mint"
- )))?
+ .ok_or(SolanaError::AccountNotFound(format!("{method_name}.mint")))?
.to_string();
let sysver_rent = accounts
.get(2)
@@ -1017,7 +982,8 @@ fn initialize_account_2(accounts: Vec<String>, owner: Pubkey) -> Result<SolanaDe
fn sync_native(accounts: Vec<String>) -> Result<SolanaDetail> {
let method_name = "SyncNative";
- let account_to_sync = accounts.first()
+ let account_to_sync = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.account_to_sync"
)))?
@@ -1033,16 +999,15 @@ fn sync_native(accounts: Vec<String>) -> Result<SolanaDetail> {
fn initialize_account_3(accounts: Vec<String>, owner: Pubkey) -> Result<SolanaDetail> {
let method_name = "InitializeAccount3";
- let account = accounts.first()
+ let account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.account"
)))?
.to_string();
let mint = accounts
.get(1)
- .ok_or(SolanaError::AccountNotFound(format!(
- "{method_name}.mint"
- )))?
+ .ok_or(SolanaError::AccountNotFound(format!("{method_name}.mint")))?
.to_string();
let owner = owner.to_string();
Ok(SolanaDetail {
@@ -1060,7 +1025,8 @@ fn initialize_account_3(accounts: Vec<String>, owner: Pubkey) -> Result<SolanaDe
fn initialize_multisig_2(accounts: Vec<String>, m: u8) -> Result<SolanaDetail> {
let method_name = "InitializeMultisig2";
- let multisig_account = accounts.first()
+ let multisig_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.multisig_account"
)))?
@@ -1087,10 +1053,9 @@ fn initialize_mint_2(
freeze_authority_pubkey: COption<Pubkey>,
) -> Result<SolanaDetail> {
let method_name = "InitializeMint2";
- let mint = accounts.first()
- .ok_or(SolanaError::AccountNotFound(format!(
- "{method_name}.mint"
- )))?
+ let mint = accounts
+ .first()
+ .ok_or(SolanaError::AccountNotFound(format!("{method_name}.mint")))?
.to_string();
let mint_authority_pubkey = mint_authority_pubkey.to_string();
let freeze_authority_pubkey =
diff --git a/rust/apps/solana/src/resolvers/token_lending.rs b/rust/apps/solana/src/resolvers/token_lending.rs
index 2288363..6687f21 100644
--- a/rust/apps/solana/src/resolvers/token_lending.rs
+++ b/rust/apps/solana/src/resolvers/token_lending.rs
@@ -66,7 +66,8 @@ fn init_lending_market(
quote_currency: [u8; 32],
) -> Result<SolanaDetail> {
let method_name = "InitLendingMarket";
- let lending_market_account = accounts.first()
+ let lending_market_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.lending_market_account",
)))?
@@ -111,7 +112,8 @@ fn init_lending_market(
fn set_lending_market_owner(accounts: Vec<String>, new_owner: Pubkey) -> Result<SolanaDetail> {
let method_name = "SetLendingMarketOwner";
- let lending_market_account = accounts.first()
+ let lending_market_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.lending_market_account",
)))?
@@ -144,7 +146,8 @@ fn init_reserve(
config: ReserveConfig,
) -> Result<SolanaDetail> {
let method_name = "SetLendingMarketOwner";
- let source_liquidity_account = accounts.first()
+ let source_liquidity_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.source_liquidity_account",
)))?
@@ -277,7 +280,8 @@ fn init_reserve(
fn refresh_reserve(accounts: Vec<String>) -> Result<SolanaDetail> {
let method_name = "RefreshReserve";
- let reserve_account = accounts.first()
+ let reserve_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.reserve_account",
)))?
@@ -309,7 +313,8 @@ fn refresh_reserve(accounts: Vec<String>) -> Result<SolanaDetail> {
fn deposit_reserve_liquidity(accounts: Vec<String>, liquidity_amount: u64) -> Result<SolanaDetail> {
let method_name = "DepositReserveLiquidity";
- let source_liquidity_account = accounts.first()
+ let source_liquidity_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.source_liquidity_account",
)))?
@@ -397,7 +402,8 @@ fn redeem_reserve_collateral(
collateral_amount: u64,
) -> Result<SolanaDetail> {
let method_name = "RedeemReserveCollateral";
- let source_collateral_account = accounts.first()
+ let source_collateral_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.source_collateral_account",
)))?
@@ -481,7 +487,8 @@ fn redeem_reserve_collateral(
fn init_obligation(accounts: Vec<String>) -> Result<SolanaDetail> {
let method_name = "InitObligation";
- let obligation_account = accounts.first()
+ let obligation_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.obligation_account",
)))?
@@ -534,7 +541,8 @@ fn init_obligation(accounts: Vec<String>) -> Result<SolanaDetail> {
fn refresh_obligation(accounts: Vec<String>) -> Result<SolanaDetail> {
let method_name = "RefreshObligation";
- let obligation_account = accounts.first()
+ let obligation_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.obligation_account",
)))?
@@ -564,7 +572,8 @@ fn deposit_obligation_collateral(
collateral_amount: u64,
) -> Result<SolanaDetail> {
let method_name = "DepositObligationCollateral";
- let source_collateral_account = accounts.first()
+ let source_collateral_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.source_collateral_account",
)))?
@@ -644,7 +653,8 @@ fn withdraw_obligation_collateral(
collateral_amount: u64,
) -> Result<SolanaDetail> {
let method_name = "WithdrawObligationCollateral";
- let source_collateral_account = accounts.first()
+ let source_collateral_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.source_collateral_account",
)))?
@@ -724,7 +734,8 @@ fn borrow_obligation_liquidity(
liquidity_amount: u64,
) -> Result<SolanaDetail> {
let method_name = "BorrowObligationLiquidity";
- let source_liquidity_account = accounts.first()
+ let source_liquidity_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.source_liquidity_account",
)))?
@@ -814,7 +825,8 @@ fn repay_obligation_liquidity(
) -> Result<SolanaDetail> {
let method_name = "RepayObligationLiquidity";
- let source_liquidity_account = accounts.first()
+ let source_liquidity_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.source_liquidity_account",
)))?
@@ -884,7 +896,8 @@ fn repay_obligation_liquidity(
fn liquidate_obligation(accounts: Vec<String>, liquidity_amount: u64) -> Result<SolanaDetail> {
let method_name = "LiquidateObligation";
- let source_liquidity_account = accounts.first()
+ let source_liquidity_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.source_liquidity_account",
)))?
@@ -980,7 +993,8 @@ fn liquidate_obligation(accounts: Vec<String>, liquidity_amount: u64) -> Result<
fn flash_loan(accounts: Vec<String>, amount: u64) -> Result<SolanaDetail> {
let method_name = "FlashLoan";
- let source_liquidity_account = accounts.first()
+ let source_liquidity_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.source_liquidity_account",
)))?
diff --git a/rust/apps/solana/src/resolvers/token_swap_v3.rs b/rust/apps/solana/src/resolvers/token_swap_v3.rs
index 662a1cc..7924f1f 100644
--- a/rust/apps/solana/src/resolvers/token_swap_v3.rs
+++ b/rust/apps/solana/src/resolvers/token_swap_v3.rs
@@ -32,7 +32,8 @@ pub fn resolve(instruction: SwapInstruction, accounts: Vec<String>) -> Result<So
fn initialize(accounts: Vec<String>, initialize: Initialize) -> Result<SolanaDetail> {
let method_name = "Initialize";
- let token_swap = accounts.first()
+ let token_swap = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.token_swap"
)))?
@@ -100,7 +101,8 @@ fn initialize(accounts: Vec<String>, initialize: Initialize) -> Result<SolanaDet
fn swap(accounts: Vec<String>, swap: Swap) -> Result<SolanaDetail> {
let method_name = "Swap";
- let token_swap = accounts.first()
+ let token_swap = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.token_swap"
)))?
@@ -187,7 +189,8 @@ fn deposit_all_token_types(
args: DepositAllTokenTypes,
) -> Result<SolanaDetail> {
let method_name = "DepositAllTokenTypes";
- let token_swap = accounts.first()
+ let token_swap = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.token_swap"
)))?
@@ -272,7 +275,8 @@ fn withdraw_all_token_types(
args: WithdrawAllTokenTypes,
) -> Result<SolanaDetail> {
let method_name = "WithdrawAllTokenTypes";
- let token_swap = accounts.first()
+ let token_swap = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.token_swap"
)))?
@@ -366,7 +370,8 @@ fn deposit_single_token_type_exact_amount_in(
args: DepositSingleTokenTypeExactAmountIn,
) -> Result<SolanaDetail> {
let method_name = "DepositSingleTokenTypeExactAmountIn";
- let token_swap = accounts.first()
+ let token_swap = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.token_swap"
)))?
@@ -446,7 +451,8 @@ fn withdraw_single_token_type_exact_amount_out(
args: WithdrawSingleTokenTypeExactAmountOut,
) -> Result<SolanaDetail> {
let method_name = "WithdrawSingleTokenTypeExactAmountOut";
- let token_swap = accounts.first()
+ let token_swap = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.token_swap"
)))?
diff --git a/rust/apps/solana/src/resolvers/vote.rs b/rust/apps/solana/src/resolvers/vote.rs
index 8c4ff03..5dcc0b3 100644
--- a/rust/apps/solana/src/resolvers/vote.rs
+++ b/rust/apps/solana/src/resolvers/vote.rs
@@ -53,7 +53,8 @@ pub fn resolve(instruction: VoteInstruction, accounts: Vec<String>) -> Result<So
fn resolve_initialize_account(accounts: Vec<String>, vote_init: VoteInit) -> Result<SolanaDetail> {
let method_name = "InitializeAccount".to_string();
- let account = accounts.first()
+ let account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.account"
)))?
@@ -104,7 +105,8 @@ fn resolve_authorize(
vote_authority: VoteAuthorize,
) -> Result<SolanaDetail> {
let method_name = "Authorize".to_string();
- let vote_account = accounts.first()
+ let vote_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.vote_account"
)))?
@@ -144,7 +146,8 @@ fn resolve_authorize(
fn resolve_vote(accounts: Vec<String>, vote: Vote) -> Result<SolanaDetail> {
let method_name = "Vote".to_string();
- let vote_account = accounts.first()
+ let vote_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.vote_account"
)))?
@@ -196,7 +199,8 @@ fn resolve_vote(accounts: Vec<String>, vote: Vote) -> Result<SolanaDetail> {
fn resolve_withdraw(accounts: Vec<String>, lamports: u64) -> Result<SolanaDetail> {
let method_name = "Withdraw";
- let vote_account = accounts.first()
+ let vote_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.vote_account"
)))?
@@ -231,7 +235,8 @@ fn resolve_withdraw(accounts: Vec<String>, lamports: u64) -> Result<SolanaDetail
fn resolve_update_validator_identity(accounts: Vec<String>) -> Result<SolanaDetail> {
let method_name = "UpdateValidatorIdentity".to_string();
- let vote_account = accounts.first()
+ let vote_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.vote_account"
)))?
@@ -266,7 +271,8 @@ fn resolve_update_validator_identity(accounts: Vec<String>) -> Result<SolanaDeta
fn resolve_update_commission(accounts: Vec<String>, new_commission: u8) -> Result<SolanaDetail> {
let method_name = "UpdateCommission".to_string();
- let vote_account = accounts.first()
+ let vote_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.vote_account"
)))?
@@ -297,7 +303,8 @@ fn resolve_vote_switch(
) -> Result<SolanaDetail> {
let method_name = "VoteSwitch".to_string();
- let vote_account = accounts.first()
+ let vote_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.vote_account"
)))?
@@ -354,7 +361,8 @@ fn resolve_authorize_checked(
) -> Result<SolanaDetail> {
let method_name = "AuthorizeChecked".to_string();
- let vote_account = accounts.first()
+ let vote_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.vote_account"
)))?
@@ -403,7 +411,8 @@ fn resolve_update_vote_state(
) -> Result<SolanaDetail> {
let method_name = "UpdateVoteState".to_string();
- let vote_account = accounts.first()
+ let vote_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.vote_account"
)))?
@@ -451,7 +460,8 @@ fn resolve_update_vote_state_switch(
) -> Result<SolanaDetail> {
let method_name = "UpdateVoteStateSwitch".to_string();
- let vote_account = accounts.first()
+ let vote_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.vote_account"
)))?
@@ -499,7 +509,8 @@ fn resolve_authorize_with_seed(
) -> Result<SolanaDetail> {
let method_name = "AuthorizeWithSeed".to_string();
- let vote_account = accounts.first()
+ let vote_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.vote_account"
)))?
@@ -548,7 +559,8 @@ fn resolve_authorize_checked_with_seed(
) -> Result<SolanaDetail> {
let method_name = "AuthorizeCheckedWithSeed".to_string();
- let vote_account = accounts.first()
+ let vote_account = accounts
+ .first()
.ok_or(SolanaError::AccountNotFound(format!(
"{method_name}.vote_account"
)))?
diff --git a/rust/apps/stellar/src/address.rs b/rust/apps/stellar/src/address.rs
index 88e2386..138164d 100644
--- a/rust/apps/stellar/src/address.rs
+++ b/rust/apps/stellar/src/address.rs
@@ -22,9 +22,7 @@ pub fn get_address(pub_key: &String) -> Result<String> {
.collect::<Vec<u8>>();
Ok(encode_base32(&data))
}
- Err(e) => Err(StellarError::AddressError(format!(
- "hex decode error {e}"
- ))),
+ Err(e) => Err(StellarError::AddressError(format!("hex decode error {e}"))),
}
}
diff --git a/rust/keystore/src/algorithms/ed25519/slip10_ed25519.rs b/rust/keystore/src/algorithms/ed25519/slip10_ed25519.rs
index dedde87..aa315ee 100644
--- a/rust/keystore/src/algorithms/ed25519/slip10_ed25519.rs
+++ b/rust/keystore/src/algorithms/ed25519/slip10_ed25519.rs
@@ -21,7 +21,9 @@ pub fn get_private_key_by_seed(seed: &[u8], path: &String) -> Result<[u8; 32]> {
new_vec.push(index + 0x80000000);
return Ok(new_vec);
}
- Err(KeystoreError::InvalidDerivationPath("non hardened derivation is not supported for slip10-ed25519".to_string()))
+ Err(KeystoreError::InvalidDerivationPath(
+ "non hardened derivation is not supported for slip10-ed25519".to_string(),
+ ))
}
e => e,
})?;
diff --git a/rust/keystore/src/algorithms/zcash/mod.rs b/rust/keystore/src/algorithms/zcash/mod.rs
index ce881bd..4c23976 100644
--- a/rust/keystore/src/algorithms/zcash/mod.rs
+++ b/rust/keystore/src/algorithms/zcash/mod.rs
@@ -105,7 +105,6 @@ mod tests {
use rand_chacha::ChaCha8Rng;
extern crate std;
-
#[test]
fn test_ufvk_generation_and_encoding() {
diff --git a/rust/zcash_vendor/src/pczt_ext.rs b/rust/zcash_vendor/src/pczt_ext.rs
index 25032ff..cb74be5 100644
--- a/rust/zcash_vendor/src/pczt_ext.rs
+++ b/rust/zcash_vendor/src/pczt_ext.rs
@@ -301,12 +301,20 @@ fn sheilded_sig_commitment(pczt: &Pczt, lock_time: u32, input_info: Option<Signa
let sig_digest = transparent_sig_digest(pczt, input_info);
h.update(sig_digest.as_bytes());
h.update(
- if has_sapling(pczt) { digest_sapling(pczt) } else { hash_sapling_txid_empty() }
- .as_bytes(),
+ if has_sapling(pczt) {
+ digest_sapling(pczt)
+ } else {
+ hash_sapling_txid_empty()
+ }
+ .as_bytes(),
);
h.update(
- if has_orchard(pczt) { digest_orchard(pczt) } else { hash_orchard_txid_empty() }
- .as_bytes(),
+ if has_orchard(pczt) {
+ digest_orchard(pczt)
+ } else {
+ hash_orchard_txid_empty()
+ }
+ .as_bytes(),
);
h.finalize()
}
Risk score
Our methodology →Why this scored 15/100
Human-validated context
Community notes
Notes can correct, qualify, or add evidence to the AI analysis. Every note shown here has been validated by a human moderator.
No validated notes yet.
The AI analysis stands alone for now. Submit a note if you can add evidence or important context.