Fixed destination fee on source chain

moonbeam-foundation · Jul 5, 2024 · 3999e0c · 3999e0c
1 parent bea2122
commit 3999e0c
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 33 deletions.
diff --git a/packages/builder/src/balance/BalanceBuilder.interfaces.ts b/packages/builder/src/balance/BalanceBuilder.interfaces.ts
@@ -12,6 +12,7 @@ export interface BalanceConfigBuilder {
 export interface BalanceConfigBuilderPrams {
   address: string;
   asset: ChainAssetId;
+  constractAddress?: string;
 }
 
 export interface PalletBalancesAccountDataOld extends Struct {

diff --git a/packages/builder/src/balance/BalanceBuilder.ts b/packages/builder/src/balance/BalanceBuilder.ts
@@ -31,23 +31,15 @@ export function evm() {
   };
 }
 
-export function substrate() {
-  return {
-    assets,
-    system,
-    tokens,
-  };
-}
-
 function erc20(): BalanceConfigBuilder {
   return {
-    build: ({ address, asset }) => {
-      if (!asset || !isString(asset)) {
-        throw new Error(`Invalid contract address: ${asset}`);
+    build: ({ address, constractAddress }) => {
+      if (!constractAddress || !isString(constractAddress)) {
+        throw new Error(`Invalid contract address: ${constractAddress}`);
       }
 
       return new ContractConfig({
-        address: asset,
+        address: constractAddress,
         args: [address],
         func: 'balanceOf',
         module: 'Erc20',
@@ -56,6 +48,14 @@ function erc20(): BalanceConfigBuilder {
   };
 }
 
+export function substrate() {
+  return {
+    assets,
+    system,
+    tokens,
+  };
+}
+
 function assets() {
   return {
     account: (): BalanceConfigBuilder => ({

diff --git a/packages/builder/src/contract/contracts/erc20/Erc20.ts b/packages/builder/src/contract/contracts/erc20/Erc20.ts
diff --git a/packages/builder/src/contract/contracts/erc20/index.ts b/packages/builder/src/contract/contracts/erc20/index.ts
diff --git a/packages/sdk/src/getTransferData/getSourceData.ts b/packages/sdk/src/getTransferData/getSourceData.ts
@@ -88,6 +88,7 @@ export async function getSourceData({
   });
 
   const fee = await getFee({
+    balance,
     chain,
     contract,
     extrinsic,
@@ -117,6 +118,7 @@ export async function getSourceData({
 }
 
 export interface GetFeeParams {
+  balance: AssetAmount;
   feeBalance: AssetAmount;
   contract?: ContractConfig;
   chain: AnyChain;
@@ -127,6 +129,7 @@ export interface GetFeeParams {
 }
 
 export async function getFee({
+  balance,
   feeBalance,
   chain,
   contract: contractConfig,
@@ -144,13 +147,13 @@ export async function getFee({
       chain,
       contractConfig,
     ) as TransferContractInterface;
-    const fee = await contract.getFee(feeBalance.amount, sourceAddress);
+    const fee = await contract.getFee(balance.amount, sourceAddress);
 
     return feeBalance.copyWith({ amount: fee });
   }
 
   const fee = await getExtrinsicFee(
-    feeBalance,
+    balance,
     extrinsic as ExtrinsicConfig,
     polkadot,
     sourceAddress,

diff --git a/packages/sdk/src/getTransferData/getTransferData.ts b/packages/sdk/src/getTransferData/getTransferData.ts
@@ -2,6 +2,7 @@
 import { IConfigService, TransferConfig } from '@moonbeam-network/xcm-config';
 import { toBigInt } from '@moonbeam-network/xcm-utils';
 import Big from 'big.js';
+import { AssetAmount } from '@moonbeam-network/xcm-types';
 import { TransferContractInterface, createContract } from '../contract';
 import { PolkadotService } from '../polkadot';
 import {
@@ -38,9 +39,14 @@ export async function getTransferData({
     transferConfig,
   });
 
-  const destinationFee = destination.fee.convertDecimals(
-    transferConfig.source.chain.getChainAsset(destination.fee).decimals,
+  // Here we need to convert the fee on the destination chain to an asset on source chain.
+  const destinationFeeAsset = transferConfig.source.chain.getChainAsset(
+    destination.fee,
   );
+  const destinationFee = AssetAmount.fromChainAsset(destinationFeeAsset, {
+    amount: destination.fee.convertDecimals(destinationFeeAsset.decimals)
+      .amount,
+  });
 
   const source = await getSourceData({
     destinationAddress,

diff --git a/packages/sdk/src/getTransferData/getTransferData.utils.ts b/packages/sdk/src/getTransferData/getTransferData.utils.ts
@@ -27,6 +27,7 @@ export async function getBalance({
   const cfg = builder.build({
     address,
     asset: asset.getBalanceAssetId(),
+    constractAddress: asset.address,
   });
   const amount = AssetAmount.fromChainAsset(asset, { amount: 0n });