More fixes after integration (#385)

* adjust USDT fees for asset hub coins and enable sovereing account fee balance checking * more fixes discovered with integration * kill nodle and add min balances in destionation for asset hub tokens * add destination min balance builders and fix aseed configuration in moonriver * update snapshot with config fixes
moonbeam-foundation · Nov 14, 2024 · 5c0fb5c · 5c0fb5c
1 parent 9ea36ad
commit 5c0fb5c
Show file tree

Hide file tree

Showing 12 changed files with 122 additions and 155 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/contract/contracts/Xtokens/Xtokens.ts b/packages/builder/src/contract/contracts/Xtokens/Xtokens.ts
@@ -46,7 +46,7 @@ export function Xtokens() {
                 fee.address
                   ? formatAssetIdToERC20(fee.address)
                   : fee.getAssetId(),
-                fee,
+                fee.amount,
               ],
             ],
             1, // index of the fee asset

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
@@ -1310,7 +1310,7 @@ export const moonbeam = new EvmParachain({
     }),
     ChainAsset.fromAsset(wifd, {
       address: '0xffffffff2e1d1ac9ea1686255befe995b31abc96',
-      decimals: 18,
+      decimals: 10,
       ids: {
         id: '61295607754960722617854661686514597014',
       },
@@ -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/moonbaseAlpha.ts b/packages/config/src/xcm-configs/moonbaseAlpha.ts
@@ -1,4 +1,8 @@
-import { BalanceBuilder, ContractBuilder } from '@moonbeam-network/xcm-builder';
+import {
+  AssetMinBuilder,
+  BalanceBuilder,
+  ContractBuilder,
+} from '@moonbeam-network/xcm-builder';
 import {
   agng,
   alan,
@@ -243,6 +247,7 @@ export const moonbaseAlphaRoutes = new ChainRoutes({
           amount: 5,
           asset: tt1,
         },
+        min: AssetMinBuilder().assets().asset(),
       },
       contract: ContractBuilder().Xtokens().transfer(),
     },
@@ -419,6 +424,7 @@ export const moonbaseAlphaRoutes = new ChainRoutes({
           amount: 0.00000001,
           asset: dev,
         },
+        min: AssetMinBuilder().assets().asset(),
       },
       contract: ContractBuilder().Xtokens().transfer(),
     },
@@ -442,6 +448,7 @@ export const moonbaseAlphaRoutes = new ChainRoutes({
           amount: 0.01,
           asset: ftmwh,
         },
+        min: AssetMinBuilder().assets().asset(),
       },
       contract: ContractBuilder().Xtokens().transfer(),
     },
@@ -484,6 +491,7 @@ export const moonbaseAlphaRoutes = new ChainRoutes({
           amount: 0.00000001,
           asset: dev,
         },
+        min: AssetMinBuilder().assets().asset(),
       },
       contract: ContractBuilder().Xtokens().transferWithEvmTo32(),
     },
@@ -507,6 +515,7 @@ export const moonbaseAlphaRoutes = new ChainRoutes({
           amount: 0.01,
           asset: ftmwh,
         },
+        min: AssetMinBuilder().assets().asset(),
       },
       contract: ContractBuilder().Xtokens().transferWithEvmTo32(),
     },