mirror of
https://github.com/Instadapp/dsa-connectors.git
synced 2024-07-29 22:37:00 +00:00
Addressing PR comments
This commit is contained in:
Tianjie Wei
parent
7534ddd4ad
commit
74a7effdb4
|
|
@ -1,3 +1,4 @@
|
|||
// SPDX-License-Identifier: MIT
|
||||
pragma solidity ^0.7.6;
|
||||
|
||||
contract Events {
|
||||
|
|
|
|||
|
|
@ -1,286 +1,276 @@
|
|||
// SPDX-License-Identifier: MIT
|
||||
pragma solidity ^0.7.6;
|
||||
pragma abicoder v2;
|
||||
|
||||
import {Token, NotionalInterface, BalanceAction, BalanceActionWithTrades, DepositActionType} from "./interface.sol";
|
||||
import {Basic} from "../../common/basic.sol";
|
||||
import {DSMath} from "../../common/math.sol";
|
||||
import {TokenInterface} from "../../common/interfaces.sol";
|
||||
import { Token, NotionalInterface, BalanceAction, BalanceActionWithTrades, DepositActionType } from "./interface.sol";
|
||||
import { Basic } from "../../common/basic.sol";
|
||||
import { DSMath } from "../../common/math.sol";
|
||||
import { TokenInterface } from "../../common/interfaces.sol";
|
||||
|
||||
abstract contract Helpers is DSMath, Basic {
|
||||
uint8 internal constant LEND_TRADE = 0;
|
||||
uint8 internal constant BORROW_TRADE = 1;
|
||||
uint256 internal constant INTERNAL_TOKEN_PRECISION = 1e8;
|
||||
uint256 internal constant ETH_CURRENCY_ID = 1;
|
||||
uint256 internal constant MAX_DEPOSIT = uint256(-1);
|
||||
uint8 internal constant LEND_TRADE = 0;
|
||||
uint8 internal constant BORROW_TRADE = 1;
|
||||
uint256 internal constant INTERNAL_TOKEN_PRECISION = 1e8;
|
||||
uint256 internal constant ETH_CURRENCY_ID = 1;
|
||||
uint256 internal constant MAX_DEPOSIT = type(uint256).max;
|
||||
|
||||
/// @dev Contract address is different on Kovan: 0x0EAE7BAdEF8f95De91fDDb74a89A786cF891Eb0e
|
||||
NotionalInterface internal constant notional =
|
||||
NotionalInterface(0x1344A36A1B56144C3Bc62E7757377D288fDE0369);
|
||||
/// @dev Contract address is different on Kovan: 0x0EAE7BAdEF8f95De91fDDb74a89A786cF891Eb0e
|
||||
NotionalInterface internal constant notional =
|
||||
NotionalInterface(0x1344A36A1B56144C3Bc62E7757377D288fDE0369);
|
||||
|
||||
/// @notice Returns the address of the underlying token for a given currency id,
|
||||
function getUnderlyingToken(uint16 currencyId)
|
||||
internal
|
||||
view
|
||||
returns (address)
|
||||
{
|
||||
// prettier-ignore
|
||||
(/* assetToken */, Token memory underlyingToken) = notional.getCurrency(currencyId);
|
||||
return underlyingToken.tokenAddress;
|
||||
}
|
||||
/// @notice Returns the address of the underlying token for a given currency id,
|
||||
function getAssetOrUnderlyingToken(uint16 currencyId, bool underlying)
|
||||
internal
|
||||
view
|
||||
returns (address)
|
||||
{
|
||||
// prettier-ignore
|
||||
(Token memory assetToken, Token memory underlyingToken) = notional.getCurrency(currencyId);
|
||||
return
|
||||
underlying ? underlyingToken.tokenAddress : assetToken.tokenAddress;
|
||||
}
|
||||
|
||||
/// @notice Returns the address of the asset token for a given currency id
|
||||
function getAssetToken(uint16 currencyId) internal view returns (address) {
|
||||
// prettier-ignore
|
||||
(Token memory assetToken, /* underlyingToken */) = notional.getCurrency(currencyId);
|
||||
return assetToken.tokenAddress;
|
||||
}
|
||||
|
||||
function getCashBalance(uint16 currencyId)
|
||||
internal
|
||||
view
|
||||
returns (int256 cashBalance)
|
||||
{
|
||||
// prettier-ignore
|
||||
(
|
||||
cashBalance,
|
||||
/* int256 nTokenBalance */,
|
||||
/* int256 lastClaimTime */
|
||||
) = notional.getAccountBalance(currencyId, address(this));
|
||||
}
|
||||
|
||||
function getNTokenBalance(uint16 currencyId)
|
||||
internal
|
||||
view
|
||||
returns (uint256)
|
||||
{
|
||||
// prettier-ignore
|
||||
(
|
||||
/* int256 cashBalance */,
|
||||
function getCashOrNTokenBalance(uint16 currencyId, bool nToken)
|
||||
internal
|
||||
view
|
||||
returns (uint256)
|
||||
{
|
||||
// prettier-ignore
|
||||
(
|
||||
int256 cashBalance,
|
||||
int256 nTokenBalance,
|
||||
/* int256 lastClaimTime */
|
||||
) = notional.getAccountBalance(currencyId, address(this));
|
||||
return toUint(nTokenBalance);
|
||||
}
|
||||
return toUint(nToken ? nTokenBalance : cashBalance);
|
||||
}
|
||||
|
||||
function getNTokenRedeemAmount(
|
||||
uint16 currencyId,
|
||||
uint96 _tokensToRedeem,
|
||||
uint256 getId
|
||||
) internal returns (uint96 tokensToRedeem) {
|
||||
tokensToRedeem = uint96(getUint(getId, _tokensToRedeem));
|
||||
if (tokensToRedeem == uint96(-1)) {
|
||||
tokensToRedeem = uint96(getNTokenBalance(currencyId));
|
||||
}
|
||||
}
|
||||
function getNTokenRedeemAmount(
|
||||
uint16 currencyId,
|
||||
uint96 _tokensToRedeem,
|
||||
uint256 getId
|
||||
) internal returns (uint96 tokensToRedeem) {
|
||||
tokensToRedeem = toUint96(getUint(getId, _tokensToRedeem));
|
||||
if (tokensToRedeem == type(uint96).max) {
|
||||
tokensToRedeem = toUint96(getCashOrNTokenBalance(currencyId, true));
|
||||
}
|
||||
}
|
||||
|
||||
function getMsgValue(
|
||||
uint16 currencyId,
|
||||
bool useUnderlying,
|
||||
uint256 depositAmount
|
||||
) internal pure returns (uint256 msgValue) {
|
||||
msgValue = (currencyId == ETH_CURRENCY_ID && useUnderlying)
|
||||
? depositAmount
|
||||
: 0;
|
||||
}
|
||||
function toUint96(uint256 value) internal pure returns (uint96) {
|
||||
require(value <= type(uint96).max, "uint96 value overflow");
|
||||
return uint96(value);
|
||||
}
|
||||
|
||||
function convertToInternal(uint16 currencyId, uint256 amount)
|
||||
internal
|
||||
view
|
||||
returns (uint256)
|
||||
{
|
||||
// If token decimals is greater than INTERNAL_TOKEN_PRECISION then this will truncate
|
||||
// down to the internal precision. Resulting dust will accumulate to the protocol.
|
||||
// If token decimals is less than INTERNAL_TOKEN_PRECISION then this will add zeros to the
|
||||
// end of amount and will not result in dust.
|
||||
// prettier-ignore
|
||||
(Token memory assetToken, /* underlyingToken */) = notional.getCurrency(currencyId);
|
||||
uint256 decimals = toUint(assetToken.decimals);
|
||||
if (decimals == INTERNAL_TOKEN_PRECISION) return amount;
|
||||
return div(mul(amount, INTERNAL_TOKEN_PRECISION), decimals);
|
||||
}
|
||||
function toUint88(uint256 value) internal pure returns (uint88) {
|
||||
require(value <= type(uint88).max, "uint88 value overflow");
|
||||
return uint88(value);
|
||||
}
|
||||
|
||||
function encodeLendTrade(
|
||||
uint8 marketIndex,
|
||||
uint88 fCashAmount,
|
||||
uint32 minLendRate
|
||||
) internal pure returns (bytes32) {
|
||||
return
|
||||
(bytes32(uint256(LEND_TRADE)) << 248) |
|
||||
(bytes32(uint256(marketIndex)) << 240) |
|
||||
(bytes32(uint256(fCashAmount)) << 152) |
|
||||
(bytes32(uint256(minLendRate)) << 120);
|
||||
}
|
||||
function getMsgValue(
|
||||
uint16 currencyId,
|
||||
bool useUnderlying,
|
||||
uint256 depositAmount
|
||||
) internal pure returns (uint256 msgValue) {
|
||||
msgValue = (currencyId == ETH_CURRENCY_ID && useUnderlying)
|
||||
? depositAmount
|
||||
: 0;
|
||||
}
|
||||
|
||||
function encodeBorrowTrade(
|
||||
uint8 marketIndex,
|
||||
uint88 fCashAmount,
|
||||
uint32 maxBorrowRate
|
||||
) internal pure returns (bytes32) {
|
||||
return
|
||||
(bytes32(uint256(BORROW_TRADE)) << 248) |
|
||||
(bytes32(uint256(marketIndex)) << 240) |
|
||||
(bytes32(uint256(fCashAmount)) << 152) |
|
||||
(bytes32(uint256(maxBorrowRate)) << 120);
|
||||
}
|
||||
function convertToInternal(uint16 currencyId, uint256 amount)
|
||||
internal
|
||||
view
|
||||
returns (uint256)
|
||||
{
|
||||
// If token decimals is greater than INTERNAL_TOKEN_PRECISION then this will truncate
|
||||
// down to the internal precision. Resulting dust will accumulate to the protocol.
|
||||
// If token decimals is less than INTERNAL_TOKEN_PRECISION then this will add zeros to the
|
||||
// end of amount and will not result in dust.
|
||||
// prettier-ignore
|
||||
(Token memory assetToken, /* underlyingToken */) = notional.getCurrency(currencyId);
|
||||
uint256 decimals = toUint(assetToken.decimals);
|
||||
if (decimals == INTERNAL_TOKEN_PRECISION) return amount;
|
||||
return div(mul(amount, INTERNAL_TOKEN_PRECISION), decimals);
|
||||
}
|
||||
|
||||
/// @dev Uses getId to set approval for the given token up to the specified deposit
|
||||
/// amount only
|
||||
function getDepositAmountAndSetApproval(
|
||||
uint256 getId,
|
||||
uint16 currencyId,
|
||||
bool useUnderlying,
|
||||
uint256 depositAmount
|
||||
) internal returns (uint256) {
|
||||
depositAmount = getUint(getId, depositAmount);
|
||||
if (currencyId == ETH_CURRENCY_ID && useUnderlying) {
|
||||
// No approval required for ETH so we can return the deposit amount
|
||||
return
|
||||
depositAmount == MAX_DEPOSIT
|
||||
? address(this).balance
|
||||
: depositAmount;
|
||||
}
|
||||
function encodeLendTrade(
|
||||
uint8 marketIndex,
|
||||
uint88 fCashAmount,
|
||||
uint32 minLendRate
|
||||
) internal pure returns (bytes32) {
|
||||
return
|
||||
(bytes32(uint256(LEND_TRADE)) << 248) |
|
||||
(bytes32(uint256(marketIndex)) << 240) |
|
||||
(bytes32(uint256(fCashAmount)) << 152) |
|
||||
(bytes32(uint256(minLendRate)) << 120);
|
||||
}
|
||||
|
||||
address tokenAddress = useUnderlying
|
||||
? getUnderlyingToken(currencyId)
|
||||
: getAssetToken(currencyId);
|
||||
function encodeBorrowTrade(
|
||||
uint8 marketIndex,
|
||||
uint88 fCashAmount,
|
||||
uint32 maxBorrowRate
|
||||
) internal pure returns (bytes32) {
|
||||
return
|
||||
(bytes32(uint256(BORROW_TRADE)) << 248) |
|
||||
(bytes32(uint256(marketIndex)) << 240) |
|
||||
(bytes32(uint256(fCashAmount)) << 152) |
|
||||
(bytes32(uint256(maxBorrowRate)) << 120);
|
||||
}
|
||||
|
||||
if (depositAmount == MAX_DEPOSIT) {
|
||||
depositAmount = TokenInterface(tokenAddress).balanceOf(
|
||||
address(this)
|
||||
);
|
||||
}
|
||||
approve(TokenInterface(tokenAddress), address(notional), depositAmount);
|
||||
return depositAmount;
|
||||
}
|
||||
/// @dev Uses getId to set approval for the given token up to the specified deposit
|
||||
/// amount only
|
||||
function getDepositAmountAndSetApproval(
|
||||
uint256 getId,
|
||||
uint16 currencyId,
|
||||
bool useUnderlying,
|
||||
uint256 depositAmount
|
||||
) internal returns (uint256) {
|
||||
depositAmount = getUint(getId, depositAmount);
|
||||
if (currencyId == ETH_CURRENCY_ID && useUnderlying) {
|
||||
// No approval required for ETH so we can return the deposit amount
|
||||
return
|
||||
depositAmount == MAX_DEPOSIT
|
||||
? address(this).balance
|
||||
: depositAmount;
|
||||
}
|
||||
|
||||
function getBalance(address addr) internal view returns (uint256) {
|
||||
if (addr == ethAddr) {
|
||||
return address(this).balance;
|
||||
}
|
||||
address tokenAddress = getAssetOrUnderlyingToken(
|
||||
currencyId,
|
||||
useUnderlying
|
||||
);
|
||||
|
||||
return TokenInterface(addr).balanceOf(address(this));
|
||||
}
|
||||
if (depositAmount == MAX_DEPOSIT) {
|
||||
depositAmount = TokenInterface(tokenAddress).balanceOf(
|
||||
address(this)
|
||||
);
|
||||
}
|
||||
approve(TokenInterface(tokenAddress), address(notional), depositAmount);
|
||||
return depositAmount;
|
||||
}
|
||||
|
||||
function getAddress(uint16 currencyId, bool useUnderlying)
|
||||
internal
|
||||
view
|
||||
returns (address)
|
||||
{
|
||||
if (currencyId == ETH_CURRENCY_ID && useUnderlying) {
|
||||
return ethAddr;
|
||||
}
|
||||
function getBalance(address addr) internal view returns (uint256) {
|
||||
if (addr == ethAddr) {
|
||||
return address(this).balance;
|
||||
}
|
||||
|
||||
return
|
||||
useUnderlying
|
||||
? getUnderlyingToken(currencyId)
|
||||
: getAssetToken(currencyId);
|
||||
}
|
||||
return TokenInterface(addr).balanceOf(address(this));
|
||||
}
|
||||
|
||||
/// @dev Executes a trade action and sets the balance change to setId
|
||||
function executeTradeActionWithBalanceChange(
|
||||
BalanceActionWithTrades[] memory action,
|
||||
uint256 msgValue,
|
||||
uint16 currencyId,
|
||||
bool useUnderlying,
|
||||
uint256 setId
|
||||
) internal {
|
||||
address tokenAddress;
|
||||
uint256 balanceBefore;
|
||||
if (setId != 0) {
|
||||
tokenAddress = getAddress(currencyId, useUnderlying);
|
||||
balanceBefore = getBalance(tokenAddress);
|
||||
}
|
||||
function getAddress(uint16 currencyId, bool useUnderlying)
|
||||
internal
|
||||
view
|
||||
returns (address)
|
||||
{
|
||||
if (currencyId == ETH_CURRENCY_ID && useUnderlying) {
|
||||
return ethAddr;
|
||||
}
|
||||
|
||||
notional.batchBalanceAndTradeAction{value: msgValue}(
|
||||
address(this),
|
||||
action
|
||||
);
|
||||
return getAssetOrUnderlyingToken(currencyId, useUnderlying);
|
||||
}
|
||||
|
||||
if (setId != 0) {
|
||||
uint256 balanceAfter = getBalance(tokenAddress);
|
||||
setUint(setId, sub(balanceAfter, balanceBefore));
|
||||
}
|
||||
}
|
||||
/// @dev Executes a trade action and sets the balance change to setId
|
||||
function executeTradeActionWithBalanceChange(
|
||||
BalanceActionWithTrades[] memory action,
|
||||
uint256 msgValue,
|
||||
uint16 currencyId,
|
||||
bool useUnderlying,
|
||||
uint256 setId
|
||||
) internal {
|
||||
address tokenAddress;
|
||||
uint256 balanceBefore;
|
||||
if (setId != 0) {
|
||||
tokenAddress = getAddress(currencyId, useUnderlying);
|
||||
balanceBefore = getBalance(tokenAddress);
|
||||
}
|
||||
|
||||
/// @dev Executes a balance action and sets the balance change to setId
|
||||
function executeActionWithBalanceChange(
|
||||
BalanceAction[] memory action,
|
||||
uint256 msgValue,
|
||||
uint16 currencyId,
|
||||
bool useUnderlying,
|
||||
uint256 setId
|
||||
) internal {
|
||||
address tokenAddress;
|
||||
uint256 balanceBefore;
|
||||
if (setId != 0) {
|
||||
tokenAddress = getAddress(currencyId, useUnderlying);
|
||||
balanceBefore = getBalance(tokenAddress);
|
||||
}
|
||||
notional.batchBalanceAndTradeAction{ value: msgValue }(
|
||||
address(this),
|
||||
action
|
||||
);
|
||||
|
||||
notional.batchBalanceAction{value: msgValue}(address(this), action);
|
||||
if (setId != 0) {
|
||||
uint256 balanceAfter = getBalance(tokenAddress);
|
||||
setUint(setId, sub(balanceAfter, balanceBefore));
|
||||
}
|
||||
}
|
||||
|
||||
if (setId != 0) {
|
||||
uint256 balanceAfter = getBalance(tokenAddress);
|
||||
setUint(setId, sub(balanceAfter, balanceBefore));
|
||||
}
|
||||
}
|
||||
/// @dev Executes a balance action and sets the balance change to setId
|
||||
function executeActionWithBalanceChange(
|
||||
BalanceAction[] memory action,
|
||||
uint256 msgValue,
|
||||
uint16 currencyId,
|
||||
bool useUnderlying,
|
||||
uint256 setId
|
||||
) internal {
|
||||
address tokenAddress;
|
||||
uint256 balanceBefore;
|
||||
if (setId != 0) {
|
||||
tokenAddress = getAddress(currencyId, useUnderlying);
|
||||
balanceBefore = getBalance(tokenAddress);
|
||||
}
|
||||
|
||||
function getDepositCollateralBorrowAndWithdrawActions(
|
||||
uint16 depositCurrencyId,
|
||||
DepositActionType depositAction,
|
||||
uint256 depositAmount,
|
||||
uint16 borrowCurrencyId,
|
||||
uint8 marketIndex,
|
||||
uint88 fCashAmount,
|
||||
uint32 maxBorrowRate,
|
||||
bool redeemToUnderlying
|
||||
) internal returns (BalanceActionWithTrades[] memory action) {
|
||||
BalanceActionWithTrades[] memory actions;
|
||||
bytes32[] memory trades = new bytes32[](1);
|
||||
trades[0] = encodeBorrowTrade(marketIndex, fCashAmount, maxBorrowRate);
|
||||
notional.batchBalanceAction{ value: msgValue }(address(this), action);
|
||||
|
||||
if (depositCurrencyId == borrowCurrencyId) {
|
||||
// In this case the account is likely borrowing against newly minted nTokens
|
||||
// in the same currency. Technically the other deposit actions may work but
|
||||
// there's no good reason to borrow against cToken collateral
|
||||
actions = new BalanceActionWithTrades[](1);
|
||||
actions[0].actionType = depositAction;
|
||||
actions[0].currencyId = depositCurrencyId;
|
||||
actions[0].depositActionAmount = depositAmount;
|
||||
// Withdraw borrowed amount to wallet
|
||||
actions[0].withdrawEntireCashBalance = true;
|
||||
actions[0].redeemToUnderlying = redeemToUnderlying;
|
||||
actions[0].trades = trades;
|
||||
if (setId != 0) {
|
||||
uint256 balanceAfter = getBalance(tokenAddress);
|
||||
setUint(setId, sub(balanceAfter, balanceBefore));
|
||||
}
|
||||
}
|
||||
|
||||
return actions;
|
||||
}
|
||||
function getDepositCollateralBorrowAndWithdrawActions(
|
||||
uint16 depositCurrencyId,
|
||||
DepositActionType depositAction,
|
||||
uint256 depositAmount,
|
||||
uint16 borrowCurrencyId,
|
||||
uint8 marketIndex,
|
||||
uint88 fCashAmount,
|
||||
uint32 maxBorrowRate,
|
||||
bool redeemToUnderlying
|
||||
) internal returns (BalanceActionWithTrades[] memory action) {
|
||||
BalanceActionWithTrades[] memory actions;
|
||||
bytes32[] memory trades = new bytes32[](1);
|
||||
trades[0] = encodeBorrowTrade(marketIndex, fCashAmount, maxBorrowRate);
|
||||
|
||||
// This is the more common case that the account is borrowing against
|
||||
// collateral in a different currency
|
||||
actions = new BalanceActionWithTrades[](2);
|
||||
if (depositCurrencyId == borrowCurrencyId) {
|
||||
// In this case the account is likely borrowing against newly minted nTokens
|
||||
// in the same currency. Technically the other deposit actions may work but
|
||||
// there's no good reason to borrow against cToken collateral
|
||||
actions = new BalanceActionWithTrades[](1);
|
||||
actions[0].actionType = depositAction;
|
||||
actions[0].currencyId = depositCurrencyId;
|
||||
actions[0].depositActionAmount = depositAmount;
|
||||
// Withdraw borrowed amount to wallet
|
||||
actions[0].withdrawEntireCashBalance = true;
|
||||
actions[0].redeemToUnderlying = redeemToUnderlying;
|
||||
actions[0].trades = trades;
|
||||
|
||||
uint256 depositIndex;
|
||||
uint256 borrowIndex;
|
||||
// Notional requires the batch actions to be ordered by currency id
|
||||
if (depositCurrencyId < borrowCurrencyId) {
|
||||
depositIndex = 0;
|
||||
borrowIndex = 1;
|
||||
} else {
|
||||
depositIndex = 1;
|
||||
borrowIndex = 0;
|
||||
}
|
||||
return actions;
|
||||
}
|
||||
|
||||
actions[depositIndex].actionType = depositAction;
|
||||
actions[depositIndex].currencyId = depositCurrencyId;
|
||||
actions[depositIndex].depositActionAmount = depositAmount;
|
||||
// This is the more common case that the account is borrowing against
|
||||
// collateral in a different currency
|
||||
actions = new BalanceActionWithTrades[](2);
|
||||
|
||||
actions[borrowIndex].actionType = DepositActionType.None;
|
||||
actions[borrowIndex].currencyId = borrowCurrencyId;
|
||||
// Withdraw borrowed amount to wallet
|
||||
actions[borrowIndex].withdrawEntireCashBalance = true;
|
||||
actions[borrowIndex].redeemToUnderlying = redeemToUnderlying;
|
||||
actions[borrowIndex].trades = trades;
|
||||
uint256 depositIndex;
|
||||
uint256 borrowIndex;
|
||||
// Notional requires the batch actions to be ordered by currency id
|
||||
if (depositCurrencyId < borrowCurrencyId) {
|
||||
depositIndex = 0;
|
||||
borrowIndex = 1;
|
||||
} else {
|
||||
depositIndex = 1;
|
||||
borrowIndex = 0;
|
||||
}
|
||||
|
||||
return actions;
|
||||
}
|
||||
actions[depositIndex].actionType = depositAction;
|
||||
actions[depositIndex].currencyId = depositCurrencyId;
|
||||
actions[depositIndex].depositActionAmount = depositAmount;
|
||||
|
||||
actions[borrowIndex].actionType = DepositActionType.None;
|
||||
actions[borrowIndex].currencyId = borrowCurrencyId;
|
||||
// Withdraw borrowed amount to wallet
|
||||
actions[borrowIndex].withdrawEntireCashBalance = true;
|
||||
actions[borrowIndex].redeemToUnderlying = redeemToUnderlying;
|
||||
actions[borrowIndex].trades = trades;
|
||||
|
||||
return actions;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
// SPDX-License-Identifier: MIT
|
||||
pragma solidity ^0.7.6;
|
||||
pragma abicoder v2;
|
||||
|
||||
|
|
@ -8,126 +9,127 @@ pragma abicoder v2;
|
|||
/// - Ether: the one and only
|
||||
/// - NonMintable: tokens that do not have an underlying (therefore not cTokens)
|
||||
enum TokenType {
|
||||
UnderlyingToken,
|
||||
cToken,
|
||||
cETH,
|
||||
Ether,
|
||||
NonMintable
|
||||
UnderlyingToken,
|
||||
cToken,
|
||||
cETH,
|
||||
Ether,
|
||||
NonMintable
|
||||
}
|
||||
|
||||
/// @notice Specifies different deposit actions that can occur during BalanceAction or BalanceActionWithTrades
|
||||
enum DepositActionType {
|
||||
// No deposit action
|
||||
None,
|
||||
// Deposit asset cash, depositActionAmount is specified in asset cash external precision
|
||||
DepositAsset,
|
||||
// Deposit underlying tokens that are mintable to asset cash, depositActionAmount is specified in underlying token
|
||||
// external precision
|
||||
DepositUnderlying,
|
||||
// Deposits specified asset cash external precision amount into an nToken and mints the corresponding amount of
|
||||
// nTokens into the account
|
||||
DepositAssetAndMintNToken,
|
||||
// Deposits specified underlying in external precision, mints asset cash, and uses that asset cash to mint nTokens
|
||||
DepositUnderlyingAndMintNToken,
|
||||
// Redeems an nToken balance to asset cash. depositActionAmount is specified in nToken precision. Considered a deposit action
|
||||
// because it deposits asset cash into an account. If there are fCash residuals that cannot be sold off, will revert.
|
||||
RedeemNToken,
|
||||
// Converts specified amount of asset cash balance already in Notional to nTokens. depositActionAmount is specified in
|
||||
// Notional internal 8 decimal precision.
|
||||
ConvertCashToNToken
|
||||
// No deposit action
|
||||
None,
|
||||
// Deposit asset cash, depositActionAmount is specified in asset cash external precision
|
||||
DepositAsset,
|
||||
// Deposit underlying tokens that are mintable to asset cash, depositActionAmount is specified in underlying token
|
||||
// external precision
|
||||
DepositUnderlying,
|
||||
// Deposits specified asset cash external precision amount into an nToken and mints the corresponding amount of
|
||||
// nTokens into the account
|
||||
DepositAssetAndMintNToken,
|
||||
// Deposits specified underlying in external precision, mints asset cash, and uses that asset cash to mint nTokens
|
||||
DepositUnderlyingAndMintNToken,
|
||||
// Redeems an nToken balance to asset cash. depositActionAmount is specified in nToken precision. Considered a deposit action
|
||||
// because it deposits asset cash into an account. If there are fCash residuals that cannot be sold off, will revert.
|
||||
RedeemNToken,
|
||||
// Converts specified amount of asset cash balance already in Notional to nTokens. depositActionAmount is specified in
|
||||
// Notional internal 8 decimal precision.
|
||||
ConvertCashToNToken
|
||||
}
|
||||
|
||||
/// @notice Defines a balance action with a set of trades to do as well
|
||||
struct BalanceActionWithTrades {
|
||||
DepositActionType actionType;
|
||||
uint16 currencyId;
|
||||
uint256 depositActionAmount;
|
||||
uint256 withdrawAmountInternalPrecision;
|
||||
bool withdrawEntireCashBalance;
|
||||
bool redeemToUnderlying;
|
||||
// Array of tightly packed 32 byte objects that represent trades. See TradeActionType documentation
|
||||
bytes32[] trades;
|
||||
DepositActionType actionType;
|
||||
uint16 currencyId;
|
||||
uint256 depositActionAmount;
|
||||
uint256 withdrawAmountInternalPrecision;
|
||||
bool withdrawEntireCashBalance;
|
||||
bool redeemToUnderlying;
|
||||
// Array of tightly packed 32 byte objects that represent trades. See TradeActionType documentation
|
||||
bytes32[] trades;
|
||||
}
|
||||
|
||||
/// @notice Defines a balance action for batchAction
|
||||
struct BalanceAction {
|
||||
// Deposit action to take (if any)
|
||||
DepositActionType actionType;
|
||||
uint16 currencyId;
|
||||
// Deposit action amount must correspond to the depositActionType, see documentation above.
|
||||
uint256 depositActionAmount;
|
||||
// Withdraw an amount of asset cash specified in Notional internal 8 decimal precision
|
||||
uint256 withdrawAmountInternalPrecision;
|
||||
// If set to true, will withdraw entire cash balance. Useful if there may be an unknown amount of asset cash
|
||||
// residual left from trading.
|
||||
bool withdrawEntireCashBalance;
|
||||
// If set to true, will redeem asset cash to the underlying token on withdraw.
|
||||
bool redeemToUnderlying;
|
||||
// Deposit action to take (if any)
|
||||
DepositActionType actionType;
|
||||
uint16 currencyId;
|
||||
// Deposit action amount must correspond to the depositActionType, see documentation above.
|
||||
uint256 depositActionAmount;
|
||||
// Withdraw an amount of asset cash specified in Notional internal 8 decimal precision
|
||||
uint256 withdrawAmountInternalPrecision;
|
||||
// If set to true, will withdraw entire cash balance. Useful if there may be an unknown amount of asset cash
|
||||
// residual left from trading.
|
||||
bool withdrawEntireCashBalance;
|
||||
// If set to true, will redeem asset cash to the underlying token on withdraw.
|
||||
bool redeemToUnderlying;
|
||||
}
|
||||
|
||||
struct Token {
|
||||
// Address of the token
|
||||
address tokenAddress;
|
||||
// True if the token has a transfer fee which is used internally to determine
|
||||
// the proper balance change
|
||||
bool hasTransferFee;
|
||||
// Decimal precision of the token as a power of 10
|
||||
int256 decimals;
|
||||
// Type of token, enumerated above
|
||||
TokenType tokenType;
|
||||
// Used internally for tokens that have a collateral cap, zero if there is no cap
|
||||
uint256 maxCollateralBalance;
|
||||
// Address of the token
|
||||
address tokenAddress;
|
||||
// True if the token has a transfer fee which is used internally to determine
|
||||
// the proper balance change
|
||||
bool hasTransferFee;
|
||||
// Decimal precision of the token as a power of 10
|
||||
int256 decimals;
|
||||
// Type of token, enumerated above
|
||||
TokenType tokenType;
|
||||
// Used internally for tokens that have a collateral cap, zero if there is no cap
|
||||
uint256 maxCollateralBalance;
|
||||
}
|
||||
|
||||
interface NotionalInterface {
|
||||
function getCurrency(uint16 currencyId)
|
||||
external
|
||||
view
|
||||
returns (Token memory assetToken, Token memory underlyingToken);
|
||||
function getCurrency(uint16 currencyId)
|
||||
external
|
||||
view
|
||||
returns (Token memory assetToken, Token memory underlyingToken);
|
||||
|
||||
function getAccountBalance(uint16 currencyId, address account)
|
||||
external
|
||||
view
|
||||
returns (
|
||||
int256 cashBalance,
|
||||
int256 nTokenBalance,
|
||||
uint256 lastClaimTime
|
||||
);
|
||||
function getAccountBalance(uint16 currencyId, address account)
|
||||
external
|
||||
view
|
||||
returns (
|
||||
int256 cashBalance,
|
||||
int256 nTokenBalance,
|
||||
uint256 lastClaimTime
|
||||
);
|
||||
|
||||
function depositUnderlyingToken(
|
||||
address account,
|
||||
uint16 currencyId,
|
||||
uint256 amountExternalPrecision
|
||||
) external payable returns (uint256);
|
||||
function depositUnderlyingToken(
|
||||
address account,
|
||||
uint16 currencyId,
|
||||
uint256 amountExternalPrecision
|
||||
) external payable returns (uint256);
|
||||
|
||||
function depositAssetToken(
|
||||
address account,
|
||||
uint16 currencyId,
|
||||
uint256 amountExternalPrecision
|
||||
) external returns (uint256);
|
||||
function depositAssetToken(
|
||||
address account,
|
||||
uint16 currencyId,
|
||||
uint256 amountExternalPrecision
|
||||
) external returns (uint256);
|
||||
|
||||
function withdraw(
|
||||
uint16 currencyId,
|
||||
uint88 amountInternalPrecision,
|
||||
bool redeemToUnderlying
|
||||
) external returns (uint256);
|
||||
function withdraw(
|
||||
uint16 currencyId,
|
||||
uint88 amountInternalPrecision,
|
||||
bool redeemToUnderlying
|
||||
) external returns (uint256);
|
||||
|
||||
function nTokenClaimIncentives() external returns (uint256);
|
||||
function nTokenClaimIncentives() external returns (uint256);
|
||||
|
||||
function nTokenRedeem(
|
||||
address redeemer,
|
||||
uint16 currencyId,
|
||||
uint96 tokensToRedeem_,
|
||||
bool sellTokenAssets
|
||||
) external returns (int256);
|
||||
function nTokenRedeem(
|
||||
address redeemer,
|
||||
uint16 currencyId,
|
||||
uint96 tokensToRedeem_,
|
||||
bool sellTokenAssets,
|
||||
bool acceptResidualAssets
|
||||
) external returns (int256);
|
||||
|
||||
function batchBalanceAction(
|
||||
address account,
|
||||
BalanceAction[] calldata actions
|
||||
) external payable;
|
||||
function batchBalanceAction(
|
||||
address account,
|
||||
BalanceAction[] calldata actions
|
||||
) external payable;
|
||||
|
||||
function batchBalanceAndTradeAction(
|
||||
address account,
|
||||
BalanceActionWithTrades[] calldata actions
|
||||
) external payable;
|
||||
function batchBalanceAndTradeAction(
|
||||
address account,
|
||||
BalanceActionWithTrades[] calldata actions
|
||||
) external payable;
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -95,7 +95,7 @@ const redeemNTokenRaw = async (
|
|||
{
|
||||
connector: "NOTIONAL-TEST-A",
|
||||
method: "redeemNTokenRaw",
|
||||
args: [currencyId, sellTokenAssets, tokensToRedeem, 0, 0]
|
||||
args: [currencyId, sellTokenAssets, tokensToRedeem, false, 0, 0]
|
||||
}
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ describe("Notional", function () {
|
|||
forking: {
|
||||
//@ts-ignore
|
||||
jsonRpcUrl: hre.config.networks.hardhat.forking.url,
|
||||
blockNumber: 13798624,
|
||||
blockNumber: 14483893,
|
||||
},
|
||||
},
|
||||
],
|
||||
|
|
@ -240,7 +240,7 @@ describe("Notional", function () {
|
|||
expect(
|
||||
await daiToken.balanceOf(dsaWallet0.address),
|
||||
"expect DSA wallet to contain borrowed balance minus fees"
|
||||
).to.be.gte(ethers.utils.parseEther("990"));
|
||||
).to.be.gte(ethers.utils.parseEther("985"));
|
||||
});
|
||||
|
||||
it("test_deposit_ETH_and_borrow_DAI_asset", async function () {
|
||||
|
|
@ -256,7 +256,7 @@ describe("Notional", function () {
|
|||
expect(
|
||||
await cdaiToken.balanceOf(dsaWallet0.address),
|
||||
"expect DSA wallet to contain borrowed balance minus fees"
|
||||
).to.be.gte(ethers.utils.parseUnits("4500000000000", 0));
|
||||
).to.be.gte(ethers.utils.parseUnits("4490000000000", 0));
|
||||
});
|
||||
|
||||
it("test_deposit_DAI_underlying_and_borrow_ETH", async function () {
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user