more core space rpc types from client crate to cfx-rpc-types crate

Author: Pana

Cargo.lock

@@ -13,5 +13,4 @@ pub use cfx_rpc::helpers::{
     poll_manager::PollManager,
     EpochQueue, MAX_FEE_HISTORY_CACHE_BLOCK_COUNT,
 };
-pub use cfx_rpc_primitives::{maybe_vec_into, VariadicValue};
 pub use subscribers::{Id as SubscriberId, Subscribers};

crates/client/src/rpc/helpers/mod.rs

@@ -87,12 +87,13 @@ use crate::{
             pos::Block as PosBlock, Account as RpcAccount, AccountPendingInfo,
             AccountPendingTransactions, BlameInfo, Block as RpcBlock,
             BlockHashOrEpochNumber, Bytes, CfxRpcLogFilter,
-            CheckBalanceAgainstTransactionResponse, ConsensusGraphStates,
-            EpochNumber, EstimateGasAndCollateralResponse, Log as RpcLog,
-            PackedOrExecuted, Receipt as RpcReceipt,
-            RewardInfo as RpcRewardInfo, Status as RpcStatus,
-            StorageCollateralInfo, SyncGraphStates,
-            Transaction as RpcTransaction, TransactionRequest,
+            CheckBalanceAgainstTransactionResponse,
+            ConsensusGraphBlockExecutionState, ConsensusGraphBlockState,
+            ConsensusGraphStates, EpochNumber,
+            EstimateGasAndCollateralResponse, Log as RpcLog, PackedOrExecuted,
+            Receipt as RpcReceipt, RewardInfo as RpcRewardInfo,
+            Status as RpcStatus, StorageCollateralInfo, SyncGraphBlockState,
+            SyncGraphStates, Transaction as RpcTransaction, TransactionRequest,
         },
         CoreResult,
     },
@@ -633,6 +634,7 @@ impl RpcImpl {
             password,
             self.accounts.clone(),
         )
+        .map_err(Into::into)
     }
 
     fn send_transaction(
@@ -1249,7 +1251,13 @@ impl RpcImpl {
                         *self.sync.network.get_network_type(),
                     )?;
 
-                    ret.push(RpcRewardInfo::new(b, author, reward_result));
+                    ret.push(RpcRewardInfo {
+                        block_hash: b.into(),
+                        author,
+                        total_reward: reward_result.total_reward.into(),
+                        base_reward: reward_result.base_reward.into(),
+                        tx_fee: reward_result.tx_fee.into(),
+                    })
                 }
             }
         }
@@ -1532,12 +1540,55 @@ impl RpcImpl {
     pub fn consensus_graph_state(&self) -> CoreResult<ConsensusGraphStates> {
         let consensus_graph_states =
             STATE_EXPOSER.consensus_graph.lock().retrieve();
-        Ok(ConsensusGraphStates::new(consensus_graph_states))
+        // Ok(ConsensusGraphStates::new(consensus_graph_states))
+        let mut block_state_vec = Vec::new();
+        let mut block_execution_state_vec = Vec::new();
+
+        for block_state in &consensus_graph_states.block_state_vec {
+            block_state_vec.push(ConsensusGraphBlockState {
+                block_hash: block_state.block_hash.into(),
+                best_block_hash: block_state.best_block_hash.into(),
+                block_status: (block_state.block_status as u8).into(),
+                era_block_hash: block_state.era_block_hash.into(),
+                adaptive: block_state.adaptive,
+            })
+        }
+        for exec_state in &consensus_graph_states.block_execution_state_vec {
+            block_execution_state_vec.push(ConsensusGraphBlockExecutionState {
+                block_hash: exec_state.block_hash.into(),
+                deferred_state_root: exec_state.deferred_state_root.into(),
+                deferred_receipt_root: exec_state.deferred_receipt_root.into(),
+                deferred_logs_bloom_hash: exec_state
+                    .deferred_logs_bloom_hash
+                    .into(),
+                state_valid: exec_state.state_valid,
+            })
+        }
+
+        Ok(ConsensusGraphStates {
+            block_state_vec,
+            block_execution_state_vec,
+        })
     }
 
     pub fn sync_graph_state(&self) -> CoreResult<SyncGraphStates> {
         let sync_graph_states = STATE_EXPOSER.sync_graph.lock().retrieve();
-        Ok(SyncGraphStates::new(sync_graph_states))
+        let mut ready_block_vec = Vec::new();
+        for block_state in sync_graph_states.ready_block_vec {
+            ready_block_vec.push(SyncGraphBlockState {
+                block_hash: block_state.block_hash.into(),
+                parent: block_state.parent.into(),
+                referees: block_state
+                    .referees
+                    .iter()
+                    .map(|x| H256::from(*x))
+                    .collect(),
+                nonce: block_state.nonce.into(),
+                timestamp: U64::from(block_state.timestamp),
+                adaptive: block_state.adaptive,
+            })
+        }
+        Ok(SyncGraphStates { ready_block_vec })
     }
 
     /// Return (block_info.status, state_valid)

crates/client/src/rpc/impls/cfx/cfx_handler.rs

@@ -0,0 +1,16 @@
+pub use cfx_rpc_cfx_types::{
+    access_list::*,
+    account::{self, Account},
+    address,
+    address::{
+        check_rpc_address_network, check_two_rpc_address_network_match,
+        RcpAddressNetworkInconsistent, RpcAddress, UnexpectedRpcAddressNetwork,
+    },
+    blame_info, block, consensus_graph_states, epoch_number, filter, log,
+    pos_economics, pubsub, receipt, reward_info, sponsor_info,
+    stat_on_gas_load, status, storage_collateral_info, sync_graph_states,
+    token_supply_info, transaction, transaction_request, tx_pool,
+    vote_params_info, CfxFeeHistory,
+};
+pub use sponsor_info::SponsorInfo;
+pub use tx_pool::*;

crates/client/src/rpc/types/cfx.rs

@@ -4,18 +4,16 @@
 
 pub mod cfx;
 mod constants;
-mod provenance;
-pub use cfx_rpc_cfx_types::pos;
-
-pub use cfx_rpc_primitives::{Bytes, Index, U64};
 
 pub use self::{
     cfx::{
-        address,
-        address::{check_two_rpc_address_network_match, RpcAddress},
+        address::{self, check_two_rpc_address_network_match, RpcAddress},
         blame_info::BlameInfo,
         block::{Block, BlockTransactions, Header},
-        consensus_graph_states::ConsensusGraphStates,
+        consensus_graph_states::{
+            ConsensusGraphBlockExecutionState, ConsensusGraphBlockState,
+            ConsensusGraphStates,
+        },
         epoch_number::{BlockHashOrEpochNumber, EpochNumber},
         filter::{CfxFilterChanges, CfxFilterLog, CfxRpcLogFilter, RevertTo},
         log::Log,
@@ -26,9 +24,9 @@ pub use self::{
         stat_on_gas_load::StatOnGasLoad,
         status::Status,
         storage_collateral_info::StorageCollateralInfo,
-        sync_graph_states::SyncGraphStates,
+        sync_graph_states::{SyncGraphBlockState, SyncGraphStates},
         token_supply_info::TokenSupplyInfo,
-        transaction::{PackedOrExecuted, Transaction, WrapTransaction},
+        transaction::{PackedOrExecuted, Transaction},
         transaction_request::{
             self, CheckBalanceAgainstTransactionResponse,
             EstimateGasAndCollateralResponse, TransactionRequest,
@@ -42,13 +40,15 @@ pub use self::{
         Account, CfxFeeHistory, SponsorInfo,
     },
     constants::MAX_GAS_CALL_REQUEST,
-    provenance::Origin,
 };
 pub use cfx_rpc_cfx_types::{
+    pos,
+    provenance::Origin,
     trace::{
         Action, LocalizedBlockTrace, LocalizedTrace, LocalizedTransactionTrace,
     },
     trace_filter::TraceFilter,
 };
+pub use cfx_rpc_primitives::{Bytes, Index, U64};
 
-pub use cfx_rpc_eth_types::FeeHistory;
+pub use cfx_rpc_eth_types::{FeeHistory, WrapTransaction};

crates/client/src/rpc/types/cfx/consensus_graph_states.rs

@@ -34,5 +34,8 @@ diem-types = { workspace = true }
 rustc-hex = { workspace = true }
 bls-signatures = { workspace = true }
 once_cell = { workspace = true }
+cfxkey = { workspace = true }
+cfx-rpc-utils = { workspace = true }
+cfxcore-accounts = { workspace = true }
 
 [dev-dependencies]