From 482103b2e881132a7bf2fa692fd47819315197ea Mon Sep 17 00:00:00 2001 From: nicholaspai Date: Mon, 2 Oct 2023 16:31:06 -0400 Subject: [PATCH 1/2] feat: Import constants-v2 Signed-off-by: nicholaspai --- package.json | 2 +- src/clients/AcrossAPIClient.ts | 3 +-- src/clients/ProfitClient.ts | 4 ++-- src/clients/bridges/ArbitrumAdapter.ts | 3 +-- src/clients/bridges/PolygonAdapter.ts | 3 +-- src/utils/TokenUtils.ts | 3 ++- test/AdapterManager.SendTokensCrossChain.ts | 3 +-- yarn.lock | 5 +++++ 8 files changed, 14 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 37923b31b..c6245060f 100644 --- a/package.json +++ b/package.json @@ -5,12 +5,12 @@ "repository": "git@github.com:across-protocol/relayer-v2.git", "author": "UMA Team", "license": "AGPL-3.0-only", - "private": true, "engines": { "node": ">=16.18.0" }, "dependencies": { "@across-protocol/contracts-v2": "2.4.3", + "@across-protocol/constants-v2": "1.0.4", "@across-protocol/sdk-v2": "0.16.4", "@arbitrum/sdk": "^3.1.3", "@defi-wonderland/smock": "^2.3.5", diff --git a/src/clients/AcrossAPIClient.ts b/src/clients/AcrossAPIClient.ts index ca9c8e9df..c202d2449 100644 --- a/src/clients/AcrossAPIClient.ts +++ b/src/clients/AcrossAPIClient.ts @@ -1,10 +1,9 @@ import { winston, BigNumber, getL2TokenAddresses } from "../utils"; import axios, { AxiosError } from "axios"; import { HubPoolClient } from "./HubPoolClient"; -import { constants } from "@across-protocol/sdk-v2"; +import { TOKEN_SYMBOLS_MAP, CHAIN_IDs } from "@across-protocol/constants-v2"; import { SpokePoolClientsByChain } from "../interfaces"; import _ from "lodash"; -const { TOKEN_SYMBOLS_MAP, CHAIN_IDs } = constants; export interface DepositLimits { maxDeposit: BigNumber; diff --git a/src/clients/ProfitClient.ts b/src/clients/ProfitClient.ts index e5eba34b2..6ba204268 100644 --- a/src/clients/ProfitClient.ts +++ b/src/clients/ProfitClient.ts @@ -4,10 +4,10 @@ import * as constants from "../common/Constants"; import { assert, BigNumber, formatFeePct, max, winston, toBNWei, toBN, assign } from "../utils"; import { HubPoolClient } from "."; import { Deposit, DepositWithBlock, L1Token, SpokePoolClientsByChain } from "../interfaces"; -import { constants as sdkConstants, priceClient, relayFeeCalculator, utils as sdkUtils } from "@across-protocol/sdk-v2"; +import { priceClient, relayFeeCalculator, utils as sdkUtils } from "@across-protocol/sdk-v2"; +import { TOKEN_SYMBOLS_MAP, CHAIN_IDs } from "@across-protocol/constants-v2"; const { formatEther } = ethersUtils; -const { TOKEN_SYMBOLS_MAP, CHAIN_IDs } = sdkConstants; const { fixedPointAdjustment: fixedPoint } = sdkUtils; // We use wrapped ERC-20 versions instead of the native tokens such as ETH, MATIC for ease of computing prices. diff --git a/src/clients/bridges/ArbitrumAdapter.ts b/src/clients/bridges/ArbitrumAdapter.ts index 823a701a0..4851e882b 100644 --- a/src/clients/bridges/ArbitrumAdapter.ts +++ b/src/clients/bridges/ArbitrumAdapter.ts @@ -17,9 +17,8 @@ import { import { SpokePoolClient } from "../../clients"; import { BaseAdapter } from "./BaseAdapter"; import { SortableEvent, OutstandingTransfers } from "../../interfaces"; -import { constants } from "@across-protocol/sdk-v2"; import { CONTRACT_ADDRESSES } from "../../common"; -const { TOKEN_SYMBOLS_MAP, CHAIN_IDs } = constants; +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. diff --git a/src/clients/bridges/PolygonAdapter.ts b/src/clients/bridges/PolygonAdapter.ts index 9f05ef725..f5ba05877 100644 --- a/src/clients/bridges/PolygonAdapter.ts +++ b/src/clients/bridges/PolygonAdapter.ts @@ -16,9 +16,8 @@ import { import { SpokePoolClient } from "../../clients"; import { BaseAdapter } from "./"; import { SortableEvent, OutstandingTransfers } from "../../interfaces"; -import { constants } from "@across-protocol/sdk-v2"; import { CONTRACT_ADDRESSES } from "../../common"; -const { TOKEN_SYMBOLS_MAP, CHAIN_IDs } = constants; +import { TOKEN_SYMBOLS_MAP, CHAIN_IDs } from "@across-protocol/constants-v2"; // ether bridge = 0x8484Ef722627bf18ca5Ae6BcF031c23E6e922B30 // erc20 bridge = 0x40ec5B33f54e0E8A33A975908C5BA1c14e5BbbDf diff --git a/src/utils/TokenUtils.ts b/src/utils/TokenUtils.ts index 1d2f8bbab..230827867 100644 --- a/src/utils/TokenUtils.ts +++ b/src/utils/TokenUtils.ts @@ -1,7 +1,8 @@ import { constants, utils } from "@across-protocol/sdk-v2"; import { CONTRACT_ADDRESSES } from "../common"; import { BigNumberish, utils as ethersUtils } from "ethers"; -const { TOKEN_SYMBOLS_MAP, CHAIN_IDs, ZERO_ADDRESS } = constants; +const { ZERO_ADDRESS } = constants; +import { TOKEN_SYMBOLS_MAP, CHAIN_IDs } from "@across-protocol/constants-v2"; export const { fetchTokenInfo } = utils; diff --git a/test/AdapterManager.SendTokensCrossChain.ts b/test/AdapterManager.SendTokensCrossChain.ts index 5b27cfe28..153505794 100644 --- a/test/AdapterManager.SendTokensCrossChain.ts +++ b/test/AdapterManager.SendTokensCrossChain.ts @@ -1,4 +1,3 @@ -import { constants } from "@across-protocol/sdk-v2"; import * as zksync from "zksync-web3"; import { SpokePoolClient } from "../src/clients"; import { AdapterManager } from "../src/clients/bridges"; // Tested @@ -18,7 +17,7 @@ import { toBN, winston, } from "./utils"; -const { TOKEN_SYMBOLS_MAP, CHAIN_IDs } = constants; +import { TOKEN_SYMBOLS_MAP, CHAIN_IDs } from "@across-protocol/constants-v2"; let hubPoolClient: MockHubPoolClient; const mockSpokePoolClients: { diff --git a/yarn.lock b/yarn.lock index a2568d0f5..5aef267a0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11,6 +11,11 @@ "@uma/common" "^2.17.0" hardhat "^2.9.3" +"@across-protocol/constants-v2@1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@across-protocol/constants-v2/-/constants-v2-1.0.4.tgz#df31c81038982a25de2b1b8f7604875f3de1186c" + integrity sha512-Nzl8Z1rZFvcpuKQu7CmBVfvgB13/NoulcsRVYBSkG90imS/e6mugxzqD9UrUb+WOL0ODMCANCAoDw54ZBBzNiQ== + "@across-protocol/contracts-v2@2.4.3", "@across-protocol/contracts-v2@^2.4.3": version "2.4.3" resolved "https://registry.yarnpkg.com/@across-protocol/contracts-v2/-/contracts-v2-2.4.3.tgz#9cc0b1f52b4f819b32ca1524ef84af9dfed8687a" From b541608bf96a28843f0af35321e095ac3f847224 Mon Sep 17 00:00:00 2001 From: nicholaspai <9457025+nicholaspai@users.noreply.github.com> Date: Tue, 3 Oct 2023 17:01:45 -0400 Subject: [PATCH 2/2] Update package.json --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index c6245060f..57a700e1b 100644 --- a/package.json +++ b/package.json @@ -5,6 +5,7 @@ "repository": "git@github.com:across-protocol/relayer-v2.git", "author": "UMA Team", "license": "AGPL-3.0-only", + "private": true, "engines": { "node": ">=16.18.0" },