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

fixed few more issues.

Browse Source
This commit is contained in:
Sowmayjain 2019-06-20 19:19:34 +05:30
parent 89d7f9fd98
commit 6dd447c992
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
contracts/ProxyLogics/InstaBridge.sol
View File

@ -46,28 +46,35 @@ contract Helper {
} }
/** /**
* @dev get Compound Comptroller Address * @dev get DAI Token Addrewss
*/ */
function getDAIAddress() public pure returns (address dai) { function getDAIAddress() public pure returns (address dai) {
dai = 0x89d24A6b4CcB1B6fAA2625fE562bDD9a23260359; dai = 0x89d24A6b4CcB1B6fAA2625fE562bDD9a23260359;
} }
/** /**
* @dev get Compound Comptroller Address * @dev get Compound CETH Address
*/
function getCETHAddress() public pure returns (address cDai) {
cDai = 0x0000000000000000000000000000000000000000; // CHANGE <BRIDGE ADDRESS>
}
/**
* @dev get Compound CDAI Address
*/ */
function getCDAIAddress() public pure returns (address cDai) { function getCDAIAddress() public pure returns (address cDai) {
cDai = 0xF5DCe57282A584D2746FaF1593d3121Fcac444dC; cDai = 0xF5DCe57282A584D2746FaF1593d3121Fcac444dC;
} }
/** /**
* @dev get Compound Comptroller Address * @dev get MakerDAO<>Compound Bridge Contract
*/ */
function getBridgeAddress() public pure returns (address bridge) { function getBridgeAddress() public pure returns (address bridge) {
bridge = ;// <BRIDGE ADDRESS> bridge = 0x0000000000000000000000000000000000000000; // CHANGE <BRIDGE ADDRESS>
} }
/** /**
* @dev setting allowance to compound for the "user proxy" if required * @dev setting allowance if required
*/ */
function setApproval(address erc20, uint srcAmt, address to) internal { function setApproval(address erc20, uint srcAmt, address to) internal {
ERC20Interface erc20Contract = ERC20Interface(erc20); ERC20Interface erc20Contract = ERC20Interface(erc20);
@ -115,7 +122,7 @@ contract Helper {
} }
contract Bridge is CompoundHelper { contract Bridge is Helper {
/** /**
* @dev MakerDAO to Compound * @dev MakerDAO to Compound
@ -126,7 +133,7 @@ contract Bridge is CompoundHelper {
uint daiAmt = bridge.makerToCompound(cdpId, ethCol, daiDebt); uint daiAmt = bridge.makerToCompound(cdpId, ethCol, daiDebt);
if (daiDebt > 0) { if (daiDebt > 0) {
borrowDAI(daiAmt); borrowDAI(daiAmt);
setApproval(getDaiAddress(), daiAmt, getBridgeAddress()); setApproval(getDAIAddress(), daiAmt, getBridgeAddress());
bridge.refillFunds(daiAmt); bridge.refillFunds(daiAmt);
} }
} }
@ -139,7 +146,7 @@ contract Bridge is CompoundHelper {
give(cdpId, getBridgeAddress()); give(cdpId, getBridgeAddress());
} }
if (ethCol > 0) { if (ethCol > 0) {
setApproval(getCEthAddress(), 2**150, getBridgeAddress()); setApproval(getCETHAddress(), 2**150, getBridgeAddress());
} }
BridgeInterface(getBridgeAddress()).compoundToMaker(cdpId, ethCol, daiDebt); BridgeInterface(getBridgeAddress()).compoundToMaker(cdpId, ethCol, daiDebt);
} }

10
contracts/bridges/MakerCompound.sol
View File

@ -493,19 +493,15 @@ contract Bridge is LiquidityProvider {
} }
contract MakerCompBridge is Bridge { contract MakerCompoundBridge is Bridge {
uint public version;
/** /**
* @dev setting up variables on deployment * @dev setting up all required token approvals
* 1...2...3 versioning in each subsequent deployments
*/ */
constructor(uint _version) public { constructor() public {
setApproval(daiAddr, 10**30, cDai); setApproval(daiAddr, 10**30, cDai);
setApproval(cDai, 10**30, cDai); setApproval(cDai, 10**30, cDai);
setApproval(cEth, 10**30, cEth); setApproval(cEth, 10**30, cEth);
version = _version;
} }
function() external payable {} function() external payable {}