Refactor createHeaderPolkadotXCM function

src/nodes/ParachainNode.ts

@@ -15,14 +15,12 @@ import {
   type TTransferRelayToParaOptions,
   Parents
 } from '../types'
+import { generateAddressPayload, getFees, getAllNodeProviders, createApiInstance } from '../utils'
 import {
-  generateAddressPayload,
-  getFees,
-  createHeaderPolkadotXCM,
-  getAllNodeProviders,
-  createApiInstance
-} from '../utils'
-import { constructRelayToParaParameters, createCurrencySpec } from '../pallets/xcmPallet/utils'
+  constructRelayToParaParameters,
+  createCurrencySpec,
+  createPolkadotXcmHeader
+} from '../pallets/xcmPallet/utils'
 
 export const supportsXTokens = (obj: any): obj is IXTokensTransfer => {
   return 'transferXTokens' in obj
@@ -108,7 +106,7 @@ abstract class ParachainNode {
     } else if (supportsPolkadotXCM(this)) {
       return this.transferPolkadotXCM({
         api,
-        header: createHeaderPolkadotXCM(scenario, this.version, paraId),
+        header: this.createPolkadotXcmHeader(scenario, paraId),
         addressSelection: generateAddressPayload(
           api,
           scenario,
@@ -155,6 +153,10 @@ abstract class ParachainNode {
       scenario === 'ParaToRelay' ? Parents.ONE : Parents.ZERO
     )
   }
+
+  createPolkadotXcmHeader(scenario: TScenario, paraId?: number): any {
+    return createPolkadotXcmHeader(scenario, this.version, paraId)
+  }
 }
 
 export default ParachainNode

src/nodes/supported/Astar.ts

@@ -14,7 +14,7 @@ import {
   type IXTokensTransfer,
   type XTokensTransferInput
 } from '../../types'
-import { generateAddressPayload, getFees, createHeaderPolkadotXCM } from '../../utils'
+import { generateAddressPayload, getFees } from '../../utils'
 import ParachainNode, { supportsPolkadotXCM, supportsXTokens } from '../ParachainNode'
 import PolkadotXCMTransferImpl from '../PolkadotXCMTransferImpl'
 import XTokensTransferImpl from '../XTokensTransferImpl'
@@ -69,7 +69,7 @@ class Astar extends ParachainNode implements IPolkadotXCMTransfer, IXTokensTrans
     } else if (supportsPolkadotXCM(this)) {
       return this.transferPolkadotXCM({
         api,
-        header: createHeaderPolkadotXCM(scenario, this.version, paraId),
+        header: this.createPolkadotXcmHeader(scenario, paraId),
         addressSelection: generateAddressPayload(
           api,
           scenario,

src/nodes/supported/Moonbeam.ts

@@ -19,7 +19,7 @@ class Moonbeam extends ParachainNode implements IXTokensTransfer {
 
   transferXTokens(input: XTokensTransferInput): Extrinsic | TSerializedApiCall {
     const { currency, currencyID } = input
-    const currencySelection = currency === 'GLMR' ? 'SelfReserve ' : { ForeignAsset: currencyID }
+    const currencySelection = currency === 'GLMR' ? 'SelfReserve' : { ForeignAsset: currencyID }
     return XTokensTransferImpl.transferXTokens(input, currencySelection)
   }
 

src/nodes/supported/Moonriver.ts

@@ -19,7 +19,7 @@ class Moonriver extends ParachainNode implements IXTokensTransfer {
 
   transferXTokens(input: XTokensTransferInput): Extrinsic | TSerializedApiCall {
     const { currency, currencyID } = input
-    const currencySelection = currency === 'MOVR' ? 'SelfReserve ' : { ForeignAsset: currencyID }
+    const currencySelection = currency === 'MOVR' ? 'SelfReserve' : { ForeignAsset: currencyID }
     return XTokensTransferImpl.transferXTokens(input, currencySelection)
   }
 

src/nodes/supported/Shiden.ts

@@ -12,7 +12,7 @@ import {
   type TNode,
   type TScenario
 } from '../../types'
-import { createHeaderPolkadotXCM, generateAddressPayload, getFees } from '../../utils'
+import { generateAddressPayload, getFees } from '../../utils'
 import ParachainNode, { supportsPolkadotXCM, supportsXTokens } from '../ParachainNode'
 import PolkadotXCMTransferImpl from '../PolkadotXCMTransferImpl'
 import XTokensTransferImpl from '../XTokensTransferImpl'
@@ -70,7 +70,7 @@ class Shiden extends ParachainNode implements IPolkadotXCMTransfer, IXTokensTran
     } else if (supportsPolkadotXCM(this)) {
       return this.transferPolkadotXCM({
         api,
-        header: createHeaderPolkadotXCM(scenario, this.version, paraId),
+        header: this.createPolkadotXcmHeader(scenario, paraId),
         addressSelection: generateAddressPayload(
           api,
           scenario,

src/pallets/xcmPallet/utils.ts

@@ -1,5 +1,11 @@
-import { type Version, type TTransferRelayToParaOptions, Parents } from '../../types'
-import { createHeaderPolkadotXCM, generateAddressPayload } from '../../utils'
+import {
+  Version,
+  type TTransferRelayToParaOptions,
+  Parents,
+  type PolkadotXCMHeader,
+  type TScenario
+} from '../../types'
+import { generateAddressPayload } from '../../utils'
 import { getParaId } from '../assets'
 
 export const constructRelayToParaParameters = (
@@ -9,7 +15,7 @@ export const constructRelayToParaParameters = (
 ): any[] => {
   const paraId = paraIdTo ?? getParaId(destination)
   const parameters = [
-    createHeaderPolkadotXCM('RelayToPara', version, paraId),
+    createPolkadotXcmHeader('RelayToPara', version, paraId),
     generateAddressPayload(api, 'RelayToPara', null, address, version, paraId),
     createCurrencySpec(amount, version, Parents.ZERO),
     0
@@ -40,3 +46,25 @@ export const createCurrencySpec = (
     }
   ]
 })
+
+export const createPolkadotXcmHeader = (
+  scenario: TScenario,
+  version: Version,
+  nodeId?: number
+): PolkadotXCMHeader => {
+  const parents = scenario === 'RelayToPara' ? Parents.ZERO : Parents.ONE
+  const interior =
+    scenario === 'ParaToRelay'
+      ? 'Here'
+      : {
+          X1: {
+            Parachain: nodeId
+          }
+        }
+  return {
+    [scenario === 'RelayToPara' ? Version.V3 : version]: {
+      parents,
+      interior
+    }
+  }
+}

src/types.ts

@@ -93,3 +93,10 @@ export enum Parents {
   ONE = 1,
   ZERO = 0
 }
+
+export type PolkadotXCMHeader = {
+  [K in Version]?: {
+    parents: Parents
+    interior: any
+  }
+}

src/utils.ts

@@ -115,45 +115,6 @@ export const generateAddressPayload = (
   }
 }
 
-export const createHeaderPolkadotXCM = (
-  scenario: TScenario,
-  version: Version,
-  nodeId?: number
-): any => {
-  if (scenario === 'ParaToRelay') {
-    return {
-      [version]: {
-        parents: 1,
-        interior: 'Here'
-      }
-    }
-  }
-
-  if (scenario === 'ParaToPara') {
-    return {
-      [version]: {
-        parents: 1,
-        interior: {
-          X1: {
-            Parachain: nodeId
-          }
-        }
-      }
-    }
-  }
-
-  return {
-    V3: {
-      parents: 0,
-      interior: {
-        X1: {
-          Parachain: nodeId
-        }
-      }
-    }
-  }
-}
-
 export const getNode = (node: TNode): ParachainNode => {
   return nodes[node]
 }