rename anvil ext namespace to anvil_zks

crates/api_decl/src/lib.rs

@@ -1,7 +1,7 @@
 mod namespaces;
 
 pub use namespaces::{
-    AnvilExtNamespaceServer, AnvilNamespaceServer, ConfigNamespaceServer, EthTestNamespaceServer,
+    AnvilNamespaceServer, AnvilZksNamespaceServer, ConfigNamespaceServer, EthTestNamespaceServer,
     EvmNamespaceServer,
 };
 

crates/api_decl/src/namespaces/anvil_ext.rs → crates/api_decl/src/namespaces/anvil_zks.rs

@@ -1,11 +1,10 @@
-//! This module extends the Anvil JSON-RPC API with anvil-zksync specific RPC methods.
-
 use jsonrpsee::core::RpcResult;
 use jsonrpsee::proc_macros::rpc;
 use zksync_types::{L1BatchNumber, H256};
 
-#[rpc(server, namespace = "anvil")]
-pub trait AnvilExtNamespace {
+/// Custom namespace that contains anvil-zksync specific methods.
+#[rpc(server, namespace = "anvil_zks")]
+pub trait AnvilZksNamespace {
     #[method(name = "commitBatch")]
     async fn commit_batch(&self, batch_number: L1BatchNumber) -> RpcResult<H256>;
 }

crates/api_decl/src/namespaces/mod.rs

@@ -1,10 +1,10 @@
 mod anvil;
-mod anvil_ext;
+mod anvil_zks;
 mod config;
 mod eth_test;
 mod evm;
 
 pub use self::{
-    anvil::AnvilNamespaceServer, anvil_ext::AnvilExtNamespaceServer, config::ConfigNamespaceServer,
+    anvil::AnvilNamespaceServer, anvil_zks::AnvilZksNamespaceServer, config::ConfigNamespaceServer,
     eth_test::EthTestNamespaceServer, evm::EvmNamespaceServer,
 };

crates/api_server/src/impls/anvil_ext.rs → crates/api_server/src/impls/anvil_zks.rs

@@ -1,21 +1,21 @@
 use crate::error::RpcError;
-use anvil_zksync_api_decl::AnvilExtNamespaceServer;
+use anvil_zksync_api_decl::AnvilZksNamespaceServer;
 use anvil_zksync_l1_sidecar::L1Sidecar;
 use jsonrpsee::core::{async_trait, RpcResult};
 use zksync_types::{L1BatchNumber, H256};
 
-pub struct AnvilExtNamespace {
+pub struct AnvilZksNamespace {
     l1_sidecar: L1Sidecar,
 }
 
-impl AnvilExtNamespace {
+impl AnvilZksNamespace {
     pub fn new(l1_sidecar: L1Sidecar) -> Self {
         Self { l1_sidecar }
     }
 }
 
 #[async_trait]
-impl AnvilExtNamespaceServer for AnvilExtNamespace {
+impl AnvilZksNamespaceServer for AnvilZksNamespace {
     async fn commit_batch(&self, batch_number: L1BatchNumber) -> RpcResult<H256> {
         Ok(self
             .l1_sidecar

crates/api_server/src/impls/mod.rs

@@ -1,5 +1,5 @@
 mod anvil;
-mod anvil_ext;
+mod anvil_zks;
 mod config;
 mod debug;
 mod eth;
@@ -10,7 +10,7 @@ mod web3;
 mod zks;
 
 pub use self::{
-    anvil::AnvilNamespace, anvil_ext::AnvilExtNamespace, config::ConfigNamespace,
+    anvil::AnvilNamespace, anvil_zks::AnvilZksNamespace, config::ConfigNamespace,
     debug::DebugNamespace, eth::EthNamespace, eth_test::EthTestNamespace, evm::EvmNamespace,
     net::NetNamespace, web3::Web3Namespace, zks::ZksNamespace,
 };

crates/api_server/src/lib.rs

@@ -3,7 +3,7 @@ mod impls;
 mod server;
 
 pub use impls::{
-    AnvilNamespace, ConfigNamespace, DebugNamespace, EthNamespace, EthTestNamespace, EvmNamespace,
-    NetNamespace, Web3Namespace, ZksNamespace,
+    AnvilNamespace, AnvilZksNamespace, ConfigNamespace, DebugNamespace, EthNamespace,
+    EthTestNamespace, EvmNamespace, NetNamespace, Web3Namespace, ZksNamespace,
 };
 pub use server::NodeServerBuilder;

crates/api_server/src/server.rs

@@ -1,10 +1,9 @@
-use crate::impls::AnvilExtNamespace;
 use crate::{
-    AnvilNamespace, ConfigNamespace, DebugNamespace, EthNamespace, EthTestNamespace, EvmNamespace,
-    NetNamespace, Web3Namespace, ZksNamespace,
+    AnvilNamespace, AnvilZksNamespace, ConfigNamespace, DebugNamespace, EthNamespace,
+    EthTestNamespace, EvmNamespace, NetNamespace, Web3Namespace, ZksNamespace,
 };
 use anvil_zksync_api_decl::{
-    AnvilExtNamespaceServer, AnvilNamespaceServer, ConfigNamespaceServer, DebugNamespaceServer,
+    AnvilNamespaceServer, AnvilZksNamespaceServer, ConfigNamespaceServer, DebugNamespaceServer,
     EthNamespaceServer, EthTestNamespaceServer, EvmNamespaceServer, NetNamespaceServer,
     Web3NamespaceServer, ZksNamespaceServer,
 };
@@ -53,7 +52,7 @@ impl NodeServerBuilder {
             .unwrap();
         rpc.merge(AnvilNamespace::new(node.clone()).into_rpc())
             .unwrap();
-        rpc.merge(AnvilExtNamespace::new(l1_sidecar).into_rpc())
+        rpc.merge(AnvilZksNamespace::new(l1_sidecar).into_rpc())
             .unwrap();
         rpc.merge(EvmNamespace::new(node.clone()).into_rpc())
             .unwrap();

e2e-tests-rust/src/provider/anvil_zksync.rs

@@ -30,7 +30,7 @@ where
     /// Commits batch with given number to L1
     async fn anvil_commit_batch(&self, batch_number: u64) -> TransportResult<TxHash> {
         self.client()
-            .request("anvil_commitBatch", (batch_number,))
+            .request("anvil_zks_commitBatch", (batch_number,))
             .await
     }
 }