From 7760b95a41ed88c6f4e8ef348a93e1759da9adfa Mon Sep 17 00:00:00 2001 From: Sergio Chouhy Date: Wed, 23 Apr 2025 11:26:47 -0300 Subject: [PATCH] Fix register account method --- node_rpc/src/process.rs | 34 +++++++++++++++---------------- node_rpc/src/types/rpc_structs.rs | 9 ++++++++ 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/node_rpc/src/process.rs b/node_rpc/src/process.rs index 25cd9ec..896f426 100644 --- a/node_rpc/src/process.rs +++ b/node_rpc/src/process.rs @@ -13,27 +13,27 @@ use common::transaction::ActionData; use common::rpc_primitives::requests::{ GetBlockDataRequest, GetBlockDataResponse, GetLastBlockRequest, GetLastBlockResponse, - RegisterAccountRequest, RegisterAccountResponse, }; use crate::types::{ err_rpc::cast_common_execution_error_into_rpc_error, rpc_structs::{ - ExecuteScenarioMultipleSendRequest, ExecuteScenarioMultipleSendResponse, - ExecuteScenarioSplitRequest, ExecuteScenarioSplitResponse, ExecuteSubscenarioRequest, - ExecuteSubscenarioResponse, ShowAccountPublicBalanceRequest, - ShowAccountPublicBalanceResponse, ShowAccountUTXORequest, ShowAccountUTXOResponse, - ShowTransactionRequest, ShowTransactionResponse, UTXOShortEssentialStruct, - WriteDepositPublicBalanceRequest, WriteDepositPublicBalanceResponse, - WriteMintPrivateUTXOMultipleAssetsRequest, WriteMintPrivateUTXOMultipleAssetsResponse, - WriteMintPrivateUTXORequest, WriteMintPrivateUTXOResponse, - WriteSendDeshieldedBalanceRequest, WriteSendDeshieldedUTXOResponse, - WriteSendPrivateUTXORequest, WriteSendPrivateUTXOResponse, WriteSendShieldedUTXORequest, - WriteSendShieldedUTXOResponse, WriteSendSplitUTXOResponse, WriteSplitUTXORequest, + CreateAccountRequest, CreateAccountResponse, ExecuteScenarioMultipleSendRequest, + ExecuteScenarioMultipleSendResponse, ExecuteScenarioSplitRequest, + ExecuteScenarioSplitResponse, ExecuteSubscenarioRequest, ExecuteSubscenarioResponse, + ShowAccountPublicBalanceRequest, ShowAccountPublicBalanceResponse, ShowAccountUTXORequest, + ShowAccountUTXOResponse, ShowTransactionRequest, ShowTransactionResponse, + UTXOShortEssentialStruct, WriteDepositPublicBalanceRequest, + WriteDepositPublicBalanceResponse, WriteMintPrivateUTXOMultipleAssetsRequest, + WriteMintPrivateUTXOMultipleAssetsResponse, WriteMintPrivateUTXORequest, + WriteMintPrivateUTXOResponse, WriteSendDeshieldedBalanceRequest, + WriteSendDeshieldedUTXOResponse, WriteSendPrivateUTXORequest, WriteSendPrivateUTXOResponse, + WriteSendShieldedUTXORequest, WriteSendShieldedUTXOResponse, WriteSendSplitUTXOResponse, + WriteSplitUTXORequest, }, }; -pub const WRITE_REGISTER_ACCOUNT: &str = "write_register_account"; +pub const CREATE_ACCOUNT: &str = "create_account"; pub const EXECUTE_SUBSCENARIO: &str = "execute_subscenario"; pub const GET_BLOCK: &str = "get_block"; pub const GET_LAST_BLOCK: &str = "get_last_block"; @@ -155,8 +155,8 @@ impl JsonHandler { respond(helperstruct) } - async fn process_register_account(&self, request: Request) -> Result { - let _req = RegisterAccountRequest::parse(Some(request.params))?; + async fn process_create_account(&self, request: Request) -> Result { + let _req = CreateAccountRequest::parse(Some(request.params))?; let acc_addr = { let mut guard = self.node_chain_store.lock().await; @@ -164,7 +164,7 @@ impl JsonHandler { guard.create_new_account().await }; - let helperstruct = RegisterAccountResponse { + let helperstruct = CreateAccountResponse { status: hex::encode(acc_addr), }; @@ -782,7 +782,7 @@ impl JsonHandler { pub async fn process_request_internal(&self, request: Request) -> Result { match request.method.as_ref() { //Todo : Add handling of more JSON RPC methods - WRITE_REGISTER_ACCOUNT => self.process_register_account(request).await, + CREATE_ACCOUNT => self.process_create_account(request).await, EXECUTE_SUBSCENARIO => self.process_request_execute_subscenario(request).await, GET_BLOCK => self.process_get_block_data(request).await, GET_LAST_BLOCK => self.process_get_last_block(request).await, diff --git a/node_rpc/src/types/rpc_structs.rs b/node_rpc/src/types/rpc_structs.rs index 7418de1..3ae8694 100644 --- a/node_rpc/src/types/rpc_structs.rs +++ b/node_rpc/src/types/rpc_structs.rs @@ -90,6 +90,9 @@ pub struct WriteSplitUTXORequest { pub utxo_commitment: String, } +#[derive(Serialize, Deserialize, Debug)] +pub struct CreateAccountRequest {} + // parse_request!(GetGenesisIdRequest); parse_request!(ExecuteSubscenarioRequest); parse_request!(ExecuteScenarioSplitRequest); @@ -107,6 +110,7 @@ parse_request!(WriteSendPrivateUTXORequest); parse_request!(WriteSendShieldedUTXORequest); parse_request!(WriteSendDeshieldedBalanceRequest); parse_request!(WriteSplitUTXORequest); +parse_request!(CreateAccountRequest); #[derive(Serialize, Deserialize, Debug)] pub struct ExecuteSubscenarioResponse { @@ -195,3 +199,8 @@ pub struct WriteSendSplitUTXOResponse { pub status: String, pub utxo_results: Vec, } + +#[derive(Serialize, Deserialize, Debug)] +pub struct CreateAccountResponse { + pub status: String, +}