fix: remove all v2/v3 references (#509)

* fix: remove all v2/v3 references

Signed-off-by: Matt Rice <[email protected]>

* WIP

Signed-off-by: Matt Rice <[email protected]>

* WIP

Signed-off-by: Matt Rice <[email protected]>

---------

Signed-off-by: Matt Rice <[email protected]>

Author: mrice32

deploy/032_deploy_uniswap_swap_and_bridge.ts

@@ -1,6 +1,6 @@
 import { DeployFunction } from "hardhat-deploy/types";
 import { HardhatRuntimeEnvironment } from "hardhat/types";
-import { TOKEN_SYMBOLS_MAP } from "@across-protocol/constants-v2";
+import { TOKEN_SYMBOLS_MAP } from "@across-protocol/constants";
 
 import { getDeployedAddress } from "../src/DeploymentUtils";
 import { L2_ADDRESS_MAP } from "./consts";

deploy/034_deploy_1inch_swap_and_bridge.ts

@@ -1,6 +1,6 @@
 import { DeployFunction } from "hardhat-deploy/types";
 import { HardhatRuntimeEnvironment } from "hardhat/types";
-import { TOKEN_SYMBOLS_MAP } from "@across-protocol/constants-v2";
+import { TOKEN_SYMBOLS_MAP } from "@across-protocol/constants";
 
 import { getDeployedAddress } from "../src/DeploymentUtils";
 import { L2_ADDRESS_MAP } from "./consts";

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "@across-protocol/contracts-v2",
-  "version": "2.5.10",
+  "name": "@across-protocol/contracts",
+  "version": "3.0.0",
   "author": "UMA Team",
   "license": "AGPL-3.0-only",
   "repository": {
@@ -32,7 +32,7 @@
     "prepublish": "yarn build && hardhat export --export-all ./cache/massExport.json && ts-node ./scripts/processHardhatExport.ts && prettier --write ./deployments/deployments.json && yarn generate-contract-types"
   },
   "dependencies": {
-    "@across-protocol/constants-v2": "^1.1.0",
+    "@across-protocol/constants": "^3.0.0",
     "@defi-wonderland/smock": "^2.3.4",
     "@eth-optimism/contracts": "^0.5.40",
     "@ethersproject/abstract-provider": "5.7.0",

test-utils.ts

@@ -1,8 +1,8 @@
 // Note: this file sits on a separate export path and is intended to export test utilities and code:
-// You can import it like this: import * as testUtils from "@across-protocol/contracts-v2/dist/test-utils".
+// You can import it like this: import * as testUtils from "@across-protocol/contracts/dist/test-utils".
 // This is separated because this code assumes the caller has a hardhat config because it imports
 // hardhat. For non-test code, import the standard index file:
-// import * as contracts-v2 from "@across-protocol/contracts-v2"
+// import * as contracts from "@across-protocol/contracts"
 export * from "./test/fixtures/SpokePool.Fixture";
 export * from "./test/fixtures/HubPool.Fixture";
 export * from "./test/fixtures/MerkleLib.Fixture";

test/chain-adapters/ZkSync_Adapter.ts

@@ -24,7 +24,7 @@ let zkSync: FakeContract, zkSyncErc20Bridge: FakeContract;
 
 const zkSyncChainId = 324;
 
-// TODO: Grab the following from relayer-v2/CONTRACT_ADDRESSES dictionary?
+// TODO: Grab the following from relayer/CONTRACT_ADDRESSES dictionary?
 const zkSyncAbi = [
   {
     inputs: [

test/chain-specific-spokepools/ZkSync_SpokePool.ts

@@ -21,7 +21,7 @@ let l2Dai: string, crossDomainAliasAddress, crossDomainAlias: SignerWithAddress;
 let owner: SignerWithAddress, relayer: SignerWithAddress, rando: SignerWithAddress;
 let zkErc20Bridge: FakeContract, l2Eth: FakeContract;
 
-// TODO: Grab the following from relayer-v2/CONTRACT_ADDRESSES dictionary?
+// TODO: Grab the following from relayer/CONTRACT_ADDRESSES dictionary?
 const abiData = {
   erc20DefaultBridge: {
     address: "0x11f943b2c77b743ab90f4a0ae7d5a4e7fca3e102",

utils/constants.ts

@@ -1,4 +1,4 @@
-export { CHAIN_IDs, TOKEN_SYMBOLS_MAP } from "@across-protocol/constants-v2";
+export { CHAIN_IDs, TOKEN_SYMBOLS_MAP } from "@across-protocol/constants";
 
 export const FillStatus = {
   Unfilled: 0,

yarn.lock

@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@across-protocol/constants-v2@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@across-protocol/constants-v2/-/constants-v2-1.1.0.tgz#c9885fa8f465ce76d26a3e3d332558fbb6ad60f1"
-  integrity sha512-UpEvF26NrzcaKTlfZsCBG5qpnVz9TJw82OflamuA4T99tiXjegTJVk7Kc/vocGNKh0wr4yPGFyDbzB2h9O50Xw==
+"@across-protocol/constants@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@across-protocol/constants/-/constants-3.0.0.tgz#0f5cbcaf40d43babbecb322d91a689b49c5536a0"
+  integrity sha512-iJz1EDdYr+GRgHRZwcAw2G06ZvV9VOW6GQ846X7G/dd8wVQej18v1Fpx6th4bcSba1j7jR5Hfi+/zqSDoxyLmw==
 
 "@across-protocol/contracts@^0.1.4":
   version "0.1.4"