diff --git a/packages/types/src/interfaces/xcm/definitions.ts b/packages/types/src/interfaces/xcm/definitions.ts index 9e0246ce74..407dae65ca 100644 --- a/packages/types/src/interfaces/xcm/definitions.ts +++ b/packages/types/src/interfaces/xcm/definitions.ts @@ -84,43 +84,18 @@ const location = { Junctions: { _enum: { Here: 'Null', - X1: 'Junction', - X2: '(Junction, Junction)', - X3: '(Junction, Junction, Junction)', - X4: '(Junction, Junction, Junction, Junction)', - X5: '(Junction, Junction, Junction, Junction, Junction)', - X6: '(Junction, Junction, Junction, Junction, Junction, Junction)', - X7: '(Junction, Junction, Junction, Junction, Junction, Junction, Junction)', - X8: '(Junction, Junction, Junction, Junction, Junction, Junction, Junction, Junction)' + X1: 'JunctionV1', + X2: '(JunctionV1, JunctionV1)', + X3: '(JunctionV1, JunctionV1, JunctionV1)', + X4: '(JunctionV1, JunctionV1, JunctionV1, JunctionV1)', + X5: '(JunctionV1, JunctionV1, JunctionV1, JunctionV1, JunctionV1)', + X6: '(JunctionV1, JunctionV1, JunctionV1, JunctionV1, JunctionV1, JunctionV1)', + X7: '(JunctionV1, JunctionV1, JunctionV1, JunctionV1, JunctionV1, JunctionV1, JunctionV1)', + X8: '(JunctionV1, JunctionV1, JunctionV1, JunctionV1, JunctionV1, JunctionV1, JunctionV1, JunctionV1)' } }, - Junction: { - _enum: { - Parent: 'Null', - Parachain: 'Compact', - AccountId32: { - network: 'NetworkId', - id: 'AccountId' - }, - AccountIndex64: { - network: 'NetworkId', - index: 'Compact' - }, - AccountKey20: { - network: 'NetworkId', - key: '[u8; 20]' - }, - PalletInstance: 'u8', - GeneralIndex: 'Compact', - GeneralKey: 'Vec', - OnlyChild: 'Null', - Plurality: { - id: 'BodyId', - part: 'BodyPart' - } - } - }, - MultiLocation: 'Junctions', + Junction: 'JunctionV1', + MultiLocation: 'MultiLocationV1', NetworkId: { _enum: { Any: 'Null', diff --git a/packages/types/src/interfaces/xcm/v0.ts b/packages/types/src/interfaces/xcm/v0.ts index 1e80f261ab..de2b0eef41 100644 --- a/packages/types/src/interfaces/xcm/v0.ts +++ b/packages/types/src/interfaces/xcm/v0.ts @@ -22,6 +22,32 @@ export const v0: DefinitionsTypes = { Blob: 'Vec' } }, + JunctionV0: { + _enum: { + Parent: 'Null', + Parachain: 'Compact', + AccountId32: { + network: 'NetworkId', + id: 'AccountId' + }, + AccountIndex64: { + network: 'NetworkId', + index: 'Compact' + }, + AccountKey20: { + network: 'NetworkId', + key: '[u8; 20]' + }, + PalletInstance: 'u8', + GeneralIndex: 'Compact', + GeneralKey: 'Vec', + OnlyChild: 'Null', + Plurality: { + id: 'BodyId', + part: 'BodyPart' + } + } + }, MultiAssetV0: { _enum: { None: 'Null', @@ -50,7 +76,19 @@ export const v0: DefinitionsTypes = { } } }, - MultiLocationV0: 'MultiLocation', + MultiLocationV0: { + _enum: { + Here: 'Null', + X1: 'JunctionV0', + X2: '(JunctionV0, JunctionV0)', + X3: '(JunctionV0, JunctionV0, JunctionV0)', + X4: '(JunctionV0, JunctionV0, JunctionV0, JunctionV0)', + X5: '(JunctionV0, JunctionV0, JunctionV0, JunctionV0, JunctionV0)', + X6: '(JunctionV0, JunctionV0, JunctionV0, JunctionV0, JunctionV0, JunctionV0)', + X7: '(JunctionV0, JunctionV0, JunctionV0, JunctionV0, JunctionV0, JunctionV0, JunctionV0)', + X8: '(JunctionV0, JunctionV0, JunctionV0, JunctionV0, JunctionV0, JunctionV0, JunctionV0, JunctionV0)' + } + }, OriginKindV0: { _enum: ['Native', 'SovereignAccount', 'Superuser', 'Xcm'] }, diff --git a/packages/types/src/interfaces/xcm/v1.ts b/packages/types/src/interfaces/xcm/v1.ts index 4a773eada0..e4d6c30f40 100644 --- a/packages/types/src/interfaces/xcm/v1.ts +++ b/packages/types/src/interfaces/xcm/v1.ts @@ -18,6 +18,31 @@ export const v1: DefinitionsTypes = { Blob: 'Bytes' } }, + JunctionV1: { + _enum: { + Parachain: 'Compact', + AccountId32: { + network: 'NetworkId', + id: 'AccountId' + }, + AccountIndex64: { + network: 'NetworkId', + index: 'Compact' + }, + AccountKey20: { + network: 'NetworkId', + key: '[u8; 20]' + }, + PalletInstance: 'u8', + GeneralIndex: 'Compact', + GeneralKey: 'Vec', + OnlyChild: 'Null', + Plurality: { + id: 'BodyId', + part: 'BodyPart' + } + } + }, MultiAssetsV1: 'Vec', MultiAssetV1: { id: 'XcmAssetId',