chore: npm clean up (#143)

ArrakisFinance · Feb 9, 2023 · 6f4360d · 6f4360d
1 parent 6f6065a
commit 6f4360d
Show file tree

Hide file tree

Showing 13 changed files with 38 additions and 29 deletions.
diff --git a/deploy/ArrakisV2.deploy.ts b/deploy/ArrakisV2.deploy.ts
@@ -1,7 +1,7 @@
 import { deployments, getNamedAccounts, ethers } from "hardhat";
 import { HardhatRuntimeEnvironment } from "hardhat/types";
 import { DeployFunction } from "hardhat-deploy/types";
-import { getAddresses } from "../src";
+import { getAddresses, Addresses } from "../src/addresses";
 import { sleep } from "../src/utils";
 
 const func: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
@@ -18,7 +18,7 @@ const func: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
     await sleep(10000);
   }
 
-  const addresses = getAddresses(hre.network.name);
+  const addresses: Addresses = getAddresses(hre.network.name);
   const { deploy } = deployments;
   const { deployer } = await getNamedAccounts();
   await deploy("ArrakisV2", {

diff --git a/deploy/ArrakisV2Helper.deploy.ts b/deploy/ArrakisV2Helper.deploy.ts
@@ -1,7 +1,7 @@
 import { deployments, getNamedAccounts, ethers } from "hardhat";
 import { HardhatRuntimeEnvironment } from "hardhat/types";
 import { DeployFunction } from "hardhat-deploy/types";
-import { getAddresses } from "../src";
+import { getAddresses, Addresses } from "../src/addresses";
 import { sleep } from "../src/utils";
 
 const func: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
@@ -18,7 +18,7 @@ const func: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
     await sleep(10000);
   }
 
-  const addresses = getAddresses(hre.network.name);
+  const addresses: Addresses = getAddresses(hre.network.name);
   const { deploy } = deployments;
   const { deployer } = await getNamedAccounts();
   await deploy("ArrakisV2Helper", {

diff --git a/deploy/ArrakisV2Resolver.deploy.ts b/deploy/ArrakisV2Resolver.deploy.ts
@@ -1,7 +1,7 @@
 import { deployments, getNamedAccounts, ethers } from "hardhat";
 import { HardhatRuntimeEnvironment } from "hardhat/types";
 import { DeployFunction } from "hardhat-deploy/types";
-import { getAddresses } from "../src";
+import { getAddresses, Addresses } from "../src/addresses";
 import { sleep } from "../src/utils";
 
 const func: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
@@ -18,7 +18,7 @@ const func: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
     await sleep(10000);
   }
 
-  const addresses = getAddresses(hre.network.name);
+  const addresses: Addresses = getAddresses(hre.network.name);
   const { deploy } = deployments;
   const { deployer } = await getNamedAccounts();
   await deploy("ArrakisV2Resolver", {

diff --git a/package.json b/package.json
@@ -1,14 +1,14 @@
 {
   "name": "@arrakisfi/v2-core",
-  "version": "1.1.3",
+  "version": "1.1.9",
   "description": "Arrakis V2 Automated Market Maker",
   "license": "BUSL-1.1",
-  "main": "dist/src/index",
-  "types": "dist/src/index",
+  "main": "dist/src/addresses.js",
+  "types": "dist/src/addresses.d.ts",
   "files": [
     "contracts",
     "!contracts/__mocks__",
-    "src"
+    "dist/src"
   ],
   "scripts": {
     "build": "yarn compile && npx tsc",

diff --git a/scripts/verify/verifyVaultV2.ts b/scripts/verify/verifyVaultV2.ts
@@ -1,8 +1,8 @@
 import hre from "hardhat";
-import { getAddresses } from "../../src";
+import { getAddresses, Addresses } from "../../src/addresses";
 
 async function main() {
-  const addresses = getAddresses(hre.network.name);
+  const addresses: Addresses = getAddresses(hre.network.name);
 
   await hre.run("verify:verify", {
     address: (await hre.ethers.getContract("ArrakisV2")).address,

diff --git a/scripts/verify/verifyVaultV2Helper.ts b/scripts/verify/verifyVaultV2Helper.ts
@@ -1,8 +1,8 @@
 import hre from "hardhat";
-import { getAddresses } from "../../src";
+import { getAddresses, Addresses } from "../../src/addresses";
 
 async function main() {
-  const addresses = getAddresses(hre.network.name);
+  const addresses: Addresses = getAddresses(hre.network.name);
 
   await hre.run("verify:verify", {
     address: (await hre.ethers.getContract("ArrakisV2Helper")).address,

diff --git a/scripts/verify/verifyVaultV2Resolver.ts b/scripts/verify/verifyVaultV2Resolver.ts
@@ -1,8 +1,8 @@
 import hre from "hardhat";
-import { getAddresses } from "../../src";
+import { getAddresses, Addresses } from "../../src/addresses";
 
 async function main() {
-  const addresses = getAddresses(hre.network.name);
+  const addresses: Addresses = getAddresses(hre.network.name);
 
   await hre.run("verify:verify", {
     address: (await hre.ethers.getContract("ArrakisV2Resolver")).address,

diff --git a/src/addresses.ts b/src/addresses.ts
@@ -1,5 +1,18 @@
 /* eslint-disable @typescript-eslint/naming-convention */
-export const getAddresses = (network: string): any => {
+export interface Addresses {
+  UniswapV3Factory: string;
+  SwapRouter: string;
+  WETH: string;
+  WMATIC: string;
+  USDC: string;
+  ArrakisV2Implementation: string;
+  ArrakisV2Beacon: string;
+  ArrakisV2Factory: string;
+  ArrakisV2Helper: string;
+  ArrakisV2Resolver: string;
+}
+
+export const getAddresses = (network: string): Addresses => {
   switch (network) {
     case "hardhat":
       return {

diff --git a/src/index.ts b/src/index.ts
diff --git a/test/integration_tests/ArrakisV2.test.ts b/test/integration_tests/ArrakisV2.test.ts
@@ -9,7 +9,7 @@ import {
   ArrakisV2Resolver,
   Position,
 } from "../../typechain";
-import { getAddresses } from "../../src";
+import { getAddresses, Addresses } from "../../src/addresses";
 import { Signer } from "ethers";
 import { Contract } from "ethers";
 import { ManagerProxyMock } from "../../typechain/contracts/__mocks__/ManagerProxyMock";
@@ -33,7 +33,7 @@ describe("Arrakis V2 integration test!!!", async function () {
   let wMatic: Contract;
   let wEth: Contract;
   let usdc: Contract;
-  let addresses: any;
+  let addresses: Addresses;
   let lowerTick: number;
   let upperTick: number;
 

diff --git a/test/unit_tests/ArrakisV2.test.ts b/test/unit_tests/ArrakisV2.test.ts
@@ -2,7 +2,7 @@ import { expect } from "chai";
 import { Signer } from "ethers";
 import hre = require("hardhat");
 import { ArrakisV2, IUniswapV3Factory } from "../../typechain";
-import { getAddresses } from "../../src";
+import { getAddresses, Addresses } from "../../src/addresses";
 const { ethers, deployments } = hre;
 
 describe("ArrakisV2 functions unit test", function () {
@@ -15,7 +15,7 @@ describe("ArrakisV2 functions unit test", function () {
   let manager: Signer;
   let managerAddr: string;
   let arrakisV2: ArrakisV2;
-  let addresses: any;
+  let addresses: Addresses;
 
   before("Setting up for ArrakisV2 function test", async function () {
     if (hre.network.name !== "hardhat") {

diff --git a/test/unit_tests/ArrakisV2Factory.test.ts b/test/unit_tests/ArrakisV2Factory.test.ts
@@ -9,7 +9,7 @@ import {
   ArrakisV2Resolver,
   ArrakisV2Beacon,
 } from "../../typechain";
-import { getAddresses } from "../../src";
+import { getAddresses, Addresses } from "../../src/addresses";
 const { ethers, deployments } = hre;
 
 describe("Factory function unit test", function () {
@@ -21,7 +21,7 @@ describe("Factory function unit test", function () {
   let arrakisV2Factory: ArrakisV2Factory;
   let uniswapV3Pool: IUniswapV3Pool;
   let arrakisV2Resolver: ArrakisV2Resolver;
-  let addresses: any;
+  let addresses: Addresses;
   let owner: Signer;
 
   beforeEach("Setting up for Factory view function test", async function () {

diff --git a/test/unit_tests/ArrakisV2Helper.test.ts b/test/unit_tests/ArrakisV2Helper.test.ts
@@ -11,7 +11,7 @@ import {
   IUniswapV3Pool,
   ManagerProxyMock,
 } from "../../typechain";
-import { getAddresses } from "../../src";
+import { getAddresses, Addresses } from "../../src/addresses";
 const { ethers, deployments } = hre;
 
 describe("ArrakisV2Helper functions unit test", function () {
@@ -27,7 +27,7 @@ describe("ArrakisV2Helper functions unit test", function () {
   let managerProxyMock: ManagerProxyMock;
   let arrakisV2Resolver: ArrakisV2Resolver;
   let swapRouter: ISwapRouter;
-  let addresses: any;
+  let addresses: Addresses;
   let wEth: Contract;
   let usdc: Contract;
   let wMatic: Contract;