fix: Sync constants imports (#1078)

Export directly from src/utils/index.ts so that we don't end up with
stale references to contracts-v2.

scripts/utils.ts

@@ -1,10 +1,9 @@
 import assert from "assert";
 import { Contract, ethers, utils as ethersUtils } from "ethers";
 import readline from "readline";
-import { CHAIN_IDs } from "@across-protocol/constants-v2";
 import * as contracts from "@across-protocol/contracts-v2";
 import { utils as sdkUtils } from "@across-protocol/sdk-v2";
-import { getDeployedContract, getNodeUrlList } from "../src/utils";
+import { getDeployedContract, getNodeUrlList, CHAIN_IDs } from "../src/utils";
 
 export type ERC20 = {
   address: string;

src/clients/AcrossAPIClient.ts

@@ -1,8 +1,7 @@
 import _ from "lodash";
 import axios, { AxiosError } from "axios";
-import { TOKEN_SYMBOLS_MAP, CHAIN_IDs } from "@across-protocol/constants-v2";
-import { bnZero, isDefined, winston, BigNumber, getL2TokenAddresses } from "../utils";
 import { SpokePoolClientsByChain } from "../interfaces";
+import { bnZero, isDefined, winston, BigNumber, getL2TokenAddresses, CHAIN_IDs, TOKEN_SYMBOLS_MAP } from "../utils";
 import { HubPoolClient } from "./HubPoolClient";
 
 export interface DepositLimits {

src/clients/InventoryClient.ts

@@ -1,4 +1,3 @@
-import { TOKEN_SYMBOLS_MAP } from "@across-protocol/constants-v2";
 import {
   bnZero,
   BigNumber,
@@ -14,6 +13,7 @@ import {
   TransactionResponse,
   AnyObject,
   ERC20,
+  TOKEN_SYMBOLS_MAP,
 } from "../utils";
 import { HubPoolClient, TokenClient, BundleDataClient } from ".";
 import { AdapterManager, CrossChainTransferClient } from "./bridges";

src/clients/ProfitClient.ts

@@ -8,7 +8,6 @@ import {
   typeguards,
   utils as sdkUtils,
 } from "@across-protocol/sdk-v2";
-import { TOKEN_SYMBOLS_MAP, CHAIN_IDs } from "@across-protocol/constants-v2";
 import * as constants from "../common/Constants";
 import {
   assert,
@@ -26,6 +25,8 @@ import {
   toBNWei,
   toBN,
   assign,
+  CHAIN_IDs,
+  TOKEN_SYMBOLS_MAP,
 } from "../utils";
 import { Deposit, DepositWithBlock, L1Token, SpokePoolClientsByChain } from "../interfaces";
 import { HubPoolClient } from ".";

src/clients/bridges/ArbitrumAdapter.ts

@@ -14,12 +14,13 @@ import {
   paginatedEventQuery,
   Event,
   assert,
+  CHAIN_IDs,
+  TOKEN_SYMBOLS_MAP,
 } from "../../utils";
 import { SpokePoolClient } from "../../clients";
 import { BaseAdapter } from "./BaseAdapter";
 import { SortableEvent, OutstandingTransfers } from "../../interfaces";
 import { CONTRACT_ADDRESSES } from "../../common";
-import { TOKEN_SYMBOLS_MAP, CHAIN_IDs } from "@across-protocol/constants-v2";
 
 // TODO: Move to ../../common/ContractAddresses.ts
 // These values are obtained from Arbitrum's gateway router contract.

src/clients/bridges/BaseAdapter.ts

@@ -1,5 +1,4 @@
 /* eslint-disable @typescript-eslint/ban-types */
-import { constants as sdkConstants } from "@across-protocol/sdk-v2";
 import { Provider } from "@ethersproject/abstract-provider";
 import { Signer } from "@ethersproject/abstract-signer";
 import { AugmentedTransaction, SpokePoolClient, TransactionClient } from "../../clients";
@@ -27,6 +26,7 @@ import {
   winston,
   createFormatFunction,
   BigNumberish,
+  TOKEN_SYMBOLS_MAP,
 } from "../../utils";
 
 import { CONTRACT_ADDRESSES } from "../../common";
@@ -42,8 +42,6 @@ interface Events {
   };
 }
 
-const { TOKEN_SYMBOLS_MAP } = sdkConstants;
-
 // TODO: make these generic arguments to BaseAdapter.
 type SupportedL1Token = string;
 type SupportedTokenSymbol = string;

src/clients/bridges/PolygonAdapter.ts

@@ -12,12 +12,13 @@ import {
   ZERO_ADDRESS,
   spreadEventWithBlockNumber,
   paginatedEventQuery,
+  CHAIN_IDs,
+  TOKEN_SYMBOLS_MAP,
 } from "../../utils";
 import { SpokePoolClient } from "../../clients";
 import { BaseAdapter } from "./";
 import { SortableEvent, OutstandingTransfers } from "../../interfaces";
 import { CONTRACT_ADDRESSES } from "../../common";
-import { TOKEN_SYMBOLS_MAP, CHAIN_IDs } from "@across-protocol/constants-v2";
 
 // ether bridge = 0x8484Ef722627bf18ca5Ae6BcF031c23E6e922B30
 // erc20 bridge = 0x40ec5B33f54e0E8A33A975908C5BA1c14e5BbbDf

src/clients/bridges/ZKSyncAdapter.ts

@@ -10,12 +10,12 @@ import {
   Event,
   ZERO_ADDRESS,
   getTokenAddress,
+  TOKEN_SYMBOLS_MAP,
 } from "../../utils";
 import { SpokePoolClient } from "../SpokePoolClient";
 import assert from "assert";
 import * as zksync from "zksync-web3";
 import { CONTRACT_ADDRESSES } from "../../common";
-import { TOKEN_SYMBOLS_MAP } from "@across-protocol/contracts-v2";
 import { isDefined } from "../../utils/TypeGuards";
 import { gasPriceOracle, utils } from "@across-protocol/sdk-v2";
 import { zkSync as zkSyncUtils } from "../../utils/chains";

src/clients/bridges/op-stack/OpStackAdapter.ts

@@ -10,18 +10,16 @@ import {
   spreadEventWithBlockNumber,
   assign,
   winston,
+  TOKEN_SYMBOLS_MAP,
 } from "../../../utils";
 import { SpokePoolClient } from "../..";
 import { BaseAdapter } from "..";
 import { SortableEvent, OutstandingTransfers } from "../../../interfaces";
 import { CONTRACT_ADDRESSES } from "../../../common";
-import { constants } from "@across-protocol/sdk-v2";
 import { OpStackBridge } from "./OpStackBridgeInterface";
 import { WethBridge } from "./WethBridge";
 import { DefaultERC20Bridge } from "./DefaultErc20Bridge";
 
-const { TOKEN_SYMBOLS_MAP } = constants;
-
 export class OpStackAdapter extends BaseAdapter {
   public l2Gas: number;
   private readonly defaultBridge: OpStackBridge;

src/clients/bridges/op-stack/optimism/OptimismAdapter.ts

@@ -1,9 +1,7 @@
-import { winston } from "../../../../utils";
+import { winston, TOKEN_SYMBOLS_MAP } from "../../../../utils";
 import { SpokePoolClient } from "../../..";
 import { BaseAdapter } from "../..";
-import { constants } from "@across-protocol/sdk-v2";
 import { OpStackAdapter } from "../OpStackAdapter";
-const { TOKEN_SYMBOLS_MAP } = constants;
 import { DaiOptimismBridge } from "./DaiOptimismBridge";
 import { SnxOptimismBridge } from "./SnxOptimismBridge";
 

src/utils/AddressUtils.ts

@@ -1,4 +1,4 @@
-import { TOKEN_SYMBOLS_MAP } from "@across-protocol/contracts-v2";
+import { TOKEN_SYMBOLS_MAP } from "@across-protocol/constants-v2";
 import { BigNumber, ethers } from ".";
 
 export function compareAddresses(addressA: string, addressB: string): 1 | -1 | 0 {

src/utils/TokenUtils.ts

@@ -1,8 +1,8 @@
 import { constants, utils } from "@across-protocol/sdk-v2";
 import { CONTRACT_ADDRESSES } from "../common";
 import { BigNumberish, utils as ethersUtils } from "ethers";
+import { CHAIN_IDs, TOKEN_SYMBOLS_MAP } from "@across-protocol/constants-v2";
 const { ZERO_ADDRESS } = constants;
-import { TOKEN_SYMBOLS_MAP, CHAIN_IDs } from "@across-protocol/constants-v2";
 
 export const { fetchTokenInfo } = utils;
 

src/utils/index.ts

@@ -31,6 +31,8 @@ export { config } from "dotenv";
 export { replaceAddressCase } from "@uma/common";
 export { Logger } from "@uma/financial-templates-lib";
 
+export { CHAIN_IDs, TOKEN_SYMBOLS_MAP } from "@across-protocol/constants-v2";
+
 // TypeChain exports used in the bot.
 export {
   getContractInfoFromAddress,