Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update ERC4626 #329

Merged
merged 2 commits into from
Feb 17, 2024
Merged

Update ERC4626 #329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4dcd91b
feat: update erc4626 mainnet
shriyatyagii Feb 11, 2024
9175ffb
feat: update ERC4626 Polygon
shriyatyagii Feb 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions contracts/mainnet/connectors/basic-ERC4626/events.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ contract Events {
event LogDeposit(
address indexed token,
uint256 underlyingAmt,
uint256 minSharesPerToken,
uint256 sharesReceieved,
uint256 getId,
uint256 setId
Expand All @@ -14,16 +13,14 @@ contract Events {
event LogMint(
address indexed token,
uint256 shareAmt,
uint256 maxTokenPerShares,
uint256 tokensDeducted,
uint256 tokensDeposited,
uint256 getId,
uint256 setId
);

event LogWithdraw(
address indexed token,
uint256 underlyingAmt,
uint256 maxSharesPerToken,
uint256 sharedBurned,
address indexed to,
uint256 getId,
Expand All @@ -33,7 +30,6 @@ contract Events {
event LogRedeem(
address indexed token,
uint256 shareAmt,
uint256 minTokenPerShares,
uint256 underlyingAmtReceieved,
address to,
uint256 getId,
Expand Down
97 changes: 19 additions & 78 deletions contracts/mainnet/connectors/basic-ERC4626/main.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
pragma solidity ^0.7.0;

/**
* @title Basic D.
* @title Basic D V2.
* @dev Deposit, Mint, Withdraw, & Redeem from ERC4626 DSA.
*/

Expand All @@ -14,19 +14,18 @@ import { Basic } from "../../common/basic.sol";
import { Events } from "./events.sol";

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 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 getId ID to retrieve amt.
* @param setId ID stores the amount of tokens deposited.
*/
*/
function deposit(
address vaultToken,
uint256 underlyingAmt,
uint256 minSharesPerToken,
uint256 getId,
uint256 setId
) public returns (string memory _eventName, bytes memory _eventParam) {
Expand All @@ -41,31 +40,18 @@ abstract contract BasicConnector is Events, DSMath, Basic {
? _underlyingTokenContract.balanceOf(address(this))
: _underlyingAmt;

// Returns final amount in token decimals.
uint256 _minShares = wmul(minSharesPerToken, _underlyingAmt);

// Initial share balance
uint256 _initialVaultBal = vaultTokenContract.balanceOf(address(this));

approve(_underlyingTokenContract, vaultToken, _underlyingAmt);

// Deposit tokens for shares
vaultTokenContract.deposit(_underlyingAmt, address(this));

uint256 _sharesReceieved = sub(
vaultTokenContract.balanceOf(address(this)),
_initialVaultBal
);

require(_minShares <= _sharesReceieved, "Less shares received");
uint256 _sharesReceieved =
vaultTokenContract.deposit(_underlyingAmt, address(this));

setUint(setId, _sharesReceieved);

_eventName = "LogDeposit(address,uint256,uint256,uint256,uint256,uint256)";
_eventName = "LogDeposit(address,uint256,uint256,uint256,uint256)";
_eventParam = abi.encode(
vaultToken,
_underlyingAmt,
minSharesPerToken,
_sharesReceieved,
getId,
setId
Expand All @@ -77,14 +63,12 @@ abstract contract BasicConnector is Events, DSMath, Basic {
* @notice Mints vault shares by minting exactly amount of underlying assets
* @param vaultToken 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 getId ID to retrieve amt.
* @param setId ID stores the amount of tokens minted.
*/
function mint(
address vaultToken,
uint256 shareAmt,
uint256 maxTokenPerShares,
uint256 getId,
uint256 setId
) public returns (string memory _eventName, bytes memory _eventParam) {
Expand All @@ -95,41 +79,23 @@ abstract contract BasicConnector is Events, DSMath, Basic {
vaultTokenContract.asset()
);

_shareAmt = _shareAmt == uint256(-1)
? vaultTokenContract.balanceOf(address(this))
: _shareAmt;

// Returns final amount in token decimals.
uint256 _maxTokens = wmul(maxTokenPerShares, _shareAmt);

uint256 _underlyingTokenAmount = vaultTokenContract.previewMint(
_shareAmt
);

uint256 _initalUnderlyingBal = underlyingTokenContract.balanceOf(
address(this)
);

approve(underlyingTokenContract, vaultToken, _underlyingTokenAmount);

// Mint shares for tokens
vaultTokenContract.mint(_shareAmt, address(this));
uint256 _tokensDeposited =
vaultTokenContract.mint(_shareAmt, address(this));

uint256 _tokensDeducted = sub(
_initalUnderlyingBal,
underlyingTokenContract.balanceOf(address(this))
);

require(_maxTokens >= _tokensDeducted, "maxTokenPerShares-exceeds");

setUint(setId, _shareAmt);
setUint(setId, _tokensDeposited);

_eventName = "LogMint(address,uint256,uint256,uint256,uint256,uint256)";
_eventName = "LogMint(address,uint256,uint256,uint256,uint256)";
_eventParam = abi.encode(
vaultToken,
_shareAmt,
maxTokenPerShares,
_tokensDeducted,
_tokensDeposited,
getId,
setId
);
Expand All @@ -140,15 +106,13 @@ abstract contract BasicConnector is Events, DSMath, Basic {
* @notice Withdraw vault shares with exactly amount of underlying assets
* @param vaultToken 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 to The address of receiver.
* @param getId ID to retrieve amt.
* @param setId ID stores the amount of tokens withdrawn.
*/
function withdraw(
address vaultToken,
uint256 underlyingAmt,
uint256 maxSharesPerToken,
address payable to,
uint256 getId,
uint256 setId
Expand All @@ -164,25 +128,16 @@ abstract contract BasicConnector is Events, DSMath, Basic {
? underlyingTokenContract.balanceOf(address(this))
: _underlyingAmt;

// Returns final amount in token decimals.
uint256 _maxShares = wmul(maxSharesPerToken, _underlyingAmt);

uint256 _initialVaultBal = vaultTokenContract.balanceOf(to);

// Withdraw tokens for shares
vaultTokenContract.withdraw(_underlyingAmt, to, address(this));

uint256 _sharesBurned = sub(_initialVaultBal, vaultTokenContract.balanceOf(to));

require(_maxShares >= _sharesBurned, "maxShares-exceeds");
uint256 _sharesBurned =
vaultTokenContract.withdraw(_underlyingAmt, to, address(this));

setUint(setId, _underlyingAmt);

_eventName = "LogWithdraw(address,uint256,uint256,uint256,address,uint256,uint256)";
_eventName = "LogWithdraw(address,uint256,uint256,address,uint256,uint256)";
_eventParam = abi.encode(
vaultToken,
_underlyingAmt,
maxSharesPerToken,
_sharesBurned,
to,
getId,
Expand All @@ -195,7 +150,6 @@ abstract contract BasicConnector is Events, DSMath, Basic {
* @notice Redeem vault shares with exactly amount of underlying assets
* @param vaultToken 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 to The address of receiver.
* @param getId ID to retrieve amt.
* @param setId ID stores the amount of tokens redeem.
Expand All @@ -204,7 +158,6 @@ abstract contract BasicConnector is Events, DSMath, Basic {
function redeem(
address vaultToken,
uint256 shareAmt,
uint256 minTokenPerShares,
address payable to,
uint256 getId,
uint256 setId
Expand All @@ -220,28 +173,16 @@ abstract contract BasicConnector is Events, DSMath, Basic {
? vaultTokenContract.balanceOf(address(this))
: _shareAmt;

// Returns final amount in token decimals.
uint256 _minUnderlyingAmt = wmul(minTokenPerShares, _shareAmt);

uint256 _initalUnderlyingBal = underlyingTokenContract.balanceOf(to);

// Redeem tokens for shares
vaultTokenContract.redeem(_shareAmt, to, address(this));

uint256 _underlyingAmtReceieved = sub(
underlyingTokenContract.balanceOf(to),
_initalUnderlyingBal
);

require(_minUnderlyingAmt <= _underlyingAmtReceieved, "_minUnderlyingAmt-exceeds");
uint256 _underlyingAmtReceieved =
vaultTokenContract.redeem(_shareAmt, to, address(this));

setUint(setId, _shareAmt);

_eventName = "LogRedeem(address,uint256,uint256,uint256,address,uint256,uint256)";
_eventName = "LogRedeem(address,uint256,uint256,address,uint256,uint256)";
_eventParam = abi.encode(
vaultToken,
_shareAmt,
minTokenPerShares,
_underlyingAmtReceieved,
to,
getId,
Expand All @@ -250,6 +191,6 @@ abstract contract BasicConnector is Events, DSMath, Basic {
}
}

contract ConnectV2BasicERC4626 is BasicConnector {
string public constant name = "BASIC-ERC4626-v1.0";
contract ConnectV2BasicERC4626V2 is BasicConnector {
string public constant name = "BASIC-ERC4626-v2.0";
}
6 changes: 1 addition & 5 deletions contracts/polygon/connectors/basic-ERC4626/events.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ contract Events {
event LogDeposit(
address indexed token,
uint256 underlyingAmt,
uint256 minSharesPerToken,
uint256 sharesReceieved,
uint256 getId,
uint256 setId
Expand All @@ -14,16 +13,14 @@ contract Events {
event LogMint(
address indexed token,
uint256 shareAmt,
uint256 maxTokenPerShares,
uint256 tokensDeducted,
uint256 tokensDeposited,
uint256 getId,
uint256 setId
);

event LogWithdraw(
address indexed token,
uint256 underlyingAmt,
uint256 maxSharesPerToken,
uint256 sharedBurned,
address indexed to,
uint256 getId,
Expand All @@ -33,7 +30,6 @@ contract Events {
event LogRedeem(
address indexed token,
uint256 shareAmt,
uint256 minTokenPerShares,
uint256 underlyingAmtReceieved,
address to,
uint256 getId,
Expand Down
Loading
Loading