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

update fixes on matcha connector

Browse Source
This commit is contained in:
“Njoku 2021-02-02 15:35:30 +01:00
parent 32ccc0ccdc
commit 7dbe80a465
1 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
contracts/connectors/matcha.sol
View File

@ -43,26 +43,8 @@ interface IWETH is IERC20 {
contract Matcha { contract Matcha {
IWETH WETH = getWETHAddress();
event LogSwap(
// Transfer ETH held by this contrat to the sender/owner.
function withdrawETH(uint256 amount)
external
{
(address(this)).transfer(amount);
}
function depositETH()
external
payable
{
WETH.deposit{value: msg.value}();
}
event BoughtTokens(
address indexed sellAddr, address indexed sellAddr,
address indexed buyAddr, address indexed buyAddr,
uint256 buyAmt, uint256 buyAmt,
@ -83,7 +65,6 @@ contract Matcha {
TokenInterface sellAddr, TokenInterface sellAddr,
TokenInterface buyAddr, TokenInterface buyAddr,
address spender, address spender,
address payable swapTarget,
bytes calldata swapCallData, bytes calldata swapCallData,
uint ethAmt, uint ethAmt,
uint setId uint setId
@ -93,16 +74,19 @@ contract Matcha {
uint buyAmt; uint buyAmt;
if (address(_sellAddr) == getEthAddr()) {
TokenInterface(_sellAddr).approve(getWETHAddress(), ethAmt);
}
// Give `spender` an infinite allowance to spend this contract's `sellToken`. // Give `spender` an infinite allowance to spend this contract's `sellToken`.
// Note that for some tokens (e.g., USDT, KNC), you must first reset any existing // Note that for some tokens (e.g., USDT, KNC), you must first reset any existing
// allowance to 0 before being able to update it. // allowance to 0 before being able to update it.
require(sellAddr.approve(spender, uint(-1))); require(sellAddr.approve(spender, ethAmt);
// Call the encoded swap function call on the contract at `swapTarget`, // Call the encoded swap function call on the contract at `swapTarget`,
// passing along any ETH attached to this function call to cover protocol fees. // passing along any ETH attached to this function call to cover protocol fees.
(bool success,) = swapTarget.call.value(ethAmt)(swapCallData); (bool success,) = address(getMatchaAddress()).call.value(ethAmt)(swapCallData);
require(success, 'SWAP_CALL_FAILED');
// Refund any unspent protocol fees to the sender. if (!success) revert("Mathca-swap-failed");
address(this).transfer(address(this).balance);
// Use our current buyToken balance to determine how much we've bought. // Use our current buyToken balance to determine how much we've bought.
uint finalBal = getTokenBal(buyAddr); uint finalBal = getTokenBal(buyAddr);
@ -111,7 +95,7 @@ contract Matcha {
setUint(setId, buyAmt); setUint(setId, buyAmt);
emit BoughtTokens(sellAddr, buyAddr, boughtAmount, setId); emit LogSwap(sellAddr, buyAddr, boughtAmount, setId);
} }