refactor(katana): move predeployedAccounts under DevApi and remove Ka…

…tanaApi (dojoengine#2310)

fix: move predeployedAccounts under DevApi and remove KatanaApi

bin/katana/src/cli/node.rs

@@ -271,7 +271,7 @@ impl NodeArgs {
     }
 
     fn server_config(&self) -> ServerConfig {
-        let mut apis = vec![ApiKind::Starknet, ApiKind::Katana, ApiKind::Torii, ApiKind::Saya];
+        let mut apis = vec![ApiKind::Starknet, ApiKind::Torii, ApiKind::Saya];
         // only enable `katana` API in dev mode
         if self.dev {
             apis.push(ApiKind::Dev);

crates/dojo-test-utils/src/sequencer.rs

@@ -43,13 +43,7 @@ impl TestSequencer {
             host: "127.0.0.1".into(),
             max_connections: 100,
             allowed_origins: None,
-            apis: vec![
-                ApiKind::Starknet,
-                ApiKind::Katana,
-                ApiKind::Dev,
-                ApiKind::Saya,
-                ApiKind::Torii,
-            ],
+            apis: vec![ApiKind::Starknet, ApiKind::Dev, ApiKind::Saya, ApiKind::Torii],
         };
 
         let (handle, backend) = katana_node::start(server_config, config, starknet_config)

crates/katana/node/src/lib.rs

@@ -32,13 +32,11 @@ use katana_provider::providers::fork::ForkedProvider;
 use katana_provider::providers::in_memory::InMemoryProvider;
 use katana_rpc::config::ServerConfig;
 use katana_rpc::dev::DevApi;
-use katana_rpc::katana::KatanaApi;
 use katana_rpc::metrics::RpcServerMetrics;
 use katana_rpc::saya::SayaApi;
 use katana_rpc::starknet::StarknetApi;
 use katana_rpc::torii::ToriiApi;
 use katana_rpc_api::dev::DevApiServer;
-use katana_rpc_api::katana::KatanaApiServer;
 use katana_rpc_api::saya::SayaApiServer;
 use katana_rpc_api::starknet::{StarknetApiServer, StarknetTraceApiServer, StarknetWriteApiServer};
 use katana_rpc_api::torii::ToriiApiServer;
@@ -243,9 +241,6 @@ pub async fn spawn<EF: ExecutorFactory>(
                 methods.merge(StarknetWriteApiServer::into_rpc(server.clone()))?;
                 methods.merge(StarknetTraceApiServer::into_rpc(server))?;
             }
-            ApiKind::Katana => {
-                methods.merge(KatanaApi::new(backend.clone()).into_rpc())?;
-            }
             ApiKind::Dev => {
                 methods.merge(DevApi::new(backend.clone(), block_producer.clone()).into_rpc())?;
             }

crates/katana/rpc/rpc-api/src/dev.rs

@@ -1,6 +1,7 @@
 use jsonrpsee::core::RpcResult;
 use jsonrpsee::proc_macros::rpc;
 use katana_primitives::FieldElement;
+use katana_rpc_types::account::Account;
 
 #[cfg_attr(not(feature = "client"), rpc(server, namespace = "dev"))]
 #[cfg_attr(feature = "client", rpc(client, server, namespace = "dev"))]
@@ -24,4 +25,7 @@ pub trait DevApi {
         key: FieldElement,
         value: FieldElement,
     ) -> RpcResult<()>;
+
+    #[method(name = "predeployedAccounts")]
+    async fn predeployed_accounts(&self) -> RpcResult<Vec<Account>>;
 }

crates/katana/rpc/rpc-api/src/lib.rs

@@ -1,5 +1,4 @@
 pub mod dev;
-pub mod katana;
 pub mod saya;
 pub mod starknet;
 pub mod torii;
@@ -8,7 +7,6 @@ pub mod torii;
 #[derive(Debug, Copy, Clone)]
 pub enum ApiKind {
     Starknet,
-    Katana,
     Torii,
     Dev,
     Saya,

crates/katana/rpc/rpc/src/dev.rs

@@ -6,6 +6,7 @@ use katana_core::service::block_producer::{BlockProducer, BlockProducerMode, Pen
 use katana_executor::ExecutorFactory;
 use katana_primitives::FieldElement;
 use katana_rpc_api::dev::DevApiServer;
+use katana_rpc_types::account::Account;
 use katana_rpc_types::error::dev::DevApiError;
 
 #[allow(missing_debug_implementations)]
@@ -90,4 +91,9 @@ impl<EF: ExecutorFactory> DevApiServer for DevApi<EF> {
         //     .map_err(|_| Error::from(KatanaApiError::FailedToUpdateStorage))
         Ok(())
     }
+
+    #[allow(deprecated)]
+    async fn predeployed_accounts(&self) -> Result<Vec<Account>, Error> {
+        Ok(self.backend.config.genesis.accounts().map(|e| Account::new(*e.0, e.1)).collect())
+    }
 }

crates/katana/rpc/rpc/src/lib.rs

@@ -5,7 +5,6 @@
 
 pub mod config;
 pub mod dev;
-pub mod katana;
 pub mod metrics;
 pub mod saya;
 pub mod starknet;

crates/katana/runner/src/lib.rs

@@ -102,6 +102,7 @@ impl KatanaRunner {
             .accounts(n_accounts)
             .json_log(true)
             .max_connections(10000)
+            .dev(config.dev)
             .fee(!config.disable_fee);
 
         if let Some(block_time_ms) = config.block_time {

crates/sozo/ops/src/migration/mod.rs

@@ -66,7 +66,7 @@ async fn get_declarers_accounts<A: ConnectedAccount>(
         .post(rpc_url)
         .json(&serde_json::json!({
             "jsonrpc": "2.0",
-            "method": "katana_predeployedAccounts",
+            "method": "dev_predeployedAccounts",
             "params": [],
             "id": 1
         }))