Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
wangjj9219 committed Jun 21, 2023
1 parent edd335f commit 548cd81
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 2 deletions.
1 change: 0 additions & 1 deletion modules/currencies/src/mock.rs
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ impl pallet_balances::Config for Runtime {
type DustRemoval = ();
type RuntimeEvent = RuntimeEvent;
type ExistentialDeposit = ConstU128<2>;
//type AccountStore = System;
type AccountStore = support::SystemAccountStore<Runtime>;
type MaxLocks = ();
type MaxReserves = ConstU32<50>;
Expand Down
6 changes: 5 additions & 1 deletion modules/evm/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1496,7 +1496,11 @@ impl<T: Config> Pallet<T> {
let contract_account = T::AddressMapping::get_account_id(&address);

// NOTE: inc providers occurs before receive and reserve storage fee for this `address`,
// it will directly `NewAccount`.
// it will directly `NewAccount`. If config `type AccountStore = System` when impl pallet_balances
// Config, System::Account exists, Balances::Account doesn't exist if AccountData is default(). So
// if runtime integrates module-evm, plz confirm config `type AccountStore =
// module_support::SystemAccountStore` for pallet_balances, it regards Balances::Account exists when
// System::Account exists.
frame_system::Pallet::<T>::inc_providers(&contract_account);
}

Expand Down
2 changes: 2 additions & 0 deletions runtime/acala/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,7 @@ impl pallet_timestamp::Config for Runtime {
type WeightInfo = ();
}

// pallet-treasury did not impl OnUnbalanced<Credit>, need an adapter to handle dust.
type CreditOf = frame_support::traits::fungible::Credit<<Runtime as frame_system::Config>::AccountId, Balances>;
pub struct DustRemovalAdapter;
impl OnUnbalanced<CreditOf> for DustRemovalAdapter {
Expand Down Expand Up @@ -1856,6 +1857,7 @@ pub type Executive = frame_executive::Executive<
pallet_xcm::migration::v1::MigrateToV1<Runtime>,
orml_unknown_tokens::Migration<Runtime>,
// Note: The following Migrations do not use the StorageVersion feature, must to be removed after the upgrade
// TODO: if Acala runtime has upgraded to 2180, review following migrations and delete these.
module_asset_registry::migrations::MigrateV1MultiLocationToV3<Runtime>,
module_xcm_interface::migrations::MigrateXcmDestWeightAndFee<Runtime>,
module_transaction_pause::migrations::MigrateEvmPrecompile<Runtime>,
Expand Down
1 change: 1 addition & 0 deletions runtime/karura/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,7 @@ impl pallet_timestamp::Config for Runtime {
type WeightInfo = ();
}

// pallet-treasury did not impl OnUnbalanced<Credit>, need an adapter to handle dust.
type CreditOf = frame_support::traits::fungible::Credit<<Runtime as frame_system::Config>::AccountId, Balances>;
pub struct DustRemovalAdapter;
impl OnUnbalanced<CreditOf> for DustRemovalAdapter {
Expand Down
1 change: 1 addition & 0 deletions runtime/mandala/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,7 @@ impl pallet_timestamp::Config for Runtime {
type WeightInfo = ();
}

// pallet-treasury did not impl OnUnbalanced<Credit>, need an adapter to handle dust.
type CreditOf = frame_support::traits::fungible::Credit<<Runtime as frame_system::Config>::AccountId, Balances>;
pub struct DustRemovalAdapter;
impl OnUnbalanced<CreditOf> for DustRemovalAdapter {
Expand Down

0 comments on commit 548cd81

Please sign in to comment.