support transfer multiassets

galacticcouncil · Mar 22, 2024 · 7ba7c49 · 7ba7c49
1 parent 435ba75
commit 7ba7c49
Show file tree

Hide file tree

Showing 3 changed files with 86 additions and 11 deletions.
diff --git a/packages/sdk/src/index.ts b/packages/sdk/src/index.ts
@@ -6,3 +6,4 @@ export * from './errors';
 export * from './consts';
 export * from './utils/bignumber';
 export * from './utils/math';
+export * from './utils/json';
diff --git a/packages/xcm-cfg/src/builders/pallets/xTokens.ts b/packages/xcm-cfg/src/builders/pallets/xTokens.ts
@@ -39,9 +39,56 @@ const transferMultiasset = (originParachainId?: number) => {
           getArgs: () => {
             const version = XcmVersion.v3;
             const account = getExtrinsicAccount(address);
+            const assets = toAsset(
+              {
+                X3: [
+                  {
+                    Parachain: originParachainId ?? destination.parachainId,
+                  },
+                  {
+                    PalletInstance: palletInstance,
+                  },
+                  {
+                    GeneralIndex: asset,
+                  },
+                ],
+              },
+              amount
+            );
             return [
+              {
+                [version]: assets,
+              },
+              toDest(version, destination, account),
+              'Unlimited',
+            ];
+          },
+        }),
+    }),
+  };
+};
+
+const transferMultiassets = (originParachainId?: number) => {
+  return {
+    X3: (): ExtrinsicConfigBuilder => ({
+      build: ({
+        address,
+        amount,
+        asset,
+        destination,
+        fee,
+        feeAsset,
+        palletInstance,
+      }) =>
+        new ExtrinsicConfig({
+          module: pallet,
+          func: 'transferMultiassets',
+          getArgs: () => {
+            const version = XcmVersion.v3;
+            const account = getExtrinsicAccount(address);
+            const isAssetDifferent = !!feeAsset && asset !== feeAsset;
+            const assets = [
               toAsset(
-                version,
                 {
                   X3: [
                     {
@@ -57,6 +104,34 @@ const transferMultiasset = (originParachainId?: number) => {
                 },
                 amount
               ),
+            ];
+
+            if (isAssetDifferent) {
+              assets.push(
+                toAsset(
+                  {
+                    X3: [
+                      {
+                        Parachain: originParachainId ?? destination.parachainId,
+                      },
+                      {
+                        PalletInstance: palletInstance,
+                      },
+                      {
+                        GeneralIndex: feeAsset,
+                      },
+                    ],
+                  },
+                  fee
+                )
+              );
+            }
+
+            return [
+              {
+                [version]: assets,
+              },
+              isAssetDifferent ? 1 : 0,
               toDest(version, destination, account),
               'Unlimited',
             ];
@@ -70,5 +145,6 @@ export const xTokens = () => {
   return {
     transfer,
     transferMultiasset,
+    transferMultiassets,
   };
 };
diff --git a/packages/xcm-cfg/src/builders/pallets/xTokens.utils.ts b/packages/xcm-cfg/src/builders/pallets/xTokens.utils.ts
@@ -32,18 +32,16 @@ export const toDest = (
   };
 };
 
-export const toAsset = (version: XcmVersion, interior: any, amount: any) => {
+export const toAsset = (interior: any, amount: any) => {
   return {
-    [version]: {
-      id: {
-        Concrete: {
-          parents: 1,
-          interior: interior,
-        },
-      },
-      fun: {
-        Fungible: amount,
+    id: {
+      Concrete: {
+        parents: 1,
+        interior: interior,
       },
     },
+    fun: {
+      Fungible: amount,
+    },
   };
 };