Skip to content

[Issue-194] Fix bug duplicate import brc-20 #205

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.

Sign up for GitHub

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

Merged
saltict merged 1 commit into from
Jun 25, 2024
Merged

[Issue-194] Fix bug duplicate import brc-20 #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 1 addition & 3 deletions packages/extension-base/src/services/chain-service/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1924,9 +1924,7 @@ export class ChainService {
let existedToken: _ChainAsset | undefined;

for (const token of Object.values(assetRegistry)) {
const ticker = token?.slug;

if (ticker === data.ticker && token.assetType === data.type && token.originChain === data.originChain) {
if (token?.symbol === data.ticker && token?.assetType === data.type && token?.originChain === data.originChain) {
existedToken = token;
break;
}
Expand Down
14 changes: 14 additions & 0 deletions packages/extension-base/src/services/hiro-service/utils/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,3 +86,17 @@ export function getPreviewUrl (inscriptionId: string) {
throw error;
}
}

export function isValidBrc20Ticker (ticker: string) {
const bytesLength = getByteLength(ticker);

return bytesLength === 4 || bytesLength === 5;
}

function getByteLength (str: string): number {
const encoder = new TextEncoder();
const encodedStr = encoder.encode(str);

// Return the length of the encoded array, which represents the number of bytes
return encodedStr.length;
}
10 changes: 7 additions & 3 deletions packages/extension-base/src/services/rune-service/utils/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,17 @@ export async function getAllCollectionRunes (isTestnet = false) {
}
}

export async function getRuneMetadata (runeid: string, isTestnet = false) {
export async function getRuneMetadata (runeId: string, isTestnet = false) {
const runeService = RunesService.getInstance(isTestnet);

try {
return await runeService.getRuneMetadata(runeid);
return await runeService.getRuneMetadata(runeId);
} catch (error) {
console.error(`Failed to get rune ${runeid} metadata`, error);
console.error(`Failed to get rune ${runeId} metadata`, error);
throw error;
}
}

export function isValidRuneId (runeId: string) {
return runeId.includes(':');
}
11 changes: 6 additions & 5 deletions packages/extension-koni-ui/src/Popup/Settings/Tokens/FungibleTokenImport.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@

import { _AssetType, _ChainInfo } from '@subwallet/chain-list/types';
import { _getTokenTypesSupportedByChain, _isChainTestNet, _parseMetadataForBrc20Asset, _parseMetadataForRuneAsset, _parseMetadataForSmartContractAsset } from '@subwallet/extension-base/services/chain-service/utils';
import { isValidBrc20Ticker } from '@subwallet/extension-base/services/hiro-service/utils';
import { isValidRuneId } from '@subwallet/extension-base/services/rune-service/utils';
import { isValidSubstrateAddress } from '@subwallet/extension-base/utils';
import { AddressInput, ChainSelector, Layout, PageWrapper, TokenTypeSelector } from '@subwallet/extension-koni-ui/components';
import { DataContext } from '@subwallet/extension-koni-ui/contexts/DataContext';
import { useChainChecker, useDefaultNavigate, useGetChainPrefixBySlug, useGetFungibleContractSupportedChains, useNotification, useTranslation } from '@subwallet/extension-koni-ui/hooks';
import { upsertCustomToken, validateCustomBrc20, validateCustomRune, validateCustomToken } from '@subwallet/extension-koni-ui/messaging';
import { FormCallbacks, FormRule, Theme, ThemeProps } from '@subwallet/extension-koni-ui/types';
import { convertFieldToError, convertFieldToObject, reformatAddress, simpleCheckForm } from '@subwallet/extension-koni-ui/utils';
import { isBitcoinAddress } from '@subwallet/keyring';
import { Col, Field, Form, Icon, Input, Row } from '@subwallet/react-ui';
import SwAvatar from '@subwallet/react-ui/es/sw-avatar';
import { PlusCircle } from 'phosphor-react';
Expand Down Expand Up @@ -114,11 +115,12 @@ function Component ({ className = '' }: Props): React.ReactElement<Props> {
const selectedTokenType = getFieldValue('type') as _AssetType;
const isValidEvmContract = [_AssetType.ERC20].includes(selectedTokenType) && isEthereumAddress(inputMetadata);
const isValidWasmContract = [_AssetType.PSP22].includes(selectedTokenType) && isValidSubstrateAddress(inputMetadata);
const isValidRune = [_AssetType.RUNE].includes(selectedTokenType) && isBitcoinAddress(inputMetadata);
const isValidBrc20 = [_AssetType.BRC20].includes(selectedTokenType) && isBitcoinAddress(inputMetadata);
const reformattedContractAddress = reformatAddress(inputMetadata, chainNetworkPrefix);
const isValidRune = [_AssetType.RUNE].includes(selectedTokenType) && isValidRuneId(inputMetadata);
const isValidBrc20 = [_AssetType.BRC20].includes(selectedTokenType) && isValidBrc20Ticker(inputMetadata);

if (isValidEvmContract || isValidWasmContract) {
const reformattedContractAddress = reformatAddress(inputMetadata, chainNetworkPrefix);

setLoading(true);
validateCustomToken({
contractAddress: reformattedContractAddress,
Expand Down Expand Up @@ -158,7 +160,6 @@ function Component ({ className = '' }: Props): React.ReactElement<Props> {
type: selectedTokenType
})
.then((validationResult) => {
console.log('validationResult');
setLoading(false);

if (validationResult.isExist) {
Expand Down