From c4bff550bb9ceff1e9731ee1bb05b4bda053ddca Mon Sep 17 00:00:00 2001 From: Rostyslav Tyshko Date: Sun, 9 Feb 2025 11:44:10 -0500 Subject: [PATCH 01/10] lock file changes --- Cargo.lock | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index 00ae759..8f56826 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3824,8 +3824,10 @@ dependencies = [ "anyhow", "env_logger", "log", + "sequencer_core", "serde", "serde_json", + "storage", ] [[package]] From d34d87c274e8a66b5707d8e541d4395f394ea921 Mon Sep 17 00:00:00 2001 From: Rostyslav Tyshko Date: Sun, 9 Feb 2025 11:44:24 -0500 Subject: [PATCH 02/10] rm redundunt structures in json --- node_core/src/sequencer_client/json.rs | 32 +------------------------- 1 file changed, 1 insertion(+), 31 deletions(-) diff --git a/node_core/src/sequencer_client/json.rs b/node_core/src/sequencer_client/json.rs index 7683ea8..93a3231 100644 --- a/node_core/src/sequencer_client/json.rs +++ b/node_core/src/sequencer_client/json.rs @@ -1,16 +1,9 @@ use rpc_primitives::errors::RpcError; use serde::{Deserialize, Serialize}; -use storage::{block::Block, transaction::Transaction}; +use storage::transaction::Transaction; //Requests -#[derive(Serialize, Deserialize, Debug)] -pub struct RegisterAccountRequest { - pub nullifier_public_key: Vec, - pub viewing_public_key: Vec, - pub address: [u8; 32], -} - #[derive(Serialize, Deserialize, Debug)] pub struct SendTxRequest { pub transaction: Transaction, @@ -18,37 +11,14 @@ pub struct SendTxRequest { pub tx_roots: [[u8; 32]; 3], } -#[derive(Serialize, Deserialize, Debug)] -pub struct GetBlockDataRequest { - pub block_id: u64, -} - -#[derive(Serialize, Deserialize, Debug)] -pub struct GetGenesisIdRequest {} - //Responses -#[derive(Serialize, Deserialize, Debug)] -pub struct RegisterAccountResponse { - pub status: String, -} - #[derive(Serialize, Deserialize, Debug)] pub struct SendTxResponse { pub status: String, pub additional_data: Option, } -#[derive(Serialize, Deserialize, Debug)] -pub struct GetBlockDataResponse { - pub block: Block, -} - -#[derive(Serialize, Deserialize, Debug)] -pub struct GetGenesisIdResponse { - pub genesis_id: u64, -} - //General #[derive(Debug, Clone, Serialize)] From 809cc090e5885e198a8062362b7f33ad3f15ab5b Mon Sep 17 00:00:00 2001 From: Rostyslav Tyshko Date: Sun, 9 Feb 2025 11:44:41 -0500 Subject: [PATCH 03/10] rm parse --- node_rpc/src/types/mod.rs | 1 - node_rpc/src/types/parse.rs | 1 - 2 files changed, 2 deletions(-) delete mode 100644 node_rpc/src/types/parse.rs diff --git a/node_rpc/src/types/mod.rs b/node_rpc/src/types/mod.rs index 6084ddd..4901b7f 100644 --- a/node_rpc/src/types/mod.rs +++ b/node_rpc/src/types/mod.rs @@ -1,3 +1,2 @@ pub mod err_rpc; -pub mod parse; pub mod rpc_structs; diff --git a/node_rpc/src/types/parse.rs b/node_rpc/src/types/parse.rs deleted file mode 100644 index 8b13789..0000000 --- a/node_rpc/src/types/parse.rs +++ /dev/null @@ -1 +0,0 @@ - From f472c253496cbada427ab6a71fef86bb202e6ee4 Mon Sep 17 00:00:00 2001 From: Rostyslav Tyshko Date: Sun, 9 Feb 2025 11:44:55 -0500 Subject: [PATCH 04/10] rm node_core reduncunt code --- sequencer_rpc/src/types/rpc_structs.rs | 73 -------------------------- 1 file changed, 73 deletions(-) delete mode 100644 sequencer_rpc/src/types/rpc_structs.rs diff --git a/sequencer_rpc/src/types/rpc_structs.rs b/sequencer_rpc/src/types/rpc_structs.rs deleted file mode 100644 index 1c95fb8..0000000 --- a/sequencer_rpc/src/types/rpc_structs.rs +++ /dev/null @@ -1,73 +0,0 @@ -use rpc_primitives::errors::RpcParseError; -use rpc_primitives::parse_request; -use rpc_primitives::parser::parse_params; -use rpc_primitives::parser::RpcRequest; -use sequencer_core::transaction_mempool::TransactionMempool; -use serde::{Deserialize, Serialize}; -use serde_json::Value; -use storage::block::Block; - -#[derive(Serialize, Deserialize, Debug)] -pub struct HelloRequest {} - -#[derive(Serialize, Deserialize, Debug)] -pub struct RegisterAccountRequest { - pub nullifier_public_key: Vec, - pub viewing_public_key: Vec, - pub address: [u8; 32], -} - -#[derive(Serialize, Deserialize, Debug)] -pub struct SendTxRequest { - pub transaction: TransactionMempool, - ///Nullifier Root, UTXO Commitment Root, Pub Tx Root - pub tx_roots: [[u8; 32]; 3], -} - -#[derive(Serialize, Deserialize, Debug)] -pub struct GetBlockDataRequest { - pub block_id: u64, -} - -#[derive(Serialize, Deserialize, Debug)] -pub struct GetGenesisIdRequest {} - -#[derive(Serialize, Deserialize, Debug)] -pub struct GetLastBlockRequest {} - -parse_request!(HelloRequest); -parse_request!(RegisterAccountRequest); -parse_request!(SendTxRequest); -parse_request!(GetBlockDataRequest); -parse_request!(GetGenesisIdRequest); -parse_request!(GetLastBlockRequest); - -#[derive(Serialize, Deserialize, Debug)] -pub struct HelloResponse { - pub greeting: String, -} - -#[derive(Serialize, Deserialize, Debug)] -pub struct RegisterAccountResponse { - pub status: String, -} - -#[derive(Serialize, Deserialize, Debug)] -pub struct SendTxResponse { - pub status: String, -} - -#[derive(Serialize, Deserialize, Debug)] -pub struct GetBlockDataResponse { - pub block: Block, -} - -#[derive(Serialize, Deserialize, Debug)] -pub struct GetGenesisIdResponse { - pub genesis_id: u64, -} - -#[derive(Serialize, Deserialize, Debug)] -pub struct GetLastBlockResponse { - pub last_block: u64, -} From 8815eb836c65a0653eb1962a3125da980b0e0e69 Mon Sep 17 00:00:00 2001 From: Rostyslav Tyshko Date: Sun, 9 Feb 2025 11:45:01 -0500 Subject: [PATCH 05/10] unused --- sequencer_rpc/src/types/mod.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/sequencer_rpc/src/types/mod.rs b/sequencer_rpc/src/types/mod.rs index 6084ddd..a4c0397 100644 --- a/sequencer_rpc/src/types/mod.rs +++ b/sequencer_rpc/src/types/mod.rs @@ -1,3 +1,2 @@ pub mod err_rpc; pub mod parse; -pub mod rpc_structs; From 01b370d9b6e5350500add966e5afec3d01198181 Mon Sep 17 00:00:00 2001 From: Rostyslav Tyshko Date: Sun, 9 Feb 2025 11:45:16 -0500 Subject: [PATCH 06/10] create common requests module --- rpc_primitives/src/requests.rs | 73 ++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 rpc_primitives/src/requests.rs diff --git a/rpc_primitives/src/requests.rs b/rpc_primitives/src/requests.rs new file mode 100644 index 0000000..b5f0beb --- /dev/null +++ b/rpc_primitives/src/requests.rs @@ -0,0 +1,73 @@ +use crate::errors::RpcParseError; +use crate::parse_request; +use crate::parser::parse_params; +use crate::parser::RpcRequest; +use sequencer_core::transaction_mempool::TransactionMempool; +use serde::{Deserialize, Serialize}; +use serde_json::Value; +use storage::block::Block; + +#[derive(Serialize, Deserialize, Debug)] +pub struct HelloRequest {} + +#[derive(Serialize, Deserialize, Debug)] +pub struct RegisterAccountRequest { + pub nullifier_public_key: Vec, + pub viewing_public_key: Vec, + pub address: [u8; 32], +} + +#[derive(Serialize, Deserialize, Debug)] +pub struct SendTxRequest { + pub transaction: TransactionMempool, + ///Nullifier Root, UTXO Commitment Root, Pub Tx Root + pub tx_roots: [[u8; 32]; 3], +} + +#[derive(Serialize, Deserialize, Debug)] +pub struct GetBlockDataRequest { + pub block_id: u64, +} + +#[derive(Serialize, Deserialize, Debug)] +pub struct GetGenesisIdRequest {} + +#[derive(Serialize, Deserialize, Debug)] +pub struct GetLastBlockRequest {} + +parse_request!(HelloRequest); +parse_request!(RegisterAccountRequest); +parse_request!(SendTxRequest); +parse_request!(GetBlockDataRequest); +parse_request!(GetGenesisIdRequest); +parse_request!(GetLastBlockRequest); + +#[derive(Serialize, Deserialize, Debug)] +pub struct HelloResponse { + pub greeting: String, +} + +#[derive(Serialize, Deserialize, Debug)] +pub struct RegisterAccountResponse { + pub status: String, +} + +#[derive(Serialize, Deserialize, Debug)] +pub struct SendTxResponse { + pub status: String, +} + +#[derive(Serialize, Deserialize, Debug)] +pub struct GetBlockDataResponse { + pub block: Block, +} + +#[derive(Serialize, Deserialize, Debug)] +pub struct GetGenesisIdResponse { + pub genesis_id: u64, +} + +#[derive(Serialize, Deserialize, Debug)] +pub struct GetLastBlockResponse { + pub last_block: u64, +} From a0580238a64147a160616e703fddcdd063aaef32 Mon Sep 17 00:00:00 2001 From: Rostyslav Tyshko Date: Sun, 9 Feb 2025 11:45:31 -0500 Subject: [PATCH 07/10] add needed deps --- rpc_primitives/Cargo.toml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/rpc_primitives/Cargo.toml b/rpc_primitives/Cargo.toml index f015302..15bbfd1 100644 --- a/rpc_primitives/Cargo.toml +++ b/rpc_primitives/Cargo.toml @@ -9,3 +9,9 @@ serde_json.workspace = true env_logger.workspace = true log.workspace = true serde.workspace = true + +[dependencies.storage] +path = "../storage" + +[dependencies.sequencer_core] +path = "../sequencer_core" From e8c14f91858e7c9e44aaea53dfcc63cfa546c923 Mon Sep 17 00:00:00 2001 From: Rostyslav Tyshko Date: Sun, 9 Feb 2025 11:45:45 -0500 Subject: [PATCH 08/10] rm node_rps redundunt code --- node_rpc/src/types/rpc_structs.rs | 58 ++----------------------------- 1 file changed, 2 insertions(+), 56 deletions(-) diff --git a/node_rpc/src/types/rpc_structs.rs b/node_rpc/src/types/rpc_structs.rs index 563db03..6d7d8a3 100644 --- a/node_rpc/src/types/rpc_structs.rs +++ b/node_rpc/src/types/rpc_structs.rs @@ -4,23 +4,8 @@ use rpc_primitives::parser::parse_params; use rpc_primitives::parser::RpcRequest; use serde::{Deserialize, Serialize}; use serde_json::Value; -use storage::block::Block; -use storage::transaction::Transaction; use storage::transaction::TxKind; -#[derive(Serialize, Deserialize, Debug)] -pub struct RegisterAccountRequest {} - -#[derive(Serialize, Deserialize, Debug)] -pub struct SendTxRequest { - pub transaction: Transaction, -} - -#[derive(Serialize, Deserialize, Debug)] -pub struct GetBlockDataRequest { - pub block_id: u64, -} - #[derive(Serialize, Deserialize, Debug)] pub struct ExecuteSubscenarioRequest { pub scenario_id: u64, @@ -38,12 +23,6 @@ pub struct ExecuteScenarioMultipleSendRequest { pub number_to_send: usize, } -#[derive(Serialize, Deserialize, Debug)] -pub struct GetGenesisIdRequest {} - -#[derive(Serialize, Deserialize, Debug)] -pub struct GetLastBlockRequest {} - #[derive(Serialize, Deserialize, Debug)] pub struct ShowAccountPublicBalanceRequest { pub account_addr: String, @@ -111,14 +90,11 @@ pub struct WriteSplitUTXORequest { pub utxo_commitment: String, } -parse_request!(RegisterAccountRequest); -parse_request!(SendTxRequest); -parse_request!(GetBlockDataRequest); -parse_request!(GetGenesisIdRequest); +// parse_request!(GetGenesisIdRequest); parse_request!(ExecuteSubscenarioRequest); parse_request!(ExecuteScenarioSplitRequest); parse_request!(ExecuteScenarioMultipleSendRequest); -parse_request!(GetLastBlockRequest); +// parse_request!(GetLastBlockRequest); parse_request!(ShowAccountPublicBalanceRequest); parse_request!(ShowAccountUTXORequest); @@ -132,26 +108,6 @@ parse_request!(WriteSendShieldedUTXORequest); parse_request!(WriteSendDeshieldedBalanceRequest); parse_request!(WriteSplitUTXORequest); -#[derive(Serialize, Deserialize, Debug)] -pub struct HelloResponse { - pub greeting: String, -} - -#[derive(Serialize, Deserialize, Debug)] -pub struct RegisterAccountResponse { - pub status: String, -} - -#[derive(Serialize, Deserialize, Debug)] -pub struct SendTxResponse { - pub status: String, -} - -#[derive(Serialize, Deserialize, Debug)] -pub struct GetBlockDataResponse { - pub block: Block, -} - #[derive(Serialize, Deserialize, Debug)] pub struct ExecuteSubscenarioResponse { pub scenario_result: String, @@ -167,16 +123,6 @@ pub struct ExecuteScenarioMultipleSendResponse { pub scenario_result: String, } -#[derive(Serialize, Deserialize, Debug)] -pub struct GetGenesisIdResponse { - pub genesis_id: u64, -} - -#[derive(Serialize, Deserialize, Debug)] -pub struct GetLastBlockResponse { - pub last_block: u64, -} - #[derive(Serialize, Deserialize, Debug)] pub struct ShowAccountPublicBalanceResponse { pub addr: String, From 9c5b4fb3d4cd98d261a438bb4493ee531eb05ee4 Mon Sep 17 00:00:00 2001 From: Rostyslav Tyshko Date: Sun, 9 Feb 2025 11:45:53 -0500 Subject: [PATCH 09/10] fix imports --- node_core/src/sequencer_client/mod.rs | 7 +++++-- node_rpc/src/process.rs | 5 +++-- rpc_primitives/src/lib.rs | 1 + sequencer_rpc/src/process.rs | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/node_core/src/sequencer_client/mod.rs b/node_core/src/sequencer_client/mod.rs index 6a65b9e..4282ecd 100644 --- a/node_core/src/sequencer_client/mod.rs +++ b/node_core/src/sequencer_client/mod.rs @@ -1,8 +1,11 @@ use accounts::account_core::Account; use anyhow::Result; -use json::{ +use rpc_primitives::requests::{ GetBlockDataRequest, GetBlockDataResponse, GetGenesisIdRequest, GetGenesisIdResponse, - RegisterAccountRequest, RegisterAccountResponse, SendTxRequest, SendTxResponse, + RegisterAccountRequest, RegisterAccountResponse, +}; +use json::{ + SendTxResponse, SendTxRequest, SequencerRpcError, SequencerRpcRequest, SequencerRpcResponse, }; use k256::elliptic_curve::group::GroupEncoding; diff --git a/node_rpc/src/process.rs b/node_rpc/src/process.rs index 38b5843..1bd367d 100644 --- a/node_rpc/src/process.rs +++ b/node_rpc/src/process.rs @@ -11,11 +11,12 @@ use rpc_primitives::{ }; use storage::transaction::ActionData; +use rpc_primitives::requests::{GetLastBlockRequest, GetLastBlockResponse, RegisterAccountRequest, RegisterAccountResponse, GetBlockDataRequest, GetBlockDataResponse}; + use crate::types::rpc_structs::{ ExecuteScenarioMultipleSendRequest, ExecuteScenarioMultipleSendResponse, ExecuteScenarioSplitRequest, ExecuteScenarioSplitResponse, ExecuteSubscenarioRequest, - ExecuteSubscenarioResponse, GetBlockDataRequest, GetBlockDataResponse, GetLastBlockRequest, - GetLastBlockResponse, RegisterAccountRequest, RegisterAccountResponse, + ExecuteSubscenarioResponse, ShowAccountPublicBalanceRequest, ShowAccountPublicBalanceResponse, ShowAccountUTXORequest, ShowAccountUTXOResponse, ShowTransactionRequest, ShowTransactionResponse, UTXOShortEssentialStruct, WriteDepositPublicBalanceRequest, WriteDepositPublicBalanceResponse, diff --git a/rpc_primitives/src/lib.rs b/rpc_primitives/src/lib.rs index 5e3d870..ffa8564 100644 --- a/rpc_primitives/src/lib.rs +++ b/rpc_primitives/src/lib.rs @@ -5,6 +5,7 @@ use serde::{Deserialize, Serialize}; pub mod errors; pub mod message; pub mod parser; +pub mod requests; #[derive(Serialize, Deserialize, Clone, Copy, Debug)] pub struct RpcPollingConfig { diff --git a/sequencer_rpc/src/process.rs b/sequencer_rpc/src/process.rs index 294878e..b89960c 100644 --- a/sequencer_rpc/src/process.rs +++ b/sequencer_rpc/src/process.rs @@ -8,7 +8,7 @@ use rpc_primitives::{ parser::RpcRequest, }; -use crate::types::rpc_structs::{ +use rpc_primitives::requests::{ GetBlockDataRequest, GetBlockDataResponse, GetGenesisIdRequest, GetGenesisIdResponse, GetLastBlockRequest, GetLastBlockResponse, HelloRequest, HelloResponse, RegisterAccountRequest, RegisterAccountResponse, SendTxRequest, SendTxResponse, From b88358949cc46ec6cfeb097efe384c0e5125b540 Mon Sep 17 00:00:00 2001 From: Rostyslav Tyshko Date: Sun, 9 Feb 2025 11:46:08 -0500 Subject: [PATCH 10/10] fmt --- node_core/src/sequencer_client/mod.rs | 11 +++++------ node_rpc/src/process.rs | 17 ++++++++++------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/node_core/src/sequencer_client/mod.rs b/node_core/src/sequencer_client/mod.rs index 4282ecd..60f9d9d 100644 --- a/node_core/src/sequencer_client/mod.rs +++ b/node_core/src/sequencer_client/mod.rs @@ -1,15 +1,14 @@ use accounts::account_core::Account; use anyhow::Result; +use json::{ + SendTxRequest, SendTxResponse, SequencerRpcError, SequencerRpcRequest, SequencerRpcResponse, +}; +use k256::elliptic_curve::group::GroupEncoding; +use reqwest::Client; use rpc_primitives::requests::{ GetBlockDataRequest, GetBlockDataResponse, GetGenesisIdRequest, GetGenesisIdResponse, RegisterAccountRequest, RegisterAccountResponse, }; -use json::{ - SendTxResponse, SendTxRequest, - SequencerRpcError, SequencerRpcRequest, SequencerRpcResponse, -}; -use k256::elliptic_curve::group::GroupEncoding; -use reqwest::Client; use serde_json::Value; use storage::transaction::Transaction; diff --git a/node_rpc/src/process.rs b/node_rpc/src/process.rs index 1bd367d..b174619 100644 --- a/node_rpc/src/process.rs +++ b/node_rpc/src/process.rs @@ -11,17 +11,20 @@ use rpc_primitives::{ }; use storage::transaction::ActionData; -use rpc_primitives::requests::{GetLastBlockRequest, GetLastBlockResponse, RegisterAccountRequest, RegisterAccountResponse, GetBlockDataRequest, GetBlockDataResponse}; +use rpc_primitives::requests::{ + GetBlockDataRequest, GetBlockDataResponse, GetLastBlockRequest, GetLastBlockResponse, + RegisterAccountRequest, RegisterAccountResponse, +}; use crate::types::rpc_structs::{ ExecuteScenarioMultipleSendRequest, ExecuteScenarioMultipleSendResponse, ExecuteScenarioSplitRequest, ExecuteScenarioSplitResponse, ExecuteSubscenarioRequest, - ExecuteSubscenarioResponse, - ShowAccountPublicBalanceRequest, ShowAccountPublicBalanceResponse, ShowAccountUTXORequest, - ShowAccountUTXOResponse, ShowTransactionRequest, ShowTransactionResponse, - UTXOShortEssentialStruct, WriteDepositPublicBalanceRequest, WriteDepositPublicBalanceResponse, - WriteMintPrivateUTXOMultipleAssetsRequest, WriteMintPrivateUTXOMultipleAssetsResponse, - WriteMintPrivateUTXORequest, WriteMintPrivateUTXOResponse, WriteSendDeshieldedBalanceRequest, + ExecuteSubscenarioResponse, ShowAccountPublicBalanceRequest, ShowAccountPublicBalanceResponse, + ShowAccountUTXORequest, ShowAccountUTXOResponse, ShowTransactionRequest, + ShowTransactionResponse, UTXOShortEssentialStruct, WriteDepositPublicBalanceRequest, + WriteDepositPublicBalanceResponse, WriteMintPrivateUTXOMultipleAssetsRequest, + WriteMintPrivateUTXOMultipleAssetsResponse, WriteMintPrivateUTXORequest, + WriteMintPrivateUTXOResponse, WriteSendDeshieldedBalanceRequest, WriteSendDeshieldedUTXOResponse, WriteSendPrivateUTXORequest, WriteSendPrivateUTXOResponse, WriteSendShieldedUTXORequest, WriteSendShieldedUTXOResponse, WriteSendSplitUTXOResponse, WriteSplitUTXORequest,