Skip to content

Fixed: excessive deductions #134

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

Merged
toints merged 1 commit into from
Jul 31, 2024
Merged

Fixed: excessive deductions #134

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
19 changes: 17 additions & 2 deletions runtime/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ pub mod xcms;

use codec::{Decode, Encode, MaxEncodedLen};
use core::ops::Div;
use pallet_evm::AddressMapping;

use cumulus_pallet_parachain_system::RelayNumberMonotonicallyIncreases;
use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;
Expand Down Expand Up @@ -362,7 +363,7 @@ pub const GRAND: Balance = QUID * 1_000;
pub const MILLICENTS: Balance = CENTS / 1_000;

/// The existential deposit. Set to 1/10 of the Connected Relay Chain.
pub const EXISTENTIAL_DEPOSIT: Balance = MILLIUNIT;
pub const EXISTENTIAL_DEPOSIT: Balance = 1;

/// We assume that ~5% of the block weight is consumed by `on_initialize` handlers. This is
/// used to limit the maximal weight of a single extrinsic.
Expand Down Expand Up @@ -1416,7 +1417,21 @@ impl_runtime_apis! {
}

fn account_basic(address: H160) -> EVMAccount {
let (account, _) = pallet_evm::Pallet::<Runtime>::account_basic(&address);
let account_id = <Runtime as pallet_evm::Config>::AddressMapping::into_account_id(address);

let nonce = frame_system::Pallet::<Runtime>::account_nonce(&account_id);

let balance_free =
<Runtime as pallet_evm::Config>::Currency::free_balance(account_id.clone());
let balance_reserved =
<Runtime as pallet_evm::Config>::Currency::reserved_balance(account_id);
let balance = balance_free.saturating_add(balance_reserved);


let account = EVMAccount {
nonce: U256::from(UniqueSaturatedInto::<u128>::unique_saturated_into(nonce)),
balance: U256::from(UniqueSaturatedInto::<u128>::unique_saturated_into(balance)),
};
account
}

Expand Down