standarize transferAsset and feeAsset

moonbeam-foundation · Oct 3, 2024 · fcc496e · fcc496e
1 parent 7531461
commit fcc496e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/packages/mrl/src/getTransferData/getMoonChainData.ts b/packages/mrl/src/getTransferData/getMoonChainData.ts
@@ -38,10 +38,10 @@ export async function getMoonChainData({
 
   const fee = await getDestinationFee({
     address: sourceAddress, // TODO not correct
-    asset: route.mrl.moonChain.fee.asset,
+    asset: route.source.asset,
     destination: moonChain,
     fee: route.mrl.moonChain.fee.amount,
-    transferAsset: route.source.asset,
+    feeAsset: route.mrl.moonChain.fee.asset,
   });
 
   let address = sourceAddress;

diff --git a/packages/sdk/src/getTransferData/getDestinationData.ts b/packages/sdk/src/getTransferData/getDestinationData.ts
@@ -31,10 +31,10 @@ export async function getDestinationData({
   });
   const fee = await getDestinationFee({
     address: destinationAddress,
-    asset: route.destination.fee.asset,
+    feeAsset: route.destination.fee.asset,
     destination,
     fee: route.destination.fee.amount,
-    transferAsset: route.source.asset,
+    asset: route.source.asset,
   });
   const existentialDeposit = await getExistentialDeposit(destination);
 

diff --git a/packages/sdk/src/getTransferData/getTransferData.utils.ts b/packages/sdk/src/getTransferData/getTransferData.utils.ts
@@ -157,19 +157,19 @@ export function getMax({
 export interface GetDestinationFeeParams {
   address: string;
   asset: Asset;
+  feeAsset: Asset;
   destination: AnyChain;
   fee: number | FeeConfigBuilder;
-  transferAsset: Asset;
 }
 
 export async function getDestinationFee({
   address,
   asset,
   destination,
   fee,
-  transferAsset,
+  feeAsset,
 }: GetDestinationFeeParams): Promise<AssetAmount> {
-  const zero = AssetAmount.fromChainAsset(destination.getChainAsset(asset), {
+  const zero = AssetAmount.fromChainAsset(destination.getChainAsset(feeAsset), {
     amount: 0n,
   });
 
@@ -184,9 +184,9 @@ export async function getDestinationFee({
     const cfg = (fee as FeeConfigBuilder).build({
       address,
       api: polkadot.api,
-      asset: destination.getChainAsset(transferAsset),
-      feeAsset: destination.getChainAsset(asset),
+      asset: destination.getChainAsset(asset),
       destination,
+      feeAsset: destination.getChainAsset(feeAsset),
     });
 
     return zero.copyWith({