kill nodle and add min balances in destionation for asset hub tokens

moonbeam-foundation · Nov 13, 2024 · 6ace529 · 6ace529
1 parent 5bd5d44
commit 6ace529
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 106 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -52,7 +52,6 @@
     "neuro",
     "neuroweb",
     "nodl",
-    "nodle",
     "npmjs",
     "onfinality",
     "parachain",

diff --git a/packages/builder/src/extrinsic/pallets/polkadotXcm/polkadotXcm.ts b/packages/builder/src/extrinsic/pallets/polkadotXcm/polkadotXcm.ts
@@ -195,24 +195,25 @@ export function polkadotXcm() {
             new ExtrinsicConfig({
               module: pallet,
               func,
-              getArgs: (extrinsicFunction) =>
-                getPolkadotXcmExtrinsicArgs({
+              getArgs: (extrinsicFunction) => {
+                const version = getExtrinsicArgumentVersion(extrinsicFunction);
+
+                return getPolkadotXcmExtrinsicArgs({
                   ...params,
                   func: extrinsicFunction,
                   asset: [
                     {
-                      id: {
-                        Concrete: {
-                          parents: 1,
-                          interior: 'Here',
-                        },
-                      },
+                      id: normalizeConcrete(version, {
+                        parents: 1,
+                        interior: 'Here',
+                      }),
                       fun: {
                         Fungible: params.asset.amount,
                       },
                     },
                   ],
-                }),
+                });
+              },
             }),
         }),
       };

diff --git a/packages/builder/src/extrinsic/pallets/xcmPallet/xcmPallet.ts b/packages/builder/src/extrinsic/pallets/xcmPallet/xcmPallet.ts
@@ -4,7 +4,11 @@ import {
   type Parents,
   XcmVersion,
 } from '../../ExtrinsicBuilder.interfaces';
-import { getExtrinsicAccount } from '../../ExtrinsicBuilder.utils';
+import {
+  getExtrinsicAccount,
+  getExtrinsicArgumentVersion,
+  normalizeConcrete,
+} from '../../ExtrinsicBuilder.utils';
 import { getPolkadotXcmExtrinsicArgs } from '../polkadotXcm/polkadotXcm.util';
 
 const pallet = 'xcmPallet';
@@ -20,25 +24,25 @@ export function xcmPallet() {
             new ExtrinsicConfig({
               module: pallet,
               func,
-              getArgs: (extrinsicFunction) =>
-                getPolkadotXcmExtrinsicArgs({
+              getArgs: (extrinsicFunction) => {
+                const version = getExtrinsicArgumentVersion(extrinsicFunction);
+                return getPolkadotXcmExtrinsicArgs({
                   ...params,
                   parents,
                   func: extrinsicFunction,
                   asset: [
                     {
-                      id: {
-                        Concrete: {
-                          parents: 0,
-                          interior: 'Here',
-                        },
-                      },
+                      id: normalizeConcrete(version, {
+                        parents: 0,
+                        interior: 'Here',
+                      }),
                       fun: {
                         Fungible: params.asset.amount,
                       },
                     },
                   ],
-                }),
+                });
+              },
             }),
         }),
       };

diff --git a/packages/config/src/chains.ts b/packages/config/src/chains.ts
@@ -1539,29 +1539,6 @@ export const neuroweb = new Parachain({
   ],
 });
 
-export const nodle = new Parachain({
-  assets: [
-    ChainAsset.fromAsset(nodl, {
-      decimals: 11,
-      ids: {
-        id: 'NodleNative',
-      },
-    }),
-  ],
-  ecosystem: Ecosystem.Polkadot,
-  genesisHash:
-    '0x97da7ede98d7bad4e36b4d734b6055425a3be036da2a332ea5a7037656427a21',
-  key: 'nodle',
-  name: 'Nodle',
-  nativeAsset: nodl,
-  parachainId: 2026,
-  ss58Format: 37,
-  ws: [
-    'wss://nodle-rpc.dwellir.com',
-    'wss://nodle-parachain.api.onfinality.io/public-ws',
-  ],
-});
-
 export const originTrailAlphanet = new Parachain({
   assets: [
     ChainAsset.fromAsset(otp, {
@@ -2250,7 +2227,6 @@ export const chainsList: AnyChain[] = [
   moonbeam,
   moonriver,
   neuroweb,
-  nodle,
   originTrailAlphanet,
   peaqChain,
   peaqEvm,

diff --git a/packages/config/src/xcm-configs/index.ts b/packages/config/src/xcm-configs/index.ts
@@ -27,7 +27,6 @@ import { moonbaseBetaRoutes } from './moonbaseBeta';
 import { moonbeamRoutes } from './moonbeam';
 import { moonriverRoutes } from './moonriver';
 import { neurowebRoutes } from './neuroweb';
-import { nodleRoutes } from './nodle';
 import { originTrailAlphanetRoutes } from './originTrailAlphanet';
 import { peaqRoutes } from './peaq';
 import { peaqAlphanetRoutes } from './peaqAlphanet';
@@ -74,7 +73,6 @@ export const xcmRoutesList: ChainRoutes[] = [
   moonbeamRoutes,
   moonriverRoutes,
   neurowebRoutes,
-  nodleRoutes,
   originTrailAlphanetRoutes,
   peaqRoutes,
   peaqEvmRoutes,

diff --git a/packages/config/src/xcm-configs/moonbeam.ts b/packages/config/src/xcm-configs/moonbeam.ts
@@ -1,4 +1,8 @@
-import { BalanceBuilder, ContractBuilder } from '@moonbeam-network/xcm-builder';
+import {
+  AssetMinBuilder,
+  BalanceBuilder,
+  ContractBuilder,
+} from '@moonbeam-network/xcm-builder';
 import {
   aca,
   apillon,
@@ -52,7 +56,6 @@ import {
   mantaParachain,
   moonbeam,
   neuroweb,
-  nodle,
   peaqChain,
   peaqEvm,
   pendulum,
@@ -491,29 +494,6 @@ export const moonbeamRoutes = new ChainRoutes({
       },
       contract: ContractBuilder().Xtokens().transfer(),
     },
-    {
-      source: {
-        asset: nodl,
-        balance: BalanceBuilder().substrate().assets().account(),
-        fee: {
-          asset: glmr,
-          balance: BalanceBuilder().substrate().system().account(),
-        },
-        destinationFee: {
-          balance: BalanceBuilder().substrate().assets().account(),
-        },
-      },
-      destination: {
-        asset: nodl,
-        balance: BalanceBuilder().substrate().system().account(),
-        chain: nodle,
-        fee: {
-          amount: 0.02,
-          asset: nodl,
-        },
-      },
-      contract: ContractBuilder().Xtokens().transfer(),
-    },
     {
       source: {
         asset: neuro,
@@ -673,6 +653,7 @@ export const moonbeamRoutes = new ChainRoutes({
           asset: usdt,
           balance: BalanceBuilder().substrate().assets().account(), // TODO change when DOT pays for fees
         },
+        min: AssetMinBuilder().assets().asset(),
       },
       contract: ContractBuilder().Xtokens().transferMultiCurrencies(),
     },
@@ -700,6 +681,7 @@ export const moonbeamRoutes = new ChainRoutes({
           // asset: dot,
           // balance: BalanceBuilder().substrate().system().account(),
         },
+        min: AssetMinBuilder().assets().asset(),
       },
       contract: ContractBuilder().Xtokens().transferMultiCurrencies(),
     },
@@ -724,6 +706,7 @@ export const moonbeamRoutes = new ChainRoutes({
           asset: usdt,
           balance: BalanceBuilder().substrate().assets().account(), // TODO change when DOT pays for fees
         },
+        min: AssetMinBuilder().assets().asset(),
       },
       contract: ContractBuilder().Xtokens().transferMultiCurrencies(),
     },
@@ -748,6 +731,7 @@ export const moonbeamRoutes = new ChainRoutes({
           asset: usdt,
           balance: BalanceBuilder().substrate().assets().account(), // TODO change when DOT pays for fees
         },
+        min: AssetMinBuilder().assets().asset(),
       },
       contract: ContractBuilder().Xtokens().transferMultiCurrencies(),
     },
@@ -1431,6 +1415,7 @@ export const moonbeamRoutes = new ChainRoutes({
           asset: usdt,
           balance: BalanceBuilder().substrate().assets().account(), // TODO change when DOT pays for fees
         },
+        min: AssetMinBuilder().assets().asset(),
       },
       contract: ContractBuilder().Xtokens().transferMultiCurrencies(),
     },

diff --git a/packages/config/src/xcm-configs/nodle.ts b/packages/config/src/xcm-configs/nodle.ts