Skip to content

Commit

Permalink
replace Number.parseint instances
Browse files Browse the repository at this point in the history
  • Loading branch information
@TarikGul
TarikGul committed Aug 30, 2023
1 parent 01a717a commit 7f821be
Show file tree
Hide file tree
Showing 9 changed files with 79 additions and 79 deletions.
18 changes: 9 additions & 9 deletions src/AssetsTransferApi.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import type {
RuntimeDispatchInfoV1,
} from '@polkadot/types/interfaces';
import type { ISubmittableResult } from '@polkadot/types/types';
import BN from 'bn.js';

import {
RELAY_CHAIN_IDS,
Expand Down Expand Up @@ -62,6 +63,7 @@ import {
TxResult,
UnsignedTransaction,
} from './types';
import { validateNumber } from './validate';

/**
* Holds open an api connection to a specified chain within the ApiPromise in order to help
Expand Down Expand Up @@ -886,7 +888,7 @@ export class AssetsTransferApi {
opts: { paysWithFeeOrigin?: string; sendersAddr: string }
): Promise<`0x${string}`> => {
const { paysWithFeeOrigin, sendersAddr } = opts;
let assetId = 0;
let assetId = new BN(0);

// if a paysWithFeeOrigin is provided and the chain is of system origin
// we assign the assetId to the value of paysWithFeeOrigin
Expand All @@ -895,21 +897,21 @@ export class AssetsTransferApi {
);

if (paysWithFeeOrigin && isOriginSystemParachain) {
assetId = Number.parseInt(paysWithFeeOrigin);
const isNotANumber = Number.isNaN(assetId);
const isValidInt = validateNumber(paysWithFeeOrigin);

if (isNotANumber) {
if (!isValidInt) {
throw new BaseError(
`paysWithFeeOrigin value must be a valid number. Received: ${paysWithFeeOrigin}`,
BaseErrorsEnum.InvalidInput
);
}

assetId = new BN(paysWithFeeOrigin);
const isSufficient = await this.checkAssetIsSufficient(assetId);

if (!isSufficient) {
throw new BaseError(
`asset with assetId ${assetId} is not a sufficient asset to pay for fees`,
`asset with assetId ${assetId.toString()} is not a sufficient asset to pay for fees`,
BaseErrorsEnum.InvalidAsset
);
}
Expand Down Expand Up @@ -970,9 +972,7 @@ export class AssetsTransferApi {
* @param assetId number
* @returns Promise<boolean>
*/
private checkAssetIsSufficient = async (
assetId: number
): Promise<boolean> => {
private checkAssetIsSufficient = async (assetId: BN): Promise<boolean> => {
try {
const asset = (await this._api.query.assets.asset(assetId)).unwrap();

Expand All @@ -983,7 +983,7 @@ export class AssetsTransferApi {
return false;
} catch (err: unknown) {
throw new BaseError(
`assetId ${assetId} does not match a valid asset`,
`assetId ${assetId.toString()} does not match a valid asset`,
BaseErrorsEnum.InvalidAsset
);
}
Expand Down
16 changes: 7 additions & 9 deletions src/createXcmTypes/ParaToSystem.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import {
} from '../types';
import { getFeeAssetItemIndex } from '../util/getFeeAssetItemIndex';
import { normalizeArrToStr } from '../util/normalizeArrToStr';
import { validateNumber } from '../validate';
import type {
CreateAssetsOpts,
CreateFeeAssetItemOpts,
Expand Down Expand Up @@ -289,12 +290,11 @@ export const ParaToSystem: ICreateXcmType = {
const { registry } = opts;
const { xcAssets } = registry;
const { tokens: relayTokens } = registry.currentRelayRegistry['0'];
const parsedAssetIdAsNumber = Number.parseInt(assetId);
const isNotANumber = Number.isNaN(parsedAssetIdAsNumber);
const isValidInt = validateNumber(assetId);
const isRelayNative = isRelayNativeAsset(relayTokens, assetId);
const currentRelayChainSpecName = registry.relayChain;

if (!isRelayNative && isNotANumber) {
if (!isRelayNative && !isValidInt) {
assetId = await getAssetId(api, registry, assetId, specName);
}

Expand Down Expand Up @@ -407,10 +407,9 @@ const createXTokensMultiAssets = async (
const amount = amounts[i];
let assetId = assets[i];

const parsedAssetIdAsNumber = Number.parseInt(assetId);
const isNotANumber = Number.isNaN(parsedAssetIdAsNumber);
const isValidInt = validateNumber(assetId);

if (isNotANumber) {
if (!isValidInt) {
assetId = await getAssetId(api, registry, assetId, specName);
}

Expand Down Expand Up @@ -516,10 +515,9 @@ const createParaToSystemMultiAssets = async (
const amount = amounts[i];
let assetId = assets[i];

const parsedAssetIdAsNumber = Number.parseInt(assetId);
const isNotANumber = Number.isNaN(parsedAssetIdAsNumber);
const isValidInt = validateNumber(assetId);

if (isNotANumber) {
if (!isValidInt) {
assetId = await getAssetId(
api,
registry,
Expand Down
6 changes: 3 additions & 3 deletions src/createXcmTypes/SystemToPara.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import type { Registry } from '../registry';
import { MultiAsset } from '../types';
import { getFeeAssetItemIndex } from '../util/getFeeAssetItemIndex';
import { normalizeArrToStr } from '../util/normalizeArrToStr';
import { validateNumber } from '../validate';
import {
CreateAssetsOpts,
CreateFeeAssetItemOpts,
Expand Down Expand Up @@ -297,11 +298,10 @@ export const createSystemToParaMultiAssets = async (
let assetId: string = assets[i];
const amount = amounts[i];

const parsedAssetIdAsNumber = Number.parseInt(assetId);
const isNotANumber = Number.isNaN(parsedAssetIdAsNumber);
const isValidInt = validateNumber(assetId);
const isRelayNative = isRelayNativeAsset(tokens, assetId);

if (!isRelayNative && isNotANumber) {
if (!isRelayNative && !isValidInt) {
assetId = await getAssetId(
api,
registry,
Expand Down
22 changes: 10 additions & 12 deletions src/createXcmTypes/SystemToSystem.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import { BaseError, BaseErrorsEnum } from '../errors';
import type { Registry } from '../registry';
import { getFeeAssetItemIndex } from '../util/getFeeAssetItemIndex';
import { normalizeArrToStr } from '../util/normalizeArrToStr';
import { validateNumber } from '../validate';
import { MultiAsset } from './../types';
import {
CreateAssetsOpts,
Expand Down Expand Up @@ -289,20 +290,17 @@ export const createSystemToSystemMultiAssets = async (
let assetId: string = assets[i];
const amount = amounts[i];

const parsedAssetIdAsNumber = Number.parseInt(assetId);
const isNotANumber = Number.isNaN(parsedAssetIdAsNumber);
const isValidInt = validateNumber(assetId);
const isRelayNative = isRelayNativeAsset(tokens, assetId);

if (!isRelayNative) {
if (isNotANumber) {
assetId = await getAssetId(
api,
registry,
assetId,
specName,
isForeignAssetsTransfer
);
}
if (!isRelayNative && !isValidInt) {
assetId = await getAssetId(
api,
registry,
assetId,
specName,
isForeignAssetsTransfer
);
}

let concretMultiLocation: MultiLocation;
Expand Down
10 changes: 5 additions & 5 deletions src/createXcmTypes/util/getAssetId.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { ApiPromise } from '@polkadot/api';
import { ASSET_HUB_CHAIN_ID } from '../../consts';
import { BaseError, BaseErrorsEnum } from '../../errors';
import { Registry } from '../../registry';
import { validateNumber } from '../../validate';
import { foreignAssetMultiLocationIsInCacheOrRegistry } from './foreignAssetMultiLocationIsInCacheOrRegistry';
import { foreignAssetsMultiLocationExists } from './foreignAssetsMultiLocationExists';
import { getChainIdBySpecName } from './getChainIdBySpecName';
Expand All @@ -29,8 +30,7 @@ export const getAssetId = async (
isForeignAssetsTransfer?: boolean
): Promise<string> => {
const currentChainId = getChainIdBySpecName(registry, specName);
const parsedAssetAsNumber = Number.parseInt(asset);
const assetIsNumber = !Number.isNaN(parsedAssetAsNumber);
const assetIsValidInt = validateNumber(asset);
const isParachain = parseInt(currentChainId) >= 2000;

// if assets pallet, check the cache and return the cached assetId if found
Expand All @@ -56,7 +56,7 @@ export const getAssetId = async (
}
}
// check number assetId in registry
if (assetIsNumber) {
if (assetIsValidInt) {
// if assetId index is valid, return the assetId
if (assetsInfo[asset] && assetsInfo[asset].length > 0) {
return asset;
Expand Down Expand Up @@ -105,7 +105,7 @@ export const getAssetId = async (
const { tokens } = registry.currentRelayRegistry[ASSET_HUB_CHAIN_ID];

assetId = tokens[0];
} else if (assetIsNumber) {
} else if (assetIsValidInt) {
const maybeAsset = await _api.query.assets.asset(asset);

if (maybeAsset.isSome) {
Expand All @@ -130,7 +130,7 @@ export const getAssetId = async (
);
}
} else if (isParachain) {
if (!assetIsNumber) {
if (!assetIsValidInt) {
// if not assetHub and assetId isnt a number, query the parachain chain for the asset symbol
const parachainAssets = await _api.query.assets.asset.entries();

Expand Down
21 changes: 9 additions & 12 deletions src/createXcmTypes/util/sortMultiAssetsAscending.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@

import { JunctionV1 } from '@polkadot/types/interfaces';
import { ITuple } from '@polkadot/types-codec/types';
import { BN } from 'bn.js';

import { MultiAsset, XcmMultiAsset } from '../../types';
import { validateNumber } from '../../validate';

/**
* This sorts a list of multiassets in ascending order based on their id.
Expand Down Expand Up @@ -192,22 +194,17 @@ const getSortOrderForX2ThroughX8 = (
// if the junctions are the same type but not equal
// we compare the inner values in order to determine sort order
if (junctionA.type === junctionB.type && !junctionA.eq(junctionB)) {
const junctionAValueAsNumber = Number.parseInt(
junctionA.value.toString()
);
const junctionAIsNotANumber = Number.isNaN(junctionAValueAsNumber);

const junctionBValueAsNumber = Number.parseInt(
junctionB.value.toString()
);
const junctionBIsNotANumber = Number.isNaN(junctionBValueAsNumber);
const junctionAIsValidInt = validateNumber(junctionA.value.toString());
const junctionBIsValidInt = validateNumber(junctionB.value.toString());

// compare number values if both junction values are valid integers
// otherwise compare the lexicographical values
if (!junctionAIsNotANumber && !junctionBIsNotANumber) {
if (junctionAValueAsNumber < junctionBValueAsNumber) {
if (junctionAIsValidInt && junctionBIsValidInt) {
const junctionAValueAsBN = new BN(junctionA.value.toString());
const junctionBValueAsBN = new BN(junctionB.value.toString());
if (junctionAValueAsBN.lt(junctionBValueAsBN)) {
return -1;
} else if (junctionAValueAsNumber > junctionBValueAsNumber) {
} else if (junctionAValueAsBN.gt(junctionBValueAsBN)) {
return 1;
}
} else {
Expand Down
37 changes: 14 additions & 23 deletions src/errors/checkXcmTxInputs.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import { Registry } from '../registry';
import type { ChainInfo, ChainInfoKeys } from '../registry/types';
import { XCMChainInfoKeys } from '../registry/types';
import { AssetInfo, Direction } from '../types';
import { validateNumber } from '../validate';
import { BaseError, BaseErrorsEnum } from './BaseError';

/**
Expand Down Expand Up @@ -377,11 +378,8 @@ export const checkLiquidTokenValidity = async (
systemParachainInfo: ChainInfoKeys,
assetId: string
) => {
// check if assetId is a number
const parsedAssetIdAsNumber = Number.parseInt(assetId);
const invalidNumber = Number.isNaN(parsedAssetIdAsNumber);

if (invalidNumber) {
const isValidInt = validateNumber(assetId);
if (!isValidInt) {
throw new BaseError(
`Liquid Tokens must be valid Integers`,
BaseErrorsEnum.InvalidAsset
Expand Down Expand Up @@ -475,11 +473,9 @@ const checkSystemAssets = async (
} else if (isLiquidTokenTransfer) {
await checkLiquidTokenValidity(api, registry, systemParachainInfo, assetId);
} else {
// check if assetId is a number
const parsedAssetIdAsNumber = Number.parseInt(assetId);
const invalidNumber = Number.isNaN(parsedAssetIdAsNumber);
const isValidInt = validateNumber(assetId);

if (!invalidNumber) {
if (isValidInt) {
let assetSymbol: string | undefined;

// check the cache for the asset
Expand All @@ -492,7 +488,7 @@ const checkSystemAssets = async (

if (!assetSymbol) {
// if asset is not in cache or registry, query the assets pallet to see if it has a value
const asset = await api.query.assets.asset(parsedAssetIdAsNumber);
const asset = await api.query.assets.asset(assetId);

// if asset is found in the assets pallet, return LocalTxType Assets
if (asset.isNone) {
Expand All @@ -501,9 +497,7 @@ const checkSystemAssets = async (
BaseErrorsEnum.AssetNotFound
);
} else {
const assetSymbol = (
await api.query.assets.metadata(parsedAssetIdAsNumber)
).symbol
const assetSymbol = (await api.query.assets.metadata(assetId)).symbol
.toHuman()
?.toString();

Expand Down Expand Up @@ -614,11 +608,9 @@ export const checkParaAssets = async (
const { xcAssets } = registry;
const currentRelayChainSpecName = registry.relayChain;

// check if assetId is a number
const parsedAssetIdAsNumber = Number.parseInt(assetId);
const invalidNumber = Number.isNaN(parsedAssetIdAsNumber);
const isValidInt = validateNumber(assetId);

if (!invalidNumber) {
if (isValidInt) {
// query the parachains assets pallet to see if it has a value matching the assetId
const asset = await api.query.assets.asset(assetId);

Expand Down Expand Up @@ -666,11 +658,12 @@ export const checkParaAssets = async (
} else {
// not a valid number
// check if id is a valid token symbol of the system parachain chain
if (!invalidNumber) {
// TODO: Im confused about this, clarify this logic.
if (isValidInt) {
// if assetId is not in registry cache, query for the asset
if (!registry.cacheLookupAsset(assetId)) {
// query the parachains assets pallet to see if it has a value matching the assetId
const asset = await api.query.assets.asset(parsedAssetIdAsNumber);
const asset = await api.query.assets.asset(assetId);

if (asset.isNone) {
throw new BaseError(
Expand Down Expand Up @@ -939,10 +932,8 @@ export const checkAssetIdsAreOfSameAssetIdType = (assetIds: string[]) => {
continue;
}

const parsedAssetIdAsNumber = Number.parseInt(assetId);
const isNotANumber = Number.isNaN(parsedAssetIdAsNumber);

if (!isNotANumber) {
const isValidInt = validateNumber(assetId);
if (isValidInt) {
integerAssetIdFound = assetId;
} else if (assetId.toLowerCase().includes('parents')) {
multiLocationAssetIdFound = assetId;
Expand Down
Loading

0 comments on commit 7f821be

Please sign in to comment.