Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: modified logic for checking the native token's remaining balance #1429

Merged
merged 3 commits into from
Dec 30, 2024
Merged
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 20 additions & 15 deletions src/v2/services/implementations/AssetsService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
REQUIRED_MINIMUM_BALANCE_ETH,
} from 'src/modules/toast/index';
import { astarNativeTokenErcAddr } from 'src/modules/xcm';
import { idAstarNativeToken } from 'src/modules/xcm/tokens';
import { container } from 'src/v2/common';
import { IEventAggregator } from 'src/v2/messaging';
import { IAssetsRepository } from 'src/v2/repositories/IAssetsRepository';
Expand Down Expand Up @@ -38,23 +39,27 @@ export class AssetsService implements IAssetsService {
}

public async transferNativeAsset(param: ParamAssetTransfer): Promise<void> {
const useableBalance = await this.AssetsRepository.getNativeBalance(param.senderAddress);
const isBalanceEnough =
Number(ethers.utils.formatEther(useableBalance)) -
Number(ethers.utils.formatEther(param.amount)) >
REQUIRED_MINIMUM_BALANCE;
const isNativeToken = param.assetId === idAstarNativeToken;
// Memo: Check if the native token's remaining balance is enough to pay the transaction fee
if (isNativeToken) {
const useableBalance = await this.AssetsRepository.getNativeBalance(param.senderAddress);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AssetsRepository should be renamed to assetsRepository since it is a private variable

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in this commit

const isBalanceEnough =
Number(ethers.utils.formatEther(useableBalance)) -
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are unnecessary conversions here. The main reason for that is useableBalance and param.amount are strings. IMO using string for balances is not natural (more natural is bigint) and leads to increased code complexity.
You don't need to fix this now, but we should have this in mind for the future

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Noted, I've modified like this but we need to do some refactoring in the future.

Number(ethers.utils.formatEther(param.amount)) >
REQUIRED_MINIMUM_BALANCE;

if (isBalanceEnough) {
const transaction = await this.AssetsRepository.getNativeTransferCall(param);
const hash = await this.wallet.signAndSend({
extrinsic: transaction,
senderAddress: param.senderAddress,
successMessage: param.successMessage,
});
param.finalizedCallback(String(hash));
} else {
throw new Error(AlertMsg.MINIMUM_BALANCE);
if (!isBalanceEnough) {
throw new Error(AlertMsg.MINIMUM_BALANCE);
}
}

const transaction = await this.AssetsRepository.getNativeTransferCall(param);
const hash = await this.wallet.signAndSend({
extrinsic: transaction,
senderAddress: param.senderAddress,
successMessage: param.successMessage,
});
param.finalizedCallback(String(hash));
}

public async transferEvmAsset(param: ParamEvmTransfer): Promise<void> {
Expand Down
Loading