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
--- 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 {
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
--- 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,
 			})
 		}
modifiedruntime/common/config/pallets/app_promotion.rsdiffbeforeafterboth
--- a/runtime/common/config/pallets/app_promotion.rs
+++ b/runtime/common/config/pallets/app_promotion.rs
@@ -31,6 +31,7 @@
 	pub const RecalculationInterval: BlockNumber = RELAY_DAYS;
 	pub const PendingInterval: BlockNumber = 7 * DAYS;
 	pub const Nominal: Balance = UNIQUE;
+	pub const HoldAndFreezeIdentifier: [u8; 16] = *b"appstakeappstake";
 	pub IntervalIncome: Perbill = Perbill::from_rational(5u32, 10_000);
 }
 
@@ -47,4 +48,5 @@
 	type Nominal = Nominal;
 	type IntervalIncome = IntervalIncome;
 	type RuntimeEvent = RuntimeEvent;
+	type FreezeIdentifier = HoldAndFreezeIdentifier;
 }