Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Chore: Move helpers to its own repo #163

Merged
merged 4 commits into from
Sep 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 0 additions & 37 deletions .github/workflows/ci-helpers.yml

This file was deleted.

16 changes: 0 additions & 16 deletions .github/workflows/ci-price-oracle.yml
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

price oracle's integration test was successful in the last run, so why remove it?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In general running fork tests in the CI I think it's a bad idea, I would love to have those if we find a way of not having issues with them

Original file line number Diff line number Diff line change
Expand Up @@ -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
14 changes: 0 additions & 14 deletions .github/workflows/ci-tasks.yml
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would skip the failing tests instead of removing all of them from the CI

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are actually flaky, it's not predictable which ones fail

Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
"test": "yarn workspaces run test"
},
"workspaces": {
"packages": [
"packages/helpers",
"packages": [
"packages/registry",
"packages/fee-controller",
"packages/authorizer",
Expand Down
2 changes: 1 addition & 1 deletion packages/authorizer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/authorizer/test/AuthorizedHelpers.test.ts
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
2 changes: 1 addition & 1 deletion packages/authorizer/test/Authorizer.test.ts
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
2 changes: 1 addition & 1 deletion packages/connectors/contracts/1inch/OneInchV5Connector.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion packages/connectors/contracts/axelar/AxelarConnector.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion packages/connectors/contracts/bebop/BebopConnector.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion packages/connectors/contracts/connext/ConnextConnector.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 2 additions & 2 deletions packages/connectors/contracts/convex/ConvexConnector.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 2 additions & 2 deletions packages/connectors/contracts/curve/Curve2CrvConnector.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion packages/connectors/contracts/erc4626/ERC4626Connector.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
8 changes: 4 additions & 4 deletions packages/connectors/contracts/hop/HopBridgeConnector.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion packages/connectors/contracts/hop/HopSwapConnector.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion packages/connectors/contracts/odos/OdosV2Connector.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion packages/connectors/contracts/socket/SocketConnector.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
4 changes: 2 additions & 2 deletions packages/connectors/contracts/uniswap/UniswapV2Connector.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
6 changes: 3 additions & 3 deletions packages/connectors/contracts/uniswap/UniswapV3Connector.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion packages/connectors/hardhat.config.ts
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
2 changes: 1 addition & 1 deletion packages/connectors/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/connectors/src/hop.ts
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
2 changes: 1 addition & 1 deletion packages/connectors/src/paraswap-v5.ts
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { deploy } from '@mimic-fi/v3-helpers'
import { deploy } from '@mimic-fi/helpers'

import { itBehavesLikeOneInchV5Connector } from './OneInchV5Connector.behavior'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { deploy } from '@mimic-fi/v3-helpers'
import { deploy } from '@mimic-fi/helpers'

import { itBehavesLikeOneInchV5Connector } from './OneInchV5Connector.behavior'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { deploy } from '@mimic-fi/v3-helpers'
import { deploy } from '@mimic-fi/helpers'

import { itBehavesLikeAxelarConnector } from './AxelarConnector.behavior'

Expand Down
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
2 changes: 1 addition & 1 deletion packages/connectors/test/axelar/AxelarConnector.fantom.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { deploy } from '@mimic-fi/v3-helpers'
import { deploy } from '@mimic-fi/helpers'

import { itBehavesLikeAxelarConnector } from './AxelarConnector.behavior'

Expand Down
Loading
Loading