feat: cw20 addr validation

InjectiveLabs · Sep 22, 2023 · c4332e0 · c4332e0
1 parent d7f79d8
commit c4332e0
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 11 deletions.
diff --git a/packages/sdk-ts/src/utils/address.ts b/packages/sdk-ts/src/utils/address.ts
@@ -100,3 +100,6 @@ export const getChecksumAddress = (ethAddress: string) => {
 
   return checksumAddress
 }
+
+export const isCw20ContractAddress = (address: string) =>
+  address.length === 42 && address.startsWith('inj')
diff --git a/packages/sdk-ui-ts/src/denom/DenomClientAsync.ts b/packages/sdk-ui-ts/src/denom/DenomClientAsync.ts
@@ -9,10 +9,11 @@ import {
   fromUtf8,
   DenomClient,
   InsuranceFund,
+  ChainGrpcIbcApi,
   ChainGrpcBankApi,
   ChainGrpcWasmApi,
+  isCw20ContractAddress,
   ChainGrpcInsuranceFundApi,
-  ChainGrpcIbcApi,
 } from '@injectivelabs/sdk-ts'
 import { Web3Client } from '../services/web3/Web3Client'
 import type { Token } from '@injectivelabs/token-metadata'
@@ -116,9 +117,7 @@ export class DenomClientAsync {
       return getTokenFromAlchemyTokenMetaResponse(denom, response)
     }
 
-    const isCW20 = denom.startsWith('inj')
-
-    if (isCW20) {
+    if (isCw20ContractAddress(denom)) {
       const contractAddress = denom
 
       const response = await this.chainWasmApi.fetchContractState({
@@ -137,7 +136,7 @@ export class DenomClientAsync {
       const tokenFactoryAddress = denom.split('/')[2]
 
       // CW20 contract (ex: from Wormhole)
-      if (tokenFactoryAddress.startsWith('inj')) {
+      if (isCw20ContractAddress(tokenFactoryAddress)) {
         const response = await this.chainWasmApi.fetchContractState({
           contractAddress: tokenFactoryAddress,
           pagination: {
@@ -218,7 +217,9 @@ export class DenomClientAsync {
       return this.metadatas.find((metadata) => metadata.base === denom)
     }
 
-    const { metadatas } = await this.chainBankApi.fetchDenomsMetadata({ limit: 1000 })
+    const { metadatas } = await this.chainBankApi.fetchDenomsMetadata({
+      limit: 1000,
+    })
 
     this.metadatas = metadatas
 

diff --git a/packages/token-metadata/src/TokenFactory.ts b/packages/token-metadata/src/TokenFactory.ts
@@ -11,7 +11,7 @@ import {
 } from './tokens/network'
 import { Token, TokenMeta, TokenType } from './types'
 import tokensBySymbol from './tokens/tokens'
-import { getTokenFromMeta } from './utils'
+import { getTokenFromMeta, isCw20ContractAddress } from './utils'
 
 export class TokenFactory {
   public tokenMetaUtils: TokenMetaUtils
@@ -129,7 +129,7 @@ export class TokenFactory {
   }
 
   getCw20DenomTokenMeta(address: string): TokenMeta | undefined {
-    if (!address.startsWith('inj')) {
+    if (!isCw20ContractAddress(address)) {
       throw new GeneralException(
         new Error(`The address ${address} is not a valid CW20 address`),
       )
@@ -151,7 +151,7 @@ export class TokenFactory {
       )
     }
 
-    if (address.startsWith('inj') && address.length === 42) {
+    if (isCw20ContractAddress(address)) {
       const tokenMeta = this.tokenMetaUtils.getMetaByAddress(address)
 
       return tokenMeta

diff --git a/packages/token-metadata/src/utils.ts b/packages/token-metadata/src/utils.ts
@@ -48,7 +48,7 @@ export const getTokenTypeFromDenom = (denom: string) => {
     return TokenType.Native
   }
 
-  if (denom.startsWith('inj')) {
+  if (isCw20ContractAddress(denom)) {
     return TokenType.Cw20
   }
 
@@ -94,7 +94,7 @@ export const getTokenDecimals = (token: Token) => {
     return token.decimals
   }
 
-  if (token.denom.startsWith('inj')) {
+  if (isCw20ContractAddress(token.denom)) {
     return token.cw20?.decimals || token.decimals
   }
 
@@ -288,3 +288,6 @@ export const getUnknownTokenWithSymbol = (denom: string): Token => {
     tokenVerification: TokenVerification.Unverified,
   } as Token
 }
+
+export const isCw20ContractAddress = (address: string) =>
+  address.length === 42 && address.startsWith('inj')