fix: handle non-checksummed EVM addresses in validateAddress (shapesh…

…ift#4466)
rabee198 · May 9, 2023 · a7ebe39 · a7ebe39
1 parent 600784e
commit a7ebe39
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/packages/chain-adapters/src/evm/EvmBaseAdapter.ts b/packages/chain-adapters/src/evm/EvmBaseAdapter.ts
@@ -12,7 +12,6 @@ import type { BIP44Params } from '@shapeshiftoss/types'
 import { KnownChainIds } from '@shapeshiftoss/types'
 import type * as unchained from '@shapeshiftoss/unchained-client'
 import { utils } from 'ethers'
-import WAValidator from 'multicoin-address-validator'
 import { numberToHex } from 'web3-utils'
 
 import type { ChainAdapter as IChainAdapter } from '../api'
@@ -35,12 +34,7 @@ import type {
   ValidAddressResult,
 } from '../types'
 import { ValidAddressResultType } from '../types'
-import {
-  chainIdToChainLabel,
-  getAssetNamespace,
-  toAddressNList,
-  toRootDerivationPath,
-} from '../utils'
+import { getAssetNamespace, toAddressNList, toRootDerivationPath } from '../utils'
 import { bnOrZero } from '../utils/bignumber'
 import type { avalanche, bnbsmartchain, ethereum, optimism, polygon } from '.'
 import type { BuildCustomTxInput, EstimateGasRequest, Fees, GasFeeDataEstimate } from './types'
@@ -461,8 +455,7 @@ export abstract class EvmBaseAdapter<T extends EvmChainId> implements IChainAdap
 
   // eslint-disable-next-line require-await
   async validateAddress(address: string): Promise<ValidAddressResult> {
-    const chainLabel = chainIdToChainLabel(this.chainId)
-    const isValidAddress = WAValidator.validate(address, chainLabel)
+    const isValidAddress = utils.isAddress(address)
     if (isValidAddress) return { valid: true, result: ValidAddressResultType.Valid }
     return { valid: false, result: ValidAddressResultType.Invalid }
   }

diff --git a/packages/chain-adapters/src/evm/ethereum/EthereumChainAdapter.test.ts b/packages/chain-adapters/src/evm/ethereum/EthereumChainAdapter.test.ts
@@ -243,12 +243,18 @@ describe('EthereumChainAdapter', () => {
   const invalidAddressTuple = { valid: false, result: ValidAddressResultType.Invalid }
 
   describe('validateAddress', () => {
-    it('should return true for a valid address', async () => {
+    it('should return true for a valid checksummed address', async () => {
       const adapter = new ethereum.ChainAdapter(makeChainAdapterArgs())
       const res = await adapter.validateAddress('0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96045')
       expect(res).toMatchObject(validAddressTuple)
     })
 
+    it('should return true for a valid lowercased address', async () => {
+      const adapter = new ethereum.ChainAdapter(makeChainAdapterArgs())
+      const res = await adapter.validateAddress('0xd8da6bf26964af9d7eed9e03e53415d37aa96045')
+      expect(res).toMatchObject(validAddressTuple)
+    })
+
     it('should return false for an empty address', async () => {
       const adapter = new ethereum.ChainAdapter(makeChainAdapterArgs())
       const res = await adapter.validateAddress('')