diff --git a/packages/authorizer/package.json b/packages/authorizer/package.json index 92848b3d..6a906b72 100644 --- 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 index 34b74161..20d00d16 100644 --- 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 index 23961e80..87d63768 100644 --- 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 index 94691533..0ad24b39 100644 --- 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 index 4c0e9e33..aab0ee42 100644 --- 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 index fce8ced6..e7a3a3a0 100644 --- 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 index 74d84fdb..40f600a6 100644 --- 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 index 310f74ae..fbceb541 100644 --- 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 index d0080281..93a9a983 100644 --- 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 index 86a8c82e..20eae5dd 100644 --- 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 index 9d513a9d..a057f916 100644 --- 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 index 6932f35a..38411410 100644 --- 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 index a4d99e81..aa22f7fe 100644 --- 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 index 3bcbefa3..f783787d 100644 --- 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 index 3f46c87d..5a0c7db5 100644 --- 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 index e0df4328..5ed6040a 100644 --- 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 index 2eb13492..0b81f41d 100644 --- 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 index 63140f8f..0d891394 100644 --- 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 index 06b81b3d..25ca0666 100644 --- 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 index e9c512d2..b61216cb 100644 --- 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 index 0c3daabc..f2caccc5 100644 --- 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 index bf068c57..7ea70259 100644 --- 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 index f79519a8..00759e8b 100644 --- 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 index 78ef2817..a12a3711 100644 --- 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 index d9a7d54c..2ecc05ca 100644 --- 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 index 653bd776..fd1d5a8f 100644 --- 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 index 4441e136..f5a02a40 100644 --- 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 index 8cfc631c..39791f28 100644 --- 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 index cb5e600b..92a7d737 100644 --- 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 index 9f62c859..1b8ced66 100644 --- 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 index 6359b2c9..d61c9774 100644 --- 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 index 738588a2..26a91968 100644 --- 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 index 2d68431d..d166dada 100644 --- 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 index 6f7de9f8..8675dc1a 100644 --- 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' diff --git a/packages/connectors/test/balancer/BalancerV2PoolConnector.mainnet.ts b/packages/connectors/test/balancer/BalancerV2PoolConnector.mainnet.ts index 4a62692c..a6378df4 100644 --- a/packages/connectors/test/balancer/BalancerV2PoolConnector.mainnet.ts +++ b/packages/connectors/test/balancer/BalancerV2PoolConnector.mainnet.ts @@ -1,10 +1,12 @@ -import { BigNumberish, deploy, fp, impersonate, instanceAt, tokens, toUSDC, ZERO_ADDRESS } from '@mimic-fi/v3-helpers' +import { BigNumberish, deploy, fp, impersonate, instanceAt, toUSDC, 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' /* eslint-disable no-secrets/no-secrets */ +const USDC = '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48' +const WETH = '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2' const BALANCER_VAULT = '0xBA12222222228d8Ba445958a75a0704d566BF2C8' describe('BalancerV2PoolConnector', function () { @@ -148,13 +150,13 @@ describe('BalancerV2PoolConnector', function () { const POOL_ID = '0x5c6ee304399dbdb9c8ef030ab642b10820db8f56000200000000000000000014' // BAL-WETH 80/20 const WHALE = '0xf584f8728b874a6a5c7a8d4d387c9aae9172d621' - itHandlesPoolsLiquidityProperly(POOL_ID, tokens.mainnet.WETH, fp(5), WHALE) + itHandlesPoolsLiquidityProperly(POOL_ID, WETH, fp(5), WHALE) }) context('stable pool', () => { const POOL_ID = '0x06df3b2bbb68adc8b0e302443692037ed9f91b42000000000000000000000063' // staBAL3 const WHALE = '0xf584f8728b874a6a5c7a8d4d387c9aae9172d621' - itHandlesPoolsLiquidityProperly(POOL_ID, tokens.mainnet.USDC, toUSDC(500), WHALE) + itHandlesPoolsLiquidityProperly(POOL_ID, USDC, toUSDC(500), WHALE) }) }) diff --git a/packages/connectors/test/balancer/BalancerV2SwapConnector.arbitrum.ts b/packages/connectors/test/balancer/BalancerV2SwapConnector.arbitrum.ts index 08869408..d6536483 100644 --- a/packages/connectors/test/balancer/BalancerV2SwapConnector.arbitrum.ts +++ b/packages/connectors/test/balancer/BalancerV2SwapConnector.arbitrum.ts @@ -1,4 +1,4 @@ -import { deploy, deployProxy, ZERO_ADDRESS } from '@mimic-fi/v3-helpers' +import { deploy, deployProxy, ZERO_ADDRESS } from '@mimic-fi/helpers' import { itBehavesLikeBalancerV2SwapConnector } from './BalancerV2SwapConnector.behavior' diff --git a/packages/connectors/test/balancer/BalancerV2SwapConnector.behavior.ts b/packages/connectors/test/balancer/BalancerV2SwapConnector.behavior.ts index fea3d614..16825100 100644 --- a/packages/connectors/test/balancer/BalancerV2SwapConnector.behavior.ts +++ b/packages/connectors/test/balancer/BalancerV2SwapConnector.behavior.ts @@ -1,4 +1,4 @@ -import { fp, impersonate, instanceAt, pct, toUSDC, toWBTC } from '@mimic-fi/v3-helpers' +import { fp, impersonate, instanceAt, pct, toUSDC, toWBTC } 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/balancer/BalancerV2SwapConnector.mainnet.ts b/packages/connectors/test/balancer/BalancerV2SwapConnector.mainnet.ts index f0e4192c..d3e1646e 100644 --- a/packages/connectors/test/balancer/BalancerV2SwapConnector.mainnet.ts +++ b/packages/connectors/test/balancer/BalancerV2SwapConnector.mainnet.ts @@ -1,4 +1,4 @@ -import { deploy, deployProxy, ZERO_ADDRESS } from '@mimic-fi/v3-helpers' +import { deploy, deployProxy, ZERO_ADDRESS } from '@mimic-fi/helpers' import { itBehavesLikeBalancerV2SwapConnector } from './BalancerV2SwapConnector.behavior' diff --git a/packages/connectors/test/bebop/BebopConnector.arbitrum.ts b/packages/connectors/test/bebop/BebopConnector.arbitrum.ts index 6d23ff33..611d5f19 100644 --- a/packages/connectors/test/bebop/BebopConnector.arbitrum.ts +++ b/packages/connectors/test/bebop/BebopConnector.arbitrum.ts @@ -1,4 +1,4 @@ -import { deploy } from '@mimic-fi/v3-helpers' +import { deploy } from '@mimic-fi/helpers' import { itBehavesLikeBebopConnector } from './BebopConnector.behavior' diff --git a/packages/connectors/test/bebop/BebopConnector.base.ts b/packages/connectors/test/bebop/BebopConnector.base.ts index afa0844f..7fd4f345 100644 --- a/packages/connectors/test/bebop/BebopConnector.base.ts +++ b/packages/connectors/test/bebop/BebopConnector.base.ts @@ -1,4 +1,4 @@ -import { deploy } from '@mimic-fi/v3-helpers' +import { deploy } from '@mimic-fi/helpers' import { itBehavesLikeBebopConnector } from './BebopConnector.behavior' diff --git a/packages/connectors/test/bebop/BebopConnector.behavior.ts b/packages/connectors/test/bebop/BebopConnector.behavior.ts index c21d6fcd..92dbfed0 100644 --- a/packages/connectors/test/bebop/BebopConnector.behavior.ts +++ b/packages/connectors/test/bebop/BebopConnector.behavior.ts @@ -1,4 +1,4 @@ -import { deployProxy, fp, impersonate, instanceAt, pct, toUSDC, ZERO_ADDRESS } from '@mimic-fi/v3-helpers' +import { deployProxy, fp, impersonate, instanceAt, pct, toUSDC, 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/connext/ConnextConnector.behavior.ts b/packages/connectors/test/connext/ConnextConnector.behavior.ts index e38f1469..fe941cc8 100644 --- a/packages/connectors/test/connext/ConnextConnector.behavior.ts +++ b/packages/connectors/test/connext/ConnextConnector.behavior.ts @@ -1,4 +1,4 @@ -import { fp, impersonate, instanceAt, ZERO_ADDRESS } from '@mimic-fi/v3-helpers' +import { 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/connext/ConnextConnector.bsc.ts b/packages/connectors/test/connext/ConnextConnector.bsc.ts index 7805cd9c..db3f5042 100644 --- a/packages/connectors/test/connext/ConnextConnector.bsc.ts +++ b/packages/connectors/test/connext/ConnextConnector.bsc.ts @@ -1,4 +1,4 @@ -import { deploy, toUSDC } from '@mimic-fi/v3-helpers' +import { deploy, toUSDC } from '@mimic-fi/helpers' import { itBehavesLikeConnextConnector } from './ConnextConnector.behavior' diff --git a/packages/connectors/test/connext/ConnextConnector.optimism.ts b/packages/connectors/test/connext/ConnextConnector.optimism.ts index 3b5ffe6e..ddbc7d83 100644 --- a/packages/connectors/test/connext/ConnextConnector.optimism.ts +++ b/packages/connectors/test/connext/ConnextConnector.optimism.ts @@ -1,4 +1,4 @@ -import { deploy, toUSDC } from '@mimic-fi/v3-helpers' +import { deploy, toUSDC } from '@mimic-fi/helpers' import { itBehavesLikeConnextConnector } from './ConnextConnector.behavior' diff --git a/packages/connectors/test/convex/ConvexConnector.arbitrum.ts b/packages/connectors/test/convex/ConvexConnector.arbitrum.ts index f32d7214..7e49454d 100644 --- a/packages/connectors/test/convex/ConvexConnector.arbitrum.ts +++ b/packages/connectors/test/convex/ConvexConnector.arbitrum.ts @@ -1,4 +1,4 @@ -import { advanceTime, deploy, fp, impersonate, instanceAt, MONTH, toUSDC } from '@mimic-fi/v3-helpers' +import { advanceTime, deploy, fp, impersonate, instanceAt, MONTH, toUSDC } 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/test/curve/Curve2CrvConnector.arbitrum.ts b/packages/connectors/test/curve/Curve2CrvConnector.arbitrum.ts index 0e6d5e45..87546fba 100644 --- a/packages/connectors/test/curve/Curve2CrvConnector.arbitrum.ts +++ b/packages/connectors/test/curve/Curve2CrvConnector.arbitrum.ts @@ -1,4 +1,4 @@ -import { assertAlmostEqual, deploy, fp, impersonate, instanceAt, toUSDC } from '@mimic-fi/v3-helpers' +import { assertAlmostEqual, deploy, fp, impersonate, instanceAt, toUSDC } 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/test/erc4626/ERC4626Connector.mainnet.ts b/packages/connectors/test/erc4626/ERC4626Connector.mainnet.ts index 666dc72f..15ad2ea9 100644 --- a/packages/connectors/test/erc4626/ERC4626Connector.mainnet.ts +++ b/packages/connectors/test/erc4626/ERC4626Connector.mainnet.ts @@ -8,7 +8,7 @@ import { MONTH, ONES_ADDRESS, toUSDC, -} from '@mimic-fi/v3-helpers' +} 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/test/helpers/1inch-v5/index.ts b/packages/connectors/test/helpers/1inch-v5/index.ts index 1e43cb66..f07d0f7f 100644 --- a/packages/connectors/test/helpers/1inch-v5/index.ts +++ b/packages/connectors/test/helpers/1inch-v5/index.ts @@ -1,4 +1,4 @@ -import { currentBlockNumber } from '@mimic-fi/v3-helpers' +import { currentBlockNumber } from '@mimic-fi/helpers' import { BigNumber, Contract } from 'ethers' import fs from 'fs' import hre from 'hardhat' diff --git a/packages/connectors/test/helpers/bebop/index.ts b/packages/connectors/test/helpers/bebop/index.ts index e92321c5..7a2ab956 100644 --- a/packages/connectors/test/helpers/bebop/index.ts +++ b/packages/connectors/test/helpers/bebop/index.ts @@ -1,4 +1,4 @@ -import { currentBlockNumber } from '@mimic-fi/v3-helpers' +import { currentBlockNumber } from '@mimic-fi/helpers' import { BigNumber, Contract } from 'ethers' import fs from 'fs' import hre from 'hardhat' diff --git a/packages/connectors/test/helpers/kyberswap/index.ts b/packages/connectors/test/helpers/kyberswap/index.ts index 2128f86d..f737b64d 100644 --- a/packages/connectors/test/helpers/kyberswap/index.ts +++ b/packages/connectors/test/helpers/kyberswap/index.ts @@ -1,4 +1,4 @@ -import { currentBlockNumber } from '@mimic-fi/v3-helpers' +import { currentBlockNumber } from '@mimic-fi/helpers' import { BigNumber, Contract } from 'ethers' import fs from 'fs' import hre from 'hardhat' diff --git a/packages/connectors/test/helpers/odos/index.ts b/packages/connectors/test/helpers/odos/index.ts index b99064ee..0520cf0d 100644 --- a/packages/connectors/test/helpers/odos/index.ts +++ b/packages/connectors/test/helpers/odos/index.ts @@ -1,4 +1,4 @@ -import { currentBlockNumber } from '@mimic-fi/v3-helpers' +import { currentBlockNumber } from '@mimic-fi/helpers' import { BigNumber, Contract } from 'ethers' import fs from 'fs' import hre from 'hardhat' diff --git a/packages/connectors/test/helpers/paraswap-v5/index.ts b/packages/connectors/test/helpers/paraswap-v5/index.ts index d39702a8..0f466ae9 100644 --- a/packages/connectors/test/helpers/paraswap-v5/index.ts +++ b/packages/connectors/test/helpers/paraswap-v5/index.ts @@ -1,4 +1,4 @@ -import { bn, currentBlockNumber } from '@mimic-fi/v3-helpers' +import { bn, currentBlockNumber } from '@mimic-fi/helpers' import { BigNumber, Contract } from 'ethers' import fs from 'fs' import hre from 'hardhat' diff --git a/packages/connectors/test/helpers/socket/index.ts b/packages/connectors/test/helpers/socket/index.ts index a2eebdf8..ec9dee86 100644 --- a/packages/connectors/test/helpers/socket/index.ts +++ b/packages/connectors/test/helpers/socket/index.ts @@ -1,4 +1,4 @@ -import { currentBlockNumber } from '@mimic-fi/v3-helpers' +import { currentBlockNumber } from '@mimic-fi/helpers' import { BigNumber, Contract } from 'ethers' import fs from 'fs' import hre from 'hardhat' diff --git a/packages/connectors/test/helpers/symbiosis/index.ts b/packages/connectors/test/helpers/symbiosis/index.ts index 97fe246f..86bf2871 100644 --- a/packages/connectors/test/helpers/symbiosis/index.ts +++ b/packages/connectors/test/helpers/symbiosis/index.ts @@ -1,4 +1,4 @@ -import { currentBlockNumber } from '@mimic-fi/v3-helpers' +import { currentBlockNumber } from '@mimic-fi/helpers' import { BigNumber, Contract } from 'ethers' import fs from 'fs' import hre from 'hardhat' diff --git a/packages/connectors/test/hop/HopBridgeConnector.gnosis.ts b/packages/connectors/test/hop/HopBridgeConnector.gnosis.ts index b7e6c913..e7856541 100644 --- a/packages/connectors/test/hop/HopBridgeConnector.gnosis.ts +++ b/packages/connectors/test/hop/HopBridgeConnector.gnosis.ts @@ -1,4 +1,4 @@ -import { deploy } from '@mimic-fi/v3-helpers' +import { deploy } from '@mimic-fi/helpers' import { itBehavesLikeHopERC20Connector } from './HopL2ERC20Connector.behavior' import { itBehavesLikeHopNativeConnector } from './HopL2NativeConnector.behavior' diff --git a/packages/connectors/test/hop/HopBridgeConnector.mainnet.ts b/packages/connectors/test/hop/HopBridgeConnector.mainnet.ts index 65011295..62861236 100644 --- a/packages/connectors/test/hop/HopBridgeConnector.mainnet.ts +++ b/packages/connectors/test/hop/HopBridgeConnector.mainnet.ts @@ -1,4 +1,4 @@ -import { deploy, fp, impersonate, instanceAt, MAX_UINT256, toUSDC, ZERO_ADDRESS } from '@mimic-fi/v3-helpers' +import { deploy, fp, impersonate, instanceAt, MAX_UINT256, toUSDC, 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/test/hop/HopL2ERC20Connector.behavior.ts b/packages/connectors/test/hop/HopL2ERC20Connector.behavior.ts index 88c16258..92cf0073 100644 --- a/packages/connectors/test/hop/HopL2ERC20Connector.behavior.ts +++ b/packages/connectors/test/hop/HopL2ERC20Connector.behavior.ts @@ -1,4 +1,4 @@ -import { bn, fp, impersonate, instanceAt, MAX_UINT256, ZERO_ADDRESS } from '@mimic-fi/v3-helpers' +import { bn, fp, impersonate, instanceAt, MAX_UINT256, 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/hop/HopL2NativeConnector.behavior.ts b/packages/connectors/test/hop/HopL2NativeConnector.behavior.ts index 7b6c7364..85fc310f 100644 --- a/packages/connectors/test/hop/HopL2NativeConnector.behavior.ts +++ b/packages/connectors/test/hop/HopL2NativeConnector.behavior.ts @@ -1,4 +1,4 @@ -import { bn, fp, impersonate, instanceAt, MAX_UINT256, ZERO_ADDRESS } from '@mimic-fi/v3-helpers' +import { bn, fp, impersonate, instanceAt, MAX_UINT256, 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/hop/HopSwapConnector.arbitrum.ts b/packages/connectors/test/hop/HopSwapConnector.arbitrum.ts index 6d61f473..92b5023a 100644 --- a/packages/connectors/test/hop/HopSwapConnector.arbitrum.ts +++ b/packages/connectors/test/hop/HopSwapConnector.arbitrum.ts @@ -1,4 +1,4 @@ -import { deploy } from '@mimic-fi/v3-helpers' +import { deploy } from '@mimic-fi/helpers' import { itBehavesLikeHopSwapConnector } from './HopSwapConnector.behavior' diff --git a/packages/connectors/test/hop/HopSwapConnector.behavior.ts b/packages/connectors/test/hop/HopSwapConnector.behavior.ts index 6c007105..a0a3ead6 100644 --- a/packages/connectors/test/hop/HopSwapConnector.behavior.ts +++ b/packages/connectors/test/hop/HopSwapConnector.behavior.ts @@ -1,4 +1,4 @@ -import { fp, impersonate, instanceAt, toUSDC } from '@mimic-fi/v3-helpers' +import { fp, impersonate, instanceAt, toUSDC } 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/hop/HopSwapConnector.gnosis.ts b/packages/connectors/test/hop/HopSwapConnector.gnosis.ts index dd9e370d..7ba0ac00 100644 --- a/packages/connectors/test/hop/HopSwapConnector.gnosis.ts +++ b/packages/connectors/test/hop/HopSwapConnector.gnosis.ts @@ -1,4 +1,4 @@ -import { deploy } from '@mimic-fi/v3-helpers' +import { deploy } from '@mimic-fi/helpers' import { itBehavesLikeHopSwapConnector } from './HopSwapConnector.behavior' diff --git a/packages/connectors/test/kyberswap/KyberSwapV2Connector.base.ts b/packages/connectors/test/kyberswap/KyberSwapV2Connector.base.ts index bf6ce1c9..ec53b4cd 100644 --- a/packages/connectors/test/kyberswap/KyberSwapV2Connector.base.ts +++ b/packages/connectors/test/kyberswap/KyberSwapV2Connector.base.ts @@ -1,4 +1,4 @@ -import { deploy } from '@mimic-fi/v3-helpers' +import { deploy } from '@mimic-fi/helpers' import { itBehavesLikeKyberSwapV2Connector } from './KyberSwapV2Connector.behavior' diff --git a/packages/connectors/test/kyberswap/KyberSwapV2Connector.behavior.ts b/packages/connectors/test/kyberswap/KyberSwapV2Connector.behavior.ts index 7e056727..c828e5e9 100644 --- a/packages/connectors/test/kyberswap/KyberSwapV2Connector.behavior.ts +++ b/packages/connectors/test/kyberswap/KyberSwapV2Connector.behavior.ts @@ -1,4 +1,4 @@ -import { deployProxy, fp, impersonate, instanceAt, pct, toUSDC, ZERO_ADDRESS } from '@mimic-fi/v3-helpers' +import { deployProxy, fp, impersonate, instanceAt, pct, toUSDC, 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/kyberswap/KyberSwapV2Connector.mainnet.ts b/packages/connectors/test/kyberswap/KyberSwapV2Connector.mainnet.ts index 8ec9db8f..5dd96199 100644 --- a/packages/connectors/test/kyberswap/KyberSwapV2Connector.mainnet.ts +++ b/packages/connectors/test/kyberswap/KyberSwapV2Connector.mainnet.ts @@ -1,4 +1,4 @@ -import { deploy } from '@mimic-fi/v3-helpers' +import { deploy } from '@mimic-fi/helpers' import { itBehavesLikeKyberSwapV2Connector } from './KyberSwapV2Connector.behavior' diff --git a/packages/connectors/test/morpho/MorphoAaveV2Connector.mainnet.ts b/packages/connectors/test/morpho/MorphoAaveV2Connector.mainnet.ts index f7f74d75..6f1b8752 100644 --- a/packages/connectors/test/morpho/MorphoAaveV2Connector.mainnet.ts +++ b/packages/connectors/test/morpho/MorphoAaveV2Connector.mainnet.ts @@ -1,13 +1,4 @@ -import { - advanceTime, - assertAlmostEqual, - deploy, - fp, - impersonate, - instanceAt, - MONTH, - toUSDC, -} from '@mimic-fi/v3-helpers' +import { advanceTime, assertAlmostEqual, deploy, fp, impersonate, instanceAt, MONTH, toUSDC } 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/test/morpho/MorphoAaveV3Connector.mainnet.ts b/packages/connectors/test/morpho/MorphoAaveV3Connector.mainnet.ts index 479b8a8c..5d60d78a 100644 --- a/packages/connectors/test/morpho/MorphoAaveV3Connector.mainnet.ts +++ b/packages/connectors/test/morpho/MorphoAaveV3Connector.mainnet.ts @@ -1,13 +1,4 @@ -import { - advanceTime, - assertAlmostEqual, - deploy, - fp, - impersonate, - instanceAt, - MONTH, - toUSDC, -} from '@mimic-fi/v3-helpers' +import { advanceTime, assertAlmostEqual, deploy, fp, impersonate, instanceAt, MONTH, toUSDC } 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/test/odos/OdosV2Connector.base.ts b/packages/connectors/test/odos/OdosV2Connector.base.ts index 1bf7028c..a9fc05b9 100644 --- a/packages/connectors/test/odos/OdosV2Connector.base.ts +++ b/packages/connectors/test/odos/OdosV2Connector.base.ts @@ -1,4 +1,4 @@ -import { deploy } from '@mimic-fi/v3-helpers' +import { deploy } from '@mimic-fi/helpers' import { itBehavesLikeOdosV2Connector } from './OdosV2Connector.behavior' diff --git a/packages/connectors/test/odos/OdosV2Connector.behavior.ts b/packages/connectors/test/odos/OdosV2Connector.behavior.ts index 0ea7a721..ac2ed4b5 100644 --- a/packages/connectors/test/odos/OdosV2Connector.behavior.ts +++ b/packages/connectors/test/odos/OdosV2Connector.behavior.ts @@ -1,4 +1,4 @@ -import { deployProxy, fp, impersonate, instanceAt, pct, toUSDC, ZERO_ADDRESS } from '@mimic-fi/v3-helpers' +import { deployProxy, fp, impersonate, instanceAt, pct, toUSDC, 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/paraswap/ParaswapV5Connector.behavior.ts b/packages/connectors/test/paraswap/ParaswapV5Connector.behavior.ts index 95563310..e983f075 100644 --- a/packages/connectors/test/paraswap/ParaswapV5Connector.behavior.ts +++ b/packages/connectors/test/paraswap/ParaswapV5Connector.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/socket/SocketConnector.behavior.ts b/packages/connectors/test/socket/SocketConnector.behavior.ts index 6380e3ce..2138173e 100644 --- a/packages/connectors/test/socket/SocketConnector.behavior.ts +++ b/packages/connectors/test/socket/SocketConnector.behavior.ts @@ -1,4 +1,4 @@ -import { fp, impersonate, instanceAt } from '@mimic-fi/v3-helpers' +import { fp, impersonate, instanceAt } 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/socket/SocketConnector.bsc.ts b/packages/connectors/test/socket/SocketConnector.bsc.ts index c77d53b7..19b4d659 100644 --- a/packages/connectors/test/socket/SocketConnector.bsc.ts +++ b/packages/connectors/test/socket/SocketConnector.bsc.ts @@ -1,4 +1,4 @@ -import { deploy, fp, tokens } from '@mimic-fi/v3-helpers' +import { deploy, fp } from '@mimic-fi/helpers' import { itBehavesLikeSocketConnector } from './SocketConnector.behavior' @@ -10,7 +10,7 @@ const WHALE = '0x8894e0a0c962cb723c1976a4421c95949be2d4e3' describe('SocketConnector', () => { const fromChainId = 56 - const fromToken = tokens.bsc.USDC + const fromToken = '0x8AC76a51cc950d9822D68b83fE1Ad97B32Cd580d' const fromAmount = fp(50000) before('create socket connector', async function () { @@ -19,14 +19,14 @@ describe('SocketConnector', () => { context('to mainnet', () => { const toChainId = 1 - const toToken = tokens.mainnet.USDC + const toToken = '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48' itBehavesLikeSocketConnector(fromChainId, fromToken, fromAmount, toChainId, toToken, WHALE) }) context('to optimism', () => { const toChainId = 10 - const toToken = tokens.optimism.USDC + const toToken = '0x7F5c764cBc14f9669B88837ca1490cCa17c31607' itBehavesLikeSocketConnector(fromChainId, fromToken, fromAmount, toChainId, toToken, WHALE) }) diff --git a/packages/connectors/test/symbiosis/SymbiosisConnector.behavior.ts b/packages/connectors/test/symbiosis/SymbiosisConnector.behavior.ts index a3085837..8d47dbbb 100644 --- a/packages/connectors/test/symbiosis/SymbiosisConnector.behavior.ts +++ b/packages/connectors/test/symbiosis/SymbiosisConnector.behavior.ts @@ -1,4 +1,4 @@ -import { fp, impersonate, instanceAt } from '@mimic-fi/v3-helpers' +import { fp, impersonate, instanceAt } from '@mimic-fi/helpers' import { expect } from 'chai' import { BigNumber } from 'ethers' diff --git a/packages/connectors/test/symbiosis/SymbiosisConnector.zkevm.ts b/packages/connectors/test/symbiosis/SymbiosisConnector.zkevm.ts index aa9d30c4..1d9ae62f 100644 --- a/packages/connectors/test/symbiosis/SymbiosisConnector.zkevm.ts +++ b/packages/connectors/test/symbiosis/SymbiosisConnector.zkevm.ts @@ -1,4 +1,4 @@ -import { deploy, fp, toUSDC } from '@mimic-fi/v3-helpers' +import { deploy, fp, toUSDC } from '@mimic-fi/helpers' import { itBehavesLikeSymbiosisConnectorBridgingUSDC, diff --git a/packages/connectors/test/uniswap/UniswapV2Connector.behavior.ts b/packages/connectors/test/uniswap/UniswapV2Connector.behavior.ts index 2267777a..3b3676cb 100644 --- a/packages/connectors/test/uniswap/UniswapV2Connector.behavior.ts +++ b/packages/connectors/test/uniswap/UniswapV2Connector.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/uniswap/UniswapV2Connector.mainnet.ts b/packages/connectors/test/uniswap/UniswapV2Connector.mainnet.ts index 8a8fb285..2b7ffcf6 100644 --- a/packages/connectors/test/uniswap/UniswapV2Connector.mainnet.ts +++ b/packages/connectors/test/uniswap/UniswapV2Connector.mainnet.ts @@ -1,4 +1,4 @@ -import { deploy } from '@mimic-fi/v3-helpers' +import { deploy } from '@mimic-fi/helpers' import { itBehavesLikeUniswapV2Connector } from './UniswapV2Connector.behavior' diff --git a/packages/connectors/test/uniswap/UniswapV2Connector.polygon.ts b/packages/connectors/test/uniswap/UniswapV2Connector.polygon.ts index d2e79405..d4580dfc 100644 --- a/packages/connectors/test/uniswap/UniswapV2Connector.polygon.ts +++ b/packages/connectors/test/uniswap/UniswapV2Connector.polygon.ts @@ -1,4 +1,4 @@ -import { deploy } from '@mimic-fi/v3-helpers' +import { deploy } from '@mimic-fi/helpers' import { itBehavesLikeUniswapV2Connector } from './UniswapV2Connector.behavior' diff --git a/packages/connectors/test/uniswap/UniswapV3Connector.behavior.ts b/packages/connectors/test/uniswap/UniswapV3Connector.behavior.ts index bcfef2f4..d39dc49b 100644 --- a/packages/connectors/test/uniswap/UniswapV3Connector.behavior.ts +++ b/packages/connectors/test/uniswap/UniswapV3Connector.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/uniswap/UniswapV3Connector.mainnet.ts b/packages/connectors/test/uniswap/UniswapV3Connector.mainnet.ts index 2464977d..c0020482 100644 --- a/packages/connectors/test/uniswap/UniswapV3Connector.mainnet.ts +++ b/packages/connectors/test/uniswap/UniswapV3Connector.mainnet.ts @@ -1,4 +1,4 @@ -import { deploy } from '@mimic-fi/v3-helpers' +import { deploy } from '@mimic-fi/helpers' import { itBehavesLikeUniswapV3Connector } from './UniswapV3Connector.behavior' diff --git a/packages/connectors/test/uniswap/UniswapV3Connector.polygon.ts b/packages/connectors/test/uniswap/UniswapV3Connector.polygon.ts index a7328c22..fe3a99bd 100644 --- a/packages/connectors/test/uniswap/UniswapV3Connector.polygon.ts +++ b/packages/connectors/test/uniswap/UniswapV3Connector.polygon.ts @@ -1,4 +1,4 @@ -import { deploy } from '@mimic-fi/v3-helpers' +import { deploy } from '@mimic-fi/helpers' import { itBehavesLikeUniswapV3Connector } from './UniswapV3Connector.behavior' diff --git a/packages/connectors/test/wormhole/WormholeConnector.avalanche.ts b/packages/connectors/test/wormhole/WormholeConnector.avalanche.ts index f1d39991..0ac3a460 100644 --- a/packages/connectors/test/wormhole/WormholeConnector.avalanche.ts +++ b/packages/connectors/test/wormhole/WormholeConnector.avalanche.ts @@ -1,4 +1,4 @@ -import { deploy } from '@mimic-fi/v3-helpers' +import { deploy } from '@mimic-fi/helpers' import { itBehavesLikeWormholeConnector } from './WormholeConnector.behavior' diff --git a/packages/connectors/test/wormhole/WormholeConnector.behavior.ts b/packages/connectors/test/wormhole/WormholeConnector.behavior.ts index cbce9b37..3035064f 100644 --- a/packages/connectors/test/wormhole/WormholeConnector.behavior.ts +++ b/packages/connectors/test/wormhole/WormholeConnector.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/wormhole/WormholeConnector.mainnet.ts b/packages/connectors/test/wormhole/WormholeConnector.mainnet.ts index 992135bf..c1c01371 100644 --- a/packages/connectors/test/wormhole/WormholeConnector.mainnet.ts +++ b/packages/connectors/test/wormhole/WormholeConnector.mainnet.ts @@ -1,4 +1,4 @@ -import { deploy } from '@mimic-fi/v3-helpers' +import { deploy } from '@mimic-fi/helpers' import { itBehavesLikeWormholeConnector } from './WormholeConnector.behavior' diff --git a/packages/deployer/hardhat.config.ts b/packages/deployer/hardhat.config.ts index fca1e0b0..d8cd4796 100644 --- a/packages/deployer/hardhat.config.ts +++ b/packages/deployer/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/deployer/package.json b/packages/deployer/package.json index 659857d3..473b7733 100644 --- a/packages/deployer/package.json +++ b/packages/deployer/package.json @@ -18,8 +18,8 @@ "prepare": "yarn build" }, "dependencies": { + "@mimic-fi/helpers": "1.0.0", "@mimic-fi/v3-authorizer": "0.1.0", - "@mimic-fi/v3-helpers": "0.1.0", "@mimic-fi/v3-price-oracle": "0.1.0", "@mimic-fi/v3-registry": "0.1.0", "@mimic-fi/v3-smart-vault": "0.1.0", diff --git a/packages/deployer/test/Deployer.test.ts b/packages/deployer/test/Deployer.test.ts index eaa5b786..b520d451 100644 --- a/packages/deployer/test/Deployer.test.ts +++ b/packages/deployer/test/Deployer.test.ts @@ -1,4 +1,4 @@ -import { assertEvent, deploy, getSigners, instanceAt, ZERO_BYTES32 } from '@mimic-fi/v3-helpers' +import { assertEvent, deploy, getSigners, instanceAt, ZERO_BYTES32 } 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/fee-controller/contracts/FeeController.sol b/packages/fee-controller/contracts/FeeController.sol index 0c7ffc3c..6ecb706b 100644 --- a/packages/fee-controller/contracts/FeeController.sol +++ b/packages/fee-controller/contracts/FeeController.sol @@ -16,7 +16,7 @@ pragma solidity ^0.8.0; import '@openzeppelin/contracts/access/Ownable.sol'; -import '@mimic-fi/v3-helpers/contracts/math/FixedPoint.sol'; +import '@mimic-fi/helpers/contracts/math/FixedPoint.sol'; import './interfaces/IFeeController.sol'; diff --git a/packages/fee-controller/package.json b/packages/fee-controller/package.json index af102953..7a7b12f6 100644 --- a/packages/fee-controller/package.json +++ b/packages/fee-controller/package.json @@ -18,7 +18,7 @@ "prepare": "yarn build" }, "dependencies": { - "@mimic-fi/v3-helpers": "0.1.0", + "@mimic-fi/helpers": "1.0.0", "@openzeppelin/contracts": "4.9.3" }, "devDependencies": { diff --git a/packages/fee-controller/test/FeeController.test.ts b/packages/fee-controller/test/FeeController.test.ts index 520edcf5..7bdc3a33 100644 --- a/packages/fee-controller/test/FeeController.test.ts +++ b/packages/fee-controller/test/FeeController.test.ts @@ -1,4 +1,4 @@ -import { assertEvent, assertNoEvent, BigNumberish, deploy, fp, getSigners, ZERO_ADDRESS } from '@mimic-fi/v3-helpers' +import { assertEvent, assertNoEvent, BigNumberish, deploy, fp, getSigners, 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/price-oracle/contracts/PriceOracle.sol b/packages/price-oracle/contracts/PriceOracle.sol index 42784841..332142a9 100644 --- a/packages/price-oracle/contracts/PriceOracle.sol +++ b/packages/price-oracle/contracts/PriceOracle.sol @@ -22,9 +22,9 @@ import '@openzeppelin/contracts/utils/math/SafeCast.sol'; import '@openzeppelin/contracts/utils/structs/EnumerableSet.sol'; import '@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol'; +import '@mimic-fi/helpers/contracts/math/FixedPoint.sol'; +import '@mimic-fi/helpers/contracts/utils/BytesHelpers.sol'; import '@mimic-fi/v3-authorizer/contracts/Authorized.sol'; -import '@mimic-fi/v3-helpers/contracts/math/FixedPoint.sol'; -import '@mimic-fi/v3-helpers/contracts/utils/BytesHelpers.sol'; import './interfaces/IPriceOracle.sol'; diff --git a/packages/price-oracle/contracts/test/FeedMock.sol b/packages/price-oracle/contracts/test/FeedMock.sol new file mode 100644 index 00000000..827d1bd4 --- /dev/null +++ b/packages/price-oracle/contracts/test/FeedMock.sol @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: MIT + +pragma solidity ^0.8.0; + +contract FeedMock { + uint8 public decimals; + int256 public price; + + constructor(int256 _price, uint8 _decimals) { + price = _price; + decimals = _decimals; + } + + function latestRoundData() external view returns (uint80, int256 answer, uint256, uint256, uint80) { + return (0, price, 0, 0, 0); + } +} diff --git a/packages/price-oracle/hardhat.config.ts b/packages/price-oracle/hardhat.config.ts index 9edb506d..9d8d755c 100644 --- a/packages/price-oracle/hardhat.config.ts +++ b/packages/price-oracle/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/price-oracle/package.json b/packages/price-oracle/package.json index e19b8352..f87734b3 100644 --- a/packages/price-oracle/package.json +++ b/packages/price-oracle/package.json @@ -21,7 +21,7 @@ }, "dependencies": { "@chainlink/contracts": "^0.2.1", - "@mimic-fi/v3-helpers": "0.1.0", + "@mimic-fi/helpers": "1.0.0", "@openzeppelin/contracts": "4.9.3" }, "devDependencies": { diff --git a/packages/price-oracle/test/PriceOracle.mainnet.ts b/packages/price-oracle/test/PriceOracle.mainnet.ts index 13462524..ef1ebddb 100644 --- a/packages/price-oracle/test/PriceOracle.mainnet.ts +++ b/packages/price-oracle/test/PriceOracle.mainnet.ts @@ -1,4 +1,4 @@ -import { assertAlmostEqual, deployProxy, fp, getSigner } from '@mimic-fi/v3-helpers' +import { assertAlmostEqual, deployProxy, fp, getSigner } from '@mimic-fi/helpers' import { BigNumber, Contract } from 'ethers' /* eslint-disable no-secrets/no-secrets */ diff --git a/packages/price-oracle/test/PriceOracle.polygon.ts b/packages/price-oracle/test/PriceOracle.polygon.ts index 92d8d504..dc39d5be 100644 --- a/packages/price-oracle/test/PriceOracle.polygon.ts +++ b/packages/price-oracle/test/PriceOracle.polygon.ts @@ -1,4 +1,4 @@ -import { assertAlmostEqual, deployProxy, fp, getSigner } from '@mimic-fi/v3-helpers' +import { assertAlmostEqual, deployProxy, fp, getSigner } from '@mimic-fi/helpers' import { BigNumber, Contract } from 'ethers' /* eslint-disable no-secrets/no-secrets */ diff --git a/packages/price-oracle/test/PriceOracle.test.ts b/packages/price-oracle/test/PriceOracle.test.ts index 52105270..ace8a206 100644 --- a/packages/price-oracle/test/PriceOracle.test.ts +++ b/packages/price-oracle/test/PriceOracle.test.ts @@ -5,14 +5,14 @@ import { bn, currentTimestamp, DAY, - deployFeedMock, + deploy, deployProxy, deployTokenMock, fp, getSigner, getSigners, ZERO_ADDRESS, -} from '@mimic-fi/v3-helpers' +} from '@mimic-fi/helpers' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/dist/src/signer-with-address' import { expect } from 'chai' import { BigNumber, Contract, ethers } from 'ethers' @@ -223,7 +223,7 @@ describe('PriceOracle', () => { }) beforeEach('set feed', async () => { - const feed = await deployFeedMock(reportedPrice, feedDecimals) + const feed = await deploy('FeedMock', [reportedPrice, feedDecimals]) await priceOracle.setFeed(base.address, quote.address, feed.address) }) @@ -506,7 +506,7 @@ describe('PriceOracle', () => { }) beforeEach('set inverse feed', async () => { - const feed = await deployFeedMock(reportedInversePrice, feedDecimals) + const feed = await deploy('FeedMock', [reportedInversePrice, feedDecimals]) await priceOracle.setFeed(quote.address, base.address, feed.address) }) @@ -808,10 +808,10 @@ describe('PriceOracle', () => { }) beforeEach('set feed', async () => { - const baseFeed = await deployFeedMock(reportedBasePrice, baseFeedDecimals) + const baseFeed = await deploy('FeedMock', [reportedBasePrice, baseFeedDecimals]) await priceOracle.setFeed(base.address, PIVOT, baseFeed.address) - const quoteFeed = await deployFeedMock(reportedQuotePrice, quoteFeedDecimals) + const quoteFeed = await deploy('FeedMock', [reportedQuotePrice, quoteFeedDecimals]) await priceOracle.setFeed(quote.address, PIVOT, quoteFeed.address) }) @@ -1564,7 +1564,7 @@ describe('PriceOracle', () => { beforeEach('deploy base and quote', async () => { base = await deployTokenMock('BASE', 18) quote = await deployTokenMock('QUOTE', 18) - feed = await deployFeedMock(SMART_VAULT_ORACLE_PRICE, 18) + feed = await deploy('FeedMock', [SMART_VAULT_ORACLE_PRICE, 18]) }) const setUpSmartVaultOracleFeed = () => { diff --git a/packages/registry/package.json b/packages/registry/package.json index 43f8dc89..d3ad0d75 100644 --- a/packages/registry/package.json +++ b/packages/registry/package.json @@ -18,7 +18,7 @@ "prepare": "yarn build" }, "dependencies": { - "@mimic-fi/v3-helpers": "0.1.0", + "@mimic-fi/helpers": "1.0.0", "@openzeppelin/contracts": "4.9.3", "solmate": "^6.7.0" }, diff --git a/packages/registry/test/Registry.test.ts b/packages/registry/test/Registry.test.ts index f1d7b4aa..0bdac0d7 100644 --- a/packages/registry/test/Registry.test.ts +++ b/packages/registry/test/Registry.test.ts @@ -1,4 +1,4 @@ -import { assertEvent, deploy, getCreationCode, getSigners } from '@mimic-fi/v3-helpers' +import { assertEvent, deploy, getCreationCode, getSigners } 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/relayer/certora/conf/relayer.conf b/packages/relayer/certora/conf/relayer.conf index ad22e8bf..c5e6ece2 100644 --- a/packages/relayer/certora/conf/relayer.conf +++ b/packages/relayer/certora/conf/relayer.conf @@ -16,7 +16,7 @@ "optimistic_loop": true, "packages": [ "@mimic-fi/v3-authorizer=../../node_modules/@mimic-fi/v3-authorizer", - "@mimic-fi/v3-helpers=../../node_modules/@mimic-fi/v3-helpers", + "@mimic-fi/helpers=../../node_modules/@mimic-fi/helpers", "@mimic-fi/v3-smart-vault=../../node_modules/@mimic-fi/v3-smart-vault", "@mimic-fi/v3-tasks=../../node_modules/@mimic-fi/v3-tasks", "@openzeppelin=../../node_modules/@openzeppelin" diff --git a/packages/relayer/certora/helpers/Helpers.sol b/packages/relayer/certora/helpers/Helpers.sol index 32f29d7d..e665de69 100644 --- a/packages/relayer/certora/helpers/Helpers.sol +++ b/packages/relayer/certora/helpers/Helpers.sol @@ -2,8 +2,8 @@ pragma solidity ^0.8.0; -import '@mimic-fi/v3-helpers/contracts/utils/Denominations.sol'; -import '@mimic-fi/v3-helpers/contracts/utils/ERC20Helpers.sol'; +import '@mimic-fi/helpers/contracts/utils/Denominations.sol'; +import '@mimic-fi/helpers/contracts/utils/ERC20Helpers.sol'; import '@mimic-fi/v3-smart-vault/contracts/interfaces/ISmartVault.sol'; import '@mimic-fi/v3-tasks/contracts/interfaces/ITask.sol'; diff --git a/packages/relayer/package.json b/packages/relayer/package.json index c25e6576..01ff1c82 100644 --- a/packages/relayer/package.json +++ b/packages/relayer/package.json @@ -20,7 +20,7 @@ "prove:ci": "yarn prove --solc solc8.17" }, "dependencies": { - "@mimic-fi/v3-helpers": "0.1.0", + "@mimic-fi/helpers": "1.0.0", "@mimic-fi/v3-tasks": "0.1.0", "@mimic-fi/v3-smart-vault": "0.1.0", "@openzeppelin/contracts": "4.9.3" diff --git a/packages/relayer/test/Relayer.test.ts b/packages/relayer/test/Relayer.test.ts index 61e9f14b..61e237f7 100644 --- a/packages/relayer/test/Relayer.test.ts +++ b/packages/relayer/test/Relayer.test.ts @@ -11,7 +11,7 @@ import { NATIVE_TOKEN_ADDRESS, pct, ZERO_ADDRESS, -} from '@mimic-fi/v3-helpers' +} from '@mimic-fi/helpers' import { deployEnvironment } from '@mimic-fi/v3-tasks' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' import { expect } from 'chai' @@ -940,9 +940,8 @@ describe('Relayer', () => { context('when the relayer does not have enough balance', async () => { it('reverts', async () => { - await expect(relayer.rescueFunds(token.address, recipient.address, amount)).to.be.revertedWith( - 'ERC20: transfer amount exceeds balance' - ) + // TODO: Hardhat does not decode smart vault error properly + await expect(relayer.rescueFunds(token.address, recipient.address, amount)).to.be.reverted }) }) }) diff --git a/packages/smart-vault/certora/conf/smart-vault.conf b/packages/smart-vault/certora/conf/smart-vault.conf index fb0e0f2c..2dc014be 100644 --- a/packages/smart-vault/certora/conf/smart-vault.conf +++ b/packages/smart-vault/certora/conf/smart-vault.conf @@ -1,9 +1,9 @@ { "files": [ "contracts/SmartVault.sol", + "../../node_modules/@mimic-fi/helpers/contracts/mocks/WrappedNativeTokenMock.sol", "../../packages/authorizer/contracts/Authorizer.sol", "../../packages/fee-controller/contracts/FeeController.sol", - "../../packages/helpers/contracts/mocks/WrappedNativeTokenMock.sol", "../../packages/registry/contracts/Registry.sol", "certora/helpers/Helpers.sol" ], @@ -24,9 +24,9 @@ ], "optimistic_loop": true, "packages": [ + "@mimic-fi/helpers=../../node_modules/@mimic-fi/helpers", "@mimic-fi/v3-authorizer=../../node_modules/@mimic-fi/v3-authorizer", "@mimic-fi/v3-fee-controller=../../node_modules/@mimic-fi/v3-fee-controller", - "@mimic-fi/v3-helpers=../../node_modules/@mimic-fi/v3-helpers", "@mimic-fi/v3-price-oracle=../../node_modules/@mimic-fi/v3-price-oracle", "@mimic-fi/v3-registry=../../node_modules/@mimic-fi/v3-registry", "@openzeppelin=../../node_modules/@openzeppelin", diff --git a/packages/smart-vault/certora/helpers/Helpers.sol b/packages/smart-vault/certora/helpers/Helpers.sol index 99e7ec66..a212bda1 100644 --- a/packages/smart-vault/certora/helpers/Helpers.sol +++ b/packages/smart-vault/certora/helpers/Helpers.sol @@ -2,9 +2,9 @@ pragma solidity ^0.8.0; +import '@mimic-fi/helpers/contracts/utils/Denominations.sol'; +import '@mimic-fi/helpers/contracts/utils/ERC20Helpers.sol'; import '@mimic-fi/v3-authorizer/contracts/interfaces/IAuthorizer.sol'; -import '@mimic-fi/v3-helpers/contracts/utils/Denominations.sol'; -import '@mimic-fi/v3-helpers/contracts/utils/ERC20Helpers.sol'; contract Helpers { function NATIVE_TOKEN() external pure returns (address) { diff --git a/packages/smart-vault/contracts/SmartVault.sol b/packages/smart-vault/contracts/SmartVault.sol index 9d2dc790..2fe90702 100644 --- a/packages/smart-vault/contracts/SmartVault.sol +++ b/packages/smart-vault/contracts/SmartVault.sol @@ -19,12 +19,12 @@ import '@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol'; import '@openzeppelin/contracts/utils/Address.sol'; import '@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol'; +import '@mimic-fi/helpers/contracts/math/FixedPoint.sol'; +import '@mimic-fi/helpers/contracts/utils/ERC20Helpers.sol'; +import '@mimic-fi/helpers/contracts/utils/IWrappedNativeToken.sol'; import '@mimic-fi/v3-authorizer/contracts/Authorized.sol'; import '@mimic-fi/v3-authorizer/contracts/interfaces/IAuthorizer.sol'; import '@mimic-fi/v3-fee-controller/contracts/interfaces/IFeeController.sol'; -import '@mimic-fi/v3-helpers/contracts/math/FixedPoint.sol'; -import '@mimic-fi/v3-helpers/contracts/utils/ERC20Helpers.sol'; -import '@mimic-fi/v3-helpers/contracts/utils/IWrappedNativeToken.sol'; import '@mimic-fi/v3-price-oracle/contracts/interfaces/IPriceOracle.sol'; import '@mimic-fi/v3-registry/contracts/interfaces/IRegistry.sol'; diff --git a/packages/smart-vault/package.json b/packages/smart-vault/package.json index 49585a09..0df35997 100644 --- a/packages/smart-vault/package.json +++ b/packages/smart-vault/package.json @@ -20,9 +20,9 @@ "prove:ci": "yarn prove --solc solc8.17" }, "dependencies": { + "@mimic-fi/helpers": "1.0.0", "@mimic-fi/v3-authorizer": "0.1.0", "@mimic-fi/v3-fee-controller": "0.1.0", - "@mimic-fi/v3-helpers": "0.1.0", "@mimic-fi/v3-price-oracle": "0.1.0", "@mimic-fi/v3-registry": "0.1.0", "@openzeppelin/contracts": "4.9.3", diff --git a/packages/tasks/contracts/base/BaseTask.sol b/packages/tasks/contracts/base/BaseTask.sol index fcf18507..ec77535b 100644 --- a/packages/tasks/contracts/base/BaseTask.sol +++ b/packages/tasks/contracts/base/BaseTask.sol @@ -14,9 +14,9 @@ pragma solidity ^0.8.0; +import '@mimic-fi/helpers/contracts/math/FixedPoint.sol'; +import '@mimic-fi/helpers/contracts/utils/Denominations.sol'; import '@mimic-fi/v3-authorizer/contracts/Authorized.sol'; -import '@mimic-fi/v3-helpers/contracts/math/FixedPoint.sol'; -import '@mimic-fi/v3-helpers/contracts/utils/Denominations.sol'; import '@mimic-fi/v3-price-oracle/contracts/interfaces/IPriceOracle.sol'; import '@mimic-fi/v3-smart-vault/contracts/interfaces/ISmartVault.sol'; diff --git a/packages/tasks/contracts/base/GasLimitedTask.sol b/packages/tasks/contracts/base/GasLimitedTask.sol index 281b487e..279997ec 100644 --- a/packages/tasks/contracts/base/GasLimitedTask.sol +++ b/packages/tasks/contracts/base/GasLimitedTask.sol @@ -14,8 +14,8 @@ pragma solidity ^0.8.17; +import '@mimic-fi/helpers/contracts/math/FixedPoint.sol'; import '@mimic-fi/v3-authorizer/contracts/Authorized.sol'; -import '@mimic-fi/v3-helpers/contracts/math/FixedPoint.sol'; import '@mimic-fi/v3-smart-vault/contracts/interfaces/ISmartVault.sol'; import '../interfaces/base/IGasLimitedTask.sol'; diff --git a/packages/tasks/contracts/base/PausableTask.sol b/packages/tasks/contracts/base/PausableTask.sol index 539ce981..87460c07 100644 --- a/packages/tasks/contracts/base/PausableTask.sol +++ b/packages/tasks/contracts/base/PausableTask.sol @@ -14,8 +14,8 @@ pragma solidity ^0.8.17; +import '@mimic-fi/helpers/contracts/math/FixedPoint.sol'; import '@mimic-fi/v3-authorizer/contracts/Authorized.sol'; -import '@mimic-fi/v3-helpers/contracts/math/FixedPoint.sol'; import '../interfaces/base/IPausableTask.sol'; diff --git a/packages/tasks/contracts/base/TokenThresholdTask.sol b/packages/tasks/contracts/base/TokenThresholdTask.sol index 83d3087e..8108108d 100644 --- a/packages/tasks/contracts/base/TokenThresholdTask.sol +++ b/packages/tasks/contracts/base/TokenThresholdTask.sol @@ -14,8 +14,8 @@ pragma solidity ^0.8.3; +import '@mimic-fi/helpers/contracts/math/FixedPoint.sol'; import '@mimic-fi/v3-authorizer/contracts/Authorized.sol'; -import '@mimic-fi/v3-helpers/contracts/math/FixedPoint.sol'; import '../interfaces/base/ITokenThresholdTask.sol'; diff --git a/packages/tasks/contracts/base/VolumeLimitedTask.sol b/packages/tasks/contracts/base/VolumeLimitedTask.sol index 8d8525ac..be92c438 100644 --- a/packages/tasks/contracts/base/VolumeLimitedTask.sol +++ b/packages/tasks/contracts/base/VolumeLimitedTask.sol @@ -14,8 +14,8 @@ pragma solidity ^0.8.17; +import '@mimic-fi/helpers/contracts/math/FixedPoint.sol'; import '@mimic-fi/v3-authorizer/contracts/Authorized.sol'; -import '@mimic-fi/v3-helpers/contracts/math/FixedPoint.sol'; import '../interfaces/base/IVolumeLimitedTask.sol'; diff --git a/packages/tasks/contracts/bridge/AxelarBridger.sol b/packages/tasks/contracts/bridge/AxelarBridger.sol index 53605344..4152cabf 100644 --- a/packages/tasks/contracts/bridge/AxelarBridger.sol +++ b/packages/tasks/contracts/bridge/AxelarBridger.sol @@ -14,7 +14,7 @@ pragma solidity ^0.8.0; -import '@mimic-fi/v3-helpers/contracts/math/FixedPoint.sol'; +import '@mimic-fi/helpers/contracts/math/FixedPoint.sol'; import '@mimic-fi/v3-connectors/contracts/interfaces/axelar/IAxelarConnector.sol'; import './BaseBridgeTask.sol'; diff --git a/packages/tasks/contracts/bridge/BaseBridgeTask.sol b/packages/tasks/contracts/bridge/BaseBridgeTask.sol index aec873e2..aece6394 100644 --- a/packages/tasks/contracts/bridge/BaseBridgeTask.sol +++ b/packages/tasks/contracts/bridge/BaseBridgeTask.sol @@ -14,7 +14,7 @@ pragma solidity ^0.8.0; -import '@mimic-fi/v3-helpers/contracts/math/FixedPoint.sol'; +import '@mimic-fi/helpers/contracts/math/FixedPoint.sol'; import '../Task.sol'; import '../interfaces/bridge/IBaseBridgeTask.sol'; diff --git a/packages/tasks/contracts/bridge/ConnextBridger.sol b/packages/tasks/contracts/bridge/ConnextBridger.sol index 1e1794b0..e1f81e62 100644 --- a/packages/tasks/contracts/bridge/ConnextBridger.sol +++ b/packages/tasks/contracts/bridge/ConnextBridger.sol @@ -14,7 +14,7 @@ pragma solidity ^0.8.0; -import '@mimic-fi/v3-helpers/contracts/math/FixedPoint.sol'; +import '@mimic-fi/helpers/contracts/math/FixedPoint.sol'; import '@mimic-fi/v3-connectors/contracts/interfaces/connext/IConnextConnector.sol'; import './BaseBridgeTask.sol'; diff --git a/packages/tasks/contracts/bridge/HopBridger.sol b/packages/tasks/contracts/bridge/HopBridger.sol index a242d9e3..a187b0a1 100644 --- a/packages/tasks/contracts/bridge/HopBridger.sol +++ b/packages/tasks/contracts/bridge/HopBridger.sol @@ -14,7 +14,7 @@ pragma solidity ^0.8.0; -import '@mimic-fi/v3-helpers/contracts/math/FixedPoint.sol'; +import '@mimic-fi/helpers/contracts/math/FixedPoint.sol'; import '@mimic-fi/v3-connectors/contracts/interfaces/hop/IHopBridgeConnector.sol'; import './BaseBridgeTask.sol'; diff --git a/packages/tasks/contracts/bridge/SymbiosisBridger.sol b/packages/tasks/contracts/bridge/SymbiosisBridger.sol index 5b6bc36b..cdbcb42a 100644 --- a/packages/tasks/contracts/bridge/SymbiosisBridger.sol +++ b/packages/tasks/contracts/bridge/SymbiosisBridger.sol @@ -14,7 +14,7 @@ pragma solidity ^0.8.0; -import '@mimic-fi/v3-helpers/contracts/math/FixedPoint.sol'; +import '@mimic-fi/helpers/contracts/math/FixedPoint.sol'; import '@mimic-fi/v3-connectors/contracts/interfaces/symbiosis/ISymbiosisConnector.sol'; import './BaseBridgeTask.sol'; diff --git a/packages/tasks/contracts/bridge/WormholeBridger.sol b/packages/tasks/contracts/bridge/WormholeBridger.sol index 13eb1643..53786d22 100644 --- a/packages/tasks/contracts/bridge/WormholeBridger.sol +++ b/packages/tasks/contracts/bridge/WormholeBridger.sol @@ -14,7 +14,7 @@ pragma solidity ^0.8.0; -import '@mimic-fi/v3-helpers/contracts/math/FixedPoint.sol'; +import '@mimic-fi/helpers/contracts/math/FixedPoint.sol'; import '@mimic-fi/v3-connectors/contracts/interfaces/wormhole/IWormholeConnector.sol'; import './BaseBridgeTask.sol'; diff --git a/packages/tasks/contracts/liquidity/balancer/BalancerV2PoolExiter.sol b/packages/tasks/contracts/liquidity/balancer/BalancerV2PoolExiter.sol index fc44dd9a..0a88ac49 100644 --- a/packages/tasks/contracts/liquidity/balancer/BalancerV2PoolExiter.sol +++ b/packages/tasks/contracts/liquidity/balancer/BalancerV2PoolExiter.sol @@ -16,7 +16,7 @@ pragma solidity ^0.8.0; import '@openzeppelin/contracts/token/ERC20/IERC20.sol'; -import '@mimic-fi/v3-helpers/contracts/math/FixedPoint.sol'; +import '@mimic-fi/helpers/contracts/math/FixedPoint.sol'; import '@mimic-fi/v3-connectors/contracts/interfaces/balancer/IBalancerV2Vault.sol'; import '@mimic-fi/v3-connectors/contracts/interfaces/balancer/IBalancerV2PoolConnector.sol'; diff --git a/packages/tasks/contracts/liquidity/convex/ConvexExiter.sol b/packages/tasks/contracts/liquidity/convex/ConvexExiter.sol index 752ed547..aae39ee5 100644 --- a/packages/tasks/contracts/liquidity/convex/ConvexExiter.sol +++ b/packages/tasks/contracts/liquidity/convex/ConvexExiter.sol @@ -14,7 +14,7 @@ pragma solidity ^0.8.0; -import '@mimic-fi/v3-helpers/contracts/utils/BytesHelpers.sol'; +import '@mimic-fi/helpers/contracts/utils/BytesHelpers.sol'; import '@mimic-fi/v3-connectors/contracts/interfaces/convex/IConvexConnector.sol'; import './BaseConvexTask.sol'; diff --git a/packages/tasks/contracts/liquidity/convex/ConvexJoiner.sol b/packages/tasks/contracts/liquidity/convex/ConvexJoiner.sol index fe32718d..4397e9af 100644 --- a/packages/tasks/contracts/liquidity/convex/ConvexJoiner.sol +++ b/packages/tasks/contracts/liquidity/convex/ConvexJoiner.sol @@ -14,7 +14,7 @@ pragma solidity ^0.8.0; -import '@mimic-fi/v3-helpers/contracts/utils/BytesHelpers.sol'; +import '@mimic-fi/helpers/contracts/utils/BytesHelpers.sol'; import '@mimic-fi/v3-connectors/contracts/interfaces/convex/IConvexConnector.sol'; import './BaseConvexTask.sol'; diff --git a/packages/tasks/contracts/liquidity/curve/BaseCurveTask.sol b/packages/tasks/contracts/liquidity/curve/BaseCurveTask.sol index d8fed6f3..fe9f5fc7 100644 --- a/packages/tasks/contracts/liquidity/curve/BaseCurveTask.sol +++ b/packages/tasks/contracts/liquidity/curve/BaseCurveTask.sol @@ -14,7 +14,7 @@ pragma solidity ^0.8.0; -import '@mimic-fi/v3-helpers/contracts/math/FixedPoint.sol'; +import '@mimic-fi/helpers/contracts/math/FixedPoint.sol'; import '../../Task.sol'; import '../../interfaces/liquidity/curve/IBaseCurveTask.sol'; diff --git a/packages/tasks/contracts/liquidity/curve/Curve2CrvExiter.sol b/packages/tasks/contracts/liquidity/curve/Curve2CrvExiter.sol index f9a6605d..6e217079 100644 --- a/packages/tasks/contracts/liquidity/curve/Curve2CrvExiter.sol +++ b/packages/tasks/contracts/liquidity/curve/Curve2CrvExiter.sol @@ -14,7 +14,7 @@ pragma solidity ^0.8.0; -import '@mimic-fi/v3-helpers/contracts/utils/BytesHelpers.sol'; +import '@mimic-fi/helpers/contracts/utils/BytesHelpers.sol'; import '@mimic-fi/v3-connectors/contracts/interfaces/curve/ICurve2CrvConnector.sol'; import './BaseCurveTask.sol'; diff --git a/packages/tasks/contracts/liquidity/curve/Curve2CrvJoiner.sol b/packages/tasks/contracts/liquidity/curve/Curve2CrvJoiner.sol index 36389e45..f9175521 100644 --- a/packages/tasks/contracts/liquidity/curve/Curve2CrvJoiner.sol +++ b/packages/tasks/contracts/liquidity/curve/Curve2CrvJoiner.sol @@ -14,7 +14,7 @@ pragma solidity ^0.8.0; -import '@mimic-fi/v3-helpers/contracts/utils/BytesHelpers.sol'; +import '@mimic-fi/helpers/contracts/utils/BytesHelpers.sol'; import '@mimic-fi/v3-connectors/contracts/interfaces/curve/ICurve2CrvConnector.sol'; import './BaseCurveTask.sol'; diff --git a/packages/tasks/contracts/primitives/Collector.sol b/packages/tasks/contracts/primitives/Collector.sol index 632583f6..5bc33097 100644 --- a/packages/tasks/contracts/primitives/Collector.sol +++ b/packages/tasks/contracts/primitives/Collector.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 '../Task.sol'; import '../interfaces/primitives/ICollector.sol'; diff --git a/packages/tasks/contracts/primitives/Depositor.sol b/packages/tasks/contracts/primitives/Depositor.sol index f9f97148..0678d2bd 100644 --- a/packages/tasks/contracts/primitives/Depositor.sol +++ b/packages/tasks/contracts/primitives/Depositor.sol @@ -16,8 +16,8 @@ pragma solidity ^0.8.0; import '@openzeppelin/contracts/utils/Address.sol'; -import '@mimic-fi/v3-helpers/contracts/utils/ERC20Helpers.sol'; -import '@mimic-fi/v3-helpers/contracts/utils/Denominations.sol'; +import '@mimic-fi/helpers/contracts/utils/ERC20Helpers.sol'; +import '@mimic-fi/helpers/contracts/utils/Denominations.sol'; import '../Task.sol'; import '../interfaces/primitives/IDepositor.sol'; diff --git a/packages/tasks/contracts/primitives/HandleOver.sol b/packages/tasks/contracts/primitives/HandleOver.sol index 951fde3b..33d867e7 100644 --- a/packages/tasks/contracts/primitives/HandleOver.sol +++ b/packages/tasks/contracts/primitives/HandleOver.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 '../Task.sol'; import '../interfaces/primitives/IHandleOver.sol'; diff --git a/packages/tasks/contracts/primitives/Wrapper.sol b/packages/tasks/contracts/primitives/Wrapper.sol index bc6e69f6..bdce0996 100644 --- a/packages/tasks/contracts/primitives/Wrapper.sol +++ b/packages/tasks/contracts/primitives/Wrapper.sol @@ -14,7 +14,7 @@ pragma solidity ^0.8.0; -import '@mimic-fi/v3-helpers/contracts/utils/Denominations.sol'; +import '@mimic-fi/helpers/contracts/utils/Denominations.sol'; import '../Task.sol'; import '../interfaces/primitives/IWrapper.sol'; diff --git a/packages/tasks/contracts/relayer/BaseRelayerFundTask.sol b/packages/tasks/contracts/relayer/BaseRelayerFundTask.sol index 56eabc3c..ed208278 100644 --- a/packages/tasks/contracts/relayer/BaseRelayerFundTask.sol +++ b/packages/tasks/contracts/relayer/BaseRelayerFundTask.sol @@ -14,7 +14,7 @@ pragma solidity ^0.8.0; -import '@mimic-fi/v3-helpers/contracts/math/FixedPoint.sol'; +import '@mimic-fi/helpers/contracts/math/FixedPoint.sol'; import '@mimic-fi/v3-relayer/contracts/interfaces/IRelayer.sol'; import '../Task.sol'; diff --git a/packages/tasks/contracts/relayer/RelayerDepositor.sol b/packages/tasks/contracts/relayer/RelayerDepositor.sol index 62826dbd..6e7dbafb 100644 --- a/packages/tasks/contracts/relayer/RelayerDepositor.sol +++ b/packages/tasks/contracts/relayer/RelayerDepositor.sol @@ -14,7 +14,7 @@ pragma solidity ^0.8.0; -import '@mimic-fi/v3-helpers/contracts/math/FixedPoint.sol'; +import '@mimic-fi/helpers/contracts/math/FixedPoint.sol'; import '@mimic-fi/v3-relayer/contracts/interfaces/IRelayer.sol'; import '../Task.sol'; diff --git a/packages/tasks/contracts/swap/BalancerV2BoostedSwapper.sol b/packages/tasks/contracts/swap/BalancerV2BoostedSwapper.sol index cdbcb42e..ca80806e 100644 --- a/packages/tasks/contracts/swap/BalancerV2BoostedSwapper.sol +++ b/packages/tasks/contracts/swap/BalancerV2BoostedSwapper.sol @@ -14,8 +14,8 @@ pragma solidity ^0.8.0; -import '@mimic-fi/v3-helpers/contracts/math/FixedPoint.sol'; -import '@mimic-fi/v3-helpers/contracts/utils/BytesHelpers.sol'; +import '@mimic-fi/helpers/contracts/math/FixedPoint.sol'; +import '@mimic-fi/helpers/contracts/utils/BytesHelpers.sol'; import '@mimic-fi/v3-connectors/contracts/interfaces/balancer/IBalancerV2Vault.sol'; import '@mimic-fi/v3-connectors/contracts/interfaces/balancer/IBalancerV2SwapConnector.sol'; diff --git a/packages/tasks/contracts/swap/BalancerV2BptSwapper.sol b/packages/tasks/contracts/swap/BalancerV2BptSwapper.sol index 0f3d9855..15b3b516 100644 --- a/packages/tasks/contracts/swap/BalancerV2BptSwapper.sol +++ b/packages/tasks/contracts/swap/BalancerV2BptSwapper.sol @@ -14,8 +14,8 @@ pragma solidity ^0.8.0; -import '@mimic-fi/v3-helpers/contracts/math/FixedPoint.sol'; -import '@mimic-fi/v3-helpers/contracts/utils/BytesHelpers.sol'; +import '@mimic-fi/helpers/contracts/math/FixedPoint.sol'; +import '@mimic-fi/helpers/contracts/utils/BytesHelpers.sol'; import '@mimic-fi/v3-connectors/contracts/interfaces/balancer/IBalancerV2SwapConnector.sol'; import './BaseSwapTask.sol'; diff --git a/packages/tasks/contracts/swap/BalancerV2LinearSwapper.sol b/packages/tasks/contracts/swap/BalancerV2LinearSwapper.sol index 991004a8..303eda00 100644 --- a/packages/tasks/contracts/swap/BalancerV2LinearSwapper.sol +++ b/packages/tasks/contracts/swap/BalancerV2LinearSwapper.sol @@ -14,8 +14,8 @@ pragma solidity ^0.8.0; -import '@mimic-fi/v3-helpers/contracts/math/FixedPoint.sol'; -import '@mimic-fi/v3-helpers/contracts/utils/BytesHelpers.sol'; +import '@mimic-fi/helpers/contracts/math/FixedPoint.sol'; +import '@mimic-fi/helpers/contracts/utils/BytesHelpers.sol'; import '@mimic-fi/v3-connectors/contracts/interfaces/balancer/IBalancerV2SwapConnector.sol'; import './BalancerV2BptSwapper.sol'; diff --git a/packages/tasks/contracts/swap/BalancerV2Swapper.sol b/packages/tasks/contracts/swap/BalancerV2Swapper.sol index 38f0850c..d2080a18 100644 --- a/packages/tasks/contracts/swap/BalancerV2Swapper.sol +++ b/packages/tasks/contracts/swap/BalancerV2Swapper.sol @@ -14,8 +14,8 @@ pragma solidity ^0.8.0; -import '@mimic-fi/v3-helpers/contracts/math/FixedPoint.sol'; -import '@mimic-fi/v3-helpers/contracts/utils/BytesHelpers.sol'; +import '@mimic-fi/helpers/contracts/math/FixedPoint.sol'; +import '@mimic-fi/helpers/contracts/utils/BytesHelpers.sol'; import '@mimic-fi/v3-connectors/contracts/interfaces/balancer/IBalancerV2SwapConnector.sol'; import './BaseSwapTask.sol'; diff --git a/packages/tasks/contracts/swap/BaseSwapTask.sol b/packages/tasks/contracts/swap/BaseSwapTask.sol index e52e5f7d..3016a49a 100644 --- a/packages/tasks/contracts/swap/BaseSwapTask.sol +++ b/packages/tasks/contracts/swap/BaseSwapTask.sol @@ -14,8 +14,8 @@ pragma solidity ^0.8.0; -import '@mimic-fi/v3-helpers/contracts/math/FixedPoint.sol'; -import '@mimic-fi/v3-helpers/contracts/utils/Denominations.sol'; +import '@mimic-fi/helpers/contracts/math/FixedPoint.sol'; +import '@mimic-fi/helpers/contracts/utils/Denominations.sol'; import '../Task.sol'; import '../interfaces/swap/IBaseSwapTask.sol'; diff --git a/packages/tasks/contracts/swap/BebopSwapper.sol b/packages/tasks/contracts/swap/BebopSwapper.sol index 0e5f8ae9..7d7b1f1c 100644 --- a/packages/tasks/contracts/swap/BebopSwapper.sol +++ b/packages/tasks/contracts/swap/BebopSwapper.sol @@ -14,8 +14,8 @@ pragma solidity ^0.8.0; -import '@mimic-fi/v3-helpers/contracts/math/FixedPoint.sol'; -import '@mimic-fi/v3-helpers/contracts/utils/BytesHelpers.sol'; +import '@mimic-fi/helpers/contracts/math/FixedPoint.sol'; +import '@mimic-fi/helpers/contracts/utils/BytesHelpers.sol'; import '@mimic-fi/v3-connectors/contracts/interfaces/bebop/IBebopConnector.sol'; import './BaseSwapTask.sol'; diff --git a/packages/tasks/contracts/swap/HopL2Swapper.sol b/packages/tasks/contracts/swap/HopL2Swapper.sol index 4b50eaad..4cb36baf 100644 --- a/packages/tasks/contracts/swap/HopL2Swapper.sol +++ b/packages/tasks/contracts/swap/HopL2Swapper.sol @@ -14,7 +14,7 @@ pragma solidity ^0.8.0; -import '@mimic-fi/v3-helpers/contracts/utils/BytesHelpers.sol'; +import '@mimic-fi/helpers/contracts/utils/BytesHelpers.sol'; import '@mimic-fi/v3-connectors/contracts/interfaces/hop/IHopL2Amm.sol'; import '@mimic-fi/v3-connectors/contracts/interfaces/hop/IHopSwapConnector.sol'; diff --git a/packages/tasks/contracts/swap/KyberSwapV2Swapper.sol b/packages/tasks/contracts/swap/KyberSwapV2Swapper.sol index a99a58aa..d03d54a3 100644 --- a/packages/tasks/contracts/swap/KyberSwapV2Swapper.sol +++ b/packages/tasks/contracts/swap/KyberSwapV2Swapper.sol @@ -14,8 +14,8 @@ pragma solidity ^0.8.0; -import '@mimic-fi/v3-helpers/contracts/math/FixedPoint.sol'; -import '@mimic-fi/v3-helpers/contracts/utils/BytesHelpers.sol'; +import '@mimic-fi/helpers/contracts/math/FixedPoint.sol'; +import '@mimic-fi/helpers/contracts/utils/BytesHelpers.sol'; import '@mimic-fi/v3-connectors/contracts/interfaces/kyberswap/IKyberSwapV2Connector.sol'; import './BaseSwapTask.sol'; diff --git a/packages/tasks/contracts/swap/OdosV2Swapper.sol b/packages/tasks/contracts/swap/OdosV2Swapper.sol index 45bcba4e..922f2e24 100644 --- a/packages/tasks/contracts/swap/OdosV2Swapper.sol +++ b/packages/tasks/contracts/swap/OdosV2Swapper.sol @@ -14,8 +14,8 @@ pragma solidity ^0.8.0; -import '@mimic-fi/v3-helpers/contracts/math/FixedPoint.sol'; -import '@mimic-fi/v3-helpers/contracts/utils/BytesHelpers.sol'; +import '@mimic-fi/helpers/contracts/math/FixedPoint.sol'; +import '@mimic-fi/helpers/contracts/utils/BytesHelpers.sol'; import '@mimic-fi/v3-connectors/contracts/interfaces/odos/IOdosV2Connector.sol'; import './BaseSwapTask.sol'; diff --git a/packages/tasks/contracts/swap/OneInchV5Swapper.sol b/packages/tasks/contracts/swap/OneInchV5Swapper.sol index 756c1e78..b62c2645 100644 --- a/packages/tasks/contracts/swap/OneInchV5Swapper.sol +++ b/packages/tasks/contracts/swap/OneInchV5Swapper.sol @@ -14,8 +14,8 @@ pragma solidity ^0.8.0; -import '@mimic-fi/v3-helpers/contracts/math/FixedPoint.sol'; -import '@mimic-fi/v3-helpers/contracts/utils/BytesHelpers.sol'; +import '@mimic-fi/helpers/contracts/math/FixedPoint.sol'; +import '@mimic-fi/helpers/contracts/utils/BytesHelpers.sol'; import '@mimic-fi/v3-connectors/contracts/interfaces/1inch/IOneInchV5Connector.sol'; import './BaseSwapTask.sol'; diff --git a/packages/tasks/contracts/swap/ParaswapV5Swapper.sol b/packages/tasks/contracts/swap/ParaswapV5Swapper.sol index 4f389c7b..633f5171 100644 --- a/packages/tasks/contracts/swap/ParaswapV5Swapper.sol +++ b/packages/tasks/contracts/swap/ParaswapV5Swapper.sol @@ -14,8 +14,8 @@ pragma solidity ^0.8.0; -import '@mimic-fi/v3-helpers/contracts/math/FixedPoint.sol'; -import '@mimic-fi/v3-helpers/contracts/utils/BytesHelpers.sol'; +import '@mimic-fi/helpers/contracts/math/FixedPoint.sol'; +import '@mimic-fi/helpers/contracts/utils/BytesHelpers.sol'; import '@mimic-fi/v3-connectors/contracts/interfaces/paraswap/IParaswapV5Connector.sol'; import './BaseSwapTask.sol'; diff --git a/packages/tasks/contracts/swap/UniswapV2Swapper.sol b/packages/tasks/contracts/swap/UniswapV2Swapper.sol index 75203d36..1cefb5e3 100644 --- a/packages/tasks/contracts/swap/UniswapV2Swapper.sol +++ b/packages/tasks/contracts/swap/UniswapV2Swapper.sol @@ -14,8 +14,8 @@ pragma solidity ^0.8.0; -import '@mimic-fi/v3-helpers/contracts/math/FixedPoint.sol'; -import '@mimic-fi/v3-helpers/contracts/utils/BytesHelpers.sol'; +import '@mimic-fi/helpers/contracts/math/FixedPoint.sol'; +import '@mimic-fi/helpers/contracts/utils/BytesHelpers.sol'; import '@mimic-fi/v3-connectors/contracts/interfaces/uniswap/IUniswapV2Connector.sol'; import './BaseSwapTask.sol'; diff --git a/packages/tasks/contracts/swap/UniswapV3Swapper.sol b/packages/tasks/contracts/swap/UniswapV3Swapper.sol index b232a6c5..df8f5173 100644 --- a/packages/tasks/contracts/swap/UniswapV3Swapper.sol +++ b/packages/tasks/contracts/swap/UniswapV3Swapper.sol @@ -14,8 +14,8 @@ pragma solidity ^0.8.0; -import '@mimic-fi/v3-helpers/contracts/math/FixedPoint.sol'; -import '@mimic-fi/v3-helpers/contracts/utils/BytesHelpers.sol'; +import '@mimic-fi/helpers/contracts/math/FixedPoint.sol'; +import '@mimic-fi/helpers/contracts/utils/BytesHelpers.sol'; import '@mimic-fi/v3-connectors/contracts/interfaces/uniswap/IUniswapV3Connector.sol'; import './BaseSwapTask.sol'; diff --git a/packages/tasks/contracts/test/liquidity/ConvexConnectorMock.sol b/packages/tasks/contracts/test/liquidity/ConvexConnectorMock.sol index 375661bf..88d6ece9 100644 --- a/packages/tasks/contracts/test/liquidity/ConvexConnectorMock.sol +++ b/packages/tasks/contracts/test/liquidity/ConvexConnectorMock.sol @@ -14,7 +14,7 @@ pragma solidity ^0.8.0; -import '@mimic-fi/v3-helpers/contracts/mocks/TokenMock.sol'; +import '@mimic-fi/helpers/contracts/mocks/TokenMock.sol'; contract ConvexConnectorMock { IERC20 public immutable rewardToken; diff --git a/packages/tasks/contracts/test/mocks/FeedMock.sol b/packages/tasks/contracts/test/mocks/FeedMock.sol new file mode 100644 index 00000000..827d1bd4 --- /dev/null +++ b/packages/tasks/contracts/test/mocks/FeedMock.sol @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: MIT + +pragma solidity ^0.8.0; + +contract FeedMock { + uint8 public decimals; + int256 public price; + + constructor(int256 _price, uint8 _decimals) { + price = _price; + decimals = _decimals; + } + + function latestRoundData() external view returns (uint80, int256 answer, uint256, uint256, uint80) { + return (0, price, 0, 0, 0); + } +} diff --git a/packages/tasks/hardhat.config.ts b/packages/tasks/hardhat.config.ts index 9a009c6c..26d1b039 100644 --- a/packages/tasks/hardhat.config.ts +++ b/packages/tasks/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 'hardhat-gas-reporter' diff --git a/packages/tasks/package.json b/packages/tasks/package.json index b51a7030..54b8df9e 100644 --- a/packages/tasks/package.json +++ b/packages/tasks/package.json @@ -22,9 +22,9 @@ "prepare": "yarn build" }, "dependencies": { + "@mimic-fi/helpers": "1.0.0", "@mimic-fi/v3-authorizer": "0.1.1", "@mimic-fi/v3-connectors": "0.2.4", - "@mimic-fi/v3-helpers": "0.1.9", "@mimic-fi/v3-price-oracle": "0.1.0", "@mimic-fi/v3-smart-vault": "0.1.0", "@openzeppelin/contracts": "4.9.3", diff --git a/packages/tasks/src/setup.ts b/packages/tasks/src/setup.ts index c76955f3..e68814de 100644 --- a/packages/tasks/src/setup.ts +++ b/packages/tasks/src/setup.ts @@ -7,7 +7,7 @@ import { getSigner, ZERO_ADDRESS, ZERO_BYTES32, -} from '@mimic-fi/v3-helpers' +} from '@mimic-fi/helpers' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/dist/src/signer-with-address' import { Contract } from 'ethers' diff --git a/packages/tasks/test/base/BaseTask.test.ts b/packages/tasks/test/base/BaseTask.test.ts index f53d9d41..de8de35f 100644 --- a/packages/tasks/test/base/BaseTask.test.ts +++ b/packages/tasks/test/base/BaseTask.test.ts @@ -9,7 +9,7 @@ import { NATIVE_TOKEN_ADDRESS, ONES_BYTES32, ZERO_BYTES32, -} from '@mimic-fi/v3-helpers' +} 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/tasks/test/base/GasLimitedTask.test.ts b/packages/tasks/test/base/GasLimitedTask.test.ts index 3d038940..0ec31949 100644 --- a/packages/tasks/test/base/GasLimitedTask.test.ts +++ b/packages/tasks/test/base/GasLimitedTask.test.ts @@ -7,7 +7,7 @@ import { NATIVE_TOKEN_ADDRESS, ZERO_ADDRESS, ZERO_BYTES32, -} from '@mimic-fi/v3-helpers' +} 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/tasks/test/base/PausableTask.test.ts b/packages/tasks/test/base/PausableTask.test.ts index 815bd540..9af9f55b 100644 --- a/packages/tasks/test/base/PausableTask.test.ts +++ b/packages/tasks/test/base/PausableTask.test.ts @@ -1,4 +1,4 @@ -import { assertEvent, deployProxy, fp, getSigners, NATIVE_TOKEN_ADDRESS, ZERO_BYTES32 } from '@mimic-fi/v3-helpers' +import { assertEvent, deployProxy, fp, getSigners, NATIVE_TOKEN_ADDRESS, ZERO_BYTES32 } 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/tasks/test/base/TimeLockedTask.test.ts b/packages/tasks/test/base/TimeLockedTask.test.ts index c3f28530..ddda81c4 100644 --- a/packages/tasks/test/base/TimeLockedTask.test.ts +++ b/packages/tasks/test/base/TimeLockedTask.test.ts @@ -9,7 +9,7 @@ import { HOUR, MINUTE, ZERO_BYTES32, -} from '@mimic-fi/v3-helpers' +} 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/tasks/test/base/TokenIndexedTask.test.ts b/packages/tasks/test/base/TokenIndexedTask.test.ts index 358f7aed..50b54319 100644 --- a/packages/tasks/test/base/TokenIndexedTask.test.ts +++ b/packages/tasks/test/base/TokenIndexedTask.test.ts @@ -1,4 +1,4 @@ -import { assertEvent, deployProxy, getSigners, ZERO_ADDRESS, ZERO_BYTES32 } from '@mimic-fi/v3-helpers' +import { assertEvent, deployProxy, getSigners, ZERO_ADDRESS, ZERO_BYTES32 } from '@mimic-fi/helpers' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' import { expect } from 'chai' import { Contract } from 'ethers' diff --git a/packages/tasks/test/base/TokenThresholdTask.test.ts b/packages/tasks/test/base/TokenThresholdTask.test.ts index 65b94a8c..b1c3d4b4 100644 --- a/packages/tasks/test/base/TokenThresholdTask.test.ts +++ b/packages/tasks/test/base/TokenThresholdTask.test.ts @@ -1,14 +1,14 @@ import { assertEvent, BigNumberish, - deployFeedMock, + deploy, deployProxy, deployTokenMock, fp, getSigners, ZERO_ADDRESS, ZERO_BYTES32, -} from '@mimic-fi/v3-helpers' +} from '@mimic-fi/helpers' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' import { expect } from 'chai' import { Contract } from 'ethers' @@ -271,7 +271,7 @@ describe('TokenThresholdTask', () => { context('when there is a custom threshold set', () => { beforeEach('mock price feed', async () => { - const feed = await deployFeedMock(fp(1600), 18) + const feed = await deploy('FeedMock', [fp(1600), 18]) const setFeedRole = await priceOracle.interface.getSighash('setFeed') await authorizer.connect(owner).authorize(owner.address, priceOracle.address, setFeedRole, []) await priceOracle.connect(owner).setFeed(WETH, USDT, feed.address) @@ -306,7 +306,7 @@ describe('TokenThresholdTask', () => { context('when there is a default threshold set', () => { beforeEach('mock price feed', async () => { - const feed = await deployFeedMock(fp(1600), 18) + const feed = await deploy('FeedMock', [fp(1600), 18]) const setFeedRole = await priceOracle.interface.getSighash('setFeed') await authorizer.connect(owner).authorize(owner.address, priceOracle.address, setFeedRole, []) await priceOracle.connect(owner).setFeed(WETH, USDC, feed.address) @@ -342,7 +342,7 @@ describe('TokenThresholdTask', () => { context('when there is a custom threshold set', () => { beforeEach('mock price feed', async () => { - const feed = await deployFeedMock(fp(1650), 18) + const feed = await deploy('FeedMock', [fp(1650), 18]) const setFeedRole = await priceOracle.interface.getSighash('setFeed') await authorizer.connect(owner).authorize(owner.address, priceOracle.address, setFeedRole, []) await priceOracle.connect(owner).setFeed(WETH, USDT, feed.address) diff --git a/packages/tasks/test/base/VolumeLimitedTask.test.ts b/packages/tasks/test/base/VolumeLimitedTask.test.ts index ce9d8d6c..018ebeaf 100644 --- a/packages/tasks/test/base/VolumeLimitedTask.test.ts +++ b/packages/tasks/test/base/VolumeLimitedTask.test.ts @@ -3,7 +3,7 @@ import { assertEvent, BigNumberish, currentTimestamp, - deployFeedMock, + deploy, deployProxy, deployTokenMock, fp, @@ -12,7 +12,7 @@ import { NATIVE_TOKEN_ADDRESS, ZERO_ADDRESS, ZERO_BYTES32, -} from '@mimic-fi/v3-helpers' +} from '@mimic-fi/helpers' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' import { expect } from 'chai' import { Contract } from 'ethers' @@ -210,7 +210,7 @@ describe('VolumeLimitedTask', () => { beforeEach('deploy new token', async () => { newToken = await deployTokenMock('TKN') - const feed = await deployFeedMock(fp(rate), 18) + const feed = await deploy('FeedMock', [fp(rate), 18]) const setFeedRole = priceOracle.interface.getSighash('setFeed') await authorizer.connect(owner).authorize(owner.address, priceOracle.address, setFeedRole, []) await priceOracle.connect(owner).setFeed(token.address, newToken.address, feed.address) @@ -252,7 +252,7 @@ describe('VolumeLimitedTask', () => { beforeEach('deploy new token', async () => { newToken = await deployTokenMock('TKN') - const feed = await deployFeedMock(fp(rate), 18) + const feed = await deploy('FeedMock', [fp(rate), 18]) const setFeedRole = priceOracle.interface.getSighash('setFeed') await authorizer.connect(owner).authorize(owner.address, priceOracle.address, setFeedRole, []) await priceOracle.connect(owner).setFeed(token.address, newToken.address, feed.address) @@ -478,7 +478,7 @@ describe('VolumeLimitedTask', () => { beforeEach('deploy new token', async () => { newLimitToken = await deployTokenMock('TKN') - const feed = await deployFeedMock(fp(rate), 18) + const feed = await deploy('FeedMock', [fp(rate), 18]) const setFeedRole = priceOracle.interface.getSighash('setFeed') await authorizer.connect(owner).authorize(owner.address, priceOracle.address, setFeedRole, []) await priceOracle.connect(owner).setFeed(limitToken.address, newLimitToken.address, feed.address) @@ -510,7 +510,7 @@ describe('VolumeLimitedTask', () => { context('when there was some volume accrued', () => { beforeEach('accrue volume', async () => { - const feed = await deployFeedMock(fp(1), 18) + const feed = await deploy('FeedMock', [fp(1), 18]) const setFeedRole = priceOracle.interface.getSighash('setFeed') await authorizer.connect(owner).authorize(owner.address, priceOracle.address, setFeedRole, []) await priceOracle.connect(owner).setFeed(token.address, limitToken.address, feed.address) @@ -525,7 +525,7 @@ describe('VolumeLimitedTask', () => { beforeEach('deploy new token', async () => { newLimitToken = await deployTokenMock('TKN') - const feed = await deployFeedMock(fp(rate), 18) + const feed = await deploy('FeedMock', [fp(rate), 18]) const setFeedRole = priceOracle.interface.getSighash('setFeed') await authorizer.connect(owner).authorize(owner.address, priceOracle.address, setFeedRole, []) await priceOracle.connect(owner).setFeed(limitToken.address, newLimitToken.address, feed.address) @@ -685,7 +685,7 @@ describe('VolumeLimitedTask', () => { beforeEach('deploy new token', async () => { limitToken = await deployTokenMock('TKN') - const feed = await deployFeedMock(fp(limitRate), 18) + const feed = await deploy('FeedMock', [fp(limitRate), 18]) const setFeedRole = priceOracle.interface.getSighash('setFeed') await authorizer.connect(owner).authorize(owner.address, priceOracle.address, setFeedRole, []) await priceOracle.connect(owner).setFeed(token.address, limitToken.address, feed.address) diff --git a/packages/tasks/test/bridge/AxelarBridger.test.ts b/packages/tasks/test/bridge/AxelarBridger.test.ts index 1e8a2f02..be32403c 100644 --- a/packages/tasks/test/bridge/AxelarBridger.test.ts +++ b/packages/tasks/test/bridge/AxelarBridger.test.ts @@ -1,4 +1,3 @@ -import { OP } from '@mimic-fi/v3-authorizer' import { assertEvent, assertIndirectEvent, @@ -11,7 +10,8 @@ import { getSigners, ZERO_ADDRESS, ZERO_BYTES32, -} from '@mimic-fi/v3-helpers' +} from '@mimic-fi/helpers' +import { OP } from '@mimic-fi/v3-authorizer' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/dist/src/signer-with-address' import { expect } from 'chai' import { Contract } from 'ethers' diff --git a/packages/tasks/test/bridge/BaseBridgeTask.behavior.ts b/packages/tasks/test/bridge/BaseBridgeTask.behavior.ts index b5458c2b..aa98d5ed 100644 --- a/packages/tasks/test/bridge/BaseBridgeTask.behavior.ts +++ b/packages/tasks/test/bridge/BaseBridgeTask.behavior.ts @@ -6,7 +6,7 @@ import { ONES_ADDRESS, ZERO_ADDRESS, ZERO_BYTES32, -} from '@mimic-fi/v3-helpers' +} from '@mimic-fi/helpers' import { expect } from 'chai' import { Contract } from 'ethers' import { ethers } from 'hardhat' diff --git a/packages/tasks/test/bridge/ConnextBridger.test.ts b/packages/tasks/test/bridge/ConnextBridger.test.ts index d0a9cdec..3ea61b67 100644 --- a/packages/tasks/test/bridge/ConnextBridger.test.ts +++ b/packages/tasks/test/bridge/ConnextBridger.test.ts @@ -1,4 +1,3 @@ -import { OP } from '@mimic-fi/v3-authorizer' import { assertEvent, assertIndirectEvent, @@ -11,7 +10,8 @@ import { getSigners, ZERO_ADDRESS, ZERO_BYTES32, -} from '@mimic-fi/v3-helpers' +} from '@mimic-fi/helpers' +import { OP } from '@mimic-fi/v3-authorizer' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/dist/src/signer-with-address' import { expect } from 'chai' import { Contract } from 'ethers' diff --git a/packages/tasks/test/bridge/HopBridger.test.ts b/packages/tasks/test/bridge/HopBridger.test.ts index 63ce5aaf..95a204f3 100644 --- a/packages/tasks/test/bridge/HopBridger.test.ts +++ b/packages/tasks/test/bridge/HopBridger.test.ts @@ -1,4 +1,3 @@ -import { OP } from '@mimic-fi/v3-authorizer' import { assertEvent, assertIndirectEvent, @@ -13,7 +12,8 @@ import { MAX_UINT256, ZERO_ADDRESS, ZERO_BYTES32, -} from '@mimic-fi/v3-helpers' +} from '@mimic-fi/helpers' +import { OP } from '@mimic-fi/v3-authorizer' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/dist/src/signer-with-address' import { expect } from 'chai' import { Contract } from 'ethers' diff --git a/packages/tasks/test/bridge/SocketBridger.test.ts b/packages/tasks/test/bridge/SocketBridger.test.ts index 6ef736b8..a6e37168 100644 --- a/packages/tasks/test/bridge/SocketBridger.test.ts +++ b/packages/tasks/test/bridge/SocketBridger.test.ts @@ -1,4 +1,3 @@ -import { OP } from '@mimic-fi/v3-authorizer' import { assertEvent, assertIndirectEvent, @@ -11,7 +10,8 @@ import { getSigners, ZERO_ADDRESS, ZERO_BYTES32, -} from '@mimic-fi/v3-helpers' +} from '@mimic-fi/helpers' +import { OP } from '@mimic-fi/v3-authorizer' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/dist/src/signer-with-address' import { expect } from 'chai' import { Contract } from 'ethers' diff --git a/packages/tasks/test/bridge/SymbiosisBridger.test.ts b/packages/tasks/test/bridge/SymbiosisBridger.test.ts index 325f0086..a398ef6b 100644 --- a/packages/tasks/test/bridge/SymbiosisBridger.test.ts +++ b/packages/tasks/test/bridge/SymbiosisBridger.test.ts @@ -1,4 +1,3 @@ -import { OP } from '@mimic-fi/v3-authorizer' import { assertEvent, assertIndirectEvent, @@ -12,7 +11,8 @@ import { ONES_ADDRESS, ZERO_ADDRESS, ZERO_BYTES32, -} from '@mimic-fi/v3-helpers' +} from '@mimic-fi/helpers' +import { OP } from '@mimic-fi/v3-authorizer' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/dist/src/signer-with-address' import { expect } from 'chai' import { Contract } from 'ethers' diff --git a/packages/tasks/test/bridge/WormholeBridger.test.ts b/packages/tasks/test/bridge/WormholeBridger.test.ts index f2948af2..56063d6d 100644 --- a/packages/tasks/test/bridge/WormholeBridger.test.ts +++ b/packages/tasks/test/bridge/WormholeBridger.test.ts @@ -1,4 +1,3 @@ -import { OP } from '@mimic-fi/v3-authorizer' import { assertEvent, assertIndirectEvent, @@ -11,7 +10,8 @@ import { getSigners, ZERO_ADDRESS, ZERO_BYTES32, -} from '@mimic-fi/v3-helpers' +} from '@mimic-fi/helpers' +import { OP } from '@mimic-fi/v3-authorizer' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/dist/src/signer-with-address' import { expect } from 'chai' import { Contract } from 'ethers' diff --git a/packages/tasks/test/liquidity/balancer/BalancerV2PoolExiter.mainnet.ts b/packages/tasks/test/liquidity/balancer/BalancerV2PoolExiter.mainnet.ts index 078324e6..ae33826c 100644 --- a/packages/tasks/test/liquidity/balancer/BalancerV2PoolExiter.mainnet.ts +++ b/packages/tasks/test/liquidity/balancer/BalancerV2PoolExiter.mainnet.ts @@ -1,4 +1,3 @@ -import { OP } from '@mimic-fi/v3-authorizer' import { assertEvent, assertIndirectEvent, @@ -11,7 +10,8 @@ import { instanceAt, ONES_ADDRESS, ZERO_ADDRESS, -} from '@mimic-fi/v3-helpers' +} from '@mimic-fi/helpers' +import { OP } from '@mimic-fi/v3-authorizer' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/dist/src/signer-with-address' import { expect } from 'chai' import { Contract, ethers } from 'ethers' diff --git a/packages/tasks/test/liquidity/convex/BaseConvexTask.behavior.ts b/packages/tasks/test/liquidity/convex/BaseConvexTask.behavior.ts index 22269002..f6b88f6a 100644 --- a/packages/tasks/test/liquidity/convex/BaseConvexTask.behavior.ts +++ b/packages/tasks/test/liquidity/convex/BaseConvexTask.behavior.ts @@ -1,4 +1,4 @@ -import { assertEvent, deployTokenMock, ZERO_ADDRESS } from '@mimic-fi/v3-helpers' +import { assertEvent, deployTokenMock, ZERO_ADDRESS } from '@mimic-fi/helpers' import { expect } from 'chai' import { Contract } from 'ethers' import { ethers } from 'hardhat' diff --git a/packages/tasks/test/liquidity/convex/ConvexClaimer.test.ts b/packages/tasks/test/liquidity/convex/ConvexClaimer.test.ts index 189584bb..03c12d16 100644 --- a/packages/tasks/test/liquidity/convex/ConvexClaimer.test.ts +++ b/packages/tasks/test/liquidity/convex/ConvexClaimer.test.ts @@ -1,4 +1,3 @@ -import { OP } from '@mimic-fi/v3-authorizer' import { assertEvent, assertIndirectEvent, @@ -9,7 +8,8 @@ import { getSigners, ZERO_ADDRESS, ZERO_BYTES32, -} from '@mimic-fi/v3-helpers' +} from '@mimic-fi/helpers' +import { OP } from '@mimic-fi/v3-authorizer' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/dist/src/signer-with-address' import { expect } from 'chai' import { Contract } from 'ethers' diff --git a/packages/tasks/test/liquidity/convex/ConvexExiter.test.ts b/packages/tasks/test/liquidity/convex/ConvexExiter.test.ts index 2c5a9706..6a440241 100644 --- a/packages/tasks/test/liquidity/convex/ConvexExiter.test.ts +++ b/packages/tasks/test/liquidity/convex/ConvexExiter.test.ts @@ -1,4 +1,3 @@ -import { OP } from '@mimic-fi/v3-authorizer' import { assertEvent, assertIndirectEvent, @@ -10,7 +9,8 @@ import { fp, getSigners, ZERO_ADDRESS, -} from '@mimic-fi/v3-helpers' +} from '@mimic-fi/helpers' +import { OP } from '@mimic-fi/v3-authorizer' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/dist/src/signer-with-address' import { expect } from 'chai' import { Contract } from 'ethers' diff --git a/packages/tasks/test/liquidity/convex/ConvexJoiner.test.ts b/packages/tasks/test/liquidity/convex/ConvexJoiner.test.ts index 019d8872..541badbd 100644 --- a/packages/tasks/test/liquidity/convex/ConvexJoiner.test.ts +++ b/packages/tasks/test/liquidity/convex/ConvexJoiner.test.ts @@ -1,4 +1,3 @@ -import { OP } from '@mimic-fi/v3-authorizer' import { assertEvent, assertIndirectEvent, @@ -10,7 +9,8 @@ import { fp, getSigners, ZERO_ADDRESS, -} from '@mimic-fi/v3-helpers' +} from '@mimic-fi/helpers' +import { OP } from '@mimic-fi/v3-authorizer' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/dist/src/signer-with-address' import { expect } from 'chai' import { Contract } from 'ethers' diff --git a/packages/tasks/test/liquidity/curve/BaseCurveTask.behavior.ts b/packages/tasks/test/liquidity/curve/BaseCurveTask.behavior.ts index e54ff5f6..b4ab40c7 100644 --- a/packages/tasks/test/liquidity/curve/BaseCurveTask.behavior.ts +++ b/packages/tasks/test/liquidity/curve/BaseCurveTask.behavior.ts @@ -1,4 +1,4 @@ -import { assertEvent, deployTokenMock, fp, ZERO_ADDRESS } from '@mimic-fi/v3-helpers' +import { assertEvent, deployTokenMock, fp, ZERO_ADDRESS } from '@mimic-fi/helpers' import { expect } from 'chai' import { Contract } from 'ethers' import { ethers } from 'hardhat' diff --git a/packages/tasks/test/liquidity/curve/Curve2CrvExiter.test.ts b/packages/tasks/test/liquidity/curve/Curve2CrvExiter.test.ts index a94c095a..6aa96a57 100644 --- a/packages/tasks/test/liquidity/curve/Curve2CrvExiter.test.ts +++ b/packages/tasks/test/liquidity/curve/Curve2CrvExiter.test.ts @@ -1,4 +1,3 @@ -import { OP } from '@mimic-fi/v3-authorizer' import { assertEvent, assertIndirectEvent, @@ -10,7 +9,8 @@ import { fp, getSigners, ZERO_ADDRESS, -} from '@mimic-fi/v3-helpers' +} from '@mimic-fi/helpers' +import { OP } from '@mimic-fi/v3-authorizer' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/dist/src/signer-with-address' import { expect } from 'chai' import { Contract } from 'ethers' diff --git a/packages/tasks/test/liquidity/curve/Curve2CrvJoiner.test.ts b/packages/tasks/test/liquidity/curve/Curve2CrvJoiner.test.ts index 2d96d92f..9fa553ea 100644 --- a/packages/tasks/test/liquidity/curve/Curve2CrvJoiner.test.ts +++ b/packages/tasks/test/liquidity/curve/Curve2CrvJoiner.test.ts @@ -1,4 +1,3 @@ -import { OP } from '@mimic-fi/v3-authorizer' import { assertEvent, assertIndirectEvent, @@ -10,7 +9,8 @@ import { fp, getSigners, ZERO_ADDRESS, -} from '@mimic-fi/v3-helpers' +} from '@mimic-fi/helpers' +import { OP } from '@mimic-fi/v3-authorizer' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/dist/src/signer-with-address' import { expect } from 'chai' import { Contract } from 'ethers' diff --git a/packages/tasks/test/liquidity/erc4626/BaseERC4626Task.behavior.ts b/packages/tasks/test/liquidity/erc4626/BaseERC4626Task.behavior.ts index c0c77e74..682751d2 100644 --- a/packages/tasks/test/liquidity/erc4626/BaseERC4626Task.behavior.ts +++ b/packages/tasks/test/liquidity/erc4626/BaseERC4626Task.behavior.ts @@ -1,4 +1,4 @@ -import { assertEvent, deployTokenMock, ZERO_ADDRESS } from '@mimic-fi/v3-helpers' +import { assertEvent, deployTokenMock, ZERO_ADDRESS } from '@mimic-fi/helpers' import { expect } from 'chai' import { Contract } from 'ethers' import { ethers } from 'hardhat' diff --git a/packages/tasks/test/liquidity/erc4626/ERC4626Exiter.test.ts b/packages/tasks/test/liquidity/erc4626/ERC4626Exiter.test.ts index d4b202fc..4a689071 100644 --- a/packages/tasks/test/liquidity/erc4626/ERC4626Exiter.test.ts +++ b/packages/tasks/test/liquidity/erc4626/ERC4626Exiter.test.ts @@ -1,4 +1,3 @@ -import { OP } from '@mimic-fi/v3-authorizer' import { assertEvent, assertIndirectEvent, @@ -11,7 +10,8 @@ import { getSigners, ONES_ADDRESS, ZERO_ADDRESS, -} from '@mimic-fi/v3-helpers' +} from '@mimic-fi/helpers' +import { OP } from '@mimic-fi/v3-authorizer' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/dist/src/signer-with-address' import { expect } from 'chai' import { Contract } from 'ethers' diff --git a/packages/tasks/test/liquidity/erc4626/ERC4626Joiner.test.ts b/packages/tasks/test/liquidity/erc4626/ERC4626Joiner.test.ts index 1e34e0ed..ea05e08c 100644 --- a/packages/tasks/test/liquidity/erc4626/ERC4626Joiner.test.ts +++ b/packages/tasks/test/liquidity/erc4626/ERC4626Joiner.test.ts @@ -1,4 +1,3 @@ -import { OP } from '@mimic-fi/v3-authorizer' import { assertEvent, assertIndirectEvent, @@ -11,7 +10,8 @@ import { getSigners, ONES_ADDRESS, ZERO_ADDRESS, -} from '@mimic-fi/v3-helpers' +} from '@mimic-fi/helpers' +import { OP } from '@mimic-fi/v3-authorizer' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/dist/src/signer-with-address' import { expect } from 'chai' import { Contract } from 'ethers' diff --git a/packages/tasks/test/primitives/Collector.test.ts b/packages/tasks/test/primitives/Collector.test.ts index b85a5a91..c0a5577b 100644 --- a/packages/tasks/test/primitives/Collector.test.ts +++ b/packages/tasks/test/primitives/Collector.test.ts @@ -10,7 +10,7 @@ import { NATIVE_TOKEN_ADDRESS, ZERO_ADDRESS, ZERO_BYTES32, -} from '@mimic-fi/v3-helpers' +} 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/tasks/test/primitives/Depositor.test.ts b/packages/tasks/test/primitives/Depositor.test.ts index 5322587f..0a9387b3 100644 --- a/packages/tasks/test/primitives/Depositor.test.ts +++ b/packages/tasks/test/primitives/Depositor.test.ts @@ -11,7 +11,7 @@ import { NATIVE_TOKEN_ADDRESS, ZERO_ADDRESS, ZERO_BYTES32, -} from '@mimic-fi/v3-helpers' +} 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/tasks/test/primitives/HandleOver.test.ts b/packages/tasks/test/primitives/HandleOver.test.ts index 1ec85e54..672ee261 100644 --- a/packages/tasks/test/primitives/HandleOver.test.ts +++ b/packages/tasks/test/primitives/HandleOver.test.ts @@ -6,7 +6,7 @@ import { fp, getSigners, ZERO_BYTES32, -} from '@mimic-fi/v3-helpers' +} 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/tasks/test/primitives/Unwrapper.test.ts b/packages/tasks/test/primitives/Unwrapper.test.ts index 02d5b8cf..c6cc5a6e 100644 --- a/packages/tasks/test/primitives/Unwrapper.test.ts +++ b/packages/tasks/test/primitives/Unwrapper.test.ts @@ -8,7 +8,7 @@ import { getSigners, NATIVE_TOKEN_ADDRESS, ZERO_ADDRESS, -} from '@mimic-fi/v3-helpers' +} 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/tasks/test/primitives/Withdrawer.test.ts b/packages/tasks/test/primitives/Withdrawer.test.ts index cb3e1e30..b2f39e7e 100644 --- a/packages/tasks/test/primitives/Withdrawer.test.ts +++ b/packages/tasks/test/primitives/Withdrawer.test.ts @@ -10,7 +10,7 @@ import { NATIVE_TOKEN_ADDRESS, ZERO_ADDRESS, ZERO_BYTES32, -} from '@mimic-fi/v3-helpers' +} 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/tasks/test/primitives/Wrapper.test.ts b/packages/tasks/test/primitives/Wrapper.test.ts index 17fb178b..3e5be8dc 100644 --- a/packages/tasks/test/primitives/Wrapper.test.ts +++ b/packages/tasks/test/primitives/Wrapper.test.ts @@ -8,7 +8,7 @@ import { getSigners, NATIVE_TOKEN_ADDRESS, ZERO_ADDRESS, -} from '@mimic-fi/v3-helpers' +} 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/tasks/test/relayer/BaseRelayerFundTask.behavior.ts b/packages/tasks/test/relayer/BaseRelayerFundTask.behavior.ts index 1e03c2eb..20143e8b 100644 --- a/packages/tasks/test/relayer/BaseRelayerFundTask.behavior.ts +++ b/packages/tasks/test/relayer/BaseRelayerFundTask.behavior.ts @@ -1,4 +1,4 @@ -import { assertEvent, deployFeedMock, deployTokenMock, fp, ZERO_ADDRESS } from '@mimic-fi/v3-helpers' +import { assertEvent, deploy, deployTokenMock, fp, ZERO_ADDRESS } from '@mimic-fi/helpers' import { expect } from 'chai' import { Contract } from 'ethers' import { ethers } from 'hardhat' @@ -71,7 +71,7 @@ export function itBehavesLikeBaseRelayerFundTask(executionType: string): void { }) beforeEach('set price feed', async function () { - const feed = await deployFeedMock(fp(thresholdNativeRate), 18) + const feed = await deploy('FeedMock', [fp(thresholdNativeRate), 18]) const setFeedRole = this.priceOracle.interface.getSighash('setFeed') await this.authorizer .connect(this.owner) @@ -133,7 +133,7 @@ export function itBehavesLikeBaseRelayerFundTask(executionType: string): void { }) beforeEach('set price feed', async function () { - const feed = await deployFeedMock(fp(fundingThresholdRate), 18) + const feed = await deploy('FeedMock', [fp(fundingThresholdRate), 18]) const setFeedRole = this.priceOracle.interface.getSighash('setFeed') await this.authorizer .connect(this.owner) diff --git a/packages/tasks/test/relayer/CollectorRelayerFunder.test.ts b/packages/tasks/test/relayer/CollectorRelayerFunder.test.ts index 1bc9f5af..84b1c13f 100644 --- a/packages/tasks/test/relayer/CollectorRelayerFunder.test.ts +++ b/packages/tasks/test/relayer/CollectorRelayerFunder.test.ts @@ -2,14 +2,13 @@ import { assertEvent, assertIndirectEvent, deploy, - deployFeedMock, deployProxy, deployTokenMock, fp, getSigners, NATIVE_TOKEN_ADDRESS, ZERO_ADDRESS, -} from '@mimic-fi/v3-helpers' +} from '@mimic-fi/helpers' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/dist/src/signer-with-address' import { expect } from 'chai' import { Contract } from 'ethers' @@ -96,7 +95,7 @@ describe('CollectorRelayerFunder', () => { }) beforeEach('set price feed', async function () { - const feed = await deployFeedMock(fp(tokenRate)) + const feed = await deploy('FeedMock', [fp(tokenRate), 18]) const setFeedRole = priceOracle.interface.getSighash('setFeed') await authorizer.connect(owner).authorize(owner.address, priceOracle.address, setFeedRole, []) await priceOracle.connect(owner).setFeed(mimic.wrappedNativeToken.address, token.address, feed.address) diff --git a/packages/tasks/test/relayer/OneInchV5RelayerFunder.test.ts b/packages/tasks/test/relayer/OneInchV5RelayerFunder.test.ts index b76bad0b..440e5b78 100644 --- a/packages/tasks/test/relayer/OneInchV5RelayerFunder.test.ts +++ b/packages/tasks/test/relayer/OneInchV5RelayerFunder.test.ts @@ -1,15 +1,14 @@ -import { OP } from '@mimic-fi/v3-authorizer' import { assertEvent, assertIndirectEvent, deploy, - deployFeedMock, deployProxy, deployTokenMock, fp, getSigners, ZERO_ADDRESS, -} from '@mimic-fi/v3-helpers' +} from '@mimic-fi/helpers' +import { OP } from '@mimic-fi/v3-authorizer' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/dist/src/signer-with-address' import { expect } from 'chai' import { Contract } from 'ethers' @@ -116,7 +115,7 @@ describe('OneInchV5RelayerFunder', () => { }) beforeEach('set price feed', async function () { - const feed = await deployFeedMock(fp(1).div(rateTokenInNative)) + const feed = await deploy('FeedMock', [fp(1).div(rateTokenInNative), 18]) const setFeedRole = priceOracle.interface.getSighash('setFeed') await authorizer.connect(owner).authorize(owner.address, priceOracle.address, setFeedRole, []) await priceOracle.connect(owner).setFeed(tokenIn.address, mimic.wrappedNativeToken.address, feed.address) @@ -148,7 +147,7 @@ describe('OneInchV5RelayerFunder', () => { }) beforeEach('set price feed', async function () { - const feed = await deployFeedMock(fp(1).div(rateTokenOutNative)) + const feed = await deploy('FeedMock', [fp(1).div(rateTokenOutNative), 18]) const setFeedRole = priceOracle.interface.getSighash('setFeed') await authorizer.connect(owner).authorize(owner.address, priceOracle.address, setFeedRole, []) await priceOracle.connect(owner).setFeed(tokenOut.address, mimic.wrappedNativeToken.address, feed.address) @@ -355,7 +354,7 @@ describe('OneInchV5RelayerFunder', () => { context('when there is no token out set', () => { beforeEach('set price feed', async function () { - const feed = await deployFeedMock(fp(1)) + const feed = await deploy('FeedMock', [fp(1), 18]) const setFeedRole = priceOracle.interface.getSighash('setFeed') await authorizer.connect(owner).authorize(owner.address, priceOracle.address, setFeedRole, []) await priceOracle diff --git a/packages/tasks/test/relayer/ParaswapV5RelayerFunder.test.ts b/packages/tasks/test/relayer/ParaswapV5RelayerFunder.test.ts index e4a99d87..17520067 100644 --- a/packages/tasks/test/relayer/ParaswapV5RelayerFunder.test.ts +++ b/packages/tasks/test/relayer/ParaswapV5RelayerFunder.test.ts @@ -1,15 +1,14 @@ -import { OP } from '@mimic-fi/v3-authorizer' import { assertEvent, assertIndirectEvent, deploy, - deployFeedMock, deployProxy, deployTokenMock, fp, getSigners, ZERO_ADDRESS, -} from '@mimic-fi/v3-helpers' +} from '@mimic-fi/helpers' +import { OP } from '@mimic-fi/v3-authorizer' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/dist/src/signer-with-address' import { expect } from 'chai' import { Contract } from 'ethers' @@ -116,7 +115,7 @@ describe('ParaswapV5RelayerFunder', () => { }) beforeEach('set price feed', async function () { - const feed = await deployFeedMock(fp(1).div(rateTokenInNative)) + const feed = await deploy('FeedMock', [fp(1).div(rateTokenInNative), 18]) const setFeedRole = priceOracle.interface.getSighash('setFeed') await authorizer.connect(owner).authorize(owner.address, priceOracle.address, setFeedRole, []) await priceOracle.connect(owner).setFeed(tokenIn.address, mimic.wrappedNativeToken.address, feed.address) @@ -148,7 +147,7 @@ describe('ParaswapV5RelayerFunder', () => { }) beforeEach('set price feed', async function () { - const feed = await deployFeedMock(fp(1).div(rateTokenOutNative)) + const feed = await deploy('FeedMock', [fp(1).div(rateTokenOutNative), 18]) const setFeedRole = priceOracle.interface.getSighash('setFeed') await authorizer.connect(owner).authorize(owner.address, priceOracle.address, setFeedRole, []) await priceOracle.connect(owner).setFeed(tokenOut.address, mimic.wrappedNativeToken.address, feed.address) @@ -355,7 +354,7 @@ describe('ParaswapV5RelayerFunder', () => { context('when there is no token out set', () => { beforeEach('set price feed', async function () { - const feed = await deployFeedMock(fp(1)) + const feed = await deploy('FeedMock', [fp(1), 18]) const setFeedRole = priceOracle.interface.getSighash('setFeed') await authorizer.connect(owner).authorize(owner.address, priceOracle.address, setFeedRole, []) await priceOracle diff --git a/packages/tasks/test/relayer/RelayerDepositor.test.ts b/packages/tasks/test/relayer/RelayerDepositor.test.ts index 9a473862..2a18be4c 100644 --- a/packages/tasks/test/relayer/RelayerDepositor.test.ts +++ b/packages/tasks/test/relayer/RelayerDepositor.test.ts @@ -10,7 +10,7 @@ import { NATIVE_TOKEN_ADDRESS, ZERO_ADDRESS, ZERO_BYTES32, -} from '@mimic-fi/v3-helpers' +} 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/tasks/test/relayer/UnwrapperRelayerFunder.test.ts b/packages/tasks/test/relayer/UnwrapperRelayerFunder.test.ts index e915b429..d7c281db 100644 --- a/packages/tasks/test/relayer/UnwrapperRelayerFunder.test.ts +++ b/packages/tasks/test/relayer/UnwrapperRelayerFunder.test.ts @@ -2,13 +2,12 @@ import { assertEvent, assertIndirectEvent, deploy, - deployFeedMock, deployProxy, deployTokenMock, fp, getSigners, ZERO_ADDRESS, -} from '@mimic-fi/v3-helpers' +} from '@mimic-fi/helpers' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/dist/src/signer-with-address' import { expect } from 'chai' import { Contract } from 'ethers' @@ -197,7 +196,7 @@ describe('UnwrapperRelayerFunder', () => { }) beforeEach('set price feed', async () => { - const feed = await deployFeedMock(fp(1), 18) + const feed = await deploy('FeedMock', [fp(1), 18]) const setFeedRole = priceOracle.interface.getSighash('setFeed') await authorizer.connect(owner).authorize(owner.address, priceOracle.address, setFeedRole, []) await priceOracle.connect(owner).setFeed(mimic.wrappedNativeToken.address, token.address, feed.address) diff --git a/packages/tasks/test/swap/BalancerV2BoostedSwapper.mainnet.ts b/packages/tasks/test/swap/BalancerV2BoostedSwapper.mainnet.ts index cb6c91dd..dd34cb9e 100644 --- a/packages/tasks/test/swap/BalancerV2BoostedSwapper.mainnet.ts +++ b/packages/tasks/test/swap/BalancerV2BoostedSwapper.mainnet.ts @@ -1,14 +1,5 @@ +import { deploy, deployProxy, fp, getSigners, impersonate, instanceAt, ZERO_ADDRESS } from '@mimic-fi/helpers' import { OP } from '@mimic-fi/v3-authorizer' -import { - deploy, - deployFeedMock, - deployProxy, - fp, - getSigners, - impersonate, - instanceAt, - ZERO_ADDRESS, -} from '@mimic-fi/v3-helpers' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/dist/src/signer-with-address' import { expect } from 'chai' import { Contract } from 'ethers' @@ -122,7 +113,7 @@ describe('BalancerV2BoostedSwapper', function () { const rate = fp(1) beforeEach('set price feed', async () => { - const feed = await deployFeedMock(rate, 18) + const feed = await deploy('FeedMock', [rate, 18]) const setFeedRole = priceOracle.interface.getSighash('setFeed') await authorizer.connect(owner).authorize(owner.address, priceOracle.address, setFeedRole, []) await priceOracle.connect(owner).setFeed(pool.address, underlyingToken.address, feed.address) diff --git a/packages/tasks/test/swap/BalancerV2BptSwapper.test.ts b/packages/tasks/test/swap/BalancerV2BptSwapper.test.ts index ae02a16e..b32c3747 100644 --- a/packages/tasks/test/swap/BalancerV2BptSwapper.test.ts +++ b/packages/tasks/test/swap/BalancerV2BptSwapper.test.ts @@ -1,4 +1,4 @@ -import { deploy, deployProxy, getSigners, ZERO_ADDRESS } from '@mimic-fi/v3-helpers' +import { deploy, deployProxy, getSigners, ZERO_ADDRESS } from '@mimic-fi/helpers' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/dist/src/signer-with-address' import { Contract } from 'ethers' diff --git a/packages/tasks/test/swap/BalancerV2LinearSwapper.mainnet.ts b/packages/tasks/test/swap/BalancerV2LinearSwapper.mainnet.ts index f897f879..27f61abf 100644 --- a/packages/tasks/test/swap/BalancerV2LinearSwapper.mainnet.ts +++ b/packages/tasks/test/swap/BalancerV2LinearSwapper.mainnet.ts @@ -1,14 +1,5 @@ +import { deploy, deployProxy, fp, getSigners, impersonate, instanceAt, ZERO_ADDRESS } from '@mimic-fi/helpers' import { OP } from '@mimic-fi/v3-authorizer' -import { - deploy, - deployFeedMock, - deployProxy, - fp, - getSigners, - impersonate, - instanceAt, - ZERO_ADDRESS, -} from '@mimic-fi/v3-helpers' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/dist/src/signer-with-address' import { expect } from 'chai' import { Contract } from 'ethers' @@ -113,7 +104,7 @@ describe('BalancerV2LinearSwapper', function () { const rate = fp(1) beforeEach('set price feed', async () => { - const feed = await deployFeedMock(rate, 18) + const feed = await deploy('FeedMock', [rate, 18]) const setFeedRole = priceOracle.interface.getSighash('setFeed') await authorizer.connect(owner).authorize(owner.address, priceOracle.address, setFeedRole, []) await priceOracle.connect(owner).setFeed(pool.address, mainToken.address, feed.address) diff --git a/packages/tasks/test/swap/BalancerV2Swapper.test.ts b/packages/tasks/test/swap/BalancerV2Swapper.test.ts index 638e1793..2301785a 100644 --- a/packages/tasks/test/swap/BalancerV2Swapper.test.ts +++ b/packages/tasks/test/swap/BalancerV2Swapper.test.ts @@ -8,7 +8,7 @@ import { ONES_ADDRESS, ONES_BYTES32, ZERO_ADDRESS, -} from '@mimic-fi/v3-helpers' +} 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/tasks/test/swap/BaseSwapTask.behavior.ts b/packages/tasks/test/swap/BaseSwapTask.behavior.ts index 62428a85..3a48d308 100644 --- a/packages/tasks/test/swap/BaseSwapTask.behavior.ts +++ b/packages/tasks/test/swap/BaseSwapTask.behavior.ts @@ -1,4 +1,4 @@ -import { assertEvent, deployTokenMock, fp, ZERO_ADDRESS } from '@mimic-fi/v3-helpers' +import { assertEvent, deployTokenMock, fp, ZERO_ADDRESS } from '@mimic-fi/helpers' import { expect } from 'chai' import { Contract } from 'ethers' import { ethers } from 'hardhat' diff --git a/packages/tasks/test/swap/BebopSwapper.test.ts b/packages/tasks/test/swap/BebopSwapper.test.ts index b498f40d..66dfd327 100644 --- a/packages/tasks/test/swap/BebopSwapper.test.ts +++ b/packages/tasks/test/swap/BebopSwapper.test.ts @@ -1,17 +1,16 @@ -import { OP } from '@mimic-fi/v3-authorizer' import { assertIndirectEvent, assertNoEvent, BigNumberish, deploy, - deployFeedMock, deployProxy, deployTokenMock, fp, getSigners, MAX_UINT256, ZERO_ADDRESS, -} from '@mimic-fi/v3-helpers' +} from '@mimic-fi/helpers' +import { OP } from '@mimic-fi/v3-authorizer' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/dist/src/signer-with-address' import { expect } from 'chai' import { Contract, ContractTransaction } from 'ethers' @@ -292,7 +291,7 @@ describe('BebopSwapper', () => { context('when no off-chain oracle is given', () => { context('when an on-chain oracle is given', () => { beforeEach('set price feed', async () => { - const feed = await deployFeedMock(fp(tokenRate), 18) + const feed = await deploy('FeedMock', [fp(tokenRate), 18]) const setFeedRole = priceOracle.interface.getSighash('setFeed') await authorizer.connect(owner).authorize(owner.address, priceOracle.address, setFeedRole, []) await priceOracle.connect(owner).setFeed(tokenIn.address, tokenOut.address, feed.address) diff --git a/packages/tasks/test/swap/HopL2Swapper.test.ts b/packages/tasks/test/swap/HopL2Swapper.test.ts index a3f3aa92..a7de7fd9 100644 --- a/packages/tasks/test/swap/HopL2Swapper.test.ts +++ b/packages/tasks/test/swap/HopL2Swapper.test.ts @@ -1,17 +1,16 @@ -import { OP } from '@mimic-fi/v3-authorizer' import { assertEvent, assertIndirectEvent, assertNoEvent, BigNumberish, deploy, - deployFeedMock, deployProxy, deployTokenMock, fp, getSigners, ZERO_ADDRESS, -} from '@mimic-fi/v3-helpers' +} from '@mimic-fi/helpers' +import { OP } from '@mimic-fi/v3-authorizer' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/dist/src/signer-with-address' import { expect } from 'chai' import { Contract } from 'ethers' @@ -200,7 +199,7 @@ describe('HopL2Swapper', () => { }) beforeEach('set price feed', async () => { - const feed = await deployFeedMock(fp(1), 18) + const feed = await deploy('FeedMock', [fp(1), 18]) const setFeedRole = priceOracle.interface.getSighash('setFeed') await authorizer.connect(owner).authorize(owner.address, priceOracle.address, setFeedRole, []) await priceOracle.connect(owner).setFeed(tokenIn.address, tokenOut.address, feed.address) diff --git a/packages/tasks/test/swap/KyberSwapV2Swapper.test.ts b/packages/tasks/test/swap/KyberSwapV2Swapper.test.ts index eae4bfba..39f7777d 100644 --- a/packages/tasks/test/swap/KyberSwapV2Swapper.test.ts +++ b/packages/tasks/test/swap/KyberSwapV2Swapper.test.ts @@ -1,17 +1,16 @@ -import { OP } from '@mimic-fi/v3-authorizer' import { assertIndirectEvent, assertNoEvent, BigNumberish, deploy, - deployFeedMock, deployProxy, deployTokenMock, fp, getSigners, MAX_UINT256, ZERO_ADDRESS, -} from '@mimic-fi/v3-helpers' +} from '@mimic-fi/helpers' +import { OP } from '@mimic-fi/v3-authorizer' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/dist/src/signer-with-address' import { expect } from 'chai' import { Contract, ContractTransaction } from 'ethers' @@ -293,7 +292,7 @@ describe('KyberSwapV2Swapper', () => { context('when no off-chain oracle is given', () => { context('when an on-chain oracle is given', () => { beforeEach('set price feed', async () => { - const feed = await deployFeedMock(fp(tokenRate), 18) + const feed = await deploy('FeedMock', [fp(tokenRate), 18]) const setFeedRole = priceOracle.interface.getSighash('setFeed') await authorizer.connect(owner).authorize(owner.address, priceOracle.address, setFeedRole, []) await priceOracle.connect(owner).setFeed(tokenIn.address, tokenOut.address, feed.address) diff --git a/packages/tasks/test/swap/OdosV2Swapper.test.ts b/packages/tasks/test/swap/OdosV2Swapper.test.ts index 7a673410..470b2157 100644 --- a/packages/tasks/test/swap/OdosV2Swapper.test.ts +++ b/packages/tasks/test/swap/OdosV2Swapper.test.ts @@ -1,17 +1,16 @@ -import { OP } from '@mimic-fi/v3-authorizer' import { assertIndirectEvent, assertNoEvent, BigNumberish, deploy, - deployFeedMock, deployProxy, deployTokenMock, fp, getSigners, MAX_UINT256, ZERO_ADDRESS, -} from '@mimic-fi/v3-helpers' +} from '@mimic-fi/helpers' +import { OP } from '@mimic-fi/v3-authorizer' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/dist/src/signer-with-address' import { expect } from 'chai' import { Contract, ContractTransaction } from 'ethers' @@ -293,7 +292,7 @@ describe('OdosV2Swapper', () => { context('when no off-chain oracle is given', () => { context('when an on-chain oracle is given', () => { beforeEach('set price feed', async () => { - const feed = await deployFeedMock(fp(tokenRate), 18) + const feed = await deploy('FeedMock', [fp(tokenRate), 18]) const setFeedRole = priceOracle.interface.getSighash('setFeed') await authorizer.connect(owner).authorize(owner.address, priceOracle.address, setFeedRole, []) await priceOracle.connect(owner).setFeed(tokenIn.address, tokenOut.address, feed.address) diff --git a/packages/tasks/test/swap/OneInchV5Swapper.test.ts b/packages/tasks/test/swap/OneInchV5Swapper.test.ts index 6f5f4d45..56f11548 100644 --- a/packages/tasks/test/swap/OneInchV5Swapper.test.ts +++ b/packages/tasks/test/swap/OneInchV5Swapper.test.ts @@ -1,17 +1,16 @@ -import { OP } from '@mimic-fi/v3-authorizer' import { assertIndirectEvent, assertNoEvent, BigNumberish, deploy, - deployFeedMock, deployProxy, deployTokenMock, fp, getSigners, MAX_UINT256, ZERO_ADDRESS, -} from '@mimic-fi/v3-helpers' +} from '@mimic-fi/helpers' +import { OP } from '@mimic-fi/v3-authorizer' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/dist/src/signer-with-address' import { expect } from 'chai' import { Contract, ContractTransaction } from 'ethers' @@ -292,7 +291,7 @@ describe('OneInchV5Swapper', () => { context('when no off-chain oracle is given', () => { context('when an on-chain oracle is given', () => { beforeEach('set price feed', async () => { - const feed = await deployFeedMock(fp(tokenRate), 18) + const feed = await deploy('FeedMock', [fp(tokenRate), 18]) const setFeedRole = priceOracle.interface.getSighash('setFeed') await authorizer.connect(owner).authorize(owner.address, priceOracle.address, setFeedRole, []) await priceOracle.connect(owner).setFeed(tokenIn.address, tokenOut.address, feed.address) diff --git a/packages/tasks/test/swap/ParaswapV5Swapper.test.ts b/packages/tasks/test/swap/ParaswapV5Swapper.test.ts index 0190b688..d1578827 100644 --- a/packages/tasks/test/swap/ParaswapV5Swapper.test.ts +++ b/packages/tasks/test/swap/ParaswapV5Swapper.test.ts @@ -1,17 +1,16 @@ -import { OP } from '@mimic-fi/v3-authorizer' import { assertIndirectEvent, assertNoEvent, BigNumberish, deploy, - deployFeedMock, deployProxy, deployTokenMock, fp, getSigners, MAX_UINT256, ZERO_ADDRESS, -} from '@mimic-fi/v3-helpers' +} from '@mimic-fi/helpers' +import { OP } from '@mimic-fi/v3-authorizer' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/dist/src/signer-with-address' import { expect } from 'chai' import { Contract, ContractTransaction } from 'ethers' @@ -293,7 +292,7 @@ describe('ParaswapV5Swapper', () => { context('when no off-chain oracle is given', () => { context('when an on-chain oracle is given', () => { beforeEach('set price feed', async () => { - const feed = await deployFeedMock(fp(tokenRate), 18) + const feed = await deploy('FeedMock', [fp(tokenRate), 18]) const setFeedRole = priceOracle.interface.getSighash('setFeed') await authorizer.connect(owner).authorize(owner.address, priceOracle.address, setFeedRole, []) await priceOracle.connect(owner).setFeed(tokenIn.address, tokenOut.address, feed.address) diff --git a/packages/tasks/test/swap/UniswapV2Swapper.test.ts b/packages/tasks/test/swap/UniswapV2Swapper.test.ts index ba38d76e..ac2700e8 100644 --- a/packages/tasks/test/swap/UniswapV2Swapper.test.ts +++ b/packages/tasks/test/swap/UniswapV2Swapper.test.ts @@ -1,17 +1,16 @@ -import { OP } from '@mimic-fi/v3-authorizer' import { assertIndirectEvent, assertNoEvent, BigNumberish, deploy, - deployFeedMock, deployProxy, deployTokenMock, fp, getSigners, MAX_UINT256, ZERO_ADDRESS, -} from '@mimic-fi/v3-helpers' +} from '@mimic-fi/helpers' +import { OP } from '@mimic-fi/v3-authorizer' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/dist/src/signer-with-address' import { expect } from 'chai' import { Contract, ContractTransaction } from 'ethers' @@ -300,7 +299,7 @@ describe('UniswapV2Swapper', () => { context('when no off-chain oracle is given', () => { context('when an on-chain oracle is given', () => { beforeEach('set price feed', async () => { - const feed = await deployFeedMock(fp(tokenRate), 18) + const feed = await deploy('FeedMock', [fp(tokenRate), 18]) const setFeedRole = priceOracle.interface.getSighash('setFeed') await authorizer.connect(owner).authorize(owner.address, priceOracle.address, setFeedRole, []) await priceOracle.connect(owner).setFeed(tokenIn.address, tokenOut.address, feed.address) diff --git a/packages/tasks/test/swap/UniswapV3Swapper.test.ts b/packages/tasks/test/swap/UniswapV3Swapper.test.ts index 81fb1f6b..dd09604f 100644 --- a/packages/tasks/test/swap/UniswapV3Swapper.test.ts +++ b/packages/tasks/test/swap/UniswapV3Swapper.test.ts @@ -1,17 +1,16 @@ -import { OP } from '@mimic-fi/v3-authorizer' import { assertIndirectEvent, assertNoEvent, BigNumberish, deploy, - deployFeedMock, deployProxy, deployTokenMock, fp, getSigners, MAX_UINT256, ZERO_ADDRESS, -} from '@mimic-fi/v3-helpers' +} from '@mimic-fi/helpers' +import { OP } from '@mimic-fi/v3-authorizer' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/dist/src/signer-with-address' import { expect } from 'chai' import { Contract, ContractTransaction } from 'ethers' @@ -317,7 +316,7 @@ describe('UniswapV3Swapper', () => { context('when no off-chain oracle is given', () => { context('when an on-chain oracle is given', () => { beforeEach('set price feed', async () => { - const feed = await deployFeedMock(fp(tokenRate), 18) + const feed = await deploy('FeedMock', [fp(tokenRate), 18]) const setFeedRole = priceOracle.interface.getSighash('setFeed') await authorizer.connect(owner).authorize(owner.address, priceOracle.address, setFeedRole, []) await priceOracle.connect(owner).setFeed(tokenIn.address, tokenOut.address, feed.address) diff --git a/yarn.lock b/yarn.lock index 7ffc6012..aeaa5097 100644 --- a/yarn.lock +++ b/yarn.lock @@ -937,6 +937,18 @@ "@mimic-fi/v3-helpers" "0.1.0" "@openzeppelin/contracts" "4.9.3" +"@mimic-fi/helpers@1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@mimic-fi/helpers/-/helpers-1.0.0.tgz#6d28cb20e20d3a9f72d7014b80dfd5a3627918a9" + integrity sha512-t7+MAmXHlsXr13x6L32tjLE0yseh5c8emB3QgP5hnmhwOXy6tKkLPV89UGSATPm9lN61lsZC+HrQKbTXcsb7SA== + dependencies: + "@nomiclabs/hardhat-ethers" "^2.2.3" + "@nomiclabs/hardhat-waffle" "2.0.3" + "@openzeppelin/contracts" "5.0.2" + decimal.js "~10.4.3" + ethers "~5.6.0" + hardhat "^2.14.1" + "@mimic-fi/v3-authorizer@0.1.0": version "0.1.0" resolved "https://registry.yarnpkg.com/@mimic-fi/v3-authorizer/-/v3-authorizer-0.1.0.tgz#10fa3b9c5ac7c3ab95d6c77764376a6707703d09" @@ -969,22 +981,6 @@ hardhat "^2.14.1" mocha "^6.2.3" -"@mimic-fi/v3-helpers@0.1.9": - version "0.1.9" - resolved "https://registry.yarnpkg.com/@mimic-fi/v3-helpers/-/v3-helpers-0.1.9.tgz#9de0de2e60c77580b0662780e952f05424a1bdb0" - integrity sha512-xJoVAlpQs+iVaL0fh/FZy2iOHRrLNtuE+8yHSCEmPJyokLTe5KbpuxnlyZV0pcZmYyquAWplnKU467QNqk5Z4A== - dependencies: - "@nomiclabs/hardhat-ethers" "^2.2.3" - "@nomiclabs/hardhat-waffle" "2.0.3" - "@types/chai" "^4.3.5" - "@types/mocha" "^10.0.1" - "@types/sinon-chai" "^3.2.3" - chai "^4.3.7" - decimal.js "~10.4.3" - ethers "~5.6.0" - hardhat "^2.14.1" - mocha "^6.2.3" - "@mimic-fi/v3-tasks@0.1.0": version "0.1.0" resolved "https://registry.yarnpkg.com/@mimic-fi/v3-tasks/-/v3-tasks-0.1.0.tgz#ecd3dd570ec4423758f24e3c34e96d6a452473a9" @@ -1261,6 +1257,11 @@ resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.9.3.tgz#00d7a8cf35a475b160b3f0293a6403c511099364" integrity sha512-He3LieZ1pP2TNt5JbkPA4PNT9WC3gOTOlDcFGJW4Le4QKqwmiNJCRt44APfxMxvq7OugU/cqYuPcSBzOw38DAg== +"@openzeppelin/contracts@5.0.2": + version "5.0.2" + resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-5.0.2.tgz#b1d03075e49290d06570b2fd42154d76c2a5d210" + integrity sha512-ytPc6eLGcHHnapAZ9S+5qsdomhjo6QBHTDRRBFfTxXIpsicMhVPouPgmUPebZZZGX7vt9USA+Z+0M0dSVtSUEA== + "@quant-finance/solidity-datetime@2.2.0": version "2.2.0" resolved "https://registry.yarnpkg.com/@quant-finance/solidity-datetime/-/solidity-datetime-2.2.0.tgz#50f2d00a571d8cc2d962257b40b70fc44450dcaa"