Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

import allowances to redis #1002

Merged
merged 1 commit into from
Sep 1, 2023
Merged

import allowances to redis #1002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 45 additions & 32 deletions src/components/abciapp/src/abci/server/callback/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,6 @@
//! # Impl function of tendermint ABCI
//!

use globutils::wallet;
use ledger::{
data_model::ASSET_TYPE_FRA,
staking::{FF_ADDR_EXTRA_120_0000, FF_ADDR_LIST},
};
use zei::xfr::asset_record::AssetRecordType;

mod utils;

use {
Expand All @@ -28,15 +21,19 @@ use {
config::abci::global_cfg::CFG,
cryptohash::sha256,
enterprise_web3::{
Setter, BALANCE_MAP, BLOCK, CODE_MAP, NONCE_MAP, RECEIPTS, REDIS_CLIENT,
STATE_UPDATE_LIST, TXS, WEB3_SERVICE_START_HEIGHT,
Setter, ALLOWANCES, BALANCE_MAP, BLOCK, CODE_MAP, NONCE_MAP, RECEIPTS,
REDIS_CLIENT, STATE_UPDATE_LIST, TOTAL_ISSUANCE, TXS, WEB3_SERVICE_START_HEIGHT,
},
fp_storage::hash::{Sha256, StorageHasher},
globutils::wallet,
lazy_static::lazy_static,
ledger::{
converter::is_convert_account,
data_model::Operation,
staking::{evm::EVM_STAKING, KEEP_HIST, VALIDATOR_UPDATE_BLOCK_ITV},
data_model::{Operation, ASSET_TYPE_FRA},
staking::{
evm::EVM_STAKING, FF_ADDR_EXTRA_120_0000, FF_ADDR_LIST, KEEP_HIST,
VALIDATOR_UPDATE_BLOCK_ITV,
},
store::{
api_cache,
fbnc::{new_mapx, Mapx},
Expand All @@ -55,7 +52,8 @@ use {
Arc,
},
},
tracing::{error, info},
tracing::info,
zei::xfr::asset_record::AssetRecordType,
};

pub(crate) static TENDERMINT_BLOCK_HEIGHT: AtomicI64 = AtomicI64::new(0);
Expand Down Expand Up @@ -651,6 +649,27 @@ pub fn commit(s: &mut ABCISubmissionServer, req: &RequestCommit) -> ResponseComm
Default::default()
};

let total_issuance = if let Ok(mut receipts) = TOTAL_ISSUANCE.lock() {
take(&mut *receipts)
} else {
Default::default()
};
let allowances = if let Ok(mut receipts) = ALLOWANCES.lock() {
take(&mut *receipts)
} else {
Default::default()
};
if let Some(v) = total_issuance {
pnk!(setter
.set_total_issuance(height, v)
.map_err(|e| eg!("set redis error: {:?}", e)));
}
for ((owner, spender), amount) in allowances.iter() {
pnk!(setter
.set_allowances(height, *owner, *spender, *amount)
.map_err(|e| eg!("set redis error: {:?}", e)));
}

if !code_map.is_empty()
|| !nonce_map.is_empty()
|| !balance_map.is_empty()
Expand All @@ -659,45 +678,39 @@ pub fn commit(s: &mut ABCISubmissionServer, req: &RequestCommit) -> ResponseComm
|| !receipts.is_empty()
|| block.is_some()
{
setter
.set_height(height)
.map_err(|e| error!("{:?}", e))
.unwrap_or(());

for (addr, code) in code_map.iter() {
setter
pnk!(setter
.set_byte_code(height, *addr, code.clone())
.map_err(|e| error!("{:?}", e))
.unwrap_or(());
.map_err(|e| eg!("set redis error: {:?}", e)));
}

for (addr, nonce) in nonce_map.iter() {
setter
pnk!(setter
.set_nonce(height, *addr, *nonce)
.map_err(|e| error!("{:?}", e))
.unwrap_or(());
.map_err(|e| eg!("set redis error: {:?}", e)));
}

for (addr, balance) in balance_map.iter() {
setter
pnk!(setter
.set_balance(height, *addr, *balance)
.map_err(|e| error!("{:?}", e))
.unwrap_or(());
.map_err(|e| eg!("set redis error: {:?}", e)));
}

for state in state_list.iter() {
setter
pnk!(setter
.set_state(height, state.address, state.index, state.value)
.map_err(|e| error!("{:?}", e))
.unwrap_or(());
.map_err(|e| eg!("set redis error: {:?}", e)));
}

if let Some(block) = block {
setter
pnk!(setter
.set_block_info(block, receipts, txs)
.map_err(|e| error!("{:?}", e))
.unwrap_or(());
.map_err(|e| eg!("set redis error: {:?}", e)));
}

pnk!(setter
.set_height(height)
.map_err(|e| eg!("set redis error: {:?}", e)));
}
}

Expand Down
30 changes: 22 additions & 8 deletions src/components/contracts/modules/account/src/impls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
use crate::{storage::*, App, Config};
use config::abci::global_cfg::CFG;
use enterprise_web3::{BALANCE_MAP, WEB3_SERVICE_START_HEIGHT};
use enterprise_web3::{
ALLOWANCES, BALANCE_MAP, TOTAL_ISSUANCE, WEB3_SERVICE_START_HEIGHT,
};
use fp_core::{account::SmartAccount, context::Context};
use fp_storage::BorrowMut;
use fp_traits::account::AccountAsset;
use fp_types::crypto::Address;
use primitive_types::{H160, U256};
use ruc::*;

impl<C: Config> AccountAsset<Address> for App<C> {
fn total_issuance(ctx: &Context) -> U256 {
TotalIssuance::get(&ctx.state.read()).unwrap_or_default()
}

fn account_of(
ctx: &Context,
who: &Address,
Expand Down Expand Up @@ -111,8 +111,8 @@ impl<C: Config> AccountAsset<Address> for App<C> {
let mut balance_map = BALANCE_MAP.lock().c(d!())?;
let target_slice: &[u8] = target.as_ref();
let target_h160 = H160::from_slice(&target_slice[4..24]);

balance_map.insert(target_h160, target_account.balance);
set_total_issuance(issuance)?;
}

Ok(())
Expand Down Expand Up @@ -143,8 +143,8 @@ impl<C: Config> AccountAsset<Address> for App<C> {
let mut balance_map = BALANCE_MAP.lock().c(d!())?;
let target_slice: &[u8] = target.as_ref();
let target_h160 = H160::from_slice(&target_slice[4..24]);

balance_map.insert(target_h160, target_account.balance);
set_total_issuance(issuance)?;
}

Ok(())
Expand Down Expand Up @@ -205,17 +205,31 @@ impl<C: Config> AccountAsset<Address> for App<C> {

Ok(())
}

fn allowance(ctx: &Context, owner: &Address, spender: &Address) -> U256 {
Allowances::get(&ctx.state.read(), owner, spender).unwrap_or_default()
}

fn approve(
ctx: &Context,
owner: &Address,
owner_addr: H160,
spender: &Address,
spender_addr: H160,
amount: U256,
) -> Result<()> {
Allowances::insert(ctx.state.write().borrow_mut(), owner, spender, &amount)
Allowances::insert(ctx.state.write().borrow_mut(), owner, spender, &amount)?;
if CFG.enable_enterprise_web3
&& ctx.header.height as u64 > *WEB3_SERVICE_START_HEIGHT
{
let mut allowances = ALLOWANCES.lock().c(d!())?;

allowances.push(((owner_addr, spender_addr), amount));
}
Ok(())
}
}

fn set_total_issuance(issuance: U256) -> Result<()> {
let mut total_issuance = TOTAL_ISSUANCE.lock().c(d!())?;
*total_issuance = Some(issuance);
Ok(())
}
14 changes: 8 additions & 6 deletions src/components/contracts/modules/evm/precompile/frc20/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,18 +302,18 @@ impl<C: Config> FRC20<C> {
input.expect_arguments(2)?;

let caller = C::AddressMapping::convert_to_account_id(context.caller);
let spender: H160 = input.read::<Address>()?.into();
if spender == H160::zero() {
let s: H160 = input.read::<Address>()?.into();
if s == H160::zero() {
return Err(error("FRC20: approve to the zero address"));
}
let spender_id = C::AddressMapping::convert_to_account_id(spender);
let spender_id = C::AddressMapping::convert_to_account_id(s);
let amount: U256 = input.read()?;
debug!(target: "evm",
"FRC20#approve: sender: {:?}, spender: {:?}, amount: {:?}",
context.caller, spender, amount
context.caller, s, amount
);

C::AccountAsset::approve(state, &caller, &spender_id, amount)
C::AccountAsset::approve(state, &caller, context.caller, &spender_id, s, amount)
.map_err(|e| error(format!("{e:?}")))?;

Ok(PrecompileOutput {
Expand All @@ -324,7 +324,7 @@ impl<C: Config> FRC20<C> {
.log3(
APPROVAL_EVENT_SELECTOR,
context.caller,
spender,
s,
EvmDataWriter::new().write(amount).build(),
)
.build(),
Expand Down Expand Up @@ -420,7 +420,9 @@ impl<C: Config> FRC20<C> {
C::AccountAsset::approve(
state,
&from_id,
from,
&caller,
context.caller,
allowance.saturating_sub(amount),
)
.map_err(|e| error(format!("{e:?}")))?;
Expand Down
2 changes: 1 addition & 1 deletion src/components/contracts/primitives/enterprise-web3/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ edition = "2021"

[dependencies]
lazy_static = "1.4.0"
evm-exporter = { package = "evm-exporter", git = "https://github.com/FindoraNetwork/enterprise-web3.git", tag = "1.0.0"}
evm-exporter = { package = "evm-exporter", git = "https://github.com/FindoraNetwork/enterprise-web3.git", tag = "1.2.1"}
ethereum = { version = "0.12.0", default-features = false, features = ["with-serde"] }
primitive-types = "0.11.1"
redis = { version = "0.21", default-features = false, features = [ "tls", "r2d2" ] }
Expand Down
3 changes: 3 additions & 0 deletions src/components/contracts/primitives/enterprise-web3/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ lazy_static! {
Arc::new(Mutex::new(vec![]));
pub static ref REMOVE_PENDING_STATE_UPDATE_LIST: Arc<Mutex<Vec<(H160, H256)>>> =
Arc::new(Mutex::new(vec![]));
pub static ref TOTAL_ISSUANCE: Arc<Mutex<Option<U256>>> = Arc::new(Mutex::new(None));
pub static ref ALLOWANCES: Arc<Mutex<Vec<((H160, H160), U256)>>> =
Arc::new(Mutex::new(vec![]));
}

fn gen_redis_client() -> r2d2::Pool<Client> {
Expand Down
4 changes: 3 additions & 1 deletion src/components/contracts/primitives/traits/src/account.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use fp_core::{account::SmartAccount, context::Context};
use primitive_types::U256;
use primitive_types::{H160, U256};
use ruc::Result;

pub trait AccountAsset<Address> {
Expand Down Expand Up @@ -53,7 +53,9 @@ pub trait AccountAsset<Address> {
fn approve(
ctx: &Context,
owner: &Address,
owner_addr: H160,
spender: &Address,
spender_addr: H160,
amount: U256,
) -> Result<()>;
}
Expand Down
Loading