From cc7b7676d670e157a5700248a29e310e0dc49e3b Mon Sep 17 00:00:00 2001 From: marshacb Date: Fri, 20 Oct 2023 10:41:46 -0400 Subject: [PATCH] remove InteriorMultiLocation construction in para to para specs --- .../AssetTransferApi.AssetTransferApi.html | 8 ++--- .../errors_BaseError.BaseErrorsEnum.html | 30 ++++++++-------- docs/enums/types.Direction.html | 20 +++++------ ...nstructApiPromise.constructApiPromise.html | 2 +- docs/index.html | 7 ++-- .../constructApiPromise.ApiInfo.html | 8 ++--- docs/interfaces/types.TransferArgsOpts.html | 20 +++++------ docs/interfaces/types.TxResult.html | 16 ++++----- docs/modules/AssetTransferApi.html | 2 +- docs/modules/constructApiPromise.html | 2 +- docs/modules/errors_BaseError.html | 2 +- docs/modules/types.html | 2 +- docs/types/types.ConstructedFormat.html | 2 +- docs/types/types.Format.html | 2 +- docs/types/types.LocalTransferTypes.html | 2 +- docs/types/types.Methods.html | 2 +- docs/types/types.XcmDirection.html | 2 +- src/AssetTransferApi.spec.ts | 14 ++++---- src/AssetTransferApi.ts | 17 ++++++--- .../limitedReserveTransferAssets.ts | 4 +-- .../polkadotXcm/limitedTeleportAssets.ts | 4 +-- .../polkadotXcm/reserveTransferAssets.ts | 4 +-- .../polkadotXcm/teleportAssets.ts | 4 +-- .../xTokens/transferMultiAsset.ts | 4 +-- .../xTokens/transferMultiAssetWithFee.ts | 4 +-- .../xTokens/transferMultiAssets.ts | 4 +-- src/createXcmTypes/ParaToPara.spec.ts | 36 +++++++++---------- src/createXcmTypes/ParaToPara.ts | 12 ++++--- src/createXcmTypes/index.ts | 5 +-- src/types.ts | 9 +++++ 30 files changed, 135 insertions(+), 115 deletions(-) diff --git a/docs/classes/AssetTransferApi.AssetTransferApi.html b/docs/classes/AssetTransferApi.AssetTransferApi.html index c440f4e9..2e0628ec 100644 --- a/docs/classes/AssetTransferApi.AssetTransferApi.html +++ b/docs/classes/AssetTransferApi.AssetTransferApi.html @@ -28,7 +28,7 @@

Hierarchy

+
  • Defined in AssetTransferApi.ts:79
    • @@ -88,7 +88,7 @@
    opts: Returns Promise<TxResult<T>>
    +
  • Defined in AssetTransferApi.ts:126

    • decodeExtrinsic

    +
  • Defined in AssetTransferApi.ts:523

    • fetchFeeInfo

    +
  • Defined in AssetTransferApi.ts:477
    • diff --git a/docs/enums/errors_BaseError.BaseErrorsEnum.html b/docs/enums/errors_BaseError.BaseErrorsEnum.html index f0518e27..83bb1697 100644 --- a/docs/enums/errors_BaseError.BaseErrorsEnum.html +++ b/docs/enums/errors_BaseError.BaseErrorsEnum.html @@ -21,7 +21,7 @@

    Enumeration BaseErrorsEnum

    +
  • Defined in errors/BaseError.ts:6
    • @@ -53,7 +53,7 @@

    AssetNotFound

    +
  • Defined in errors/BaseError.ts:20

    • DisabledOption

    DisabledOption: "DisabledOption"
    @@ -61,7 +61,7 @@

    DisabledOption

    +
  • Defined in errors/BaseError.ts:64

    • InternalError

    InternalError: "InternalError"
    @@ -69,7 +69,7 @@

    InternalError

    +
  • Defined in errors/BaseError.ts:56

    • InvalidAddress

    InvalidAddress: "InvalidAddress"
    @@ -77,7 +77,7 @@

    InvalidAddress

    +
  • Defined in errors/BaseError.ts:60

    • InvalidAsset

    InvalidAsset: "InvalidAsset"
    @@ -86,7 +86,7 @@

    InvalidAsset

    +
  • Defined in errors/BaseError.ts:16

    • InvalidDirection

    InvalidDirection: "InvalidDirection"
    @@ -94,7 +94,7 @@

    InvalidDirection

    +
  • Defined in errors/BaseError.ts:32

    • InvalidInput

    InvalidInput: "InvalidInput"
    @@ -103,7 +103,7 @@

    InvalidInput

    +
  • Defined in errors/BaseError.ts:11

    • InvalidMultiLocationAsset

    InvalidMultiLocationAsset: "InvalidMultiLocationAsset"
    @@ -111,7 +111,7 @@

    InvalidMultiLocationAsset

    +
  • Defined in errors/BaseError.ts:36

    • InvalidPallet

    InvalidPallet: "InvalidPallet"
    @@ -119,7 +119,7 @@

    InvalidPallet

    +
  • Defined in errors/BaseError.ts:24

    • InvalidXcmVersion

    InvalidXcmVersion: "InvalidXcmVersion"
    @@ -127,7 +127,7 @@

    InvalidXcmVersion

    +
  • Defined in errors/BaseError.ts:48

    • MultipleNonUniqueAssetsFound

    MultipleNonUniqueAssetsFound: "MultipleNonUniqueAssetsFound"
    @@ -135,7 +135,7 @@

    MultipleNonUniqueAssets

    +
  • Defined in errors/BaseError.ts:40

    • NotImplemented

    NotImplemented: "NotImplemented"
    @@ -143,7 +143,7 @@

    NotImplemented

    +
  • Defined in errors/BaseError.ts:52

    • PalletNotFound

    PalletNotFound: "PalletNotFound"
    @@ -151,7 +151,7 @@

    PalletNotFound

    +
  • Defined in errors/BaseError.ts:28

    • RegistryNotFound

    RegistryNotFound: "RegistryNotFound"
    @@ -159,7 +159,7 @@

    RegistryNotFound

    +
  • Defined in errors/BaseError.ts:44
    • diff --git a/docs/enums/types.Direction.html b/docs/enums/types.Direction.html index b2539a8b..370dc2ca 100644 --- a/docs/enums/types.Direction.html +++ b/docs/enums/types.Direction.html @@ -21,7 +21,7 @@

    Enumeration Direction

    +
  • Defined in types.ts:25
    • @@ -48,7 +48,7 @@

    Local

    +
  • Defined in types.ts:29

    • ParaToPara

    ParaToPara: "ParaToPara"
    @@ -56,7 +56,7 @@

    ParaToPara

    +
  • Defined in types.ts:45

    • ParaToRelay

    ParaToRelay: "ParaToRelay"
    @@ -64,7 +64,7 @@

    ParaToRelay

    +
  • Defined in types.ts:49

    • ParaToSystem

    ParaToSystem: "ParaToSystem"
    @@ -72,7 +72,7 @@

    ParaToSystem

    +
  • Defined in types.ts:53

    • RelayToPara

    RelayToPara: "RelayToPara"
    @@ -80,7 +80,7 @@

    RelayToPara

    +
  • Defined in types.ts:61

    • RelayToSystem

    RelayToSystem: "RelayToSystem"
    @@ -88,7 +88,7 @@

    RelayToSystem

    +
  • Defined in types.ts:57

    • SystemToPara

    SystemToPara: "SystemToPara"
    @@ -96,7 +96,7 @@

    SystemToPara

    +
  • Defined in types.ts:33

    • SystemToRelay

    SystemToRelay: "SystemToRelay"
    @@ -104,7 +104,7 @@

    SystemToRelay

    +
  • Defined in types.ts:37

    • SystemToSystem

    SystemToSystem: "SystemToSystem"
    @@ -112,7 +112,7 @@

    SystemToSystem

    +
  • Defined in types.ts:41
    • diff --git a/docs/functions/constructApiPromise.constructApiPromise.html b/docs/functions/constructApiPromise.constructApiPromise.html index c58b9575..a2d9724b 100644 --- a/docs/functions/constructApiPromise.constructApiPromise.html +++ b/docs/functions/constructApiPromise.constructApiPromise.html @@ -40,7 +40,7 @@
    opts: Returns Promise<ApiInfo>
    +
  • Defined in constructApiPromise.ts:39
    • diff --git a/docs/index.html b/docs/index.html index 5431658d..087336bf 100644 --- a/docs/index.html +++ b/docs/index.html @@ -33,7 +33,6 @@

    Asset API used for common good parachains

    Docs

    Find the full documentation here, for quick start guide read below. All examples can be found here.

    Summary: Asset-transfer-api is a library focused on simplifying the construction of asset transfers for Substrate based chains that involves system parachains like Asset Hub (Polkadot and Kusama). It exposes a reduced set of methods which facilitates users to send transfers to other (para) chains or locally.

    Current Cross-chain Support

    The below chart is focusing on what directions are supported for constructing asset transfers and in what XCM version. The goal is to have everything in green checkmarks. Note that local transfers (intra-chain) are not visualized here.

    -

    Note: Parachain To Parachain support is currently limited to XCM V2, with the exception of Parachain primary asset tx construction (e.g. MOVR, SDN, etc.)

    @@ -65,12 +64,12 @@

    Asset API used for common good parachains

    - + - + @@ -83,6 +82,7 @@

    Asset API used for common good parachains

    Parachain to Parachain ✅❌✅
    Parachain to Relay ❌❎❌
    Parachain to System ✅
    +

    Note on Parachain to Parachain Support

    Parachain To Parachain support is currently limited to XCM V2, with the exception of Parachain primary asset tx construction (e.g. MOVR, SDN, etc.).

    Note: System refers to System Parachains like Asset Hub.

    Usage

    Npm

    npm install @substrate/asset-transfer-api

    Yarn

    yarn add @substrate/asset-transfer-api

    @@ -162,6 +162,7 @@

    Current Cross-chain Support +
  • Note on Parachain to Parachain Support
  • Usage
    • diff --git a/docs/interfaces/constructApiPromise.ApiInfo.html b/docs/interfaces/constructApiPromise.ApiInfo.html index 18da7e16..03647d72 100644 --- a/docs/interfaces/constructApiPromise.ApiInfo.html +++ b/docs/interfaces/constructApiPromise.ApiInfo.html @@ -25,7 +25,7 @@

      Hierarchy

      • ApiInfo
      +
    • Defined in constructApiPromise.ts:12
    @@ -46,7 +46,7 @@

    api

    • +
  • Defined in constructApiPromise.ts:16

    • safeXcmVersion

    safeXcmVersion: number
    @@ -54,7 +54,7 @@

    safeXcmVersion

    +
  • Defined in constructApiPromise.ts:24

    • specName

    specName: string
    @@ -62,7 +62,7 @@

    specName

    +
  • Defined in constructApiPromise.ts:20
    • diff --git a/docs/interfaces/types.TransferArgsOpts.html b/docs/interfaces/types.TransferArgsOpts.html index c3866a1d..a3c6d029 100644 --- a/docs/interfaces/types.TransferArgsOpts.html +++ b/docs/interfaces/types.TransferArgsOpts.html @@ -30,7 +30,7 @@

    Hierarchy

    • TransferArgsOpts
    +
  • Defined in types.ts:167
    • @@ -60,7 +60,7 @@

    Optional

    +
  • Defined in types.ts:175

    • Optional isLimited

    isLimited?: boolean
    @@ -69,7 +69,7 @@

    Optional

    +
  • Defined in types.ts:195

    • Optional keepAlive

    keepAlive?: boolean
    @@ -78,7 +78,7 @@

    Optional

    +
  • Defined in types.ts:222

    • Optional paysWithFeeDest

    paysWithFeeDest?: string
    @@ -86,7 +86,7 @@

    Optional

    +
  • Defined in types.ts:185

    • Optional paysWithFeeOrigin

    paysWithFeeOrigin?: string
    @@ -96,7 +96,7 @@

    Optional

    +
  • Defined in types.ts:181

    • Optional sendersAddr

    sendersAddr?: string
    @@ -105,7 +105,7 @@

    Optional

    +
  • Defined in types.ts:190

    • Optional transferLiquidToken

    transferLiquidToken?: boolean
    @@ -114,7 +114,7 @@

    Optional

    +
  • Defined in types.ts:227

    • Optional weightLimit

    weightLimit?: {
        proofSize?: string;
        refTime?: string;
    }
    @@ -138,7 +138,7 @@
    Optional
    +
  • Defined in types.ts:200

    • Optional xcmVersion

    xcmVersion?: number
    @@ -147,7 +147,7 @@

    Optional

    +
  • Defined in types.ts:217
    • diff --git a/docs/interfaces/types.TxResult.html b/docs/interfaces/types.TxResult.html index 3bee91e0..25a024ca 100644 --- a/docs/interfaces/types.TxResult.html +++ b/docs/interfaces/types.TxResult.html @@ -31,7 +31,7 @@

    Hierarchy

    • TxResult
    +
  • Defined in types.ts:133
    • @@ -56,7 +56,7 @@

    dest

    +
  • Defined in types.ts:137

    • direction

    direction: Direction | "local"
    @@ -64,7 +64,7 @@

    directionDescription

    The direction of the cross chain transfer.

    +
  • Defined in types.ts:153

    • format

    format: Format | "local"
    @@ -72,7 +72,7 @@

    format

    +
  • Defined in types.ts:145

    • method

    method: Methods
    @@ -80,7 +80,7 @@

    method

    +
  • Defined in types.ts:157

    • origin

    origin: string
    @@ -88,7 +88,7 @@

    origin

    +
  • Defined in types.ts:141

    • tx

    tx: ConstructedFormat<T>
    @@ -96,7 +96,7 @@

    txDescription

    The constructed transaction.

    +
  • Defined in types.ts:161

    • xcmVersion

    xcmVersion: null | number
    @@ -104,7 +104,7 @@

    xcmVersionDescription

    The xcm version that was used to construct the tx.

    +
  • Defined in types.ts:149
    • diff --git a/docs/modules/AssetTransferApi.html b/docs/modules/AssetTransferApi.html index ef232381..84c6750e 100644 --- a/docs/modules/AssetTransferApi.html +++ b/docs/modules/AssetTransferApi.html @@ -16,7 +16,7 @@
  • AssetTransferApi

    • Module AssetTransferApi

    +
  • Defined in AssetTransferApi.ts:1

    • Index

    diff --git a/docs/modules/constructApiPromise.html b/docs/modules/constructApiPromise.html index b761f98a..b372b52e 100644 --- a/docs/modules/constructApiPromise.html +++ b/docs/modules/constructApiPromise.html @@ -16,7 +16,7 @@
  • constructApiPromise

    • Module constructApiPromise

    +
  • Defined in constructApiPromise.ts:1

    • Index

    diff --git a/docs/modules/errors_BaseError.html b/docs/modules/errors_BaseError.html index 35b8751e..41285360 100644 --- a/docs/modules/errors_BaseError.html +++ b/docs/modules/errors_BaseError.html @@ -16,7 +16,7 @@
  • errors/BaseError

    • Module errors/BaseError

    +
  • Defined in errors/BaseError.ts:1

    • Index

    diff --git a/docs/modules/types.html b/docs/modules/types.html index fe1c00bb..0277876a 100644 --- a/docs/modules/types.html +++ b/docs/modules/types.html @@ -16,7 +16,7 @@
  • types

    • Module types

    +
  • Defined in types.ts:1

    • Index

    diff --git a/docs/types/types.ConstructedFormat.html b/docs/types/types.ConstructedFormat.html index 829fff5f..ab68cc41 100644 --- a/docs/types/types.ConstructedFormat.html +++ b/docs/types/types.ConstructedFormat.html @@ -26,7 +26,7 @@

    Type Parameters

    T

    +
  • Defined in types.ts:90
    • diff --git a/docs/types/types.Format.html b/docs/types/types.Format.html index 7a7c6f78..5312ec86 100644 --- a/docs/types/types.Format.html +++ b/docs/types/types.Format.html @@ -26,7 +26,7 @@

    Type alias Format

    +
  • Defined in types.ts:85
    • diff --git a/docs/types/types.LocalTransferTypes.html b/docs/types/types.LocalTransferTypes.html index 34825e0b..9936ff05 100644 --- a/docs/types/types.LocalTransferTypes.html +++ b/docs/types/types.LocalTransferTypes.html @@ -21,7 +21,7 @@

    Type alias LocalTransferTypes

    +
  • Defined in types.ts:101
    • diff --git a/docs/types/types.Methods.html b/docs/types/types.Methods.html index 33382ac0..b6342607 100644 --- a/docs/types/types.Methods.html +++ b/docs/types/types.Methods.html @@ -21,7 +21,7 @@

    Type alias Methods

    +
  • Defined in types.ts:114
    • diff --git a/docs/types/types.XcmDirection.html b/docs/types/types.XcmDirection.html index 4fe36416..07f98df3 100644 --- a/docs/types/types.XcmDirection.html +++ b/docs/types/types.XcmDirection.html @@ -21,7 +21,7 @@

    Type alias XcmDirection

    +
  • Defined in types.ts:67
    • diff --git a/src/AssetTransferApi.spec.ts b/src/AssetTransferApi.spec.ts index 2ee1a411..fe0e1871 100644 --- a/src/AssetTransferApi.spec.ts +++ b/src/AssetTransferApi.spec.ts @@ -25,31 +25,31 @@ const moonriverAssetsApi = new AssetTransferApi(adjustedMockParachainApi, 'moonr describe('AssetTransferAPI', () => { describe('establishDirection', () => { it('Should correctly determine direction for SystemToSystem', () => { - const res = systemAssetsApi['establishDirection'](false, true, false, true, false); + const res = systemAssetsApi['establishDirection'](false, false, true, false, true, false); expect(res).toEqual('SystemToSystem'); }); it('Should correctly determine direction for SystemToPara', () => { - const res = systemAssetsApi['establishDirection'](false, false, true, true, false); + const res = systemAssetsApi['establishDirection'](false, false, false, true, true, false); expect(res).toEqual('SystemToPara'); }); it('Should correctly determine direction for SystemToRelay', () => { - const res = systemAssetsApi['establishDirection'](true, false, false, true, false); + const res = systemAssetsApi['establishDirection'](false, true, false, false, true, false); expect(res).toEqual('SystemToRelay'); }); it('Should correctly determine direction for RelayToPara', () => { - const res = relayAssetsApi['establishDirection'](false, false, true, false, false); + const res = relayAssetsApi['establishDirection'](false, false, false, true, false, false); expect(res).toEqual('RelayToPara'); }); it('Should correctly determine direction for RelayToSystem', () => { - const res = relayAssetsApi['establishDirection'](false, true, false, false, false); + const res = relayAssetsApi['establishDirection'](false, false, true, false, false, false); expect(res).toEqual('RelayToSystem'); }); it('Should correctly determine direction for ParaToSystem', () => { - const res = moonriverAssetsApi['establishDirection'](false, true, false, false, true); + const res = moonriverAssetsApi['establishDirection'](false, false, true, false, false, true); expect(res).toEqual('ParaToSystem'); }); it('Should correctly determine direction for ParaToPara', () => { - const res = moonriverAssetsApi['establishDirection'](false, false, true, false, true); + const res = moonriverAssetsApi['establishDirection'](false, false, false, true, false, true); expect(res).toEqual('ParaToPara'); }); }); diff --git a/src/AssetTransferApi.ts b/src/AssetTransferApi.ts index e1d29032..886bd8e6 100644 --- a/src/AssetTransferApi.ts +++ b/src/AssetTransferApi.ts @@ -53,6 +53,7 @@ import { TransferArgsOpts, TxResult, UnsignedTransaction, + XcmDirection, } from './types'; import { resolveMultiLocation } from './util/resolveMultiLocation'; import { validateNumber } from './validate'; @@ -169,9 +170,10 @@ export class AssetTransferApi { const isLocalSystemTx = isOriginSystemParachain && isDestSystemParachain && originChainId === destChainId; const isLocalRelayTx = destChainId === '0' && RELAY_CHAIN_NAMES.includes(_specName.toLowerCase()); - // const isLocalTx = isLocalRelayTx || isLocalSystemTx; + const isLocalTx = isLocalRelayTx || isLocalSystemTx; const nativeRelayChainAsset = registry.currentRelayRegistry[relayChainID].tokens[0]; const xcmDirection = this.establishDirection( + isLocalTx, isDestRelayChain, isDestSystemParachain, isDestParachain, @@ -378,7 +380,7 @@ export class AssetTransferApi { txMethod = 'limitedReserveTransferAssets'; transaction = await limitedReserveTransferAssets( _api, - xcmDirection, + xcmDirection as XcmDirection, addr, assetIds, amounts, @@ -398,7 +400,7 @@ export class AssetTransferApi { txMethod = 'reserveTransferAssets'; transaction = await reserveTransferAssets( _api, - xcmDirection, + xcmDirection as XcmDirection, addr, assetIds, amounts, @@ -418,7 +420,7 @@ export class AssetTransferApi { txMethod = 'limitedTeleportAssets'; transaction = await limitedTeleportAssets( _api, - xcmDirection, + xcmDirection as XcmDirection, addr, assetIds, amounts, @@ -438,7 +440,7 @@ export class AssetTransferApi { txMethod = 'teleportAssets'; transaction = await teleportAssets( _api, - xcmDirection, + xcmDirection as XcmDirection, addr, assetIds, amounts, @@ -554,12 +556,17 @@ export class AssetTransferApi { * @param specName */ private establishDirection( + isLocal: boolean, destIsRelayChain: boolean, destIsSystemParachain: boolean, destIsParachain: boolean, originIsSystemParachain: boolean, originIsParachain: boolean ): Direction { + if (isLocal) { + return Direction.Local; + } + const { _api } = this; /** diff --git a/src/createXcmCalls/polkadotXcm/limitedReserveTransferAssets.ts b/src/createXcmCalls/polkadotXcm/limitedReserveTransferAssets.ts index 64410eb9..c5cf09f6 100644 --- a/src/createXcmCalls/polkadotXcm/limitedReserveTransferAssets.ts +++ b/src/createXcmCalls/polkadotXcm/limitedReserveTransferAssets.ts @@ -7,7 +7,7 @@ import type { ISubmittableResult } from '@polkadot/types/types'; import { createXcmTypes } from '../../createXcmTypes'; import type { Registry } from '../../registry'; -import { Direction } from '../../types'; +import { XcmDirection } from '../../types'; import { normalizeArrToStr } from '../../util/normalizeArrToStr'; import type { CreateXcmCallOpts } from '../types'; import { establishXcmPallet } from '../util/establishXcmPallet'; @@ -29,7 +29,7 @@ import { establishXcmPallet } from '../util/establishXcmPallet'; */ export const limitedReserveTransferAssets = async ( api: ApiPromise, - direction: Direction, + direction: XcmDirection, destAddr: string, assetIds: string[], amounts: string[], diff --git a/src/createXcmCalls/polkadotXcm/limitedTeleportAssets.ts b/src/createXcmCalls/polkadotXcm/limitedTeleportAssets.ts index 7da007db..9c0e092f 100644 --- a/src/createXcmCalls/polkadotXcm/limitedTeleportAssets.ts +++ b/src/createXcmCalls/polkadotXcm/limitedTeleportAssets.ts @@ -6,7 +6,7 @@ import type { ISubmittableResult } from '@polkadot/types/types'; import { createXcmTypes } from '../../createXcmTypes'; import type { Registry } from '../../registry'; -import { Direction } from '../../types'; +import { XcmDirection } from '../../types'; import { normalizeArrToStr } from '../../util/normalizeArrToStr'; import type { CreateXcmCallOpts } from '../types'; import { establishXcmPallet } from '../util/establishXcmPallet'; @@ -27,7 +27,7 @@ import { establishXcmPallet } from '../util/establishXcmPallet'; */ export const limitedTeleportAssets = async ( api: ApiPromise, - direction: Direction, + direction: XcmDirection, destAddr: string, assetIds: string[], amounts: string[], diff --git a/src/createXcmCalls/polkadotXcm/reserveTransferAssets.ts b/src/createXcmCalls/polkadotXcm/reserveTransferAssets.ts index 528efb7a..b48ed98d 100644 --- a/src/createXcmCalls/polkadotXcm/reserveTransferAssets.ts +++ b/src/createXcmCalls/polkadotXcm/reserveTransferAssets.ts @@ -6,7 +6,7 @@ import type { ISubmittableResult } from '@polkadot/types/types'; import { createXcmTypes } from '../../createXcmTypes'; import type { Registry } from '../../registry'; -import { Direction } from '../../types'; +import { XcmDirection } from '../../types'; import { normalizeArrToStr } from '../../util/normalizeArrToStr'; import type { CreateXcmCallOpts } from '../types'; import { establishXcmPallet } from '../util/establishXcmPallet'; @@ -27,7 +27,7 @@ import { establishXcmPallet } from '../util/establishXcmPallet'; */ export const reserveTransferAssets = async ( api: ApiPromise, - direction: Direction, + direction: XcmDirection, destAddr: string, assetIds: string[], amounts: string[], diff --git a/src/createXcmCalls/polkadotXcm/teleportAssets.ts b/src/createXcmCalls/polkadotXcm/teleportAssets.ts index 647864af..17eb91c4 100644 --- a/src/createXcmCalls/polkadotXcm/teleportAssets.ts +++ b/src/createXcmCalls/polkadotXcm/teleportAssets.ts @@ -6,7 +6,7 @@ import type { ISubmittableResult } from '@polkadot/types/types'; import { createXcmTypes } from '../../createXcmTypes'; import { Registry } from '../../registry'; -import { Direction } from '../../types'; +import { XcmDirection } from '../../types'; import { normalizeArrToStr } from '../../util/normalizeArrToStr'; import type { CreateXcmCallOpts } from '../types'; import { establishXcmPallet } from '../util/establishXcmPallet'; @@ -27,7 +27,7 @@ import { establishXcmPallet } from '../util/establishXcmPallet'; */ export const teleportAssets = async ( api: ApiPromise, - direction: Direction, + direction: XcmDirection, destAddr: string, assetIds: string[], amounts: string[], diff --git a/src/createXcmCalls/xTokens/transferMultiAsset.ts b/src/createXcmCalls/xTokens/transferMultiAsset.ts index e8d5ded6..282d5ce5 100644 --- a/src/createXcmCalls/xTokens/transferMultiAsset.ts +++ b/src/createXcmCalls/xTokens/transferMultiAsset.ts @@ -7,7 +7,7 @@ import type { ISubmittableResult } from '@polkadot/types/types'; import { createXcmTypes } from '../../createXcmTypes'; import { BaseError, BaseErrorsEnum } from '../../errors'; import type { Registry } from '../../registry'; -import { Direction } from '../../types'; +import { XcmDirection } from '../../types'; import type { CreateXcmCallOpts } from '../types'; import { XcmPalletName } from '../util/establishXcmPallet'; @@ -29,7 +29,7 @@ import { XcmPalletName } from '../util/establishXcmPallet'; */ export const transferMultiAsset = async ( api: ApiPromise, - direction: Direction, + direction: XcmDirection, destAddr: string, assetIds: string[], amounts: string[], diff --git a/src/createXcmCalls/xTokens/transferMultiAssetWithFee.ts b/src/createXcmCalls/xTokens/transferMultiAssetWithFee.ts index 574f0c74..bfc4f888 100644 --- a/src/createXcmCalls/xTokens/transferMultiAssetWithFee.ts +++ b/src/createXcmCalls/xTokens/transferMultiAssetWithFee.ts @@ -7,7 +7,7 @@ import type { ISubmittableResult } from '@polkadot/types/types'; import { createXcmTypes } from '../../createXcmTypes'; import { BaseError, BaseErrorsEnum } from '../../errors'; import type { Registry } from '../../registry'; -import { Direction } from '../../types'; +import { XcmDirection } from '../../types'; import type { CreateXcmCallOpts } from '../types'; import { XcmPalletName } from '../util/establishXcmPallet'; @@ -29,7 +29,7 @@ import { XcmPalletName } from '../util/establishXcmPallet'; */ export const transferMultiAssetWithFee = async ( api: ApiPromise, - direction: Direction, + direction: XcmDirection, destAddr: string, assetIds: string[], amounts: string[], diff --git a/src/createXcmCalls/xTokens/transferMultiAssets.ts b/src/createXcmCalls/xTokens/transferMultiAssets.ts index 1e431b02..357aaa0e 100644 --- a/src/createXcmCalls/xTokens/transferMultiAssets.ts +++ b/src/createXcmCalls/xTokens/transferMultiAssets.ts @@ -8,7 +8,7 @@ import type { ISubmittableResult } from '@polkadot/types/types'; import { createXcmTypes } from '../../createXcmTypes'; import { BaseError, BaseErrorsEnum } from '../../errors'; import type { Registry } from '../../registry'; -import { XCMDestBenificiary, Direction } from '../../types'; +import { XCMDestBenificiary, XcmDirection } from '../../types'; import type { CreateXcmCallOpts } from '../types'; import { XcmPalletName } from '../util/establishXcmPallet'; @@ -30,7 +30,7 @@ import { XcmPalletName } from '../util/establishXcmPallet'; */ export const transferMultiAssets = async ( api: ApiPromise, - direction: Direction, + direction: XcmDirection, destAddr: string, assetIds: string[], amounts: string[], diff --git a/src/createXcmTypes/ParaToPara.spec.ts b/src/createXcmTypes/ParaToPara.spec.ts index 85c4d8d6..2efa51a2 100644 --- a/src/createXcmTypes/ParaToPara.spec.ts +++ b/src/createXcmTypes/ParaToPara.spec.ts @@ -17,7 +17,7 @@ describe('ParaToPara', () => { const expectedRes = { v2: { parents: 0, - interior: mockParachainApi.registry.createType('InteriorMultiLocation', { + interior: { X1: { AccountId32: { id: '0xf5d5714c084c112843aca74f8c498da06cc5a2d63153b825189baa51043b1f0b', @@ -26,7 +26,7 @@ describe('ParaToPara', () => { }, }, }, - }), + }, }, }; @@ -63,11 +63,11 @@ describe('ParaToPara', () => { const expectedRes = { v2: { parents: 1, - interior: mockParachainApi.registry.createType('InteriorMultiLocation', { + interior: { X1: { Parachain: 100, }, - }), + }, }, }; @@ -79,11 +79,11 @@ describe('ParaToPara', () => { const expectedRes = { v3: { parents: 1, - interior: mockParachainApi.registry.createType('InteriorMultiLocation', { + interior: { X1: { Parachain: 100, }, - }), + }, }, }; @@ -113,9 +113,9 @@ describe('ParaToPara', () => { id: { concrete: { parents: 1, - interior: mockParachainApi.registry.createType('InteriorMultiLocation', { - Here: null, - }), + interior: { + here: null, + }, }, }, fun: { @@ -126,9 +126,9 @@ describe('ParaToPara', () => { id: { concrete: { parents: 1, - interior: mockParachainApi.registry.createType('InteriorMultiLocation', { - X3: [{ Parachain: 1000 }, { PalletInstance: 50 }, { GeneralIndex: 8 }], - }), + interior: { + x3: [{ parachain: 1000 }, { palletInstance: 50 }, { generalIndex: 8 }], + }, }, }, fun: { @@ -160,9 +160,9 @@ describe('ParaToPara', () => { id: { concrete: { parents: 1, - interior: mockParachainApi.registry.createType('InteriorMultiLocation', { - X3: [{ Parachain: 1000 }, { PalletInstance: 50 }, { GeneralIndex: 8 }], - }), + interior: { + x3: [{ parachain: 1000 }, { palletInstance: 50 }, { generalIndex: 8 }], + }, }, }, fun: { @@ -173,9 +173,9 @@ describe('ParaToPara', () => { id: { concrete: { parents: 1, - interior: mockParachainApi.registry.createType('InteriorMultiLocation', { - X3: [{ Parachain: 1000 }, { PalletInstance: 50 }, { GeneralIndex: 1984 }], - }), + interior: { + x3: [{ parachain: 1000 }, { palletInstance: 50 }, { generalIndex: 1984 }], + }, }, }, fun: { diff --git a/src/createXcmTypes/ParaToPara.ts b/src/createXcmTypes/ParaToPara.ts index c2475df0..05fcbb32 100644 --- a/src/createXcmTypes/ParaToPara.ts +++ b/src/createXcmTypes/ParaToPara.ts @@ -121,14 +121,16 @@ export const ParaToPara: ICreateXcmType = { assets: string[], opts: CreateAssetsOpts ): Promise => { + const { registry, isForeignAssetsTransfer } = opts; + const sortedAndDedupedMultiAssets = await createParaToParaMultiAssets( api, amounts, specName, assets, xcmVersion, - opts.registry, - opts.isForeignAssetsTransfer + registry, + isForeignAssetsTransfer ); if (xcmVersion === 2) { @@ -188,7 +190,7 @@ export const ParaToPara: ICreateXcmType = { * */ createFeeAssetItem: async (api: ApiPromise, opts: CreateFeeAssetItemOpts): Promise => { - const { registry, paysWithFeeDest, specName, assetIds, amounts, xcmVersion } = opts; + const { registry, paysWithFeeDest, specName, assetIds, amounts, xcmVersion, isForeignAssetsTransfer } = opts; if (xcmVersion && xcmVersion === 3 && specName && amounts && assetIds && paysWithFeeDest) { const multiAssets = await createParaToParaMultiAssets( api, @@ -197,7 +199,7 @@ export const ParaToPara: ICreateXcmType = { assetIds, xcmVersion, registry, - opts.isForeignAssetsTransfer + isForeignAssetsTransfer ); const assetIndex = getFeeAssetItemIndex( @@ -207,7 +209,7 @@ export const ParaToPara: ICreateXcmType = { multiAssets, specName, xcmVersion, - opts.isForeignAssetsTransfer + isForeignAssetsTransfer ); return api.registry.createType('u32', assetIndex); diff --git a/src/createXcmTypes/index.ts b/src/createXcmTypes/index.ts index 518dde17..f1e7f490 100644 --- a/src/createXcmTypes/index.ts +++ b/src/createXcmTypes/index.ts @@ -1,6 +1,7 @@ // Copyright 2023 Parity Technologies (UK) Ltd. import { Direction } from '../types'; +import { ParaToPara } from './ParaToPara'; import { ParaToSystem } from './ParaToSystem'; import { RelayToPara } from './RelayToPara'; import { RelayToSystem } from './RelayToSystem'; @@ -10,7 +11,7 @@ import { SystemToSystem } from './SystemToSystem'; import { ICreateXcmType } from './types'; type ICreateXcmTypeLookup = { - [key in Direction]: ICreateXcmType; + [key in Exclude]: ICreateXcmType; }; export const createXcmTypes: ICreateXcmTypeLookup = { @@ -19,7 +20,7 @@ export const createXcmTypes: ICreateXcmTypeLookup = { RelayToPara, SystemToRelay, RelayToSystem, - ParaToPara: {} as ICreateXcmType, + ParaToPara, ParaToRelay: {} as ICreateXcmType, ParaToSystem, }; diff --git a/src/types.ts b/src/types.ts index c9b535b2..db5086cf 100644 --- a/src/types.ts +++ b/src/types.ts @@ -23,6 +23,10 @@ export type RequireAtLeastOne = Pick; + export enum AssetType { Native = 'Native', Foreign = 'Foreign',