git.delta.rocks / unique-network / refs/commits / 50312582bbed

difftreelog

Fix feature foreign_assets misspels

Ilja Khabarov2022-08-22parent: #55191cf.patch.diff
in: master

5 files changed

modifiedruntime/common/config/pallets/mod.rsdiffbeforeafterboth
before · runtime/common/config/pallets/mod.rs
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 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, Event, Call, Balances,27};28use frame_support::traits::{ConstU32, ConstU64};29use up_common::{30	types::{AccountId, Balance, BlockNumber},31	constants::*,32};33use up_data_structs::{34	mapping::{EvmTokenAddressMapping, CrossTokenAddressMapping},35};3637#[cfg(feature = "rmrk")]38pub mod rmrk;3940#[cfg(feature = "scheduler")]41pub mod scheduler;4243#[cfg(feature = "foreign-asset")]44pub mod foreign_asset;4546parameter_types! {47	pub TreasuryAccountId: AccountId = TreasuryModuleId::get().into_account_truncating();48	pub const CollectionCreationPrice: Balance = 2 * UNIQUE;49}5051impl pallet_common::Config for Runtime {52	type WeightInfo = pallet_common::weights::SubstrateWeight<Self>;53	type Event = Event;54	type Currency = Balances;55	type CollectionCreationPrice = CollectionCreationPrice;56	type TreasuryAccountId = TreasuryAccountId;57	type CollectionDispatch = CollectionDispatchT<Self>;5859	type EvmTokenAddressMapping = EvmTokenAddressMapping;60	type CrossTokenAddressMapping = CrossTokenAddressMapping<Self::AccountId>;61	type ContractAddress = EvmCollectionHelpersAddress;62}6364impl pallet_structure::Config for Runtime {65	type Event = Event;66	type Call = Call;67	type WeightInfo = pallet_structure::weights::SubstrateWeight<Self>;68}6970impl pallet_fungible::Config for Runtime {71	type WeightInfo = pallet_fungible::weights::SubstrateWeight<Self>;72}73impl pallet_refungible::Config for Runtime {74	type WeightInfo = pallet_refungible::weights::SubstrateWeight<Self>;75}76impl pallet_nonfungible::Config for Runtime {77	type WeightInfo = pallet_nonfungible::weights::SubstrateWeight<Self>;78}7980parameter_types! {81	pub const InflationBlockInterval: BlockNumber = 100; // every time per how many blocks inflation is applied82}8384/// Used for the pallet inflation85impl pallet_inflation::Config for Runtime {86	type Currency = Balances;87	type TreasuryAccountId = TreasuryAccountId;88	type InflationBlockInterval = InflationBlockInterval;89	type BlockNumberProvider = RelayChainBlockNumberProvider<Runtime>;90}9192impl pallet_unique::Config for Runtime {93	type Event = Event;94	type WeightInfo = pallet_unique::weights::SubstrateWeight<Self>;95	type CommonWeightInfo = CommonWeights<Self>;96	type RefungibleExtensionsWeightInfo = CommonWeights<Self>;97}9899impl pallet_configuration::Config for Runtime {100	type DefaultWeightToFeeCoefficient = ConstU32<{ up_common::constants::WEIGHT_TO_FEE_COEFF }>;101	type DefaultMinGasPrice = ConstU64<{ up_common::constants::MIN_GAS_PRICE }>;102}
after · runtime/common/config/pallets/mod.rs
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 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, Event, Call, Balances,27};28use frame_support::traits::{ConstU32, ConstU64};29use up_common::{30	types::{AccountId, Balance, BlockNumber},31	constants::*,32};33use up_data_structs::{34	mapping::{EvmTokenAddressMapping, CrossTokenAddressMapping},35};3637#[cfg(feature = "rmrk")]38pub mod rmrk;3940#[cfg(feature = "scheduler")]41pub mod scheduler;4243#[cfg(feature = "foreign-assets")]44pub mod foreign_asset;4546parameter_types! {47	pub TreasuryAccountId: AccountId = TreasuryModuleId::get().into_account_truncating();48	pub const CollectionCreationPrice: Balance = 2 * UNIQUE;49}5051impl pallet_common::Config for Runtime {52	type WeightInfo = pallet_common::weights::SubstrateWeight<Self>;53	type Event = Event;54	type Currency = Balances;55	type CollectionCreationPrice = CollectionCreationPrice;56	type TreasuryAccountId = TreasuryAccountId;57	type CollectionDispatch = CollectionDispatchT<Self>;5859	type EvmTokenAddressMapping = EvmTokenAddressMapping;60	type CrossTokenAddressMapping = CrossTokenAddressMapping<Self::AccountId>;61	type ContractAddress = EvmCollectionHelpersAddress;62}6364impl pallet_structure::Config for Runtime {65	type Event = Event;66	type Call = Call;67	type WeightInfo = pallet_structure::weights::SubstrateWeight<Self>;68}6970impl pallet_fungible::Config for Runtime {71	type WeightInfo = pallet_fungible::weights::SubstrateWeight<Self>;72}73impl pallet_refungible::Config for Runtime {74	type WeightInfo = pallet_refungible::weights::SubstrateWeight<Self>;75}76impl pallet_nonfungible::Config for Runtime {77	type WeightInfo = pallet_nonfungible::weights::SubstrateWeight<Self>;78}7980parameter_types! {81	pub const InflationBlockInterval: BlockNumber = 100; // every time per how many blocks inflation is applied82}8384/// Used for the pallet inflation85impl pallet_inflation::Config for Runtime {86	type Currency = Balances;87	type TreasuryAccountId = TreasuryAccountId;88	type InflationBlockInterval = InflationBlockInterval;89	type BlockNumberProvider = RelayChainBlockNumberProvider<Runtime>;90}9192impl pallet_unique::Config for Runtime {93	type Event = Event;94	type WeightInfo = pallet_unique::weights::SubstrateWeight<Self>;95	type CommonWeightInfo = CommonWeights<Self>;96	type RefungibleExtensionsWeightInfo = CommonWeights<Self>;97}9899impl pallet_configuration::Config for Runtime {100	type DefaultWeightToFeeCoefficient = ConstU32<{ up_common::constants::WEIGHT_TO_FEE_COEFF }>;101	type DefaultMinGasPrice = ConstU64<{ up_common::constants::MIN_GAS_PRICE }>;102}
modifiedruntime/common/config/xcm.rsdiffbeforeafterboth
--- a/runtime/common/config/xcm.rs
+++ b/runtime/common/config/xcm.rs
@@ -40,9 +40,10 @@
 	FixedWeightBounds, FungiblesAdapter, LocationInverter, NativeAsset, ParentAsSuperuser, RelayChainAsNative,
 	SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative,
 	SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit, ParentIsPreset,
+	ConvertedConcreteAssetId
 };
 use xcm_executor::{Config, XcmExecutor, Assets};
-use xcm_executor::traits::{Convert as ConvertXcm, MatchesFungible, WeightTrader, FilterAssetLocation};
+use xcm_executor::traits::{Convert as ConvertXcm, JustTry, MatchesFungible, WeightTrader, FilterAssetLocation};
 use pallet_foreing_assets::{
 	AssetIds, AssetIdMapping, XcmForeignAssetIdMapping, CurrencyId, NativeCurrency,
 	UsingAnyCurrencyComponents, TryAsForeing, ForeignAssetId,
@@ -356,9 +357,10 @@
 /// Means for transacting assets on this chain.
 #[cfg(feature = "foreign-assets")]
 pub type AssetTransactors = FungiblesTransactor;
-#[cfg(not(feature = "foreign-assets"))]
-pub type AssetTransactors = LocalAssetTransactor;
 
+//#[cfg(not(feature = "foreign-assets"))]
+//pub type AssetTransactors = LocalAssetTransactor;
+
 #[cfg(feature = "foreign-assets")]
 pub struct AllAsset;
 #[cfg(feature = "foreign-assets")]
@@ -370,14 +372,15 @@
 
 #[cfg(feature = "foreign-assets")]
 pub type IsReserve = AllAsset;
-#[cfg(not(feature = "foreign-assets"))]
-pub type IsReserve = NativeAsset;
+//#[cfg(not(feature = "foreign-assets"))]
+//pub type IsReserve = NativeAsset;
 
 #[cfg(feature = "foreign-assets")]
 type Trader<T> =
 	UsingAnyCurrencyComponents<
 		pallet_configuration::WeightToFee<T, Balance>,
 		RelayLocation, AccountId, Balances, ()>;
+/*
 #[cfg(not(feature = "foreign-assets"))]
 type Trader<T> = UsingOnlySelfCurrencyComponents<
 	pallet_configuration::WeightToFee<T, Balance>,
@@ -386,6 +389,7 @@
 	Balances,
 	(),
 >;
+*/
 
 pub struct XcmConfig<T>(PhantomData<T>);
 impl<T> Config for XcmConfig<T>
modifiedruntime/opal/Cargo.tomldiffbeforeafterboth
--- a/runtime/opal/Cargo.toml
+++ b/runtime/opal/Cargo.toml
@@ -126,12 +126,12 @@
     "pallet-foreing-assets/std"
 ]
 limit-testing = ['pallet-unique/limit-testing', 'up-data-structs/limit-testing']
-opal-runtime = ['refungible', 'scheduler', 'rmrk', 'foreign-asset']
+opal-runtime = ['refungible', 'scheduler', 'rmrk', 'foreign-assets']
 
 refungible = []
 scheduler = []
 rmrk = []
-foreign-asset = []
+foreign-assets = []
 
 ################################################################################
 # Substrate Dependencies
modifiedtests/package.jsondiffbeforeafterboth
--- a/tests/package.json
+++ b/tests/package.json
@@ -75,6 +75,10 @@
     "testScheduler": "mocha --timeout 9999999 -r ts-node/register ./**/scheduler.test.ts",
     "testSchedulingEVM": "mocha --timeout 9999999 -r ts-node/register ./**/eth/scheduling.test.ts",
     "testXcmTransfer": "mocha --timeout 9999999 -r ts-node/register ./**/xcmTransfer.test.ts",
+    "testXcmTransferAcala": "mocha --timeout 9999999 -r ts-node/register ./**/xcmTransferAcala.test.ts",
+    "testXcmTransferKarura": "mocha --timeout 9999999 -r ts-node/register ./**/xcmTransferKarura.test.ts",
+    "testXcmTransferStatemine": "mocha --timeout 9999999 -r ts-node/register ./**/xcmTransferStatemine.test.ts",
+    "testXcmTransferMoonriver": "mocha --timeout 9999999 -r ts-node/register ./**/xcmTransferMoonriver.test.ts",
     "testPalletPresence": "mocha --timeout 9999999 -r ts-node/register ./**/pallet-presence.test.ts",
     "testBlockProduction": "mocha --timeout 9999999 -r ts-node/register ./**/block-production.test.ts",
     "testEnableDisableTransfers": "mocha --timeout 9999999 -r ts-node/register ./**/enableDisableTransfer.test.ts",
modifiedtests/src/xcmTransferStatemine.test.tsdiffbeforeafterboth
--- a/tests/src/xcmTransferStatemine.test.ts
+++ b/tests/src/xcmTransferStatemine.test.ts
@@ -30,7 +30,7 @@
 const expect = chai.expect;
 
 const RELAY_PORT = '9844';
-const UNIQUE_CHAIN = 5000;
+const UNIQUE_CHAIN = 2037;
 const UNIQUE_PORT = '9944';
 const STATEMINE_CHAIN = 1000;
 const STATEMINE_PORT = '9946';
@@ -87,8 +87,9 @@
       const result3 = getGenericResult(events3);
       expect(result3.success).to.be.true;
 
-      // funding parachain sovereing account (Parachain: 5000)
-      const parachainSovereingAccount = '0x7369626c88130000000000000000000000000000000000000000000000000000';
+      // funding parachain sovereing account (Parachain: 2037)
+      //const parachainSovereingAccount = '0x70617261f5070000000000000000000000000000000000000000000000000000';
+      const parachainSovereingAccount = '0x7369626cf5070000000000000000000000000000000000000000000000000000';
       const tx4 = api.tx.balances.transfer(parachainSovereingAccount, fundingAmount);
       const events4 = await submitTransactionAsync(bob, tx4);
       const result4 = getGenericResult(events4);
@@ -265,7 +266,7 @@
     }, uniqueApiOptions);
   });
 
-  it('Should connect and send USDT from Unique to Statemine back', async () => {
+  it.skip('Should connect and send USDT from Unique to Statemine back', async () => {
     let balanceBefore: bigint;
     const uniqueApiOptions: ApiOptions = {
       provider: new WsProvider('ws://127.0.0.1:' + UNIQUE_PORT),