Instadapp/InstaContract
1
0
Fork 0
mirror of https://github.com/Instadapp/InstaContract.git synced 2024-07-29 22:47:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Code optimisation.

Browse Source
This commit is contained in:
Sowmayjain 2018-11-26 03:09:47 +05:30
parent 22a93bc62b
commit cdb14394b4
2 changed files with 64 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
contracts/protocols/InstaKyber.sol
View File

@ -1,8 +1,30 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "openzeppelin-solidity/contracts/math/SafeMath.sol"; library SafeMath {
import "openzeppelin-solidity/contracts/token/ERC20/IERC20.sol";
function mul(uint256 a, uint256 b) internal pure returns (uint256) {
if (a == 0) {
return 0;
}
uint256 c = a * b;
require(c / a == b, "Assertion Failed");
return c;
}
function div(uint256 a, uint256 b) internal pure returns (uint256) {
require(b > 0, "Assertion Failed");
uint256 c = a / b;
return c;
}
}
interface IERC20 {
function balanceOf(address who) external view returns (uint256);
function transfer(address to, uint256 value) external returns (bool);
function approve(address spender, uint256 value) external returns (bool);
function transferFrom(address from, address to, uint256 value) external returns (bool);
}
interface AddressRegistry { interface AddressRegistry {
function getAddr(string name) external view returns(address); function getAddr(string name) external view returns(address);
@ -103,6 +125,17 @@ contract Trade is Registry {
getAddress("admin") getAddress("admin")
); );
// maxDestAmt usecase implementated
if (src == getAddress("eth") && address(this).balance > 0) {
msg.sender.transfer(address(this).balance);
} else {
IERC20 srcTkn = IERC20(src);
uint srcBal = srcTkn.balanceOf(address(this));
if (srcBal > 0) {
srcTkn.transfer(msg.sender, srcBal);
}
}
emit KyberTrade( emit KyberTrade(
src, src,
srcAmt, srcAmt,
@ -135,4 +168,6 @@ contract InstaKyber is Trade {
addressRegistry = rAddr; addressRegistry = rAddr;
} }
function () public payable {}
} }

30
contracts/protocols/InstaMaker.sol
View File

@ -1,8 +1,31 @@
pragma solidity 0.4.24; pragma solidity 0.4.24;
import "openzeppelin-solidity/contracts/math/SafeMath.sol";
import "openzeppelin-solidity/contracts/token/ERC20/IERC20.sol";
library SafeMath {
function mul(uint256 a, uint256 b) internal pure returns (uint256) {
if (a == 0) {
return 0;
}
uint256 c = a * b;
require(c / a == b, "Assertion Failed");
return c;
}
function div(uint256 a, uint256 b) internal pure returns (uint256) {
require(b > 0, "Assertion Failed");
uint256 c = a / b;
return c;
}
}
interface IERC20 {
function balanceOf(address who) external view returns (uint256);
function transfer(address to, uint256 value) external returns (bool);
function approve(address spender, uint256 value) external returns (bool);
function transferFrom(address from, address to, uint256 value) external returns (bool);
}
interface AddressRegistry { interface AddressRegistry {
function getAddr(string name) external view returns(address); function getAddr(string name) external view returns(address);
@ -200,7 +223,6 @@ contract RepayLoan is IssueLoan {
); );
require(mkrCharged == mkrBought, "ETH not sufficient to cover the MKR fees."); require(mkrCharged == mkrBought, "ETH not sufficient to cover the MKR fees.");
if (address(this).balance > 0) { if (address(this).balance > 0) {
// ether always belong to sender coz no way contract can hold ether
msg.sender.transfer(address(this).balance); msg.sender.transfer(address(this).balance);
} }
} }
@ -252,6 +274,8 @@ contract MoatMaker is BorrowTasks {
approveERC20(); approveERC20();
} }
function () public payable {}
function freeze(bool stop) public onlyAdmin { function freeze(bool stop) public onlyAdmin {
freezed = stop; freezed = stop;
} }