mirror of
https://github.com/Instadapp/smart-contract.git
synced 2024-07-29 22:08:07 +00:00
Naming new files
This commit is contained in:
Samyak Jain
parent
81e13f5de9
commit
43dc517637
|
|
@ -1,667 +0,0 @@
|
||||||
pragma solidity ^0.5.7;
|
|
||||||
|
|
||||||
interface TubInterface {
|
|
||||||
function open() external returns (bytes32);
|
|
||||||
function join(uint) external;
|
|
||||||
function exit(uint) external;
|
|
||||||
function lock(bytes32, uint) external;
|
|
||||||
function free(bytes32, uint) external;
|
|
||||||
function draw(bytes32, uint) external;
|
|
||||||
function wipe(bytes32, uint) external;
|
|
||||||
function give(bytes32, address) external;
|
|
||||||
function shut(bytes32) external;
|
|
||||||
function cups(bytes32) external view returns (address, uint, uint, uint);
|
|
||||||
function gem() external view returns (TokenInterface);
|
|
||||||
function gov() external view returns (TokenInterface);
|
|
||||||
function skr() external view returns (TokenInterface);
|
|
||||||
function sai() external view returns (TokenInterface);
|
|
||||||
function ink(bytes32) external view returns (uint);
|
|
||||||
function tab(bytes32) external returns (uint);
|
|
||||||
function rap(bytes32) external returns (uint);
|
|
||||||
function per() external view returns (uint);
|
|
||||||
function pep() external view returns (PepInterface);
|
|
||||||
}
|
|
||||||
|
|
||||||
interface TokenInterface {
|
|
||||||
function allowance(address, address) external view returns (uint);
|
|
||||||
function balanceOf(address) external view returns (uint);
|
|
||||||
function approve(address, uint) external;
|
|
||||||
function transfer(address, uint) external returns (bool);
|
|
||||||
function transferFrom(address, address, uint) external returns (bool);
|
|
||||||
function deposit() external payable;
|
|
||||||
function withdraw(uint) external;
|
|
||||||
}
|
|
||||||
|
|
||||||
interface PepInterface {
|
|
||||||
function peek() external returns (bytes32, bool);
|
|
||||||
}
|
|
||||||
|
|
||||||
interface MakerOracleInterface {
|
|
||||||
function read() external view returns (bytes32);
|
|
||||||
}
|
|
||||||
|
|
||||||
interface UniswapExchange {
|
|
||||||
function getEthToTokenOutputPrice(uint256 tokensBought) external view returns (uint256 ethSold);
|
|
||||||
function getTokenToEthOutputPrice(uint256 ethBought) external view returns (uint256 tokensSold);
|
|
||||||
function tokenToTokenSwapOutput(
|
|
||||||
uint256 tokensBought,
|
|
||||||
uint256 maxTokensSold,
|
|
||||||
uint256 maxEthSold,
|
|
||||||
uint256 deadline,
|
|
||||||
address tokenAddr
|
|
||||||
) external returns (uint256 tokensSold);
|
|
||||||
}
|
|
||||||
|
|
||||||
interface BridgeInterface {
|
|
||||||
function transferDAI(uint) external;
|
|
||||||
function transferBackDAI(uint) external;
|
|
||||||
function cArrLength() external view returns (uint);
|
|
||||||
function cTokenAddr(uint) external view returns (address, uint);
|
|
||||||
}
|
|
||||||
|
|
||||||
interface CTokenInterface {
|
|
||||||
function redeem(uint redeemTokens) external returns (uint);
|
|
||||||
function redeemUnderlying(uint redeemAmount) external returns (uint);
|
|
||||||
function borrow(uint borrowAmount) external returns (uint);
|
|
||||||
function liquidateBorrow(address borrower, uint repayAmount, address cTokenCollateral) external returns (uint);
|
|
||||||
function liquidateBorrow(address borrower, address cTokenCollateral) external payable;
|
|
||||||
function exchangeRateCurrent() external returns (uint);
|
|
||||||
function getCash() external view returns (uint);
|
|
||||||
function totalBorrowsCurrent() external returns (uint);
|
|
||||||
function borrowRatePerBlock() external view returns (uint);
|
|
||||||
function supplyRatePerBlock() external view returns (uint);
|
|
||||||
function totalReserves() external view returns (uint);
|
|
||||||
function reserveFactorMantissa() external view returns (uint);
|
|
||||||
function borrowBalanceCurrent(address account) external returns (uint);
|
|
||||||
|
|
||||||
function totalSupply() external view returns (uint256);
|
|
||||||
function balanceOf(address owner) external view returns (uint256 balance);
|
|
||||||
function allowance(address, address) external view returns (uint);
|
|
||||||
function approve(address, uint) external;
|
|
||||||
function transfer(address, uint) external returns (bool);
|
|
||||||
function transferFrom(address, address, uint) external returns (bool);
|
|
||||||
}
|
|
||||||
|
|
||||||
interface CERC20Interface {
|
|
||||||
function mint(uint mintAmount) external returns (uint); // For ERC20
|
|
||||||
function repayBorrow(uint repayAmount) external returns (uint); // For ERC20
|
|
||||||
function repayBorrowBehalf(address borrower, uint repayAmount) external returns (uint); // For ERC20
|
|
||||||
function borrowBalanceCurrent(address account) external returns (uint);
|
|
||||||
}
|
|
||||||
|
|
||||||
interface CETHInterface {
|
|
||||||
function mint() external payable; // For ETH
|
|
||||||
function repayBorrow() external payable; // For ETH
|
|
||||||
function repayBorrowBehalf(address borrower) external payable; // For ETH
|
|
||||||
function borrowBalanceCurrent(address account) external returns (uint);
|
|
||||||
}
|
|
||||||
|
|
||||||
interface ERC20Interface {
|
|
||||||
function allowance(address, address) external view returns (uint);
|
|
||||||
function balanceOf(address) external view returns (uint);
|
|
||||||
function approve(address, uint) external;
|
|
||||||
function transfer(address, uint) external returns (bool);
|
|
||||||
function transferFrom(address, address, uint) external returns (bool);
|
|
||||||
}
|
|
||||||
|
|
||||||
interface ComptrollerInterface {
|
|
||||||
function enterMarkets(address[] calldata cTokens) external returns (uint[] memory);
|
|
||||||
function exitMarket(address cTokenAddress) external returns (uint);
|
|
||||||
function getAssetsIn(address account) external view returns (address[] memory);
|
|
||||||
function getAccountLiquidity(address account) external view returns (uint, uint, uint);
|
|
||||||
}
|
|
||||||
|
|
||||||
interface CompOracleInterface {
|
|
||||||
function getUnderlyingPrice(address) external view returns (uint);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
contract DSMath {
|
|
||||||
|
|
||||||
function add(uint x, uint y) internal pure returns (uint z) {
|
|
||||||
require((z = x + y) >= x, "math-not-safe");
|
|
||||||
}
|
|
||||||
|
|
||||||
function mul(uint x, uint y) internal pure returns (uint z) {
|
|
||||||
require(y == 0 || (z = x * y) / y == x, "math-not-safe");
|
|
||||||
}
|
|
||||||
|
|
||||||
uint constant WAD = 10 ** 18;
|
|
||||||
uint constant RAY = 10 ** 27;
|
|
||||||
|
|
||||||
function rmul(uint x, uint y) internal pure returns (uint z) {
|
|
||||||
z = add(mul(x, y), RAY / 2) / RAY;
|
|
||||||
}
|
|
||||||
|
|
||||||
function rdiv(uint x, uint y) internal pure returns (uint z) {
|
|
||||||
z = add(mul(x, RAY), y / 2) / y;
|
|
||||||
}
|
|
||||||
|
|
||||||
function wmul(uint x, uint y) internal pure returns (uint z) {
|
|
||||||
z = add(mul(x, y), WAD / 2) / WAD;
|
|
||||||
}
|
|
||||||
|
|
||||||
function wdiv(uint x, uint y) internal pure returns (uint z) {
|
|
||||||
z = add(mul(x, WAD), y / 2) / y;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
contract Helper is DSMath {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @dev setting allowance to compound for the "user proxy" if required
|
|
||||||
*/
|
|
||||||
function setApproval(address erc20, uint srcAmt, address to) internal {
|
|
||||||
TokenInterface erc20Contract = TokenInterface(erc20);
|
|
||||||
uint tokenAllowance = erc20Contract.allowance(address(this), to);
|
|
||||||
if (srcAmt > tokenAllowance) {
|
|
||||||
erc20Contract.approve(to, 2**255);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @dev get ethereum address for trade
|
|
||||||
*/
|
|
||||||
function getAddressETH() public pure returns (address eth) {
|
|
||||||
eth = 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @dev get MakerDAO CDP engine
|
|
||||||
*/
|
|
||||||
function getSaiTubAddress() public pure returns (address sai) {
|
|
||||||
sai = 0x448a5065aeBB8E423F0896E6c5D525C040f59af3;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @dev get MakerDAO Oracle for ETH price
|
|
||||||
*/
|
|
||||||
function getOracleAddress() public pure returns (address oracle) {
|
|
||||||
oracle = 0x729D19f657BD0614b4985Cf1D82531c67569197B;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @dev get uniswap MKR exchange
|
|
||||||
*/
|
|
||||||
function getUniswapMKRExchange() public pure returns (address ume) {
|
|
||||||
ume = 0x2C4Bd064b998838076fa341A83d007FC2FA50957;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @dev get uniswap DAI exchange
|
|
||||||
*/
|
|
||||||
function getUniswapDAIExchange() public pure returns (address ude) {
|
|
||||||
ude = 0x09cabEC1eAd1c0Ba254B09efb3EE13841712bE14;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @dev get uniswap DAI exchange
|
|
||||||
*/
|
|
||||||
function getBridgeAddress() public pure returns (address bridge) {
|
|
||||||
bridge = 0x9807554C441Bb37F549fc7F77165E5be49e55eD5;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @dev get Compound Comptroller Address
|
|
||||||
*/
|
|
||||||
function getComptrollerAddress() public pure returns (address troller) {
|
|
||||||
troller = 0x3d9819210A31b4961b30EF54bE2aeD79B9c9Cd3B;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @dev get Compound Comptroller Address
|
|
||||||
*/
|
|
||||||
function getCompOracleAddress() public pure returns (address troller) {
|
|
||||||
troller = 0xe7664229833AE4Abf4E269b8F23a86B657E2338D;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @dev get Compound Comptroller Address
|
|
||||||
*/
|
|
||||||
function getCETHAddress() public pure returns (address cEth) {
|
|
||||||
cEth = 0x4Ddc2D193948926D02f9B1fE9e1daa0718270ED5;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @dev get Compound Comptroller Address
|
|
||||||
*/
|
|
||||||
function getDAIAddress() public pure returns (address dai) {
|
|
||||||
dai = 0x89d24A6b4CcB1B6fAA2625fE562bDD9a23260359;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @dev get Compound Comptroller Address
|
|
||||||
*/
|
|
||||||
function getCDAIAddress() public pure returns (address cDai) {
|
|
||||||
cDai = 0xF5DCe57282A584D2746FaF1593d3121Fcac444dC;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @dev get CDP bytes by CDP ID
|
|
||||||
*/
|
|
||||||
function getCDPBytes(uint cdpNum) public pure returns (bytes32 cup) {
|
|
||||||
cup = bytes32(cdpNum);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
contract MakerHelper is Helper {
|
|
||||||
|
|
||||||
event LogOpen(uint cdpNum, address owner);
|
|
||||||
event LogLock(uint cdpNum, uint amtETH, uint amtPETH, address owner);
|
|
||||||
event LogFree(uint cdpNum, uint amtETH, uint amtPETH, address owner);
|
|
||||||
event LogDraw(uint cdpNum, uint amtDAI, address owner);
|
|
||||||
event LogWipe(uint cdpNum, uint daiAmt, uint mkrFee, uint daiFee, address owner);
|
|
||||||
event LogShut(uint cdpNum);
|
|
||||||
|
|
||||||
function setMakerAllowance(TokenInterface _token, address _spender) internal {
|
|
||||||
if (_token.allowance(address(this), _spender) != uint(-1)) {
|
|
||||||
_token.approve(_spender, uint(-1));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function isCupOwner(bytes32 cup) internal view returns(bool isOwner) {
|
|
||||||
TubInterface tub = TubInterface(getSaiTubAddress());
|
|
||||||
(address lad,,,) = tub.cups(cup);
|
|
||||||
isOwner = lad == address(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
function getCDPStats(bytes32 cup) public view returns (uint ethCol, uint daiDebt) {
|
|
||||||
TubInterface tub = TubInterface(getSaiTubAddress());
|
|
||||||
(, uint pethCol, uint debt,) = tub.cups(cup);
|
|
||||||
ethCol = rmul(pethCol, tub.per()); // get ETH col from PETH col
|
|
||||||
daiDebt = debt;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @dev get final Ratio of Maker CDP
|
|
||||||
* @param ethCol amount of ETH Col to add in existing Col
|
|
||||||
* @param daiDebt amount of DAI Debt to add in existing Debt
|
|
||||||
*/
|
|
||||||
function getMakerRatio(bytes32 cup, uint ethCol, uint daiDebt) public view returns (uint ratio) {
|
|
||||||
(uint makerCol, uint makerDebt) = getCDPStats(cup);
|
|
||||||
makerCol += ethCol;
|
|
||||||
makerDebt += daiDebt;
|
|
||||||
uint usdPerEth = uint(MakerOracleInterface(getOracleAddress()).read());
|
|
||||||
uint makerColInUSD = wmul(makerCol, usdPerEth);
|
|
||||||
ratio = wdiv(makerDebt, makerColInUSD);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
contract CompoundHelper is MakerHelper {
|
|
||||||
|
|
||||||
event LogMint(address erc20, address cErc20, uint tokenAmt, address owner);
|
|
||||||
event LogRedeem(address erc20, address cErc20, uint tokenAmt, address owner);
|
|
||||||
event LogBorrow(address erc20, address cErc20, uint tokenAmt, address owner);
|
|
||||||
event LogRepay(address erc20, address cErc20, uint tokenAmt, address owner);
|
|
||||||
|
|
||||||
function isCompoundOk(bytes32 cup, uint ethCol, uint daiAmt) internal returns (bool isOk) {
|
|
||||||
uint daiCompOracle = CompOracleInterface(getCompOracleAddress()).getUnderlyingPrice(getCDAIAddress()); // DAI in ETH
|
|
||||||
uint debtInEth = wmul(daiAmt, daiCompOracle);
|
|
||||||
if (ethCol == 0) {
|
|
||||||
(ethCol,) = getCDPStats(cup);
|
|
||||||
}
|
|
||||||
(, uint totalBorrow, uint maxBorrow,) = getCompRatio(address(this));
|
|
||||||
totalBorrow += debtInEth;
|
|
||||||
maxBorrow += wmul(ethCol, 750000000000000000);
|
|
||||||
isOk = totalBorrow < maxBorrow;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @dev get user's token supply and borrow in ETH
|
|
||||||
*/
|
|
||||||
function compSupplyBorrow(address cTokenAdd, address user) public returns(uint supplyInEth, uint borrowInEth) {
|
|
||||||
CTokenInterface cTokenContract = CTokenInterface(cTokenAdd);
|
|
||||||
uint tokenPriceInEth = CompOracleInterface(getCompOracleAddress()).getUnderlyingPrice(cTokenAdd);
|
|
||||||
uint cTokenBal = cTokenContract.balanceOf(user);
|
|
||||||
uint cTokenExchangeRate = cTokenContract.exchangeRateCurrent();
|
|
||||||
uint tokenSupply = wmul(cTokenBal, cTokenExchangeRate);
|
|
||||||
supplyInEth = wmul(tokenSupply, tokenPriceInEth);
|
|
||||||
uint tokenBorrowed = cTokenContract.borrowBalanceCurrent(user);
|
|
||||||
borrowInEth = wmul(tokenBorrowed, tokenPriceInEth);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @dev get users overall details for Compound
|
|
||||||
*/
|
|
||||||
function getCompRatio(address user) public returns (uint totalSupply, uint totalBorrow, uint maxBorrow, uint ratio) {
|
|
||||||
BridgeInterface bridgeContract = BridgeInterface(getBridgeAddress());
|
|
||||||
uint arrLength = bridgeContract.cArrLength();
|
|
||||||
for (uint i = 0; i < arrLength; i++) {
|
|
||||||
(address cTokenAdd, uint factor) = bridgeContract.cTokenAddr(i);
|
|
||||||
(uint supplyInEth, uint borrowInEth) = compSupplyBorrow(cTokenAdd, user);
|
|
||||||
totalSupply += supplyInEth;
|
|
||||||
totalBorrow += borrowInEth;
|
|
||||||
maxBorrow += wmul(supplyInEth, factor);
|
|
||||||
}
|
|
||||||
ratio = wdiv(totalBorrow, totalSupply);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @dev get users overall and basic stats for Compound
|
|
||||||
*/
|
|
||||||
function getCompoundStats(address user) public returns (uint ethColFree, uint daiDebt, uint totalSupply, uint totalBorrow, uint maxBorrow, uint daiInEth) {
|
|
||||||
CTokenInterface cEthContract = CTokenInterface(getCETHAddress());
|
|
||||||
CERC20Interface cDaiContract = CERC20Interface(getCDAIAddress());
|
|
||||||
uint cEthBal = cEthContract.balanceOf(user);
|
|
||||||
uint cEthExchangeRate = cEthContract.exchangeRateCurrent();
|
|
||||||
uint ethCol = wmul(cEthBal, cEthExchangeRate);
|
|
||||||
ethCol = wdiv(ethCol, cEthExchangeRate) <= cEthBal ? ethCol : ethCol - 1;
|
|
||||||
daiDebt = cDaiContract.borrowBalanceCurrent(user);
|
|
||||||
daiInEth = CompOracleInterface(getCompOracleAddress()).getUnderlyingPrice(getCDAIAddress());
|
|
||||||
uint compRatio;
|
|
||||||
(totalSupply, totalBorrow, maxBorrow, compRatio) = getCompRatio(user);
|
|
||||||
ethColFree = wdiv(wmul(daiDebt, daiInEth), compRatio);
|
|
||||||
if (ethColFree > ethCol) {
|
|
||||||
ethColFree = ethCol;
|
|
||||||
daiDebt = wdiv(wmul(ethColFree, compRatio), daiInEth);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function enterMarket(address cErc20) internal {
|
|
||||||
ComptrollerInterface troller = ComptrollerInterface(getComptrollerAddress());
|
|
||||||
address[] memory markets = troller.getAssetsIn(address(this));
|
|
||||||
bool isEntered = false;
|
|
||||||
for (uint i = 0; i < markets.length; i++) {
|
|
||||||
if (markets[i] == cErc20) {
|
|
||||||
isEntered = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!isEntered) {
|
|
||||||
address[] memory toEnter = new address[](1);
|
|
||||||
toEnter[0] = cErc20;
|
|
||||||
troller.enterMarkets(toEnter);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
contract MakerResolver is CompoundHelper {
|
|
||||||
|
|
||||||
function open() internal returns (bytes32) {
|
|
||||||
bytes32 cup = TubInterface(getSaiTubAddress()).open();
|
|
||||||
emit LogOpen(uint(cup), address(this));
|
|
||||||
return cup;
|
|
||||||
}
|
|
||||||
|
|
||||||
function lock(bytes32 cup, uint ethAmt) internal {
|
|
||||||
if (ethAmt > 0) {
|
|
||||||
address tubAddr = getSaiTubAddress();
|
|
||||||
|
|
||||||
TubInterface tub = TubInterface(tubAddr);
|
|
||||||
TokenInterface weth = tub.gem();
|
|
||||||
TokenInterface peth = tub.skr();
|
|
||||||
|
|
||||||
weth.deposit.value(ethAmt)();
|
|
||||||
|
|
||||||
uint ink = rdiv(ethAmt, tub.per());
|
|
||||||
ink = rmul(ink, tub.per()) <= ethAmt ? ink : ink - 1;
|
|
||||||
|
|
||||||
setMakerAllowance(weth, tubAddr);
|
|
||||||
tub.join(ink);
|
|
||||||
|
|
||||||
setMakerAllowance(peth, tubAddr);
|
|
||||||
tub.lock(cup, ink);
|
|
||||||
|
|
||||||
emit LogLock(
|
|
||||||
uint(cup),
|
|
||||||
ethAmt,
|
|
||||||
ink,
|
|
||||||
address(this)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function free(bytes32 cup, uint jam) internal {
|
|
||||||
if (jam > 0) {
|
|
||||||
address tubAddr = getSaiTubAddress();
|
|
||||||
|
|
||||||
TubInterface tub = TubInterface(tubAddr);
|
|
||||||
TokenInterface peth = tub.skr();
|
|
||||||
TokenInterface weth = tub.gem();
|
|
||||||
|
|
||||||
uint ink = rdiv(jam, tub.per());
|
|
||||||
ink = rmul(ink, tub.per()) <= jam ? ink : ink - 1;
|
|
||||||
tub.free(cup, ink);
|
|
||||||
|
|
||||||
setMakerAllowance(peth, tubAddr);
|
|
||||||
|
|
||||||
tub.exit(ink);
|
|
||||||
uint freeJam = weth.balanceOf(address(this)); // convert previous WETH into ETH as well
|
|
||||||
weth.withdraw(freeJam);
|
|
||||||
|
|
||||||
emit LogFree(
|
|
||||||
uint(cup),
|
|
||||||
freeJam,
|
|
||||||
ink,
|
|
||||||
address(this)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function draw(bytes32 cup, uint _wad) public {
|
|
||||||
if (_wad > 0) {
|
|
||||||
TubInterface tub = TubInterface(getSaiTubAddress());
|
|
||||||
|
|
||||||
tub.draw(cup, _wad);
|
|
||||||
TokenInterface dai = tub.sai();
|
|
||||||
setMakerAllowance(dai, getBridgeAddress());
|
|
||||||
BridgeInterface(getBridgeAddress()).transferBackDAI(_wad);
|
|
||||||
|
|
||||||
emit LogDraw(uint(cup), _wad, address(this));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function wipe(bytes32 cup, uint _wad, uint ethCol) internal returns (uint daiAmt) {
|
|
||||||
if (_wad > 0) {
|
|
||||||
TubInterface tub = TubInterface(getSaiTubAddress());
|
|
||||||
UniswapExchange daiEx = UniswapExchange(getUniswapDAIExchange());
|
|
||||||
UniswapExchange mkrEx = UniswapExchange(getUniswapMKRExchange());
|
|
||||||
TokenInterface dai = tub.sai();
|
|
||||||
TokenInterface mkr = tub.gov();
|
|
||||||
|
|
||||||
setMakerAllowance(dai, getSaiTubAddress());
|
|
||||||
setMakerAllowance(mkr, getSaiTubAddress());
|
|
||||||
setMakerAllowance(dai, getUniswapDAIExchange());
|
|
||||||
|
|
||||||
(bytes32 val, bool ok) = tub.pep().peek();
|
|
||||||
|
|
||||||
// MKR required for wipe = Stability fees accrued in Dai / MKRUSD value
|
|
||||||
uint mkrFeeHelper = rdiv(tub.rap(cup), tub.tab(cup));
|
|
||||||
uint mkrFee = wdiv(rmul(_wad, mkrFeeHelper), uint(val));
|
|
||||||
|
|
||||||
uint daiFeeAmt = daiEx.getTokenToEthOutputPrice(mkrEx.getEthToTokenOutputPrice(mkrFee));
|
|
||||||
daiAmt = add(_wad, daiFeeAmt);
|
|
||||||
|
|
||||||
require(isCompoundOk(cup, ethCol, daiAmt), "Compound Will Liquidate");
|
|
||||||
|
|
||||||
BridgeInterface(getBridgeAddress()).transferDAI(daiAmt);
|
|
||||||
|
|
||||||
if (ok && val != 0) {
|
|
||||||
daiEx.tokenToTokenSwapOutput(
|
|
||||||
mkrFee,
|
|
||||||
daiAmt,
|
|
||||||
uint(999000000000000000000),
|
|
||||||
uint(1899063809), // 6th March 2030 GMT // no logic
|
|
||||||
address(mkr)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
tub.wipe(cup, _wad);
|
|
||||||
|
|
||||||
emit LogWipe(
|
|
||||||
uint(cup),
|
|
||||||
daiAmt,
|
|
||||||
mkrFee,
|
|
||||||
daiFeeAmt,
|
|
||||||
address(this)
|
|
||||||
);
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function wipeAndFree(bytes32 cup, uint jam, uint _wad) internal returns (uint daiAmt) {
|
|
||||||
daiAmt = wipe(cup, _wad, 0);
|
|
||||||
free(cup, jam);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @dev close CDP
|
|
||||||
*/
|
|
||||||
function shut(bytes32 cup) internal returns (uint daiAmt) {
|
|
||||||
TubInterface tub = TubInterface(getSaiTubAddress());
|
|
||||||
daiAmt = wipeAndFree(cup, rmul(tub.ink(cup), tub.per()), tub.tab(cup));
|
|
||||||
tub.shut(cup);
|
|
||||||
emit LogShut(uint(cup)); // fetch remaining data from WIPE & FREE events
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
contract CompoundResolver is MakerResolver {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @dev Deposit ETH and mint Compound Tokens
|
|
||||||
*/
|
|
||||||
function mintCEth(uint tokenAmt) internal {
|
|
||||||
enterMarket(getCETHAddress());
|
|
||||||
CETHInterface cToken = CETHInterface(getCETHAddress());
|
|
||||||
cToken.mint.value(tokenAmt)();
|
|
||||||
emit LogMint(
|
|
||||||
getAddressETH(),
|
|
||||||
getCETHAddress(),
|
|
||||||
tokenAmt,
|
|
||||||
msg.sender
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @dev borrow DAI
|
|
||||||
*/
|
|
||||||
function borrowDAIComp(uint tokenAmt) internal {
|
|
||||||
enterMarket(getCDAIAddress());
|
|
||||||
require(CTokenInterface(getCDAIAddress()).borrow(tokenAmt) == 0, "got collateral?");
|
|
||||||
setApproval(getDAIAddress(), tokenAmt, getBridgeAddress());
|
|
||||||
BridgeInterface(getBridgeAddress()).transferBackDAI(tokenAmt);
|
|
||||||
emit LogBorrow(
|
|
||||||
getDAIAddress(),
|
|
||||||
getCDAIAddress(),
|
|
||||||
tokenAmt,
|
|
||||||
address(this)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @dev Pay DAI Debt
|
|
||||||
*/
|
|
||||||
function repayToken(uint tokenAmt) internal {
|
|
||||||
CERC20Interface cToken = CERC20Interface(getCDAIAddress());
|
|
||||||
BridgeInterface(getBridgeAddress()).transferDAI(tokenAmt);
|
|
||||||
setApproval(getDAIAddress(), tokenAmt, getCDAIAddress());
|
|
||||||
require(cToken.repayBorrow(tokenAmt) == 0, "transfer approved?");
|
|
||||||
emit LogRepay(
|
|
||||||
getDAIAddress(),
|
|
||||||
getCDAIAddress(),
|
|
||||||
tokenAmt,
|
|
||||||
address(this)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @dev Redeem ETH and mint Compound Tokens
|
|
||||||
* @param tokenAmt Amount of token To Redeem
|
|
||||||
*/
|
|
||||||
function redeemUnderlying(uint tokenAmt) internal {
|
|
||||||
CTokenInterface cToken = CTokenInterface(getCETHAddress());
|
|
||||||
setApproval(getCETHAddress(), 2**128, getCETHAddress());
|
|
||||||
require(cToken.redeemUnderlying(tokenAmt) == 0, "something went wrong");
|
|
||||||
emit LogRedeem(
|
|
||||||
getAddressETH(),
|
|
||||||
getCETHAddress(),
|
|
||||||
tokenAmt,
|
|
||||||
address(this)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
contract Bridge is CompoundResolver {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @dev convert Maker CDP into Compound Collateral
|
|
||||||
* @param toConvert ranges from 0 to 1 and has (18 decimals)
|
|
||||||
*/
|
|
||||||
function makerToCompound(uint cdpId, uint toConvert) public {
|
|
||||||
bytes32 cup = bytes32(cdpId);
|
|
||||||
isCupOwner(cup);
|
|
||||||
(uint ethCol, uint daiDebt) = getCDPStats(cup);
|
|
||||||
uint ethFree = ethCol;
|
|
||||||
uint daiAmt = daiDebt;
|
|
||||||
if (toConvert < 10**18) {
|
|
||||||
uint wipeAmt = wmul(daiDebt, toConvert);
|
|
||||||
ethFree = wmul(ethCol, toConvert);
|
|
||||||
daiAmt = wipe(cup, wipeAmt, ethFree);
|
|
||||||
free(cup, ethFree);
|
|
||||||
} else {
|
|
||||||
daiAmt = shut(cup);
|
|
||||||
}
|
|
||||||
mintCEth(ethFree);
|
|
||||||
borrowDAIComp(daiAmt);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @dev convert Compound Collateral into Maker CDP
|
|
||||||
* @param cdpId = 0, if user don't have any CDP
|
|
||||||
* @param toConvert ranges from 0 to 1 and has (18 decimals)
|
|
||||||
*/
|
|
||||||
function compoundToMaker(uint cdpId, uint toConvert) public {
|
|
||||||
bytes32 cup = bytes32(cdpId);
|
|
||||||
if (cdpId == 0) {
|
|
||||||
cup = open();
|
|
||||||
} else {
|
|
||||||
require(isCupOwner(cup), "Not CDP Owner");
|
|
||||||
}
|
|
||||||
|
|
||||||
(uint ethCol, uint daiDebt,, uint totalBorrow, uint maxBorrow, uint daiInEth) = getCompoundStats(address(this));
|
|
||||||
uint ethFree = ethCol;
|
|
||||||
uint daiAmt = daiDebt;
|
|
||||||
if (toConvert < 10**18) {
|
|
||||||
daiAmt = wmul(daiDebt, toConvert);
|
|
||||||
ethFree = wmul(ethCol, toConvert);
|
|
||||||
}
|
|
||||||
uint makerFinalRatio = getMakerRatio(cup, ethFree, daiAmt);
|
|
||||||
require(makerFinalRatio < 660000000000000000, "Maker CDP will liquidate");
|
|
||||||
totalBorrow -= wmul(daiAmt, daiInEth);
|
|
||||||
maxBorrow -= wmul(ethFree, 750000000000000000);
|
|
||||||
require(totalBorrow < maxBorrow, "Compound position will liquidate");
|
|
||||||
repayToken(daiAmt);
|
|
||||||
redeemUnderlying(ethFree);
|
|
||||||
lock(cup, ethFree);
|
|
||||||
draw(cup, daiAmt);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
contract InstaBridge is Bridge {
|
|
||||||
|
|
||||||
uint public version;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @dev setting up variables on deployment
|
|
||||||
* 1...2...3 versioning in each subsequent deployments
|
|
||||||
*/
|
|
||||||
constructor(uint _version) public {
|
|
||||||
version = _version;
|
|
||||||
}
|
|
||||||
|
|
||||||
function() external payable {}
|
|
||||||
|
|
||||||
}
|
|
||||||
667
contracts/ProxyLogics/InstaBridgeOld.sol
Normal file
667
contracts/ProxyLogics/InstaBridgeOld.sol
Normal file
|
|
@ -0,0 +1,667 @@
|
||||||
|
pragma solidity ^0.5.7;
|
||||||
|
|
||||||
|
interface TubInterface {
|
||||||
|
function open() external returns (bytes32);
|
||||||
|
function join(uint) external;
|
||||||
|
function exit(uint) external;
|
||||||
|
function lock(bytes32, uint) external;
|
||||||
|
function free(bytes32, uint) external;
|
||||||
|
function draw(bytes32, uint) external;
|
||||||
|
function wipe(bytes32, uint) external;
|
||||||
|
function give(bytes32, address) external;
|
||||||
|
function shut(bytes32) external;
|
||||||
|
function cups(bytes32) external view returns (address, uint, uint, uint);
|
||||||
|
function gem() external view returns (TokenInterface);
|
||||||
|
function gov() external view returns (TokenInterface);
|
||||||
|
function skr() external view returns (TokenInterface);
|
||||||
|
function sai() external view returns (TokenInterface);
|
||||||
|
function ink(bytes32) external view returns (uint);
|
||||||
|
function tab(bytes32) external returns (uint);
|
||||||
|
function rap(bytes32) external returns (uint);
|
||||||
|
function per() external view returns (uint);
|
||||||
|
function pep() external view returns (PepInterface);
|
||||||
|
}
|
||||||
|
|
||||||
|
interface TokenInterface {
|
||||||
|
function allowance(address, address) external view returns (uint);
|
||||||
|
function balanceOf(address) external view returns (uint);
|
||||||
|
function approve(address, uint) external;
|
||||||
|
function transfer(address, uint) external returns (bool);
|
||||||
|
function transferFrom(address, address, uint) external returns (bool);
|
||||||
|
function deposit() external payable;
|
||||||
|
function withdraw(uint) external;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface PepInterface {
|
||||||
|
function peek() external returns (bytes32, bool);
|
||||||
|
}
|
||||||
|
|
||||||
|
interface MakerOracleInterface {
|
||||||
|
function read() external view returns (bytes32);
|
||||||
|
}
|
||||||
|
|
||||||
|
interface UniswapExchange {
|
||||||
|
function getEthToTokenOutputPrice(uint256 tokensBought) external view returns (uint256 ethSold);
|
||||||
|
function getTokenToEthOutputPrice(uint256 ethBought) external view returns (uint256 tokensSold);
|
||||||
|
function tokenToTokenSwapOutput(
|
||||||
|
uint256 tokensBought,
|
||||||
|
uint256 maxTokensSold,
|
||||||
|
uint256 maxEthSold,
|
||||||
|
uint256 deadline,
|
||||||
|
address tokenAddr
|
||||||
|
) external returns (uint256 tokensSold);
|
||||||
|
}
|
||||||
|
|
||||||
|
interface BridgeInterface {
|
||||||
|
function transferDAI(uint) external;
|
||||||
|
function transferBackDAI(uint) external;
|
||||||
|
function cArrLength() external view returns (uint);
|
||||||
|
function cTokenAddr(uint) external view returns (address, uint);
|
||||||
|
}
|
||||||
|
|
||||||
|
interface CTokenInterface {
|
||||||
|
function redeem(uint redeemTokens) external returns (uint);
|
||||||
|
function redeemUnderlying(uint redeemAmount) external returns (uint);
|
||||||
|
function borrow(uint borrowAmount) external returns (uint);
|
||||||
|
function liquidateBorrow(address borrower, uint repayAmount, address cTokenCollateral) external returns (uint);
|
||||||
|
function liquidateBorrow(address borrower, address cTokenCollateral) external payable;
|
||||||
|
function exchangeRateCurrent() external returns (uint);
|
||||||
|
function getCash() external view returns (uint);
|
||||||
|
function totalBorrowsCurrent() external returns (uint);
|
||||||
|
function borrowRatePerBlock() external view returns (uint);
|
||||||
|
function supplyRatePerBlock() external view returns (uint);
|
||||||
|
function totalReserves() external view returns (uint);
|
||||||
|
function reserveFactorMantissa() external view returns (uint);
|
||||||
|
function borrowBalanceCurrent(address account) external returns (uint);
|
||||||
|
|
||||||
|
function totalSupply() external view returns (uint256);
|
||||||
|
function balanceOf(address owner) external view returns (uint256 balance);
|
||||||
|
function allowance(address, address) external view returns (uint);
|
||||||
|
function approve(address, uint) external;
|
||||||
|
function transfer(address, uint) external returns (bool);
|
||||||
|
function transferFrom(address, address, uint) external returns (bool);
|
||||||
|
}
|
||||||
|
|
||||||
|
interface CERC20Interface {
|
||||||
|
function mint(uint mintAmount) external returns (uint); // For ERC20
|
||||||
|
function repayBorrow(uint repayAmount) external returns (uint); // For ERC20
|
||||||
|
function repayBorrowBehalf(address borrower, uint repayAmount) external returns (uint); // For ERC20
|
||||||
|
function borrowBalanceCurrent(address account) external returns (uint);
|
||||||
|
}
|
||||||
|
|
||||||
|
interface CETHInterface {
|
||||||
|
function mint() external payable; // For ETH
|
||||||
|
function repayBorrow() external payable; // For ETH
|
||||||
|
function repayBorrowBehalf(address borrower) external payable; // For ETH
|
||||||
|
function borrowBalanceCurrent(address account) external returns (uint);
|
||||||
|
}
|
||||||
|
|
||||||
|
interface ERC20Interface {
|
||||||
|
function allowance(address, address) external view returns (uint);
|
||||||
|
function balanceOf(address) external view returns (uint);
|
||||||
|
function approve(address, uint) external;
|
||||||
|
function transfer(address, uint) external returns (bool);
|
||||||
|
function transferFrom(address, address, uint) external returns (bool);
|
||||||
|
}
|
||||||
|
|
||||||
|
interface ComptrollerInterface {
|
||||||
|
function enterMarkets(address[] calldata cTokens) external returns (uint[] memory);
|
||||||
|
function exitMarket(address cTokenAddress) external returns (uint);
|
||||||
|
function getAssetsIn(address account) external view returns (address[] memory);
|
||||||
|
function getAccountLiquidity(address account) external view returns (uint, uint, uint);
|
||||||
|
}
|
||||||
|
|
||||||
|
interface CompOracleInterface {
|
||||||
|
function getUnderlyingPrice(address) external view returns (uint);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
contract DSMath {
|
||||||
|
|
||||||
|
function add(uint x, uint y) internal pure returns (uint z) {
|
||||||
|
require((z = x + y) >= x, "math-not-safe");
|
||||||
|
}
|
||||||
|
|
||||||
|
function mul(uint x, uint y) internal pure returns (uint z) {
|
||||||
|
require(y == 0 || (z = x * y) / y == x, "math-not-safe");
|
||||||
|
}
|
||||||
|
|
||||||
|
uint constant WAD = 10 ** 18;
|
||||||
|
uint constant RAY = 10 ** 27;
|
||||||
|
|
||||||
|
function rmul(uint x, uint y) internal pure returns (uint z) {
|
||||||
|
z = add(mul(x, y), RAY / 2) / RAY;
|
||||||
|
}
|
||||||
|
|
||||||
|
function rdiv(uint x, uint y) internal pure returns (uint z) {
|
||||||
|
z = add(mul(x, RAY), y / 2) / y;
|
||||||
|
}
|
||||||
|
|
||||||
|
function wmul(uint x, uint y) internal pure returns (uint z) {
|
||||||
|
z = add(mul(x, y), WAD / 2) / WAD;
|
||||||
|
}
|
||||||
|
|
||||||
|
function wdiv(uint x, uint y) internal pure returns (uint z) {
|
||||||
|
z = add(mul(x, WAD), y / 2) / y;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
contract Helper is DSMath {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dev setting allowance to compound for the "user proxy" if required
|
||||||
|
*/
|
||||||
|
function setApproval(address erc20, uint srcAmt, address to) internal {
|
||||||
|
TokenInterface erc20Contract = TokenInterface(erc20);
|
||||||
|
uint tokenAllowance = erc20Contract.allowance(address(this), to);
|
||||||
|
if (srcAmt > tokenAllowance) {
|
||||||
|
erc20Contract.approve(to, 2**255);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dev get ethereum address for trade
|
||||||
|
*/
|
||||||
|
function getAddressETH() public pure returns (address eth) {
|
||||||
|
eth = 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dev get MakerDAO CDP engine
|
||||||
|
*/
|
||||||
|
function getSaiTubAddress() public pure returns (address sai) {
|
||||||
|
sai = 0x448a5065aeBB8E423F0896E6c5D525C040f59af3;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dev get MakerDAO Oracle for ETH price
|
||||||
|
*/
|
||||||
|
function getOracleAddress() public pure returns (address oracle) {
|
||||||
|
oracle = 0x729D19f657BD0614b4985Cf1D82531c67569197B;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dev get uniswap MKR exchange
|
||||||
|
*/
|
||||||
|
function getUniswapMKRExchange() public pure returns (address ume) {
|
||||||
|
ume = 0x2C4Bd064b998838076fa341A83d007FC2FA50957;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dev get uniswap DAI exchange
|
||||||
|
*/
|
||||||
|
function getUniswapDAIExchange() public pure returns (address ude) {
|
||||||
|
ude = 0x09cabEC1eAd1c0Ba254B09efb3EE13841712bE14;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dev get uniswap DAI exchange
|
||||||
|
*/
|
||||||
|
function getBridgeAddress() public pure returns (address bridge) {
|
||||||
|
bridge = 0x9807554C441Bb37F549fc7F77165E5be49e55eD5;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dev get Compound Comptroller Address
|
||||||
|
*/
|
||||||
|
function getComptrollerAddress() public pure returns (address troller) {
|
||||||
|
troller = 0x3d9819210A31b4961b30EF54bE2aeD79B9c9Cd3B;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dev get Compound Comptroller Address
|
||||||
|
*/
|
||||||
|
function getCompOracleAddress() public pure returns (address troller) {
|
||||||
|
troller = 0xe7664229833AE4Abf4E269b8F23a86B657E2338D;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dev get Compound Comptroller Address
|
||||||
|
*/
|
||||||
|
function getCETHAddress() public pure returns (address cEth) {
|
||||||
|
cEth = 0x4Ddc2D193948926D02f9B1fE9e1daa0718270ED5;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dev get Compound Comptroller Address
|
||||||
|
*/
|
||||||
|
function getDAIAddress() public pure returns (address dai) {
|
||||||
|
dai = 0x89d24A6b4CcB1B6fAA2625fE562bDD9a23260359;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dev get Compound Comptroller Address
|
||||||
|
*/
|
||||||
|
function getCDAIAddress() public pure returns (address cDai) {
|
||||||
|
cDai = 0xF5DCe57282A584D2746FaF1593d3121Fcac444dC;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dev get CDP bytes by CDP ID
|
||||||
|
*/
|
||||||
|
function getCDPBytes(uint cdpNum) public pure returns (bytes32 cup) {
|
||||||
|
cup = bytes32(cdpNum);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
contract MakerHelper is Helper {
|
||||||
|
|
||||||
|
event LogOpen(uint cdpNum, address owner);
|
||||||
|
event LogLock(uint cdpNum, uint amtETH, uint amtPETH, address owner);
|
||||||
|
event LogFree(uint cdpNum, uint amtETH, uint amtPETH, address owner);
|
||||||
|
event LogDraw(uint cdpNum, uint amtDAI, address owner);
|
||||||
|
event LogWipe(uint cdpNum, uint daiAmt, uint mkrFee, uint daiFee, address owner);
|
||||||
|
event LogShut(uint cdpNum);
|
||||||
|
|
||||||
|
function setMakerAllowance(TokenInterface _token, address _spender) internal {
|
||||||
|
if (_token.allowance(address(this), _spender) != uint(-1)) {
|
||||||
|
_token.approve(_spender, uint(-1));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function isCupOwner(bytes32 cup) internal view returns(bool isOwner) {
|
||||||
|
TubInterface tub = TubInterface(getSaiTubAddress());
|
||||||
|
(address lad,,,) = tub.cups(cup);
|
||||||
|
isOwner = lad == address(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
function getCDPStats(bytes32 cup) public view returns (uint ethCol, uint daiDebt) {
|
||||||
|
TubInterface tub = TubInterface(getSaiTubAddress());
|
||||||
|
(, uint pethCol, uint debt,) = tub.cups(cup);
|
||||||
|
ethCol = rmul(pethCol, tub.per()); // get ETH col from PETH col
|
||||||
|
daiDebt = debt;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dev get final Ratio of Maker CDP
|
||||||
|
* @param ethCol amount of ETH Col to add in existing Col
|
||||||
|
* @param daiDebt amount of DAI Debt to add in existing Debt
|
||||||
|
*/
|
||||||
|
function getMakerRatio(bytes32 cup, uint ethCol, uint daiDebt) public view returns (uint ratio) {
|
||||||
|
(uint makerCol, uint makerDebt) = getCDPStats(cup);
|
||||||
|
makerCol += ethCol;
|
||||||
|
makerDebt += daiDebt;
|
||||||
|
uint usdPerEth = uint(MakerOracleInterface(getOracleAddress()).read());
|
||||||
|
uint makerColInUSD = wmul(makerCol, usdPerEth);
|
||||||
|
ratio = wdiv(makerDebt, makerColInUSD);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
contract CompoundHelper is MakerHelper {
|
||||||
|
|
||||||
|
event LogMint(address erc20, address cErc20, uint tokenAmt, address owner);
|
||||||
|
event LogRedeem(address erc20, address cErc20, uint tokenAmt, address owner);
|
||||||
|
event LogBorrow(address erc20, address cErc20, uint tokenAmt, address owner);
|
||||||
|
event LogRepay(address erc20, address cErc20, uint tokenAmt, address owner);
|
||||||
|
|
||||||
|
function isCompoundOk(bytes32 cup, uint ethCol, uint daiAmt) internal returns (bool isOk) {
|
||||||
|
uint daiCompOracle = CompOracleInterface(getCompOracleAddress()).getUnderlyingPrice(getCDAIAddress()); // DAI in ETH
|
||||||
|
uint debtInEth = wmul(daiAmt, daiCompOracle);
|
||||||
|
if (ethCol == 0) {
|
||||||
|
(ethCol,) = getCDPStats(cup);
|
||||||
|
}
|
||||||
|
(, uint totalBorrow, uint maxBorrow,) = getCompRatio(address(this));
|
||||||
|
totalBorrow += debtInEth;
|
||||||
|
maxBorrow += wmul(ethCol, 750000000000000000);
|
||||||
|
isOk = totalBorrow < maxBorrow;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dev get user's token supply and borrow in ETH
|
||||||
|
*/
|
||||||
|
function compSupplyBorrow(address cTokenAdd, address user) public returns(uint supplyInEth, uint borrowInEth) {
|
||||||
|
CTokenInterface cTokenContract = CTokenInterface(cTokenAdd);
|
||||||
|
uint tokenPriceInEth = CompOracleInterface(getCompOracleAddress()).getUnderlyingPrice(cTokenAdd);
|
||||||
|
uint cTokenBal = cTokenContract.balanceOf(user);
|
||||||
|
uint cTokenExchangeRate = cTokenContract.exchangeRateCurrent();
|
||||||
|
uint tokenSupply = wmul(cTokenBal, cTokenExchangeRate);
|
||||||
|
supplyInEth = wmul(tokenSupply, tokenPriceInEth);
|
||||||
|
uint tokenBorrowed = cTokenContract.borrowBalanceCurrent(user);
|
||||||
|
borrowInEth = wmul(tokenBorrowed, tokenPriceInEth);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dev get users overall details for Compound
|
||||||
|
*/
|
||||||
|
function getCompRatio(address user) public returns (uint totalSupply, uint totalBorrow, uint maxBorrow, uint ratio) {
|
||||||
|
BridgeInterface bridgeContract = BridgeInterface(getBridgeAddress());
|
||||||
|
uint arrLength = bridgeContract.cArrLength();
|
||||||
|
for (uint i = 0; i < arrLength; i++) {
|
||||||
|
(address cTokenAdd, uint factor) = bridgeContract.cTokenAddr(i);
|
||||||
|
(uint supplyInEth, uint borrowInEth) = compSupplyBorrow(cTokenAdd, user);
|
||||||
|
totalSupply += supplyInEth;
|
||||||
|
totalBorrow += borrowInEth;
|
||||||
|
maxBorrow += wmul(supplyInEth, factor);
|
||||||
|
}
|
||||||
|
ratio = wdiv(totalBorrow, totalSupply);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dev get users overall and basic stats for Compound
|
||||||
|
*/
|
||||||
|
function getCompoundStats(address user) public returns (uint ethColFree, uint daiDebt, uint totalSupply, uint totalBorrow, uint maxBorrow, uint daiInEth) {
|
||||||
|
CTokenInterface cEthContract = CTokenInterface(getCETHAddress());
|
||||||
|
CERC20Interface cDaiContract = CERC20Interface(getCDAIAddress());
|
||||||
|
uint cEthBal = cEthContract.balanceOf(user);
|
||||||
|
uint cEthExchangeRate = cEthContract.exchangeRateCurrent();
|
||||||
|
uint ethCol = wmul(cEthBal, cEthExchangeRate);
|
||||||
|
ethCol = wdiv(ethCol, cEthExchangeRate) <= cEthBal ? ethCol : ethCol - 1;
|
||||||
|
daiDebt = cDaiContract.borrowBalanceCurrent(user);
|
||||||
|
daiInEth = CompOracleInterface(getCompOracleAddress()).getUnderlyingPrice(getCDAIAddress());
|
||||||
|
uint compRatio;
|
||||||
|
(totalSupply, totalBorrow, maxBorrow, compRatio) = getCompRatio(user);
|
||||||
|
ethColFree = wdiv(wmul(daiDebt, daiInEth), compRatio);
|
||||||
|
if (ethColFree > ethCol) {
|
||||||
|
ethColFree = ethCol;
|
||||||
|
daiDebt = wdiv(wmul(ethColFree, compRatio), daiInEth);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function enterMarket(address cErc20) internal {
|
||||||
|
ComptrollerInterface troller = ComptrollerInterface(getComptrollerAddress());
|
||||||
|
address[] memory markets = troller.getAssetsIn(address(this));
|
||||||
|
bool isEntered = false;
|
||||||
|
for (uint i = 0; i < markets.length; i++) {
|
||||||
|
if (markets[i] == cErc20) {
|
||||||
|
isEntered = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!isEntered) {
|
||||||
|
address[] memory toEnter = new address[](1);
|
||||||
|
toEnter[0] = cErc20;
|
||||||
|
troller.enterMarkets(toEnter);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
contract MakerResolver is CompoundHelper {
|
||||||
|
|
||||||
|
function open() internal returns (bytes32) {
|
||||||
|
bytes32 cup = TubInterface(getSaiTubAddress()).open();
|
||||||
|
emit LogOpen(uint(cup), address(this));
|
||||||
|
return cup;
|
||||||
|
}
|
||||||
|
|
||||||
|
function lock(bytes32 cup, uint ethAmt) internal {
|
||||||
|
if (ethAmt > 0) {
|
||||||
|
address tubAddr = getSaiTubAddress();
|
||||||
|
|
||||||
|
TubInterface tub = TubInterface(tubAddr);
|
||||||
|
TokenInterface weth = tub.gem();
|
||||||
|
TokenInterface peth = tub.skr();
|
||||||
|
|
||||||
|
weth.deposit.value(ethAmt)();
|
||||||
|
|
||||||
|
uint ink = rdiv(ethAmt, tub.per());
|
||||||
|
ink = rmul(ink, tub.per()) <= ethAmt ? ink : ink - 1;
|
||||||
|
|
||||||
|
setMakerAllowance(weth, tubAddr);
|
||||||
|
tub.join(ink);
|
||||||
|
|
||||||
|
setMakerAllowance(peth, tubAddr);
|
||||||
|
tub.lock(cup, ink);
|
||||||
|
|
||||||
|
emit LogLock(
|
||||||
|
uint(cup),
|
||||||
|
ethAmt,
|
||||||
|
ink,
|
||||||
|
address(this)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function free(bytes32 cup, uint jam) internal {
|
||||||
|
if (jam > 0) {
|
||||||
|
address tubAddr = getSaiTubAddress();
|
||||||
|
|
||||||
|
TubInterface tub = TubInterface(tubAddr);
|
||||||
|
TokenInterface peth = tub.skr();
|
||||||
|
TokenInterface weth = tub.gem();
|
||||||
|
|
||||||
|
uint ink = rdiv(jam, tub.per());
|
||||||
|
ink = rmul(ink, tub.per()) <= jam ? ink : ink - 1;
|
||||||
|
tub.free(cup, ink);
|
||||||
|
|
||||||
|
setMakerAllowance(peth, tubAddr);
|
||||||
|
|
||||||
|
tub.exit(ink);
|
||||||
|
uint freeJam = weth.balanceOf(address(this)); // convert previous WETH into ETH as well
|
||||||
|
weth.withdraw(freeJam);
|
||||||
|
|
||||||
|
emit LogFree(
|
||||||
|
uint(cup),
|
||||||
|
freeJam,
|
||||||
|
ink,
|
||||||
|
address(this)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function draw(bytes32 cup, uint _wad) public {
|
||||||
|
if (_wad > 0) {
|
||||||
|
TubInterface tub = TubInterface(getSaiTubAddress());
|
||||||
|
|
||||||
|
tub.draw(cup, _wad);
|
||||||
|
TokenInterface dai = tub.sai();
|
||||||
|
setMakerAllowance(dai, getBridgeAddress());
|
||||||
|
BridgeInterface(getBridgeAddress()).transferBackDAI(_wad);
|
||||||
|
|
||||||
|
emit LogDraw(uint(cup), _wad, address(this));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function wipe(bytes32 cup, uint _wad, uint ethCol) internal returns (uint daiAmt) {
|
||||||
|
if (_wad > 0) {
|
||||||
|
TubInterface tub = TubInterface(getSaiTubAddress());
|
||||||
|
UniswapExchange daiEx = UniswapExchange(getUniswapDAIExchange());
|
||||||
|
UniswapExchange mkrEx = UniswapExchange(getUniswapMKRExchange());
|
||||||
|
TokenInterface dai = tub.sai();
|
||||||
|
TokenInterface mkr = tub.gov();
|
||||||
|
|
||||||
|
setMakerAllowance(dai, getSaiTubAddress());
|
||||||
|
setMakerAllowance(mkr, getSaiTubAddress());
|
||||||
|
setMakerAllowance(dai, getUniswapDAIExchange());
|
||||||
|
|
||||||
|
(bytes32 val, bool ok) = tub.pep().peek();
|
||||||
|
|
||||||
|
// MKR required for wipe = Stability fees accrued in Dai / MKRUSD value
|
||||||
|
uint mkrFeeHelper = rdiv(tub.rap(cup), tub.tab(cup));
|
||||||
|
uint mkrFee = wdiv(rmul(_wad, mkrFeeHelper), uint(val));
|
||||||
|
|
||||||
|
uint daiFeeAmt = daiEx.getTokenToEthOutputPrice(mkrEx.getEthToTokenOutputPrice(mkrFee));
|
||||||
|
daiAmt = add(_wad, daiFeeAmt);
|
||||||
|
|
||||||
|
require(isCompoundOk(cup, ethCol, daiAmt), "Compound Will Liquidate");
|
||||||
|
|
||||||
|
BridgeInterface(getBridgeAddress()).transferDAI(daiAmt);
|
||||||
|
|
||||||
|
if (ok && val != 0) {
|
||||||
|
daiEx.tokenToTokenSwapOutput(
|
||||||
|
mkrFee,
|
||||||
|
daiAmt,
|
||||||
|
uint(999000000000000000000),
|
||||||
|
uint(1899063809), // 6th March 2030 GMT // no logic
|
||||||
|
address(mkr)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
tub.wipe(cup, _wad);
|
||||||
|
|
||||||
|
emit LogWipe(
|
||||||
|
uint(cup),
|
||||||
|
daiAmt,
|
||||||
|
mkrFee,
|
||||||
|
daiFeeAmt,
|
||||||
|
address(this)
|
||||||
|
);
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function wipeAndFree(bytes32 cup, uint jam, uint _wad) internal returns (uint daiAmt) {
|
||||||
|
daiAmt = wipe(cup, _wad, 0);
|
||||||
|
free(cup, jam);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dev close CDP
|
||||||
|
*/
|
||||||
|
function shut(bytes32 cup) internal returns (uint daiAmt) {
|
||||||
|
TubInterface tub = TubInterface(getSaiTubAddress());
|
||||||
|
daiAmt = wipeAndFree(cup, rmul(tub.ink(cup), tub.per()), tub.tab(cup));
|
||||||
|
tub.shut(cup);
|
||||||
|
emit LogShut(uint(cup)); // fetch remaining data from WIPE & FREE events
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
contract CompoundResolver is MakerResolver {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dev Deposit ETH and mint Compound Tokens
|
||||||
|
*/
|
||||||
|
function mintCEth(uint tokenAmt) internal {
|
||||||
|
enterMarket(getCETHAddress());
|
||||||
|
CETHInterface cToken = CETHInterface(getCETHAddress());
|
||||||
|
cToken.mint.value(tokenAmt)();
|
||||||
|
emit LogMint(
|
||||||
|
getAddressETH(),
|
||||||
|
getCETHAddress(),
|
||||||
|
tokenAmt,
|
||||||
|
msg.sender
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dev borrow DAI
|
||||||
|
*/
|
||||||
|
function borrowDAIComp(uint tokenAmt) internal {
|
||||||
|
enterMarket(getCDAIAddress());
|
||||||
|
require(CTokenInterface(getCDAIAddress()).borrow(tokenAmt) == 0, "got collateral?");
|
||||||
|
setApproval(getDAIAddress(), tokenAmt, getBridgeAddress());
|
||||||
|
BridgeInterface(getBridgeAddress()).transferBackDAI(tokenAmt);
|
||||||
|
emit LogBorrow(
|
||||||
|
getDAIAddress(),
|
||||||
|
getCDAIAddress(),
|
||||||
|
tokenAmt,
|
||||||
|
address(this)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dev Pay DAI Debt
|
||||||
|
*/
|
||||||
|
function repayToken(uint tokenAmt) internal {
|
||||||
|
CERC20Interface cToken = CERC20Interface(getCDAIAddress());
|
||||||
|
BridgeInterface(getBridgeAddress()).transferDAI(tokenAmt);
|
||||||
|
setApproval(getDAIAddress(), tokenAmt, getCDAIAddress());
|
||||||
|
require(cToken.repayBorrow(tokenAmt) == 0, "transfer approved?");
|
||||||
|
emit LogRepay(
|
||||||
|
getDAIAddress(),
|
||||||
|
getCDAIAddress(),
|
||||||
|
tokenAmt,
|
||||||
|
address(this)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dev Redeem ETH and mint Compound Tokens
|
||||||
|
* @param tokenAmt Amount of token To Redeem
|
||||||
|
*/
|
||||||
|
function redeemUnderlying(uint tokenAmt) internal {
|
||||||
|
CTokenInterface cToken = CTokenInterface(getCETHAddress());
|
||||||
|
setApproval(getCETHAddress(), 2**128, getCETHAddress());
|
||||||
|
require(cToken.redeemUnderlying(tokenAmt) == 0, "something went wrong");
|
||||||
|
emit LogRedeem(
|
||||||
|
getAddressETH(),
|
||||||
|
getCETHAddress(),
|
||||||
|
tokenAmt,
|
||||||
|
address(this)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
contract Bridge is CompoundResolver {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dev convert Maker CDP into Compound Collateral
|
||||||
|
* @param toConvert ranges from 0 to 1 and has (18 decimals)
|
||||||
|
*/
|
||||||
|
function makerToCompound(uint cdpId, uint toConvert) public {
|
||||||
|
bytes32 cup = bytes32(cdpId);
|
||||||
|
isCupOwner(cup);
|
||||||
|
(uint ethCol, uint daiDebt) = getCDPStats(cup);
|
||||||
|
uint ethFree = ethCol;
|
||||||
|
uint daiAmt = daiDebt;
|
||||||
|
if (toConvert < 10**18) {
|
||||||
|
uint wipeAmt = wmul(daiDebt, toConvert);
|
||||||
|
ethFree = wmul(ethCol, toConvert);
|
||||||
|
daiAmt = wipe(cup, wipeAmt, ethFree);
|
||||||
|
free(cup, ethFree);
|
||||||
|
} else {
|
||||||
|
daiAmt = shut(cup);
|
||||||
|
}
|
||||||
|
mintCEth(ethFree);
|
||||||
|
borrowDAIComp(daiAmt);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dev convert Compound Collateral into Maker CDP
|
||||||
|
* @param cdpId = 0, if user don't have any CDP
|
||||||
|
* @param toConvert ranges from 0 to 1 and has (18 decimals)
|
||||||
|
*/
|
||||||
|
function compoundToMaker(uint cdpId, uint toConvert) public {
|
||||||
|
bytes32 cup = bytes32(cdpId);
|
||||||
|
if (cdpId == 0) {
|
||||||
|
cup = open();
|
||||||
|
} else {
|
||||||
|
require(isCupOwner(cup), "Not CDP Owner");
|
||||||
|
}
|
||||||
|
|
||||||
|
(uint ethCol, uint daiDebt,, uint totalBorrow, uint maxBorrow, uint daiInEth) = getCompoundStats(address(this));
|
||||||
|
uint ethFree = ethCol;
|
||||||
|
uint daiAmt = daiDebt;
|
||||||
|
if (toConvert < 10**18) {
|
||||||
|
daiAmt = wmul(daiDebt, toConvert);
|
||||||
|
ethFree = wmul(ethCol, toConvert);
|
||||||
|
}
|
||||||
|
uint makerFinalRatio = getMakerRatio(cup, ethFree, daiAmt);
|
||||||
|
require(makerFinalRatio < 660000000000000000, "Maker CDP will liquidate");
|
||||||
|
totalBorrow -= wmul(daiAmt, daiInEth);
|
||||||
|
maxBorrow -= wmul(ethFree, 750000000000000000);
|
||||||
|
require(totalBorrow < maxBorrow, "Compound position will liquidate");
|
||||||
|
repayToken(daiAmt);
|
||||||
|
redeemUnderlying(ethFree);
|
||||||
|
lock(cup, ethFree);
|
||||||
|
draw(cup, daiAmt);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
contract InstaBridge is Bridge {
|
||||||
|
|
||||||
|
uint public version;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dev setting up variables on deployment
|
||||||
|
* 1...2...3 versioning in each subsequent deployments
|
||||||
|
*/
|
||||||
|
constructor(uint _version) public {
|
||||||
|
version = _version;
|
||||||
|
}
|
||||||
|
|
||||||
|
function() external payable {}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -1,203 +0,0 @@
|
||||||
pragma solidity ^0.5.7;
|
|
||||||
|
|
||||||
interface RegistryInterface {
|
|
||||||
function proxies(address) external view returns (address);
|
|
||||||
}
|
|
||||||
|
|
||||||
interface UserWalletInterface {
|
|
||||||
function owner() external view returns (address);
|
|
||||||
}
|
|
||||||
|
|
||||||
interface CTokenInterface {
|
|
||||||
function mint(uint mintAmount) external returns (uint); // For ERC20
|
|
||||||
function redeem(uint redeemTokens) external returns (uint);
|
|
||||||
function redeemUnderlying(uint redeemAmount) external returns (uint);
|
|
||||||
function exchangeRateCurrent() external returns (uint);
|
|
||||||
function allowance(address, address) external view returns (uint);
|
|
||||||
function approve(address, uint) external;
|
|
||||||
function transfer(address, uint) external returns (bool);
|
|
||||||
function transferFrom(address, address, uint) external returns (bool);
|
|
||||||
}
|
|
||||||
|
|
||||||
interface ERC20Interface {
|
|
||||||
function allowance(address, address) external view returns (uint);
|
|
||||||
function approve(address, uint) external;
|
|
||||||
function transfer(address, uint) external returns (bool);
|
|
||||||
function transferFrom(address, address, uint) external returns (bool);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
contract DSMath {
|
|
||||||
|
|
||||||
function add(uint x, uint y) internal pure returns (uint z) {
|
|
||||||
require((z = x + y) >= x, "math-not-safe");
|
|
||||||
}
|
|
||||||
|
|
||||||
function mul(uint x, uint y) internal pure returns (uint z) {
|
|
||||||
require(y == 0 || (z = x * y) / y == x, "math-not-safe");
|
|
||||||
}
|
|
||||||
|
|
||||||
uint constant WAD = 10 ** 18;
|
|
||||||
|
|
||||||
function wmul(uint x, uint y) internal pure returns (uint z) {
|
|
||||||
z = add(mul(x, y), WAD / 2) / WAD;
|
|
||||||
}
|
|
||||||
|
|
||||||
function wdiv(uint x, uint y) internal pure returns (uint z) {
|
|
||||||
z = add(mul(x, WAD), y / 2) / y;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
contract Helper is DSMath {
|
|
||||||
|
|
||||||
address public daiAddr = 0x89d24A6b4CcB1B6fAA2625fE562bDD9a23260359;
|
|
||||||
address public cdaiAddr = 0xF5DCe57282A584D2746FaF1593d3121Fcac444dC;
|
|
||||||
address public registryAddr = 0xF5DCe57282A584D2746FaF1593d3121Fcac444dC;
|
|
||||||
mapping (address => uint) public deposited; // amount of CToken deposited
|
|
||||||
mapping (address => bool) public isAdmin;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @dev setting allowance to compound for the "user proxy" if required
|
|
||||||
*/
|
|
||||||
function setApproval(address erc20, uint srcAmt, address to) internal {
|
|
||||||
ERC20Interface erc20Contract = ERC20Interface(erc20);
|
|
||||||
uint tokenAllowance = erc20Contract.allowance(address(this), to);
|
|
||||||
if (srcAmt > tokenAllowance) {
|
|
||||||
erc20Contract.approve(to, 2**255);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
modifier isUserWallet {
|
|
||||||
address userAdd = UserWalletInterface(msg.sender).owner();
|
|
||||||
address walletAdd = RegistryInterface(registryAddr).proxies(userAdd);
|
|
||||||
require(walletAdd != address(0), "Not-User-Wallet");
|
|
||||||
require(walletAdd == msg.sender, "Not-Wallet-Owner");
|
|
||||||
_;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
contract CTokens is Helper {
|
|
||||||
|
|
||||||
struct CTokenData {
|
|
||||||
address cTokenAdd;
|
|
||||||
uint factor;
|
|
||||||
}
|
|
||||||
|
|
||||||
CTokenData[] public cTokenAddr;
|
|
||||||
|
|
||||||
uint public cArrLength = 0;
|
|
||||||
|
|
||||||
function addCToken(address cToken, uint factor) public {
|
|
||||||
require(isAdmin[msg.sender], "Address not an admin");
|
|
||||||
CTokenData memory setCToken = CTokenData(cToken, factor);
|
|
||||||
cTokenAddr.push(setCToken);
|
|
||||||
cArrLength++;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
contract Bridge is CTokens {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @dev Deposit DAI for liquidity
|
|
||||||
*/
|
|
||||||
function depositDAI(uint amt) public {
|
|
||||||
ERC20Interface(daiAddr).transferFrom(msg.sender, address(this), amt);
|
|
||||||
CTokenInterface cToken = CTokenInterface(cdaiAddr);
|
|
||||||
assert(cToken.mint(amt) == 0);
|
|
||||||
uint cDaiAmt = wdiv(amt, cToken.exchangeRateCurrent());
|
|
||||||
deposited[msg.sender] += cDaiAmt;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @dev Withdraw DAI from liquidity
|
|
||||||
*/
|
|
||||||
function withdrawDAI(uint amt) public {
|
|
||||||
require(deposited[msg.sender] != 0, "Nothing to Withdraw");
|
|
||||||
CTokenInterface cToken = CTokenInterface(cdaiAddr);
|
|
||||||
uint withdrawAmt = wdiv(amt, cToken.exchangeRateCurrent());
|
|
||||||
uint daiAmt = amt;
|
|
||||||
if (withdrawAmt > deposited[msg.sender]) {
|
|
||||||
withdrawAmt = deposited[msg.sender];
|
|
||||||
daiAmt = wmul(withdrawAmt, cToken.exchangeRateCurrent());
|
|
||||||
}
|
|
||||||
require(cToken.redeem(withdrawAmt) == 0, "something went wrong");
|
|
||||||
ERC20Interface(daiAddr).transfer(msg.sender, daiAmt);
|
|
||||||
deposited[msg.sender] -= withdrawAmt;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @dev Deposit CDAI for liquidity
|
|
||||||
*/
|
|
||||||
function depositCDAI(uint amt) public {
|
|
||||||
CTokenInterface cToken = CTokenInterface(cdaiAddr);
|
|
||||||
require(cToken.transferFrom(msg.sender, address(this), amt) == true, "Nothing to deposit");
|
|
||||||
deposited[msg.sender] += amt;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @dev Withdraw CDAI from liquidity
|
|
||||||
*/
|
|
||||||
function withdrawCDAI(uint amt) public {
|
|
||||||
require(deposited[msg.sender] != 0, "Nothing to Withdraw");
|
|
||||||
CTokenInterface cToken = CTokenInterface(cdaiAddr);
|
|
||||||
uint withdrawAmt = amt;
|
|
||||||
if (withdrawAmt > deposited[msg.sender]) {
|
|
||||||
withdrawAmt = deposited[msg.sender];
|
|
||||||
}
|
|
||||||
cToken.transfer(msg.sender, withdrawAmt);
|
|
||||||
deposited[msg.sender] -= withdrawAmt;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @dev Transfer DAI to only to user wallet
|
|
||||||
*/
|
|
||||||
function transferDAI(uint amt) public isUserWallet {
|
|
||||||
CTokenInterface cToken = CTokenInterface(cdaiAddr);
|
|
||||||
require(cToken.redeemUnderlying(amt) == 0, "something went wrong");
|
|
||||||
ERC20Interface(daiAddr).transfer(msg.sender, amt);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @dev Take DAI back from user wallet
|
|
||||||
*/
|
|
||||||
function transferBackDAI(uint amt) public isUserWallet {
|
|
||||||
ERC20Interface tokenContract = ERC20Interface(daiAddr);
|
|
||||||
tokenContract.transferFrom(msg.sender, address(this), amt);
|
|
||||||
CTokenInterface cToken = CTokenInterface(cdaiAddr);
|
|
||||||
assert(cToken.mint(amt) == 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
contract MakerCompBridge is Bridge {
|
|
||||||
|
|
||||||
uint public version;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @dev setting up variables on deployment
|
|
||||||
* 1...2...3 versioning in each subsequent deployments
|
|
||||||
*/
|
|
||||||
constructor(uint _version) public {
|
|
||||||
isAdmin[0x7284a8451d9a0e7Dc62B3a71C0593eA2eC5c5638] = true;
|
|
||||||
isAdmin[0xa7615CD307F323172331865181DC8b80a2834324] = true;
|
|
||||||
addCToken(0x6C8c6b02E7b2BE14d4fA6022Dfd6d75921D90E4E, 600000000000000000);
|
|
||||||
addCToken(0xF5DCe57282A584D2746FaF1593d3121Fcac444dC, 750000000000000000);
|
|
||||||
addCToken(0x4Ddc2D193948926D02f9B1fE9e1daa0718270ED5, 750000000000000000);
|
|
||||||
addCToken(0x158079Ee67Fce2f58472A96584A73C7Ab9AC95c1, 500000000000000000);
|
|
||||||
addCToken(0x39AA39c021dfbaE8faC545936693aC917d5E7563, 750000000000000000);
|
|
||||||
addCToken(0xB3319f5D18Bc0D84dD1b4825Dcde5d5f7266d407, 600000000000000000);
|
|
||||||
setApproval(daiAddr, 10**30, cdaiAddr);
|
|
||||||
setApproval(cdaiAddr, 10**30, cdaiAddr);
|
|
||||||
version = _version;
|
|
||||||
}
|
|
||||||
|
|
||||||
function() external payable {}
|
|
||||||
|
|
||||||
}
|
|
||||||
203
contracts/bridges/MakerCompoundOld.sol
Normal file
203
contracts/bridges/MakerCompoundOld.sol
Normal file
|
|
@ -0,0 +1,203 @@
|
||||||
|
pragma solidity ^0.5.7;
|
||||||
|
|
||||||
|
interface RegistryInterface {
|
||||||
|
function proxies(address) external view returns (address);
|
||||||
|
}
|
||||||
|
|
||||||
|
interface UserWalletInterface {
|
||||||
|
function owner() external view returns (address);
|
||||||
|
}
|
||||||
|
|
||||||
|
interface CTokenInterface {
|
||||||
|
function mint(uint mintAmount) external returns (uint); // For ERC20
|
||||||
|
function redeem(uint redeemTokens) external returns (uint);
|
||||||
|
function redeemUnderlying(uint redeemAmount) external returns (uint);
|
||||||
|
function exchangeRateCurrent() external returns (uint);
|
||||||
|
function allowance(address, address) external view returns (uint);
|
||||||
|
function approve(address, uint) external;
|
||||||
|
function transfer(address, uint) external returns (bool);
|
||||||
|
function transferFrom(address, address, uint) external returns (bool);
|
||||||
|
}
|
||||||
|
|
||||||
|
interface ERC20Interface {
|
||||||
|
function allowance(address, address) external view returns (uint);
|
||||||
|
function approve(address, uint) external;
|
||||||
|
function transfer(address, uint) external returns (bool);
|
||||||
|
function transferFrom(address, address, uint) external returns (bool);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
contract DSMath {
|
||||||
|
|
||||||
|
function add(uint x, uint y) internal pure returns (uint z) {
|
||||||
|
require((z = x + y) >= x, "math-not-safe");
|
||||||
|
}
|
||||||
|
|
||||||
|
function mul(uint x, uint y) internal pure returns (uint z) {
|
||||||
|
require(y == 0 || (z = x * y) / y == x, "math-not-safe");
|
||||||
|
}
|
||||||
|
|
||||||
|
uint constant WAD = 10 ** 18;
|
||||||
|
|
||||||
|
function wmul(uint x, uint y) internal pure returns (uint z) {
|
||||||
|
z = add(mul(x, y), WAD / 2) / WAD;
|
||||||
|
}
|
||||||
|
|
||||||
|
function wdiv(uint x, uint y) internal pure returns (uint z) {
|
||||||
|
z = add(mul(x, WAD), y / 2) / y;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
contract Helper is DSMath {
|
||||||
|
|
||||||
|
address public daiAddr = 0x89d24A6b4CcB1B6fAA2625fE562bDD9a23260359;
|
||||||
|
address public cdaiAddr = 0xF5DCe57282A584D2746FaF1593d3121Fcac444dC;
|
||||||
|
address public registryAddr = 0xF5DCe57282A584D2746FaF1593d3121Fcac444dC;
|
||||||
|
mapping (address => uint) public deposited; // amount of CToken deposited
|
||||||
|
mapping (address => bool) public isAdmin;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dev setting allowance to compound for the "user proxy" if required
|
||||||
|
*/
|
||||||
|
function setApproval(address erc20, uint srcAmt, address to) internal {
|
||||||
|
ERC20Interface erc20Contract = ERC20Interface(erc20);
|
||||||
|
uint tokenAllowance = erc20Contract.allowance(address(this), to);
|
||||||
|
if (srcAmt > tokenAllowance) {
|
||||||
|
erc20Contract.approve(to, 2**255);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
modifier isUserWallet {
|
||||||
|
address userAdd = UserWalletInterface(msg.sender).owner();
|
||||||
|
address walletAdd = RegistryInterface(registryAddr).proxies(userAdd);
|
||||||
|
require(walletAdd != address(0), "Not-User-Wallet");
|
||||||
|
require(walletAdd == msg.sender, "Not-Wallet-Owner");
|
||||||
|
_;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
contract CTokens is Helper {
|
||||||
|
|
||||||
|
struct CTokenData {
|
||||||
|
address cTokenAdd;
|
||||||
|
uint factor;
|
||||||
|
}
|
||||||
|
|
||||||
|
CTokenData[] public cTokenAddr;
|
||||||
|
|
||||||
|
uint public cArrLength = 0;
|
||||||
|
|
||||||
|
function addCToken(address cToken, uint factor) public {
|
||||||
|
require(isAdmin[msg.sender], "Address not an admin");
|
||||||
|
CTokenData memory setCToken = CTokenData(cToken, factor);
|
||||||
|
cTokenAddr.push(setCToken);
|
||||||
|
cArrLength++;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
contract Bridge is CTokens {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dev Deposit DAI for liquidity
|
||||||
|
*/
|
||||||
|
function depositDAI(uint amt) public {
|
||||||
|
ERC20Interface(daiAddr).transferFrom(msg.sender, address(this), amt);
|
||||||
|
CTokenInterface cToken = CTokenInterface(cdaiAddr);
|
||||||
|
assert(cToken.mint(amt) == 0);
|
||||||
|
uint cDaiAmt = wdiv(amt, cToken.exchangeRateCurrent());
|
||||||
|
deposited[msg.sender] += cDaiAmt;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dev Withdraw DAI from liquidity
|
||||||
|
*/
|
||||||
|
function withdrawDAI(uint amt) public {
|
||||||
|
require(deposited[msg.sender] != 0, "Nothing to Withdraw");
|
||||||
|
CTokenInterface cToken = CTokenInterface(cdaiAddr);
|
||||||
|
uint withdrawAmt = wdiv(amt, cToken.exchangeRateCurrent());
|
||||||
|
uint daiAmt = amt;
|
||||||
|
if (withdrawAmt > deposited[msg.sender]) {
|
||||||
|
withdrawAmt = deposited[msg.sender];
|
||||||
|
daiAmt = wmul(withdrawAmt, cToken.exchangeRateCurrent());
|
||||||
|
}
|
||||||
|
require(cToken.redeem(withdrawAmt) == 0, "something went wrong");
|
||||||
|
ERC20Interface(daiAddr).transfer(msg.sender, daiAmt);
|
||||||
|
deposited[msg.sender] -= withdrawAmt;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dev Deposit CDAI for liquidity
|
||||||
|
*/
|
||||||
|
function depositCDAI(uint amt) public {
|
||||||
|
CTokenInterface cToken = CTokenInterface(cdaiAddr);
|
||||||
|
require(cToken.transferFrom(msg.sender, address(this), amt) == true, "Nothing to deposit");
|
||||||
|
deposited[msg.sender] += amt;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dev Withdraw CDAI from liquidity
|
||||||
|
*/
|
||||||
|
function withdrawCDAI(uint amt) public {
|
||||||
|
require(deposited[msg.sender] != 0, "Nothing to Withdraw");
|
||||||
|
CTokenInterface cToken = CTokenInterface(cdaiAddr);
|
||||||
|
uint withdrawAmt = amt;
|
||||||
|
if (withdrawAmt > deposited[msg.sender]) {
|
||||||
|
withdrawAmt = deposited[msg.sender];
|
||||||
|
}
|
||||||
|
cToken.transfer(msg.sender, withdrawAmt);
|
||||||
|
deposited[msg.sender] -= withdrawAmt;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dev Transfer DAI to only to user wallet
|
||||||
|
*/
|
||||||
|
function transferDAI(uint amt) public isUserWallet {
|
||||||
|
CTokenInterface cToken = CTokenInterface(cdaiAddr);
|
||||||
|
require(cToken.redeemUnderlying(amt) == 0, "something went wrong");
|
||||||
|
ERC20Interface(daiAddr).transfer(msg.sender, amt);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dev Take DAI back from user wallet
|
||||||
|
*/
|
||||||
|
function transferBackDAI(uint amt) public isUserWallet {
|
||||||
|
ERC20Interface tokenContract = ERC20Interface(daiAddr);
|
||||||
|
tokenContract.transferFrom(msg.sender, address(this), amt);
|
||||||
|
CTokenInterface cToken = CTokenInterface(cdaiAddr);
|
||||||
|
assert(cToken.mint(amt) == 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
contract MakerCompBridge is Bridge {
|
||||||
|
|
||||||
|
uint public version;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dev setting up variables on deployment
|
||||||
|
* 1...2...3 versioning in each subsequent deployments
|
||||||
|
*/
|
||||||
|
constructor(uint _version) public {
|
||||||
|
isAdmin[0x7284a8451d9a0e7Dc62B3a71C0593eA2eC5c5638] = true;
|
||||||
|
isAdmin[0xa7615CD307F323172331865181DC8b80a2834324] = true;
|
||||||
|
addCToken(0x6C8c6b02E7b2BE14d4fA6022Dfd6d75921D90E4E, 600000000000000000);
|
||||||
|
addCToken(0xF5DCe57282A584D2746FaF1593d3121Fcac444dC, 750000000000000000);
|
||||||
|
addCToken(0x4Ddc2D193948926D02f9B1fE9e1daa0718270ED5, 750000000000000000);
|
||||||
|
addCToken(0x158079Ee67Fce2f58472A96584A73C7Ab9AC95c1, 500000000000000000);
|
||||||
|
addCToken(0x39AA39c021dfbaE8faC545936693aC917d5E7563, 750000000000000000);
|
||||||
|
addCToken(0xB3319f5D18Bc0D84dD1b4825Dcde5d5f7266d407, 600000000000000000);
|
||||||
|
setApproval(daiAddr, 10**30, cdaiAddr);
|
||||||
|
setApproval(cdaiAddr, 10**30, cdaiAddr);
|
||||||
|
version = _version;
|
||||||
|
}
|
||||||
|
|
||||||
|
function() external payable {}
|
||||||
|
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue
Block a user