rename properties

moonbeam-foundation · Oct 2, 2024 · 3d61e89 · 3d61e89
1 parent f04a877
commit 3d61e89
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 23 deletions.
diff --git a/packages/builder/src/fee/FeeBuilder.interfaces.ts b/packages/builder/src/fee/FeeBuilder.interfaces.ts
@@ -14,8 +14,8 @@ export interface FeeConfigBuilderPrams {
   address: string;
   api: ApiPromise;
   asset: ChainAsset;
-  chain: AnyParachain;
-  transferAsset: ChainAsset;
+  destination: AnyParachain;
+  feeAsset: ChainAsset;
 }
 
 export interface XcmPaymentFeeProps {

diff --git a/packages/builder/src/fee/FeeBuilder.ts b/packages/builder/src/fee/FeeBuilder.ts
@@ -34,43 +34,43 @@ function xcmPaymentApi() {
         address,
         api,
         asset,
-        chain,
-        transferAsset,
+        destination,
+        feeAsset,
       }: FeeConfigBuilderPrams) =>
         new SubstrateCallConfig({
           api,
           call: async (): Promise<bigint> => {
-            const versionedAssetId = await getVersionedAssetId(
+            const versionedFeeAssetId = await getVersionedAssetId(
               api,
-              asset,
-              chain,
+              feeAsset,
+              destination,
             );
             const versionedTransferAssetId = await getVersionedAssetId(
               api,
-              transferAsset,
-              chain,
+              asset,
+              destination,
             );
             const versionedAssets = shouldTransferAssetPrecedeFeeAsset
-              ? [versionedTransferAssetId, versionedAssetId]
-              : [versionedAssetId, versionedTransferAssetId];
+              ? [versionedTransferAssetId, versionedFeeAssetId]
+              : [versionedFeeAssetId, versionedTransferAssetId];
 
             const assets =
-              asset === transferAsset ? [versionedAssetId] : versionedAssets;
+              feeAsset === asset ? [versionedFeeAssetId] : versionedAssets;
 
             const instructions = [
               isAssetReserveChain
                 ? getWithdrawAssetInstruction(assets)
                 : getReserveAssetDepositedInstruction(assets),
               getClearOriginInstruction(),
-              getBuyExecutionInstruction(versionedAssetId),
+              getBuyExecutionInstruction(versionedFeeAssetId),
               getDepositAssetInstruction(address, assets),
               getSetTopicInstruction(),
             ];
 
             return getFeeForXcmInstructionsAndAsset(
               api,
               instructions,
-              versionedAssetId,
+              versionedFeeAssetId,
             );
           },
         }),

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

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;
-  chain: AnyChain;
+  destination: AnyChain;
   fee: number | FeeConfigBuilder;
   transferAsset: Asset;
 }
 
 export async function getDestinationFee({
   address,
   asset,
-  chain,
+  destination,
   fee,
   transferAsset,
 }: GetDestinationFeeParams): Promise<AssetAmount> {
-  const zero = AssetAmount.fromChainAsset(chain.getChainAsset(asset), {
+  const zero = AssetAmount.fromChainAsset(destination.getChainAsset(asset), {
     amount: 0n,
   });
 
@@ -179,14 +179,14 @@ export async function getDestinationFee({
     });
   }
 
-  if (EvmParachain.isAnyParachain(chain)) {
-    const polkadot = await PolkadotService.create(chain);
+  if (EvmParachain.isAnyParachain(destination)) {
+    const polkadot = await PolkadotService.create(destination);
     const cfg = (fee as FeeConfigBuilder).build({
       address,
       api: polkadot.api,
-      asset: chain.getChainAsset(asset),
-      chain,
-      transferAsset: chain.getChainAsset(transferAsset),
+      asset: destination.getChainAsset(transferAsset),
+      feeAsset: destination.getChainAsset(asset),
+      destination,
     });
 
     return zero.copyWith({