Chore: Move helpers to its own repo (#163)

mimic-fi · Sep 20, 2024 · a6f7eb8 · a6f7eb8
1 parent 65c7773
commit a6f7eb8
Show file tree

Hide file tree

Showing 292 changed files with 330 additions and 3,680 deletions.
diff --git a/.github/workflows/ci-helpers.yml b/.github/workflows/ci-helpers.yml
diff --git a/.github/workflows/ci-price-oracle.yml b/.github/workflows/ci-price-oracle.yml
@@ -35,19 +35,3 @@ jobs:
         run: yarn build
       - name: Test
         run: yarn workspace @mimic-fi/v3-price-oracle test
-
-  integration:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Set up environment
-        uses: ./.github/actions/setup
-      - name: Set up hardhat config
-        run: .github/scripts/setup-hardhat-config.sh ${{secrets.MAINNET_RPC}} ${{secrets.POLYGON_RPC}} ${{secrets.OPTIMISM_RPC}} ${{secrets.ARBITRUM_RPC}} ${{secrets.GNOSIS_RPC}} ${{secrets.AVALANCHE_RPC}} ${{secrets.BSC_RPC}} ${{secrets.FANTOM_RPC}} ${{secrets.ZKEVM_RPC}}
-      - name: Build
-        run: yarn build
-      - name: Test mainnet
-        run: yarn workspace @mimic-fi/v3-price-oracle test:mainnet
-      - name: Test polygon
-        run: yarn workspace @mimic-fi/v3-price-oracle test:polygon
diff --git a/.github/workflows/ci-tasks.yml b/.github/workflows/ci-tasks.yml
@@ -39,17 +39,3 @@ jobs:
         env:
           CC_SECRET: ${{ secrets.CODECHECKS_SECRET }}
         run: yarn workspace @mimic-fi/v3-tasks codechecks
-
-  integration:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Set up environment
-        uses: ./.github/actions/setup
-      - name: Set up hardhat config
-        run: .github/scripts/setup-hardhat-config.sh ${{secrets.MAINNET_RPC}} ${{secrets.POLYGON_RPC}} ${{secrets.OPTIMISM_RPC}} ${{secrets.ARBITRUM_RPC}} ${{secrets.GNOSIS_RPC}} ${{secrets.AVALANCHE_RPC}} ${{secrets.BSC_RPC}} ${{secrets.FANTOM_RPC}} ${{secrets.ZKEVM_RPC}}
-      - name: Build
-        run: yarn build
-      - name: Test mainnet
-        run: yarn workspace @mimic-fi/v3-tasks test:mainnet
diff --git a/README.md b/README.md
@@ -33,7 +33,6 @@ This monorepo holds the key components of the Mimic protocol:
 - [Connectors](./packages/connectors)
 - [Deployer](./packages/deployer)
 - [Fee controller](./packages/fee-controller)
-- [Helpers](./packages/helpers)
 - [Price oracle](./packages/price-oracle)
 - [Registry](./packages/registry)
 - [Relayer](./packages/relayer)

diff --git a/package.json b/package.json
@@ -9,8 +9,7 @@
     "test": "yarn workspaces run test"
   },
   "workspaces": {
-    "packages": [
-      "packages/helpers",
+    "packages": [ 
       "packages/registry",
       "packages/fee-controller",
       "packages/authorizer",

diff --git a/packages/authorizer/package.json b/packages/authorizer/package.json
@@ -23,7 +23,7 @@
     "prove:ci": "yarn prove --solc solc8.17"
   },
   "dependencies": {
-    "@mimic-fi/v3-helpers": "0.1.0",
+    "@mimic-fi/helpers": "1.0.0",
     "@openzeppelin/contracts": "4.9.3"
   },
   "devDependencies": {

diff --git a/packages/authorizer/test/AuthorizedHelpers.test.ts b/packages/authorizer/test/AuthorizedHelpers.test.ts
@@ -1,4 +1,4 @@
-import { deploy } from '@mimic-fi/v3-helpers'
+import { deploy } from '@mimic-fi/helpers'
 import { expect } from 'chai'
 import { Contract, utils } from 'ethers'
 

diff --git a/packages/authorizer/test/Authorizer.test.ts b/packages/authorizer/test/Authorizer.test.ts
@@ -1,4 +1,4 @@
-import { assertEvent, deployProxy, getSigner, getSigners, ONES_ADDRESS, ZERO_ADDRESS } from '@mimic-fi/v3-helpers'
+import { assertEvent, deployProxy, getSigner, getSigners, ONES_ADDRESS, ZERO_ADDRESS } from '@mimic-fi/helpers'
 import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/dist/src/signer-with-address'
 import { expect } from 'chai'
 import { Contract } from 'ethers'

diff --git a/packages/connectors/contracts/1inch/OneInchV5Connector.sol b/packages/connectors/contracts/1inch/OneInchV5Connector.sol
@@ -18,7 +18,7 @@ import '@openzeppelin/contracts/token/ERC20/IERC20.sol';
 import '@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol';
 import '@openzeppelin/contracts/utils/Address.sol';
 
-import '@mimic-fi/v3-helpers/contracts/utils/ERC20Helpers.sol';
+import '@mimic-fi/helpers/contracts/utils/ERC20Helpers.sol';
 
 import '../interfaces/1inch/IOneInchV5Connector.sol';
 

diff --git a/packages/connectors/contracts/axelar/AxelarConnector.sol b/packages/connectors/contracts/axelar/AxelarConnector.sol
@@ -17,7 +17,7 @@ pragma solidity ^0.8.0;
 import '@openzeppelin/contracts/utils/Strings.sol';
 import '@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol';
 
-import '@mimic-fi/v3-helpers/contracts/utils/ERC20Helpers.sol';
+import '@mimic-fi/helpers/contracts/utils/ERC20Helpers.sol';
 
 import '../interfaces/axelar/IAxelarGateway.sol';
 import '../interfaces/axelar/IAxelarConnector.sol';

diff --git a/packages/connectors/contracts/balancer/BalancerV2PoolConnector.sol b/packages/connectors/contracts/balancer/BalancerV2PoolConnector.sol
@@ -17,8 +17,8 @@ pragma solidity ^0.8.0;
 import '@openzeppelin/contracts/token/ERC20/IERC20.sol';
 import '@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol';
 
-import '@mimic-fi/v3-helpers/contracts/math/FixedPoint.sol';
-import '@mimic-fi/v3-helpers/contracts/utils/ERC20Helpers.sol';
+import '@mimic-fi/helpers/contracts/math/FixedPoint.sol';
+import '@mimic-fi/helpers/contracts/utils/ERC20Helpers.sol';
 
 import '../interfaces/balancer/IBalancerPool.sol';
 import '../interfaces/balancer/IBalancerV2Vault.sol';

diff --git a/packages/connectors/contracts/balancer/BalancerV2SwapConnector.sol b/packages/connectors/contracts/balancer/BalancerV2SwapConnector.sol
@@ -17,8 +17,8 @@ pragma solidity ^0.8.0;
 import '@openzeppelin/contracts/token/ERC20/IERC20.sol';
 import '@openzeppelin/contracts/utils/math/SafeCast.sol';
 
-import '@mimic-fi/v3-helpers/contracts/utils/Arrays.sol';
-import '@mimic-fi/v3-helpers/contracts/utils/ERC20Helpers.sol';
+import '@mimic-fi/helpers/contracts/utils/Arrays.sol';
+import '@mimic-fi/helpers/contracts/utils/ERC20Helpers.sol';
 
 import '../interfaces/balancer/IBalancerV2Vault.sol';
 import '../interfaces/balancer/IBalancerV2SwapConnector.sol';

diff --git a/packages/connectors/contracts/bebop/BebopConnector.sol b/packages/connectors/contracts/bebop/BebopConnector.sol
@@ -17,7 +17,7 @@ pragma solidity ^0.8.0;
 import '@openzeppelin/contracts/token/ERC20/IERC20.sol';
 import '@openzeppelin/contracts/utils/Address.sol';
 
-import '@mimic-fi/v3-helpers/contracts/utils/ERC20Helpers.sol';
+import '@mimic-fi/helpers/contracts/utils/ERC20Helpers.sol';
 
 import '../interfaces/bebop/IBebopConnector.sol';
 

diff --git a/packages/connectors/contracts/connext/ConnextConnector.sol b/packages/connectors/contracts/connext/ConnextConnector.sol
@@ -16,7 +16,7 @@ pragma solidity ^0.8.0;
 
 import '@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol';
 
-import '@mimic-fi/v3-helpers/contracts/utils/ERC20Helpers.sol';
+import '@mimic-fi/helpers/contracts/utils/ERC20Helpers.sol';
 
 import '../interfaces/connext/IConnext.sol';
 import '../interfaces/connext/IConnextConnector.sol';

diff --git a/packages/connectors/contracts/convex/ConvexConnector.sol b/packages/connectors/contracts/convex/ConvexConnector.sol
@@ -16,8 +16,8 @@ pragma solidity ^0.8.0;
 
 import '@openzeppelin/contracts/token/ERC20/IERC20.sol';
 
-import '@mimic-fi/v3-helpers/contracts/math/FixedPoint.sol';
-import '@mimic-fi/v3-helpers/contracts/utils/ERC20Helpers.sol';
+import '@mimic-fi/helpers/contracts/math/FixedPoint.sol';
+import '@mimic-fi/helpers/contracts/utils/ERC20Helpers.sol';
 
 import '../interfaces/convex/ICvxPool.sol';
 import '../interfaces/convex/ICvxBooster.sol';

diff --git a/packages/connectors/contracts/curve/Curve2CrvConnector.sol b/packages/connectors/contracts/curve/Curve2CrvConnector.sol
@@ -17,8 +17,8 @@ pragma solidity ^0.8.0;
 import '@openzeppelin/contracts/token/ERC20/IERC20.sol';
 import '@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol';
 
-import '@mimic-fi/v3-helpers/contracts/math/FixedPoint.sol';
-import '@mimic-fi/v3-helpers/contracts/utils/ERC20Helpers.sol';
+import '@mimic-fi/helpers/contracts/math/FixedPoint.sol';
+import '@mimic-fi/helpers/contracts/utils/ERC20Helpers.sol';
 
 import '../interfaces/curve/I2CrvPool.sol';
 import '../interfaces/curve/ICurve2CrvConnector.sol';

diff --git a/packages/connectors/contracts/erc4626/ERC4626Connector.sol b/packages/connectors/contracts/erc4626/ERC4626Connector.sol
@@ -16,7 +16,7 @@ pragma solidity ^0.8.0;
 
 import '@openzeppelin/contracts/interfaces/IERC4626.sol';
 
-import '@mimic-fi/v3-helpers/contracts/utils/ERC20Helpers.sol';
+import '@mimic-fi/helpers/contracts/utils/ERC20Helpers.sol';
 
 import '../interfaces/erc4626/IERC4626Connector.sol';
 

diff --git a/packages/connectors/contracts/hop/HopBridgeConnector.sol b/packages/connectors/contracts/hop/HopBridgeConnector.sol
@@ -17,10 +17,10 @@ pragma solidity ^0.8.0;
 import '@openzeppelin/contracts/token/ERC20/IERC20.sol';
 import '@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol';
 
-import '@mimic-fi/v3-helpers/contracts/math/FixedPoint.sol';
-import '@mimic-fi/v3-helpers/contracts/utils/Denominations.sol';
-import '@mimic-fi/v3-helpers/contracts/utils/ERC20Helpers.sol';
-import '@mimic-fi/v3-helpers/contracts/utils/IWrappedNativeToken.sol';
+import '@mimic-fi/helpers/contracts/math/FixedPoint.sol';
+import '@mimic-fi/helpers/contracts/utils/Denominations.sol';
+import '@mimic-fi/helpers/contracts/utils/ERC20Helpers.sol';
+import '@mimic-fi/helpers/contracts/utils/IWrappedNativeToken.sol';
 
 import '../interfaces/hop/IHopL2Amm.sol';
 import '../interfaces/hop/IHopL1Bridge.sol';

diff --git a/packages/connectors/contracts/hop/HopSwapConnector.sol b/packages/connectors/contracts/hop/HopSwapConnector.sol
@@ -16,7 +16,7 @@ pragma solidity ^0.8.0;
 
 import '@openzeppelin/contracts/token/ERC20/IERC20.sol';
 
-import '@mimic-fi/v3-helpers/contracts/utils/ERC20Helpers.sol';
+import '@mimic-fi/helpers/contracts/utils/ERC20Helpers.sol';
 
 import '../interfaces/hop/IHopDex.sol';
 import '../interfaces/hop/IHopSwapConnector.sol';

diff --git a/packages/connectors/contracts/kyberswap/KyberSwapV2Connector.sol b/packages/connectors/contracts/kyberswap/KyberSwapV2Connector.sol
@@ -18,7 +18,7 @@ import '@openzeppelin/contracts/token/ERC20/IERC20.sol';
 import '@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol';
 import '@openzeppelin/contracts/utils/Address.sol';
 
-import '@mimic-fi/v3-helpers/contracts/utils/ERC20Helpers.sol';
+import '@mimic-fi/helpers/contracts/utils/ERC20Helpers.sol';
 
 import '../interfaces/kyberswap/IKyberSwapV2Connector.sol';
 

diff --git a/packages/connectors/contracts/morpho/MorphoAaveV2Connector.sol b/packages/connectors/contracts/morpho/MorphoAaveV2Connector.sol
@@ -14,7 +14,7 @@
 
 pragma solidity ^0.8.0;
 
-import '@mimic-fi/v3-helpers/contracts/utils/ERC20Helpers.sol';
+import '@mimic-fi/helpers/contracts/utils/ERC20Helpers.sol';
 
 import '../interfaces/morpho/ILendingPool.sol';
 import '../interfaces/morpho/ILens.sol';

diff --git a/packages/connectors/contracts/morpho/MorphoAaveV3Connector.sol b/packages/connectors/contracts/morpho/MorphoAaveV3Connector.sol
@@ -14,7 +14,7 @@
 
 pragma solidity ^0.8.0;
 
-import '@mimic-fi/v3-helpers/contracts/utils/ERC20Helpers.sol';
+import '@mimic-fi/helpers/contracts/utils/ERC20Helpers.sol';
 
 import '../interfaces/morpho/IMorphoV3.sol';
 import '../interfaces/morpho/IRewardsDistributor.sol';

diff --git a/packages/connectors/contracts/odos/OdosV2Connector.sol b/packages/connectors/contracts/odos/OdosV2Connector.sol
@@ -18,7 +18,7 @@ import '@openzeppelin/contracts/token/ERC20/IERC20.sol';
 import '@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol';
 import '@openzeppelin/contracts/utils/Address.sol';
 
-import '@mimic-fi/v3-helpers/contracts/utils/ERC20Helpers.sol';
+import '@mimic-fi/helpers/contracts/utils/ERC20Helpers.sol';
 
 import '../interfaces/odos/IOdosV2Connector.sol';
 

diff --git a/packages/connectors/contracts/paraswap/ParaswapV5Connector.sol b/packages/connectors/contracts/paraswap/ParaswapV5Connector.sol
@@ -17,7 +17,7 @@ pragma solidity ^0.8.0;
 import '@openzeppelin/contracts/token/ERC20/IERC20.sol';
 import '@openzeppelin/contracts/utils/Address.sol';
 
-import '@mimic-fi/v3-helpers/contracts/utils/ERC20Helpers.sol';
+import '@mimic-fi/helpers/contracts/utils/ERC20Helpers.sol';
 
 import '../interfaces/paraswap/IParaswapV5Augustus.sol';
 import '../interfaces/paraswap/IParaswapV5Connector.sol';

diff --git a/packages/connectors/contracts/socket/SocketConnector.sol b/packages/connectors/contracts/socket/SocketConnector.sol
@@ -16,7 +16,7 @@ pragma solidity ^0.8.0;
 
 import '@openzeppelin/contracts/utils/Address.sol';
 
-import '@mimic-fi/v3-helpers/contracts/utils/ERC20Helpers.sol';
+import '@mimic-fi/helpers/contracts/utils/ERC20Helpers.sol';
 
 import '../interfaces/socket/ISocketConnector.sol';
 

diff --git a/packages/connectors/contracts/symbiosis/SymbiosisConnector.sol b/packages/connectors/contracts/symbiosis/SymbiosisConnector.sol
@@ -14,9 +14,10 @@
 
 pragma solidity ^0.8.0;
 
-import '@mimic-fi/v3-helpers/contracts/utils/ERC20Helpers.sol';
 import '@openzeppelin/contracts/utils/Address.sol';
 
+import '@mimic-fi/helpers/contracts/utils/ERC20Helpers.sol';
+
 import '../interfaces/symbiosis/ISymbiosisConnector.sol';
 import '../interfaces/symbiosis/ISymbiosisMetaRouter.sol';
 

diff --git a/packages/connectors/contracts/uniswap/UniswapV2Connector.sol b/packages/connectors/contracts/uniswap/UniswapV2Connector.sol
@@ -17,8 +17,8 @@ pragma solidity ^0.8.0;
 import '@openzeppelin/contracts/token/ERC20/IERC20.sol';
 import '@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol';
 
-import '@mimic-fi/v3-helpers/contracts/utils/Arrays.sol';
-import '@mimic-fi/v3-helpers/contracts/utils/ERC20Helpers.sol';
+import '@mimic-fi/helpers/contracts/utils/Arrays.sol';
+import '@mimic-fi/helpers/contracts/utils/ERC20Helpers.sol';
 
 import '../interfaces/uniswap/IUniswapV2Factory.sol';
 import '../interfaces/uniswap/IUniswapV2Router02.sol';

diff --git a/packages/connectors/contracts/uniswap/UniswapV3Connector.sol b/packages/connectors/contracts/uniswap/UniswapV3Connector.sol
@@ -16,9 +16,9 @@ pragma solidity ^0.8.0;
 
 import '@openzeppelin/contracts/token/ERC20/IERC20.sol';
 
-import '@mimic-fi/v3-helpers/contracts/utils/Arrays.sol';
-import '@mimic-fi/v3-helpers/contracts/utils/BytesHelpers.sol';
-import '@mimic-fi/v3-helpers/contracts/utils/ERC20Helpers.sol';
+import '@mimic-fi/helpers/contracts/utils/Arrays.sol';
+import '@mimic-fi/helpers/contracts/utils/BytesHelpers.sol';
+import '@mimic-fi/helpers/contracts/utils/ERC20Helpers.sol';
 
 import '../interfaces/uniswap/IUniswapV3Factory.sol';
 import '../interfaces/uniswap/IUniswapV3SwapRouter.sol';

diff --git a/packages/connectors/contracts/wormhole/WormholeConnector.sol b/packages/connectors/contracts/wormhole/WormholeConnector.sol
@@ -17,7 +17,7 @@ pragma solidity ^0.8.0;
 import '@openzeppelin/contracts/token/ERC20/IERC20.sol';
 import '@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol';
 
-import '@mimic-fi/v3-helpers/contracts/utils/ERC20Helpers.sol';
+import '@mimic-fi/helpers/contracts/utils/ERC20Helpers.sol';
 
 import '../interfaces/wormhole/IWormhole.sol';
 import '../interfaces/wormhole/IWormholeConnector.sol';

diff --git a/packages/connectors/hardhat.config.ts b/packages/connectors/hardhat.config.ts
@@ -1,6 +1,6 @@
 import '@nomiclabs/hardhat-ethers'
 import '@nomiclabs/hardhat-waffle'
-import '@mimic-fi/v3-helpers/dist/tests'
+import '@mimic-fi/helpers/dist/tests'
 import 'hardhat-local-networks-config-plugin'
 
 import { homedir } from 'os'

diff --git a/packages/connectors/package.json b/packages/connectors/package.json
@@ -28,8 +28,8 @@
     "prepare": "yarn build"
   },
   "dependencies": {
+    "@mimic-fi/helpers": "1.0.0",
     "@mimic-fi/erc4626-adapter": "0.0.1-rc.0",
-    "@mimic-fi/v3-helpers": "0.1.9",
     "@openzeppelin/contracts": "4.9.3"
   },
   "devDependencies": {

diff --git a/packages/connectors/src/hop.ts b/packages/connectors/src/hop.ts
@@ -1,4 +1,4 @@
-import { bn } from '@mimic-fi/v3-helpers'
+import { bn } from '@mimic-fi/helpers'
 import axios, { AxiosError } from 'axios'
 import { BigNumber, Contract } from 'ethers'
 

diff --git a/packages/connectors/src/paraswap-v5.ts b/packages/connectors/src/paraswap-v5.ts
@@ -1,4 +1,4 @@
-import { bn, currentTimestamp, MINUTE, pct } from '@mimic-fi/v3-helpers'
+import { bn, currentTimestamp, MINUTE, pct } from '@mimic-fi/helpers'
 import axios, { AxiosError } from 'axios'
 import { BigNumber, Contract } from 'ethers'
 

diff --git a/packages/connectors/test/1inch/OneInchV5Connector.behavior.ts b/packages/connectors/test/1inch/OneInchV5Connector.behavior.ts
@@ -1,4 +1,4 @@
-import { deployProxy, fp, impersonate, instanceAt, pct, toUSDC, toWBTC, ZERO_ADDRESS } from '@mimic-fi/v3-helpers'
+import { deployProxy, fp, impersonate, instanceAt, pct, toUSDC, toWBTC, ZERO_ADDRESS } from '@mimic-fi/helpers'
 import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers'
 import { expect } from 'chai'
 import { BigNumber, Contract } from 'ethers'

diff --git a/packages/connectors/test/1inch/OneInchV5Connector.mainnet.ts b/packages/connectors/test/1inch/OneInchV5Connector.mainnet.ts
@@ -1,4 +1,4 @@
-import { deploy } from '@mimic-fi/v3-helpers'
+import { deploy } from '@mimic-fi/helpers'
 
 import { itBehavesLikeOneInchV5Connector } from './OneInchV5Connector.behavior'
 

diff --git a/packages/connectors/test/1inch/OneInchV5Connector.polygon.ts b/packages/connectors/test/1inch/OneInchV5Connector.polygon.ts
@@ -1,4 +1,4 @@
-import { deploy } from '@mimic-fi/v3-helpers'
+import { deploy } from '@mimic-fi/helpers'
 
 import { itBehavesLikeOneInchV5Connector } from './OneInchV5Connector.behavior'
 

diff --git a/packages/connectors/test/axelar/AxelarConnector.arbitrum.ts b/packages/connectors/test/axelar/AxelarConnector.arbitrum.ts
@@ -1,4 +1,4 @@
-import { deploy } from '@mimic-fi/v3-helpers'
+import { deploy } from '@mimic-fi/helpers'
 
 import { itBehavesLikeAxelarConnector } from './AxelarConnector.behavior'
 

diff --git a/packages/connectors/test/axelar/AxelarConnector.behavior.ts b/packages/connectors/test/axelar/AxelarConnector.behavior.ts
@@ -1,4 +1,4 @@
-import { bn, fp, impersonate, instanceAt, ZERO_ADDRESS } from '@mimic-fi/v3-helpers'
+import { bn, fp, impersonate, instanceAt, ZERO_ADDRESS } from '@mimic-fi/helpers'
 import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/dist/src/signer-with-address'
 import { expect } from 'chai'
 import { BigNumber, Contract } from 'ethers'

diff --git a/packages/connectors/test/axelar/AxelarConnector.fantom.ts b/packages/connectors/test/axelar/AxelarConnector.fantom.ts
@@ -1,4 +1,4 @@
-import { deploy } from '@mimic-fi/v3-helpers'
+import { deploy } from '@mimic-fi/helpers'
 
 import { itBehavesLikeAxelarConnector } from './AxelarConnector.behavior'