Merge pull request #169 from vic-en/fix/uniswap_token_address

Fix/uniswap token address

src/chains/ethereum/ethereum-base.ts

@@ -18,6 +18,7 @@ import fse from 'fs-extra';
 import { ConfigManagerCertPassphrase } from '../../services/config-manager-cert-passphrase';
 import { logger } from '../../services/logger';
 import { ReferenceCountingCloseable } from '../../services/refcounting-closeable';
+import { getAddress } from 'ethers/lib/utils';
 
 // information about an Ethereum token
 export interface TokenInfo {
@@ -153,15 +154,19 @@ export class EthereumBase {
     tokenListSource: string,
     tokenListType: TokenListType
   ): Promise<TokenInfo[]> {
-    let tokens;
+    let tokens: TokenInfo[];
     if (tokenListType === 'URL') {
       ({
         data: { tokens },
       } = await axios.get(tokenListSource));
     } else {
       ({ tokens } = JSON.parse(await fs.readFile(tokenListSource, 'utf8')));
     }
-    return tokens;
+    const mappedTokens: TokenInfo[] = tokens.map((token) => {
+      token.address = getAddress(token.address);
+      return token;
+    });
+    return mappedTokens;
   }
 
   public get nonceManager() {

src/connectors/defira/defira.ts

@@ -21,6 +21,7 @@ import { logger } from '../../services/logger';
 import { percentRegexp } from '../../services/config-manager-v2';
 import { Harmony } from '../../chains/harmony/harmony';
 import { ExpectedTrade, Uniswapish } from '../../services/common-interfaces';
+import { getAddress } from 'ethers/lib/utils';
 
 export class Defira implements Uniswapish {
   private static _instances: { [name: string]: Defira };
@@ -65,7 +66,7 @@ export class Defira implements Uniswapish {
    * @param address Token address
    */
   public getTokenByAddress(address: string): Token {
-    return this.tokenList[address];
+    return this.tokenList[getAddress(address)];
   }
 
   public async init() {

src/connectors/openocean/openocean.ts

@@ -28,6 +28,7 @@ import {
   UNKNOWN_ERROR_ERROR_CODE,
   UNKNOWN_ERROR_MESSAGE,
 } from '../../services/error-handler';
+import { getAddress } from 'ethers/lib/utils';
 
 export function newFakeTrade(
   tokenIn: Token,
@@ -110,7 +111,7 @@ export class Openocean implements Uniswapish {
    * @param address Token address
    */
   public getTokenByAddress(address: string): Token {
-    return this.tokenList[address];
+    return this.tokenList[getAddress(address)];
   }
 
   public async init() {

src/connectors/pancakeswap/pancakeswap.ts

@@ -29,6 +29,7 @@ import { logger } from '../../services/logger';
 import { isFractionString } from '../../services/validators';
 import { PancakeSwapConfig } from './pancakeswap.config';
 import routerAbi from './pancakeswap_router_abi.json';
+import { getAddress } from 'ethers/lib/utils';
 
 export class PancakeSwap implements Uniswapish {
   private static _instances: { [name: string]: PancakeSwap };
@@ -91,7 +92,7 @@ export class PancakeSwap implements Uniswapish {
    * @param address Token address
    */
   public getTokenByAddress(address: string): Token {
-    return this.tokenList[address];
+    return this.tokenList[getAddress(address)];
   }
 
   /**

src/connectors/pangolin/pangolin.ts

@@ -23,6 +23,7 @@ import {
 import { logger } from '../../services/logger';
 import { Avalanche } from '../../chains/avalanche/avalanche';
 import { ExpectedTrade, Uniswapish } from '../../services/common-interfaces';
+import { getAddress } from 'ethers/lib/utils';
 
 export class Pangolin implements Uniswapish {
   private static _instances: { [name: string]: Pangolin };
@@ -63,7 +64,7 @@ export class Pangolin implements Uniswapish {
    * @param address Token address
    */
   public getTokenByAddress(address: string): Token {
-    return this.tokenList[address];
+    return this.tokenList[getAddress(address)];
   }
 
   public async init() {

src/connectors/perp/perp.ts

@@ -23,6 +23,7 @@ import { logger } from '../../services/logger';
 import { percentRegexp } from '../../services/config-manager-v2';
 import { Ethereum } from '../../chains/ethereum/ethereum';
 import { Perpish } from '../../services/common-interfaces';
+import { getAddress } from 'ethers/lib/utils';
 
 export interface PerpPosition {
   positionAmt: string;
@@ -88,7 +89,7 @@ export class Perp implements Perpish {
    * @param address Token address
    */
   public getTokenByAddress(address: string): Token {
-    return this.tokenList[address];
+    return this.tokenList[getAddress(address)];
   }
 
   public async init() {

src/connectors/quickswap/quickswap.ts

@@ -22,6 +22,7 @@ import {
 import { logger } from '../../services/logger';
 import { Polygon } from '../../chains/polygon/polygon';
 import { ExpectedTrade, Uniswapish } from '../../services/common-interfaces';
+import { getAddress } from 'ethers/lib/utils';
 
 export class Quickswap implements Uniswapish {
   private static _instances: { [name: string]: Quickswap };
@@ -62,7 +63,7 @@ export class Quickswap implements Uniswapish {
    * @param address Token address
    */
   public getTokenByAddress(address: string): Token {
-    return this.tokenList[address];
+    return this.tokenList[getAddress(address)];
   }
 
   public async init() {

src/connectors/sushiswap/sushiswap.ts

@@ -31,6 +31,7 @@ import {
 } from 'ethers';
 import { percentRegexp } from '../../services/config-manager-v2';
 import { logger } from '../../services/logger';
+import { getAddress } from 'ethers/lib/utils';
 
 export class Sushiswap implements Uniswapish {
   private static _instances: { [name: string]: Sushiswap };
@@ -83,7 +84,7 @@ export class Sushiswap implements Uniswapish {
    * @param address Token address
    */
   public getTokenByAddress(address: string): Token {
-    return this.tokenList[address];
+    return this.tokenList[getAddress(address)];
   }
 
   public async init() {

src/connectors/traderjoe/traderjoe.ts

@@ -22,6 +22,7 @@ import {
 import { EVMTxBroadcaster } from '../../chains/ethereum/evm.broadcaster';
 import { createPublicClient, http } from 'viem';
 import { avalanche, avalancheFuji } from 'viem/chains';
+import { getAddress } from 'ethers/lib/utils';
 
 const MAX_HOPS = 2;
 const BASES = ['USDT', 'USDC', 'WAVAX'];
@@ -71,7 +72,7 @@ export class Traderjoe implements Uniswapish {
    * @param address Token address
    */
   public getTokenByAddress(address: string): Token {
-    return this.tokenList[address];
+    return this.tokenList[getAddress(address)];
   }
 
   public async init() {

src/connectors/uniswap/uniswap.lp.helper.ts

@@ -18,6 +18,7 @@ import {
   ReduceLiquidityData,
 } from './uniswap.lp.interfaces';
 import * as math from 'mathjs';
+import { getAddress } from 'ethers/lib/utils';
 
 export class UniswapLPHelper {
   protected ethereum: Ethereum;
@@ -96,7 +97,7 @@ export class UniswapLPHelper {
    * @param address Token address
    */
   public getTokenByAddress(address: string): Token {
-    return this.tokenList[address];
+    return this.tokenList[getAddress(address)];
   }
 
   public async init() {

src/connectors/uniswap/uniswap.ts

@@ -39,6 +39,7 @@ import { percentRegexp } from '../../services/config-manager-v2';
 import { Ethereum } from '../../chains/ethereum/ethereum';
 import { Polygon } from '../../chains/polygon/polygon';
 import { ExpectedTrade, Uniswapish } from '../../services/common-interfaces';
+import { getAddress } from 'ethers/lib/utils';
 
 export class Uniswap implements Uniswapish {
   private static _instances: { [name: string]: Uniswap };
@@ -107,7 +108,7 @@ export class Uniswap implements Uniswapish {
    * @param address Token address
    */
   public getTokenByAddress(address: string): Token {
-    return this.tokenList[address];
+    return this.tokenList[getAddress(address)];
   }
 
   public async init() {