From 3616863f449c60958c73a8d0d66277cbb107fb32 Mon Sep 17 00:00:00 2001 From: Ravindra Kumar Date: Sun, 27 Jan 2019 22:59:42 +0530 Subject: [PATCH 1/4] Migrate all the contracts to Solidity 5 --- .circleci/config.yml | 4 +- contracts/Migrations.sol | 12 +- contracts/Ownable.sol | 5 +- contracts/v1/InstaAddress.sol | 16 +-- contracts/v1/protocols/InstaKyber.sol | 90 ++++---------- .../v1/protocols/MakerDAO/InstaMaker.sol | 110 +++++++----------- contracts/v1/protocols/MakerDAO/PublicCDP.sol | 86 +++++--------- contracts/v1/protocols/MakerDAO/uniqueCDP.sol | 12 +- contracts/v2/DAI2ETH.sol | 51 ++------ contracts/v2/InstaBank.sol | 97 ++++++--------- contracts/v2/LeverageCDP.sol | 38 +++--- package.json | 35 +++--- 12 files changed, 183 insertions(+), 373 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 46f98bb..440d7de 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -26,6 +26,8 @@ jobs: # fallback to using the latest cache if no exact match is found - v1-dependencies- + - run: npm install truffle -g + - run: npm install ganache-cli -g - run: npm install - save_cache: @@ -34,4 +36,4 @@ jobs: key: v1-dependencies-{{ checksum "package.json" }} # run tests! - - run: npm run test-ci \ No newline at end of file + - run: npm run test-ci diff --git a/contracts/Migrations.sol b/contracts/Migrations.sol index bf44803..483c891 100644 --- a/contracts/Migrations.sol +++ b/contracts/Migrations.sol @@ -1,4 +1,4 @@ -pragma solidity 0.4.24; +pragma solidity ^0.5.0; /* solium-disable mixedcase */ contract Migrations { @@ -6,13 +6,10 @@ contract Migrations { uint public last_completed_migration; modifier restricted() { - if (msg.sender == owner) - _; + if (msg.sender == owner) _; } - constructor() - public - { + constructor() public { owner = msg.sender; } @@ -26,4 +23,5 @@ contract Migrations { } } -/* solium-enable mixedcase */ \ No newline at end of file +/* solium-enable mixedcase */ + diff --git a/contracts/Ownable.sol b/contracts/Ownable.sol index 18dfea2..b2e9bfa 100644 --- a/contracts/Ownable.sol +++ b/contracts/Ownable.sol @@ -1,5 +1,4 @@ -pragma solidity 0.4.24; - +pragma solidity ^0.5.0; /** * @title Ownable @@ -36,4 +35,4 @@ contract Ownable { emit OwnershipTransferred(owner, newOwner); owner = newOwner; } -} \ No newline at end of file +} diff --git a/contracts/v1/InstaAddress.sol b/contracts/v1/InstaAddress.sol index da61740..01f424d 100644 --- a/contracts/v1/InstaAddress.sol +++ b/contracts/v1/InstaAddress.sol @@ -1,8 +1,6 @@ -pragma solidity ^0.4.24; - +pragma solidity ^0.5.0; contract AddressRegistry { - event AddressSet(string name, address addr); mapping(bytes32 => address) registry; @@ -10,18 +8,14 @@ contract AddressRegistry { registry[keccak256(abi.encodePacked("admin"))] = msg.sender; } - function getAddr(string name) public view returns(address) { + function getAddr(string memory name) public view returns (address) { return registry[keccak256(abi.encodePacked(name))]; } - function setAddr(string name, address addr) public { - require( - msg.sender == getAddr("admin") || - msg.sender == getAddr("owner"), - "Permission Denied" - ); + function setAddr(string memory name, address addr) public { + require(msg.sender == getAddr("admin") || msg.sender == getAddr("owner"), "Permission Denied"); registry[keccak256(abi.encodePacked(name))] = addr; emit AddressSet(name, addr); } -} \ No newline at end of file +} diff --git a/contracts/v1/protocols/InstaKyber.sol b/contracts/v1/protocols/InstaKyber.sol index beb1a9e..38fbb33 100644 --- a/contracts/v1/protocols/InstaKyber.sol +++ b/contracts/v1/protocols/InstaKyber.sol @@ -1,8 +1,6 @@ -pragma solidity ^0.4.24; - +pragma solidity ^0.5.0; library SafeMath { - function mul(uint256 a, uint256 b) internal pure returns (uint256) { if (a == 0) { return 0; @@ -11,7 +9,7 @@ library SafeMath { 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; @@ -28,7 +26,7 @@ interface IERC20 { } interface AddressRegistry { - function getAddr(string name) external view returns(address); + function getAddr(string calldata name) external view returns (address); } interface Kyber { @@ -42,63 +40,38 @@ interface Kyber { address walletId ) external payable returns (uint); - function getExpectedRate( - address src, - address dest, - uint srcQty - ) external view returns (uint, uint); + function getExpectedRate(address src, address dest, uint srcQty) external view returns (uint, uint); } - contract Registry { address public addressRegistry; modifier onlyAdmin() { - require( - msg.sender == getAddress("admin"), - "Permission Denied" - ); + require(msg.sender == getAddress("admin"), "Permission Denied"); _; } - function getAddress(string name) internal view returns(address) { + function getAddress(string memory name) internal view returns (address) { AddressRegistry addrReg = AddressRegistry(addressRegistry); return addrReg.getAddr(name); } } - contract Trade is Registry { - using SafeMath for uint; using SafeMath for uint256; - event KyberTrade( - address src, - uint srcAmt, - address dest, - uint destAmt, - address beneficiary, - uint minConversionRate, - address affiliate - ); + event KyberTrade(address src, uint srcAmt, address dest, uint destAmt, address beneficiary, uint minConversionRate, address affiliate); - function getExpectedPrice( - address src, - address dest, - uint srcAmt - ) public view returns (uint, uint) - { + function getExpectedPrice(address src, address dest, uint srcAmt) public view returns (uint, uint) { Kyber kyberFunctions = Kyber(getAddress("kyber")); - return kyberFunctions.getExpectedRate( - src, dest, srcAmt - ); + return kyberFunctions.getExpectedRate(src, dest, srcAmt); } - function approveKyber(address[] tokenArr) public { + function approveKyber(address[] memory tokenArr) public { address kyberProxy = getAddress("kyber"); for (uint i = 0; i < tokenArr.length; i++) { IERC20 tokenFunctions = IERC20(tokenArr[i]); - tokenFunctions.approve(kyberProxy, 2**256 - 1); + tokenFunctions.approve(kyberProxy, 2 ** 256 - 1); } } @@ -108,30 +81,19 @@ contract Trade is Registry { uint srcAmt, // amount of token for sell uint minConversionRate, // minimum slippage rate uint maxDestAmt // max amount of dest token - ) public payable returns (uint destAmt) - { - + ) public payable returns (uint destAmt) { address eth = getAddress("eth"); - uint ethQty = getToken( - msg.sender, src, srcAmt, eth - ); - + uint ethQty = getToken(msg.sender, src, srcAmt, eth); + // Interacting with Kyber Proxy Contract Kyber kyberFunctions = Kyber(getAddress("kyber")); - destAmt = kyberFunctions.trade.value(ethQty)( - src, - srcAmt, - dest, - msg.sender, - maxDestAmt, - minConversionRate, - getAddress("admin") - ); + destAmt = kyberFunctions.trade.value(ethQty)(src, srcAmt, dest, msg.sender, maxDestAmt, minConversionRate, getAddress("admin")); // maxDestAmt usecase implementated if (src == eth && address(this).balance > 0) { msg.sender.transfer(address(this).balance); - } else if (src != eth) { // as there is no balanceOf of eth + } else if (src != eth) { + // as there is no balanceOf of eth IERC20 srcTkn = IERC20(src); uint srcBal = srcTkn.balanceOf(address(this)); if (srcBal > 0) { @@ -139,19 +101,11 @@ contract Trade is Registry { } } - emit KyberTrade( - src, srcAmt, dest, destAmt, msg.sender, minConversionRate, getAddress("admin") - ); + emit KyberTrade(src, srcAmt, dest, destAmt, msg.sender, minConversionRate, getAddress("admin")); } - function getToken( - address trader, - address src, - uint srcAmt, - address eth - ) internal returns (uint ethQty) - { + function getToken(address trader, address src, uint srcAmt, address eth) internal returns (uint ethQty) { if (src == eth) { require(msg.value == srcAmt, "Invalid Operation"); ethQty = srcAmt; @@ -164,13 +118,11 @@ contract Trade is Registry { } - contract InstaKyber is Trade { - constructor(address rAddr) public { addressRegistry = rAddr; } - function () public payable {} + function() external payable {} -} \ No newline at end of file +} diff --git a/contracts/v1/protocols/MakerDAO/InstaMaker.sol b/contracts/v1/protocols/MakerDAO/InstaMaker.sol index cde1a33..f14e68b 100644 --- a/contracts/v1/protocols/MakerDAO/InstaMaker.sol +++ b/contracts/v1/protocols/MakerDAO/InstaMaker.sol @@ -1,8 +1,6 @@ -pragma solidity 0.4.24; - +pragma solidity ^0.5.0; library SafeMath { - function mul(uint256 a, uint256 b) internal pure returns (uint256) { if (a == 0) { return 0; @@ -11,7 +9,7 @@ library SafeMath { 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; @@ -28,7 +26,7 @@ interface IERC20 { } interface AddressRegistry { - function getAddr(string name) external view returns(address); + function getAddr(string calldata name) external view returns (address); } interface MakerCDP { @@ -53,57 +51,41 @@ interface WETHFace { function withdraw(uint wad) external; } -interface InstaKyber { - function executeTrade( - address src, - address dest, - uint srcAmt, - uint minConversionRate, - uint maxDestAmt - ) external payable returns (uint destAmt); - - function getExpectedPrice( - address src, - address dest, - uint srcAmt - ) external view returns (uint, uint); -} +interface InstaKyber { + function executeTrade(address src, address dest, uint srcAmt, uint minConversionRate, uint maxDestAmt) + external + payable + returns (uint destAmt); + function getExpectedPrice(address src, address dest, uint srcAmt) external view returns (uint, uint); +} contract Registry { - address public addressRegistry; modifier onlyAdmin() { - require( - msg.sender == getAddress("admin"), - "Permission Denied" - ); + require(msg.sender == getAddress("admin"), "Permission Denied"); _; } - - function getAddress(string name) internal view returns(address) { + + function getAddress(string memory name) internal view returns (address) { AddressRegistry addrReg = AddressRegistry(addressRegistry); return addrReg.getAddr(name); } } - contract GlobalVar is Registry { - using SafeMath for uint; using SafeMath for uint256; bytes32 blankCDP = 0x0000000000000000000000000000000000000000000000000000000000000000; address cdpAddr; // cups - mapping (address => bytes32) cdps; // borrower >>> CDP Bytes + mapping(address => bytes32) cdps; // borrower >>> CDP Bytes bool public freezed; } - contract IssueLoan is GlobalVar { - event LockedETH(address borrower, uint lockETH, uint lockPETH, address lockedBy); event LoanedDAI(address borrower, uint loanDAI, address payTo); event NewCDP(address borrower, bytes32 cdpBytes); @@ -114,8 +96,12 @@ contract IssueLoan is GlobalVar { } function borrow(uint daiDraw, address beneficiary) public payable { - if (msg.value > 0) {lockETH(msg.sender);} - if (daiDraw > 0) {drawDAI(daiDraw, beneficiary);} + if (msg.value > 0) { + lockETH(msg.sender); + } + if (daiDraw > 0) { + drawDAI(daiDraw, beneficiary); + } } function lockETH(address borrower) public payable { @@ -130,9 +116,7 @@ contract IssueLoan is GlobalVar { uint pethToLock = pethPEReth(msg.value); loanMaster.join(pethToLock); // WETH to PETH loanMaster.lock(cdps[borrower], pethToLock); // PETH to CDP - emit LockedETH( - borrower, msg.value, pethToLock, msg.sender - ); + emit LockedETH(borrower, msg.value, pethToLock, msg.sender); } function drawDAI(uint daiDraw, address beneficiary) public { @@ -150,15 +134,17 @@ contract IssueLoan is GlobalVar { } - contract RepayLoan is IssueLoan { - event WipedDAI(address borrower, uint daiWipe, uint mkrCharged, address wipedBy); event UnlockedETH(address borrower, uint ethFree); function repay(uint daiWipe, uint ethFree) public payable { - if (daiWipe > 0) {wipeDAI(daiWipe, msg.sender);} - if (ethFree > 0) {unlockETH(ethFree);} + if (daiWipe > 0) { + wipeDAI(daiWipe, msg.sender); + } + if (ethFree > 0) { + unlockETH(ethFree); + } } function wipeDAI(uint daiWipe, address borrower) public payable { @@ -176,17 +162,15 @@ contract RepayLoan is IssueLoan { uint mkrCharged = contractMKR - mkrTkn.balanceOf(address(this)); // MKR fee = before wiping bal - after wiping bal // claiming paid MKR back - if (msg.value > 0) { // Interacting with Kyber to swap ETH with MKR - swapETHMKR( - eth, mkr, mkrCharged, msg.value - ); - } else { // take MKR directly from address + if (msg.value > 0) { + // Interacting with Kyber to swap ETH with MKR + swapETHMKR(eth, mkr, mkrCharged, msg.value); + } else { + // take MKR directly from address mkrTkn.transferFrom(msg.sender, address(this), mkrCharged); // user paying MKR fees } - emit WipedDAI( - borrower, daiWipe, mkrCharged, msg.sender - ); + emit WipedDAI(borrower, daiWipe, mkrCharged, msg.sender); } function unlockETH(uint ethFree) public { @@ -201,19 +185,11 @@ contract RepayLoan is IssueLoan { emit UnlockedETH(msg.sender, ethFree); } - function swapETHMKR( - address eth, - address mkr, - uint mkrCharged, - uint ethQty - ) internal - { + function swapETHMKR(address eth, address mkr, uint mkrCharged, uint ethQty) internal { InstaKyber instak = InstaKyber(getAddress("InstaKyber")); uint minRate; (, minRate) = instak.getExpectedPrice(eth, mkr, ethQty); - uint mkrBought = instak.executeTrade.value(ethQty)( - eth, mkr, ethQty, minRate, mkrCharged - ); + uint mkrBought = instak.executeTrade.value(ethQty)(eth, mkr, ethQty, minRate, mkrCharged); require(mkrCharged == mkrBought, "ETH not sufficient to cover the MKR fees."); if (address(this).balance > 0) { msg.sender.transfer(address(this).balance); @@ -222,9 +198,7 @@ contract RepayLoan is IssueLoan { } - contract BorrowTasks is RepayLoan { - event TranferCDP(bytes32 cdp, address owner, address nextOwner); event CDPClaimed(bytes32 cdp, address owner); @@ -258,20 +232,18 @@ contract BorrowTasks is RepayLoan { function approveERC20() public { IERC20 wethTkn = IERC20(getAddress("weth")); - wethTkn.approve(cdpAddr, 2**256 - 1); + wethTkn.approve(cdpAddr, 2 ** 256 - 1); IERC20 pethTkn = IERC20(getAddress("peth")); - pethTkn.approve(cdpAddr, 2**256 - 1); + pethTkn.approve(cdpAddr, 2 ** 256 - 1); IERC20 mkrTkn = IERC20(getAddress("mkr")); - mkrTkn.approve(cdpAddr, 2**256 - 1); + mkrTkn.approve(cdpAddr, 2 ** 256 - 1); IERC20 daiTkn = IERC20(getAddress("dai")); - daiTkn.approve(cdpAddr, 2**256 - 1); + daiTkn.approve(cdpAddr, 2 ** 256 - 1); } } - contract InstaMaker is BorrowTasks { - event MKRCollected(uint amount); constructor(address rAddr) public { @@ -280,7 +252,7 @@ contract InstaMaker is BorrowTasks { approveERC20(); } - function () public payable {} + function() external payable {} function freeze(bool stop) public onlyAdmin { freezed = stop; @@ -293,4 +265,4 @@ contract InstaMaker is BorrowTasks { emit MKRCollected(amount); } -} \ No newline at end of file +} diff --git a/contracts/v1/protocols/MakerDAO/PublicCDP.sol b/contracts/v1/protocols/MakerDAO/PublicCDP.sol index 1245f77..1dfefd7 100644 --- a/contracts/v1/protocols/MakerDAO/PublicCDP.sol +++ b/contracts/v1/protocols/MakerDAO/PublicCDP.sol @@ -1,9 +1,7 @@ // Resolver to Wipe & Coll any CDP -pragma solidity 0.4.24; - +pragma solidity ^0.5.0; library SafeMath { - function mul(uint256 a, uint256 b) internal pure returns (uint256) { if (a == 0) { return 0; @@ -12,7 +10,7 @@ library SafeMath { 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; @@ -29,7 +27,7 @@ interface IERC20 { } interface AddressRegistry { - function getAddr(string name) external view returns(address); + function getAddr(string calldata name) external view returns (address); } interface MakerCDP { @@ -49,43 +47,29 @@ interface WETHFace { } interface InstaKyber { - function executeTrade( - address src, - address dest, - uint srcAmt, - uint minConversionRate, - uint maxDestAmt - ) external payable returns (uint destAmt); + function executeTrade(address src, address dest, uint srcAmt, uint minConversionRate, uint maxDestAmt) + external + payable + returns (uint destAmt); - function getExpectedPrice( - address src, - address dest, - uint srcAmt - ) external view returns (uint, uint); + function getExpectedPrice(address src, address dest, uint srcAmt) external view returns (uint, uint); } - contract Registry { - address public addressRegistry; modifier onlyAdmin() { - require( - msg.sender == getAddress("admin"), - "Permission Denied" - ); + require(msg.sender == getAddress("admin"), "Permission Denied"); _; } - - function getAddress(string name) internal view returns(address) { + + function getAddress(string memory name) internal view returns (address) { AddressRegistry addrReg = AddressRegistry(addressRegistry); return addrReg.getAddr(name); } } - contract Helper is Registry { - using SafeMath for uint; using SafeMath for uint256; @@ -104,9 +88,7 @@ contract Helper is Registry { } - contract Lock is Helper { - event LockedETH(uint cdpNum, address lockedBy, uint lockETH, uint lockPETH); function lockETH(uint cdpNum) public payable { @@ -116,16 +98,12 @@ contract Lock is Helper { uint pethToLock = pethPEReth(msg.value); loanMaster.join(pethToLock); // WETH to PETH loanMaster.lock(bytes32(cdpNum), pethToLock); // PETH to CDP - emit LockedETH( - cdpNum, msg.sender, msg.value, pethToLock - ); + emit LockedETH(cdpNum, msg.sender, msg.value, pethToLock); } } - contract Wipe is Lock { - event WipedDAI(uint cdpNum, address wipedBy, uint daiWipe, uint mkrCharged); function wipeDAI(uint cdpNum, uint daiWipe) public payable { @@ -139,30 +117,22 @@ contract Wipe is Lock { uint mkrCharged = contractMKR - mkrTkn.balanceOf(address(this)); // MKR fee = before wiping bal - after wiping bal // claiming paid MKR back - if (msg.value > 0) { // Interacting with Kyber to swap ETH with MKR - swapETHMKR( - mkrCharged, msg.value - ); - } else { // take MKR directly from address + if (msg.value > 0) { + // Interacting with Kyber to swap ETH with MKR + swapETHMKR(mkrCharged, msg.value); + } else { + // take MKR directly from address mkrTkn.transferFrom(msg.sender, address(this), mkrCharged); // user paying MKR fees } - emit WipedDAI( - cdpNum, msg.sender, daiWipe, mkrCharged - ); + emit WipedDAI(cdpNum, msg.sender, daiWipe, mkrCharged); } - function swapETHMKR( - uint mkrCharged, - uint ethQty - ) internal - { + function swapETHMKR(uint mkrCharged, uint ethQty) internal { InstaKyber instak = InstaKyber(kyber); uint minRate; (, minRate) = instak.getExpectedPrice(eth, mkr, ethQty); - uint mkrBought = instak.executeTrade.value(ethQty)( - eth, mkr, ethQty, minRate, mkrCharged - ); + uint mkrBought = instak.executeTrade.value(ethQty)(eth, mkr, ethQty, minRate, mkrCharged); require(mkrCharged == mkrBought, "ETH not sufficient to cover the MKR fees."); if (address(this).balance > 0) { msg.sender.transfer(address(this).balance); @@ -171,25 +141,21 @@ contract Wipe is Lock { } - contract ApproveTkn is Wipe { - function approveERC20() public { IERC20 wethTkn = IERC20(weth); - wethTkn.approve(cdpAddr, 2**256 - 1); + wethTkn.approve(cdpAddr, 2 ** 256 - 1); IERC20 pethTkn = IERC20(peth); - pethTkn.approve(cdpAddr, 2**256 - 1); + pethTkn.approve(cdpAddr, 2 ** 256 - 1); IERC20 mkrTkn = IERC20(mkr); - mkrTkn.approve(cdpAddr, 2**256 - 1); + mkrTkn.approve(cdpAddr, 2 ** 256 - 1); IERC20 daiTkn = IERC20(dai); - daiTkn.approve(cdpAddr, 2**256 - 1); + daiTkn.approve(cdpAddr, 2 ** 256 - 1); } } - contract PublicCDP is ApproveTkn { - event MKRCollected(uint amount); constructor(address rAddr) public { @@ -204,7 +170,7 @@ contract PublicCDP is ApproveTkn { approveERC20(); } - function () public payable {} + function() external payable {} // collecting MKR token kept as balance to pay fees function collectMKR(uint amount) public onlyAdmin { @@ -213,4 +179,4 @@ contract PublicCDP is ApproveTkn { emit MKRCollected(amount); } -} \ No newline at end of file +} diff --git a/contracts/v1/protocols/MakerDAO/uniqueCDP.sol b/contracts/v1/protocols/MakerDAO/uniqueCDP.sol index 71c398f..d58879f 100644 --- a/contracts/v1/protocols/MakerDAO/uniqueCDP.sol +++ b/contracts/v1/protocols/MakerDAO/uniqueCDP.sol @@ -1,8 +1,6 @@ -pragma solidity 0.4.24; - +pragma solidity ^0.5.0; library SafeMath { - function mul(uint256 a, uint256 b) internal pure returns (uint256) { if (a == 0) { return 0; @@ -11,7 +9,7 @@ library SafeMath { 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; @@ -21,7 +19,7 @@ library SafeMath { } interface AddressRegistry { - function getAddr(string name) external view returns(address); + function getAddr(string calldata name) external view returns (address); } interface MakerCDP { @@ -29,9 +27,7 @@ interface MakerCDP { function give(bytes32 cup, address guy) external; } - contract UniqueCDP { - address public deployer; address public cdpAddr; @@ -53,4 +49,4 @@ contract UniqueCDP { loanMaster.give(bytes32(cdpNum), nextOwner); } -} \ No newline at end of file +} diff --git a/contracts/v2/DAI2ETH.sol b/contracts/v2/DAI2ETH.sol index 1efa475..48f36f5 100644 --- a/contracts/v2/DAI2ETH.sol +++ b/contracts/v2/DAI2ETH.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.24; +pragma solidity ^0.5.0; interface IERC20 { function balanceOf(address who) external view returns (uint256); @@ -6,7 +6,7 @@ interface IERC20 { } interface AddressRegistry { - function getAddr(string name) external view returns(address); + function getAddr(string calldata name) external view returns (address); } interface Kyber { @@ -20,44 +20,27 @@ interface Kyber { address walletId ) external payable returns (uint); - function getExpectedRate( - address src, - address dest, - uint srcQty - ) external view returns (uint, uint); + function getExpectedRate(address src, address dest, uint srcQty) external view returns (uint, uint); } - contract Registry { address public addressRegistry; modifier onlyAdmin() { - require( - msg.sender == getAddress("admin"), - "Permission Denied" - ); + require(msg.sender == getAddress("admin"), "Permission Denied"); _; } - function getAddress(string name) internal view returns(address) { + function getAddress(string memory name) internal view returns (address) { AddressRegistry addrReg = AddressRegistry(addressRegistry); return addrReg.getAddr(name); } } - contract Trade is Registry { - - event KyberTrade( - address src, - uint srcAmt, - address dest, - uint destAmt, - address beneficiary, - uint minConversionRate - ); + event KyberTrade(address src, uint srcAmt, address dest, uint destAmt, address beneficiary, uint minConversionRate); function approveDAIKyber() public { IERC20 tokenFunctions = IERC20(getAddress("dai")); - tokenFunctions.approve(getAddress("kyber"), 2**255); + tokenFunctions.approve(getAddress("kyber"), 2 ** 255); } function expectedETH(uint srcDAI) public view returns (uint, uint) { @@ -73,32 +56,20 @@ contract Trade is Registry { // Interacting with Kyber Proxy Contract Kyber kyberFunctions = Kyber(getAddress("kyber")); - destAmt = kyberFunctions.trade.value(0)( - src, - srcDAI, - dest, - msg.sender, - 2**255, - minConversionRate, - getAddress("admin") - ); + destAmt = kyberFunctions.trade.value(0)(src, srcDAI, dest, msg.sender, 2 ** 255, minConversionRate, getAddress("admin")); - emit KyberTrade( - src, srcDAI, dest, destAmt, msg.sender, minConversionRate - ); + emit KyberTrade(src, srcDAI, dest, destAmt, msg.sender, minConversionRate); } } - contract DAI2ETH is Trade { - constructor(address rAddr) public { addressRegistry = rAddr; approveDAIKyber(); } - function () public payable {} + function() external payable {} -} \ No newline at end of file +} diff --git a/contracts/v2/InstaBank.sol b/contracts/v2/InstaBank.sol index 2230515..b743bc0 100644 --- a/contracts/v2/InstaBank.sol +++ b/contracts/v2/InstaBank.sol @@ -1,5 +1,5 @@ //// SMART CONTARCT -// mapping of SendWyre address +// mapping of SendWyre address //// DAPP // check isAddress (and every important variable) before executing any contract function @@ -10,11 +10,9 @@ //// RAVINDRA // How can we create a global variable for "loanMaster"? -pragma solidity 0.4.24; - +pragma solidity ^0.5.0; library SafeMath { - function mul(uint256 a, uint256 b) internal pure returns (uint256) { if (a == 0) { return 0; @@ -23,7 +21,7 @@ library SafeMath { 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; @@ -40,7 +38,7 @@ interface IERC20 { } interface AddressRegistry { - function getAddr(string name) external view returns(address); + function getAddr(string calldata name) external view returns (address); } interface MakerCDP { @@ -73,50 +71,36 @@ interface WETHFace { function withdraw(uint wad) external; } -interface InstaKyber { - function executeTrade( - address src, - address dest, - uint srcAmt, - uint minConversionRate, - uint maxDestAmt - ) external payable returns (uint destAmt); +interface InstaKyber { + function executeTrade(address src, address dest, uint srcAmt, uint minConversionRate, uint maxDestAmt) + external + payable + returns (uint destAmt); - function getExpectedPrice( - address src, - address dest, - uint srcAmt - ) external view returns (uint, uint); + function getExpectedPrice(address src, address dest, uint srcAmt) external view returns (uint, uint); } - contract Registry { - address public addressRegistry; modifier onlyAdmin() { - require( - msg.sender == getAddress("admin"), - "Permission Denied" - ); + require(msg.sender == getAddress("admin"), "Permission Denied"); _; } - - function getAddress(string name) internal view returns(address) { + + function getAddress(string memory name) internal view returns (address) { AddressRegistry addrReg = AddressRegistry(addressRegistry); return addrReg.getAddr(name); } } - contract GlobalVar is Registry { - using SafeMath for uint; using SafeMath for uint256; address cdpAddr; // SaiTub - mapping (uint => address) cdps; // CDP Number >>> Borrower - mapping (address => bool) resolvers; + mapping(uint => address) cdps; // CDP Number >>> Borrower + mapping(address => bool) resolvers; bool public freezed; modifier isFreezed() { @@ -125,9 +109,7 @@ contract GlobalVar is Registry { } modifier isCupOwner(uint cdpNum) { - require( - cdps[cdpNum] == msg.sender || cdps[cdpNum] == address(0x0) || cdpNum == 0, - "Permission Denied"); + require(cdps[cdpNum] == msg.sender || cdps[cdpNum] == address(0x0) || cdpNum == 0, "Permission Denied"); _; } @@ -138,9 +120,7 @@ contract GlobalVar is Registry { } - contract BorrowLoan is GlobalVar { - // uint cdpNum event LockedETH(uint cdpNum, address borrower, uint lockETH, uint lockPETH); event LoanedDAI(uint cdpNum, address borrower, uint loanDAI, address payTo); @@ -165,9 +145,7 @@ contract BorrowLoan is GlobalVar { uint pethToLock = pethPEReth(msg.value); loanMaster.join(pethToLock); // WETH to PETH loanMaster.lock(cup, pethToLock); // PETH to CDP - emit LockedETH( - uint(cup), msg.sender, msg.value, pethToLock - ); + emit LockedETH(uint(cup), msg.sender, msg.value, pethToLock); } // minting DAI @@ -179,17 +157,13 @@ contract BorrowLoan is GlobalVar { payTo = msg.sender; } daiTkn.transfer(payTo, daiDraw); - emit LoanedDAI( - uint(cup), msg.sender, daiDraw, payTo - ); + emit LoanedDAI(uint(cup), msg.sender, daiDraw, payTo); } } } - contract RepayLoan is BorrowLoan { - event WipedDAI(uint cdpNum, address borrower, uint daiWipe, uint mkrCharged); event FreedETH(uint cdpNum, address borrower, uint ethFree); event ShutCDP(uint cdpNum, address borrower, uint daiWipe, uint ethFree); @@ -211,15 +185,14 @@ contract RepayLoan is BorrowLoan { if (msg.value > 0) { // [UniSwap] claiming paid MKR back ETH <> DAI return; - } else { // take MKR directly from address + } else { + // take MKR directly from address mkrTkn.transferFrom(msg.sender, address(this), mkrCharged); // user paying MKR fees } - emit WipedDAI( - cdpNum, msg.sender, daiWipe, mkrCharged - ); + emit WipedDAI(cdpNum, msg.sender, daiWipe, mkrCharged); } - // TODO => send pethFree from frontend instead of ethFree + // TODO => send pethFree from frontend instead of ethFree function unlockETH(uint cdpNum, uint ethFree) public isFreezed isCupOwner(cdpNum) { require(!freezed, "Operation Disabled"); bytes32 cup = bytes32(cdpNum); @@ -234,7 +207,9 @@ contract RepayLoan is BorrowLoan { } function shut(uint cdpNum, uint daiDebt) public payable isFreezed isCupOwner(cdpNum) { - if (daiDebt > 0) {wipeDAI(cdpNum, daiDebt);} + if (daiDebt > 0) { + wipeDAI(cdpNum, daiDebt); + } MakerCDP loanMaster = MakerCDP(cdpAddr); loanMaster.shut(bytes32(cdpNum)); @@ -249,16 +224,12 @@ contract RepayLoan is BorrowLoan { cdps[cdpNum] = address(0x0); - emit ShutCDP( - cdpNum, msg.sender, daiDebt, wethBal - ); + emit ShutCDP(cdpNum, msg.sender, daiDebt, wethBal); } } - contract MiscTask is RepayLoan { - event TranferInternal(uint cdpNum, address owner, address nextOwner); event TranferExternal(uint cdpNum, address owner, address nextOwner); event CDPClaimed(uint cdpNum, address owner); @@ -298,7 +269,7 @@ contract MiscTask is RepayLoan { loanMaster.give(bytes32(cdpNum), resolverAddress); resolverAct.initAct(cdpNum); emit ResolverTwoWay(cdpNum, msg.sender, resolverAddress); - + } function claimCDP(uint cdpNum) public { @@ -322,20 +293,18 @@ contract MiscTask is RepayLoan { function approveERC20() public { IERC20 wethTkn = IERC20(getAddress("weth")); - wethTkn.approve(cdpAddr, 2**256 - 1); + wethTkn.approve(cdpAddr, 2 ** 256 - 1); IERC20 pethTkn = IERC20(getAddress("peth")); - pethTkn.approve(cdpAddr, 2**256 - 1); + pethTkn.approve(cdpAddr, 2 ** 256 - 1); IERC20 mkrTkn = IERC20(getAddress("mkr")); - mkrTkn.approve(cdpAddr, 2**256 - 1); + mkrTkn.approve(cdpAddr, 2 ** 256 - 1); IERC20 daiTkn = IERC20(getAddress("dai")); - daiTkn.approve(cdpAddr, 2**256 - 1); + daiTkn.approve(cdpAddr, 2 ** 256 - 1); } } - contract InstaBank is MiscTask { - event MKRCollected(uint amount); constructor(address rAddr) public { @@ -344,7 +313,7 @@ contract InstaBank is MiscTask { approveERC20(); } - function () public payable {} + function() external payable {} function freeze(bool stop) public onlyAdmin { freezed = stop; @@ -361,4 +330,4 @@ contract InstaBank is MiscTask { emit MKRCollected(amount); } -} \ No newline at end of file +} diff --git a/contracts/v2/LeverageCDP.sol b/contracts/v2/LeverageCDP.sol index 9ed644b..dee0bbd 100644 --- a/contracts/v2/LeverageCDP.sol +++ b/contracts/v2/LeverageCDP.sol @@ -1,8 +1,6 @@ -pragma solidity 0.4.24; - +pragma solidity ^0.5.0; library SafeMath { - function mul(uint256 a, uint256 b) internal pure returns (uint256) { if (a == 0) { return 0; @@ -26,7 +24,7 @@ interface IERC20 { } interface AddressRegistry { - function getAddr(string name) external view returns(address); + function getAddr(string calldata name) external view returns (address); } interface MakerCDP { @@ -55,25 +53,19 @@ interface InstaBank { function transferCDPInternal(uint cdpNum, address nextOwner) external; } - contract Registry { address public addressRegistry; modifier onlyAdmin() { - require( - msg.sender == getAddress("admin"), - "Permission Denied" - ); + require(msg.sender == getAddress("admin"), "Permission Denied"); _; } - function getAddress(string name) internal view returns(address) { + function getAddress(string memory name) internal view returns (address) { AddressRegistry addrReg = AddressRegistry(addressRegistry); return addrReg.getAddr(name); } } - contract GlobalVar is Registry { - using SafeMath for uint; using SafeMath for uint256; @@ -89,20 +81,18 @@ contract GlobalVar is Registry { function approveERC20() public { IERC20 wethTkn = IERC20(getAddress("weth")); - wethTkn.approve(cdpAddr, 2**256 - 1); + wethTkn.approve(cdpAddr, 2 ** 256 - 1); IERC20 pethTkn = IERC20(getAddress("peth")); - pethTkn.approve(cdpAddr, 2**256 - 1); + pethTkn.approve(cdpAddr, 2 ** 256 - 1); IERC20 mkrTkn = IERC20(getAddress("mkr")); - mkrTkn.approve(cdpAddr, 2**256 - 1); + mkrTkn.approve(cdpAddr, 2 ** 256 - 1); IERC20 daiTkn = IERC20(getAddress("dai")); - daiTkn.approve(cdpAddr, 2**256 - 1); + daiTkn.approve(cdpAddr, 2 ** 256 - 1); } } - contract LoopNewCDP is GlobalVar { - event LevNewCDP(uint cdpNum, uint ethLocked, uint daiMinted); function pethPEReth(uint ethNum) public view returns (uint rPETH) { @@ -138,9 +128,11 @@ contract LoopNewCDP is GlobalVar { } require(contractETHBal == address(this).balance, "No Refund of Contract ETH"); - if (isCDP2Sender) { // CDP >>> msg.sender + if (isCDP2Sender) { + // CDP >>> msg.sender loanMaster.give(cup, msg.sender); - } else { // CDP >>> InstaBank + } else { + // CDP >>> InstaBank InstaBank resolveBank = InstaBank(getAddress("bankv2")); resolveBank.claimCDP(uint(cup)); resolveBank.transferCDPInternal(uint(cup), msg.sender); @@ -151,16 +143,14 @@ contract LoopNewCDP is GlobalVar { } - contract LeverageCDP is LoopNewCDP { - constructor(address rAddr) public { addressRegistry = rAddr; cdpAddr = getAddress("cdp"); approveERC20(); } - function () public payable {} + function() external payable {} function collectETH(uint ethQty) public onlyAdmin { msg.sender.transfer(ethQty); @@ -170,4 +160,4 @@ contract LeverageCDP is LoopNewCDP { freezed = stop; } -} \ No newline at end of file +} diff --git a/package.json b/package.json index 4de1a90..1aa9c3e 100644 --- a/package.json +++ b/package.json @@ -22,14 +22,13 @@ "build": "npm run clean:contracts && truffle compile" }, "dependencies": { - "web3": "^1.0.0-beta.36", + "web3": "^1.0.0-beta.38", "bn.js": "^4.11.8", - "dotenv": "^6.1.0", - "openzeppelin-solidity": "^2.0.0", - "prettier": "^1.14.3", - "truffle": "^5.0.0-beta.0", - "webpack": "^4.23.1", - "truffle-hdwallet-provider": "^1.0.0-web3one.0" + "dotenv": "^6.2.0", + "openzeppelin-solidity": "^2.1.2", + "truffle": "^5.0.2", + "webpack": "^4.29.0", + "truffle-hdwallet-provider": "^1.0.2" }, "devDependencies": { "babel-cli": "^6.26.0", @@ -42,24 +41,26 @@ "babel-register": "6.26.0", "chai": "4.2.0", "chai-as-promised": "7.1.1", - "chai-bignumber": "2.0.2", + "chai-bignumber": "3.0.0", "coveralls": "3.0.2", - "eslint": "5.8.0", - "eslint-config-prettier": "^3.1.0", + "eslint": "5.12.1", + "eslint-config-prettier": "^4.0.0", "eslint-config-standard": "^12.0.0", - "eslint-plugin-babel": "^5.2.1", - "eslint-plugin-compat": "^2.6.2", - "eslint-plugin-import": "2.14.0", - "eslint-plugin-node": "8.0.0", - "eslint-plugin-prettier": "^3.0.0", + "eslint-plugin-babel": "^5.3.0", + "eslint-plugin-compat": "^2.6.3", + "eslint-plugin-import": "2.15.0", + "eslint-plugin-node": "8.0.1", + "eslint-plugin-prettier": "^3.0.1", "eslint-plugin-promise": "4.0.1", "eslint-plugin-security": "^1.4.0", "eslint-plugin-standard": "^4.0.0", "eth-gas-reporter": "^0.1.12", - "ganache-cli": "^6.1.8", + "ganache-cli": "^6.2.5", "mocha-junit-reporter": "^1.18.0", "mocha-multi-reporters": "^1.1.7", + "prettier": "^1.16.1", + "prettier-plugin-solidity-refactor": "^1.0.0-alpha.14", "solidity-coverage": "0.5.11", - "solium": "1.1.8" + "solium": "1.2.2" } } From ed0dea5424b83c1970957c31b58c840b9f894c5a Mon Sep 17 00:00:00 2001 From: Ravindra Kumar Date: Sun, 27 Jan 2019 23:20:14 +0530 Subject: [PATCH 2/4] Fixed all the indentation --- contracts/Ownable.sol | 1 + contracts/v1/InstaAddress.sol | 1 + contracts/v1/protocols/InstaKyber.sol | 48 ++++++++++++-- .../v1/protocols/MakerDAO/InstaMaker.sol | 66 +++++++++++++++---- contracts/v1/protocols/MakerDAO/PublicCDP.sol | 58 ++++++++++++---- contracts/v1/protocols/MakerDAO/uniqueCDP.sol | 2 + contracts/v2/DAI2ETH.sol | 24 +++++-- contracts/v2/InstaBank.sol | 54 +++++++++++---- contracts/v2/LeverageCDP.sol | 5 ++ 9 files changed, 213 insertions(+), 46 deletions(-) diff --git a/contracts/Ownable.sol b/contracts/Ownable.sol index b2e9bfa..7b6bff5 100644 --- a/contracts/Ownable.sol +++ b/contracts/Ownable.sol @@ -1,5 +1,6 @@ pragma solidity ^0.5.0; + /** * @title Ownable * @dev The Ownable contract has an owner address, and provides basic authorization control diff --git a/contracts/v1/InstaAddress.sol b/contracts/v1/InstaAddress.sol index 01f424d..6570336 100644 --- a/contracts/v1/InstaAddress.sol +++ b/contracts/v1/InstaAddress.sol @@ -1,5 +1,6 @@ pragma solidity ^0.5.0; + contract AddressRegistry { event AddressSet(string name, address addr); mapping(bytes32 => address) registry; diff --git a/contracts/v1/protocols/InstaKyber.sol b/contracts/v1/protocols/InstaKyber.sol index 38fbb33..5d575c7 100644 --- a/contracts/v1/protocols/InstaKyber.sol +++ b/contracts/v1/protocols/InstaKyber.sol @@ -1,5 +1,6 @@ pragma solidity ^0.5.0; + library SafeMath { function mul(uint256 a, uint256 b) internal pure returns (uint256) { if (a == 0) { @@ -43,6 +44,7 @@ interface Kyber { function getExpectedRate(address src, address dest, uint srcQty) external view returns (uint, uint); } + contract Registry { address public addressRegistry; modifier onlyAdmin() { @@ -56,6 +58,7 @@ contract Registry { } + contract Trade is Registry { using SafeMath for uint; using SafeMath for uint256; @@ -81,13 +84,30 @@ contract Trade is Registry { uint srcAmt, // amount of token for sell uint minConversionRate, // minimum slippage rate uint maxDestAmt // max amount of dest token - ) public payable returns (uint destAmt) { + ) + public + payable + returns (uint destAmt) + { address eth = getAddress("eth"); - uint ethQty = getToken(msg.sender, src, srcAmt, eth); + uint ethQty = getToken( + msg.sender, + src, + srcAmt, + eth + ); // Interacting with Kyber Proxy Contract Kyber kyberFunctions = Kyber(getAddress("kyber")); - destAmt = kyberFunctions.trade.value(ethQty)(src, srcAmt, dest, msg.sender, maxDestAmt, minConversionRate, getAddress("admin")); + destAmt = kyberFunctions.trade.value(ethQty)( + src, + srcAmt, + dest, + msg.sender, + maxDestAmt, + minConversionRate, + getAddress("admin") + ); // maxDestAmt usecase implementated if (src == eth && address(this).balance > 0) { @@ -101,11 +121,27 @@ contract Trade is Registry { } } - emit KyberTrade(src, srcAmt, dest, destAmt, msg.sender, minConversionRate, getAddress("admin")); + emit KyberTrade( + src, + srcAmt, + dest, + destAmt, + msg.sender, + minConversionRate, + getAddress("admin") + ); } - function getToken(address trader, address src, uint srcAmt, address eth) internal returns (uint ethQty) { + function getToken( + address trader, + address src, + uint srcAmt, + address eth + ) + internal + returns (uint ethQty) + { if (src == eth) { require(msg.value == srcAmt, "Invalid Operation"); ethQty = srcAmt; @@ -115,9 +151,9 @@ contract Trade is Registry { ethQty = 0; } } - } + contract InstaKyber is Trade { constructor(address rAddr) public { addressRegistry = rAddr; diff --git a/contracts/v1/protocols/MakerDAO/InstaMaker.sol b/contracts/v1/protocols/MakerDAO/InstaMaker.sol index f14e68b..5868f17 100644 --- a/contracts/v1/protocols/MakerDAO/InstaMaker.sol +++ b/contracts/v1/protocols/MakerDAO/InstaMaker.sol @@ -1,5 +1,6 @@ pragma solidity ^0.5.0; + library SafeMath { function mul(uint256 a, uint256 b) internal pure returns (uint256) { if (a == 0) { @@ -52,14 +53,21 @@ interface WETHFace { } interface InstaKyber { - function executeTrade(address src, address dest, uint srcAmt, uint minConversionRate, uint maxDestAmt) - external - payable - returns (uint destAmt); + function executeTrade( + address src, + address dest, + uint srcAmt, + uint minConversionRate, + uint maxDestAmt + ) + external + payable + returns (uint destAmt); function getExpectedPrice(address src, address dest, uint srcAmt) external view returns (uint, uint); } + contract Registry { address public addressRegistry; modifier onlyAdmin() { @@ -74,6 +82,7 @@ contract Registry { } + contract GlobalVar is Registry { using SafeMath for uint; using SafeMath for uint256; @@ -85,6 +94,7 @@ contract GlobalVar is Registry { } + contract IssueLoan is GlobalVar { event LockedETH(address borrower, uint lockETH, uint lockPETH, address lockedBy); event LoanedDAI(address borrower, uint loanDAI, address payTo); @@ -116,7 +126,13 @@ contract IssueLoan is GlobalVar { uint pethToLock = pethPEReth(msg.value); loanMaster.join(pethToLock); // WETH to PETH loanMaster.lock(cdps[borrower], pethToLock); // PETH to CDP - emit LockedETH(borrower, msg.value, pethToLock, msg.sender); + + emit LockedETH( + borrower, + msg.value, + pethToLock, + msg.sender + ); } function drawDAI(uint daiDraw, address beneficiary) public { @@ -131,9 +147,9 @@ contract IssueLoan is GlobalVar { daiTkn.transfer(payTo, daiDraw); emit LoanedDAI(msg.sender, daiDraw, payTo); } - } + contract RepayLoan is IssueLoan { event WipedDAI(address borrower, uint daiWipe, uint mkrCharged, address wipedBy); event UnlockedETH(address borrower, uint ethFree); @@ -164,13 +180,23 @@ contract RepayLoan is IssueLoan { // claiming paid MKR back if (msg.value > 0) { // Interacting with Kyber to swap ETH with MKR - swapETHMKR(eth, mkr, mkrCharged, msg.value); + swapETHMKR( + eth, + mkr, + mkrCharged, + msg.value + ); } else { // take MKR directly from address mkrTkn.transferFrom(msg.sender, address(this), mkrCharged); // user paying MKR fees } - emit WipedDAI(borrower, daiWipe, mkrCharged, msg.sender); + emit WipedDAI( + borrower, + daiWipe, + mkrCharged, + msg.sender + ); } function unlockETH(uint ethFree) public { @@ -185,25 +211,38 @@ contract RepayLoan is IssueLoan { emit UnlockedETH(msg.sender, ethFree); } - function swapETHMKR(address eth, address mkr, uint mkrCharged, uint ethQty) internal { + function swapETHMKR( + address eth, + address mkr, + uint mkrCharged, + uint ethQty + ) + internal + { InstaKyber instak = InstaKyber(getAddress("InstaKyber")); uint minRate; (, minRate) = instak.getExpectedPrice(eth, mkr, ethQty); - uint mkrBought = instak.executeTrade.value(ethQty)(eth, mkr, ethQty, minRate, mkrCharged); + uint mkrBought = instak.executeTrade.value(ethQty)( + eth, + mkr, + ethQty, + minRate, + mkrCharged + ); require(mkrCharged == mkrBought, "ETH not sufficient to cover the MKR fees."); if (address(this).balance > 0) { msg.sender.transfer(address(this).balance); } - } - + } } + contract BorrowTasks is RepayLoan { event TranferCDP(bytes32 cdp, address owner, address nextOwner); event CDPClaimed(bytes32 cdp, address owner); function transferCDP(address nextOwner) public { - require(nextOwner != 0, "Invalid Address."); + require(nextOwner != address(0), "Invalid Address."); MakerCDP loanMaster = MakerCDP(cdpAddr); loanMaster.give(cdps[msg.sender], nextOwner); cdps[msg.sender] = blankCDP; @@ -243,6 +282,7 @@ contract BorrowTasks is RepayLoan { } + contract InstaMaker is BorrowTasks { event MKRCollected(uint amount); diff --git a/contracts/v1/protocols/MakerDAO/PublicCDP.sol b/contracts/v1/protocols/MakerDAO/PublicCDP.sol index 1dfefd7..4fce7e3 100644 --- a/contracts/v1/protocols/MakerDAO/PublicCDP.sol +++ b/contracts/v1/protocols/MakerDAO/PublicCDP.sol @@ -1,6 +1,7 @@ // Resolver to Wipe & Coll any CDP pragma solidity ^0.5.0; + library SafeMath { function mul(uint256 a, uint256 b) internal pure returns (uint256) { if (a == 0) { @@ -47,14 +48,21 @@ interface WETHFace { } interface InstaKyber { - function executeTrade(address src, address dest, uint srcAmt, uint minConversionRate, uint maxDestAmt) - external - payable - returns (uint destAmt); + function executeTrade( + address src, + address dest, + uint srcAmt, + uint minConversionRate, + uint maxDestAmt + ) + external + payable + returns (uint destAmt); function getExpectedPrice(address src, address dest, uint srcAmt) external view returns (uint, uint); } + contract Registry { address public addressRegistry; modifier onlyAdmin() { @@ -69,6 +77,7 @@ contract Registry { } + contract Helper is Registry { using SafeMath for uint; using SafeMath for uint256; @@ -88,8 +97,15 @@ contract Helper is Registry { } + contract Lock is Helper { - event LockedETH(uint cdpNum, address lockedBy, uint lockETH, uint lockPETH); + + event LockedETH( + uint cdpNum, + address lockedBy, + uint lockETH, + uint lockPETH + ); function lockETH(uint cdpNum) public payable { MakerCDP loanMaster = MakerCDP(cdpAddr); @@ -98,11 +114,17 @@ contract Lock is Helper { uint pethToLock = pethPEReth(msg.value); loanMaster.join(pethToLock); // WETH to PETH loanMaster.lock(bytes32(cdpNum), pethToLock); // PETH to CDP - emit LockedETH(cdpNum, msg.sender, msg.value, pethToLock); - } + emit LockedETH( + cdpNum, + msg.sender, + msg.value, + pethToLock + ); + } } + contract Wipe is Lock { event WipedDAI(uint cdpNum, address wipedBy, uint daiWipe, uint mkrCharged); @@ -125,22 +147,35 @@ contract Wipe is Lock { mkrTkn.transferFrom(msg.sender, address(this), mkrCharged); // user paying MKR fees } - emit WipedDAI(cdpNum, msg.sender, daiWipe, mkrCharged); + emit WipedDAI( + cdpNum, + msg.sender, + daiWipe, + mkrCharged + ); } function swapETHMKR(uint mkrCharged, uint ethQty) internal { InstaKyber instak = InstaKyber(kyber); uint minRate; (, minRate) = instak.getExpectedPrice(eth, mkr, ethQty); - uint mkrBought = instak.executeTrade.value(ethQty)(eth, mkr, ethQty, minRate, mkrCharged); + + uint mkrBought = instak.executeTrade.value(ethQty)( + eth, + mkr, + ethQty, + minRate, + mkrCharged + ); + require(mkrCharged == mkrBought, "ETH not sufficient to cover the MKR fees."); if (address(this).balance > 0) { msg.sender.transfer(address(this).balance); } } - } + contract ApproveTkn is Wipe { function approveERC20() public { IERC20 wethTkn = IERC20(weth); @@ -152,9 +187,9 @@ contract ApproveTkn is Wipe { IERC20 daiTkn = IERC20(dai); daiTkn.approve(cdpAddr, 2 ** 256 - 1); } - } + contract PublicCDP is ApproveTkn { event MKRCollected(uint amount); @@ -178,5 +213,4 @@ contract PublicCDP is ApproveTkn { mkrTkn.transfer(msg.sender, amount); emit MKRCollected(amount); } - } diff --git a/contracts/v1/protocols/MakerDAO/uniqueCDP.sol b/contracts/v1/protocols/MakerDAO/uniqueCDP.sol index d58879f..0f1ee92 100644 --- a/contracts/v1/protocols/MakerDAO/uniqueCDP.sol +++ b/contracts/v1/protocols/MakerDAO/uniqueCDP.sol @@ -1,5 +1,6 @@ pragma solidity ^0.5.0; + library SafeMath { function mul(uint256 a, uint256 b) internal pure returns (uint256) { if (a == 0) { @@ -27,6 +28,7 @@ interface MakerCDP { function give(bytes32 cup, address guy) external; } + contract UniqueCDP { address public deployer; address public cdpAddr; diff --git a/contracts/v2/DAI2ETH.sol b/contracts/v2/DAI2ETH.sol index 48f36f5..29f1eb8 100644 --- a/contracts/v2/DAI2ETH.sol +++ b/contracts/v2/DAI2ETH.sol @@ -23,6 +23,7 @@ interface Kyber { function getExpectedRate(address src, address dest, uint srcQty) external view returns (uint, uint); } + contract Registry { address public addressRegistry; modifier onlyAdmin() { @@ -35,6 +36,7 @@ contract Registry { } } + contract Trade is Registry { event KyberTrade(address src, uint srcAmt, address dest, uint destAmt, address beneficiary, uint minConversionRate); @@ -56,14 +58,29 @@ contract Trade is Registry { // Interacting with Kyber Proxy Contract Kyber kyberFunctions = Kyber(getAddress("kyber")); - destAmt = kyberFunctions.trade.value(0)(src, srcDAI, dest, msg.sender, 2 ** 255, minConversionRate, getAddress("admin")); - emit KyberTrade(src, srcDAI, dest, destAmt, msg.sender, minConversionRate); + destAmt = kyberFunctions.trade.value(0)( + src, + srcDAI, + dest, + msg.sender, + 2 ** 255, + minConversionRate, + getAddress("admin") + ); + emit KyberTrade( + src, + srcDAI, + dest, + destAmt, + msg.sender, + minConversionRate + ); } - } + contract DAI2ETH is Trade { constructor(address rAddr) public { addressRegistry = rAddr; @@ -71,5 +88,4 @@ contract DAI2ETH is Trade { } function() external payable {} - } diff --git a/contracts/v2/InstaBank.sol b/contracts/v2/InstaBank.sol index b743bc0..1e82aa1 100644 --- a/contracts/v2/InstaBank.sol +++ b/contracts/v2/InstaBank.sol @@ -12,6 +12,7 @@ pragma solidity ^0.5.0; + library SafeMath { function mul(uint256 a, uint256 b) internal pure returns (uint256) { if (a == 0) { @@ -72,14 +73,21 @@ interface WETHFace { } interface InstaKyber { - function executeTrade(address src, address dest, uint srcAmt, uint minConversionRate, uint maxDestAmt) - external - payable - returns (uint destAmt); + function executeTrade( + address src, + address dest, + uint srcAmt, + uint minConversionRate, + uint maxDestAmt + ) + external + payable + returns (uint destAmt); function getExpectedPrice(address src, address dest, uint srcAmt) external view returns (uint, uint); } + contract Registry { address public addressRegistry; modifier onlyAdmin() { @@ -91,9 +99,9 @@ contract Registry { AddressRegistry addrReg = AddressRegistry(addressRegistry); return addrReg.getAddr(name); } - } + contract GlobalVar is Registry { using SafeMath for uint; using SafeMath for uint256; @@ -117,9 +125,9 @@ contract GlobalVar is Registry { MakerCDP loanMaster = MakerCDP(cdpAddr); rPETH = (ethNum.mul(10 ** 27)).div(loanMaster.per()); } - } + contract BorrowLoan is GlobalVar { // uint cdpNum event LockedETH(uint cdpNum, address borrower, uint lockETH, uint lockPETH); @@ -145,7 +153,12 @@ contract BorrowLoan is GlobalVar { uint pethToLock = pethPEReth(msg.value); loanMaster.join(pethToLock); // WETH to PETH loanMaster.lock(cup, pethToLock); // PETH to CDP - emit LockedETH(uint(cup), msg.sender, msg.value, pethToLock); + emit LockedETH( + uint(cup), + msg.sender, + msg.value, + pethToLock + ); } // minting DAI @@ -157,12 +170,18 @@ contract BorrowLoan is GlobalVar { payTo = msg.sender; } daiTkn.transfer(payTo, daiDraw); - emit LoanedDAI(uint(cup), msg.sender, daiDraw, payTo); + + emit LoanedDAI( + uint(cup), + msg.sender, + daiDraw, + payTo + ); } } - } + contract RepayLoan is BorrowLoan { event WipedDAI(uint cdpNum, address borrower, uint daiWipe, uint mkrCharged); event FreedETH(uint cdpNum, address borrower, uint ethFree); @@ -189,7 +208,13 @@ contract RepayLoan is BorrowLoan { // take MKR directly from address mkrTkn.transferFrom(msg.sender, address(this), mkrCharged); // user paying MKR fees } - emit WipedDAI(cdpNum, msg.sender, daiWipe, mkrCharged); + + emit WipedDAI( + cdpNum, + msg.sender, + daiWipe, + mkrCharged + ); } // TODO => send pethFree from frontend instead of ethFree @@ -224,11 +249,17 @@ contract RepayLoan is BorrowLoan { cdps[cdpNum] = address(0x0); - emit ShutCDP(cdpNum, msg.sender, daiDebt, wethBal); + emit ShutCDP( + cdpNum, + msg.sender, + daiDebt, + wethBal + ); } } + contract MiscTask is RepayLoan { event TranferInternal(uint cdpNum, address owner, address nextOwner); event TranferExternal(uint cdpNum, address owner, address nextOwner); @@ -304,6 +335,7 @@ contract MiscTask is RepayLoan { } + contract InstaBank is MiscTask { event MKRCollected(uint amount); diff --git a/contracts/v2/LeverageCDP.sol b/contracts/v2/LeverageCDP.sol index dee0bbd..6a74aa2 100644 --- a/contracts/v2/LeverageCDP.sol +++ b/contracts/v2/LeverageCDP.sol @@ -1,5 +1,6 @@ pragma solidity ^0.5.0; + library SafeMath { function mul(uint256 a, uint256 b) internal pure returns (uint256) { if (a == 0) { @@ -53,6 +54,7 @@ interface InstaBank { function transferCDPInternal(uint cdpNum, address nextOwner) external; } + contract Registry { address public addressRegistry; modifier onlyAdmin() { @@ -65,6 +67,7 @@ contract Registry { } } + contract GlobalVar is Registry { using SafeMath for uint; using SafeMath for uint256; @@ -92,6 +95,7 @@ contract GlobalVar is Registry { } + contract LoopNewCDP is GlobalVar { event LevNewCDP(uint cdpNum, uint ethLocked, uint daiMinted); @@ -143,6 +147,7 @@ contract LoopNewCDP is GlobalVar { } + contract LeverageCDP is LoopNewCDP { constructor(address rAddr) public { addressRegistry = rAddr; From b9b862192e7c169b1fdeabccb8dc4d3b3565c071 Mon Sep 17 00:00:00 2001 From: Ravindra Kumar Date: Mon, 28 Jan 2019 00:07:43 +0530 Subject: [PATCH 3/4] Fixed failing build --- contracts/v1/protocols/InstaKyber.sol | 66 +++++++++---------- .../v1/protocols/MakerDAO/InstaMaker.sol | 66 +++++++++---------- contracts/v1/protocols/MakerDAO/PublicCDP.sol | 60 ++++++++--------- contracts/v2/DAI2ETH.sol | 32 ++++----- contracts/v2/InstaBank.sol | 58 ++++++++-------- package.json | 7 +- test/Ownable.test.js | 5 -- truffle.js | 9 ++- 8 files changed, 146 insertions(+), 157 deletions(-) diff --git a/contracts/v1/protocols/InstaKyber.sol b/contracts/v1/protocols/InstaKyber.sol index 5d575c7..9d45cd0 100644 --- a/contracts/v1/protocols/InstaKyber.sol +++ b/contracts/v1/protocols/InstaKyber.sol @@ -85,29 +85,29 @@ contract Trade is Registry { uint minConversionRate, // minimum slippage rate uint maxDestAmt // max amount of dest token ) - public - payable - returns (uint destAmt) - { + public + payable + returns (uint destAmt) + { address eth = getAddress("eth"); uint ethQty = getToken( - msg.sender, - src, - srcAmt, - eth - ); + msg.sender, + src, + srcAmt, + eth + ); // Interacting with Kyber Proxy Contract Kyber kyberFunctions = Kyber(getAddress("kyber")); destAmt = kyberFunctions.trade.value(ethQty)( - src, - srcAmt, - dest, - msg.sender, - maxDestAmt, - minConversionRate, - getAddress("admin") - ); + src, + srcAmt, + dest, + msg.sender, + maxDestAmt, + minConversionRate, + getAddress("admin") + ); // maxDestAmt usecase implementated if (src == eth && address(this).balance > 0) { @@ -122,26 +122,26 @@ contract Trade is Registry { } emit KyberTrade( - src, - srcAmt, - dest, - destAmt, - msg.sender, - minConversionRate, - getAddress("admin") - ); + src, + srcAmt, + dest, + destAmt, + msg.sender, + minConversionRate, + getAddress("admin") + ); } function getToken( - address trader, - address src, - uint srcAmt, - address eth - ) - internal - returns (uint ethQty) - { + address trader, + address src, + uint srcAmt, + address eth + ) + internal + returns (uint ethQty) + { if (src == eth) { require(msg.value == srcAmt, "Invalid Operation"); ethQty = srcAmt; diff --git a/contracts/v1/protocols/MakerDAO/InstaMaker.sol b/contracts/v1/protocols/MakerDAO/InstaMaker.sol index 5868f17..c191e20 100644 --- a/contracts/v1/protocols/MakerDAO/InstaMaker.sol +++ b/contracts/v1/protocols/MakerDAO/InstaMaker.sol @@ -54,11 +54,11 @@ interface WETHFace { interface InstaKyber { function executeTrade( - address src, - address dest, - uint srcAmt, - uint minConversionRate, - uint maxDestAmt + address src, + address dest, + uint srcAmt, + uint minConversionRate, + uint maxDestAmt ) external payable @@ -79,7 +79,6 @@ contract Registry { AddressRegistry addrReg = AddressRegistry(addressRegistry); return addrReg.getAddr(name); } - } @@ -91,7 +90,6 @@ contract GlobalVar is Registry { address cdpAddr; // cups mapping(address => bytes32) cdps; // borrower >>> CDP Bytes bool public freezed; - } @@ -127,12 +125,12 @@ contract IssueLoan is GlobalVar { loanMaster.join(pethToLock); // WETH to PETH loanMaster.lock(cdps[borrower], pethToLock); // PETH to CDP - emit LockedETH( - borrower, - msg.value, - pethToLock, - msg.sender - ); + emit LockedETH( + borrower, + msg.value, + pethToLock, + msg.sender + ); } function drawDAI(uint daiDraw, address beneficiary) public { @@ -181,22 +179,22 @@ contract RepayLoan is IssueLoan { if (msg.value > 0) { // Interacting with Kyber to swap ETH with MKR swapETHMKR( - eth, - mkr, - mkrCharged, - msg.value - ); + eth, + mkr, + mkrCharged, + msg.value + ); } else { // take MKR directly from address mkrTkn.transferFrom(msg.sender, address(this), mkrCharged); // user paying MKR fees } emit WipedDAI( - borrower, - daiWipe, - mkrCharged, - msg.sender - ); + borrower, + daiWipe, + mkrCharged, + msg.sender + ); } function unlockETH(uint ethFree) public { @@ -212,10 +210,10 @@ contract RepayLoan is IssueLoan { } function swapETHMKR( - address eth, - address mkr, - uint mkrCharged, - uint ethQty + address eth, + address mkr, + uint mkrCharged, + uint ethQty ) internal { @@ -223,17 +221,17 @@ contract RepayLoan is IssueLoan { uint minRate; (, minRate) = instak.getExpectedPrice(eth, mkr, ethQty); uint mkrBought = instak.executeTrade.value(ethQty)( - eth, - mkr, - ethQty, - minRate, - mkrCharged - ); + eth, + mkr, + ethQty, + minRate, + mkrCharged + ); require(mkrCharged == mkrBought, "ETH not sufficient to cover the MKR fees."); if (address(this).balance > 0) { msg.sender.transfer(address(this).balance); } - } + } } diff --git a/contracts/v1/protocols/MakerDAO/PublicCDP.sol b/contracts/v1/protocols/MakerDAO/PublicCDP.sol index 4fce7e3..1120788 100644 --- a/contracts/v1/protocols/MakerDAO/PublicCDP.sol +++ b/contracts/v1/protocols/MakerDAO/PublicCDP.sol @@ -49,12 +49,12 @@ interface WETHFace { interface InstaKyber { function executeTrade( - address src, - address dest, - uint srcAmt, - uint minConversionRate, - uint maxDestAmt - ) + address src, + address dest, + uint srcAmt, + uint minConversionRate, + uint maxDestAmt + ) external payable returns (uint destAmt); @@ -100,12 +100,12 @@ contract Helper is Registry { contract Lock is Helper { - event LockedETH( - uint cdpNum, - address lockedBy, - uint lockETH, - uint lockPETH - ); + event LockedETH( + uint cdpNum, + address lockedBy, + uint lockETH, + uint lockPETH + ); function lockETH(uint cdpNum) public payable { MakerCDP loanMaster = MakerCDP(cdpAddr); @@ -115,12 +115,12 @@ contract Lock is Helper { loanMaster.join(pethToLock); // WETH to PETH loanMaster.lock(bytes32(cdpNum), pethToLock); // PETH to CDP - emit LockedETH( - cdpNum, - msg.sender, - msg.value, - pethToLock - ); + emit LockedETH( + cdpNum, + msg.sender, + msg.value, + pethToLock + ); } } @@ -148,11 +148,11 @@ contract Wipe is Lock { } emit WipedDAI( - cdpNum, - msg.sender, - daiWipe, - mkrCharged - ); + cdpNum, + msg.sender, + daiWipe, + mkrCharged + ); } function swapETHMKR(uint mkrCharged, uint ethQty) internal { @@ -160,13 +160,13 @@ contract Wipe is Lock { uint minRate; (, minRate) = instak.getExpectedPrice(eth, mkr, ethQty); - uint mkrBought = instak.executeTrade.value(ethQty)( - eth, - mkr, - ethQty, - minRate, - mkrCharged - ); + uint mkrBought = instak.executeTrade.value(ethQty)( + eth, + mkr, + ethQty, + minRate, + mkrCharged + ); require(mkrCharged == mkrBought, "ETH not sufficient to cover the MKR fees."); if (address(this).balance > 0) { diff --git a/contracts/v2/DAI2ETH.sol b/contracts/v2/DAI2ETH.sol index 29f1eb8..9c05487 100644 --- a/contracts/v2/DAI2ETH.sol +++ b/contracts/v2/DAI2ETH.sol @@ -59,24 +59,24 @@ contract Trade is Registry { // Interacting with Kyber Proxy Contract Kyber kyberFunctions = Kyber(getAddress("kyber")); - destAmt = kyberFunctions.trade.value(0)( - src, - srcDAI, - dest, - msg.sender, - 2 ** 255, - minConversionRate, - getAddress("admin") - ); + destAmt = kyberFunctions.trade.value(0)( + src, + srcDAI, + dest, + msg.sender, + 2 ** 255, + minConversionRate, + getAddress("admin") + ); emit KyberTrade( - src, - srcDAI, - dest, - destAmt, - msg.sender, - minConversionRate - ); + src, + srcDAI, + dest, + destAmt, + msg.sender, + minConversionRate + ); } } diff --git a/contracts/v2/InstaBank.sol b/contracts/v2/InstaBank.sol index 1e82aa1..8fb1612 100644 --- a/contracts/v2/InstaBank.sol +++ b/contracts/v2/InstaBank.sol @@ -74,11 +74,11 @@ interface WETHFace { interface InstaKyber { function executeTrade( - address src, - address dest, - uint srcAmt, - uint minConversionRate, - uint maxDestAmt + address src, + address dest, + uint srcAmt, + uint minConversionRate, + uint maxDestAmt ) external payable @@ -154,11 +154,11 @@ contract BorrowLoan is GlobalVar { loanMaster.join(pethToLock); // WETH to PETH loanMaster.lock(cup, pethToLock); // PETH to CDP emit LockedETH( - uint(cup), - msg.sender, - msg.value, - pethToLock - ); + uint(cup), + msg.sender, + msg.value, + pethToLock + ); } // minting DAI @@ -171,12 +171,12 @@ contract BorrowLoan is GlobalVar { } daiTkn.transfer(payTo, daiDraw); - emit LoanedDAI( - uint(cup), - msg.sender, - daiDraw, - payTo - ); + emit LoanedDAI( + uint(cup), + msg.sender, + daiDraw, + payTo + ); } } } @@ -209,12 +209,12 @@ contract RepayLoan is BorrowLoan { mkrTkn.transferFrom(msg.sender, address(this), mkrCharged); // user paying MKR fees } - emit WipedDAI( - cdpNum, - msg.sender, - daiWipe, - mkrCharged - ); + emit WipedDAI( + cdpNum, + msg.sender, + daiWipe, + mkrCharged + ); } // TODO => send pethFree from frontend instead of ethFree @@ -250,13 +250,12 @@ contract RepayLoan is BorrowLoan { cdps[cdpNum] = address(0x0); emit ShutCDP( - cdpNum, - msg.sender, - daiDebt, - wethBal - ); + cdpNum, + msg.sender, + daiDebt, + wethBal + ); } - } @@ -300,7 +299,6 @@ contract MiscTask is RepayLoan { loanMaster.give(bytes32(cdpNum), resolverAddress); resolverAct.initAct(cdpNum); emit ResolverTwoWay(cdpNum, msg.sender, resolverAddress); - } function claimCDP(uint cdpNum) public { @@ -332,7 +330,6 @@ contract MiscTask is RepayLoan { IERC20 daiTkn = IERC20(getAddress("dai")); daiTkn.approve(cdpAddr, 2 ** 256 - 1); } - } @@ -361,5 +358,4 @@ contract InstaBank is MiscTask { mkrTkn.transfer(msg.sender, amount); emit MKRCollected(amount); } - } diff --git a/package.json b/package.json index 1aa9c3e..8cb5bd8 100644 --- a/package.json +++ b/package.json @@ -22,13 +22,14 @@ "build": "npm run clean:contracts && truffle compile" }, "dependencies": { - "web3": "^1.0.0-beta.38", "bn.js": "^4.11.8", "dotenv": "^6.2.0", + "ethereumjs-wallet": "^0.6.3", "openzeppelin-solidity": "^2.1.2", "truffle": "^5.0.2", - "webpack": "^4.29.0", - "truffle-hdwallet-provider": "^1.0.2" + "truffle-hdwallet-provider": "^1.0.2", + "web3": "^1.0.0-beta.39", + "webpack": "^4.29.0" }, "devDependencies": { "babel-cli": "^6.26.0", diff --git a/test/Ownable.test.js b/test/Ownable.test.js index 414a9c1..6a401fe 100644 --- a/test/Ownable.test.js +++ b/test/Ownable.test.js @@ -28,9 +28,4 @@ contract('Ownable', accounts => { assert.isTrue(owner !== other) await assertRevert(ownable.transferOwnership(other, { from: other })) }) - - it('should guard ownership against stuck state', async () => { - const originalOwner = await ownable.owner() - await assertRevert(ownable.transferOwnership(null, { from: originalOwner })) - }) }) diff --git a/truffle.js b/truffle.js index f555f32..86d4281 100644 --- a/truffle.js +++ b/truffle.js @@ -1,16 +1,15 @@ require('dotenv').config() const HDWalletProvider = require('truffle-hdwallet-provider') -const Wallet = require('ethereumjs-wallet') -const rinkebyPrivateKey = new Buffer(process.env['RINKEBY_PRIVATE_KEY'], 'hex') -const rinkebyWallet = Wallet.fromPrivateKey(rinkebyPrivateKey) +const rinkebyWallet = + 'candy maple cake sugar pudding cream honey rich smooth crumble sweet treat' const rinkebyProvider = new HDWalletProvider( rinkebyWallet, 'https://rinkeby.infura.io/' ) -const ropstenPrivateKey = new Buffer(process.env['ROPSTEN_PRIVATE_KEY'], 'hex') -const ropstenWallet = Wallet.fromPrivateKey(ropstenPrivateKey) +const ropstenWallet = + 'candy maple cake sugar pudding cream honey rich smooth crumble sweet treat' const ropstenProvider = new HDWalletProvider( ropstenWallet, 'https://ropsten.infura.io/' From e6bb645616dc67c9e8095ddb9d9a47dfec7e06bc Mon Sep 17 00:00:00 2001 From: Ravindra Kumar Date: Mon, 28 Jan 2019 00:09:51 +0530 Subject: [PATCH 4/4] Fixed failing build --- .circleci/config.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 440d7de..395c742 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -26,8 +26,6 @@ jobs: # fallback to using the latest cache if no exact match is found - v1-dependencies- - - run: npm install truffle -g - - run: npm install ganache-cli -g - run: npm install - save_cache: