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

Merge pull request #14 from Instadapp/fluid-approve-fix

Browse Source 
Fix fluid approve
This commit is contained in:
Shriya Tyagi 2024-05-23 22:46:41 +05:30 committed by GitHub
commit dc8f8b4e03
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
contracts/mainnet/connectors/fluid/main.sol
View File

@ -6,12 +6,13 @@ pragma solidity ^0.8.2;
* @dev Lending & Borrowing.
*/
import {Stores} from "../../common/stores.sol";
import {Basic} from "../../common/basic.sol";
import {TokenInterface} from "../../common/interfaces.sol";
import {Events} from "./events.sol";
import {IVault} from "./interface.sol";
abstract contract FluidConnector is Events, Stores {
abstract contract FluidConnector is Events, Basic {
/**
* @dev Returns Eth address
*/
@ -103,8 +104,9 @@ abstract contract FluidConnector is Events, Stores {
);
}
TokenInterface(vaultDetails_.supplyToken).approve(
vaultAddress_,
approve(
TokenInterface(vaultDetails_.supplyToken),
vaultAddress_,
uint256(newCol_)
);
}
@ -121,12 +123,14 @@ abstract contract FluidConnector is Events, Stores {
: uint256(-newDebt_);
} else {
isPaybackMin_
? TokenInterface(vaultDetails_.borrowToken).approve(
vaultAddress_,
? approve(
TokenInterface(vaultDetails_.borrowToken),
vaultAddress_,
repayApproveAmt_
)
: TokenInterface(vaultDetails_.borrowToken).approve(
vaultAddress_,
: approve(
TokenInterface(vaultDetails_.borrowToken),
vaultAddress_,
uint256(-newDebt_)
);
}
@ -208,8 +212,9 @@ abstract contract FluidConnector is Events, Stores {
);
}
TokenInterface(vaultDetails_.supplyToken).approve(
vaultAddress_,
approve(
TokenInterface(vaultDetails_.supplyToken),
vaultAddress_,
uint256(newCol_)
);
}
@ -226,12 +231,14 @@ abstract contract FluidConnector is Events, Stores {
: uint256(-newDebt_);
} else {
isPaybackMin_
? TokenInterface(vaultDetails_.borrowToken).approve(
vaultAddress_,
? approve(
TokenInterface(vaultDetails_.borrowToken),
vaultAddress_,
repayApproveAmt_
)
: TokenInterface(vaultDetails_.borrowToken).approve(
vaultAddress_,
: approve(
TokenInterface(vaultDetails_.borrowToken),
vaultAddress_,
uint256(-newDebt_)
);
}
@ -256,5 +263,5 @@ abstract contract FluidConnector is Events, Stores {
}
contract ConnectV2Fluid is FluidConnector {
string public constant name = "Fluid-v1.1";
string public constant name = "Fluid-v1.2";
}