git.delta.rocks / unique-network / refs/commits / 95338e20d6df

difftreelog

fix after rebase

Trubnikov Sergey2023-05-22parent: #5d77792.patch.diff
in: master

4 files changed

modifiedpallets/balances-adapter/src/common.rsdiffbeforeafterboth
45 }45 }
4646
47 fn transfer() -> Weight {47 fn transfer() -> Weight {
48 <BalancesWeight<T> as WeightInfo>::transfer()48 <BalancesWeight<T> as WeightInfo>::transfer_allow_death()
49 }49 }
5050
51 fn approve() -> Weight {51 fn approve() -> Weight {
57 }57 }
5858
59 fn transfer_from() -> Weight {59 fn transfer_from() -> Weight {
60 <BalancesWeight<T> as WeightInfo>::transfer()60 <BalancesWeight<T> as WeightInfo>::transfer_allow_death()
61 }61 }
6262
63 fn burn_from() -> Weight {63 fn burn_from() -> Weight {
modifiedpallets/balances-adapter/src/erc.rsdiffbeforeafterboth
54 Ok(total.into())54 Ok(total.into())
55 }55 }
5656
57 #[weight(<SelfWeightOf<T>>::transfer())]57 #[weight(<SelfWeightOf<T>>::transfer_allow_death())]
58 fn transfer(&mut self, caller: Caller, to: Address, amount: U256) -> Result<bool> {58 fn transfer(&mut self, caller: Caller, to: Address, amount: U256) -> Result<bool> {
59 let caller = T::CrossAccountId::from_eth(caller);59 let caller = T::CrossAccountId::from_eth(caller);
60 let to = T::CrossAccountId::from_eth(to);60 let to = T::CrossAccountId::from_eth(to);
68 Ok(true)68 Ok(true)
69 }69 }
7070
71 #[weight(<SelfWeightOf<T>>::transfer())]71 #[weight(<SelfWeightOf<T>>::transfer_allow_death())]
72 fn transfer_from(72 fn transfer_from(
73 &mut self,73 &mut self,
74 caller: Caller,74 caller: Caller,
102 Ok(balance.into())102 Ok(balance.into())
103 }103 }
104104
105 #[weight(<SelfWeightOf<T>>::transfer())]105 #[weight(<SelfWeightOf<T>>::transfer_allow_death())]
106 fn transfer_cross(&mut self, caller: Caller, to: CrossAddress, amount: U256) -> Result<bool> {106 fn transfer_cross(&mut self, caller: Caller, to: CrossAddress, amount: U256) -> Result<bool> {
107 let caller = T::CrossAccountId::from_eth(caller);107 let caller = T::CrossAccountId::from_eth(caller);
108 let to = to.into_sub_cross_account::<T>()?;108 let to = to.into_sub_cross_account::<T>()?;
117 Ok(true)117 Ok(true)
118 }118 }
119119
120 #[weight(<SelfWeightOf<T>>::transfer())]120 #[weight(<SelfWeightOf<T>>::transfer_allow_death())]
121 fn transfer_from_cross(121 fn transfer_from_cross(
122 &mut self,122 &mut self,
123 caller: Caller,123 caller: Caller,
modifiedpallets/balances-adapter/src/lib.rsdiffbeforeafterboth
153 };153 };
154154
155 Ok(PostDispatchInfo {155 Ok(PostDispatchInfo {
156 actual_weight: Some(<SelfWeightOf<T>>::transfer()),156 actual_weight: Some(<SelfWeightOf<T>>::transfer_allow_death()),
157 pays_fee: Pays::Yes,157 pays_fee: Pays::Yes,
158 })158 })
159 }159 }
modifiedruntime/common/config/pallets/app_promotion.rsdiffbeforeafterboth
31 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}
3637
47 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