mirror of
https://github.com/Instadapp/dsa-connectors.git
synced 2024-07-29 22:37:00 +00:00
Revert "feat: Update function calculations"
This reverts commit ddaec8d11a.
This commit is contained in:
Shriya Tyagi
parent
88038ed8ff
commit
17ed93e797
|
|
@ -6,7 +6,6 @@ contract Events {
|
|||
address indexed token,
|
||||
uint256 underlyingAmt,
|
||||
uint256 minSharesPerToken,
|
||||
uint256 sharesReceieved,
|
||||
uint256 getId,
|
||||
uint256 setId
|
||||
);
|
||||
|
|
@ -15,7 +14,6 @@ contract Events {
|
|||
address indexed token,
|
||||
uint256 shareAmt,
|
||||
uint256 maxTokenPerShares,
|
||||
uint256 underlyingTokenAmount,
|
||||
uint256 getId,
|
||||
uint256 setId
|
||||
);
|
||||
|
|
@ -24,7 +22,6 @@ contract Events {
|
|||
address indexed token,
|
||||
uint256 underlyingAmt,
|
||||
uint256 maxSharesPerToken,
|
||||
uint256 sharedBurned,
|
||||
address indexed to,
|
||||
uint256 getId,
|
||||
uint256 setId
|
||||
|
|
@ -34,7 +31,6 @@ contract Events {
|
|||
address indexed token,
|
||||
uint256 shareAmt,
|
||||
uint256 minTokenPerShares,
|
||||
uint256 underlyingAmtReceieved,
|
||||
address to,
|
||||
uint256 getId,
|
||||
uint256 setId
|
||||
|
|
|
|||
|
|
@ -17,61 +17,57 @@ abstract contract BasicConnector is Events, DSMath, Basic {
|
|||
/**
|
||||
* @dev Deposit underlying asset to ERC4626 Vault.
|
||||
* @notice Mints vault shares by depositing exactly amount of underlying assets
|
||||
* @param vaultToken ERC4626 Token address.
|
||||
* @param token ERC4626 Token address.
|
||||
* @param underlyingAmt The amount of the underlying asset to deposit. (For max: `uint256(-1)`)
|
||||
* @param minSharesPerToken The min share rate of deposit. Should always be in 18 decimals.
|
||||
* @param minSharesPerToken The min share rate of deposit
|
||||
* @param getId ID to retrieve amt.
|
||||
* @param setId ID stores the amount of tokens deposited.
|
||||
*/
|
||||
|
||||
function deposit(
|
||||
address vaultToken,
|
||||
address token,
|
||||
uint256 underlyingAmt,
|
||||
uint256 minSharesPerToken,
|
||||
uint256 getId,
|
||||
uint256 setId
|
||||
) public returns (string memory _eventName, bytes memory _eventParam) {
|
||||
uint256 _underlyingAmt = getUint(getId, underlyingAmt);
|
||||
IERC4626 vaultTokenContract = IERC4626(token);
|
||||
|
||||
IERC4626 vaultTokenContract = IERC4626(vaultToken);
|
||||
TokenInterface _underlyingTokenContract = TokenInterface(
|
||||
vaultTokenContract.asset()
|
||||
address _underlyingToken = vaultTokenContract.asset();
|
||||
uint8 _vaultShareDecimal = vaultTokenContract.decimals();
|
||||
TokenInterface underlyingTokenContract = TokenInterface(
|
||||
_underlyingToken
|
||||
);
|
||||
|
||||
_underlyingAmt = _underlyingAmt == uint256(-1)
|
||||
? _underlyingTokenContract.balanceOf(address(this))
|
||||
? underlyingTokenContract.balanceOf(address(this))
|
||||
: _underlyingAmt;
|
||||
|
||||
// Making sure that the underlying amount is always in 18 decimals.
|
||||
uint256 _underlyingAmt18 = convertTo18(
|
||||
_underlyingTokenContract.decimals(),
|
||||
_underlyingAmt
|
||||
);
|
||||
|
||||
uint256 _minShares = convert18ToDec(
|
||||
vaultTokenContract.decimals(),
|
||||
wmul(minSharesPerToken, _underlyingAmt18) // Returns final amount in the floor value of the two token decimals.
|
||||
_vaultShareDecimal,
|
||||
wmul(minSharesPerToken, _underlyingAmt)
|
||||
);
|
||||
|
||||
uint256 _initialVaultBal = vaultTokenContract.balanceOf(address(this));
|
||||
|
||||
approve(_underlyingTokenContract, vaultToken, _underlyingAmt);
|
||||
approve(underlyingTokenContract, token, _underlyingAmt);
|
||||
vaultTokenContract.deposit(_underlyingAmt, address(this));
|
||||
|
||||
uint256 _sharesReceieved = sub(
|
||||
vaultTokenContract.balanceOf(address(this)),
|
||||
_initialVaultBal
|
||||
uint256 _finalVaultBal = vaultTokenContract.balanceOf(address(this));
|
||||
|
||||
require(
|
||||
_minShares <= sub(_finalVaultBal, _initialVaultBal),
|
||||
"minShares-exceeds"
|
||||
);
|
||||
|
||||
require(_minShares <= _sharesReceieved, "Less shares received");
|
||||
setUint(setId, _underlyingAmt);
|
||||
|
||||
setUint(setId, _sharesReceieved);
|
||||
|
||||
_eventName = "LogDeposit(address,uint256,uint256,uint256,uint256,uint256)";
|
||||
_eventName = "LogDeposit(address,uint256,uint256,uint256,uint256)";
|
||||
_eventParam = abi.encode(
|
||||
vaultToken,
|
||||
token,
|
||||
_underlyingAmt,
|
||||
minSharesPerToken,
|
||||
_sharesReceieved,
|
||||
getId,
|
||||
setId
|
||||
);
|
||||
|
|
@ -80,59 +76,51 @@ abstract contract BasicConnector is Events, DSMath, Basic {
|
|||
/**
|
||||
* @dev Mint underlying asset to ERC4626 Vault.
|
||||
* @notice Mints vault shares by minting exactly amount of underlying assets
|
||||
* @param vaultToken ERC4626 Token address.
|
||||
* @param token ERC4626 Token address.
|
||||
* @param shareAmt The amount of the share to mint. (For max: `uint256(-1)`)
|
||||
* @param maxTokenPerShares The max underyling token rate of mint. Always in 18 decimals.
|
||||
* @param maxTokenPerShares The max underyling token rate of mint
|
||||
* @param getId ID to retrieve amt.
|
||||
* @param setId ID stores the amount of tokens minted.
|
||||
*/
|
||||
|
||||
function mint(
|
||||
address vaultToken,
|
||||
address token,
|
||||
uint256 shareAmt,
|
||||
uint256 maxTokenPerShares,
|
||||
uint256 getId,
|
||||
uint256 setId
|
||||
) public returns (string memory _eventName, bytes memory _eventParam) {
|
||||
uint256 _shareAmt = getUint(getId, shareAmt);
|
||||
IERC4626 vaultTokenContract = IERC4626(token);
|
||||
|
||||
IERC4626 vaultTokenContract = IERC4626(vaultToken);
|
||||
address _underlyingToken = vaultTokenContract.asset();
|
||||
uint8 _vaultShareDecimal = vaultTokenContract.decimals();
|
||||
TokenInterface underlyingTokenContract = TokenInterface(
|
||||
vaultTokenContract.asset()
|
||||
_underlyingToken
|
||||
);
|
||||
|
||||
// In vault token decimals
|
||||
_shareAmt = _shareAmt == uint256(-1)
|
||||
? vaultTokenContract.balanceOf(address(this))
|
||||
: _shareAmt;
|
||||
|
||||
// In 18 decimals
|
||||
maxTokenPerShares = convertTo18(
|
||||
vaultTokenContract.decimals(),
|
||||
wmul(maxTokenPerShares, _shareAmt) // Returns final amount in the vault token decimals.
|
||||
_vaultShareDecimal,
|
||||
wmul(maxTokenPerShares, _shareAmt)
|
||||
);
|
||||
|
||||
// In token decimals
|
||||
maxTokenPerShares = convert18ToDec(
|
||||
underlyingTokenContract.decimals(),
|
||||
maxTokenPerShares
|
||||
);
|
||||
|
||||
// In token decimals
|
||||
uint256 _underlyingTokenAmount = vaultTokenContract.previewMint(
|
||||
uint256 _approveUnderlyingTokenAmount = vaultTokenContract.previewMint(
|
||||
_shareAmt
|
||||
);
|
||||
|
||||
// In token decimals
|
||||
uint256 _initalUnderlyingBal = underlyingTokenContract.balanceOf(
|
||||
uint256 _initalUnderlyingBal = IERC20(_underlyingToken).balanceOf(
|
||||
address(this)
|
||||
);
|
||||
|
||||
approve(underlyingTokenContract, vaultToken, _underlyingTokenAmount);
|
||||
approve(underlyingTokenContract, token, _approveUnderlyingTokenAmount);
|
||||
|
||||
vaultTokenContract.mint(_shareAmt, address(this));
|
||||
|
||||
// In token decimals
|
||||
uint256 _finalUnderlyingBal = underlyingTokenContract.balanceOf(
|
||||
uint256 _finalUnderlyingBal = IERC20(_underlyingToken).balanceOf(
|
||||
address(this)
|
||||
);
|
||||
|
||||
|
|
@ -143,12 +131,11 @@ abstract contract BasicConnector is Events, DSMath, Basic {
|
|||
|
||||
setUint(setId, _shareAmt);
|
||||
|
||||
_eventName = "LogMint(address,uint256,uint256,uint256,uint256,uint256)";
|
||||
_eventName = "LogMint(address,uint256,uint256,uint256,uint256)";
|
||||
_eventParam = abi.encode(
|
||||
vaultToken,
|
||||
token,
|
||||
_shareAmt,
|
||||
maxTokenPerShares,
|
||||
_underlyingTokenAmount,
|
||||
getId,
|
||||
setId
|
||||
);
|
||||
|
|
@ -157,15 +144,16 @@ abstract contract BasicConnector is Events, DSMath, Basic {
|
|||
/**
|
||||
* @dev Withdraw underlying asset from ERC4626 Vault.
|
||||
* @notice Withdraw vault shares with exactly amount of underlying assets
|
||||
* @param vaultToken ERC4626 Token address.
|
||||
* @param token ERC4626 Token address.
|
||||
* @param underlyingAmt The amount of the token to withdraw. (For max: `uint256(-1)`)
|
||||
* @param maxSharesPerToken The max share rate of withdrawn amount. Always send in 18 decimals.
|
||||
* @param maxSharesPerToken The max share rate of withdrawn amount.
|
||||
* @param to The address of receiver.
|
||||
* @param getId ID to retrieve amt.
|
||||
* @param setId ID stores the amount of tokens withdrawn.
|
||||
*/
|
||||
|
||||
function withdraw(
|
||||
address vaultToken,
|
||||
address token,
|
||||
uint256 underlyingAmt,
|
||||
uint256 maxSharesPerToken,
|
||||
address payable to,
|
||||
|
|
@ -173,50 +161,41 @@ abstract contract BasicConnector is Events, DSMath, Basic {
|
|||
uint256 setId
|
||||
) public returns (string memory _eventName, bytes memory _eventParam) {
|
||||
uint256 _underlyingAmt = getUint(getId, underlyingAmt);
|
||||
IERC4626 vaultTokenContract = IERC4626(token);
|
||||
|
||||
IERC4626 vaultTokenContract = IERC4626(vaultToken);
|
||||
address _underlyingToken = vaultTokenContract.asset();
|
||||
uint8 _vaultShareDecimal = vaultTokenContract.decimals();
|
||||
TokenInterface underlyingTokenContract = TokenInterface(
|
||||
vaultTokenContract.asset()
|
||||
_underlyingToken
|
||||
);
|
||||
|
||||
// In token decimals
|
||||
_underlyingAmt = _underlyingAmt == uint256(-1)
|
||||
? underlyingTokenContract.balanceOf(address(this))
|
||||
: _underlyingAmt;
|
||||
|
||||
// In 18 decimals
|
||||
_underlyingAmt = convertTo18(
|
||||
underlyingTokenContract.decimals(),
|
||||
_underlyingAmt
|
||||
);
|
||||
|
||||
// In vault token decimals
|
||||
uint256 _maxShares = convert18ToDec(
|
||||
vaultTokenContract.decimals(),
|
||||
wmul(maxSharesPerToken, _underlyingAmt) // In 18 decimals
|
||||
_vaultShareDecimal,
|
||||
wmul(maxSharesPerToken, _underlyingAmt)
|
||||
);
|
||||
|
||||
// In vault token decimals
|
||||
uint256 _initialVaultBal = vaultTokenContract.balanceOf(to);
|
||||
|
||||
vaultTokenContract.withdraw(_underlyingAmt, to, address(this));
|
||||
|
||||
// In vault token decimals
|
||||
uint256 _finalVaultBal = vaultTokenContract.balanceOf(to);
|
||||
|
||||
// In vault token decimals
|
||||
uint256 _sharesBurned = sub(_initialVaultBal, _finalVaultBal);
|
||||
|
||||
require(_maxShares >= _sharesBurned, "maxShares-exceeds");
|
||||
require(
|
||||
_maxShares >= sub(_finalVaultBal, _initialVaultBal),
|
||||
"maxShares-exceeds"
|
||||
);
|
||||
|
||||
setUint(setId, _underlyingAmt);
|
||||
|
||||
_eventName = "LogWithdraw(address,uint256,uint256,uint256,address,uint256,uint256)";
|
||||
_eventName = "LogWithdraw(address,uint256,uint256,address,uint256,uint256)";
|
||||
_eventParam = abi.encode(
|
||||
vaultToken,
|
||||
token,
|
||||
_underlyingAmt,
|
||||
maxSharesPerToken,
|
||||
_sharesBurned,
|
||||
to,
|
||||
getId,
|
||||
setId
|
||||
|
|
@ -226,16 +205,16 @@ abstract contract BasicConnector is Events, DSMath, Basic {
|
|||
/**
|
||||
* @dev Redeem underlying asset from ERC4626 Vault.
|
||||
* @notice Redeem vault shares with exactly amount of underlying assets
|
||||
* @param vaultToken ERC4626 Token address.
|
||||
* @param token ERC4626 Token address.
|
||||
* @param shareAmt The amount of the token to redeem. (For max: `uint256(-1)`)
|
||||
* @param minTokenPerShares The min underlying token rate of withdraw. Always in 18 decimals.
|
||||
* @param minTokenPerShares The min underlying token rate of withdraw.
|
||||
* @param to The address of receiver.
|
||||
* @param getId ID to retrieve amt.
|
||||
* @param setId ID stores the amount of tokens redeem.
|
||||
*/
|
||||
|
||||
function redeem(
|
||||
address vaultToken,
|
||||
address token,
|
||||
uint256 shareAmt,
|
||||
uint256 minTokenPerShares,
|
||||
address payable to,
|
||||
|
|
@ -243,53 +222,44 @@ abstract contract BasicConnector is Events, DSMath, Basic {
|
|||
uint256 setId
|
||||
) public returns (string memory _eventName, bytes memory _eventParam) {
|
||||
uint256 _shareAmt = getUint(getId, shareAmt);
|
||||
IERC4626 vaultTokenContract = IERC4626(token);
|
||||
|
||||
IERC4626 vaultTokenContract = IERC4626(vaultToken);
|
||||
address _underlyingToken = vaultTokenContract.asset();
|
||||
uint8 _vaultShareDecimal = vaultTokenContract.decimals();
|
||||
TokenInterface underlyingTokenContract = TokenInterface(
|
||||
vaultTokenContract.asset()
|
||||
_underlyingToken
|
||||
);
|
||||
|
||||
// In vault token decimals
|
||||
_shareAmt = _shareAmt == uint256(-1)
|
||||
? vaultTokenContract.balanceOf(address(this))
|
||||
: _shareAmt;
|
||||
|
||||
// In 18 decimals
|
||||
_shareAmt = convertTo18(vaultTokenContract.decimals(), _shareAmt);
|
||||
|
||||
// In token decimals
|
||||
uint256 _minUnderlyingAmt = convert18ToDec(
|
||||
underlyingTokenContract.decimals(),
|
||||
wmul(minTokenPerShares, _shareAmt) // In 18 decimals
|
||||
_vaultShareDecimal,
|
||||
wmul(minTokenPerShares, _shareAmt)
|
||||
);
|
||||
|
||||
// In token decimals
|
||||
uint256 _initalUnderlyingBal = underlyingTokenContract.balanceOf(to);
|
||||
uint256 _initalUnderlyingBal = IERC20(_underlyingToken).balanceOf(
|
||||
to
|
||||
);
|
||||
|
||||
vaultTokenContract.redeem(_shareAmt, to, address(this));
|
||||
|
||||
// In token decimals
|
||||
uint256 _finalUnderlyingBal = underlyingTokenContract.balanceOf(to);
|
||||
|
||||
// In token decimals
|
||||
uint256 _underlyingAmtReceieved = sub(
|
||||
_finalUnderlyingBal,
|
||||
_initalUnderlyingBal
|
||||
uint256 _finalUnderlyingBal = IERC20(_underlyingToken).balanceOf(
|
||||
to
|
||||
);
|
||||
|
||||
require(
|
||||
_minUnderlyingAmt <= _underlyingAmtReceieved,
|
||||
_minUnderlyingAmt <= sub(_finalUnderlyingBal, _initalUnderlyingBal),
|
||||
"_minUnderlyingAmt-exceeds"
|
||||
);
|
||||
|
||||
setUint(setId, _shareAmt);
|
||||
|
||||
_eventName = "LogRedeem(address,uint256,uint256,uint256,address,uint256,uint256)";
|
||||
_eventName = "LogRedeem(address,uint256,uint256,address,uint256,uint256)";
|
||||
_eventParam = abi.encode(
|
||||
vaultToken,
|
||||
token,
|
||||
_shareAmt,
|
||||
minTokenPerShares,
|
||||
_underlyingAmtReceieved,
|
||||
to,
|
||||
getId,
|
||||
setId
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user