Compound changes

This commit is contained in:
Thrilok Kumar 2021-03-21 01:21:23 +05:30
parent a615f19b2d
commit 35330c92a2

View File

@ -17,12 +17,15 @@ abstract contract CompoundResolver is Events, Helpers {
*/ */
function deposit( function deposit(
string calldata tokenId, string calldata tokenId,
uint amt, uint256 amt,
uint getId, uint256 getId,
uint setId uint256 setId
) external payable returns (string memory _eventName, bytes memory _eventParam) { ) external payable returns (string memory _eventName, bytes memory _eventParam) {
uint _amt = getUint(getId, amt); uint _amt = getUint(getId, amt);
(address token, address cToken) = compMapping.getMapping(tokenId); (address token, address cToken) = compMapping.getMapping(tokenId);
require(token != address(0) && cToken != address(0), "ctoken mapping not found");
enterMarket(cToken); enterMarket(cToken);
if (token == ethAddr) { if (token == ethAddr) {
_amt = _amt == uint(-1) ? address(this).balance : _amt; _amt = _amt == uint(-1) ? address(this).balance : _amt;
@ -48,12 +51,15 @@ abstract contract CompoundResolver is Events, Helpers {
*/ */
function withdraw( function withdraw(
string calldata tokenId, string calldata tokenId,
uint amt, uint256 amt,
uint getId, uint256 getId,
uint setId uint256 setId
) external payable returns (string memory _eventName, bytes memory _eventParam) { ) external payable returns (string memory _eventName, bytes memory _eventParam) {
uint _amt = getUint(getId, amt); uint _amt = getUint(getId, amt);
(address token, address cToken) = compMapping.getMapping(tokenId); (address token, address cToken) = compMapping.getMapping(tokenId);
require(token != address(0) && cToken != address(0), "ctoken mapping not found");
CTokenInterface cTokenContract = CTokenInterface(cToken); CTokenInterface cTokenContract = CTokenInterface(cToken);
if (_amt == uint(-1)) { if (_amt == uint(-1)) {
TokenInterface tokenContract = TokenInterface(token); TokenInterface tokenContract = TokenInterface(token);
@ -79,12 +85,14 @@ abstract contract CompoundResolver is Events, Helpers {
*/ */
function borrow( function borrow(
string calldata tokenId, string calldata tokenId,
uint amt, uint256 amt,
uint getId, uint256 getId,
uint setId uint256 setId
) external payable returns (string memory _eventName, bytes memory _eventParam) { ) external payable returns (string memory _eventName, bytes memory _eventParam) {
uint _amt = getUint(getId, amt); uint _amt = getUint(getId, amt);
(address token, address cToken) = compMapping.getMapping(tokenId); (address token, address cToken) = compMapping.getMapping(tokenId);
require(token != address(0) && cToken != address(0), "ctoken mapping not found");
enterMarket(cToken); enterMarket(cToken);
require(CTokenInterface(cToken).borrow(_amt) == 0, "borrow-failed"); require(CTokenInterface(cToken).borrow(_amt) == 0, "borrow-failed");
setUint(setId, _amt); setUint(setId, _amt);
@ -102,12 +110,14 @@ abstract contract CompoundResolver is Events, Helpers {
*/ */
function payback( function payback(
string calldata tokenId, string calldata tokenId,
uint amt, uint256 amt,
uint getId, uint256 getId,
uint setId uint256 setId
) external payable returns (string memory _eventName, bytes memory _eventParam) { ) external payable returns (string memory _eventName, bytes memory _eventParam) {
uint _amt = getUint(getId, amt); uint _amt = getUint(getId, amt);
(address token, address cToken) = compMapping.getMapping(tokenId); (address token, address cToken) = compMapping.getMapping(tokenId);
require(token != address(0) && cToken != address(0), "ctoken mapping not found");
CTokenInterface cTokenContract = CTokenInterface(cToken); CTokenInterface cTokenContract = CTokenInterface(cToken);
_amt = _amt == uint(-1) ? cTokenContract.borrowBalanceCurrent(address(this)) : _amt; _amt = _amt == uint(-1) ? cTokenContract.borrowBalanceCurrent(address(this)) : _amt;
@ -135,12 +145,14 @@ abstract contract CompoundResolver is Events, Helpers {
*/ */
function depositCToken( function depositCToken(
string calldata tokenId, string calldata tokenId,
uint amt, uint256 amt,
uint getId, uint256 getId,
uint setId uint256 setId
) external payable returns (string memory _eventName, bytes memory _eventParam) { ) external payable returns (string memory _eventName, bytes memory _eventParam) {
uint _amt = getUint(getId, amt); uint _amt = getUint(getId, amt);
(address token, address cToken) = compMapping.getMapping(tokenId); (address token, address cToken) = compMapping.getMapping(tokenId);
require(token != address(0) && cToken != address(0), "ctoken mapping not found");
enterMarket(cToken); enterMarket(cToken);
CTokenInterface ctokenContract = CTokenInterface(cToken); CTokenInterface ctokenContract = CTokenInterface(cToken);
@ -183,6 +195,8 @@ abstract contract CompoundResolver is Events, Helpers {
) external payable returns (string memory _eventName, bytes memory _eventParam) { ) external payable returns (string memory _eventName, bytes memory _eventParam) {
uint _cAmt = getUint(getId, cTokenAmt); uint _cAmt = getUint(getId, cTokenAmt);
(address token, address cToken) = compMapping.getMapping(tokenId); (address token, address cToken) = compMapping.getMapping(tokenId);
require(token != address(0) && cToken != address(0), "ctoken mapping not found");
CTokenInterface cTokenContract = CTokenInterface(cToken); CTokenInterface cTokenContract = CTokenInterface(cToken);
TokenInterface tokenContract = TokenInterface(token); TokenInterface tokenContract = TokenInterface(token);
_cAmt = _cAmt == uint(-1) ? cTokenContract.balanceOf(address(this)) : _cAmt; _cAmt = _cAmt == uint(-1) ? cTokenContract.balanceOf(address(this)) : _cAmt;
@ -215,9 +229,9 @@ abstract contract CompoundResolver is Events, Helpers {
address borrower, address borrower,
string calldata tokenIdToPay, string calldata tokenIdToPay,
string calldata tokenIdInReturn, string calldata tokenIdInReturn,
uint amt, uint256 amt,
uint getId, uint256 getId,
uint setId uint256 setId
) external payable returns (string memory _eventName, bytes memory _eventParam) { ) external payable returns (string memory _eventName, bytes memory _eventParam) {
uint _amt = getUint(getId, amt); uint _amt = getUint(getId, amt);
@ -245,7 +259,7 @@ abstract contract CompoundResolver is Events, Helpers {
setUint(setId, _amt); setUint(setId, _amt);
_eventName = "LogLiquidate(address,address,address,uint256,uint256,uint256,uint256)"; _eventName = "LogLiquidate(address,address,address,uint256,uint256,uint256)";
_eventParam = abi.encode( _eventParam = abi.encode(
address(this), address(this),
data.tokenToPay, data.tokenToPay,