docs(amm,flash-swap,protocol,proxy-target): change "artifacts" to "sm…

…art contract ABIs"

build: set "@ethersproject/wallet" resolution in core "package.json"
build: upgrade dev deps
chore(amm,flash-swap,helpers,protocol,proxy-target,tasks): use "import type" instead of "import"

package.json

@@ -20,6 +20,9 @@
   },
   "packageManager": "[email protected]",
   "private": true,
+  "resolutions": {
+    "@ethersproject/wallet": "^5.5.0"
+  },
   "scripts": {
     "build:ts": "yarn workspaces foreach --topological-dev --verbose run build:ts",
     "build:types": "yarn workspaces foreach --topological-dev --verbose run build:types",

packages/amm/README.md

@@ -21,7 +21,7 @@ $ npm install @hifi/amm
 ## Usage
 
 The node package that you just installed contains both Solidity and JavaScript code. The former represents the smart contracts
-themselves; the latter, the Hardhat artifacts and the TypeChain bindings.
+themselves; the latter, the smart contract ABIs and the TypeChain bindings.
 
 ### Solidity
 
@@ -49,7 +49,7 @@ contract YourContract {
 ```js
 import { parseUnits } from "@ethersproject/units";
 import { getDefaultProvider } from "@ethersproject/providers";
-import { HifiPool__factory } from "@hifi/amm/dist/types/factories/HifiPool__factory";
+import type { HifiPool__factory } from "@hifi/amm/dist/types/factories/HifiPool__factory";
 
 async function getQuote() {
   const defaultProvider = getDefaultProvider();

packages/amm/hardhat.config.ts

@@ -8,7 +8,7 @@ import { resolve } from "path";
 
 import { getChainConfig, getEnvVar } from "@hifi/helpers";
 import { config as dotenvConfig } from "dotenv";
-import { HardhatUserConfig } from "hardhat/config";
+import type { HardhatUserConfig } from "hardhat/config";
 
 dotenvConfig({ path: resolve(__dirname, "..", "..", ".env") });
 

packages/amm/test/integration/hifiPool/effects/buyHToken.ts

@@ -3,7 +3,7 @@ import { Zero } from "@ethersproject/constants";
 import { H_TOKEN_MATURITY_ONE_YEAR, USDC_PRICE_PRECISION_SCALAR } from "@hifi/constants";
 import { HifiPoolErrors, YieldSpaceErrors } from "@hifi/errors";
 import { USDC, getNow, hUSDC } from "@hifi/helpers";
-import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers";
+import type { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers";
 import { expect } from "chai";
 import { fromBn, toBn } from "evm-bn";
 import forEach from "mocha-each";

packages/amm/test/integration/hifiPool/effects/buyUnderlying.ts

@@ -3,7 +3,7 @@ import { Zero } from "@ethersproject/constants";
 import { H_TOKEN_MATURITY_ONE_YEAR, USDC_PRICE_PRECISION_SCALAR } from "@hifi/constants";
 import { HifiPoolErrors, YieldSpaceErrors } from "@hifi/errors";
 import { USDC, getNow } from "@hifi/helpers";
-import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers";
+import type { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers";
 import { expect } from "chai";
 import { fromBn, toBn } from "evm-bn";
 import forEach from "mocha-each";

packages/amm/test/integration/hifiPool/effects/sellHToken.ts

@@ -3,7 +3,7 @@ import { Zero } from "@ethersproject/constants";
 import { H_TOKEN_MATURITY_ONE_YEAR, USDC_PRICE_PRECISION_SCALAR } from "@hifi/constants";
 import { HifiPoolErrors, YieldSpaceErrors } from "@hifi/errors";
 import { USDC, getNow, hUSDC } from "@hifi/helpers";
-import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers";
+import type { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers";
 import { expect } from "chai";
 import { fromBn, toBn } from "evm-bn";
 import forEach from "mocha-each";

packages/amm/test/integration/hifiPool/effects/sellUnderlying.ts

@@ -3,7 +3,7 @@ import { Zero } from "@ethersproject/constants";
 import { H_TOKEN_MATURITY_ONE_YEAR, USDC_PRICE_PRECISION_SCALAR } from "@hifi/constants";
 import { HifiPoolErrors, YieldSpaceErrors } from "@hifi/errors";
 import { USDC, getNow, hUSDC } from "@hifi/helpers";
-import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers";
+import type { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers";
 import { expect } from "chai";
 import { fromBn, toBn } from "evm-bn";
 import forEach from "mocha-each";

packages/amm/test/shared/contexts.ts

@@ -1,5 +1,5 @@
 // eslint-disable @typescript-eslint/no-explicit-any
-import { Signer } from "@ethersproject/abstract-signer";
+import type { Signer } from "@ethersproject/abstract-signer";
 import { Wallet } from "@ethersproject/wallet";
 import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/dist/src/signer-with-address";
 import { ethers, waffle } from "hardhat";

packages/amm/test/shared/deployers.ts

@@ -1,12 +1,12 @@
-import { Signer } from "@ethersproject/abstract-signer";
+import type { Signer } from "@ethersproject/abstract-signer";
 import { artifacts, waffle } from "hardhat";
-import { Artifact } from "hardhat/types";
+import type { Artifact } from "hardhat/types";
 
 import { H_TOKEN_MATURITY_ONE_YEAR, USDC_DECIMALS, USDC_NAME, USDC_SYMBOL } from "@hifi/constants";
-import { GodModeHifiPoolRegistry } from "../../src/types/GodModeHifiPoolRegistry";
-import { GodModeHToken } from "../../src/types/GodModeHToken";
-import { GodModeErc20 } from "../../src/types/GodModeErc20";
-import { GodModeHifiPool } from "../../src/types/GodModeHifiPool";
+import type { GodModeHifiPoolRegistry } from "../../src/types/GodModeHifiPoolRegistry";
+import type { GodModeHToken } from "../../src/types/GodModeHToken";
+import type { GodModeErc20 } from "../../src/types/GodModeErc20";
+import type { GodModeHifiPool } from "../../src/types/GodModeHifiPool";
 import { getHTokenName, getHifiPoolName, getHTokenSymbol, getHifiPoolSymbol } from "@hifi/helpers";
 
 export async function deployUsdc(deployer: Signer): Promise<GodModeErc20> {

packages/amm/test/shared/fixtures.ts

@@ -1,13 +1,13 @@
-import { Signer } from "@ethersproject/abstract-signer";
-import { MockContract } from "ethereum-waffle";
+import type { Signer } from "@ethersproject/abstract-signer";
+import type { MockContract } from "ethereum-waffle";
 import { artifacts, waffle } from "hardhat";
-import { Artifact } from "hardhat/types";
+import type { Artifact } from "hardhat/types";
 
-import { GodModeErc20 } from "../../src/types/GodModeErc20";
-import { GodModeHifiPool } from "../../src/types/GodModeHifiPool";
-import { GodModeHifiPoolRegistry } from "../../src/types/GodModeHifiPoolRegistry";
-import { GodModeHToken } from "../../src/types/GodModeHToken";
-import { YieldSpaceMock } from "../../src/types/YieldSpaceMock";
+import type { GodModeErc20 } from "../../src/types/GodModeErc20";
+import type { GodModeHifiPool } from "../../src/types/GodModeHifiPool";
+import type { GodModeHifiPoolRegistry } from "../../src/types/GodModeHifiPoolRegistry";
+import type { GodModeHToken } from "../../src/types/GodModeHToken";
+import type { YieldSpaceMock } from "../../src/types/YieldSpaceMock";
 import { deployGodModeHToken, deployGodModeHifiPool, deployGodModeHifiPoolRegistry, deployUsdc } from "./deployers";
 import { deployMockHToken, deployMockHifiPool, deployMockUsdc } from "./mocks";
 

packages/amm/test/shared/mocks.ts

@@ -1,10 +1,10 @@
-import { Signer } from "@ethersproject/abstract-signer";
+import type { Signer } from "@ethersproject/abstract-signer";
 import { H_TOKEN_DECIMALS, USDC_DECIMALS, USDC_NAME, USDC_PRICE_PRECISION_SCALAR, USDC_SYMBOL } from "@hifi/constants";
 import { H_TOKEN_MATURITY_ONE_YEAR } from "@hifi/constants";
 import { getHTokenName, getHTokenSymbol, getHifiPoolName, getHifiPoolSymbol } from "@hifi/helpers";
 import { MockContract } from "ethereum-waffle";
 import { artifacts, waffle } from "hardhat";
-import { Artifact } from "hardhat/types";
+import type { Artifact } from "hardhat/types";
 
 export async function deployMockHToken(deployer: Signer, underlyingAddress: string): Promise<MockContract> {
   const hTokenArtifact: Artifact = await artifacts.readArtifact("GodModeHToken");

packages/amm/test/shared/types.ts

@@ -1,12 +1,12 @@
-import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/dist/src/signer-with-address";
-import { Fixture } from "ethereum-waffle";
-import { MockContract } from "ethereum-waffle";
+import type { SignerWithAddress } from "@nomiclabs/hardhat-ethers/dist/src/signer-with-address";
+import type { Fixture } from "ethereum-waffle";
+import type { MockContract } from "ethereum-waffle";
 
-import { GodModeErc20 } from "../../src/types/GodModeErc20";
-import { GodModeHifiPool } from "../../src/types/GodModeHifiPool";
-import { GodModeHifiPoolRegistry } from "../../src/types/GodModeHifiPoolRegistry";
-import { GodModeHToken } from "../../src/types/GodModeHToken";
-import { YieldSpaceMock } from "../../src/types/YieldSpaceMock";
+import type { GodModeErc20 } from "../../src/types/GodModeErc20";
+import type { GodModeHifiPool } from "../../src/types/GodModeHifiPool";
+import type { GodModeHifiPoolRegistry } from "../../src/types/GodModeHifiPoolRegistry";
+import type { GodModeHToken } from "../../src/types/GodModeHToken";
+import type { YieldSpaceMock } from "../../src/types/YieldSpaceMock";
 
 declare module "mocha" {
   export interface Context {

packages/flash-swap/README.md

@@ -22,7 +22,7 @@ $ npm install @hifi/flash-swap
 ## Usage
 
 The node package that you just installed contains both Solidity and JavaScript code. The former represents the smart contracts
-themselves; the latter, the Hardhat artifacts and the TypeChain bindings.
+themselves; the latter, the smart contract ABIs and the TypeChain bindings.
 
 ### Solidity
 
@@ -39,7 +39,7 @@ Example for Uniswap V2:
 import { defaultAbiCoder } from "@ethersproject/abi";
 import { getDefaultProvider } from "@ethersproject/providers";
 import { parseUnits } from "@ethersproject/units";
-import { UniswapV2Pair__factory } from "@hifi/flash-swap/dist/types/factories/UniswapV2Pair__factory";
+import type { UniswapV2Pair__factory } from "@hifi/flash-swap/dist/types/factories/UniswapV2Pair__factory";
 
 async function flashSwap() {
   const defaultProvider = getDefaultProvider();

packages/flash-swap/hardhat.config.ts

@@ -8,7 +8,7 @@ import { resolve } from "path";
 
 import { getChainConfig, getEnvVar } from "@hifi/helpers";
 import { config as dotenvConfig } from "dotenv";
-import { HardhatUserConfig } from "hardhat/config";
+import type { HardhatUserConfig } from "hardhat/config";
 
 dotenvConfig({ path: resolve(__dirname, "..", "..", ".env") });
 

packages/flash-swap/test/integration/hifiFlashUniswapV2/effects/uniswapV2Call.ts

@@ -6,7 +6,7 @@ import { USDC, WBTC, hUSDC, price } from "@hifi/helpers";
 import { expect } from "chai";
 import { toBn } from "evm-bn";
 
-import { GodModeErc20 } from "../../../../src/types/GodModeErc20";
+import type { GodModeErc20 } from "../../../../src/types/GodModeErc20";
 import { deployGodModeErc20 } from "../../../shared/deployers";
 
 async function bumpPoolReserves(this: Mocha.Context, wbtcAmount: BigNumber, usdcAmount: BigNumber): Promise<void> {

packages/flash-swap/test/shared/contexts.ts

@@ -1,4 +1,4 @@
-import { Signer } from "@ethersproject/abstract-signer";
+import type { Signer } from "@ethersproject/abstract-signer";
 import { Wallet } from "@ethersproject/wallet";
 import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/dist/src/signer-with-address";
 import { ethers, waffle } from "hardhat";

packages/flash-swap/test/shared/deployers.ts

@@ -1,9 +1,9 @@
-import { Signer } from "@ethersproject/abstract-signer";
-import { BigNumber } from "@ethersproject/bignumber";
+import type { Signer } from "@ethersproject/abstract-signer";
+import type { BigNumber } from "@ethersproject/bignumber";
 import { artifacts, waffle } from "hardhat";
-import { Artifact } from "hardhat/types";
+import type { Artifact } from "hardhat/types";
 
-import { GodModeErc20 } from "../../src/types/GodModeErc20";
+import type { GodModeErc20 } from "../../src/types/GodModeErc20";
 
 export async function deployGodModeErc20(
   deployer: Signer,

packages/flash-swap/test/shared/fixtures.ts

@@ -1,4 +1,4 @@
-import { Signer } from "@ethersproject/abstract-signer";
+import type { Signer } from "@ethersproject/abstract-signer";
 import { keccak256 } from "@ethersproject/keccak256";
 import { H_TOKEN_MATURITY_ONE_YEAR } from "@hifi/constants";
 import { USDC_DECIMALS, USDC_NAME, USDC_SYMBOL, WBTC_DECIMALS, WBTC_NAME, WBTC_SYMBOL } from "@hifi/constants";
@@ -10,16 +10,16 @@ import { BalanceSheetV1 } from "@hifi/protocol/typechain/BalanceSheetV1";
 import { ChainlinkOperator } from "@hifi/protocol/typechain/ChainlinkOperator";
 import { FintrollerV1 } from "@hifi/protocol/typechain/FintrollerV1";
 import { artifacts, waffle } from "hardhat";
-import { Artifact } from "hardhat/types";
+import type { Artifact } from "hardhat/types";
 
 import { GodModeUniswapV2Pair__factory } from "../../src/types/factories/GodModeUniswapV2Pair__factory";
-import { GodModeErc20 } from "../../src/types/GodModeErc20";
-import { GodModeHToken } from "../../src/types/GodModeHToken";
-import { GodModeUniswapV2Factory } from "../../src/types/GodModeUniswapV2Factory";
-import { HifiFlashUniswapV2 } from "../../src/types/HifiFlashUniswapV2";
-import { MaliciousPair } from "../../src/types/MaliciousPair";
-import { SimplePriceFeed } from "../../src/types/SimplePriceFeed";
-import { GodModeUniswapV2Pair } from "../../src/types/GodModeUniswapV2Pair";
+import type { GodModeErc20 } from "../../src/types/GodModeErc20";
+import type { GodModeHToken } from "../../src/types/GodModeHToken";
+import type { GodModeUniswapV2Factory } from "../../src/types/GodModeUniswapV2Factory";
+import type { HifiFlashUniswapV2 } from "../../src/types/HifiFlashUniswapV2";
+import type { MaliciousPair } from "../../src/types/MaliciousPair";
+import type { SimplePriceFeed } from "../../src/types/SimplePriceFeed";
+import type { GodModeUniswapV2Pair } from "../../src/types/GodModeUniswapV2Pair";
 import { deployGodModeErc20 } from "./deployers";
 
 type IntegrationFixtureReturnType = {

packages/flash-swap/test/shared/types.ts

@@ -3,12 +3,12 @@ import { ChainlinkOperator } from "@hifi/protocol/typechain/ChainlinkOperator";
 import { FintrollerV1 } from "@hifi/protocol/typechain/FintrollerV1";
 import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/dist/src/signer-with-address";
 
-import { GodModeErc20 } from "../../src/types/GodModeErc20";
-import { GodModeHToken } from "../../src/types/GodModeHToken";
-import { GodModeUniswapV2Pair } from "../../src/types/GodModeUniswapV2Pair";
-import { HifiFlashUniswapV2 } from "../../src/types/HifiFlashUniswapV2";
-import { MaliciousPair } from "../../src/types/MaliciousPair";
-import { SimplePriceFeed } from "../../src/types/SimplePriceFeed";
+import type { GodModeErc20 } from "../../src/types/GodModeErc20";
+import type { GodModeHToken } from "../../src/types/GodModeHToken";
+import type { GodModeUniswapV2Pair } from "../../src/types/GodModeUniswapV2Pair";
+import type { HifiFlashUniswapV2 } from "../../src/types/HifiFlashUniswapV2";
+import type { MaliciousPair } from "../../src/types/MaliciousPair";
+import type { SimplePriceFeed } from "../../src/types/SimplePriceFeed";
 
 declare module "mocha" {
   export interface Context {

packages/helpers/src/chains.ts

@@ -1,5 +1,5 @@
 import { CHAIN_IDS } from "@hifi/constants";
-import { NetworkUserConfig } from "hardhat/types";
+import type { NetworkUserConfig } from "hardhat/types";
 
 export function getChainConfig(
   chain: keyof typeof CHAIN_IDS,

packages/protocol/README.md

@@ -21,7 +21,7 @@ $ npm install @hifi/protocol
 ## Usage
 
 The node package that you just installed contains both Solidity and JavaScript code. The former represents the smart contracts
-themselves; the latter, the Hardhat artifacts and the TypeChain bindings.
+themselves; the latter, the smart contract ABIs and the TypeChain bindings.
 
 ### Solidity
 
@@ -55,7 +55,7 @@ contract YourContract {
 
 ```ts
 import { getDefaultProvider } from "@ethersproject/providers";
-import { BalanceSheetV1__factory } from "@hifi/protocol/dist/types/factories/BalanceSheet__factory";
+import type { BalanceSheetV1__factory } from "@hifi/protocol/dist/types/factories/BalanceSheet__factory";
 
 async function queryAccountLiquidity() {
   const defaultProvider = getDefaultProvider();

packages/protocol/hardhat.config.ts

@@ -13,7 +13,7 @@ import { resolve } from "path";
 import { GAS_LIMITS } from "@hifi/constants";
 import { getChainConfig, getEnvVar } from "@hifi/helpers";
 import { config as dotenvConfig } from "dotenv";
-import { HardhatUserConfig } from "hardhat/types";
+import type { HardhatUserConfig } from "hardhat/types";
 
 dotenvConfig({ path: resolve(__dirname, "..", "..", ".env") });
 

packages/protocol/tasks/deploy/balanceSheet.ts

@@ -1,8 +1,8 @@
 import * as core from "@actions/core";
 import { task, types } from "hardhat/config";
-import { TaskArguments } from "hardhat/types";
+import type { TaskArguments } from "hardhat/types";
 
-import { BalanceSheetV1 } from "../../src/types/BalanceSheetV1";
+import type { BalanceSheetV1 } from "../../src/types/BalanceSheetV1";
 import { BalanceSheetV1__factory } from "../../src/types/factories/BalanceSheetV1__factory";
 import { SUBTASK_DEPLOY_WAIT_FOR_CONFIRMATIONS, TASK_DEPLOY_CONTRACT_BALANCE_SHEET } from "../constants";
 

packages/protocol/tasks/deploy/fintroller.ts

@@ -1,8 +1,8 @@
 import * as core from "@actions/core";
 import { task, types } from "hardhat/config";
-import { TaskArguments } from "hardhat/types";
+import type { TaskArguments } from "hardhat/types";
 
-import { FintrollerV1 } from "../../src/types/FintrollerV1";
+import type { FintrollerV1 } from "../../src/types/FintrollerV1";
 import { FintrollerV1__factory } from "../../src/types/factories/FintrollerV1__factory";
 import { SUBTASK_DEPLOY_WAIT_FOR_CONFIRMATIONS, TASK_DEPLOY_CONTRACT_FINTROLLER } from "../constants";
 

packages/protocol/test/shared/contexts.ts

@@ -1,12 +1,10 @@
 // eslint-disable @typescript-eslint/no-explicit-any
-import { Signer } from "@ethersproject/abstract-signer";
-import { Wallet } from "@ethersproject/wallet";
-import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/dist/src/signer-with-address";
+import type { Signer } from "@ethersproject/abstract-signer";
+import type { Wallet } from "@ethersproject/wallet";
+import type { SignerWithAddress } from "@nomiclabs/hardhat-ethers/dist/src/signer-with-address";
 import { ethers, waffle } from "hardhat";
 
-import { Contracts, Mocks, Signers } from "./types";
-
-const { createFixtureLoader } = waffle;
+import type { Contracts, Mocks, Signers } from "./types";
 
 /// This is run at the beginning of each suite of tests: 2e2, integration and unit.
 export function baseContext(description: string, hooks: () => void): void {
@@ -25,7 +23,7 @@ export function baseContext(description: string, hooks: () => void): void {
       this.signers.raider = signers[5];
 
       // Get rid of this when https://github.com/nomiclabs/hardhat/issues/849 gets fixed.
-      this.loadFixture = createFixtureLoader(signers as Signer[] as Wallet[]);
+      this.loadFixture = waffle.createFixtureLoader(signers as Signer[] as Wallet[]);
     });
 
     hooks();

packages/protocol/test/shared/deployers.ts

@@ -1,7 +1,7 @@
-import { Signer } from "@ethersproject/abstract-signer";
+import type { Signer } from "@ethersproject/abstract-signer";
 import { BigNumber } from "@ethersproject/bignumber";
 import { artifacts, ethers, upgrades, waffle } from "hardhat";
-import { Artifact } from "hardhat/types";
+import type { Artifact } from "hardhat/types";
 
 import {
   GAS_LIMITS,

packages/protocol/test/shared/fixtures.ts

@@ -1,4 +1,4 @@
-import { Signer } from "@ethersproject/abstract-signer";
+import type { Signer } from "@ethersproject/abstract-signer";
 import {
   H_TOKEN_MATURITY_ONE_YEAR,
   H_TOKEN_MATURITY_THREE_MONTHS,
@@ -11,15 +11,15 @@ import {
   WBTC_SYMBOL,
   WETH_SYMBOL,
 } from "@hifi/constants";
-import { MockContract } from "ethereum-waffle";
-
-import { ChainlinkOperator } from "../../src/types/ChainlinkOperator";
-import { FintrollerV1 } from "../../src/types/FintrollerV1";
-import { GodModeBalanceSheet } from "../../src/types/GodModeBalanceSheet";
-import { GodModeErc20 } from "../../src/types/GodModeErc20";
-import { GodModeHToken } from "../../src/types/GodModeHToken";
-import { OwnableUpgradeable } from "../../src/types/OwnableUpgradeable";
-import { SimplePriceFeed } from "../../src/types/SimplePriceFeed";
+import type { MockContract } from "ethereum-waffle";
+
+import type { ChainlinkOperator } from "../../src/types/ChainlinkOperator";
+import type { FintrollerV1 } from "../../src/types/FintrollerV1";
+import type { GodModeBalanceSheet } from "../../src/types/GodModeBalanceSheet";
+import type { GodModeErc20 } from "../../src/types/GodModeErc20";
+import type { GodModeHToken } from "../../src/types/GodModeHToken";
+import type { OwnableUpgradeable } from "../../src/types/OwnableUpgradeable";
+import type { SimplePriceFeed } from "../../src/types/SimplePriceFeed";
 import {
   deployChainlinkOperator,
   deployFintrollerV1,

packages/protocol/test/shared/mocks.ts

@@ -1,4 +1,4 @@
-import { Signer } from "@ethersproject/abstract-signer";
+import type { Signer } from "@ethersproject/abstract-signer";
 import { BigNumber } from "@ethersproject/bignumber";
 import { Zero } from "@ethersproject/constants";
 import {
@@ -17,7 +17,7 @@ import {
 import { getHTokenName, getHTokenSymbol } from "@hifi/helpers";
 import { MockContract } from "ethereum-waffle";
 import hre from "hardhat";
-import { Artifact } from "hardhat/types";
+import type { Artifact } from "hardhat/types";
 
 const { deployMockContract } = hre.waffle;