Revert "feat: Update function calculations"

This reverts commit ddaec8d11a.
This commit is contained in:
Shriya Tyagi 2023-08-21 17:38:34 +05:30
parent 88038ed8ff
commit 17ed93e797
2 changed files with 310 additions and 344 deletions

View File

@ -1,42 +1,38 @@
//SPDX-License-Identifier: MIT //SPDX-License-Identifier: MIT
pragma solidity ^0.7.0; pragma solidity ^0.7.0;
contract Events { contract Events {
event LogDeposit( event LogDeposit(
address indexed token, address indexed token,
uint256 underlyingAmt, uint256 underlyingAmt,
uint256 minSharesPerToken, uint256 minSharesPerToken,
uint256 sharesReceieved, uint256 getId,
uint256 getId, uint256 setId
uint256 setId );
);
event LogMint(
event LogMint( address indexed token,
address indexed token, uint256 shareAmt,
uint256 shareAmt, uint256 maxTokenPerShares,
uint256 maxTokenPerShares, uint256 getId,
uint256 underlyingTokenAmount, uint256 setId
uint256 getId, );
uint256 setId
); event LogWithdraw(
address indexed token,
event LogWithdraw( uint256 underlyingAmt,
address indexed token, uint256 maxSharesPerToken,
uint256 underlyingAmt, address indexed to,
uint256 maxSharesPerToken, uint256 getId,
uint256 sharedBurned, uint256 setId
address indexed to, );
uint256 getId,
uint256 setId event LogRedeem(
); address indexed token,
uint256 shareAmt,
event LogRedeem( uint256 minTokenPerShares,
address indexed token, address to,
uint256 shareAmt, uint256 getId,
uint256 minTokenPerShares, uint256 setId
uint256 underlyingAmtReceieved, );
address to, }
uint256 getId,
uint256 setId
);
}

View File

@ -1,302 +1,272 @@
//SPDX-License-Identifier: MIT //SPDX-License-Identifier: MIT
pragma solidity ^0.7.0; pragma solidity ^0.7.0;
/** /**
* @title Basic D. * @title Basic D.
* @dev Deposit, Mint, Withdraw, & Redeem from ERC4626 DSA. * @dev Deposit, Mint, Withdraw, & Redeem from ERC4626 DSA.
*/ */
import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
import { IERC4626 } from "./interface.sol"; import { IERC4626 } from "./interface.sol";
import { TokenInterface } from "../../common/interfaces.sol"; import { TokenInterface } from "../../common/interfaces.sol";
import { DSMath } from "../../common/math.sol"; import { DSMath } from "../../common/math.sol";
import { Basic } from "../../common/basic.sol"; import { Basic } from "../../common/basic.sol";
import { Events } from "./events.sol"; import { Events } from "./events.sol";
abstract contract BasicConnector is Events, DSMath, Basic { abstract contract BasicConnector is Events, DSMath, Basic {
/** /**
* @dev Deposit underlying asset to ERC4626 Vault. * @dev Deposit underlying asset to ERC4626 Vault.
* @notice Mints vault shares by depositing exactly amount of underlying assets * @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 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 getId ID to retrieve amt.
* @param setId ID stores the amount of tokens deposited. * @param setId ID stores the amount of tokens deposited.
*/ */
function deposit(
address vaultToken, function deposit(
uint256 underlyingAmt, address token,
uint256 minSharesPerToken, uint256 underlyingAmt,
uint256 getId, uint256 minSharesPerToken,
uint256 setId uint256 getId,
) public returns (string memory _eventName, bytes memory _eventParam) { uint256 setId
uint256 _underlyingAmt = getUint(getId, underlyingAmt); ) public returns (string memory _eventName, bytes memory _eventParam) {
uint256 _underlyingAmt = getUint(getId, underlyingAmt);
IERC4626 vaultTokenContract = IERC4626(vaultToken); IERC4626 vaultTokenContract = IERC4626(token);
TokenInterface _underlyingTokenContract = TokenInterface(
vaultTokenContract.asset() address _underlyingToken = vaultTokenContract.asset();
); uint8 _vaultShareDecimal = vaultTokenContract.decimals();
TokenInterface underlyingTokenContract = TokenInterface(
_underlyingAmt = _underlyingAmt == uint256(-1) _underlyingToken
? _underlyingTokenContract.balanceOf(address(this)) );
: _underlyingAmt;
_underlyingAmt = _underlyingAmt == uint256(-1)
// Making sure that the underlying amount is always in 18 decimals. ? underlyingTokenContract.balanceOf(address(this))
uint256 _underlyingAmt18 = convertTo18( : _underlyingAmt;
_underlyingTokenContract.decimals(),
_underlyingAmt uint256 _minShares = convert18ToDec(
); _vaultShareDecimal,
wmul(minSharesPerToken, _underlyingAmt)
uint256 _minShares = convert18ToDec( );
vaultTokenContract.decimals(),
wmul(minSharesPerToken, _underlyingAmt18) // Returns final amount in the floor value of the two token decimals. uint256 _initialVaultBal = vaultTokenContract.balanceOf(address(this));
);
approve(underlyingTokenContract, token, _underlyingAmt);
uint256 _initialVaultBal = vaultTokenContract.balanceOf(address(this)); vaultTokenContract.deposit(_underlyingAmt, address(this));
approve(_underlyingTokenContract, vaultToken, _underlyingAmt); uint256 _finalVaultBal = vaultTokenContract.balanceOf(address(this));
vaultTokenContract.deposit(_underlyingAmt, address(this));
require(
uint256 _sharesReceieved = sub( _minShares <= sub(_finalVaultBal, _initialVaultBal),
vaultTokenContract.balanceOf(address(this)), "minShares-exceeds"
_initialVaultBal );
);
setUint(setId, _underlyingAmt);
require(_minShares <= _sharesReceieved, "Less shares received");
_eventName = "LogDeposit(address,uint256,uint256,uint256,uint256)";
setUint(setId, _sharesReceieved); _eventParam = abi.encode(
token,
_eventName = "LogDeposit(address,uint256,uint256,uint256,uint256,uint256)"; _underlyingAmt,
_eventParam = abi.encode( minSharesPerToken,
vaultToken, getId,
_underlyingAmt, setId
minSharesPerToken, );
_sharesReceieved, }
getId,
setId /**
); * @dev Mint underlying asset to ERC4626 Vault.
} * @notice Mints vault shares by minting exactly amount of underlying assets
* @param token ERC4626 Token address.
/** * @param shareAmt The amount of the share to mint. (For max: `uint256(-1)`)
* @dev Mint underlying asset to ERC4626 Vault. * @param maxTokenPerShares The max underyling token rate of mint
* @notice Mints vault shares by minting exactly amount of underlying assets * @param getId ID to retrieve amt.
* @param vaultToken ERC4626 Token address. * @param setId ID stores the amount of tokens minted.
* @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 getId ID to retrieve amt. function mint(
* @param setId ID stores the amount of tokens minted. address token,
*/ uint256 shareAmt,
function mint( uint256 maxTokenPerShares,
address vaultToken, uint256 getId,
uint256 shareAmt, uint256 setId
uint256 maxTokenPerShares, ) public returns (string memory _eventName, bytes memory _eventParam) {
uint256 getId, uint256 _shareAmt = getUint(getId, shareAmt);
uint256 setId IERC4626 vaultTokenContract = IERC4626(token);
) public returns (string memory _eventName, bytes memory _eventParam) {
uint256 _shareAmt = getUint(getId, shareAmt); address _underlyingToken = vaultTokenContract.asset();
uint8 _vaultShareDecimal = vaultTokenContract.decimals();
IERC4626 vaultTokenContract = IERC4626(vaultToken); TokenInterface underlyingTokenContract = TokenInterface(
TokenInterface underlyingTokenContract = TokenInterface( _underlyingToken
vaultTokenContract.asset() );
);
_shareAmt = _shareAmt == uint256(-1)
// In vault token decimals ? vaultTokenContract.balanceOf(address(this))
_shareAmt = _shareAmt == uint256(-1) : _shareAmt;
? vaultTokenContract.balanceOf(address(this))
: _shareAmt; maxTokenPerShares = convertTo18(
_vaultShareDecimal,
// In 18 decimals wmul(maxTokenPerShares, _shareAmt)
maxTokenPerShares = convertTo18( );
vaultTokenContract.decimals(),
wmul(maxTokenPerShares, _shareAmt) // Returns final amount in the vault token decimals. uint256 _approveUnderlyingTokenAmount = vaultTokenContract.previewMint(
); _shareAmt
);
// In token decimals
maxTokenPerShares = convert18ToDec( uint256 _initalUnderlyingBal = IERC20(_underlyingToken).balanceOf(
underlyingTokenContract.decimals(), address(this)
maxTokenPerShares );
);
approve(underlyingTokenContract, token, _approveUnderlyingTokenAmount);
// In token decimals
uint256 _underlyingTokenAmount = vaultTokenContract.previewMint( vaultTokenContract.mint(_shareAmt, address(this));
_shareAmt
); uint256 _finalUnderlyingBal = IERC20(_underlyingToken).balanceOf(
address(this)
// In token decimals );
uint256 _initalUnderlyingBal = underlyingTokenContract.balanceOf(
address(this) require(
); maxTokenPerShares >= sub(_initalUnderlyingBal, _finalUnderlyingBal),
"maxTokenPerShares-exceeds"
approve(underlyingTokenContract, vaultToken, _underlyingTokenAmount); );
vaultTokenContract.mint(_shareAmt, address(this)); setUint(setId, _shareAmt);
// In token decimals _eventName = "LogMint(address,uint256,uint256,uint256,uint256)";
uint256 _finalUnderlyingBal = underlyingTokenContract.balanceOf( _eventParam = abi.encode(
address(this) token,
); _shareAmt,
maxTokenPerShares,
require( getId,
maxTokenPerShares >= sub(_initalUnderlyingBal, _finalUnderlyingBal), setId
"maxTokenPerShares-exceeds" );
); }
setUint(setId, _shareAmt); /**
* @dev Withdraw underlying asset from ERC4626 Vault.
_eventName = "LogMint(address,uint256,uint256,uint256,uint256,uint256)"; * @notice Withdraw vault shares with exactly amount of underlying assets
_eventParam = abi.encode( * @param token ERC4626 Token address.
vaultToken, * @param underlyingAmt The amount of the token to withdraw. (For max: `uint256(-1)`)
_shareAmt, * @param maxSharesPerToken The max share rate of withdrawn amount.
maxTokenPerShares, * @param to The address of receiver.
_underlyingTokenAmount, * @param getId ID to retrieve amt.
getId, * @param setId ID stores the amount of tokens withdrawn.
setId */
);
} function withdraw(
address token,
/** uint256 underlyingAmt,
* @dev Withdraw underlying asset from ERC4626 Vault. uint256 maxSharesPerToken,
* @notice Withdraw vault shares with exactly amount of underlying assets address payable to,
* @param vaultToken ERC4626 Token address. uint256 getId,
* @param underlyingAmt The amount of the token to withdraw. (For max: `uint256(-1)`) uint256 setId
* @param maxSharesPerToken The max share rate of withdrawn amount. Always send in 18 decimals. ) public returns (string memory _eventName, bytes memory _eventParam) {
* @param to The address of receiver. uint256 _underlyingAmt = getUint(getId, underlyingAmt);
* @param getId ID to retrieve amt. IERC4626 vaultTokenContract = IERC4626(token);
* @param setId ID stores the amount of tokens withdrawn.
*/ address _underlyingToken = vaultTokenContract.asset();
function withdraw( uint8 _vaultShareDecimal = vaultTokenContract.decimals();
address vaultToken, TokenInterface underlyingTokenContract = TokenInterface(
uint256 underlyingAmt, _underlyingToken
uint256 maxSharesPerToken, );
address payable to,
uint256 getId, _underlyingAmt = _underlyingAmt == uint256(-1)
uint256 setId ? underlyingTokenContract.balanceOf(address(this))
) public returns (string memory _eventName, bytes memory _eventParam) { : _underlyingAmt;
uint256 _underlyingAmt = getUint(getId, underlyingAmt);
uint256 _maxShares = convert18ToDec(
IERC4626 vaultTokenContract = IERC4626(vaultToken); _vaultShareDecimal,
TokenInterface underlyingTokenContract = TokenInterface( wmul(maxSharesPerToken, _underlyingAmt)
vaultTokenContract.asset() );
);
uint256 _initialVaultBal = vaultTokenContract.balanceOf(to);
// In token decimals
_underlyingAmt = _underlyingAmt == uint256(-1) vaultTokenContract.withdraw(_underlyingAmt, to, address(this));
? underlyingTokenContract.balanceOf(address(this))
: _underlyingAmt; uint256 _finalVaultBal = vaultTokenContract.balanceOf(to);
// In 18 decimals require(
_underlyingAmt = convertTo18( _maxShares >= sub(_finalVaultBal, _initialVaultBal),
underlyingTokenContract.decimals(), "maxShares-exceeds"
_underlyingAmt );
);
setUint(setId, _underlyingAmt);
// In vault token decimals
uint256 _maxShares = convert18ToDec( _eventName = "LogWithdraw(address,uint256,uint256,address,uint256,uint256)";
vaultTokenContract.decimals(), _eventParam = abi.encode(
wmul(maxSharesPerToken, _underlyingAmt) // In 18 decimals token,
); _underlyingAmt,
maxSharesPerToken,
// In vault token decimals to,
uint256 _initialVaultBal = vaultTokenContract.balanceOf(to); getId,
setId
vaultTokenContract.withdraw(_underlyingAmt, to, address(this)); );
}
// In vault token decimals
uint256 _finalVaultBal = vaultTokenContract.balanceOf(to); /**
* @dev Redeem underlying asset from ERC4626 Vault.
// In vault token decimals * @notice Redeem vault shares with exactly amount of underlying assets
uint256 _sharesBurned = sub(_initialVaultBal, _finalVaultBal); * @param token ERC4626 Token address.
* @param shareAmt The amount of the token to redeem. (For max: `uint256(-1)`)
require(_maxShares >= _sharesBurned, "maxShares-exceeds"); * @param minTokenPerShares The min underlying token rate of withdraw.
* @param to The address of receiver.
setUint(setId, _underlyingAmt); * @param getId ID to retrieve amt.
* @param setId ID stores the amount of tokens redeem.
_eventName = "LogWithdraw(address,uint256,uint256,uint256,address,uint256,uint256)"; */
_eventParam = abi.encode(
vaultToken, function redeem(
_underlyingAmt, address token,
maxSharesPerToken, uint256 shareAmt,
_sharesBurned, uint256 minTokenPerShares,
to, address payable to,
getId, uint256 getId,
setId uint256 setId
); ) public returns (string memory _eventName, bytes memory _eventParam) {
} uint256 _shareAmt = getUint(getId, shareAmt);
IERC4626 vaultTokenContract = IERC4626(token);
/**
* @dev Redeem underlying asset from ERC4626 Vault. address _underlyingToken = vaultTokenContract.asset();
* @notice Redeem vault shares with exactly amount of underlying assets uint8 _vaultShareDecimal = vaultTokenContract.decimals();
* @param vaultToken ERC4626 Token address. TokenInterface underlyingTokenContract = TokenInterface(
* @param shareAmt The amount of the token to redeem. (For max: `uint256(-1)`) _underlyingToken
* @param minTokenPerShares The min underlying token rate of withdraw. Always in 18 decimals. );
* @param to The address of receiver.
* @param getId ID to retrieve amt. _shareAmt = _shareAmt == uint256(-1)
* @param setId ID stores the amount of tokens redeem. ? vaultTokenContract.balanceOf(address(this))
*/ : _shareAmt;
function redeem( uint256 _minUnderlyingAmt = convert18ToDec(
address vaultToken, _vaultShareDecimal,
uint256 shareAmt, wmul(minTokenPerShares, _shareAmt)
uint256 minTokenPerShares, );
address payable to,
uint256 getId, uint256 _initalUnderlyingBal = IERC20(_underlyingToken).balanceOf(
uint256 setId to
) public returns (string memory _eventName, bytes memory _eventParam) { );
uint256 _shareAmt = getUint(getId, shareAmt);
vaultTokenContract.redeem(_shareAmt, to, address(this));
IERC4626 vaultTokenContract = IERC4626(vaultToken);
TokenInterface underlyingTokenContract = TokenInterface( uint256 _finalUnderlyingBal = IERC20(_underlyingToken).balanceOf(
vaultTokenContract.asset() to
); );
// In vault token decimals require(
_shareAmt = _shareAmt == uint256(-1) _minUnderlyingAmt <= sub(_finalUnderlyingBal, _initalUnderlyingBal),
? vaultTokenContract.balanceOf(address(this)) "_minUnderlyingAmt-exceeds"
: _shareAmt; );
setUint(setId, _shareAmt);
// In 18 decimals
_shareAmt = convertTo18(vaultTokenContract.decimals(), _shareAmt); _eventName = "LogRedeem(address,uint256,uint256,address,uint256,uint256)";
_eventParam = abi.encode(
// In token decimals token,
uint256 _minUnderlyingAmt = convert18ToDec( _shareAmt,
underlyingTokenContract.decimals(), minTokenPerShares,
wmul(minTokenPerShares, _shareAmt) // In 18 decimals to,
); getId,
setId
// In token decimals );
uint256 _initalUnderlyingBal = underlyingTokenContract.balanceOf(to); }
}
vaultTokenContract.redeem(_shareAmt, to, address(this));
contract ConnectV2BasicERC4626 is BasicConnector {
// In token decimals string public constant name = "BASIC-ERC4626-v1.0";
uint256 _finalUnderlyingBal = underlyingTokenContract.balanceOf(to); }
// In token decimals
uint256 _underlyingAmtReceieved = sub(
_finalUnderlyingBal,
_initalUnderlyingBal
);
require(
_minUnderlyingAmt <= _underlyingAmtReceieved,
"_minUnderlyingAmt-exceeds"
);
setUint(setId, _shareAmt);
_eventName = "LogRedeem(address,uint256,uint256,uint256,address,uint256,uint256)";
_eventParam = abi.encode(
vaultToken,
_shareAmt,
minTokenPerShares,
_underlyingAmtReceieved,
to,
getId,
setId
);
}
}
contract ConnectV2BasicERC4626 is BasicConnector {
string public constant name = "BASIC-ERC4626-v1.0";
}