anvil-polkadot: add chain reversion RPCs

crates/anvil-polkadot/Cargo.toml

@@ -21,6 +21,7 @@ path = "bin/main.rs"
 # foundry internal
 codec = { version = "3.7.5", default-features = true, package = "parity-scale-codec" }
 substrate-runtime = { path = "substrate-runtime" }
+pallet-revive-eth-rpc = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
 secp256k1 = { version = "0.28.0", default-features = false }
 libsecp256k1 = { version = "0.7.0", default-features = false }
 sp-runtime-interface = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master", default-features = false }
@@ -64,7 +65,6 @@ polkadot-sdk = { git = "https://github.com/paritytech/polkadot-sdk.git", branch
 	"substrate-frame-rpc-system",
 	"substrate-rpc-client",
 	"substrate-wasm-builder",
-	"pallet-revive-eth-rpc"
 ] }
 anvil.workspace = true
 anvil-core.workspace = true

crates/anvil-polkadot/src/api_server/error.rs

@@ -1,9 +1,7 @@
 use crate::substrate_node::{mining_engine::MiningError, service::BackendError};
 use anvil_rpc::{error::RpcError, response::ResponseResult};
-use polkadot_sdk::{
-    pallet_revive_eth_rpc::{EthRpcError, client::ClientError},
-    sp_api,
-};
+use pallet_revive_eth_rpc::{EthRpcError, client::ClientError};
+use polkadot_sdk::sp_api;
 use serde::Serialize;
 
 #[derive(Debug, thiserror::Error)]
@@ -16,6 +14,10 @@ pub enum Error {
     InvalidParams(String),
     #[error("Revive call failed: {0}")]
     ReviveRpc(#[from] EthRpcError),
+    #[error("Snapshot error: {0}")]
+    SnapshotRpc(String),
+    #[error("Subxt error: {0}")]
+    Subxt(#[from] subxt::error::Error),
     #[error(transparent)]
     Backend(#[from] BackendError),
     #[error("Nonce overflowing the substrate nonce type")]
@@ -28,12 +30,6 @@ pub enum Error {
     InternalError(String),
 }
 
-impl From<subxt::Error> for Error {
-    fn from(err: subxt::Error) -> Self {
-        Self::ReviveRpc(EthRpcError::ClientError(err.into()))
-    }
-}
-
 impl From<ClientError> for Error {
     fn from(err: ClientError) -> Self {
         Self::ReviveRpc(EthRpcError::ClientError(err))
@@ -83,6 +79,13 @@ impl<T: Serialize> ToRpcResponseResult for Result<T> {
                 Error::InvalidParams(error_message) => {
                     RpcError::invalid_params(error_message).into()
                 }
+                Error::SnapshotRpc(err) => RpcError::internal_error_with(err).into(),
+                Error::ReviveRpc(client_error) => {
+                    RpcError::internal_error_with(format!("{client_error}")).into()
+                }
+                Error::Subxt(subxt_err) => {
+                    RpcError::internal_error_with(format!("{subxt_err}")).into()
+                }
                 err => RpcError::internal_error_with(format!("{err}")).into(),
             },
         }

crates/anvil-polkadot/src/api_server/mod.rs

@@ -1,7 +1,9 @@
 use crate::{
     AnvilNodeConfig,
     logging::LoggingManager,
-    substrate_node::{impersonation::ImpersonationManager, service::Service},
+    substrate_node::{
+        impersonation::ImpersonationManager, service::Service, snapshot::SnapshotManager,
+    },
 };
 use anvil_core::eth::EthRequest;
 use anvil_rpc::response::ResponseResult;
@@ -20,19 +22,26 @@ pub struct ApiRequest {
 }
 
 pub fn spawn(
+    config: &AnvilNodeConfig,
     substrate_service: &Service,
     logging_manager: LoggingManager,
-    config: &AnvilNodeConfig,
+    snapshot_manager: SnapshotManager,
 ) -> ApiHandle {
     let (api_handle, receiver) = mpsc::channel(100);
 
     let service = substrate_service.clone();
     let mut impersonation_manager = ImpersonationManager::default();
     impersonation_manager.set_auto_impersonate_account(config.enable_auto_impersonate);
     substrate_service.spawn_handle.spawn("anvil-api-server", "anvil", async move {
-        let api_server = ApiServer::new(service, receiver, logging_manager, impersonation_manager)
-            .await
-            .unwrap_or_else(|err| panic!("Failed to spawn the API server: {err}"));
+        let api_server = ApiServer::new(
+            service,
+            receiver,
+            logging_manager,
+            snapshot_manager,
+            impersonation_manager,
+        )
+        .await
+        .unwrap_or_else(|err| panic!("Failed to spawn the API server: {err}"));
         api_server.run().await;
     });