From ec20ce08dae6b0a60666f4d13ee36de050f3cae9 Mon Sep 17 00:00:00 2001 From: Alexandre RAY-BERNAT Date: Mon, 26 May 2025 14:42:16 +0200 Subject: [PATCH] Fix some clippy issues --- .drone.yml | 7 +++---- src/dto.rs | 1 - src/main.rs | 38 ++++++-------------------------------- src/solana_rpc_calls.rs | 6 ------ 4 files changed, 9 insertions(+), 43 deletions(-) diff --git a/.drone.yml b/.drone.yml index f422e36..556dc5a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -16,8 +16,6 @@ steps: pull: always commands: - cargo build --release --target x86_64-unknown-linux-musl - - cargo clippy - - cargo fmt --check - name: docker build & push image: plugins/docker environment: @@ -27,10 +25,11 @@ steps: privileged: true settings: dockerfile: Dockerfile + username: drone_publish_token + password: + from_secret: gitea_secret repo: code.raybernat.com/alex/solana_scanner registry: code.raybernat.com - username: drone - tags: - latest - ${DRONE_COMMIT_SHA} diff --git a/src/dto.rs b/src/dto.rs index 69b0368..2f62f04 100644 --- a/src/dto.rs +++ b/src/dto.rs @@ -1,7 +1,6 @@ use borsh_derive::BorshDeserialize; use serde::Deserialize; use solana_program::clock::Slot; -use solana_program::program_option::COption; use solana_program::pubkey::Pubkey; use solana_sdk::transaction::TransactionError; diff --git a/src/main.rs b/src/main.rs index d751a05..c82bc2e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,33 +1,14 @@ -use std::error::Error; -use bs58; -use chrono; -use solana_sdk::message::Message; - -use crate::dto::{AccountKeys, ParsedAccount, TokenData, TokenInfo, Transaction, TokenSocials }; +use crate::dto::{AccountKeys, TokenData, Transaction }; use crate::utils::{base58_to_pubkey, get_token_socials}; -use anyhow::Result; -use anyhow::anyhow; use base64::prelude::*; -use borsh::{BorshDeserialize, BorshSerialize}; -use chrono::Utc; -use hex; use lazy_static::lazy_static; use log::{debug, error, info}; -use mpl_token_metadata::accounts::Metadata; -use serde::{Deserialize, Serialize}; -use solana_account_decoder::{UiAccountData, UiAccountEncoding}; use solana_client::rpc_client::RpcClient; -use solana_client::rpc_config::RpcAccountInfoConfig; -use solana_client::rpc_request::TokenAccountsFilter; -use solana_program::{program_pack::Pack, pubkey::Pubkey}; -use solana_sdk::account::Account; -use solana_sdk::message::VersionedMessage; +use solana_program::pubkey::Pubkey; use solana_sdk::signature::Signature; -use solana_sdk::transaction::{TransactionError, VersionedTransaction}; +use solana_sdk::transaction:: VersionedTransaction; use solana_transaction_status::EncodedTransaction::Binary; -use solana_transaction_status::{EncodedConfirmedTransactionWithStatusMeta, UiTransactionEncoding}; use solana_transaction_status_client_types::option_serializer; -use spl_token::state::Mint; use std::str::FromStr; use utils::sanitize_string; use solana_rpc_calls::*; @@ -48,7 +29,7 @@ async fn main() { // Adresse du programme Token (SPL Token Program) --> pumpfun let token_program_address = "TSLvdd1pWpHVjahSpsvCXUbgwsL3JAcvokwaKt1eokM"; - let buy_router_address = "6EF8rrecthR5Dkzon8Nwu78hRvfCKubJ14M5uBEwF6P"; + //let buy_router_address = "6EF8rrecthR5Dkzon8Nwu78hRvfCKubJ14M5uBEwF6P"; match base58_to_pubkey(token_program_address) { Ok(token_program) => { @@ -97,7 +78,7 @@ async fn main() { } match tx.transaction.transaction { - Binary(data, encoding) => { + Binary(data, _) => { let decoded = BASE64_STANDARD.decode(data).unwrap(); if let Ok(versioned_tx) = @@ -172,13 +153,7 @@ async fn main() { dbg!(token_data.clone()); - - let is_safe_token = - is_safe_token( - token_data.clone(), - ); - - if (is_safe_token) { + if is_safe_token(token_data.clone()){ println!("Token OK"); @@ -200,7 +175,6 @@ async fn main() { \nTwitter: {} \ \nWebsite: {} \ \nImage: {} \ - ", token_data.name, token_data.symbol, token_data.uri, diff --git a/src/solana_rpc_calls.rs b/src/solana_rpc_calls.rs index 40557f9..8114e7e 100644 --- a/src/solana_rpc_calls.rs +++ b/src/solana_rpc_calls.rs @@ -1,20 +1,14 @@ -use anyhow::anyhow; -use base64::Engine; -use base64::prelude::BASE64_STANDARD; use log::error; use mpl_token_metadata::accounts::Metadata; use solana_account_decoder::{UiAccountData, UiAccountEncoding}; use solana_client::rpc_client::RpcClient; use solana_client::rpc_config::RpcAccountInfoConfig; use solana_client::rpc_request::TokenAccountsFilter; -use solana_program::message::{Message, VersionedMessage}; use solana_program::program_pack::Pack; use solana_program::pubkey::Pubkey; use solana_sdk::account::Account; use solana_sdk::signature::Signature; -use solana_sdk::transaction::VersionedTransaction; use solana_transaction_status_client_types::{EncodedConfirmedTransactionWithStatusMeta, UiTransactionEncoding}; -use solana_transaction_status_client_types::EncodedTransaction::Binary; use spl_token::state::Mint; use crate::dto::{ParsedAccount, TokenInfo}; use crate::{ find_metadata_account};