From 00e562abc7c98dd98cde429afab4ce3bc6607bd7 Mon Sep 17 00:00:00 2001 From: Samyak Jain <34437877+KaymasJain@users.noreply.github.com> Date: Tue, 30 Nov 2021 04:06:52 +0530 Subject: [PATCH] removed eth specific conditions --- .../mainnet/connectors/instapool_v4/main.sol | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/contracts/mainnet/connectors/instapool_v4/main.sol b/contracts/mainnet/connectors/instapool_v4/main.sol index c07a1990..da3a159f 100644 --- a/contracts/mainnet/connectors/instapool_v4/main.sol +++ b/contracts/mainnet/connectors/instapool_v4/main.sol @@ -7,16 +7,13 @@ pragma experimental ABIEncoderV2; */ import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/SafeERC20.sol"; -import { Address } from "@openzeppelin/contracts/utils/Address.sol"; import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; -import { TokenInterface } from "../../common/interfaces.sol"; import { AccountInterface } from "./interfaces.sol"; -import { DSMath } from "../../common/math.sol"; import { Stores } from "../../common/stores.sol"; import { Variables } from "./variables.sol"; import { Events } from "./events.sol"; -contract LiquidityResolver is DSMath, Stores, Variables, Events { +contract LiquidityResolver is Stores, Variables, Events { using SafeERC20 for IERC20; /** @@ -70,11 +67,7 @@ contract LiquidityResolver is DSMath, Stores, Variables, Events { IERC20 tokenContract = IERC20(token); - if (token == ethAddr) { - Address.sendValue(payable(address(instaPool)), _amt); - } else { - tokenContract.safeTransfer(address(instaPool), _amt); - } + tokenContract.safeTransfer(address(instaPool), _amt); setUint(setId, _amt); @@ -127,11 +120,7 @@ contract LiquidityResolver is DSMath, Stores, Variables, Events { for (uint i = 0; i < tokens_.length; i++) { amts_[i] = getUint(getIds[i], amts_[i]); - if (tokens_[i] == ethAddr) { - Address.sendValue(payable(address(instaPool)), amts_[i]); - } else { - IERC20(tokens_[i]).safeTransfer(address(instaPool), amts_[i]); - } + IERC20(tokens_[i]).safeTransfer(address(instaPool), amts_[i]); setUint(setIds[i], amts_[i]); }