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

function name changes

Browse Source
This commit is contained in:
Richa-iitr 2022-09-02 20:50:12 +05:30
parent cf3c71986d
commit e3946201a8
4 changed files with 45 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
contracts/mainnet/connectors/compound/v3/events.sol
View File

@ -10,7 +10,7 @@ contract Events {
uint256 setId uint256 setId
); );
event LogDepositOnBehalfOf( event LogDepositOnBehalf(
address indexed market, address indexed market,
address indexed token, address indexed token,
address to, address to,
@ -46,7 +46,7 @@ contract Events {
uint256 setId uint256 setId
); );
event LogWithdrawFromUsingManager( event LogWithdrawOnBehalf(
address indexed market, address indexed market,
address indexed token, address indexed token,
address from, address from,
@ -63,7 +63,7 @@ contract Events {
uint256 setId uint256 setId
); );
event LogBorrowOnBehalfOf( event LogBorrowTo(
address indexed market, address indexed market,
address to, address to,
uint256 tokenAmt, uint256 tokenAmt,
@ -71,7 +71,7 @@ contract Events {
uint256 setId uint256 setId
); );
event LogBorrowFromUsingManager( event LogBorrowOnBehalf(
address indexed market, address indexed market,
address from, address from,
address to, address to,
@ -82,7 +82,7 @@ contract Events {
event LogPayback(address indexed market, uint256 tokenAmt, uint256 setId); event LogPayback(address indexed market, uint256 tokenAmt, uint256 setId);
event LogPaybackOnBehalfOf( event LogPaybackOnBehalf(
address indexed market, address indexed market,
address to, address to,
uint256 tokenAmt, uint256 tokenAmt,
@ -127,9 +127,9 @@ contract Events {
uint256 setId uint256 setId
); );
event LogAllow(address indexed market, address indexed manager, bool allow); event LogToggleAccountManager(address indexed market, address indexed manager, bool allow);
event LogAllowWithPermit( event LogToggleAccountManagerWithPermit(
address indexed market, address indexed market,
address indexed owner, address indexed owner,
address indexed manager, address indexed manager,

2
contracts/mainnet/connectors/compound/v3/helpers.sol
View File

@ -177,7 +177,7 @@ abstract contract Helpers is DSMath, Basic {
} }
} }
function _setAmt( function _calculateFromAmount(
address market, address market,
address token, address token,
address src, address src,

51
contracts/mainnet/connectors/compound/v3/main.sol
View File

@ -104,7 +104,7 @@ abstract contract CompoundV3Resolver is Events, Helpers {
if (token_ == getBaseToken(market)) { if (token_ == getBaseToken(market)) {
require( require(
CometInterface(market).borrowBalanceOf(to) == 0, CometInterface(market).borrowBalanceOf(to) == 0,
"debt-not-repaid" "to-address-position-debt-not-repaid"
); );
} }
@ -164,11 +164,18 @@ abstract contract CompoundV3Resolver is Events, Helpers {
if (token_ == getBaseToken(market)) { if (token_ == getBaseToken(market)) {
require( require(
CometInterface(market).borrowBalanceOf(to) == 0, CometInterface(market).borrowBalanceOf(to) == 0,
"debt-not-repaid" "to-address-position-debt-not-repaid"
); );
} }
amt_ = _setAmt(market, token_, from, amt_, isEth, Action.DEPOSIT); amt_ = _calculateFromAmount(
market,
token_,
from,
amt_,
isEth,
Action.DEPOSIT
);
CometInterface(market).supplyFrom(from, to, token_, amt_); CometInterface(market).supplyFrom(from, to, token_, amt_);
setUint(setId, amt_); setUint(setId, amt_);
@ -291,7 +298,7 @@ abstract contract CompoundV3Resolver is Events, Helpers {
* @param getId ID to retrieve amt. * @param getId ID to retrieve amt.
* @param setId ID stores the amount of tokens withdrawn. * @param setId ID stores the amount of tokens withdrawn.
*/ */
function withdrawFromUsingManager( function withdrawOnBehalf(
address market, address market,
address token, address token,
address from, address from,
@ -316,7 +323,7 @@ abstract contract CompoundV3Resolver is Events, Helpers {
}) })
); );
eventName_ = "LogWithdrawFromUsingManager(address,address,address,address,uint256,uint256,uint256)"; eventName_ = "LogWithdrawOnBehalf(address,address,address,address,uint256,uint256,uint256)";
eventParam_ = abi.encode(market, token, from, to, amt_, getId, setId_); eventParam_ = abi.encode(market, token, from, to, amt_, getId, setId_);
} }
@ -346,7 +353,7 @@ abstract contract CompoundV3Resolver is Events, Helpers {
bool isEth = token == ethAddr; bool isEth = token == ethAddr;
address token_ = getBaseToken(market); address token_ = getBaseToken(market);
require(token == token_ || token == ethAddr, "invalid-token"); require(token == token_ || isEth, "invalid-token");
TokenInterface tokenContract = TokenInterface(token_); TokenInterface tokenContract = TokenInterface(token_);
@ -412,7 +419,7 @@ abstract contract CompoundV3Resolver is Events, Helpers {
setId: setId setId: setId
}) })
); );
eventName_ = "LogBorrowOnBehalf(address,address,uint256,uint256,uint256)"; eventName_ = "LogBorrowTo(address,address,uint256,uint256,uint256)";
eventParam_ = abi.encode(market, to, amt_, getId, setId_); eventParam_ = abi.encode(market, to, amt_, getId, setId_);
} }
@ -455,7 +462,7 @@ abstract contract CompoundV3Resolver is Events, Helpers {
setId: setId setId: setId
}) })
); );
eventName_ = "LogBorrowFromUsingManager(address,address,address,uint256,uint256,uint256)"; eventName_ = "LogBorrowOnBehalf(address,address,address,uint256,uint256,uint256)";
eventParam_ = abi.encode(market, from, to, amt_, getId, setId_); eventParam_ = abi.encode(market, from, to, amt_, getId, setId_);
} }
@ -487,7 +494,7 @@ abstract contract CompoundV3Resolver is Events, Helpers {
bool isEth = token == ethAddr; bool isEth = token == ethAddr;
address token_ = getBaseToken(market); address token_ = getBaseToken(market);
require(token == token_ || token == ethAddr, "invalid-token"); require(token == token_ || isEth, "invalid-token");
TokenInterface tokenContract = TokenInterface(token_); TokenInterface tokenContract = TokenInterface(token_);
@ -542,7 +549,7 @@ abstract contract CompoundV3Resolver is Events, Helpers {
address token_ = getBaseToken(market); address token_ = getBaseToken(market);
bool isEth = token == ethAddr; bool isEth = token == ethAddr;
require(token == token_ || token == ethAddr, "invalid-token"); require(token == token_ || isEth, "invalid-token");
TokenInterface tokenContract = TokenInterface(token_); TokenInterface tokenContract = TokenInterface(token_);
@ -598,11 +605,18 @@ abstract contract CompoundV3Resolver is Events, Helpers {
address token_ = getBaseToken(market); address token_ = getBaseToken(market);
bool isEth = token == ethAddr; bool isEth = token == ethAddr;
require(token == token_ || token == ethAddr, "invalid-token"); require(token == token_ || isEth, "invalid-token");
TokenInterface tokenContract = TokenInterface(token_); TokenInterface tokenContract = TokenInterface(token_);
amt_ = _setAmt(market, token_, from, amt_, isEth, Action.REPAY); amt_ = _calculateFromAmount(
market,
token_,
from,
amt_,
isEth,
Action.REPAY
);
uint256 borrowBal = CometInterface(market).borrowBalanceOf(to); uint256 borrowBal = CometInterface(market).borrowBalanceOf(to);
if (borrowBal > 0) { if (borrowBal > 0) {
@ -764,7 +778,14 @@ abstract contract CompoundV3Resolver is Events, Helpers {
address token_ = isEth ? wethAddr : token; address token_ = isEth ? wethAddr : token;
TokenInterface tokenContract = TokenInterface(token_); TokenInterface tokenContract = TokenInterface(token_);
amt_ = _setAmt(market, token_, src, amt_, isEth, Action.TRANSFER); amt_ = _calculateFromAmount(
market,
token_,
src,
amt_,
isEth,
Action.TRANSFER
);
_transfer(market, token_, src, dest, amt_); _transfer(market, token_, src, dest, amt_);
@ -787,7 +808,7 @@ abstract contract CompoundV3Resolver is Events, Helpers {
bool isAllowed bool isAllowed
) external returns (string memory eventName_, bytes memory eventParam_) { ) external returns (string memory eventName_, bytes memory eventParam_) {
CometInterface(market).allow(manager, isAllowed); CometInterface(market).allow(manager, isAllowed);
eventName_ = "LogAllow(address,address,bool)"; eventName_ = "LogToggleAccountManager(address,address,bool)";
eventParam_ = abi.encode(market, manager, isAllowed); eventParam_ = abi.encode(market, manager, isAllowed);
} }
@ -825,7 +846,7 @@ abstract contract CompoundV3Resolver is Events, Helpers {
r, r,
s s
); );
eventName_ = "LogAllowWithPermit(address,address,address,bool,uint256,uint256,uint8,bytes32,bytes32)"; eventName_ = "LogToggleAccountManagerWithPermit(address,address,address,bool,uint256,uint256,uint8,bytes32,bytes32)";
eventParam_ = abi.encode( eventParam_ = abi.encode(
market, market,
owner, owner,

2
test/mainnet/compound/compound.iii.test.ts
View File

@ -399,7 +399,7 @@ describe("Compound III", function () {
const spells = [ const spells = [
{ {
connector: connectorName, connector: connectorName,
method: "withdrawFromUsingManager", method: "withdrawOnBehalf",
args: [market, tokens.eth.address, dsaWallet0.address, dsaWallet1.address, amount, 0, 0] args: [market, tokens.eth.address, dsaWallet0.address, dsaWallet1.address, amount, 0, 0]
} }
]; ];