difftreelog
fix after rebase
in: master
4 files changed
pallets/balances-adapter/src/common.rsdiffbeforeafterboth--- a/pallets/balances-adapter/src/common.rs
+++ b/pallets/balances-adapter/src/common.rs
@@ -45,7 +45,7 @@
}
fn transfer() -> Weight {
- <BalancesWeight<T> as WeightInfo>::transfer()
+ <BalancesWeight<T> as WeightInfo>::transfer_allow_death()
}
fn approve() -> Weight {
@@ -57,7 +57,7 @@
}
fn transfer_from() -> Weight {
- <BalancesWeight<T> as WeightInfo>::transfer()
+ <BalancesWeight<T> as WeightInfo>::transfer_allow_death()
}
fn burn_from() -> Weight {
pallets/balances-adapter/src/erc.rsdiffbeforeafterboth--- a/pallets/balances-adapter/src/erc.rs
+++ b/pallets/balances-adapter/src/erc.rs
@@ -54,7 +54,7 @@
Ok(total.into())
}
- #[weight(<SelfWeightOf<T>>::transfer())]
+ #[weight(<SelfWeightOf<T>>::transfer_allow_death())]
fn transfer(&mut self, caller: Caller, to: Address, amount: U256) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
let to = T::CrossAccountId::from_eth(to);
@@ -68,7 +68,7 @@
Ok(true)
}
- #[weight(<SelfWeightOf<T>>::transfer())]
+ #[weight(<SelfWeightOf<T>>::transfer_allow_death())]
fn transfer_from(
&mut self,
caller: Caller,
@@ -102,7 +102,7 @@
Ok(balance.into())
}
- #[weight(<SelfWeightOf<T>>::transfer())]
+ #[weight(<SelfWeightOf<T>>::transfer_allow_death())]
fn transfer_cross(&mut self, caller: Caller, to: CrossAddress, amount: U256) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
let to = to.into_sub_cross_account::<T>()?;
@@ -117,7 +117,7 @@
Ok(true)
}
- #[weight(<SelfWeightOf<T>>::transfer())]
+ #[weight(<SelfWeightOf<T>>::transfer_allow_death())]
fn transfer_from_cross(
&mut self,
caller: Caller,
pallets/balances-adapter/src/lib.rsdiffbeforeafterboth--- a/pallets/balances-adapter/src/lib.rs
+++ b/pallets/balances-adapter/src/lib.rs
@@ -153,7 +153,7 @@
};
Ok(PostDispatchInfo {
- actual_weight: Some(<SelfWeightOf<T>>::transfer()),
+ actual_weight: Some(<SelfWeightOf<T>>::transfer_allow_death()),
pays_fee: Pays::Yes,
})
}
runtime/common/config/pallets/app_promotion.rsdiffbeforeafterboth31 pub const RecalculationInterval: BlockNumber = RELAY_DAYS;31 pub const RecalculationInterval: BlockNumber = RELAY_DAYS;32 pub const PendingInterval: BlockNumber = 7 * DAYS;32 pub const PendingInterval: BlockNumber = 7 * DAYS;33 pub const Nominal: Balance = UNIQUE;33 pub const Nominal: Balance = UNIQUE;34 pub const HoldAndFreezeIdentifier: [u8; 16] = *b"appstakeappstake";34 pub IntervalIncome: Perbill = Perbill::from_rational(5u32, 10_000);35 pub IntervalIncome: Perbill = Perbill::from_rational(5u32, 10_000);35}36}363747 type Nominal = Nominal;48 type Nominal = Nominal;48 type IntervalIncome = IntervalIncome;49 type IntervalIncome = IntervalIncome;49 type RuntimeEvent = RuntimeEvent;50 type RuntimeEvent = RuntimeEvent;51 type FreezeIdentifier = HoldAndFreezeIdentifier;50}52}5153