git.delta.rocks / unique-network / refs/commits / ceb84596992e

difftreelog

Merge pull request #801 from UniqueNetwork/fix/xcm-qtz-unq-tests

Yaroslav Bolyukin2022-12-22parents: #b9448b5 #3e66406.patch.diff
in: master
Fix xcm

10 files changed

modifiedpallets/foreign-assets/src/lib.rsdiffbeforeafterboth
--- a/pallets/foreign-assets/src/lib.rs
+++ b/pallets/foreign-assets/src/lib.rs
@@ -161,9 +161,7 @@
 
 	fn get_currency_id(multi_location: MultiLocation) -> Option<CurrencyId> {
 		log::trace!(target: "fassets::get_currency_id", "call");
-		Some(AssetIds::ForeignAssetId(
-			Pallet::<T>::location_to_currency_ids(multi_location).unwrap_or(0),
-		))
+		Pallet::<T>::location_to_currency_ids(multi_location).map(|id| AssetIds::ForeignAssetId(id))
 	}
 }
 
modifiedruntime/common/config/xcm/foreignassets.rsdiffbeforeafterboth
--- a/runtime/common/config/xcm/foreignassets.rs
+++ b/runtime/common/config/xcm/foreignassets.rs
@@ -18,7 +18,7 @@
 	traits::{Contains, Get, fungibles},
 	parameter_types,
 };
-use sp_runtime::traits::{Zero, Convert};
+use sp_runtime::traits::Convert;
 use xcm::v1::{Junction::*, MultiLocation, Junctions::*};
 use xcm::latest::MultiAsset;
 use xcm_builder::{FungiblesAdapter, ConvertedConcreteAssetId};
@@ -38,16 +38,16 @@
 	pub CheckingAccount: AccountId = PolkadotXcm::check_account();
 }
 
-/// Allow checking in assets that have issuance > 0.
-pub struct NonZeroIssuance<AccountId, ForeignAssets>(PhantomData<(AccountId, ForeignAssets)>);
+/// No teleports are allowed
+pub struct NoTeleports<AccountId, ForeignAssets>(PhantomData<(AccountId, ForeignAssets)>);
 
 impl<AccountId, ForeignAssets> Contains<<ForeignAssets as fungibles::Inspect<AccountId>>::AssetId>
-	for NonZeroIssuance<AccountId, ForeignAssets>
+	for NoTeleports<AccountId, ForeignAssets>
 where
 	ForeignAssets: fungibles::Inspect<AccountId>,
 {
-	fn contains(id: &<ForeignAssets as fungibles::Inspect<AccountId>>::AssetId) -> bool {
-		!ForeignAssets::total_issuance(*id).is_zero()
+	fn contains(_id: &<ForeignAssets as fungibles::Inspect<AccountId>>::AssetId) -> bool {
+		false
 	}
 }
 
@@ -84,7 +84,7 @@
 			Some(AssetIds::ForeignAssetId(foreign_asset_id)) => {
 				ConvertAssetId::convert_ref(AssetIds::ForeignAssetId(foreign_asset_id))
 			}
-			_ => ConvertAssetId::convert_ref(AssetIds::ForeignAssetId(0)),
+			_ => Err(()),
 		}
 	}
 
@@ -132,9 +132,8 @@
 	LocationToAccountId,
 	// Our chain's account ID type (we can't get away without mentioning it explicitly):
 	AccountId,
-	// We only want to allow teleports of known assets. We use non-zero issuance as an indication
-	// that this asset is known.
-	NonZeroIssuance<AccountId, ForeignAssets>,
+	// No teleports are allowed
+	NoTeleports<AccountId, ForeignAssets>,
 	// The account to use for tracking teleports.
 	CheckingAccount,
 >;
modifiedruntime/common/config/xcm/mod.rsdiffbeforeafterboth
--- a/runtime/common/config/xcm/mod.rs
+++ b/runtime/common/config/xcm/mod.rs
@@ -186,6 +186,9 @@
 			TransferReserveAsset { dest: dst, .. } => {
 				allowed |= allowed_locations.contains(dst);
 			}
+			InitiateReserveWithdraw { reserve: dst, .. } => {
+				allowed |= allowed_locations.contains(dst);
+			}
 			_ => {}
 		});
 
modifiedtests/src/config.tsdiffbeforeafterboth
--- a/tests/src/config.ts
+++ b/tests/src/config.ts
@@ -25,6 +25,8 @@
   moonbeamUrl: process.env.moonbeamUrl || 'ws://127.0.0.1:9947',
   moonriverUrl: process.env.moonbeamUrl || 'ws://127.0.0.1:9947',
   westmintUrl: process.env.westmintUrl || 'ws://127.0.0.1:9948',
+  statemineUrl: process.env.statemineUrl || 'ws://127.0.0.1:9948',
+  statemintUrl: process.env.statemintUrl || 'ws://127.0.0.1:9948',
 };
 
 export default config;
modifiedtests/src/util/index.tsdiffbeforeafterboth
--- a/tests/src/util/index.ts
+++ b/tests/src/util/index.ts
@@ -11,7 +11,7 @@
 import config from '../config';
 import {ChainHelperBase} from './playgrounds/unique';
 import {ILogger} from './playgrounds/types';
-import {DevUniqueHelper, SilentLogger, SilentConsole, DevMoonbeamHelper, DevMoonriverHelper, DevAcalaHelper, DevKaruraHelper, DevRelayHelper, DevWestmintHelper} from './playgrounds/unique.dev';
+import {DevUniqueHelper, SilentLogger, SilentConsole, DevMoonbeamHelper, DevMoonriverHelper, DevAcalaHelper, DevKaruraHelper, DevRelayHelper, DevWestmintHelper, DevStatemineHelper, DevStatemintHelper} from './playgrounds/unique.dev';
 
 chai.use(chaiAsPromised);
 chai.use(chaiSubset);
@@ -65,6 +65,14 @@
   return usingPlaygroundsGeneral<DevWestmintHelper>(DevWestmintHelper, url, code);
 };
 
+export const usingStateminePlaygrounds = (url: string, code: (helper: DevWestmintHelper, privateKey: (seed: string) => Promise<IKeyringPair>) => Promise<void>) => {
+  return usingPlaygroundsGeneral<DevStatemineHelper>(DevWestmintHelper, url, code);
+};
+
+export const usingStatemintPlaygrounds = (url: string, code: (helper: DevWestmintHelper, privateKey: (seed: string) => Promise<IKeyringPair>) => Promise<void>) => {
+  return usingPlaygroundsGeneral<DevStatemintHelper>(DevWestmintHelper, url, code);
+};
+
 export const usingRelayPlaygrounds = (url: string, code: (helper: DevRelayHelper, privateKey: (seed: string) => Promise<IKeyringPair>) => Promise<void>) => {
   return usingPlaygroundsGeneral<DevRelayHelper>(DevRelayHelper, url, code);
 };
modifiedtests/src/util/playgrounds/unique.dev.tsdiffbeforeafterboth
before · tests/src/util/playgrounds/unique.dev.ts
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// SPDX-License-Identifier: Apache-2.034import {stringToU8a} from '@polkadot/util';5import {encodeAddress, mnemonicGenerate} from '@polkadot/util-crypto';6import {UniqueHelper, MoonbeamHelper, ChainHelperBase, AcalaHelper, RelayHelper, WestmintHelper} from './unique';7import {ApiPromise, Keyring, WsProvider} from '@polkadot/api';8import * as defs from '../../interfaces/definitions';9import {IKeyringPair} from '@polkadot/types/types';10import {EventRecord} from '@polkadot/types/interfaces';11import {ICrossAccountId, TSigner} from './types';12import {FrameSystemEventRecord} from '@polkadot/types/lookup';13import {VoidFn} from '@polkadot/api/types';14import {Pallets} from '..';1516export class SilentLogger {17  log(_msg: any, _level: any): void { }18  level = {19    ERROR: 'ERROR' as const,20    WARNING: 'WARNING' as const,21    INFO: 'INFO' as const,22  };23}2425export class SilentConsole {26  // TODO: Remove, this is temporary: Filter unneeded API output27  // (Jaco promised it will be removed in the next version)28  consoleErr: any;29  consoleLog: any;30  consoleWarn: any;3132  constructor() {33    this.consoleErr = console.error;34    this.consoleLog = console.log;35    this.consoleWarn = console.warn;36  }3738  enable() {  39    const outFn = (printer: any) => (...args: any[]) => {40      for (const arg of args) {41        if (typeof arg !== 'string')42          continue;43        if (arg.includes('1000:: Normal connection closure') || arg.includes('Not decorating unknown runtime apis:') || arg.includes('RPC methods not decorated:') || arg === 'Normal connection closure')44          return;45      }46      printer(...args);47    };48  49    console.error = outFn(this.consoleErr.bind(console));50    console.log = outFn(this.consoleLog.bind(console));51    console.warn = outFn(this.consoleWarn.bind(console));52  }5354  disable() {55    console.error = this.consoleErr;56    console.log = this.consoleLog;57    console.warn = this.consoleWarn;58  }59}6061export class DevUniqueHelper extends UniqueHelper {62  /**63   * Arrange methods for tests64   */65  arrange: ArrangeGroup;66  wait: WaitGroup;67  admin: AdminGroup;68  testUtils: TestUtilGroup;6970  constructor(logger: { log: (msg: any, level: any) => void, level: any }, options: {[key: string]: any} = {}) {71    options.helperBase = options.helperBase ?? DevUniqueHelper;7273    super(logger, options);74    this.arrange = new ArrangeGroup(this);75    this.wait = new WaitGroup(this);76    this.admin = new AdminGroup(this);77    this.testUtils = new TestUtilGroup(this);78  }7980  async connect(wsEndpoint: string, _listeners?: any): Promise<void> {81    const wsProvider = new WsProvider(wsEndpoint);82    this.api = new ApiPromise({83      provider: wsProvider,84      signedExtensions: {85        ContractHelpers: {86          extrinsic: {},87          payload: {},88        },89        CheckMaintenance: {90          extrinsic: {},91          payload: {},92        },93        FakeTransactionFinalizer: {94          extrinsic: {},95          payload: {},96        },97      },98      rpc: {99        unique: defs.unique.rpc,100        appPromotion: defs.appPromotion.rpc,101        rmrk: defs.rmrk.rpc,102        eth: {103          feeHistory: {104            description: 'Dummy',105            params: [],106            type: 'u8',107          },108          maxPriorityFeePerGas: {109            description: 'Dummy',110            params: [],111            type: 'u8',112          },113        },114      },115    });116    await this.api.isReadyOrError;117    this.network = await UniqueHelper.detectNetwork(this.api);118  }119}120121export class DevRelayHelper extends RelayHelper {}122123export class DevWestmintHelper extends WestmintHelper {124  wait: WaitGroup;125126  constructor(logger: { log: (msg: any, level: any) => void, level: any }, options: {[key: string]: any} = {}) {127    options.helperBase = options.helperBase ?? DevWestmintHelper;128129    super(logger, options);130    this.wait = new WaitGroup(this);131  }132}133134export class DevMoonbeamHelper extends MoonbeamHelper {135  account: MoonbeamAccountGroup;136  wait: WaitGroup;137138  constructor(logger: { log: (msg: any, level: any) => void, level: any }, options: {[key: string]: any} = {}) {139    options.helperBase = options.helperBase ?? DevMoonbeamHelper;140141    super(logger, options);142    this.account = new MoonbeamAccountGroup(this);143    this.wait = new WaitGroup(this);144  }145}146147export class DevMoonriverHelper extends DevMoonbeamHelper {}148149export class DevAcalaHelper extends AcalaHelper {150  wait: WaitGroup;151152  constructor(logger: { log: (msg: any, level: any) => void, level: any }, options: {[key: string]: any} = {}) {153    options.helperBase = options.helperBase ?? DevAcalaHelper;154155    super(logger, options);156    this.wait = new WaitGroup(this);157  }158}159160export class DevKaruraHelper extends DevAcalaHelper {}161162class ArrangeGroup {163  helper: DevUniqueHelper;164165  scheduledIdSlider = 0;166167  constructor(helper: DevUniqueHelper) {168    this.helper = helper;169  }170171  /**172   * Generates accounts with the specified UNQ token balance 173   * @param balances balances for generated accounts. Each balance will be multiplied by the token nominal.174   * @param donor donor account for balances175   * @returns array of newly created accounts176   * @example const [acc1, acc2, acc3] = await createAccounts([0n, 10n, 20n], donor); 177   */178  createAccounts = async (balances: bigint[], donor: IKeyringPair): Promise<IKeyringPair[]> => {179    let nonce = await this.helper.chain.getNonce(donor.address);180    const wait = new WaitGroup(this.helper);181    const ss58Format = this.helper.chain.getChainProperties().ss58Format;182    const tokenNominal = this.helper.balance.getOneTokenNominal();183    const transactions = [];184    const accounts: IKeyringPair[] = [];185    for (const balance of balances) {186      const recipient = this.helper.util.fromSeed(mnemonicGenerate(), ss58Format);187      accounts.push(recipient);188      if (balance !== 0n) {189        const tx = this.helper.constructApiCall('api.tx.balances.transfer', [{Id: recipient.address}, balance * tokenNominal]);190        transactions.push(this.helper.signTransaction(donor, tx, {nonce}, 'account generation'));191        nonce++;192      }193    }194195    await Promise.all(transactions).catch(_e => {});196    197    //#region TODO remove this region, when nonce problem will be solved198    const checkBalances = async () => {199      let isSuccess = true;200      for (let i = 0; i < balances.length; i++) {201        const balance = await this.helper.balance.getSubstrate(accounts[i].address);202        if (balance !== balances[i] * tokenNominal) {203          isSuccess = false;204          break;205        }206      }207      return isSuccess;208    };209210    let accountsCreated = false;211    const maxBlocksChecked = await this.helper.arrange.isDevNode() ? 50 : 5;212    // checkBalances retry up to 5-50 blocks213    for (let index = 0; index < maxBlocksChecked; index++) {214      accountsCreated = await checkBalances();215      if(accountsCreated) break;216      await wait.newBlocks(1);217    }218219    if (!accountsCreated) throw Error('Accounts generation failed');220    //#endregion221222    return accounts;223  };224225  // TODO combine this method and createAccounts into one226  createCrowd = async (accountsToCreate: number, withBalance: bigint, donor: IKeyringPair): Promise<IKeyringPair[]> => {  227    const createAsManyAsCan = async () => {228      let transactions: any = [];229      const accounts: IKeyringPair[] = [];230      let nonce = await this.helper.chain.getNonce(donor.address);231      const tokenNominal = this.helper.balance.getOneTokenNominal();232      for (let i = 0; i < accountsToCreate; i++) {233        if (i === 500) { // if there are too many accounts to create234          await Promise.allSettled(transactions); // wait while first 500 (should be 100 for devnode) tx will be settled 235          transactions = []; //236          nonce = await this.helper.chain.getNonce(donor.address); // update nonce 237        }238        const recepient = this.helper.util.fromSeed(mnemonicGenerate());239        accounts.push(recepient);240        if (withBalance !== 0n) {241          const tx = this.helper.constructApiCall('api.tx.balances.transfer', [{Id: recepient.address}, withBalance * tokenNominal]);242          transactions.push(this.helper.signTransaction(donor, tx, {nonce}, 'account generation'));243          nonce++;244        }245      }246      247      const fullfilledAccounts = [];248      await Promise.allSettled(transactions);249      for (const account of accounts) {250        const accountBalance = await this.helper.balance.getSubstrate(account.address);251        if (accountBalance === withBalance * tokenNominal) {252          fullfilledAccounts.push(account);253        }254      }255      return fullfilledAccounts;256    };257258    259    const crowd: IKeyringPair[] = [];260    // do up to 5 retries261    for (let index = 0; index < 5 && accountsToCreate !== 0; index++) {262      const asManyAsCan = await createAsManyAsCan();263      crowd.push(...asManyAsCan);264      accountsToCreate -= asManyAsCan.length;265    }266267    if (accountsToCreate !== 0) throw Error(`Crowd generation failed: ${accountsToCreate} accounts left`);268269    return crowd;270  };271272  isDevNode = async () => {273    let blockNumber = (await this.helper.callRpc('api.query.system.number')).toJSON();274    if (blockNumber == 0) {275      await this.helper.wait.newBlocks(1); 276      blockNumber = (await this.helper.callRpc('api.query.system.number')).toJSON();277    }278    const block2 = await this.helper.callRpc('api.rpc.chain.getBlock', [await this.helper.callRpc('api.rpc.chain.getBlockHash', [blockNumber])]);279    const block1 = await this.helper.callRpc('api.rpc.chain.getBlock', [await this.helper.callRpc('api.rpc.chain.getBlockHash', [blockNumber - 1])]);280    const findCreationDate = (block: any) => {281      const humanBlock = block.toHuman();282      let date;283      humanBlock.block.extrinsics.forEach((ext: any) => {284        if(ext.method.section === 'timestamp') {285          date = Number(ext.method.args.now.replaceAll(',', ''));286        }287      });288      return date;289    };290    const block1date = await findCreationDate(block1);291    const block2date = await findCreationDate(block2);292    if(block2date! - block1date! < 9000) return true;293  };294  295  async calculcateFee(payer: ICrossAccountId, promise: () => Promise<any>): Promise<bigint> {296    const address = payer.Substrate ? payer.Substrate : await this.helper.address.ethToSubstrate(payer.Ethereum!);297    let balance = await this.helper.balance.getSubstrate(address); 298    299    await promise();300    301    balance -= await this.helper.balance.getSubstrate(address);302    303    return balance;304  }305306  calculatePalletAddress(palletId: any) {307    const address = stringToU8a(('modl' + palletId).padEnd(32, '\0'));308    return encodeAddress(address, this.helper.chain.getChainProperties().ss58Format);309  }310311  makeScheduledIds(num: number): string[] {312    function makeId(slider: number) {313      const scheduledIdSize = 64;314      const hexId = slider.toString(16);315      const prefixSize = scheduledIdSize - hexId.length;316317      const scheduledId = '0x' + '0'.repeat(prefixSize) + hexId;318319      return scheduledId;  320    }321322    const ids = [];323    for (let i = 0; i < num; i++) {324      ids.push(makeId(this.scheduledIdSlider));325      this.scheduledIdSlider += 1;326    }327328    return ids;329  }330331  makeScheduledId(): string {332    return (this.makeScheduledIds(1))[0];333  }334335  async captureEvents(eventSection: string, eventMethod: string): Promise<EventCapture> {336    const capture = new EventCapture(this.helper, eventSection, eventMethod);337    await capture.startCapture();338339    return capture;340  }341}342343class MoonbeamAccountGroup {344  helper: MoonbeamHelper;345346  keyring: Keyring;347  _alithAccount: IKeyringPair;348  _baltatharAccount: IKeyringPair;349  _dorothyAccount: IKeyringPair;350351  constructor(helper: MoonbeamHelper) {352    this.helper = helper;353354    this.keyring = new Keyring({type: 'ethereum'});355    const alithPrivateKey = '0x5fb92d6e98884f76de468fa3f6278f8807c48bebc13595d45af5bdc4da702133';356    const baltatharPrivateKey = '0x8075991ce870b93a8870eca0c0f91913d12f47948ca0fd25b49c6fa7cdbeee8b';357    const dorothyPrivateKey = '0x39539ab1876910bbf3a223d84a29e28f1cb4e2e456503e7e91ed39b2e7223d68';358359    this._alithAccount = this.keyring.addFromUri(alithPrivateKey, undefined, 'ethereum');360    this._baltatharAccount = this.keyring.addFromUri(baltatharPrivateKey, undefined, 'ethereum');361    this._dorothyAccount = this.keyring.addFromUri(dorothyPrivateKey, undefined, 'ethereum');362  }363364  alithAccount() {365    return this._alithAccount;366  }367368  baltatharAccount() {369    return this._baltatharAccount;370  }371372  dorothyAccount() {373    return this._dorothyAccount;374  }375376  create() {377    return this.keyring.addFromUri(mnemonicGenerate());378  }379}380381class WaitGroup {382  helper: ChainHelperBase;383384  constructor(helper: ChainHelperBase) {385    this.helper = helper;386  }387388  sleep(milliseconds: number) {389    return new Promise((resolve) => setTimeout(resolve, milliseconds));390  }391392  private async waitWithTimeout(promise: Promise<any>, timeout: number) {393    let isBlock = false;394    promise.then(() => isBlock = true).catch(() => isBlock = true);395    let totalTime = 0;396    const step = 100;397    while(!isBlock) {398      await this.sleep(step);399      totalTime += step;400      if(totalTime >= timeout) throw Error('Blocks production failed');401    }402    return promise;403  }404405  /**406   * Wait for specified number of blocks407   * @param blocksCount number of blocks to wait408   * @returns 409   */410  async newBlocks(blocksCount = 1, timeout?: number): Promise<void> {411    timeout = timeout ?? blocksCount * 60_000;412    // eslint-disable-next-line no-async-promise-executor413    const promise = new Promise<void>(async (resolve) => {414      const unsubscribe = await this.helper.getApi().rpc.chain.subscribeNewHeads(() => {415        if (blocksCount > 0) {416          blocksCount--;417        } else {418          unsubscribe();419          resolve();420        }421      });422    });423    await this.waitWithTimeout(promise, timeout);424    return promise;425  }426427  async forParachainBlockNumber(blockNumber: bigint | number, timeout?: number) {428    timeout = timeout ?? 30 * 60 * 1000;429    // eslint-disable-next-line no-async-promise-executor430    const promise = new Promise<void>(async (resolve) => {431      const unsubscribe = await this.helper.getApi().rpc.chain.subscribeNewHeads((data: any) => {432        if (data.number.toNumber() >= blockNumber) {433          unsubscribe();434          resolve();435        }436      });437    });438    await this.waitWithTimeout(promise, timeout);439    return promise;440  }441  442  async forRelayBlockNumber(blockNumber: bigint | number, timeout?: number) {443    timeout = timeout ?? 30 * 60 * 1000;444    // eslint-disable-next-line no-async-promise-executor445    const promise = new Promise<void>(async (resolve) => {446      const unsubscribe = await this.helper.getApi().query.parachainSystem.validationData((data: any) => {447        if (data.value.relayParentNumber.toNumber() >= blockNumber) {448          // @ts-ignore449          unsubscribe();450          resolve();451        }452      });453    });454    await this.waitWithTimeout(promise, timeout);455    return promise;456  }457458  noScheduledTasks() {459    const api = this.helper.getApi();460    461    // eslint-disable-next-line no-async-promise-executor462    const promise = new Promise<void>(async resolve => {463      const unsubscribe = await api.rpc.chain.subscribeNewHeads(async () => {464        const areThereScheduledTasks = await api.query.scheduler.lookup.entries();465466        if(areThereScheduledTasks.length == 0) {467          unsubscribe();468          resolve();469        }470      }); 471    });472473    return promise;474  }475476  event(maxBlocksToWait: number, eventSection: string, eventMethod: string) {477    // eslint-disable-next-line no-async-promise-executor478    const promise = new Promise<EventRecord | null>(async (resolve) => {479      const unsubscribe = await this.helper.getApi().rpc.chain.subscribeNewHeads(async header => {480        const blockNumber = header.number.toHuman();481        const blockHash = header.hash;482        const eventIdStr = `${eventSection}.${eventMethod}`;483        const waitLimitStr = `wait blocks remaining: ${maxBlocksToWait}`;484  485        this.helper.logger.log(`[Block #${blockNumber}] Waiting for event \`${eventIdStr}\` (${waitLimitStr})`);486  487        const apiAt = await this.helper.getApi().at(blockHash);488        const eventRecords = (await apiAt.query.system.events()) as any;489  490        const neededEvent = eventRecords.toArray().find((r: FrameSystemEventRecord) => {491          return r.event.section == eventSection && r.event.method == eventMethod;492        });493  494        if (neededEvent) {495          unsubscribe();496          resolve(neededEvent);497        } else if (maxBlocksToWait > 0) {498          maxBlocksToWait--;499        } else {500          this.helper.logger.log(`Event \`${eventIdStr}\` is NOT found`);501          unsubscribe();502          resolve(null);503        }504      });505    });506    return promise;507  }508}509510class TestUtilGroup {511  helper: DevUniqueHelper;512513  constructor(helper: DevUniqueHelper) {514    this.helper = helper;515  }516517  async enable() {518    if (this.helper.fetchMissingPalletNames([Pallets.TestUtils]).length != 0) {519      return;520    }521522    const signer = this.helper.util.fromSeed('//Alice');523    await this.helper.getSudo<DevUniqueHelper>().executeExtrinsic(signer, 'api.tx.testUtils.enable', [], true);524  }525526  async setTestValue(signer: TSigner, testVal: number) {527    await this.helper.executeExtrinsic(signer, 'api.tx.testUtils.setTestValue', [testVal], true);528  }529530  async incTestValue(signer: TSigner) {531    await this.helper.executeExtrinsic(signer, 'api.tx.testUtils.incTestValue', [], true);532  }533534  async setTestValueAndRollback(signer: TSigner, testVal: number) {535    await this.helper.executeExtrinsic(signer, 'api.tx.testUtils.setTestValueAndRollback', [testVal], true);536  }537538  async testValue(blockIdx?: number) {539    const api = blockIdx540      ? await this.helper.getApi().at(await this.helper.callRpc('api.rpc.chain.getBlockHash', [blockIdx]))541      : this.helper.getApi();542543    return (await api.query.testUtils.testValue()).toJSON();544  }545546  async justTakeFee(signer: TSigner) {547    await this.helper.executeExtrinsic(signer, 'api.tx.testUtils.justTakeFee', [], true);548  }549550  async selfCancelingInc(signer: TSigner, scheduledId: string, maxTestVal: number) {551    await this.helper.executeExtrinsic(signer, 'api.tx.testUtils.selfCancelingInc', [scheduledId, maxTestVal], true);552  }553}554555class EventCapture {556  helper: DevUniqueHelper;557  eventSection: string;558  eventMethod: string;559  events: EventRecord[] = [];560  unsubscribe: VoidFn | null = null;561562  constructor(563    helper: DevUniqueHelper,564    eventSection: string,565    eventMethod: string,566  ) {567    this.helper = helper;568    this.eventSection = eventSection;569    this.eventMethod = eventMethod;570  }571572  async startCapture() {573    this.stopCapture();574    this.unsubscribe = (await this.helper.getApi().query.system.events((eventRecords: FrameSystemEventRecord[]) => {575      const newEvents = eventRecords.filter(r => {576        return r.event.section == this.eventSection && r.event.method == this.eventMethod;577      });578579      this.events.push(...newEvents);580    })) as any;581  }582583  stopCapture() {584    if (this.unsubscribe !== null) {585      this.unsubscribe();586    }587  }588589  extractCapturedEvents() {590    return this.events;591  }592}593594class AdminGroup {595  helper: UniqueHelper;596597  constructor(helper: UniqueHelper) {598    this.helper = helper;599  }600601  async payoutStakers(signer: IKeyringPair, stakersToPayout: number) {602    const payoutResult = await this.helper.executeExtrinsic(signer, 'api.tx.appPromotion.payoutStakers', [stakersToPayout], true);603    return payoutResult.result.events.filter(e => e.event.method === 'StakingRecalculation').map(e => {604      return {605        staker: e.event.data[0].toString(),606        stake: e.event.data[1].toBigInt(),607        payout: e.event.data[2].toBigInt(),608      };609    });610  }611}
after · tests/src/util/playgrounds/unique.dev.ts
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// SPDX-License-Identifier: Apache-2.034import {stringToU8a} from '@polkadot/util';5import {encodeAddress, mnemonicGenerate} from '@polkadot/util-crypto';6import {UniqueHelper, MoonbeamHelper, ChainHelperBase, AcalaHelper, RelayHelper, WestmintHelper} from './unique';7import {ApiPromise, Keyring, WsProvider} from '@polkadot/api';8import * as defs from '../../interfaces/definitions';9import {IKeyringPair} from '@polkadot/types/types';10import {EventRecord} from '@polkadot/types/interfaces';11import {ICrossAccountId, TSigner} from './types';12import {FrameSystemEventRecord} from '@polkadot/types/lookup';13import {VoidFn} from '@polkadot/api/types';14import {Pallets} from '..';1516export class SilentLogger {17  log(_msg: any, _level: any): void { }18  level = {19    ERROR: 'ERROR' as const,20    WARNING: 'WARNING' as const,21    INFO: 'INFO' as const,22  };23}2425export class SilentConsole {26  // TODO: Remove, this is temporary: Filter unneeded API output27  // (Jaco promised it will be removed in the next version)28  consoleErr: any;29  consoleLog: any;30  consoleWarn: any;3132  constructor() {33    this.consoleErr = console.error;34    this.consoleLog = console.log;35    this.consoleWarn = console.warn;36  }3738  enable() {  39    const outFn = (printer: any) => (...args: any[]) => {40      for (const arg of args) {41        if (typeof arg !== 'string')42          continue;43        if (arg.includes('1000:: Normal connection closure') || arg.includes('Not decorating unknown runtime apis:') || arg.includes('RPC methods not decorated:') || arg === 'Normal connection closure')44          return;45      }46      printer(...args);47    };48  49    console.error = outFn(this.consoleErr.bind(console));50    console.log = outFn(this.consoleLog.bind(console));51    console.warn = outFn(this.consoleWarn.bind(console));52  }5354  disable() {55    console.error = this.consoleErr;56    console.log = this.consoleLog;57    console.warn = this.consoleWarn;58  }59}6061export class DevUniqueHelper extends UniqueHelper {62  /**63   * Arrange methods for tests64   */65  arrange: ArrangeGroup;66  wait: WaitGroup;67  admin: AdminGroup;68  testUtils: TestUtilGroup;6970  constructor(logger: { log: (msg: any, level: any) => void, level: any }, options: {[key: string]: any} = {}) {71    options.helperBase = options.helperBase ?? DevUniqueHelper;7273    super(logger, options);74    this.arrange = new ArrangeGroup(this);75    this.wait = new WaitGroup(this);76    this.admin = new AdminGroup(this);77    this.testUtils = new TestUtilGroup(this);78  }7980  async connect(wsEndpoint: string, _listeners?: any): Promise<void> {81    const wsProvider = new WsProvider(wsEndpoint);82    this.api = new ApiPromise({83      provider: wsProvider,84      signedExtensions: {85        ContractHelpers: {86          extrinsic: {},87          payload: {},88        },89        CheckMaintenance: {90          extrinsic: {},91          payload: {},92        },93        FakeTransactionFinalizer: {94          extrinsic: {},95          payload: {},96        },97      },98      rpc: {99        unique: defs.unique.rpc,100        appPromotion: defs.appPromotion.rpc,101        rmrk: defs.rmrk.rpc,102        eth: {103          feeHistory: {104            description: 'Dummy',105            params: [],106            type: 'u8',107          },108          maxPriorityFeePerGas: {109            description: 'Dummy',110            params: [],111            type: 'u8',112          },113        },114      },115    });116    await this.api.isReadyOrError;117    this.network = await UniqueHelper.detectNetwork(this.api);118  }119}120121export class DevRelayHelper extends RelayHelper {122  wait: WaitGroup;123124  constructor(logger: { log: (msg: any, level: any) => void, level: any }, options: {[key: string]: any} = {}) {125    options.helperBase = options.helperBase ?? DevRelayHelper;126127    super(logger, options);128    this.wait = new WaitGroup(this);129  }130}131132export class DevWestmintHelper extends WestmintHelper {133  wait: WaitGroup;134135  constructor(logger: { log: (msg: any, level: any) => void, level: any }, options: {[key: string]: any} = {}) {136    options.helperBase = options.helperBase ?? DevWestmintHelper;137138    super(logger, options);139    this.wait = new WaitGroup(this);140  }141}142143export class DevStatemineHelper extends DevWestmintHelper {}144145export class DevStatemintHelper extends DevWestmintHelper {}146147export class DevMoonbeamHelper extends MoonbeamHelper {148  account: MoonbeamAccountGroup;149  wait: WaitGroup;150151  constructor(logger: { log: (msg: any, level: any) => void, level: any }, options: {[key: string]: any} = {}) {152    options.helperBase = options.helperBase ?? DevMoonbeamHelper;153    options.notePreimagePallet = options.notePreimagePallet ?? 'democracy';154155    super(logger, options);156    this.account = new MoonbeamAccountGroup(this);157    this.wait = new WaitGroup(this);158  }159}160161export class DevMoonriverHelper extends DevMoonbeamHelper {162  constructor(logger: { log: (msg: any, level: any) => void, level: any }, options: {[key: string]: any} = {}) {163    options.notePreimagePallet = options.notePreimagePallet ?? 'preimage';164    super(logger, options);165  }166}167168export class DevAcalaHelper extends AcalaHelper {169  wait: WaitGroup;170171  constructor(logger: { log: (msg: any, level: any) => void, level: any }, options: {[key: string]: any} = {}) {172    options.helperBase = options.helperBase ?? DevAcalaHelper;173174    super(logger, options);175    this.wait = new WaitGroup(this);176  }177}178179export class DevKaruraHelper extends DevAcalaHelper {}180181class ArrangeGroup {182  helper: DevUniqueHelper;183184  scheduledIdSlider = 0;185186  constructor(helper: DevUniqueHelper) {187    this.helper = helper;188  }189190  /**191   * Generates accounts with the specified UNQ token balance 192   * @param balances balances for generated accounts. Each balance will be multiplied by the token nominal.193   * @param donor donor account for balances194   * @returns array of newly created accounts195   * @example const [acc1, acc2, acc3] = await createAccounts([0n, 10n, 20n], donor); 196   */197  createAccounts = async (balances: bigint[], donor: IKeyringPair): Promise<IKeyringPair[]> => {198    let nonce = await this.helper.chain.getNonce(donor.address);199    const wait = new WaitGroup(this.helper);200    const ss58Format = this.helper.chain.getChainProperties().ss58Format;201    const tokenNominal = this.helper.balance.getOneTokenNominal();202    const transactions = [];203    const accounts: IKeyringPair[] = [];204    for (const balance of balances) {205      const recipient = this.helper.util.fromSeed(mnemonicGenerate(), ss58Format);206      accounts.push(recipient);207      if (balance !== 0n) {208        const tx = this.helper.constructApiCall('api.tx.balances.transfer', [{Id: recipient.address}, balance * tokenNominal]);209        transactions.push(this.helper.signTransaction(donor, tx, {nonce}, 'account generation'));210        nonce++;211      }212    }213214    await Promise.all(transactions).catch(_e => {});215    216    //#region TODO remove this region, when nonce problem will be solved217    const checkBalances = async () => {218      let isSuccess = true;219      for (let i = 0; i < balances.length; i++) {220        const balance = await this.helper.balance.getSubstrate(accounts[i].address);221        if (balance !== balances[i] * tokenNominal) {222          isSuccess = false;223          break;224        }225      }226      return isSuccess;227    };228229    let accountsCreated = false;230    const maxBlocksChecked = await this.helper.arrange.isDevNode() ? 50 : 5;231    // checkBalances retry up to 5-50 blocks232    for (let index = 0; index < maxBlocksChecked; index++) {233      accountsCreated = await checkBalances();234      if(accountsCreated) break;235      await wait.newBlocks(1);236    }237238    if (!accountsCreated) throw Error('Accounts generation failed');239    //#endregion240241    return accounts;242  };243244  // TODO combine this method and createAccounts into one245  createCrowd = async (accountsToCreate: number, withBalance: bigint, donor: IKeyringPair): Promise<IKeyringPair[]> => {  246    const createAsManyAsCan = async () => {247      let transactions: any = [];248      const accounts: IKeyringPair[] = [];249      let nonce = await this.helper.chain.getNonce(donor.address);250      const tokenNominal = this.helper.balance.getOneTokenNominal();251      for (let i = 0; i < accountsToCreate; i++) {252        if (i === 500) { // if there are too many accounts to create253          await Promise.allSettled(transactions); // wait while first 500 (should be 100 for devnode) tx will be settled 254          transactions = []; //255          nonce = await this.helper.chain.getNonce(donor.address); // update nonce 256        }257        const recepient = this.helper.util.fromSeed(mnemonicGenerate());258        accounts.push(recepient);259        if (withBalance !== 0n) {260          const tx = this.helper.constructApiCall('api.tx.balances.transfer', [{Id: recepient.address}, withBalance * tokenNominal]);261          transactions.push(this.helper.signTransaction(donor, tx, {nonce}, 'account generation'));262          nonce++;263        }264      }265      266      const fullfilledAccounts = [];267      await Promise.allSettled(transactions);268      for (const account of accounts) {269        const accountBalance = await this.helper.balance.getSubstrate(account.address);270        if (accountBalance === withBalance * tokenNominal) {271          fullfilledAccounts.push(account);272        }273      }274      return fullfilledAccounts;275    };276277    278    const crowd: IKeyringPair[] = [];279    // do up to 5 retries280    for (let index = 0; index < 5 && accountsToCreate !== 0; index++) {281      const asManyAsCan = await createAsManyAsCan();282      crowd.push(...asManyAsCan);283      accountsToCreate -= asManyAsCan.length;284    }285286    if (accountsToCreate !== 0) throw Error(`Crowd generation failed: ${accountsToCreate} accounts left`);287288    return crowd;289  };290291  isDevNode = async () => {292    let blockNumber = (await this.helper.callRpc('api.query.system.number')).toJSON();293    if (blockNumber == 0) {294      await this.helper.wait.newBlocks(1); 295      blockNumber = (await this.helper.callRpc('api.query.system.number')).toJSON();296    }297    const block2 = await this.helper.callRpc('api.rpc.chain.getBlock', [await this.helper.callRpc('api.rpc.chain.getBlockHash', [blockNumber])]);298    const block1 = await this.helper.callRpc('api.rpc.chain.getBlock', [await this.helper.callRpc('api.rpc.chain.getBlockHash', [blockNumber - 1])]);299    const findCreationDate = (block: any) => {300      const humanBlock = block.toHuman();301      let date;302      humanBlock.block.extrinsics.forEach((ext: any) => {303        if(ext.method.section === 'timestamp') {304          date = Number(ext.method.args.now.replaceAll(',', ''));305        }306      });307      return date;308    };309    const block1date = await findCreationDate(block1);310    const block2date = await findCreationDate(block2);311    if(block2date! - block1date! < 9000) return true;312  };313  314  async calculcateFee(payer: ICrossAccountId, promise: () => Promise<any>): Promise<bigint> {315    const address = payer.Substrate ? payer.Substrate : await this.helper.address.ethToSubstrate(payer.Ethereum!);316    let balance = await this.helper.balance.getSubstrate(address); 317    318    await promise();319    320    balance -= await this.helper.balance.getSubstrate(address);321    322    return balance;323  }324325  calculatePalletAddress(palletId: any) {326    const address = stringToU8a(('modl' + palletId).padEnd(32, '\0'));327    return encodeAddress(address, this.helper.chain.getChainProperties().ss58Format);328  }329330  makeScheduledIds(num: number): string[] {331    function makeId(slider: number) {332      const scheduledIdSize = 64;333      const hexId = slider.toString(16);334      const prefixSize = scheduledIdSize - hexId.length;335336      const scheduledId = '0x' + '0'.repeat(prefixSize) + hexId;337338      return scheduledId;  339    }340341    const ids = [];342    for (let i = 0; i < num; i++) {343      ids.push(makeId(this.scheduledIdSlider));344      this.scheduledIdSlider += 1;345    }346347    return ids;348  }349350  makeScheduledId(): string {351    return (this.makeScheduledIds(1))[0];352  }353354  async captureEvents(eventSection: string, eventMethod: string): Promise<EventCapture> {355    const capture = new EventCapture(this.helper, eventSection, eventMethod);356    await capture.startCapture();357358    return capture;359  }360}361362class MoonbeamAccountGroup {363  helper: MoonbeamHelper;364365  keyring: Keyring;366  _alithAccount: IKeyringPair;367  _baltatharAccount: IKeyringPair;368  _dorothyAccount: IKeyringPair;369370  constructor(helper: MoonbeamHelper) {371    this.helper = helper;372373    this.keyring = new Keyring({type: 'ethereum'});374    const alithPrivateKey = '0x5fb92d6e98884f76de468fa3f6278f8807c48bebc13595d45af5bdc4da702133';375    const baltatharPrivateKey = '0x8075991ce870b93a8870eca0c0f91913d12f47948ca0fd25b49c6fa7cdbeee8b';376    const dorothyPrivateKey = '0x39539ab1876910bbf3a223d84a29e28f1cb4e2e456503e7e91ed39b2e7223d68';377378    this._alithAccount = this.keyring.addFromUri(alithPrivateKey, undefined, 'ethereum');379    this._baltatharAccount = this.keyring.addFromUri(baltatharPrivateKey, undefined, 'ethereum');380    this._dorothyAccount = this.keyring.addFromUri(dorothyPrivateKey, undefined, 'ethereum');381  }382383  alithAccount() {384    return this._alithAccount;385  }386387  baltatharAccount() {388    return this._baltatharAccount;389  }390391  dorothyAccount() {392    return this._dorothyAccount;393  }394395  create() {396    return this.keyring.addFromUri(mnemonicGenerate());397  }398}399400class WaitGroup {401  helper: ChainHelperBase;402403  constructor(helper: ChainHelperBase) {404    this.helper = helper;405  }406407  sleep(milliseconds: number) {408    return new Promise((resolve) => setTimeout(resolve, milliseconds));409  }410411  private async waitWithTimeout(promise: Promise<any>, timeout: number) {412    let isBlock = false;413    promise.then(() => isBlock = true).catch(() => isBlock = true);414    let totalTime = 0;415    const step = 100;416    while(!isBlock) {417      await this.sleep(step);418      totalTime += step;419      if(totalTime >= timeout) throw Error('Blocks production failed');420    }421    return promise;422  }423424  /**425   * Wait for specified number of blocks426   * @param blocksCount number of blocks to wait427   * @returns 428   */429  async newBlocks(blocksCount = 1, timeout?: number): Promise<void> {430    timeout = timeout ?? blocksCount * 60_000;431    // eslint-disable-next-line no-async-promise-executor432    const promise = new Promise<void>(async (resolve) => {433      const unsubscribe = await this.helper.getApi().rpc.chain.subscribeNewHeads(() => {434        if (blocksCount > 0) {435          blocksCount--;436        } else {437          unsubscribe();438          resolve();439        }440      });441    });442    await this.waitWithTimeout(promise, timeout);443    return promise;444  }445446  async forParachainBlockNumber(blockNumber: bigint | number, timeout?: number) {447    timeout = timeout ?? 30 * 60 * 1000;448    // eslint-disable-next-line no-async-promise-executor449    const promise = new Promise<void>(async (resolve) => {450      const unsubscribe = await this.helper.getApi().rpc.chain.subscribeNewHeads((data: any) => {451        if (data.number.toNumber() >= blockNumber) {452          unsubscribe();453          resolve();454        }455      });456    });457    await this.waitWithTimeout(promise, timeout);458    return promise;459  }460  461  async forRelayBlockNumber(blockNumber: bigint | number, timeout?: number) {462    timeout = timeout ?? 30 * 60 * 1000;463    // eslint-disable-next-line no-async-promise-executor464    const promise = new Promise<void>(async (resolve) => {465      const unsubscribe = await this.helper.getApi().query.parachainSystem.validationData((data: any) => {466        if (data.value.relayParentNumber.toNumber() >= blockNumber) {467          // @ts-ignore468          unsubscribe();469          resolve();470        }471      });472    });473    await this.waitWithTimeout(promise, timeout);474    return promise;475  }476477  noScheduledTasks() {478    const api = this.helper.getApi();479    480    // eslint-disable-next-line no-async-promise-executor481    const promise = new Promise<void>(async resolve => {482      const unsubscribe = await api.rpc.chain.subscribeNewHeads(async () => {483        const areThereScheduledTasks = await api.query.scheduler.lookup.entries();484485        if(areThereScheduledTasks.length == 0) {486          unsubscribe();487          resolve();488        }489      }); 490    });491492    return promise;493  }494495  event(maxBlocksToWait: number, eventSection: string, eventMethod: string) {496    // eslint-disable-next-line no-async-promise-executor497    const promise = new Promise<EventRecord | null>(async (resolve) => {498      const unsubscribe = await this.helper.getApi().rpc.chain.subscribeNewHeads(async header => {499        const blockNumber = header.number.toHuman();500        const blockHash = header.hash;501        const eventIdStr = `${eventSection}.${eventMethod}`;502        const waitLimitStr = `wait blocks remaining: ${maxBlocksToWait}`;503  504        this.helper.logger.log(`[Block #${blockNumber}] Waiting for event \`${eventIdStr}\` (${waitLimitStr})`);505  506        const apiAt = await this.helper.getApi().at(blockHash);507        const eventRecords = (await apiAt.query.system.events()) as any;508  509        const neededEvent = eventRecords.toArray().find((r: FrameSystemEventRecord) => {510          return r.event.section == eventSection && r.event.method == eventMethod;511        });512  513        if (neededEvent) {514          unsubscribe();515          resolve(neededEvent);516        } else if (maxBlocksToWait > 0) {517          maxBlocksToWait--;518        } else {519          this.helper.logger.log(`Event \`${eventIdStr}\` is NOT found`);520          unsubscribe();521          resolve(null);522        }523      });524    });525    return promise;526  }527}528529class TestUtilGroup {530  helper: DevUniqueHelper;531532  constructor(helper: DevUniqueHelper) {533    this.helper = helper;534  }535536  async enable() {537    if (this.helper.fetchMissingPalletNames([Pallets.TestUtils]).length != 0) {538      return;539    }540541    const signer = this.helper.util.fromSeed('//Alice');542    await this.helper.getSudo<DevUniqueHelper>().executeExtrinsic(signer, 'api.tx.testUtils.enable', [], true);543  }544545  async setTestValue(signer: TSigner, testVal: number) {546    await this.helper.executeExtrinsic(signer, 'api.tx.testUtils.setTestValue', [testVal], true);547  }548549  async incTestValue(signer: TSigner) {550    await this.helper.executeExtrinsic(signer, 'api.tx.testUtils.incTestValue', [], true);551  }552553  async setTestValueAndRollback(signer: TSigner, testVal: number) {554    await this.helper.executeExtrinsic(signer, 'api.tx.testUtils.setTestValueAndRollback', [testVal], true);555  }556557  async testValue(blockIdx?: number) {558    const api = blockIdx559      ? await this.helper.getApi().at(await this.helper.callRpc('api.rpc.chain.getBlockHash', [blockIdx]))560      : this.helper.getApi();561562    return (await api.query.testUtils.testValue()).toJSON();563  }564565  async justTakeFee(signer: TSigner) {566    await this.helper.executeExtrinsic(signer, 'api.tx.testUtils.justTakeFee', [], true);567  }568569  async selfCancelingInc(signer: TSigner, scheduledId: string, maxTestVal: number) {570    await this.helper.executeExtrinsic(signer, 'api.tx.testUtils.selfCancelingInc', [scheduledId, maxTestVal], true);571  }572}573574class EventCapture {575  helper: DevUniqueHelper;576  eventSection: string;577  eventMethod: string;578  events: EventRecord[] = [];579  unsubscribe: VoidFn | null = null;580581  constructor(582    helper: DevUniqueHelper,583    eventSection: string,584    eventMethod: string,585  ) {586    this.helper = helper;587    this.eventSection = eventSection;588    this.eventMethod = eventMethod;589  }590591  async startCapture() {592    this.stopCapture();593    this.unsubscribe = (await this.helper.getApi().query.system.events((eventRecords: FrameSystemEventRecord[]) => {594      const newEvents = eventRecords.filter(r => {595        return r.event.section == this.eventSection && r.event.method == this.eventMethod;596      });597598      this.events.push(...newEvents);599    })) as any;600  }601602  stopCapture() {603    if (this.unsubscribe !== null) {604      this.unsubscribe();605    }606  }607608  extractCapturedEvents() {609    return this.events;610  }611}612613class AdminGroup {614  helper: UniqueHelper;615616  constructor(helper: UniqueHelper) {617    this.helper = helper;618  }619620  async payoutStakers(signer: IKeyringPair, stakersToPayout: number) {621    const payoutResult = await this.helper.executeExtrinsic(signer, 'api.tx.appPromotion.payoutStakers', [stakersToPayout], true);622    return payoutResult.result.events.filter(e => e.event.method === 'StakingRecalculation').map(e => {623      return {624        staker: e.event.data[0].toString(),625        stake: e.event.data[1].toBigInt(),626        payout: e.event.data[2].toBigInt(),627      };628    });629  }630}
modifiedtests/src/util/playgrounds/unique.tsdiffbeforeafterboth
--- a/tests/src/util/playgrounds/unique.ts
+++ b/tests/src/util/playgrounds/unique.ts
@@ -2740,21 +2740,72 @@
     this.palletName = palletName;
   }
 
-  async limitedReserveTransferAssets(signer: TSigner, destination: any, beneficiary: any, assets: any, feeAssetItem: number, weightLimit: number) {
-    await this.helper.executeExtrinsic(signer, `api.tx.${this.palletName}.limitedReserveTransferAssets`, [destination, beneficiary, assets, feeAssetItem, {Limited: weightLimit}], true);
+  async limitedReserveTransferAssets(signer: TSigner, destination: any, beneficiary: any, assets: any, feeAssetItem: number, weightLimit: any) {
+    await this.helper.executeExtrinsic(signer, `api.tx.${this.palletName}.limitedReserveTransferAssets`, [destination, beneficiary, assets, feeAssetItem, weightLimit], true);
+  }
+
+  async teleportAssets(signer: TSigner, destination: any, beneficiary: any, assets: any, feeAssetItem: number) {
+    await this.helper.executeExtrinsic(signer, `api.tx.${this.palletName}.teleportAssets`, [destination, beneficiary, assets, feeAssetItem], true);
+  }
+
+  async teleportNativeAsset(signer: TSigner, destinationParaId: number, targetAccount: Uint8Array, amount: bigint) {
+    const destination = {
+      V1: {
+        parents: 0,
+        interior: {
+          X1: {
+            Parachain: destinationParaId,
+          },
+        },
+      },
+    };
+
+    const beneficiary = {
+      V1: {
+        parents: 0,
+        interior: {
+          X1: {
+            AccountId32: {
+              network: 'Any',
+              id: targetAccount,
+            },
+          },
+        },
+      },
+    };
+
+    const assets = {
+      V1: [
+        {
+          id: {
+            Concrete: {
+              parents: 0,
+              interior: 'Here',
+            },
+          },
+          fun: {
+            Fungible: amount,
+          },
+        },
+      ],
+    };
+
+    const feeAssetItem = 0;
+
+    await this.teleportAssets(signer, destination, beneficiary, assets, feeAssetItem);
   }
 }
 
 class XTokensGroup<T extends ChainHelperBase> extends HelperGroup<T> {
-  async transfer(signer: TSigner, currencyId: any, amount: bigint, destination: any, destWeight: number) {
+  async transfer(signer: TSigner, currencyId: any, amount: bigint, destination: any, destWeight: any) {
     await this.helper.executeExtrinsic(signer, 'api.tx.xTokens.transfer', [currencyId, amount, destination, destWeight], true);
   }
 
-  async transferMultiasset(signer: TSigner, asset: any, destination: any, destWeight: number) {
+  async transferMultiasset(signer: TSigner, asset: any, destination: any, destWeight: any) {
     await this.helper.executeExtrinsic(signer, 'api.tx.xTokens.transferMultiasset', [asset, destination, destWeight], true);
   }
 
-  async transferMulticurrencies(signer: TSigner, currencies: any[], feeItem: number, destLocation: any, destWeight: number) {
+  async transferMulticurrencies(signer: TSigner, currencies: any[], feeItem: number, destLocation: any, destWeight: any) {
     await this.helper.executeExtrinsic(signer, 'api.tx.xTokens.transferMulticurrencies', [currencies, feeItem, destLocation, destWeight], true);
   }
 }
@@ -2823,12 +2874,19 @@
 }
 
 class MoonbeamDemocracyGroup extends HelperGroup<MoonbeamHelper> {
+  notePreimagePallet: string;
+
+  constructor(helper: MoonbeamHelper, options: {[key: string]: any} = {}) {
+    super(helper);
+    this.notePreimagePallet = options.notePreimagePallet;
+  }
+
   async notePreimage(signer: TSigner, encodedProposal: string) {
-    await this.helper.executeExtrinsic(signer, 'api.tx.democracy.notePreimage', [encodedProposal], true);
+    await this.helper.executeExtrinsic(signer, `api.tx.${this.notePreimagePallet}.notePreimage`, [encodedProposal], true);
   }
 
-  externalProposeMajority(proposalHash: string) {
-    return this.helper.constructApiCall('api.tx.democracy.externalProposeMajority', [proposalHash]);
+  externalProposeMajority(proposal: any) {
+    return this.helper.constructApiCall('api.tx.democracy.externalProposeMajority', [proposal]);
   }
 
   fastTrack(proposalHash: string, votingPeriod: number, delayPeriod: number) {
@@ -2857,7 +2915,7 @@
     await this.helper.executeExtrinsic(signer, `api.tx.${this.collective}.vote`, [proposalHash, proposalIndex, approve], true);
   }
 
-  async close(signer: TSigner, proposalHash: string, proposalIndex: number, weightBound: number, lengthBound: number) {
+  async close(signer: TSigner, proposalHash: string, proposalIndex: number, weightBound: any, lengthBound: number) {
     await this.helper.executeExtrinsic(signer, `api.tx.${this.collective}.close`, [proposalHash, proposalIndex, weightBound, lengthBound], true);
   }
 
@@ -2917,11 +2975,13 @@
 }
 
 export class RelayHelper extends XcmChainHelper {
+  balance: SubstrateBalanceGroup<RelayHelper>;
   xcm: XcmGroup<RelayHelper>;
 
   constructor(logger?: ILogger, options: {[key: string]: any} = {}) {
     super(logger, options.helperBase ?? RelayHelper);
 
+    this.balance = new SubstrateBalanceGroup(this);
     this.xcm = new XcmGroup(this, 'xcmPallet');
   }
 }
@@ -2960,7 +3020,7 @@
     this.assetManager = new MoonbeamAssetManagerGroup(this);
     this.assets = new AssetsGroup(this);
     this.xTokens = new XTokensGroup(this);
-    this.democracy = new MoonbeamDemocracyGroup(this);
+    this.democracy = new MoonbeamDemocracyGroup(this, options);
     this.collective = {
       council: new MoonbeamCollectiveGroup(this, 'councilCollective'),
       techCommittee: new MoonbeamCollectiveGroup(this, 'techCommitteeCollective'),
modifiedtests/src/xcm/xcmOpal.test.tsdiffbeforeafterboth
--- a/tests/src/xcm/xcmOpal.test.ts
+++ b/tests/src/xcm/xcmOpal.test.ts
@@ -31,6 +31,7 @@
 const ASSET_METADATA_DESCRIPTION = 'USDT';
 const ASSET_METADATA_MINIMAL_BALANCE = 1n;
 
+const RELAY_DECIMALS = 12;
 const WESTMINT_DECIMALS = 12;
 
 const TRANSFER_AMOUNT = 1_000_000_000_000_000_000n;
@@ -147,9 +148,8 @@
       };
 
       const feeAssetItem = 0;
-      const weightLimit = 5_000_000_000;
 
-      await helper.xcm.limitedReserveTransferAssets(alice, destination, beneficiary, assets, feeAssetItem, weightLimit);
+      await helper.xcm.limitedReserveTransferAssets(alice, destination, beneficiary, assets, feeAssetItem, 'Unlimited');
     });
   
   });
@@ -202,16 +202,15 @@
       };
 
       const feeAssetItem = 0;
-      const weightLimit = 5000000000;
 
       balanceStmnBefore = await helper.balance.getSubstrate(alice.address);
-      await helper.xcm.limitedReserveTransferAssets(alice, dest, beneficiary, assets, feeAssetItem, weightLimit);
+      await helper.xcm.limitedReserveTransferAssets(alice, dest, beneficiary, assets, feeAssetItem, 'Unlimited');
 
       balanceStmnAfter = await helper.balance.getSubstrate(alice.address);
 
       // common good parachain take commission in it native token
       console.log(
-        'Opal to Westmint transaction fees on Westmint: %s WND',
+        '[Westmint -> Opal] transaction fees on Westmint: %s WND',
         helper.util.bigIntToDecimals(balanceStmnBefore - balanceStmnAfter, WESTMINT_DECIMALS),
       );
       expect(balanceStmnBefore > balanceStmnAfter).to.be.true;
@@ -227,18 +226,19 @@
 
     balanceOpalAfter = await helper.balance.getSubstrate(alice.address);
 
-    // commission has not paid in USDT token
-    expect(free == TRANSFER_AMOUNT).to.be.true;
     console.log(
-      'Opal to Westmint transaction fees on Opal: %s USDT',
-      helper.util.bigIntToDecimals(TRANSFER_AMOUNT - free),
+      '[Westmint -> Opal] transaction fees on Opal: %s USDT',
+      helper.util.bigIntToDecimals(TRANSFER_AMOUNT - free, ASSET_METADATA_DECIMALS),
     );
+    console.log(
+      '[Westmint -> Opal] transaction fees on Opal: %s OPL',
+      helper.util.bigIntToDecimals(balanceOpalAfter - balanceOpalBefore),
+    );
+
+    // commission has not paid in USDT token
+    expect(free == TRANSFER_AMOUNT).to.be.true;
     // ... and parachain native token
     expect(balanceOpalAfter == balanceOpalBefore).to.be.true;
-    console.log(
-      'Opal to Westmint transaction fees on Opal: %s WND',
-      helper.util.bigIntToDecimals(balanceOpalAfter - balanceOpalBefore, WESTMINT_DECIMALS),
-    );    
   });
 
   itSub('Should connect and send USDT from Unique to Statemine back', async ({helper}) => {
@@ -276,9 +276,8 @@
     ];
 
     const feeItem = 1;
-    const destWeight = 500000000000;
 
-    await helper.xTokens.transferMulticurrencies(alice, currencies, feeItem, destination, destWeight);
+    await helper.xTokens.transferMulticurrencies(alice, currencies, feeItem, destination, 'Unlimited');
     
     // the commission has been paid in parachain native token
     balanceOpalFinal = await helper.balance.getSubstrate(alice.address);
@@ -339,9 +338,8 @@
       };
 
       const feeAssetItem = 0;
-      const weightLimit = 5_000_000_000;
 
-      await helper.xcm.limitedReserveTransferAssets(bob, destination, beneficiary, assets, feeAssetItem, weightLimit);
+      await helper.xcm.limitedReserveTransferAssets(bob, destination, beneficiary, assets, feeAssetItem, 'Unlimited');
     });
   
     await helper.wait.newBlocks(3);
@@ -363,20 +361,23 @@
   });
 
   itSub('Should connect and send Relay token back', async ({helper}) => {
+    let relayTokenBalanceBefore: bigint;
+    let relayTokenBalanceAfter: bigint;
+    await usingRelayPlaygrounds(relayUrl, async (helper) => {
+      relayTokenBalanceBefore = await helper.balance.getSubstrate(bob.address);
+    });
+
     const destination = {
       V1: {
         parents: 1,
-        interior: {X2: [
-          {
-            Parachain: STATEMINE_CHAIN,
-          },
-          {
+        interior: {
+          X1:{
             AccountId32: {
               network: 'Any',
               id: bob.addressRaw,
             },
           },
-        ]},
+        },
       },
     };
 
@@ -390,11 +391,19 @@
     ];
 
     const feeItem = 0;
-    const destWeight = 500000000000;
 
-    await helper.xTokens.transferMulticurrencies(bob, currencies, feeItem, destination, destWeight);
+    await helper.xTokens.transferMulticurrencies(bob, currencies, feeItem, destination, 'Unlimited');
 
     balanceBobFinal = await helper.balance.getSubstrate(bob.address);
-    console.log('Relay (Westend) to Opal transaction fees: %s OPL', balanceBobAfter - balanceBobFinal);
+    console.log('[Opal -> Relay (Westend)] transaction fees: %s OPL',  helper.util.bigIntToDecimals(balanceBobAfter - balanceBobFinal));
+
+    await usingRelayPlaygrounds(relayUrl, async (helper) => {
+      await helper.wait.newBlocks(10);
+      relayTokenBalanceAfter = await helper.balance.getSubstrate(bob.address);
+
+      const diff = relayTokenBalanceAfter - relayTokenBalanceBefore;
+      console.log('[Opal -> Relay (Westend)] actually delivered: %s WND', helper.util.bigIntToDecimals(diff, RELAY_DECIMALS));
+      expect(diff > 0, 'Relay tokens was not delivered back').to.be.true;
+    });
   });
 });
modifiedtests/src/xcm/xcmQuartz.test.tsdiffbeforeafterboth
--- a/tests/src/xcm/xcmQuartz.test.ts
+++ b/tests/src/xcm/xcmQuartz.test.ts
@@ -17,21 +17,430 @@
 import {IKeyringPair} from '@polkadot/types/types';
 import {blake2AsHex} from '@polkadot/util-crypto';
 import config from '../config';
-import {XcmV2TraitsOutcome, XcmV2TraitsError} from '../interfaces';
-import {itSub, expect, describeXCM, usingPlaygrounds, usingKaruraPlaygrounds, usingRelayPlaygrounds, usingMoonriverPlaygrounds} from '../util';
+import {XcmV2TraitsError} from '../interfaces';
+import {itSub, expect, describeXCM, usingPlaygrounds, usingKaruraPlaygrounds, usingRelayPlaygrounds, usingMoonriverPlaygrounds, usingStateminePlaygrounds} from '../util';
 
 const QUARTZ_CHAIN = 2095;
+const STATEMINE_CHAIN = 1000;
 const KARURA_CHAIN = 2000;
 const MOONRIVER_CHAIN = 2023;
 
+const STATEMINE_PALLET_INSTANCE = 50;
+
 const relayUrl = config.relayUrl;
+const statemineUrl = config.statemineUrl;
 const karuraUrl = config.karuraUrl;
 const moonriverUrl = config.moonriverUrl;
 
+const RELAY_DECIMALS = 12;
+const STATEMINE_DECIMALS = 12;
 const KARURA_DECIMALS = 12;
 
 const TRANSFER_AMOUNT = 2000000000000000000000000n;
 
+const FUNDING_AMOUNT = 3_500_000_0000_000_000n; 
+
+const TRANSFER_AMOUNT_RELAY = 50_000_000_000_000_000n;
+
+const USDT_ASSET_ID = 100;
+const USDT_ASSET_METADATA_DECIMALS = 18;
+const USDT_ASSET_METADATA_NAME = 'USDT';
+const USDT_ASSET_METADATA_DESCRIPTION = 'USDT';
+const USDT_ASSET_METADATA_MINIMAL_BALANCE = 1n;
+const USDT_ASSET_AMOUNT = 10_000_000_000_000_000_000_000_000n;
+
+describeXCM('[XCM] Integration test: Exchanging USDT with Statemine', () => {
+  let alice: IKeyringPair;
+  let bob: IKeyringPair;
+  
+  let balanceStmnBefore: bigint;
+  let balanceStmnAfter: bigint;
+
+  let balanceQuartzBefore: bigint;
+  let balanceQuartzAfter: bigint;
+  let balanceQuartzFinal: bigint;
+
+  let balanceBobBefore: bigint;
+  let balanceBobAfter: bigint;
+  let balanceBobFinal: bigint;
+
+  let balanceBobRelayTokenBefore: bigint;
+  let balanceBobRelayTokenAfter: bigint;
+
+
+  before(async () => {
+    await usingPlaygrounds(async (_helper, privateKey) => {
+      alice = await privateKey('//Alice');
+      bob = await privateKey('//Bob'); // sovereign account on Statemine(t) funds donor
+    });
+
+    await usingRelayPlaygrounds(relayUrl, async (helper) => {
+      // Fund accounts on Statemine(t)
+      await helper.xcm.teleportNativeAsset(alice, STATEMINE_CHAIN, alice.addressRaw, FUNDING_AMOUNT);
+      await helper.xcm.teleportNativeAsset(alice, STATEMINE_CHAIN, bob.addressRaw, FUNDING_AMOUNT);
+    });
+
+    await usingStateminePlaygrounds(statemineUrl, async (helper) => {
+      const sovereignFundingAmount = 3_500_000_000n; 
+
+      await helper.assets.create(
+        alice,
+        USDT_ASSET_ID,
+        alice.address,
+        USDT_ASSET_METADATA_MINIMAL_BALANCE,
+      );
+      await helper.assets.setMetadata(
+        alice,
+        USDT_ASSET_ID,
+        USDT_ASSET_METADATA_NAME,
+        USDT_ASSET_METADATA_DESCRIPTION,
+        USDT_ASSET_METADATA_DECIMALS,
+      );
+      await helper.assets.mint(
+        alice,
+        USDT_ASSET_ID,
+        alice.address,
+        USDT_ASSET_AMOUNT,
+      );
+
+      // funding parachain sovereing account on Statemine(t).
+      // The sovereign account should be created before any action
+      // (the assets pallet on Statemine(t) check if the sovereign account exists)
+      const parachainSovereingAccount = helper.address.paraSiblingSovereignAccount(QUARTZ_CHAIN);
+      await helper.balance.transferToSubstrate(bob, parachainSovereingAccount, sovereignFundingAmount);
+    });
+
+
+    await usingPlaygrounds(async (helper) => {
+      const location = {
+        V1: {
+          parents: 1,
+          interior: {X3: [
+            {
+              Parachain: STATEMINE_CHAIN,
+            },
+            {
+              PalletInstance: STATEMINE_PALLET_INSTANCE,
+            },
+            {
+              GeneralIndex: USDT_ASSET_ID,
+            },
+          ]},
+        },
+      };
+
+      const metadata =
+      {
+        name: USDT_ASSET_ID,
+        symbol: USDT_ASSET_METADATA_NAME,
+        decimals: USDT_ASSET_METADATA_DECIMALS,
+        minimalBalance: USDT_ASSET_METADATA_MINIMAL_BALANCE,
+      };
+      await helper.getSudo().foreignAssets.register(alice, alice.address, location, metadata);
+      balanceQuartzBefore = await helper.balance.getSubstrate(alice.address);
+    });
+
+
+    // Providing the relay currency to the quartz sender account
+    // (fee for USDT XCM are paid in relay tokens)
+    await usingRelayPlaygrounds(relayUrl, async (helper) => {
+      const destination = {
+        V1: {
+          parents: 0,
+          interior: {X1: {
+            Parachain: QUARTZ_CHAIN,
+          },
+          },
+        }};
+
+      const beneficiary = {
+        V1: {
+          parents: 0,
+          interior: {X1: {
+            AccountId32: {
+              network: 'Any',
+              id: alice.addressRaw,
+            },
+          }},
+        },
+      };
+
+      const assets = {
+        V1: [
+          {
+            id: {
+              Concrete: {
+                parents: 0,
+                interior: 'Here',
+              },
+            },
+            fun: {
+              Fungible: TRANSFER_AMOUNT_RELAY,
+            },
+          },
+        ],
+      };
+
+      const feeAssetItem = 0;
+
+      await helper.xcm.limitedReserveTransferAssets(alice, destination, beneficiary, assets, feeAssetItem, 'Unlimited');
+    });
+  
+  });
+
+  itSub('Should connect and send USDT from Statemine to Quartz', async ({helper}) => {
+    await usingStateminePlaygrounds(statemineUrl, async (helper) => {
+      const dest = {
+        V1: {
+          parents: 1,
+          interior: {X1: {
+            Parachain: QUARTZ_CHAIN,
+          },
+          },
+        }};
+
+      const beneficiary = {
+        V1: {
+          parents: 0,
+          interior: {X1: {
+            AccountId32: {
+              network: 'Any',
+              id: alice.addressRaw,
+            },
+          }},
+        },
+      };
+
+      const assets = {
+        V1: [
+          {
+            id: {
+              Concrete: {
+                parents: 0,
+                interior: {
+                  X2: [
+                    {
+                      PalletInstance: STATEMINE_PALLET_INSTANCE,
+                    },
+                    {
+                      GeneralIndex: USDT_ASSET_ID,
+                    }, 
+                  ]},
+              },
+            },
+            fun: {
+              Fungible: TRANSFER_AMOUNT,
+            },
+          },
+        ],
+      };
+
+      const feeAssetItem = 0;
+
+      balanceStmnBefore = await helper.balance.getSubstrate(alice.address);
+      await helper.xcm.limitedReserveTransferAssets(alice, dest, beneficiary, assets, feeAssetItem, 'Unlimited');
+
+      balanceStmnAfter = await helper.balance.getSubstrate(alice.address);
+
+      // common good parachain take commission in it native token
+      console.log(
+        '[Statemine -> Quartz] transaction fees on Statemine: %s WND',
+        helper.util.bigIntToDecimals(balanceStmnBefore - balanceStmnAfter, STATEMINE_DECIMALS),
+      );
+      expect(balanceStmnBefore > balanceStmnAfter).to.be.true;
+
+    });
+
+
+    // ensure that asset has been delivered
+    await helper.wait.newBlocks(3);
+
+    // expext collection id will be with id 1
+    const free = await helper.ft.getBalance(1, {Substrate: alice.address});
+
+    balanceQuartzAfter = await helper.balance.getSubstrate(alice.address);
+
+    console.log(
+      '[Statemine -> Quartz] transaction fees on Quartz: %s USDT',
+      helper.util.bigIntToDecimals(TRANSFER_AMOUNT - free, USDT_ASSET_METADATA_DECIMALS),
+    );
+    console.log(
+      '[Statemine -> Quartz] transaction fees on Quartz: %s QTZ',
+      helper.util.bigIntToDecimals(balanceQuartzAfter - balanceQuartzBefore),
+    );    
+    // commission has not paid in USDT token
+    expect(free).to.be.equal(TRANSFER_AMOUNT);
+    // ... and parachain native token
+    expect(balanceQuartzAfter == balanceQuartzBefore).to.be.true;
+  });
+
+  itSub('Should connect and send USDT from Quartz to Statemine back', async ({helper}) => {
+    const destination = {
+      V1: {
+        parents: 1,
+        interior: {X2: [
+          {
+            Parachain: STATEMINE_CHAIN,
+          },
+          {
+            AccountId32: {
+              network: 'Any',
+              id: alice.addressRaw,
+            },
+          },
+        ]},
+      },
+    };
+
+    const relayFee = 400_000_000_000_000n;
+    const currencies: [any, bigint][] = [
+      [
+        {
+          ForeignAssetId: 0,
+        },
+        TRANSFER_AMOUNT,
+      ], 
+      [
+        {
+          NativeAssetId: 'Parent',
+        },
+        relayFee,
+      ],
+    ];
+
+    const feeItem = 1;
+
+    await helper.xTokens.transferMulticurrencies(alice, currencies, feeItem, destination, 'Unlimited');
+    
+    // the commission has been paid in parachain native token
+    balanceQuartzFinal = await helper.balance.getSubstrate(alice.address);
+    console.log('[Quartz -> Statemine] transaction fees on Quartz: %s QTZ', helper.util.bigIntToDecimals(balanceQuartzFinal - balanceQuartzAfter));
+    expect(balanceQuartzAfter > balanceQuartzFinal).to.be.true;
+
+    await usingStateminePlaygrounds(statemineUrl, async (helper) => {
+      await helper.wait.newBlocks(3);
+      
+      // The USDT token never paid fees. Its amount not changed from begin value.
+      // Also check that xcm transfer has been succeeded 
+      expect((await helper.assets.account(USDT_ASSET_ID, alice.address))! == USDT_ASSET_AMOUNT).to.be.true;
+    });
+  });
+
+  itSub('Should connect and send Relay token to Quartz', async ({helper}) => {
+    balanceBobBefore = await helper.balance.getSubstrate(bob.address);
+    balanceBobRelayTokenBefore = await helper.tokens.accounts(bob.address, {NativeAssetId: 'Parent'});
+
+    await usingRelayPlaygrounds(relayUrl, async (helper) => {
+      const destination = {
+        V1: {
+          parents: 0,
+          interior: {X1: {
+            Parachain: QUARTZ_CHAIN,
+          },
+          },
+        }};
+
+      const beneficiary = {
+        V1: {
+          parents: 0,
+          interior: {X1: {
+            AccountId32: {
+              network: 'Any',
+              id: bob.addressRaw,
+            },
+          }},
+        },
+      };
+
+      const assets = {
+        V1: [
+          {
+            id: {
+              Concrete: {
+                parents: 0,
+                interior: 'Here',
+              },
+            },
+            fun: {
+              Fungible: TRANSFER_AMOUNT_RELAY,
+            },
+          },
+        ],
+      };
+
+      const feeAssetItem = 0;
+
+      await helper.xcm.limitedReserveTransferAssets(bob, destination, beneficiary, assets, feeAssetItem, 'Unlimited');
+    });
+  
+    await helper.wait.newBlocks(3);
+
+    balanceBobAfter = await helper.balance.getSubstrate(bob.address);  
+    balanceBobRelayTokenAfter = await helper.tokens.accounts(bob.address, {NativeAssetId: 'Parent'});
+
+    const wndFeeOnQuartz = balanceBobRelayTokenAfter - TRANSFER_AMOUNT_RELAY - balanceBobRelayTokenBefore;
+    const wndDiffOnQuartz = balanceBobRelayTokenAfter - balanceBobRelayTokenBefore;
+    console.log(
+      '[Relay (Westend) -> Quartz] transaction fees: %s QTZ',
+      helper.util.bigIntToDecimals(balanceBobAfter - balanceBobBefore),
+    );
+    console.log(
+      '[Relay (Westend) -> Quartz] transaction fees: %s WND',
+      helper.util.bigIntToDecimals(wndFeeOnQuartz, STATEMINE_DECIMALS),
+    );
+    console.log('[Relay (Westend) -> Quartz] actually delivered: %s WND', wndDiffOnQuartz);
+    expect(wndFeeOnQuartz == 0n, 'No incoming WND fees should be taken').to.be.true;
+    expect(balanceBobBefore == balanceBobAfter, 'No incoming QTZ fees should be taken').to.be.true;
+  });
+
+  itSub('Should connect and send Relay token back', async ({helper}) => {
+    let relayTokenBalanceBefore: bigint;
+    let relayTokenBalanceAfter: bigint;
+    await usingRelayPlaygrounds(relayUrl, async (helper) => {
+      relayTokenBalanceBefore = await helper.balance.getSubstrate(bob.address);
+    });
+
+    const destination = {
+      V1: {
+        parents: 1,
+        interior: {
+          X1:{
+            AccountId32: {
+              network: 'Any',
+              id: bob.addressRaw,
+            },
+          },
+        },
+      },
+    };
+
+    const currencies: any = [
+      [
+        {
+          NativeAssetId: 'Parent',
+        },
+        TRANSFER_AMOUNT_RELAY,
+      ],
+    ];
+
+    const feeItem = 0;
+
+    await helper.xTokens.transferMulticurrencies(bob, currencies, feeItem, destination, 'Unlimited');
+
+    balanceBobFinal = await helper.balance.getSubstrate(bob.address);
+    console.log('[Quartz -> Relay (Westend)] transaction fees: %s QTZ',  helper.util.bigIntToDecimals(balanceBobAfter - balanceBobFinal));
+
+    await usingRelayPlaygrounds(relayUrl, async (helper) => {
+      await helper.wait.newBlocks(10);
+      relayTokenBalanceAfter = await helper.balance.getSubstrate(bob.address);
+
+      const diff = relayTokenBalanceAfter - relayTokenBalanceBefore;
+      console.log('[Quartz -> Relay (Westend)] actually delivered: %s WND', helper.util.bigIntToDecimals(diff, RELAY_DECIMALS));
+      expect(diff > 0, 'Relay tokens was not delivered back').to.be.true;
+    });
+  });
+});
+
 describeXCM('[XCM] Integration test: Exchanging tokens with Karura', () => {
   let alice: IKeyringPair;
   let randomAccount: IKeyringPair;
@@ -123,14 +532,13 @@
     };
 
     const feeAssetItem = 0;
-    const weightLimit = 5000000000;
 
-    await helper.xcm.limitedReserveTransferAssets(randomAccount, destination, beneficiary, assets, feeAssetItem, weightLimit);
+    await helper.xcm.limitedReserveTransferAssets(randomAccount, destination, beneficiary, assets, feeAssetItem, 'Unlimited');
     balanceQuartzTokenMiddle = await helper.balance.getSubstrate(randomAccount.address);
 
     const qtzFees = balanceQuartzTokenInit - balanceQuartzTokenMiddle - TRANSFER_AMOUNT;
+    expect(qtzFees > 0n, 'Negative fees QTZ, looks like nothing was transferred').to.be.true;
     console.log('[Quartz -> Karura] transaction fees on Quartz: %s QTZ', helper.util.bigIntToDecimals(qtzFees));
-    expect(qtzFees > 0n).to.be.true;
 
     await usingKaruraPlaygrounds(karuraUrl, async (helper) => {
       await helper.wait.newBlocks(3);
@@ -173,9 +581,7 @@
         ForeignAsset: 0,
       };
 
-      const destWeight = 50000000;
-
-      await helper.xTokens.transfer(randomAccount, id, TRANSFER_AMOUNT, destination, destWeight);
+      await helper.xTokens.transfer(randomAccount, id, TRANSFER_AMOUNT, destination, 'Unlimited');
       balanceKaruraTokenFinal = await helper.balance.getSubstrate(randomAccount.address);
       balanceQuartzForeignTokenFinal = await helper.tokens.accounts(randomAccount.address, id);
 
@@ -188,7 +594,7 @@
       );
       console.log('[Karura -> Quartz] outcome %s QTZ', helper.util.bigIntToDecimals(qtzOutcomeTransfer));
 
-      expect(karFees > 0).to.be.true;
+      expect(karFees > 0, 'Negative fees KAR, looks like nothing was transferred').to.be.true;
       expect(qtzOutcomeTransfer == TRANSFER_AMOUNT).to.be.true;
     });
 
@@ -215,76 +621,7 @@
       alice = await privateKey('//Alice');
     });
   });
-
-  itSub('Quartz rejects tokens from the Relay', async ({helper}) => {
-    await usingRelayPlaygrounds(relayUrl, async (helper) => {
-      const destination = {
-        V1: {
-          parents: 0,
-          interior: {X1: {
-            Parachain: QUARTZ_CHAIN,
-          },
-          },
-        }};
-
-      const beneficiary = {
-        V1: {
-          parents: 0,
-          interior: {X1: {
-            AccountId32: {
-              network: 'Any',
-              id: alice.addressRaw,
-            },
-          }},
-        },
-      };
-
-      const assets = {
-        V1: [
-          {
-            id: {
-              Concrete: {
-                parents: 0,
-                interior: 'Here',
-              },
-            },
-            fun: {
-              Fungible: 50_000_000_000_000_000n,
-            },
-          },
-        ],
-      };
-
-      const feeAssetItem = 0;
-      const weightLimit = 5_000_000_000;
-
-      await helper.xcm.limitedReserveTransferAssets(alice, destination, beneficiary, assets, feeAssetItem, weightLimit);
-    });
 
-    const maxWaitBlocks = 3;
-
-    const dmpQueueExecutedDownward = await helper.wait.event(maxWaitBlocks, 'dmpQueue', 'ExecutedDownward');
-
-    expect(
-      dmpQueueExecutedDownward != null,
-      '[Relay] dmpQueue.ExecutedDownward event is expected',
-    ).to.be.true;
-
-    const event = dmpQueueExecutedDownward!.event;
-    const outcome = event.data[1] as XcmV2TraitsOutcome;
-
-    expect(
-      outcome.isIncomplete,
-      '[Relay] The outcome of the XCM should be `Incomplete`',
-    ).to.be.true;
-
-    const incomplete = outcome.asIncomplete;
-    expect(
-      incomplete[1].toString() == 'AssetNotFound',
-      '[Relay] The XCM error should be `AssetNotFound`',
-    ).to.be.true;
-  });
-
   itSub('Quartz rejects KAR tokens from Karura', async ({helper}) => {
     await usingKaruraPlaygrounds(karuraUrl, async (helper) => {
       const destination = {
@@ -308,9 +645,7 @@
         Token: 'KAR',
       };
 
-      const destWeight = 50000000;
-
-      await helper.xTokens.transfer(alice, id, 100_000_000_000n, destination, destWeight);
+      await helper.xTokens.transfer(alice, id, 100_000_000_000n, destination, 'Unlimited');
     });
 
     const maxWaitBlocks = 3;
@@ -326,8 +661,8 @@
     const outcome = event.data[1] as XcmV2TraitsError;
 
     expect(
-      outcome.isUntrustedReserveLocation,
-      '[Karura] The XCM error should be `UntrustedReserveLocation`',
+      outcome.isFailedToTransactAsset,
+      '[Karura] The XCM error should be `FailedToTransactAsset`',
     ).to.be.true;
   });
 });
@@ -420,7 +755,7 @@
 
       // >>> Propose external motion through council >>>
       console.log('Propose external motion through council.......');
-      const externalMotion = helper.democracy.externalProposeMajority(proposalHash);
+      const externalMotion = helper.democracy.externalProposeMajority({Legacy: proposalHash});
       const encodedMotion = externalMotion?.method.toHex() || '';
       const motionHash = blake2AsHex(encodedMotion);
       console.log('Motion hash is %s', motionHash);
@@ -431,7 +766,16 @@
       await helper.collective.council.vote(dorothyAccount, motionHash, councilProposalIdx, true);
       await helper.collective.council.vote(baltatharAccount, motionHash, councilProposalIdx, true);
 
-      await helper.collective.council.close(dorothyAccount, motionHash, councilProposalIdx, 1_000_000_000, externalMotion.encodedLength);
+      await helper.collective.council.close(
+        dorothyAccount,
+        motionHash,
+        councilProposalIdx,
+        {
+          refTime: 1_000_000_000,
+          proofSize: 1_000_000,
+        },
+        externalMotion.encodedLength,
+      );
       console.log('Propose external motion through council.......DONE');
       // <<< Propose external motion through council <<<
 
@@ -448,7 +792,16 @@
       await helper.collective.techCommittee.vote(baltatharAccount, fastTrackHash, techProposalIdx, true);
       await helper.collective.techCommittee.vote(alithAccount, fastTrackHash, techProposalIdx, true);
 
-      await helper.collective.techCommittee.close(baltatharAccount, fastTrackHash, techProposalIdx, 1_000_000_000, fastTrack.encodedLength);
+      await helper.collective.techCommittee.close(
+        baltatharAccount,
+        fastTrackHash,
+        techProposalIdx,
+        {
+          refTime: 1_000_000_000,
+          proofSize: 1_000_000,
+        },
+        fastTrack.encodedLength,
+      );
       console.log('Fast track proposal through technical committee.......DONE');
       // <<< Fast track proposal through technical committee <<<
 
@@ -504,16 +857,15 @@
       },
     };
     const amount = TRANSFER_AMOUNT;
-    const destWeight = 850000000;
 
-    await helper.xTokens.transfer(randomAccountQuartz, currencyId, amount, dest, destWeight);
+    await helper.xTokens.transfer(randomAccountQuartz, currencyId, amount, dest, 'Unlimited');
 
     balanceQuartzTokenMiddle = await helper.balance.getSubstrate(randomAccountQuartz.address);
     expect(balanceQuartzTokenMiddle < balanceQuartzTokenInit).to.be.true;
 
     const transactionFees = balanceQuartzTokenInit - balanceQuartzTokenMiddle - TRANSFER_AMOUNT;
     console.log('[Quartz -> Moonriver] transaction fees on Quartz: %s QTZ', helper.util.bigIntToDecimals(transactionFees));
-    expect(transactionFees > 0).to.be.true;
+    expect(transactionFees > 0, 'Negative fees QTZ, looks like nothing was transferred').to.be.true;
 
     await usingMoonriverPlaygrounds(moonriverUrl, async (helper) => {
       await helper.wait.newBlocks(3);
@@ -559,15 +911,14 @@
           },
         },
       };
-      const destWeight = 50000000;
 
-      await helper.xTokens.transferMultiasset(randomAccountMoonriver, asset, destination, destWeight);
+      await helper.xTokens.transferMultiasset(randomAccountMoonriver, asset, destination, 'Unlimited');
 
       balanceMovrTokenFinal = await helper.balance.getEthereum(randomAccountMoonriver.address);
 
       const movrFees = balanceMovrTokenMiddle - balanceMovrTokenFinal;
       console.log('[Moonriver -> Quartz] transaction fees on Moonriver: %s MOVR', helper.util.bigIntToDecimals(movrFees));
-      expect(movrFees > 0).to.be.true;
+      expect(movrFees > 0, 'Negative fees MOVR, looks like nothing was transferred').to.be.true;
 
       const qtzRandomAccountAsset = await helper.assets.account(assetId, randomAccountMoonriver.address);
 
modifiedtests/src/xcm/xcmUnique.test.tsdiffbeforeafterboth
--- a/tests/src/xcm/xcmUnique.test.ts
+++ b/tests/src/xcm/xcmUnique.test.ts
@@ -17,21 +17,430 @@
 import {IKeyringPair} from '@polkadot/types/types';
 import {blake2AsHex} from '@polkadot/util-crypto';
 import config from '../config';
-import {XcmV2TraitsError, XcmV2TraitsOutcome} from '../interfaces';
-import {itSub, expect, describeXCM, usingPlaygrounds, usingAcalaPlaygrounds, usingRelayPlaygrounds, usingMoonbeamPlaygrounds} from '../util';
+import {XcmV2TraitsError} from '../interfaces';
+import {itSub, expect, describeXCM, usingPlaygrounds, usingAcalaPlaygrounds, usingRelayPlaygrounds, usingMoonbeamPlaygrounds, usingStatemintPlaygrounds} from '../util';
 
 const UNIQUE_CHAIN = 2037;
+const STATEMINT_CHAIN = 1000;
 const ACALA_CHAIN = 2000;
 const MOONBEAM_CHAIN = 2004;
 
+const STATEMINT_PALLET_INSTANCE = 50;
+
 const relayUrl = config.relayUrl;
+const statemintUrl = config.statemintUrl;
 const acalaUrl = config.acalaUrl;
 const moonbeamUrl = config.moonbeamUrl;
 
+const RELAY_DECIMALS = 12;
+const STATEMINT_DECIMALS = 12;
 const ACALA_DECIMALS = 12;
 
 const TRANSFER_AMOUNT = 2000000000000000000000000n;
 
+const FUNDING_AMOUNT = 3_500_000_0000_000_000n; 
+
+const TRANSFER_AMOUNT_RELAY = 50_000_000_000_000_000n;
+
+const USDT_ASSET_ID = 100;
+const USDT_ASSET_METADATA_DECIMALS = 18;
+const USDT_ASSET_METADATA_NAME = 'USDT';
+const USDT_ASSET_METADATA_DESCRIPTION = 'USDT';
+const USDT_ASSET_METADATA_MINIMAL_BALANCE = 1n;
+const USDT_ASSET_AMOUNT = 10_000_000_000_000_000_000_000_000n;
+
+describeXCM('[XCM] Integration test: Exchanging USDT with Statemint', () => {
+  let alice: IKeyringPair;
+  let bob: IKeyringPair;
+  
+  let balanceStmnBefore: bigint;
+  let balanceStmnAfter: bigint;
+
+  let balanceUniqueBefore: bigint;
+  let balanceUniqueAfter: bigint;
+  let balanceUniqueFinal: bigint;
+
+  let balanceBobBefore: bigint;
+  let balanceBobAfter: bigint;
+  let balanceBobFinal: bigint;
+
+  let balanceBobRelayTokenBefore: bigint;
+  let balanceBobRelayTokenAfter: bigint;
+
+
+  before(async () => {
+    await usingPlaygrounds(async (_helper, privateKey) => {
+      alice = await privateKey('//Alice');
+      bob = await privateKey('//Bob'); // sovereign account on Statemint funds donor
+    });
+
+    await usingRelayPlaygrounds(relayUrl, async (helper) => {
+      // Fund accounts on Statemint
+      await helper.xcm.teleportNativeAsset(alice, STATEMINT_CHAIN, alice.addressRaw, FUNDING_AMOUNT);
+      await helper.xcm.teleportNativeAsset(alice, STATEMINT_CHAIN, bob.addressRaw, FUNDING_AMOUNT);
+    });
+
+    await usingStatemintPlaygrounds(statemintUrl, async (helper) => {
+      const sovereignFundingAmount = 3_500_000_000n; 
+
+      await helper.assets.create(
+        alice,
+        USDT_ASSET_ID,
+        alice.address,
+        USDT_ASSET_METADATA_MINIMAL_BALANCE,
+      );
+      await helper.assets.setMetadata(
+        alice,
+        USDT_ASSET_ID,
+        USDT_ASSET_METADATA_NAME,
+        USDT_ASSET_METADATA_DESCRIPTION,
+        USDT_ASSET_METADATA_DECIMALS,
+      );
+      await helper.assets.mint(
+        alice,
+        USDT_ASSET_ID,
+        alice.address,
+        USDT_ASSET_AMOUNT,
+      );
+
+      // funding parachain sovereing account on Statemint.
+      // The sovereign account should be created before any action
+      // (the assets pallet on Statemint check if the sovereign account exists)
+      const parachainSovereingAccount = helper.address.paraSiblingSovereignAccount(UNIQUE_CHAIN);
+      await helper.balance.transferToSubstrate(bob, parachainSovereingAccount, sovereignFundingAmount);
+    });
+
+
+    await usingPlaygrounds(async (helper) => {
+      const location = {
+        V1: {
+          parents: 1,
+          interior: {X3: [
+            {
+              Parachain: STATEMINT_CHAIN,
+            },
+            {
+              PalletInstance: STATEMINT_PALLET_INSTANCE,
+            },
+            {
+              GeneralIndex: USDT_ASSET_ID,
+            },
+          ]},
+        },
+      };
+
+      const metadata =
+      {
+        name: USDT_ASSET_ID,
+        symbol: USDT_ASSET_METADATA_NAME,
+        decimals: USDT_ASSET_METADATA_DECIMALS,
+        minimalBalance: USDT_ASSET_METADATA_MINIMAL_BALANCE,
+      };
+      await helper.getSudo().foreignAssets.register(alice, alice.address, location, metadata);
+      balanceUniqueBefore = await helper.balance.getSubstrate(alice.address);
+    });
+
+
+    // Providing the relay currency to the unique sender account
+    // (fee for USDT XCM are paid in relay tokens)
+    await usingRelayPlaygrounds(relayUrl, async (helper) => {
+      const destination = {
+        V1: {
+          parents: 0,
+          interior: {X1: {
+            Parachain: UNIQUE_CHAIN,
+          },
+          },
+        }};
+
+      const beneficiary = {
+        V1: {
+          parents: 0,
+          interior: {X1: {
+            AccountId32: {
+              network: 'Any',
+              id: alice.addressRaw,
+            },
+          }},
+        },
+      };
+
+      const assets = {
+        V1: [
+          {
+            id: {
+              Concrete: {
+                parents: 0,
+                interior: 'Here',
+              },
+            },
+            fun: {
+              Fungible: TRANSFER_AMOUNT_RELAY,
+            },
+          },
+        ],
+      };
+
+      const feeAssetItem = 0;
+
+      await helper.xcm.limitedReserveTransferAssets(alice, destination, beneficiary, assets, feeAssetItem, 'Unlimited');
+    });
+  
+  });
+
+  itSub('Should connect and send USDT from Statemint to Unique', async ({helper}) => {
+    await usingStatemintPlaygrounds(statemintUrl, async (helper) => {
+      const dest = {
+        V1: {
+          parents: 1,
+          interior: {X1: {
+            Parachain: UNIQUE_CHAIN,
+          },
+          },
+        }};
+
+      const beneficiary = {
+        V1: {
+          parents: 0,
+          interior: {X1: {
+            AccountId32: {
+              network: 'Any',
+              id: alice.addressRaw,
+            },
+          }},
+        },
+      };
+
+      const assets = {
+        V1: [
+          {
+            id: {
+              Concrete: {
+                parents: 0,
+                interior: {
+                  X2: [
+                    {
+                      PalletInstance: STATEMINT_PALLET_INSTANCE,
+                    },
+                    {
+                      GeneralIndex: USDT_ASSET_ID,
+                    }, 
+                  ]},
+              },
+            },
+            fun: {
+              Fungible: TRANSFER_AMOUNT,
+            },
+          },
+        ],
+      };
+
+      const feeAssetItem = 0;
+
+      balanceStmnBefore = await helper.balance.getSubstrate(alice.address);
+      await helper.xcm.limitedReserveTransferAssets(alice, dest, beneficiary, assets, feeAssetItem, 'Unlimited');
+
+      balanceStmnAfter = await helper.balance.getSubstrate(alice.address);
+
+      // common good parachain take commission in it native token
+      console.log(
+        '[Statemint -> Unique] transaction fees on Statemint: %s WND',
+        helper.util.bigIntToDecimals(balanceStmnBefore - balanceStmnAfter, STATEMINT_DECIMALS),
+      );
+      expect(balanceStmnBefore > balanceStmnAfter).to.be.true;
+
+    });
+
+
+    // ensure that asset has been delivered
+    await helper.wait.newBlocks(3);
+
+    // expext collection id will be with id 1
+    const free = await helper.ft.getBalance(1, {Substrate: alice.address});
+
+    balanceUniqueAfter = await helper.balance.getSubstrate(alice.address);
+
+    console.log(
+      '[Statemint -> Unique] transaction fees on Unique: %s USDT',
+      helper.util.bigIntToDecimals(TRANSFER_AMOUNT - free, USDT_ASSET_METADATA_DECIMALS),
+    );
+    console.log(
+      '[Statemint -> Unique] transaction fees on Unique: %s UNQ',
+      helper.util.bigIntToDecimals(balanceUniqueAfter - balanceUniqueBefore),
+    );    
+    // commission has not paid in USDT token
+    expect(free).to.be.equal(TRANSFER_AMOUNT);
+    // ... and parachain native token
+    expect(balanceUniqueAfter == balanceUniqueBefore).to.be.true;
+  });
+
+  itSub('Should connect and send USDT from Unique to Statemint back', async ({helper}) => {
+    const destination = {
+      V1: {
+        parents: 1,
+        interior: {X2: [
+          {
+            Parachain: STATEMINT_CHAIN,
+          },
+          {
+            AccountId32: {
+              network: 'Any',
+              id: alice.addressRaw,
+            },
+          },
+        ]},
+      },
+    };
+
+    const relayFee = 400_000_000_000_000n;
+    const currencies: [any, bigint][] = [
+      [
+        {
+          ForeignAssetId: 0,
+        },
+        TRANSFER_AMOUNT,
+      ], 
+      [
+        {
+          NativeAssetId: 'Parent',
+        },
+        relayFee,
+      ],
+    ];
+
+    const feeItem = 1;
+
+    await helper.xTokens.transferMulticurrencies(alice, currencies, feeItem, destination, 'Unlimited');
+    
+    // the commission has been paid in parachain native token
+    balanceUniqueFinal = await helper.balance.getSubstrate(alice.address);
+    console.log('[Unique -> Statemint] transaction fees on Unique: %s UNQ', helper.util.bigIntToDecimals(balanceUniqueFinal - balanceUniqueAfter));
+    expect(balanceUniqueAfter > balanceUniqueFinal).to.be.true;
+
+    await usingStatemintPlaygrounds(statemintUrl, async (helper) => {
+      await helper.wait.newBlocks(3);
+      
+      // The USDT token never paid fees. Its amount not changed from begin value.
+      // Also check that xcm transfer has been succeeded 
+      expect((await helper.assets.account(USDT_ASSET_ID, alice.address))! == USDT_ASSET_AMOUNT).to.be.true;
+    });
+  });
+
+  itSub('Should connect and send Relay token to Unique', async ({helper}) => {
+    balanceBobBefore = await helper.balance.getSubstrate(bob.address);
+    balanceBobRelayTokenBefore = await helper.tokens.accounts(bob.address, {NativeAssetId: 'Parent'});
+
+    await usingRelayPlaygrounds(relayUrl, async (helper) => {
+      const destination = {
+        V1: {
+          parents: 0,
+          interior: {X1: {
+            Parachain: UNIQUE_CHAIN,
+          },
+          },
+        }};
+
+      const beneficiary = {
+        V1: {
+          parents: 0,
+          interior: {X1: {
+            AccountId32: {
+              network: 'Any',
+              id: bob.addressRaw,
+            },
+          }},
+        },
+      };
+
+      const assets = {
+        V1: [
+          {
+            id: {
+              Concrete: {
+                parents: 0,
+                interior: 'Here',
+              },
+            },
+            fun: {
+              Fungible: TRANSFER_AMOUNT_RELAY,
+            },
+          },
+        ],
+      };
+
+      const feeAssetItem = 0;
+
+      await helper.xcm.limitedReserveTransferAssets(bob, destination, beneficiary, assets, feeAssetItem, 'Unlimited');
+    });
+  
+    await helper.wait.newBlocks(3);
+
+    balanceBobAfter = await helper.balance.getSubstrate(bob.address);  
+    balanceBobRelayTokenAfter = await helper.tokens.accounts(bob.address, {NativeAssetId: 'Parent'});
+
+    const wndFeeOnUnique = balanceBobRelayTokenAfter - TRANSFER_AMOUNT_RELAY - balanceBobRelayTokenBefore;
+    const wndDiffOnUnique = balanceBobRelayTokenAfter - balanceBobRelayTokenBefore;
+    console.log(
+      '[Relay (Westend) -> Unique] transaction fees: %s UNQ',
+      helper.util.bigIntToDecimals(balanceBobAfter - balanceBobBefore),
+    );
+    console.log(
+      '[Relay (Westend) -> Unique] transaction fees: %s WND',
+      helper.util.bigIntToDecimals(wndFeeOnUnique, STATEMINT_DECIMALS),
+    );
+    console.log('[Relay (Westend) -> Unique] actually delivered: %s WND', wndDiffOnUnique);
+    expect(wndFeeOnUnique == 0n, 'No incoming WND fees should be taken').to.be.true;
+    expect(balanceBobBefore == balanceBobAfter, 'No incoming UNQ fees should be taken').to.be.true;
+  });
+
+  itSub('Should connect and send Relay token back', async ({helper}) => {
+    let relayTokenBalanceBefore: bigint;
+    let relayTokenBalanceAfter: bigint;
+    await usingRelayPlaygrounds(relayUrl, async (helper) => {
+      relayTokenBalanceBefore = await helper.balance.getSubstrate(bob.address);
+    });
+
+    const destination = {
+      V1: {
+        parents: 1,
+        interior: {
+          X1:{
+            AccountId32: {
+              network: 'Any',
+              id: bob.addressRaw,
+            },
+          },
+        },
+      },
+    };
+
+    const currencies: any = [
+      [
+        {
+          NativeAssetId: 'Parent',
+        },
+        TRANSFER_AMOUNT_RELAY,
+      ],
+    ];
+
+    const feeItem = 0;
+
+    await helper.xTokens.transferMulticurrencies(bob, currencies, feeItem, destination, 'Unlimited');
+
+    balanceBobFinal = await helper.balance.getSubstrate(bob.address);
+    console.log('[Unique -> Relay (Westend)] transaction fees: %s UNQ',  helper.util.bigIntToDecimals(balanceBobAfter - balanceBobFinal));
+
+    await usingRelayPlaygrounds(relayUrl, async (helper) => {
+      await helper.wait.newBlocks(10);
+      relayTokenBalanceAfter = await helper.balance.getSubstrate(bob.address);
+
+      const diff = relayTokenBalanceAfter - relayTokenBalanceBefore;
+      console.log('[Unique -> Relay (Westend)] actually delivered: %s WND', helper.util.bigIntToDecimals(diff, RELAY_DECIMALS));
+      expect(diff > 0, 'Relay tokens was not delivered back').to.be.true;
+    });
+  });
+});
+
 describeXCM('[XCM] Integration test: Exchanging tokens with Acala', () => {
   let alice: IKeyringPair;
   let randomAccount: IKeyringPair;
@@ -124,15 +533,13 @@
     };
 
     const feeAssetItem = 0;
-    const weightLimit = 5000000000;
 
-    await helper.xcm.limitedReserveTransferAssets(randomAccount, destination, beneficiary, assets, feeAssetItem, weightLimit);
-
+    await helper.xcm.limitedReserveTransferAssets(randomAccount, destination, beneficiary, assets, feeAssetItem, 'Unlimited');
     balanceUniqueTokenMiddle = await helper.balance.getSubstrate(randomAccount.address);
 
     const unqFees = balanceUniqueTokenInit - balanceUniqueTokenMiddle - TRANSFER_AMOUNT;
     console.log('[Unique -> Acala] transaction fees on Unique: %s UNQ', helper.util.bigIntToDecimals(unqFees));
-    expect(unqFees > 0n).to.be.true;
+    expect(unqFees > 0n, 'Negative fees UNQ, looks like nothing was transferred').to.be.true;
 
     await usingAcalaPlaygrounds(acalaUrl, async (helper) => {
       await helper.wait.newBlocks(3);
@@ -176,10 +583,7 @@
         ForeignAsset: 0,
       };
 
-      const destWeight = 50000000;
-
-      await helper.xTokens.transfer(randomAccount, id, TRANSFER_AMOUNT, destination, destWeight);
-
+      await helper.xTokens.transfer(randomAccount, id, TRANSFER_AMOUNT, destination, 'Unlimited');
       balanceAcalaTokenFinal = await helper.balance.getSubstrate(randomAccount.address);
       balanceUniqueForeignTokenFinal = await helper.tokens.accounts(randomAccount.address, id);
 
@@ -192,7 +596,7 @@
       );
       console.log('[Acala -> Unique] outcome %s UNQ', helper.util.bigIntToDecimals(unqOutcomeTransfer));
 
-      expect(acaFees > 0).to.be.true;
+      expect(acaFees > 0, 'Negative fees ACA, looks like nothing was transferred').to.be.true;
       expect(unqOutcomeTransfer == TRANSFER_AMOUNT).to.be.true;
     });
 
@@ -219,76 +623,7 @@
       alice = await privateKey('//Alice');
     });
   });
-
-  itSub('Unique rejects tokens from the Relay', async ({helper}) => {
-    await usingRelayPlaygrounds(relayUrl, async (helper) => {
-      const destination = {
-        V1: {
-          parents: 0,
-          interior: {X1: {
-            Parachain: UNIQUE_CHAIN,
-          },
-          },
-        }};
 
-      const beneficiary = {
-        V1: {
-          parents: 0,
-          interior: {X1: {
-            AccountId32: {
-              network: 'Any',
-              id: alice.addressRaw,
-            },
-          }},
-        },
-      };
-
-      const assets = {
-        V1: [
-          {
-            id: {
-              Concrete: {
-                parents: 0,
-                interior: 'Here',
-              },
-            },
-            fun: {
-              Fungible: 50_000_000_000_000_000n,
-            },
-          },
-        ],
-      };
-
-      const feeAssetItem = 0;
-      const weightLimit = 5_000_000_000;
-
-      await helper.xcm.limitedReserveTransferAssets(alice, destination, beneficiary, assets, feeAssetItem, weightLimit);
-    });
-
-    const maxWaitBlocks = 3;
-
-    const dmpQueueExecutedDownward = await helper.wait.event(maxWaitBlocks, 'dmpQueue', 'ExecutedDownward');
-
-    expect(
-      dmpQueueExecutedDownward != null,
-      '[Relay] dmpQueue.ExecutedDownward event is expected',
-    ).to.be.true;
-
-    const event = dmpQueueExecutedDownward!.event;
-    const outcome = event.data[1] as XcmV2TraitsOutcome;
-
-    expect(
-      outcome.isIncomplete,
-      '[Relay] The outcome of the XCM should be `Incomplete`',
-    ).to.be.true;
-
-    const incomplete = outcome.asIncomplete;
-    expect(
-      incomplete[1].toString() == 'AssetNotFound',
-      '[Relay] The XCM error should be `AssetNotFound`',
-    ).to.be.true;
-  });
-
   itSub('Unique rejects ACA tokens from Acala', async ({helper}) => {
     await usingAcalaPlaygrounds(acalaUrl, async (helper) => {
       const destination = {
@@ -312,9 +647,7 @@
         Token: 'ACA',
       };
 
-      const destWeight = 50000000;
-
-      await helper.xTokens.transfer(alice, id, 100_000_000_000n, destination, destWeight);
+      await helper.xTokens.transfer(alice, id, 100_000_000_000n, destination, 'Unlimited');
     });
 
     const maxWaitBlocks = 3;
@@ -330,8 +663,8 @@
     const outcome = event.data[1] as XcmV2TraitsError;
 
     expect(
-      outcome.isUntrustedReserveLocation,
-      '[Acala] The XCM error should be `UntrustedReserveLocation`',
+      outcome.isFailedToTransactAsset,
+      '[Acala] The XCM error should be `FailedToTransactAsset`',
     ).to.be.true;
   });
 });
@@ -508,16 +841,15 @@
       },
     };
     const amount = TRANSFER_AMOUNT;
-    const destWeight = 850000000;
 
-    await helper.xTokens.transfer(randomAccountUnique, currencyId, amount, dest, destWeight);
+    await helper.xTokens.transfer(randomAccountUnique, currencyId, amount, dest, 'Unlimited');
 
     balanceUniqueTokenMiddle = await helper.balance.getSubstrate(randomAccountUnique.address);
     expect(balanceUniqueTokenMiddle < balanceUniqueTokenInit).to.be.true;
 
     const transactionFees = balanceUniqueTokenInit - balanceUniqueTokenMiddle - TRANSFER_AMOUNT;
     console.log('[Unique -> Moonbeam] transaction fees on Unique: %s UNQ', helper.util.bigIntToDecimals(transactionFees));
-    expect(transactionFees > 0).to.be.true;
+    expect(transactionFees > 0, 'Negative fees UNQ, looks like nothing was transferred').to.be.true;
 
     await usingMoonbeamPlaygrounds(moonbeamUrl, async (helper) => {
       await helper.wait.newBlocks(3);
@@ -572,7 +904,7 @@
 
       const glmrFees = balanceGlmrTokenMiddle - balanceGlmrTokenFinal;
       console.log('[Moonbeam -> Unique] transaction fees on Moonbeam: %s GLMR', helper.util.bigIntToDecimals(glmrFees));
-      expect(glmrFees > 0).to.be.true;
+      expect(glmrFees > 0, 'Negative fees GLMR, looks like nothing was transferred').to.be.true;
 
       const unqRandomAccountAsset = await helper.assets.account(assetId, randomAccountMoonbeam.address);