[feat]: Switch to ethers instead of ethers_*

Cargo.toml

@@ -8,9 +8,7 @@ edition = "2021"
 [dependencies]
 cfonts = "1.1.0"
 chrono = "0.4.26"
-ethers-core = "2.0.8"
-ethers-etherscan = "2.0.10"
-ethers-providers = "2.0.8"
+ethers = { git = "https://github.com/woxjro/ethers-rs", branch = "feat/etherscan/stats" }
 futures = "0.3.28"
 ratatui = { version = "0.22.0", features = ["all-widgets"] }
 serde_json = "1.0.104"

src/app.rs

@@ -6,7 +6,7 @@ use crate::ethers::types::TransactionWithReceipt;
 use crate::network::IoEvent;
 use crate::route::{ActiveBlock, Route};
 use crate::widget::StatefulList;
-use ethers_core::types::{Block, NameOrAddress, Transaction, TxHash, U64};
+use ethers::core::types::{Block, NameOrAddress, Transaction, TxHash, U64};
 use ratatui::widgets::{ListState, TableState};
 use statistics::Statistics;
 use std::sync::mpsc::Sender;

src/app/block.rs

@@ -1,4 +1,4 @@
-use ethers_core::types::Block;
+use ethers::core::types::Block;
 
 pub enum SelectableBlockDetailItem {
     Transactions,

src/app/event_handling.rs

@@ -2,7 +2,7 @@ use crate::app::{
     block::SelectableBlockDetailItem, statistics::Statistics,
     transaction::SelectableTransactionDetailItem, App, InputMode,
 };
-use ethers_core::types::NameOrAddress;
+use ethers::core::types::NameOrAddress;
 
 use crate::network::IoEvent;
 use crate::route::{ActiveBlock, Route, RouteId};

src/app/statistics.rs

@@ -1,4 +1,4 @@
-use ethers_core::types::{Block, Transaction, U64};
+use ethers::core::types::{Block, Transaction, U64};
 
 #[derive(Clone, Debug)]
 pub struct Statistics {

src/ethers.rs

@@ -1,5 +1,5 @@
 pub mod types {
-    use ethers_core::types::{Address, Transaction, TransactionReceipt, U256};
+    use ethers::core::types::{Address, Transaction, TransactionReceipt, U256};
     use url::Url;
 
     #[derive(Clone, Debug, PartialEq)]

src/network.rs

@@ -3,12 +3,12 @@ use crate::ethers::types::{AddressInfo, TransactionWithReceipt};
 use crate::route::{ActiveBlock, Route, RouteId};
 use crate::widget::StatefulList;
 use crate::Etherscan;
-use ethers_core::types::Chain;
-use ethers_core::types::{
+use ethers::core::types::Chain;
+use ethers::core::types::{
     Address, Block, BlockId, BlockNumber, NameOrAddress, Transaction, TxHash, H256, U64,
 };
-use ethers_etherscan::Client;
-use ethers_providers::{Http, Middleware, Provider};
+use ethers::etherscan::Client;
+use ethers::providers::{Http, Middleware, Provider};
 use futures::future::join_all;
 use std::error::Error;
 use std::sync::Arc;

src/route.rs

@@ -1,5 +1,5 @@
 use crate::ethers::types::{AddressInfo, TransactionWithReceipt};
-use ethers_core::types::{Block, Transaction};
+use ethers::core::types::{Block, Transaction};
 
 #[derive(PartialEq, Clone)]
 pub enum RouteId {

src/ui/home/address_info.rs

@@ -1,7 +1,7 @@
 use crate::app::App;
 use crate::ethers::types::AddressInfo;
 use crate::route::ActiveBlock;
-use ethers_core::utils::format_ether;
+use ethers::core::utils::format_ether;
 use ratatui::{prelude::*, widgets::*};
 
 pub fn render<B: Backend>(

src/ui/home/block.rs

@@ -6,7 +6,7 @@ mod withdrawals;
 use crate::app::App;
 use crate::route::ActiveBlock;
 use crate::route::RouteId;
-use ethers_core::types::{Block as EBlock, Transaction};
+use ethers::core::types::{Block as EBlock, Transaction};
 use ratatui::{prelude::*, widgets::*};
 
 pub fn render<B: Backend>(

src/ui/home/block/block_info.rs

@@ -1,6 +1,6 @@
 use crate::app::{block::SelectableBlockDetailItem, App};
 use crate::route::{ActiveBlock, RouteId};
-use ethers_core::types::{Block as EBlock, Transaction};
+use ethers::core::types::{Block as EBlock, Transaction};
 use ratatui::{prelude::*, widgets::*};
 
 pub fn render<B: Backend>(

src/ui/home/block/fee_info.rs

@@ -1,6 +1,6 @@
 use crate::app::{block::SelectableBlockDetailItem, App};
 use crate::route::{ActiveBlock, RouteId};
-use ethers_core::types::{Block as EBlock, Transaction};
+use ethers::core::types::{Block as EBlock, Transaction};
 use ratatui::{prelude::*, widgets::*};
 
 pub fn render<B: Backend>(

src/ui/home/block/gas_info.rs

@@ -1,7 +1,7 @@
 use crate::app::{block::SelectableBlockDetailItem, App};
 use crate::route::{ActiveBlock, RouteId};
-use ethers_core::types::{Block as EBlock, Transaction};
-use ethers_core::utils::{format_ether, format_units};
+use ethers::core::types::{Block as EBlock, Transaction};
+use ethers::core::utils::{format_ether, format_units};
 use ratatui::{prelude::*, widgets::*};
 
 pub fn render<B: Backend>(

src/ui/home/block/transactions.rs

@@ -1,7 +1,7 @@
 use crate::app::App;
 use crate::route::{ActiveBlock, RouteId};
-use ethers_core::types::{Block as EBlock, Transaction, U64};
-use ethers_core::utils::{format_ether, format_units};
+use ethers::core::types::{Block as EBlock, Transaction, U64};
+use ethers::core::utils::{format_ether, format_units};
 use ratatui::{prelude::*, widgets::*};
 
 pub fn render<B: Backend>(

src/ui/home/block/withdrawals.rs

@@ -1,6 +1,6 @@
 use crate::app::App;
 use crate::route::{ActiveBlock, RouteId};
-use ethers_core::types::{Block as EBlock, Transaction};
+use ethers::core::types::{Block as EBlock, Transaction};
 use ratatui::{prelude::*, widgets::*};
 
 pub fn render<B: Backend>(

src/ui/home/latest_status.rs

@@ -2,7 +2,7 @@ use crate::app::App;
 use crate::route::ActiveBlock;
 use crate::widget::Spinner;
 use chrono::Utc;
-use ethers_core::utils::format_ether;
+use ethers::core::utils::format_ether;
 use ratatui::{prelude::*, widgets::*};
 
 pub fn render<B: Backend>(f: &mut Frame<B>, app: &mut App, rect: Rect) {

src/ui/home/transaction.rs

@@ -1,8 +1,8 @@
 use crate::app::{transaction::SelectableTransactionDetailItem, App};
 use crate::ethers::types::TransactionWithReceipt;
 use crate::route::ActiveBlock;
-use ethers_core::types::U64;
-use ethers_core::utils::{format_ether, format_units};
+use ethers::core::types::U64;
+use ethers::core::utils::{format_ether, format_units};
 use ratatui::{prelude::*, widgets::*};
 
 pub fn render<B: Backend>(