remove assetTypeUnitsPerSecond function since it is not used now

moonbeam-foundation · Sep 23, 2024 · 6b69eab · 6b69eab
1 parent a92c261
commit 6b69eab
Show file tree

Hide file tree

Showing 15 changed files with 110 additions and 101 deletions.
diff --git a/mkdocs/docs/reference/interfaces.md b/mkdocs/docs/reference/interfaces.md
@@ -44,7 +44,7 @@ Defines an asset's key and symbol used on the asset's origin chain.
 Defines properties related to an asset, including `Asset` properties, the decimals and symbol of the asset, and the amount an associated source or destination address has of the asset.
 
 !!! note
-    A few utility methods are available for working with the `AssetAmount` class that converts the amount to various formats. Please refer to the [Methods for Asset Conversions](./methods.md#asset-utilities) section.
+A few utility methods are available for working with the `AssetAmount` class that converts the amount to various formats. Please refer to the [Methods for Asset Conversions](./methods.md#asset-utilities) section.
 
 **Attributes**
 
@@ -692,7 +692,9 @@ Defines a chain's configurations, including information for each chain's support
       balance: BalanceBuilder().substrate().assets().account(),
       destination: moonbeam,
       destinationFee: {
-        amount: FeeBuilder().assetManager().assetTypeUnitsPerSecond(),
+        amount: FeeBuilder()
+          .xcmPaymentApi()
+          .xcmPaymentFee({ isAssetReserveChain: false }),
         asset: usdt,
         balance: BalanceBuilder().substrate().assets().account(),
       },
@@ -762,7 +764,9 @@ Defines an asset's configurations for a source chain and includes information ab
   balance: BalanceBuilder().substrate().assets().account(),
   destination: moonbeam,
   destinationFee: {
-    amount: FeeBuilder().assetManager().assetTypeUnitsPerSecond(),
+    amount: FeeBuilder()
+          .xcmPaymentApi()
+          .xcmPaymentFee({ isAssetReserveChain: false }),
     asset: usdt,
     balance: BalanceBuilder().substrate().assets().account(),
   },
@@ -832,7 +836,9 @@ Defines the fees for a particular asset on the destination chain.
 {
   asset: dot,
   balance: BalanceBuilder().substrate().system().account(),
-  amount: FeeBuilder().assetManager().assetTypeUnitsPerSecond(),
+  amount: amount: FeeBuilder()
+          .xcmPaymentApi()
+          .xcmPaymentFee({ isAssetReserveChain: false }),
 }
 ```
 

diff --git a/packages/builder/src/fee/FeeBuilder.ts b/packages/builder/src/fee/FeeBuilder.ts
@@ -1,11 +1,9 @@
 /* eslint-disable sort-keys */
 /* eslint-disable @typescript-eslint/no-use-before-define */
 
-import { Option, u128 } from '@polkadot/types';
 import { SubstrateCallConfig } from '../types/substrate/SubstrateCallConfig';
 import { FeeConfigBuilder, XcmPaymentFeeProps } from './FeeBuilder.interfaces';
 import {
-  getAssetIdType,
   getBuyExecutionInstruction,
   getClearOriginInstruction,
   getDepositAssetInstruction,
@@ -18,34 +16,9 @@ import {
 
 export function FeeBuilder() {
   return {
-    assetManager,
     xcmPaymentApi,
   };
 }
-// TODO remove after it's unused
-function assetManager() {
-  return {
-    assetTypeUnitsPerSecond: (weight = 1_000_000_000): FeeConfigBuilder => ({
-      build: ({ api, asset }) =>
-        new SubstrateCallConfig({
-          api,
-          call: async (): Promise<bigint> => {
-            const type = await getAssetIdType(api, asset);
-
-            const unwrappedType = type.unwrap();
-
-            const res = (await api.query.assetManager.assetTypeUnitsPerSecond(
-              unwrappedType,
-            )) as unknown as Option<u128>;
-
-            const unitsPerSecond = res.unwrapOrDefault().toBigInt();
-
-            return (BigInt(weight) * unitsPerSecond) / BigInt(10 ** 12);
-          },
-        }),
-    }),
-  };
-}
 
 function xcmPaymentApi() {
   return {

diff --git a/packages/config/src/configs/index.ts b/packages/config/src/configs/index.ts
@@ -47,7 +47,6 @@ import { subsocialConfig } from './subsocial';
 import { tinkernetConfig } from './tinkernet';
 import { turingConfig } from './turing';
 import { turingAlphanetConfig } from './turingAlphanet';
-import { uniqueAlphaConfig } from './uniqueAlpha';
 import { zeitgeistConfig } from './zeitgeist';
 
 export const chainsConfigList: ChainConfig[] = [
@@ -98,7 +97,6 @@ export const chainsConfigList: ChainConfig[] = [
   tinkernetConfig,
   turingConfig,
   turingAlphanetConfig,
-  uniqueAlphaConfig,
   zeitgeistConfig,
 ];
 

diff --git a/packages/config/src/configs/moonbaseAlpha.ts b/packages/config/src/configs/moonbaseAlpha.ts
@@ -91,21 +91,6 @@ export const moonbaseAlphaConfig = new ChainConfig({
         balance: BalanceBuilder().substrate().system().account(),
       },
     }),
-    // NOTE: Disabling because ws endpoint is not working
-    // new AssetConfig({
-    //   asset: auq,
-    //   balance: BalanceBuilder().substrate().assets().account(),
-    //   contract: ContractBuilder().Xtokens().transfer(),
-    //   destination: uniqueAlpha,
-    //   destinationFee: {
-    //     amount: 0,
-    //     asset: auq,
-    //   },
-    //   fee: {
-    //     asset: dev,
-    //     balance: BalanceBuilder().substrate().system().account(),
-    //   },
-    // }),
     new AssetConfig({
       asset: ampe,
       balance: BalanceBuilder().substrate().assets().account(),

diff --git a/packages/config/src/configs/neuroweb.ts b/packages/config/src/configs/neuroweb.ts
@@ -15,7 +15,9 @@ export const neurowebConfig = new ChainConfig({
       balance: BalanceBuilder().substrate().system().account(),
       destination: moonbeam,
       destinationFee: {
-        amount: FeeBuilder().assetManager().assetTypeUnitsPerSecond(),
+        amount: FeeBuilder()
+          .xcmPaymentApi()
+          .xcmPaymentFee({ isAssetReserveChain: false }),
         asset: neuro,
         balance: BalanceBuilder().substrate().system().account(),
       },

diff --git a/packages/config/src/configs/nodle.ts b/packages/config/src/configs/nodle.ts
@@ -15,7 +15,9 @@ export const nodleConfig = new ChainConfig({
       balance: BalanceBuilder().substrate().system().account(),
       destination: moonbeam,
       destinationFee: {
-        amount: FeeBuilder().assetManager().assetTypeUnitsPerSecond(),
+        amount: FeeBuilder()
+          .xcmPaymentApi()
+          .xcmPaymentFee({ isAssetReserveChain: false }),
         asset: nodl,
         balance: BalanceBuilder().substrate().system().account(),
       },

diff --git a/packages/config/src/configs/parallel.ts b/packages/config/src/configs/parallel.ts
@@ -15,7 +15,9 @@ export const parallelConfig = new ChainConfig({
       balance: BalanceBuilder().substrate().system().account(),
       destination: moonbeam,
       destinationFee: {
-        amount: FeeBuilder().assetManager().assetTypeUnitsPerSecond(),
+        amount: FeeBuilder()
+          .xcmPaymentApi()
+          .xcmPaymentFee({ isAssetReserveChain: false }),
         asset: para,
         balance: BalanceBuilder().substrate().system().account(),
       },
@@ -29,7 +31,9 @@ export const parallelConfig = new ChainConfig({
       balance: BalanceBuilder().substrate().assets().account(),
       destination: moonbeam,
       destinationFee: {
-        amount: 0.01,
+        amount: FeeBuilder()
+          .xcmPaymentApi()
+          .xcmPaymentFee({ isAssetReserveChain: true }),
         asset: glmr,
         balance: BalanceBuilder().substrate().assets().account(),
       },

diff --git a/packages/config/src/configs/peaq.ts b/packages/config/src/configs/peaq.ts
@@ -16,7 +16,9 @@ export const peaqConfig = new ChainConfig({
       balance: BalanceBuilder().substrate().system().account(),
       destination: moonbeam,
       destinationFee: {
-        amount: FeeBuilder().assetManager().assetTypeUnitsPerSecond(),
+        amount: FeeBuilder()
+          .xcmPaymentApi()
+          .xcmPaymentFee({ isAssetReserveChain: false }),
         asset: peaq,
         balance: BalanceBuilder().substrate().system().account(),
       },
@@ -27,7 +29,9 @@ export const peaqConfig = new ChainConfig({
       balance: BalanceBuilder().substrate().assets().account(),
       destination: moonbeam,
       destinationFee: {
-        amount: 0.01,
+        amount: FeeBuilder()
+          .xcmPaymentApi()
+          .xcmPaymentFee({ isAssetReserveChain: true }),
         asset: glmr,
         balance: BalanceBuilder().substrate().assets().account(),
       },
@@ -39,7 +43,9 @@ export const peaqConfig = new ChainConfig({
       balance: BalanceBuilder().substrate().assets().account(),
       destination: moonbeam,
       destinationFee: {
-        amount: 0.08,
+        amount: FeeBuilder()
+          .xcmPaymentApi()
+          .xcmPaymentFee({ isAssetReserveChain: true }),
         asset: glmr,
         balance: BalanceBuilder().substrate().assets().account(),
       },
@@ -55,7 +61,9 @@ export const peaqConfig = new ChainConfig({
       balance: BalanceBuilder().substrate().assets().account(),
       destination: moonbeam,
       destinationFee: {
-        amount: 0.08,
+        amount: FeeBuilder()
+          .xcmPaymentApi()
+          .xcmPaymentFee({ isAssetReserveChain: true }),
         asset: glmr,
         balance: BalanceBuilder().substrate().assets().account(),
       },
@@ -71,7 +79,9 @@ export const peaqConfig = new ChainConfig({
       balance: BalanceBuilder().substrate().assets().account(),
       destination: moonbeam,
       destinationFee: {
-        amount: 0.08,
+        amount: FeeBuilder()
+          .xcmPaymentApi()
+          .xcmPaymentFee({ isAssetReserveChain: true }),
         asset: glmr,
         balance: BalanceBuilder().substrate().assets().account(),
       },
@@ -87,7 +97,9 @@ export const peaqConfig = new ChainConfig({
       balance: BalanceBuilder().substrate().assets().account(),
       destination: moonbeam,
       destinationFee: {
-        amount: 0.08,
+        amount: FeeBuilder()
+          .xcmPaymentApi()
+          .xcmPaymentFee({ isAssetReserveChain: true }),
         asset: glmr,
         balance: BalanceBuilder().substrate().assets().account(),
       },
@@ -103,7 +115,9 @@ export const peaqConfig = new ChainConfig({
       balance: BalanceBuilder().substrate().assets().account(),
       destination: moonbeam,
       destinationFee: {
-        amount: 0.08,
+        amount: FeeBuilder()
+          .xcmPaymentApi()
+          .xcmPaymentFee({ isAssetReserveChain: true }),
         asset: glmr,
         balance: BalanceBuilder().substrate().assets().account(),
       },

diff --git a/packages/config/src/configs/peaqEvm.ts b/packages/config/src/configs/peaqEvm.ts
@@ -2,6 +2,7 @@ import {
   AssetMinBuilder,
   BalanceBuilder,
   ContractBuilder,
+  FeeBuilder,
 } from '@moonbeam-network/xcm-builder';
 import { dai, glmr, peaq, usdcwh, usdtwh, wbtc, weth } from '../assets';
 import { moonbeam, peaqEvm } from '../chains';
@@ -16,7 +17,9 @@ export const peaqEvmConfig = new ChainConfig({
       contract: ContractBuilder().Xtokens().transfer(),
       destination: moonbeam,
       destinationFee: {
-        amount: 0.01,
+        amount: FeeBuilder()
+          .xcmPaymentApi()
+          .xcmPaymentFee({ isAssetReserveChain: true }),
         asset: glmr,
         balance: BalanceBuilder().evm().erc20(),
       },
@@ -32,7 +35,9 @@ export const peaqEvmConfig = new ChainConfig({
       contract: ContractBuilder().Xtokens().transferMultiCurrencies(),
       destination: moonbeam,
       destinationFee: {
-        amount: 0.08,
+        amount: FeeBuilder()
+          .xcmPaymentApi()
+          .xcmPaymentFee({ isAssetReserveChain: true }),
         asset: glmr,
         balance: BalanceBuilder().evm().erc20(),
       },
@@ -48,7 +53,9 @@ export const peaqEvmConfig = new ChainConfig({
       contract: ContractBuilder().Xtokens().transferMultiCurrencies(),
       destination: moonbeam,
       destinationFee: {
-        amount: 0.1,
+        amount: FeeBuilder()
+          .xcmPaymentApi()
+          .xcmPaymentFee({ isAssetReserveChain: true }),
         asset: glmr,
         balance: BalanceBuilder().evm().erc20(),
       },
@@ -64,7 +71,9 @@ export const peaqEvmConfig = new ChainConfig({
       contract: ContractBuilder().Xtokens().transferMultiCurrencies(),
       destination: moonbeam,
       destinationFee: {
-        amount: 0.08,
+        amount: FeeBuilder()
+          .xcmPaymentApi()
+          .xcmPaymentFee({ isAssetReserveChain: true }),
         asset: glmr,
         balance: BalanceBuilder().evm().erc20(),
       },
@@ -80,7 +89,9 @@ export const peaqEvmConfig = new ChainConfig({
       contract: ContractBuilder().Xtokens().transferMultiCurrencies(),
       destination: moonbeam,
       destinationFee: {
-        amount: 0.08,
+        amount: FeeBuilder()
+          .xcmPaymentApi()
+          .xcmPaymentFee({ isAssetReserveChain: true }),
         asset: glmr,
         balance: BalanceBuilder().evm().erc20(),
       },
@@ -96,7 +107,9 @@ export const peaqEvmConfig = new ChainConfig({
       contract: ContractBuilder().Xtokens().transferMultiCurrencies(),
       destination: moonbeam,
       destinationFee: {
-        amount: 0.08,
+        amount: FeeBuilder()
+          .xcmPaymentApi()
+          .xcmPaymentFee({ isAssetReserveChain: true }),
         asset: glmr,
         balance: BalanceBuilder().evm().erc20(),
       },

diff --git a/packages/config/src/configs/pendulum.ts b/packages/config/src/configs/pendulum.ts
@@ -15,7 +15,9 @@ export const pendulumConfig = new ChainConfig({
       balance: BalanceBuilder().substrate().system().account(),
       destination: moonbeam,
       destinationFee: {
-        amount: FeeBuilder().assetManager().assetTypeUnitsPerSecond(),
+        amount: FeeBuilder()
+          .xcmPaymentApi()
+          .xcmPaymentFee({ isAssetReserveChain: false }),
         asset: pen,
         balance: BalanceBuilder().substrate().system().account(),
       },
@@ -26,7 +28,9 @@ export const pendulumConfig = new ChainConfig({
       balance: BalanceBuilder().substrate().tokens().accounts(),
       destination: moonbeam,
       destinationFee: {
-        amount: 0.01,
+        amount: FeeBuilder()
+          .xcmPaymentApi()
+          .xcmPaymentFee({ isAssetReserveChain: true }),
         asset: glmr,
         balance: BalanceBuilder().substrate().tokens().accounts(),
       },
@@ -41,7 +45,9 @@ export const pendulumConfig = new ChainConfig({
       balance: BalanceBuilder().substrate().tokens().accounts(),
       destination: moonbeam,
       destinationFee: {
-        amount: 0.08,
+        amount: FeeBuilder()
+          .xcmPaymentApi()
+          .xcmPaymentFee({ isAssetReserveChain: true }),
         asset: glmr,
         balance: BalanceBuilder().substrate().tokens().accounts(),
       },

diff --git a/packages/config/src/configs/phala.ts b/packages/config/src/configs/phala.ts
@@ -15,7 +15,9 @@ export const phalaConfig = new ChainConfig({
       balance: BalanceBuilder().substrate().system().account(),
       destination: moonbeam,
       destinationFee: {
-        amount: FeeBuilder().assetManager().assetTypeUnitsPerSecond(),
+        amount: FeeBuilder()
+          .xcmPaymentApi()
+          .xcmPaymentFee({ isAssetReserveChain: false }),
         asset: pha,
         balance: BalanceBuilder().substrate().system().account(),
       },
@@ -26,7 +28,9 @@ export const phalaConfig = new ChainConfig({
       balance: BalanceBuilder().substrate().assets().account(),
       destination: moonbeam,
       destinationFee: {
-        amount: 0.01,
+        amount: FeeBuilder()
+          .xcmPaymentApi()
+          .xcmPaymentFee({ isAssetReserveChain: true }),
         asset: glmr,
         balance: BalanceBuilder().substrate().assets().account(),
       },