difftreelog
fix build
in: master
4 files changed
pallets/balances-adapter/src/erc.rsdiffbeforeafterboth--- a/pallets/balances-adapter/src/erc.rs
+++ b/pallets/balances-adapter/src/erc.rs
@@ -100,7 +100,7 @@
amount,
ExistenceRequirement::KeepAlive,
)
- .map_err(dispatch_to_evm::<T>);
+ .map_err(dispatch_to_evm::<T>)?;
Ok(true)
}
@@ -117,7 +117,7 @@
let to = T::CrossAccountId::from_eth(to);
let amount = amount.try_into().map_err(|_| "amount overflow")?;
- if (from != to) {
+ if from != to {
return Err("no permission".into());
}
// let budget = self
@@ -132,7 +132,7 @@
amount,
ExistenceRequirement::KeepAlive,
)
- .map_err(dispatch_to_evm::<T>);
+ .map_err(dispatch_to_evm::<T>)?;
Ok(true)
}
}
@@ -165,7 +165,7 @@
amount,
ExistenceRequirement::KeepAlive,
)
- .map_err(dispatch_to_evm::<T>);
+ .map_err(dispatch_to_evm::<T>)?;
Ok(true)
}
@@ -182,7 +182,7 @@
let to = to.into_sub_cross_account::<T>()?;
let amount = amount.try_into().map_err(|_| "amount overflow")?;
- if (from != to) {
+ if from != to {
return Err("no permission".into());
}
@@ -198,7 +198,7 @@
amount,
ExistenceRequirement::KeepAlive,
)
- .map_err(dispatch_to_evm::<T>);
+ .map_err(dispatch_to_evm::<T>)?;
Ok(true)
}
}
pallets/balances-adapter/src/lib.rsdiffbeforeafterboth--- a/pallets/balances-adapter/src/lib.rs
+++ b/pallets/balances-adapter/src/lib.rs
@@ -2,12 +2,14 @@
#![cfg_attr(not(feature = "std"), no_std)]
#![warn(missing_docs)]
+extern crate alloc;
pub use pallet::*;
pub mod erc;
#[frame_support::pallet]
pub mod pallet {
+ use alloc::string::String;
use frame_support::traits::Get;
use sp_core::U256;
runtime/common/config/pallets/mod.rsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617use frame_support::parameter_types;18use sp_runtime::traits::AccountIdConversion;19use crate::{20 runtime_common::{21 dispatch::CollectionDispatchT,22 config::{substrate::TreasuryModuleId, ethereum::EvmCollectionHelpersAddress},23 weights::CommonWeights,24 RelayChainBlockNumberProvider,25 },26 Runtime, RuntimeEvent, RuntimeCall, RuntimeOrigin, RUNTIME_NAME, TOKEN_SYMBOL, Balances,27};28use frame_support::traits::{ConstU32, ConstU64, Currency};29use up_common::{30 types::{AccountId, Balance, BlockNumber},31 constants::*,32};33use up_data_structs::{34 mapping::{EvmTokenAddressMapping, CrossTokenAddressMapping},35};36use sp_arithmetic::Perbill;3738#[cfg(feature = "scheduler")]39pub mod scheduler;4041#[cfg(feature = "foreign-assets")]42pub mod foreign_asset;4344#[cfg(feature = "app-promotion")]45pub mod app_promotion;4647#[cfg(feature = "collator-selection")]48pub mod collator_selection;4950#[cfg(feature = "preimage")]51pub mod preimage;5253parameter_types! {54 pub const CollectionCreationPrice: Balance = 2 * UNIQUE;55 pub const Decimals: u8 = 32;56 pub TreasuryAccountId: AccountId = TreasuryModuleId::get().into_account_truncating();57 pub Name: String = RUNTIME_NAME.to_string();58 pub Symbol: String = TOKEN_SYMBOL.to_string();59}6061impl pallet_common::Config for Runtime {62 type WeightInfo = pallet_common::weights::SubstrateWeight<Self>;63 type RuntimeEvent = RuntimeEvent;64 type Currency = Balances;65 type CollectionCreationPrice = CollectionCreationPrice;66 type TreasuryAccountId = TreasuryAccountId;67 type CollectionDispatch = CollectionDispatchT<Self>;6869 type EvmTokenAddressMapping = EvmTokenAddressMapping;70 type CrossTokenAddressMapping = CrossTokenAddressMapping<Self::AccountId>;71 type ContractAddress = EvmCollectionHelpersAddress;72}7374impl pallet_structure::Config for Runtime {75 type RuntimeEvent = RuntimeEvent;76 type RuntimeCall = RuntimeCall;77 type WeightInfo = pallet_structure::weights::SubstrateWeight<Self>;78}7980impl pallet_fungible::Config for Runtime {81 type WeightInfo = pallet_fungible::weights::SubstrateWeight<Self>;82}83impl pallet_refungible::Config for Runtime {84 type WeightInfo = pallet_refungible::weights::SubstrateWeight<Self>;85}86impl pallet_nonfungible::Config for Runtime {87 type WeightInfo = pallet_nonfungible::weights::SubstrateWeight<Self>;88}89impl pallet_balances_adapter::Config for Runtime {90 type Currency = Balances;91 type CurrencyBalance = <Balances as Currency<Self::AccountId>>::Balance;92 type Decimals = Decimals;93 type Name = Name;94 type Symbol = Symbol;95}9697parameter_types! {98 pub const InflationBlockInterval: BlockNumber = 100; // every time per how many blocks inflation is applied99}100101/// Used for the pallet inflation102impl pallet_inflation::Config for Runtime {103 type Currency = Balances;104 type TreasuryAccountId = TreasuryAccountId;105 type InflationBlockInterval = InflationBlockInterval;106 type BlockNumberProvider = RelayChainBlockNumberProvider<Runtime>;107}108109impl pallet_unique::Config for Runtime {110 type WeightInfo = pallet_unique::weights::SubstrateWeight<Self>;111 type CommonWeightInfo = CommonWeights<Self>;112 type RefungibleExtensionsWeightInfo = CommonWeights<Self>;113}114115parameter_types! {116 pub AppPromotionDailyRate: Perbill = Perbill::from_rational(5u32, 10_000);117 pub const MaxCollators: u32 = MAX_COLLATORS;118 pub const LicenseBond: Balance = GENESIS_LICENSE_BOND;119 pub const SessionPeriod: BlockNumber = SESSION_LENGTH;120 pub const DayRelayBlocks: BlockNumber = RELAY_DAYS;121}122123impl pallet_configuration::Config for Runtime {124 type RuntimeEvent = RuntimeEvent;125 type Currency = Balances;126 type DefaultWeightToFeeCoefficient = ConstU64<{ up_common::constants::WEIGHT_TO_FEE_COEFF }>;127 type DefaultMinGasPrice = ConstU64<{ up_common::constants::MIN_GAS_PRICE }>;128 type DefaultCollatorSelectionMaxCollators = MaxCollators;129 type DefaultCollatorSelectionKickThreshold = SessionPeriod;130 type DefaultCollatorSelectionLicenseBond = LicenseBond;131 type MaxXcmAllowedLocations = ConstU32<16>;132 type AppPromotionDailyRate = AppPromotionDailyRate;133 type DayRelayBlocks = DayRelayBlocks;134 type WeightInfo = pallet_configuration::weights::SubstrateWeight<Self>;135}136137impl pallet_maintenance::Config for Runtime {138 type RuntimeEvent = RuntimeEvent;139 type RuntimeOrigin = RuntimeOrigin;140 type RuntimeCall = RuntimeCall;141 #[cfg(feature = "preimage")]142 type Preimages = crate::Preimage;143 #[cfg(not(feature = "preimage"))]144 type Preimages = ();145 type WeightInfo = pallet_maintenance::weights::SubstrateWeight<Self>;146}1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617use alloc::string::{String, ToString};18use frame_support::parameter_types;19use sp_runtime::traits::AccountIdConversion;20use crate::{21 runtime_common::{22 dispatch::CollectionDispatchT,23 config::{substrate::TreasuryModuleId, ethereum::EvmCollectionHelpersAddress},24 weights::CommonWeights,25 RelayChainBlockNumberProvider,26 },27 Runtime, RuntimeEvent, RuntimeCall, RuntimeOrigin, RUNTIME_NAME, TOKEN_SYMBOL, Balances,28};29use frame_support::traits::{ConstU32, ConstU64, Currency};30use up_common::{31 types::{AccountId, Balance, BlockNumber},32 constants::*,33};34use up_data_structs::{35 mapping::{EvmTokenAddressMapping, CrossTokenAddressMapping},36};37use sp_arithmetic::Perbill;3839#[cfg(feature = "scheduler")]40pub mod scheduler;4142#[cfg(feature = "foreign-assets")]43pub mod foreign_asset;4445#[cfg(feature = "app-promotion")]46pub mod app_promotion;4748#[cfg(feature = "collator-selection")]49pub mod collator_selection;5051#[cfg(feature = "preimage")]52pub mod preimage;5354parameter_types! {55 pub const CollectionCreationPrice: Balance = 2 * UNIQUE;56 pub const Decimals: u8 = 32;57 pub TreasuryAccountId: AccountId = TreasuryModuleId::get().into_account_truncating();58 pub Name: String = RUNTIME_NAME.to_string();59 pub Symbol: String = TOKEN_SYMBOL.to_string();60}6162impl pallet_common::Config for Runtime {63 type WeightInfo = pallet_common::weights::SubstrateWeight<Self>;64 type RuntimeEvent = RuntimeEvent;65 type Currency = Balances;66 type CollectionCreationPrice = CollectionCreationPrice;67 type TreasuryAccountId = TreasuryAccountId;68 type CollectionDispatch = CollectionDispatchT<Self>;6970 type EvmTokenAddressMapping = EvmTokenAddressMapping;71 type CrossTokenAddressMapping = CrossTokenAddressMapping<Self::AccountId>;72 type ContractAddress = EvmCollectionHelpersAddress;73}7475impl pallet_structure::Config for Runtime {76 type RuntimeEvent = RuntimeEvent;77 type RuntimeCall = RuntimeCall;78 type WeightInfo = pallet_structure::weights::SubstrateWeight<Self>;79}8081impl pallet_fungible::Config for Runtime {82 type WeightInfo = pallet_fungible::weights::SubstrateWeight<Self>;83}84impl pallet_refungible::Config for Runtime {85 type WeightInfo = pallet_refungible::weights::SubstrateWeight<Self>;86}87impl pallet_nonfungible::Config for Runtime {88 type WeightInfo = pallet_nonfungible::weights::SubstrateWeight<Self>;89}90impl pallet_balances_adapter::Config for Runtime {91 type Currency = Balances;92 type CurrencyBalance = <Balances as Currency<Self::AccountId>>::Balance;93 type Decimals = Decimals;94 type Name = Name;95 type Symbol = Symbol;96}9798parameter_types! {99 pub const InflationBlockInterval: BlockNumber = 100; // every time per how many blocks inflation is applied100}101102/// Used for the pallet inflation103impl pallet_inflation::Config for Runtime {104 type Currency = Balances;105 type TreasuryAccountId = TreasuryAccountId;106 type InflationBlockInterval = InflationBlockInterval;107 type BlockNumberProvider = RelayChainBlockNumberProvider<Runtime>;108}109110impl pallet_unique::Config for Runtime {111 type WeightInfo = pallet_unique::weights::SubstrateWeight<Self>;112 type CommonWeightInfo = CommonWeights<Self>;113 type RefungibleExtensionsWeightInfo = CommonWeights<Self>;114}115116parameter_types! {117 pub AppPromotionDailyRate: Perbill = Perbill::from_rational(5u32, 10_000);118 pub const MaxCollators: u32 = MAX_COLLATORS;119 pub const LicenseBond: Balance = GENESIS_LICENSE_BOND;120 pub const SessionPeriod: BlockNumber = SESSION_LENGTH;121 pub const DayRelayBlocks: BlockNumber = RELAY_DAYS;122}123124impl pallet_configuration::Config for Runtime {125 type RuntimeEvent = RuntimeEvent;126 type Currency = Balances;127 type DefaultWeightToFeeCoefficient = ConstU64<{ up_common::constants::WEIGHT_TO_FEE_COEFF }>;128 type DefaultMinGasPrice = ConstU64<{ up_common::constants::MIN_GAS_PRICE }>;129 type DefaultCollatorSelectionMaxCollators = MaxCollators;130 type DefaultCollatorSelectionKickThreshold = SessionPeriod;131 type DefaultCollatorSelectionLicenseBond = LicenseBond;132 type MaxXcmAllowedLocations = ConstU32<16>;133 type AppPromotionDailyRate = AppPromotionDailyRate;134 type DayRelayBlocks = DayRelayBlocks;135 type WeightInfo = pallet_configuration::weights::SubstrateWeight<Self>;136}137138impl pallet_maintenance::Config for Runtime {139 type RuntimeEvent = RuntimeEvent;140 type RuntimeOrigin = RuntimeOrigin;141 type RuntimeCall = RuntimeCall;142 #[cfg(feature = "preimage")]143 type Preimages = crate::Preimage;144 #[cfg(not(feature = "preimage"))]145 type Preimages = ();146 type WeightInfo = pallet_maintenance::weights::SubstrateWeight<Self>;147}tests/src/eth/util/playgrounds/unique.dev.tsdiffbeforeafterboth--- a/tests/src/eth/util/playgrounds/unique.dev.ts
+++ b/tests/src/eth/util/playgrounds/unique.dev.ts
@@ -22,6 +22,7 @@
// Native contracts ABI
import collectionHelpersAbi from '../../abi/collectionHelpers.json' assert {type: 'json'};
+import nativeFungibleAbi from '../../abi/nativeFungible.json' assert {type: 'json'};
import fungibleAbi from '../../abi/fungible.json' assert {type: 'json'};
import fungibleDeprecatedAbi from '../../abi/fungibleDeprecated.json' assert {type: 'json'};
import nonFungibleAbi from '../../abi/nonFungible.json' assert {type: 'json'};