From 5a63253c436f4fa6a3d4fffb30bc4b54b982ddfd Mon Sep 17 00:00:00 2001 From: shaorongqiang Date: Fri, 29 Nov 2024 15:23:49 +0800 Subject: [PATCH] fix export web3 rpc --- src/components/abciapp/Cargo.toml | 2 + .../abciapp/src/abci/server/callback/mod.rs | 78 ++++++++++++++++--- .../contracts/modules/account/src/lib.rs | 2 +- 3 files changed, 71 insertions(+), 11 deletions(-) diff --git a/src/components/abciapp/Cargo.toml b/src/components/abciapp/Cargo.toml index 43daf2135..716881f29 100644 --- a/src/components/abciapp/Cargo.toml +++ b/src/components/abciapp/Cargo.toml @@ -59,9 +59,11 @@ fc-rpc = { path = "../contracts/rpc" } fp-storage = { path = "../contracts/primitives/storage" } fp-utils = { path = "../contracts/primitives/utils" } fp-types = {path = "../contracts/primitives/types"} +fp-traits = {path = "../contracts/primitives/traits"} enterprise-web3 = { path = "../contracts/primitives/enterprise-web3" } module-evm = { path = "../contracts/modules/evm"} +module-account = { path = "../contracts/modules/account" } [target.'cfg(target_os= "linux")'.dependencies] btm = "0.1.6" diff --git a/src/components/abciapp/src/abci/server/callback/mod.rs b/src/components/abciapp/src/abci/server/callback/mod.rs index b6a8eee17..d2ad08ee7 100644 --- a/src/components/abciapp/src/abci/server/callback/mod.rs +++ b/src/components/abciapp/src/abci/server/callback/mod.rs @@ -24,11 +24,15 @@ use { chrono::Local, config::abci::global_cfg::CFG, enterprise_web3::{ - ALLOWANCES, BALANCE_MAP, BLOCK, CODE_MAP, NONCE_MAP, RECEIPTS, - PG_CLIENT, STATE_UPDATE_LIST, TOTAL_ISSUANCE, TXS, WEB3_SERVICE_START_HEIGHT, + ALLOWANCES, BALANCE_MAP, BLOCK, CODE_MAP, NONCE_MAP, PG_CLIENT, RECEIPTS, + STATE_UPDATE_LIST, TOTAL_ISSUANCE, TXS, WEB3_SERVICE_START_HEIGHT, }, - fp_storage::hash::{Sha256, StorageHasher}, - fp_storage::BorrowMut, + fp_storage::{ + hash::{Sha256, StorageHasher}, + BorrowMut, + }, + fp_traits::base::BaseProvider, + fp_types::crypto::Address, globutils::wallet, lazy_static::lazy_static, ledger::{ @@ -44,6 +48,7 @@ use { }, LEDGER_TENDERMINT_BLOCK_HEIGHT, }, + module_account::storage::{Allowances, TotalIssuance}, parking_lot::{Mutex, RwLock}, protobuf::RepeatedField, ruc::*, @@ -662,29 +667,55 @@ pub fn commit(s: &mut ABCISubmissionServer, req: &RequestCommit) -> ResponseComm let height = td_height as u32; let setter = PG_CLIENT.lock().expect("PG_CLIENT error"); - let nonce_map = if let Ok(mut nonce_map) = NONCE_MAP.lock() { + let mut nonce_map = if let Ok(mut nonce_map) = NONCE_MAP.lock() { take(&mut *nonce_map) } else { Default::default() }; + nonce_map.iter_mut().for_each(|(k, v)| { + let account_id = Address::from(*k); + if let Ok(sa) = s.account_base_app.read().account_of(&account_id, None) { + *v = sa.nonce; + } + }); - let code_map = if let Ok(mut code_map) = CODE_MAP.lock() { + let mut code_map = if let Ok(mut code_map) = CODE_MAP.lock() { take(&mut *code_map) } else { Default::default() }; + code_map.iter_mut().for_each(|(k, v)| { + if let Some(code) = s.account_base_app.read().account_code_at(*k, None) { + *v = code; + } + }); - let balance_map = if let Ok(mut balance_map) = BALANCE_MAP.lock() { + let mut balance_map = if let Ok(mut balance_map) = BALANCE_MAP.lock() { take(&mut *balance_map) } else { Default::default() }; + balance_map.iter_mut().for_each(|(k, v)| { + let account_id = Address::from(*k); + if let Ok(sa) = s.account_base_app.read().account_of(&account_id, None) { + *v = sa.balance; + } + }); - let state_list = if let Ok(mut state_list) = STATE_UPDATE_LIST.lock() { + let mut state_list = if let Ok(mut state_list) = STATE_UPDATE_LIST.lock() { take(&mut *state_list) } else { Default::default() }; + state_list.iter_mut().for_each(|v| { + if let Some(value) = s.account_base_app.read().account_storage_at( + v.address, + v.index, + Some(v.height as u64), + ) { + v.value = value; + } + }); let block = if let Ok(mut block) = BLOCK.lock() { block.take() @@ -704,16 +735,43 @@ pub fn commit(s: &mut ABCISubmissionServer, req: &RequestCommit) -> ResponseComm Default::default() }; - let total_issuance = if let Ok(mut total_issuance) = TOTAL_ISSUANCE.lock() { + let mut total_issuance = if let Ok(mut total_issuance) = TOTAL_ISSUANCE.lock() { take(&mut *total_issuance) } else { Default::default() }; - let allowances = if let Ok(mut allowances) = ALLOWANCES.lock() { + + { + let base_app = s.account_base_app.write(); + let state = base_app.deliver_state.state.read(); + + if total_issuance.is_some() { + if let Some(issuance) = TotalIssuance::get(&state) { + total_issuance = Some(issuance); + } + } + } + + let mut allowances = if let Ok(mut allowances) = ALLOWANCES.lock() { take(&mut *allowances) } else { Default::default() }; + { + let base_app = s.account_base_app.write(); + let state = base_app.deliver_state.state.read(); + + allowances.iter_mut().for_each(|(k, v)| { + let owner = Address::from(k.owner_address); + + let spender = Address::from(k.spender_address); + + if let Some(issuance) = Allowances::get(&state, &owner, &spender) { + *v = issuance + } + }); + } + if let Some(v) = total_issuance { pnk!(setter .set_total_issuance(height, v) diff --git a/src/components/contracts/modules/account/src/lib.rs b/src/components/contracts/modules/account/src/lib.rs index 7429c47dc..d3343ef4c 100644 --- a/src/components/contracts/modules/account/src/lib.rs +++ b/src/components/contracts/modules/account/src/lib.rs @@ -28,7 +28,7 @@ impl Config for () { type FeeCalculator = (); } -mod storage { +pub mod storage { use fp_core::account::SmartAccount; use fp_types::crypto::Address; use primitive_types::U256;