chore: use correct type in getAccount

crates/primitives-traits/src/account.rs

@@ -8,6 +8,7 @@ use reth_codecs::{reth_codec, Compact};
 use revm_primitives::{AccountInfo, Bytecode as RevmBytecode, JumpTable};
 use serde::{Deserialize, Serialize};
 
+pub use alloy_consensus::Account as AccountTrie;
 /// An Ethereum account.
 #[reth_codec]
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Default, Serialize, Deserialize)]

crates/primitives-traits/src/lib.rs

@@ -22,7 +22,7 @@ pub use constants::gas_units::{format_gas, format_gas_throughput};
 
 /// Minimal account
 pub mod account;
-pub use account::{Account, Bytecode};
+pub use account::{Account, AccountTrie, Bytecode};
 
 mod integer_list;
 pub use integer_list::{IntegerList, RoaringBitmapError};

crates/primitives/src/lib.rs

@@ -53,8 +53,8 @@ pub use receipt::{
     gas_spent_by_transactions, Receipt, ReceiptWithBloom, ReceiptWithBloomRef, Receipts,
 };
 pub use reth_primitives_traits::{
-    logs_bloom, Account, Bytecode, GotExpected, GotExpectedBoxed, Header, HeaderError, Log,
-    LogData, Request, Requests, SealedHeader, StorageEntry, Withdrawal, Withdrawals,
+    logs_bloom, Account, AccountTrie, Bytecode, GotExpected, GotExpectedBoxed, Header, HeaderError,
+    Log, LogData, Request, Requests, SealedHeader, StorageEntry, Withdrawal, Withdrawals,
 };
 pub use static_file::StaticFileSegment;
 

crates/rpc/rpc-eth-api/src/core.rs

@@ -4,8 +4,8 @@
 use alloy_dyn_abi::TypedData;
 use jsonrpsee::{core::RpcResult, proc_macros::rpc};
 use reth_primitives::{
-    transaction::AccessListResult, Account, Address, BlockId, BlockNumberOrTag, Bytes, B256, B64,
-    U256, U64,
+    transaction::AccessListResult, AccountTrie, Address, BlockId, BlockNumberOrTag, Bytes, B256,
+    B64, U256, U64,
 };
 use reth_rpc_server_types::{result::internal_rpc_err, ToRpcResult};
 use reth_rpc_types::{
@@ -250,7 +250,7 @@ pub trait EthApi {
 
     /// Returns the account details by specifying an address and a block number/tag
     #[method(name = "getAccount")]
-    async fn get_account(&self, address: Address, block: BlockId) -> RpcResult<Account>;
+    async fn get_account(&self, address: Address, block: BlockId) -> RpcResult<AccountTrie>;
 
     /// Introduced in EIP-1559, returns suggestion for the priority for dynamic fee transactions.
     #[method(name = "maxPriorityFeePerGas")]
@@ -626,7 +626,7 @@ where
     }
 
     /// Handler for: `eth_getAccount`
-    async fn get_account(&self, _address: Address, _block: BlockId) -> RpcResult<Account> {
+    async fn get_account(&self, _address: Address, _block: BlockId) -> RpcResult<AccountTrie> {
         Err(internal_rpc_err("unimplemented"))
     }