@across-protocol/sdk 4.2.16-alpha.3 → 4.2.16-alpha.5

package/src/utils/TokenUtils.ts

@@ -1,12 +1,13 @@
+import assert from "assert";
 import { BlockTag } from "@ethersproject/abstract-provider";
 import { Contract, providers, Signer } from "ethers";
 import * as constants from "../constants";
-import { L1TokenInfo, TokenInfo } from "../interfaces";
+import { TokenInfo } from "../interfaces";
 import { ERC20__factory } from "../typechain";
 import { BigNumber } from "./BigNumberUtils";
 import { getNetworkName, chainIsL1, chainIsProd } from "./NetworkUtils";
 import { isDefined } from "./TypeGuards";
-import { compareAddressesSimple, toAddressType } from "./AddressUtils";
+import { compareAddressesSimple, EvmAddress, toAddressType } from "./AddressUtils";
 const { TOKEN_SYMBOLS_MAP, CHAIN_IDs, TOKEN_EQUIVALENCE_REMAPPING } = constants;
 
 type SignerOrProvider = providers.Provider | Signer;
@@ -14,7 +15,7 @@ type SignerOrProvider = providers.Provider | Signer;
 export async function fetchTokenInfo(address: string, signerOrProvider: SignerOrProvider): Promise<TokenInfo> {
   const token = new Contract(address, ERC20__factory.abi, signerOrProvider);
   const [symbol, decimals] = await Promise.all([token.symbol(), token.decimals()]);
-  return { address: toAddressType(address, CHAIN_IDs.MAINNET), symbol, decimals };
+  return { address: EvmAddress.from(address), symbol, decimals };
 }
 
 export const getL2TokenAddresses = (
@@ -42,9 +43,10 @@ export function resolveSymbolOnChain(chainId: number, symbol: string): TokenInfo
   }
 
   const { decimals, addresses } = token;
-  const address = addresses[chainId];
+  const address = toAddressType(addresses[chainId], chainId);
+  assert(address.isEVM() || address.isSVM());
 
-  return { symbol, decimals, address: toAddressType(address, chainId) };
+  return { symbol, decimals, address };
 }
 
 /**
@@ -111,7 +113,7 @@ export function isStablecoin(tokenSymbol: string): boolean {
  * @param tokenMapping
  * @returns
  */
-export function getTokenInfo(l2TokenAddress: string, chainId: number, tokenMapping = TOKEN_SYMBOLS_MAP): L1TokenInfo {
+export function getTokenInfo(l2TokenAddress: string, chainId: number, tokenMapping = TOKEN_SYMBOLS_MAP): TokenInfo {
   const parsedAddress = toAddressType(l2TokenAddress, chainId).toNative();
 
   // @dev This might give false positives if tokens on different networks have the same address. I'm not sure how