From 94644ac735b22ba7805ff426656c99f2c747ec92 Mon Sep 17 00:00:00 2001 From: domenicodev Date: Mon, 22 Jan 2024 12:08:59 +0100 Subject: [PATCH 01/25] feat: Initial setup and price() function implementation --- evm/src/angle/AngleAdapter.sol | 282 +++++++++++++++++++++++++++++++++ evm/src/angle/manifest.yaml | 36 +++++ 2 files changed, 318 insertions(+) create mode 100644 evm/src/angle/AngleAdapter.sol create mode 100644 evm/src/angle/manifest.yaml diff --git a/evm/src/angle/AngleAdapter.sol b/evm/src/angle/AngleAdapter.sol new file mode 100644 index 0000000..b2363a7 --- /dev/null +++ b/evm/src/angle/AngleAdapter.sol @@ -0,0 +1,282 @@ +// SPDX-License-Identifier: AGPL-3.0-or-later +pragma experimental ABIEncoderV2; +pragma solidity ^0.8.13; + +import {IERC20, ISwapAdapter} from "src/interfaces/ISwapAdapter.sol"; + +/// @title AngleAdapter +contract AngleAdapter is ISwapAdapter { + + ITransmuter transmuter; + + constructor(ITransmuter _transmuter) { + transmuter = _transmuter; + } + + function price( + bytes32, + IERC20 _sellToken, + IERC20 _buyToken, + uint256[] memory _specifiedAmounts + ) external view override returns (Fraction[] memory _prices) { + _prices = new Fraction[](_specifiedAmounts.length); + address sellTokenAddress = address(_sellToken); + address buyTokenAddress = address(_buyToken); + + for (uint256 i = 0; i < _specifiedAmounts.length; i++) { + _prices[i] = getPriceAt(_specifiedAmounts[i], sellTokenAddress, buyTokenAddress); + } + } + + function swap( + bytes32 poolId, + IERC20 sellToken, + IERC20 buyToken, + OrderSide side, + uint256 specifiedAmount + ) external returns (Trade memory trade) { + revert NotImplemented("TemplateSwapAdapter.swap"); + } + + function getLimits(bytes32, IERC20 sellToken, IERC20 buyToken) + external + returns (uint256[] memory limits) + { + revert NotImplemented("TemplateSwapAdapter.getLimits"); + } + + function getCapabilities(bytes32 poolId, IERC20 sellToken, IERC20 buyToken) + external + returns (Capability[] memory capabilities) + { + revert NotImplemented("TemplateSwapAdapter.getCapabilities"); + } + + function getTokens(bytes32 poolId) + external + returns (IERC20[] memory tokens) + { + revert NotImplemented("TemplateSwapAdapter.getTokens"); + } + + function getPoolIds(uint256 offset, uint256 limit) + external + returns (bytes32[] memory ids) + { + revert NotImplemented("TemplateSwapAdapter.getPoolIds"); + } + + /// @notice Calculates pool prices for specified amounts + /// @param amountIn The amount of the token being sold + /// @param tokenIn The token being sold + /// @param tokenOut The token being bought + /// @return The price as a fraction corresponding to the provided amount. + function getPriceAt(uint256 amountIn, address tokenIn, address tokenOut) + internal + view + returns (Fraction memory) + { + uint256 amountOut = transmuter.quoteIn(amountIn, tokenIn, tokenOut); + return Fraction( + amountOut, + amountIn + ); + } +} + +abstract contract ITransmuter { + struct Tuple6871229 { + address facetAddress; + uint8 action; + bytes4[] functionSelectors; + } + + struct Tuple1236461 { + address facetAddress; + bytes4[] functionSelectors; + } + + struct Tuple3550792 { + uint8 isManaged; + uint8 isMintLive; + uint8 isBurnLive; + uint8 decimals; + uint8 onlyWhitelisted; + uint216 normalizedStables; + uint64[] xFeeMint; + int64[] yFeeMint; + uint64[] xFeeBurn; + int64[] yFeeBurn; + bytes oracleConfig; + bytes whitelistData; + Tuple5479340 managerData; + } + + struct Tuple5479340 { + address[] subCollaterals; + bytes config; + } + + function diamondCut(Tuple6871229[] memory _diamondCut, address _init, bytes memory _calldata) external {} + + function implementation() external view returns (address) {} + + function setDummyImplementation(address _implementation) external {} + + function facetAddress(bytes4 _functionSelector) external view returns (address facetAddress_) {} + + function facetAddresses() external view returns (address[] memory facetAddresses_) {} + + function facetFunctionSelectors(address _facet) external view returns (bytes4[] memory _facetFunctionSelectors) {} + + function facets() external view returns (Tuple1236461[] memory facets_) {} + + function accessControlManager() external view returns (address) {} + + function agToken() external view returns (address) {} + + function getCollateralBurnFees( + address collateral + ) external view returns (uint64[] memory xFeeBurn, int64[] memory yFeeBurn) {} + + function getCollateralDecimals(address collateral) external view returns (uint8) {} + + function getCollateralInfo(address collateral) external view returns (Tuple3550792 memory) {} + + function getCollateralList() external view returns (address[] memory) {} + + function getCollateralMintFees( + address collateral + ) external view returns (uint64[] memory xFeeMint, int64[] memory yFeeMint) {} + + function getCollateralRatio() external view returns (uint64 collatRatio, uint256 stablecoinsIssued) {} + + function getCollateralWhitelistData(address collateral) external view returns (bytes memory) {} + + function getIssuedByCollateral( + address collateral + ) external view returns (uint256 stablecoinsFromCollateral, uint256 stablecoinsIssued) {} + + function getManagerData(address collateral) external view returns (bool, address[] memory, bytes memory) {} + + function getOracle( + address collateral + ) external view returns (uint8 oracleType, uint8 targetType, bytes memory oracleData, bytes memory targetData) {} + + function getOracleValues( + address collateral + ) external view returns (uint256 mint, uint256 burn, uint256 ratio, uint256 minRatio, uint256 redemption) {} + + function getRedemptionFees() + external + view + returns (uint64[] memory xRedemptionCurve, int64[] memory yRedemptionCurve) + {} + + function getTotalIssued() external view returns (uint256) {} + + function isPaused(address collateral, uint8 action) external view returns (bool) {} + + function isTrusted(address sender) external view returns (bool) {} + + function isTrustedSeller(address sender) external view returns (bool) {} + + function isValidSelector(bytes4 selector) external view returns (bool) {} + + function isWhitelistedCollateral(address collateral) external view returns (bool) {} + + function isWhitelistedForCollateral(address collateral, address sender) external returns (bool) {} + + function isWhitelistedForType(uint8 whitelistType, address sender) external view returns (bool) {} + + function sellRewards(uint256 minAmountOut, bytes memory payload) external returns (uint256 amountOut) {} + + function addCollateral(address collateral) external {} + + function adjustStablecoins(address collateral, uint128 amount, bool increase) external {} + + function changeAllowance(address token, address spender, uint256 amount) external {} + + function recoverERC20(address collateral, address token, address to, uint256 amount) external {} + + function revokeCollateral(address collateral) external {} + + function setAccessControlManager(address _newAccessControlManager) external {} + + function setCollateralManager(address collateral, Tuple5479340 memory managerData) external {} + + function setOracle(address collateral, bytes memory oracleConfig) external {} + + function setWhitelistStatus(address collateral, uint8 whitelistStatus, bytes memory whitelistData) external {} + + function toggleTrusted(address sender, uint8 t) external {} + + function setFees(address collateral, uint64[] memory xFee, int64[] memory yFee, bool mint) external {} + + function setRedemptionCurveParams(uint64[] memory xFee, int64[] memory yFee) external {} + + function togglePause(address collateral, uint8 pausedType) external {} + + function toggleWhitelist(uint8 whitelistType, address who) external {} + + function quoteIn(uint256 amountIn, address tokenIn, address tokenOut) external view returns (uint256 amountOut) {} + + function quoteOut(uint256 amountOut, address tokenIn, address tokenOut) external view returns (uint256 amountIn) {} + + function swapExactInput( + uint256 amountIn, + uint256 amountOutMin, + address tokenIn, + address tokenOut, + address to, + uint256 deadline + ) external returns (uint256 amountOut) {} + + function swapExactInputWithPermit( + uint256 amountIn, + uint256 amountOutMin, + address tokenIn, + address to, + uint256 deadline, + bytes memory permitData + ) external returns (uint256 amountOut) {} + + function swapExactOutput( + uint256 amountOut, + uint256 amountInMax, + address tokenIn, + address tokenOut, + address to, + uint256 deadline + ) external returns (uint256 amountIn) {} + + function swapExactOutputWithPermit( + uint256 amountOut, + uint256 amountInMax, + address tokenIn, + address to, + uint256 deadline, + bytes memory permitData + ) external returns (uint256 amountIn) {} + + function quoteRedemptionCurve( + uint256 amount + ) external view returns (address[] memory tokens, uint256[] memory amounts) {} + + function redeem( + uint256 amount, + address receiver, + uint256 deadline, + uint256[] memory minAmountOuts + ) external returns (address[] memory tokens, uint256[] memory amounts) {} + + function redeemWithForfeit( + uint256 amount, + address receiver, + uint256 deadline, + uint256[] memory minAmountOuts, + address[] memory forfeitTokens + ) external returns (address[] memory tokens, uint256[] memory amounts) {} + + function updateNormalizer(uint256 amount, bool increase) external returns (uint256) {} +} diff --git a/evm/src/angle/manifest.yaml b/evm/src/angle/manifest.yaml new file mode 100644 index 0000000..3298c49 --- /dev/null +++ b/evm/src/angle/manifest.yaml @@ -0,0 +1,36 @@ +# information about the author helps us reach out in case of issues. +author: + name: YourCompany + email: developer@yourcompany.xyz + +# Protocol Constants +constants: + protocol_gas: 30000 + # minimum capabilities we can expect, individual pools may extend these + capabilities: + - SellSide + - BuySide + - PriceFunction + +# The file containing the adapter contract +contract: TemplateSwapAdapter.sol + +# Deployment instances used to generate chain specific bytecode. +instances: + - chain: + name: mainnet + id: 0 + arguments: + - "0x00253582b2a3FE112feEC532221d9708c64cEFAb" + +# Specify some automatic test cases in case getPoolIds and +# getTokens are not implemented. +tests: + instances: + - pool_id: "0xB4e16d0168e52d35CaCD2c6185b44281Ec28C9Dc" + sell_token: "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2" + buy_token: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48" + block: 17000000 + chain: + id: 0 + name: mainnet From ba289d5bd1f41d28db15d837ebca5f8299d55bbb Mon Sep 17 00:00:00 2001 From: domenicodev Date: Tue, 23 Jan 2024 16:54:38 +0100 Subject: [PATCH 02/25] feat: Added imports in a different file as too long, implemented getLimits and getTokens --- evm/src/angle/AngleAdapter.sol | 90 ++++++++-------- evm/src/angle/AngleUtils.sol | 187 +++++++++++++++++++++++++++++++++ 2 files changed, 235 insertions(+), 42 deletions(-) create mode 100644 evm/src/angle/AngleUtils.sol diff --git a/evm/src/angle/AngleAdapter.sol b/evm/src/angle/AngleAdapter.sol index b2363a7..062e27c 100644 --- a/evm/src/angle/AngleAdapter.sol +++ b/evm/src/angle/AngleAdapter.sol @@ -2,7 +2,8 @@ pragma experimental ABIEncoderV2; pragma solidity ^0.8.13; -import {IERC20, ISwapAdapter} from "src/interfaces/ISwapAdapter.sol"; +/// @dev Wrapped imports (incl. ISwapAdapter and IERC20) are included in utils +import "./AngleUtils.sol"; /// @title AngleAdapter contract AngleAdapter is ISwapAdapter { @@ -13,6 +14,7 @@ contract AngleAdapter is ISwapAdapter { transmuter = _transmuter; } + /// @inheritdoc ISwapAdapter function price( bytes32, IERC20 _sellToken, @@ -38,11 +40,42 @@ contract AngleAdapter is ISwapAdapter { revert NotImplemented("TemplateSwapAdapter.swap"); } + /// @inheritdoc ISwapAdapter + /// @dev mint may have no limits, but we underestimate them to make sure, with the same amount of sellToken. + /// We use the quoteIn (incl. fee), because calculating fee requires a part of the implementation of + /// the Angle Diamond Storage, and therefore redundant functions and excessive contract size, with an high complexity. function getLimits(bytes32, IERC20 sellToken, IERC20 buyToken) external + view + override returns (uint256[] memory limits) { - revert NotImplemented("TemplateSwapAdapter.getLimits"); + limits = new uint256[](2); + address sellTokenAddress = address(sellToken); + address buyTokenAddress = address(buyToken); + + if(buyTokenAddress == transmuter.agToken()) { // mint(buy agToken) + Collateral memory collatInfo = transmuter.getCollateralInfo(sellTokenAddress); + if(collatInfo.isManaged > 0) { + limits[0] = LibManager.maxAvailable(collatInfo.managerData.config); + } + else { + limits[0] = sellToken.balanceOf(address(transmuter)); + } + limits[1] = transmuter.quoteIn(limits[0], sellTokenAddress, buyTokenAddress); + } + else { // burn(sell agToken) + Collateral memory collatInfo = transmuter.getCollateralInfo(buyTokenAddress); + uint256 collatLimit; + if(collatInfo.isManaged > 0) { + collatLimit = LibManager.maxAvailable(collatInfo.managerData.config); + } + else { + collatLimit = buyToken.balanceOf(address(transmuter)); + } + limits[0] = transmuter.quoteIn(collatLimit, buyTokenAddress, sellTokenAddress); + limits[1] = collatLimit; + } } function getCapabilities(bytes32 poolId, IERC20 sellToken, IERC20 buyToken) @@ -52,11 +85,21 @@ contract AngleAdapter is ISwapAdapter { revert NotImplemented("TemplateSwapAdapter.getCapabilities"); } - function getTokens(bytes32 poolId) + /// @inheritdoc ISwapAdapter + /// @dev Since Angle has no pool IDs but supports 3 tokens(agToken and the collaterals), + /// we return all the available collaterals and the agToken(agEUR) + function getTokens(bytes32) external + view + override returns (IERC20[] memory tokens) { - revert NotImplemented("TemplateSwapAdapter.getTokens"); + address[] memory collateralsAddresses = transmuter.getCollateralList(); + tokens = new IERC20[](collateralsAddresses.length + 1); + for(uint256 i = 0; i < collateralsAddresses.length; i++) { + tokens[i] = IERC20(collateralsAddresses[i]); + } + tokens[collateralsAddresses.length] = IERC20(transmuter.agToken()); } function getPoolIds(uint256 offset, uint256 limit) @@ -85,39 +128,6 @@ contract AngleAdapter is ISwapAdapter { } abstract contract ITransmuter { - struct Tuple6871229 { - address facetAddress; - uint8 action; - bytes4[] functionSelectors; - } - - struct Tuple1236461 { - address facetAddress; - bytes4[] functionSelectors; - } - - struct Tuple3550792 { - uint8 isManaged; - uint8 isMintLive; - uint8 isBurnLive; - uint8 decimals; - uint8 onlyWhitelisted; - uint216 normalizedStables; - uint64[] xFeeMint; - int64[] yFeeMint; - uint64[] xFeeBurn; - int64[] yFeeBurn; - bytes oracleConfig; - bytes whitelistData; - Tuple5479340 managerData; - } - - struct Tuple5479340 { - address[] subCollaterals; - bytes config; - } - - function diamondCut(Tuple6871229[] memory _diamondCut, address _init, bytes memory _calldata) external {} function implementation() external view returns (address) {} @@ -129,8 +139,6 @@ abstract contract ITransmuter { function facetFunctionSelectors(address _facet) external view returns (bytes4[] memory _facetFunctionSelectors) {} - function facets() external view returns (Tuple1236461[] memory facets_) {} - function accessControlManager() external view returns (address) {} function agToken() external view returns (address) {} @@ -141,7 +149,7 @@ abstract contract ITransmuter { function getCollateralDecimals(address collateral) external view returns (uint8) {} - function getCollateralInfo(address collateral) external view returns (Tuple3550792 memory) {} + function getCollateralInfo(address collateral) external view returns (Collateral memory) {} function getCollateralList() external view returns (address[] memory) {} @@ -203,8 +211,6 @@ abstract contract ITransmuter { function setAccessControlManager(address _newAccessControlManager) external {} - function setCollateralManager(address collateral, Tuple5479340 memory managerData) external {} - function setOracle(address collateral, bytes memory oracleConfig) external {} function setWhitelistStatus(address collateral, uint8 whitelistStatus, bytes memory whitelistData) external {} diff --git a/evm/src/angle/AngleUtils.sol b/evm/src/angle/AngleUtils.sol new file mode 100644 index 0000000..95ca64c --- /dev/null +++ b/evm/src/angle/AngleUtils.sol @@ -0,0 +1,187 @@ +// SPDX-License-Identifier: MIT +pragma solidity ^0.8.13; + +/** + * @dev Collection of wrapped interfaces, items and libraries for Angle + * we use them here to maintain integrity and readability of contracts + * as there are many different imports and items + */ + +import {IERC20, ISwapAdapter} from "src/interfaces/ISwapAdapter.sol"; + + +interface IAgToken is IERC20 { + /*////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + MINTER ROLE ONLY FUNCTIONS + //////////////////////////////////////////////////////////////////////////////////////////////////////////////////*/ + + /// @notice Lets a whitelisted contract mint agTokens + /// @param account Address to mint to + /// @param amount Amount to mint + function mint(address account, uint256 amount) external; + + /// @notice Burns `amount` tokens from a `burner` address after being asked to by `sender` + /// @param amount Amount of tokens to burn + /// @param burner Address to burn from + /// @param sender Address which requested the burn from `burner` + /// @dev This method is to be called by a contract with the minter right after being requested + /// to do so by a `sender` address willing to burn tokens from another `burner` address + /// @dev The method checks the allowance between the `sender` and the `burner` + function burnFrom(uint256 amount, address burner, address sender) external; + + /// @notice Burns `amount` tokens from a `burner` address + /// @param amount Amount of tokens to burn + /// @param burner Address to burn from + /// @dev This method is to be called by a contract with a minter right on the AgToken after being + /// requested to do so by an address willing to burn tokens from its address + function burnSelf(uint256 amount, address burner) external; + + /*////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + TREASURY ONLY FUNCTIONS + //////////////////////////////////////////////////////////////////////////////////////////////////////////////////*/ + + /// @notice Adds a minter in the contract + /// @param minter Minter address to add + /// @dev Zero address checks are performed directly in the `Treasury` contract + function addMinter(address minter) external; + + /// @notice Removes a minter from the contract + /// @param minter Minter address to remove + /// @dev This function can also be called by a minter wishing to revoke itself + function removeMinter(address minter) external; + + /// @notice Sets a new treasury contract + /// @param _treasury New treasury address + function setTreasury(address _treasury) external; + + /*////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + EXTERNAL FUNCTIONS + //////////////////////////////////////////////////////////////////////////////////////////////////////////////////*/ + + /// @notice Checks whether an address has the right to mint agTokens + /// @param minter Address for which the minting right should be checked + /// @return Whether the address has the right to mint agTokens or not + function isMinter(address minter) external view returns (bool); + + /// @notice Amount of decimals of the stablecoin + function decimals() external view returns (uint8); +} + +enum ManagerType { + EXTERNAL +} + +enum WhitelistType { + BACKED +} + +struct ManagerStorage { + IERC20[] subCollaterals; // Subtokens handled by the manager or strategies + bytes config; // Additional configuration data +} + +struct Collateral { + uint8 isManaged; // If the collateral is managed through external strategies + uint8 isMintLive; // If minting from this asset is unpaused + uint8 isBurnLive; // If burning to this asset is unpaused + uint8 decimals; // IERC20Metadata(collateral).decimals() + uint8 onlyWhitelisted; // If only whitelisted addresses can burn or redeem for this token + uint216 normalizedStables; // Normalized amount of stablecoins issued from this collateral + uint64[] xFeeMint; // Increasing exposures in [0,BASE_9[ + int64[] yFeeMint; // Mint fees at the exposures specified in `xFeeMint` + uint64[] xFeeBurn; // Decreasing exposures in ]0,BASE_9] + int64[] yFeeBurn; // Burn fees at the exposures specified in `xFeeBurn` + bytes oracleConfig; // Data about the oracle used for the collateral + bytes whitelistData; // For whitelisted collateral, data used to verify whitelists + ManagerStorage managerData; // For managed collateral, data used to handle the strategies +} + +struct TransmuterStorage { + IAgToken agToken; // agToken handled by the system + uint8 isRedemptionLive; // If redemption is unpaused + uint8 statusReentrant; // If call is reentrant or not + uint128 normalizedStables; // Normalized amount of stablecoins issued by the system + uint128 normalizer; // To reconcile `normalizedStables` values with the actual amount + address[] collateralList; // List of collateral assets supported by the system + uint64[] xRedemptionCurve; // Increasing collateral ratios > 0 + int64[] yRedemptionCurve; // Value of the redemption fees at `xRedemptionCurve` + mapping(address => Collateral) collaterals; // Maps a collateral asset to its parameters + mapping(address => uint256) isTrusted; // If an address is trusted to update the normalizer value + mapping(address => uint256) isSellerTrusted; // If an address is trusted to sell accruing reward tokens + mapping(WhitelistType => mapping(address => uint256)) isWhitelistedForType; +} + +interface IManager { + /// @notice Returns the amount of collateral managed by the Manager + /// @return balances Balances of all the subCollaterals handled by the manager + /// @dev MUST NOT revert + function totalAssets() external view returns (uint256[] memory balances, uint256 totalValue); + + /// @notice Hook to invest `amount` of `collateral` + /// @dev MUST revert if the manager cannot accept these funds + /// @dev MUST have received the funds beforehand + function invest(uint256 amount) external; + + /// @notice Sends `amount` of `collateral` to the `to` address + /// @dev Called when `agToken` are burnt and during redemptions + // @dev MUST revert if there are not funds enough available + /// @dev MUST be callable only by the transmuter + function release(address asset, address to, uint256 amount) external; + + /// @notice Gives the maximum amount of collateral immediately available for a transfer + /// @dev Useful for integrators using `quoteIn` and `quoteOut` + function maxAvailable() external view returns (uint256); +} + +/// @title LibManager +/// @author Angle Labs, Inc. +/// @dev Managed collateral assets may be handled through external smart contracts or directly through this library +/// @dev There is no implementation at this point for a managed collateral handled through this library, and +/// a new specific `ManagerType` would need to be added in this case +library LibManager { + /// @notice Checks to which address managed funds must be transferred + function transferRecipient(bytes memory config) internal view returns (address recipient) { + (ManagerType managerType, bytes memory data) = parseManagerConfig(config); + recipient = address(this); + if (managerType == ManagerType.EXTERNAL) return abi.decode(data, (address)); + } + + /// @notice Performs a transfer of `token` for a collateral that is managed to a `to` address + /// @dev `token` may not be the actual collateral itself, as some collaterals have subcollaterals associated + /// with it + /// @dev Eventually pulls funds from strategies + function release(address token, address to, uint256 amount, bytes memory config) internal { + (ManagerType managerType, bytes memory data) = parseManagerConfig(config); + if (managerType == ManagerType.EXTERNAL) abi.decode(data, (IManager)).release(token, to, amount); + } + + /// @notice Gets the balances of all the tokens controlled through `managerData` + /// @return balances An array of size `subCollaterals` with current balances of all subCollaterals + /// including the one corresponding to the `managerData` given + /// @return totalValue The value of all the `subCollaterals` in `collateral` + /// @dev `subCollaterals` must always have as first token (index 0) the collateral itself + function totalAssets(bytes memory config) internal view returns (uint256[] memory balances, uint256 totalValue) { + (ManagerType managerType, bytes memory data) = parseManagerConfig(config); + if (managerType == ManagerType.EXTERNAL) return abi.decode(data, (IManager)).totalAssets(); + } + + /// @notice Calls a hook if needed after new funds have been transfered to a manager + function invest(uint256 amount, bytes memory config) internal { + (ManagerType managerType, bytes memory data) = parseManagerConfig(config); + if (managerType == ManagerType.EXTERNAL) abi.decode(data, (IManager)).invest(amount); + } + + /// @notice Returns available underlying tokens, for instance if liquidity is fully used and + /// not withdrawable the function will return 0 + function maxAvailable(bytes memory config) internal view returns (uint256 available) { + (ManagerType managerType, bytes memory data) = parseManagerConfig(config); + if (managerType == ManagerType.EXTERNAL) return abi.decode(data, (IManager)).maxAvailable(); + } + + /// @notice Decodes the `managerData` associated to a collateral + function parseManagerConfig( + bytes memory config + ) internal pure returns (ManagerType managerType, bytes memory data) { + (managerType, data) = abi.decode(config, (ManagerType, bytes)); + } +} From 339b0b17b9da9e01dc1baff0fe928848e97d4ad6 Mon Sep 17 00:00:00 2001 From: domenicodev Date: Tue, 23 Jan 2024 16:55:40 +0100 Subject: [PATCH 03/25] fix: Fixed manifest.yaml --- evm/src/angle/manifest.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/evm/src/angle/manifest.yaml b/evm/src/angle/manifest.yaml index 3298c49..88a2f39 100644 --- a/evm/src/angle/manifest.yaml +++ b/evm/src/angle/manifest.yaml @@ -1,7 +1,7 @@ # information about the author helps us reach out in case of issues. author: - name: YourCompany - email: developer@yourcompany.xyz + name: Propellerheads.xyz + email: alan@propellerheads.xyz # Protocol Constants constants: @@ -13,7 +13,7 @@ constants: - PriceFunction # The file containing the adapter contract -contract: TemplateSwapAdapter.sol +contract: AngleAdapter.sol # Deployment instances used to generate chain specific bytecode. instances: From 7c1e102f73b5bef8c3ff4b33b87bcc477f56473c Mon Sep 17 00:00:00 2001 From: domenicodev Date: Tue, 23 Jan 2024 16:58:29 +0100 Subject: [PATCH 04/25] fix: Fixed getPoolIds not implemented text, improved gas in getLimits --- evm/src/angle/AngleAdapter.sol | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/evm/src/angle/AngleAdapter.sol b/evm/src/angle/AngleAdapter.sol index 062e27c..d15c01c 100644 --- a/evm/src/angle/AngleAdapter.sol +++ b/evm/src/angle/AngleAdapter.sol @@ -53,6 +53,7 @@ contract AngleAdapter is ISwapAdapter { limits = new uint256[](2); address sellTokenAddress = address(sellToken); address buyTokenAddress = address(buyToken); + address transmuterAddress = address(transmuter); if(buyTokenAddress == transmuter.agToken()) { // mint(buy agToken) Collateral memory collatInfo = transmuter.getCollateralInfo(sellTokenAddress); @@ -60,7 +61,7 @@ contract AngleAdapter is ISwapAdapter { limits[0] = LibManager.maxAvailable(collatInfo.managerData.config); } else { - limits[0] = sellToken.balanceOf(address(transmuter)); + limits[0] = sellToken.balanceOf(transmuterAddress); } limits[1] = transmuter.quoteIn(limits[0], sellTokenAddress, buyTokenAddress); } @@ -71,7 +72,7 @@ contract AngleAdapter is ISwapAdapter { collatLimit = LibManager.maxAvailable(collatInfo.managerData.config); } else { - collatLimit = buyToken.balanceOf(address(transmuter)); + collatLimit = buyToken.balanceOf(transmuterAddress); } limits[0] = transmuter.quoteIn(collatLimit, buyTokenAddress, sellTokenAddress); limits[1] = collatLimit; @@ -102,11 +103,13 @@ contract AngleAdapter is ISwapAdapter { tokens[collateralsAddresses.length] = IERC20(transmuter.agToken()); } - function getPoolIds(uint256 offset, uint256 limit) + function getPoolIds(uint256, uint256) external - returns (bytes32[] memory ids) + pure + override + returns (bytes32[] memory) { - revert NotImplemented("TemplateSwapAdapter.getPoolIds"); + revert NotImplemented("AngleAdapter.getPoolIds"); } /// @notice Calculates pool prices for specified amounts From a4693f5300d425975621f6a0199949b19e1b9047 Mon Sep 17 00:00:00 2001 From: domenicodev Date: Tue, 23 Jan 2024 18:43:57 +0100 Subject: [PATCH 05/25] feat: Implemented swap() --- evm/src/angle/AngleAdapter.sol | 62 +++++++++++++++++++++++++++++++++- 1 file changed, 61 insertions(+), 1 deletion(-) diff --git a/evm/src/angle/AngleAdapter.sol b/evm/src/angle/AngleAdapter.sol index d15c01c..36f9a62 100644 --- a/evm/src/angle/AngleAdapter.sol +++ b/evm/src/angle/AngleAdapter.sol @@ -30,6 +30,7 @@ contract AngleAdapter is ISwapAdapter { } } + /// @inheritdoc ISwapAdapter function swap( bytes32 poolId, IERC20 sellToken, @@ -37,13 +38,28 @@ contract AngleAdapter is ISwapAdapter { OrderSide side, uint256 specifiedAmount ) external returns (Trade memory trade) { - revert NotImplemented("TemplateSwapAdapter.swap"); + if (specifiedAmount == 0) { + return trade; + } + + uint256 gasBefore = gasleft(); + if (side == OrderSide.Sell) { + trade.calculatedAmount = + sell(sellToken, buyToken, specifiedAmount); + trade.price = getPriceAt(specifiedAmount, address(sellToken), address(buyToken)); + } else { + trade.calculatedAmount = + buy(sellToken, buyToken, specifiedAmount); + trade.price = getPriceAt(specifiedAmount, address(buyToken), address(sellToken)); + } + trade.gasUsed = gasBefore - gasleft(); } /// @inheritdoc ISwapAdapter /// @dev mint may have no limits, but we underestimate them to make sure, with the same amount of sellToken. /// We use the quoteIn (incl. fee), because calculating fee requires a part of the implementation of /// the Angle Diamond Storage, and therefore redundant functions and excessive contract size, with an high complexity. + /// In addition, we underestimate to * 0.9 to ensure swaps with OrderSide.Buy won't fail anyway. function getLimits(bytes32, IERC20 sellToken, IERC20 buyToken) external view @@ -63,6 +79,7 @@ contract AngleAdapter is ISwapAdapter { else { limits[0] = sellToken.balanceOf(transmuterAddress); } + limits[0] = limits[0] * 90 / 100; limits[1] = transmuter.quoteIn(limits[0], sellTokenAddress, buyTokenAddress); } else { // burn(sell agToken) @@ -74,6 +91,7 @@ contract AngleAdapter is ISwapAdapter { else { collatLimit = buyToken.balanceOf(transmuterAddress); } + collatLimit = collatLimit * 90 / 100; limits[0] = transmuter.quoteIn(collatLimit, buyTokenAddress, sellTokenAddress); limits[1] = collatLimit; } @@ -128,6 +146,48 @@ contract AngleAdapter is ISwapAdapter { amountIn ); } + + /// @notice Executes a sell order on the contract. + /// @param sellToken The token being sold. + /// @param buyToken The token being bought. + /// @param amount The amount to be traded. + /// @return calculatedAmount The amount of tokens received. + function sell( + IERC20 sellToken, + IERC20 buyToken, + uint256 amount + ) internal returns (uint256 calculatedAmount) { + address sellTokenAddress = address(sellToken); + address buyTokenAddress = address(buyToken); + uint256 amountOut = transmuter.quoteIn(amount, sellTokenAddress, buyTokenAddress); + + // TODO: use safeTransferFrom + sellToken.transferFrom(msg.sender, address(this), amount); + sellToken.approve(address(transmuter), amount); + transmuter.swapExactInput(amount, 0, sellTokenAddress, buyTokenAddress, msg.sender, 0); + return amountOut; + } + + /// @notice Executes a buy order on the contract. + /// @param sellToken The token being sold. + /// @param buyToken The token being bought. + /// @param amountOut The amount of buyToken to receive. + /// @return calculatedAmount The amount of tokens received. + function buy( + IERC20 sellToken, + IERC20 buyToken, + uint256 amountOut + ) internal returns (uint256 calculatedAmount) { + address sellTokenAddress = address(sellToken); + address buyTokenAddress = address(buyToken); + uint256 amountIn = transmuter.quoteOut(amountOut, sellTokenAddress, buyTokenAddress); + + // TODO: use safeTransferFrom + sellToken.transferFrom(msg.sender, address(this), amountIn); + sellToken.approve(address(transmuter), amountIn); + transmuter.swapExactOutput(amountOut, type(uint256).max, sellTokenAddress, buyTokenAddress, msg.sender, 0); + return amountIn; + } } abstract contract ITransmuter { From 16237824a58a2ebc8401fd21455c73d561116acf Mon Sep 17 00:00:00 2001 From: domenicodev Date: Tue, 23 Jan 2024 19:06:02 +0100 Subject: [PATCH 06/25] fix: Fixed divisions in getLimits, added RESERVE_LIMIT_FACTOR as constant --- evm/src/angle/AngleAdapter.sol | 11 +++++++---- evm/src/angle/AngleUtils.sol | 2 ++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/evm/src/angle/AngleAdapter.sol b/evm/src/angle/AngleAdapter.sol index 36f9a62..63c6ef3 100644 --- a/evm/src/angle/AngleAdapter.sol +++ b/evm/src/angle/AngleAdapter.sol @@ -4,6 +4,7 @@ pragma solidity ^0.8.13; /// @dev Wrapped imports (incl. ISwapAdapter and IERC20) are included in utils import "./AngleUtils.sol"; +import "forge-std/Test.sol"; /// @title AngleAdapter contract AngleAdapter is ISwapAdapter { @@ -59,7 +60,7 @@ contract AngleAdapter is ISwapAdapter { /// @dev mint may have no limits, but we underestimate them to make sure, with the same amount of sellToken. /// We use the quoteIn (incl. fee), because calculating fee requires a part of the implementation of /// the Angle Diamond Storage, and therefore redundant functions and excessive contract size, with an high complexity. - /// In addition, we underestimate to * 0.9 to ensure swaps with OrderSide.Buy won't fail anyway. + /// In addition, we underestimate to / RESERVE_LIMIT_FACTOR to ensure swaps with OrderSide.Buy won't fail anyway. function getLimits(bytes32, IERC20 sellToken, IERC20 buyToken) external view @@ -79,8 +80,9 @@ contract AngleAdapter is ISwapAdapter { else { limits[0] = sellToken.balanceOf(transmuterAddress); } - limits[0] = limits[0] * 90 / 100; limits[1] = transmuter.quoteIn(limits[0], sellTokenAddress, buyTokenAddress); + limits[1] = limits[1] / RESERVE_LIMIT_FACTOR; + limits[0] = limits[0] / RESERVE_LIMIT_FACTOR; } else { // burn(sell agToken) Collateral memory collatInfo = transmuter.getCollateralInfo(buyTokenAddress); @@ -91,9 +93,9 @@ contract AngleAdapter is ISwapAdapter { else { collatLimit = buyToken.balanceOf(transmuterAddress); } - collatLimit = collatLimit * 90 / 100; limits[0] = transmuter.quoteIn(collatLimit, buyTokenAddress, sellTokenAddress); - limits[1] = collatLimit; + limits[1] = collatLimit / RESERVE_LIMIT_FACTOR; + limits[0] = limits[0] / RESERVE_LIMIT_FACTOR; } } @@ -140,6 +142,7 @@ contract AngleAdapter is ISwapAdapter { view returns (Fraction memory) { + console.log("log", amountIn, tokenIn, tokenOut); uint256 amountOut = transmuter.quoteIn(amountIn, tokenIn, tokenOut); return Fraction( amountOut, diff --git a/evm/src/angle/AngleUtils.sol b/evm/src/angle/AngleUtils.sol index 95ca64c..7a9d1e6 100644 --- a/evm/src/angle/AngleUtils.sol +++ b/evm/src/angle/AngleUtils.sol @@ -9,6 +9,8 @@ pragma solidity ^0.8.13; import {IERC20, ISwapAdapter} from "src/interfaces/ISwapAdapter.sol"; +/// @dev custom reserve limit factor to prevent revert errors in OrderSide.Buy +uint256 constant RESERVE_LIMIT_FACTOR = 5; interface IAgToken is IERC20 { /*////////////////////////////////////////////////////////////////////////////////////////////////////////////////// From b589940dc9ad7ec4f8649f0ae5bd53eed95f74c9 Mon Sep 17 00:00:00 2001 From: domenicodev Date: Tue, 23 Jan 2024 19:07:32 +0100 Subject: [PATCH 07/25] fix: Removed console logs --- evm/src/angle/AngleAdapter.sol | 2 -- 1 file changed, 2 deletions(-) diff --git a/evm/src/angle/AngleAdapter.sol b/evm/src/angle/AngleAdapter.sol index 63c6ef3..81f5ee3 100644 --- a/evm/src/angle/AngleAdapter.sol +++ b/evm/src/angle/AngleAdapter.sol @@ -4,7 +4,6 @@ pragma solidity ^0.8.13; /// @dev Wrapped imports (incl. ISwapAdapter and IERC20) are included in utils import "./AngleUtils.sol"; -import "forge-std/Test.sol"; /// @title AngleAdapter contract AngleAdapter is ISwapAdapter { @@ -142,7 +141,6 @@ contract AngleAdapter is ISwapAdapter { view returns (Fraction memory) { - console.log("log", amountIn, tokenIn, tokenOut); uint256 amountOut = transmuter.quoteIn(amountIn, tokenIn, tokenOut); return Fraction( amountOut, From 42ac2b1b60189708142b8c5ea3d7c2e7c96b077c Mon Sep 17 00:00:00 2001 From: domenicodev Date: Wed, 24 Jan 2024 11:21:35 +0100 Subject: [PATCH 08/25] feat: Added top comment explaining prices --- evm/src/angle/AngleAdapter.sol | 3 +++ 1 file changed, 3 insertions(+) diff --git a/evm/src/angle/AngleAdapter.sol b/evm/src/angle/AngleAdapter.sol index 81f5ee3..26bf0bb 100644 --- a/evm/src/angle/AngleAdapter.sol +++ b/evm/src/angle/AngleAdapter.sol @@ -6,6 +6,9 @@ pragma solidity ^0.8.13; import "./AngleUtils.sol"; /// @title AngleAdapter +/// @dev Information about prices: When swapping collateral to agEUR, the trade price will not decrease(amountOut); +/// Instead, when swapping agEUR to collateral, it will, because agEUR is minted, and this mechanism is used to +/// stabilize the agEUR price. contract AngleAdapter is ISwapAdapter { ITransmuter transmuter; From 69eeec4385a6f8e3bf4581bd242e51489129ea1a Mon Sep 17 00:00:00 2001 From: domenicodev Date: Wed, 24 Jan 2024 11:52:47 +0100 Subject: [PATCH 09/25] fix: Fixed getPriceAt to obtain the correct prices --- evm/src/angle/AngleAdapter.sol | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/evm/src/angle/AngleAdapter.sol b/evm/src/angle/AngleAdapter.sol index 26bf0bb..45833e6 100644 --- a/evm/src/angle/AngleAdapter.sol +++ b/evm/src/angle/AngleAdapter.sol @@ -29,7 +29,7 @@ contract AngleAdapter is ISwapAdapter { address buyTokenAddress = address(_buyToken); for (uint256 i = 0; i < _specifiedAmounts.length; i++) { - _prices[i] = getPriceAt(_specifiedAmounts[i], sellTokenAddress, buyTokenAddress); + _prices[i] = getPriceAt(_specifiedAmounts[i], sellTokenAddress, buyTokenAddress, OrderSide.Sell); } } @@ -49,12 +49,11 @@ contract AngleAdapter is ISwapAdapter { if (side == OrderSide.Sell) { trade.calculatedAmount = sell(sellToken, buyToken, specifiedAmount); - trade.price = getPriceAt(specifiedAmount, address(sellToken), address(buyToken)); } else { trade.calculatedAmount = buy(sellToken, buyToken, specifiedAmount); - trade.price = getPriceAt(specifiedAmount, address(buyToken), address(sellToken)); } + trade.price = getPriceAt(specifiedAmount, address(sellToken), address(buyToken), side); trade.gasUsed = gasBefore - gasleft(); } @@ -135,16 +134,26 @@ contract AngleAdapter is ISwapAdapter { } /// @notice Calculates pool prices for specified amounts - /// @param amountIn The amount of the token being sold + /// @param amount The amount of the token being sold(if side == Sell) or bought(if side == Buy) /// @param tokenIn The token being sold /// @param tokenOut The token being bought + /// @param side Order side /// @return The price as a fraction corresponding to the provided amount. - function getPriceAt(uint256 amountIn, address tokenIn, address tokenOut) + function getPriceAt(uint256 amount, address tokenIn, address tokenOut, OrderSide side) internal view returns (Fraction memory) { - uint256 amountOut = transmuter.quoteIn(amountIn, tokenIn, tokenOut); + uint256 amountOut; + uint256 amountIn; + if(side == OrderSide.Sell) { + amountIn = amount; + amountOut = transmuter.quoteIn(amountIn, tokenIn, tokenOut); + } + else { + amountOut = amount; + amountIn = transmuter.quoteOut(amount, tokenIn, tokenOut); + } return Fraction( amountOut, amountIn From 61bb75985cf21e1d8eb6289a172ce3a9b8b73b47 Mon Sep 17 00:00:00 2001 From: domenicodev Date: Wed, 24 Jan 2024 11:53:56 +0100 Subject: [PATCH 10/25] feat: Implemented getCapabilities --- evm/src/angle/AngleAdapter.sol | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/evm/src/angle/AngleAdapter.sol b/evm/src/angle/AngleAdapter.sol index 45833e6..55b5d2f 100644 --- a/evm/src/angle/AngleAdapter.sol +++ b/evm/src/angle/AngleAdapter.sol @@ -35,7 +35,7 @@ contract AngleAdapter is ISwapAdapter { /// @inheritdoc ISwapAdapter function swap( - bytes32 poolId, + bytes32, IERC20 sellToken, IERC20 buyToken, OrderSide side, @@ -100,11 +100,17 @@ contract AngleAdapter is ISwapAdapter { } } - function getCapabilities(bytes32 poolId, IERC20 sellToken, IERC20 buyToken) + /// @inheritdoc ISwapAdapter + function getCapabilities(bytes32, IERC20, IERC20) external + pure + override returns (Capability[] memory capabilities) { - revert NotImplemented("TemplateSwapAdapter.getCapabilities"); + capabilities = new Capability[](3); + capabilities[0] = Capability.SellOrder; + capabilities[1] = Capability.BuyOrder; + capabilities[2] = Capability.PriceFunction; } /// @inheritdoc ISwapAdapter From 8ef2f75faec68fb350c36c064987334b7285988f Mon Sep 17 00:00:00 2001 From: domenicodev Date: Wed, 24 Jan 2024 17:29:13 +0100 Subject: [PATCH 11/25] fix: Increased RESERVE_LIMIT_FACTOR to prevent reverts --- evm/src/angle/AngleUtils.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evm/src/angle/AngleUtils.sol b/evm/src/angle/AngleUtils.sol index 7a9d1e6..a346784 100644 --- a/evm/src/angle/AngleUtils.sol +++ b/evm/src/angle/AngleUtils.sol @@ -10,7 +10,7 @@ pragma solidity ^0.8.13; import {IERC20, ISwapAdapter} from "src/interfaces/ISwapAdapter.sol"; /// @dev custom reserve limit factor to prevent revert errors in OrderSide.Buy -uint256 constant RESERVE_LIMIT_FACTOR = 5; +uint256 constant RESERVE_LIMIT_FACTOR = 10; interface IAgToken is IERC20 { /*////////////////////////////////////////////////////////////////////////////////////////////////////////////////// From 96915bd158e1ba9f1c8cbcdef3c25f8f2593920c Mon Sep 17 00:00:00 2001 From: domenicodev Date: Wed, 24 Jan 2024 17:33:10 +0100 Subject: [PATCH 12/25] feat: Moved imports to main adapter file --- evm/src/angle/AngleAdapter.sol | 182 ++++++++++++++++++++++++++- evm/src/angle/AngleUtils.sol | 189 ---------------------------- evm/test/AngleAdapter.t.sol | 223 +++++++++++++++++++++++++++++++++ 3 files changed, 403 insertions(+), 191 deletions(-) delete mode 100644 evm/src/angle/AngleUtils.sol create mode 100644 evm/test/AngleAdapter.t.sol diff --git a/evm/src/angle/AngleAdapter.sol b/evm/src/angle/AngleAdapter.sol index 55b5d2f..96aeab8 100644 --- a/evm/src/angle/AngleAdapter.sol +++ b/evm/src/angle/AngleAdapter.sol @@ -2,8 +2,10 @@ pragma experimental ABIEncoderV2; pragma solidity ^0.8.13; -/// @dev Wrapped imports (incl. ISwapAdapter and IERC20) are included in utils -import "./AngleUtils.sol"; +import {IERC20, ISwapAdapter} from "src/interfaces/ISwapAdapter.sol"; + +/// @dev custom reserve limit factor to prevent revert errors in OrderSide.Buy +uint256 constant RESERVE_LIMIT_FACTOR = 10; /// @title AngleAdapter /// @dev Information about prices: When swapping collateral to agEUR, the trade price will not decrease(amountOut); @@ -209,6 +211,182 @@ contract AngleAdapter is ISwapAdapter { } } +interface IAgToken is IERC20 { + /*////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + MINTER ROLE ONLY FUNCTIONS + //////////////////////////////////////////////////////////////////////////////////////////////////////////////////*/ + + /// @notice Lets a whitelisted contract mint agTokens + /// @param account Address to mint to + /// @param amount Amount to mint + function mint(address account, uint256 amount) external; + + /// @notice Burns `amount` tokens from a `burner` address after being asked to by `sender` + /// @param amount Amount of tokens to burn + /// @param burner Address to burn from + /// @param sender Address which requested the burn from `burner` + /// @dev This method is to be called by a contract with the minter right after being requested + /// to do so by a `sender` address willing to burn tokens from another `burner` address + /// @dev The method checks the allowance between the `sender` and the `burner` + function burnFrom(uint256 amount, address burner, address sender) external; + + /// @notice Burns `amount` tokens from a `burner` address + /// @param amount Amount of tokens to burn + /// @param burner Address to burn from + /// @dev This method is to be called by a contract with a minter right on the AgToken after being + /// requested to do so by an address willing to burn tokens from its address + function burnSelf(uint256 amount, address burner) external; + + /*////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + TREASURY ONLY FUNCTIONS + //////////////////////////////////////////////////////////////////////////////////////////////////////////////////*/ + + /// @notice Adds a minter in the contract + /// @param minter Minter address to add + /// @dev Zero address checks are performed directly in the `Treasury` contract + function addMinter(address minter) external; + + /// @notice Removes a minter from the contract + /// @param minter Minter address to remove + /// @dev This function can also be called by a minter wishing to revoke itself + function removeMinter(address minter) external; + + /// @notice Sets a new treasury contract + /// @param _treasury New treasury address + function setTreasury(address _treasury) external; + + /*////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + EXTERNAL FUNCTIONS + //////////////////////////////////////////////////////////////////////////////////////////////////////////////////*/ + + /// @notice Checks whether an address has the right to mint agTokens + /// @param minter Address for which the minting right should be checked + /// @return Whether the address has the right to mint agTokens or not + function isMinter(address minter) external view returns (bool); + + /// @notice Amount of decimals of the stablecoin + function decimals() external view returns (uint8); +} + +enum ManagerType { + EXTERNAL +} + +enum WhitelistType { + BACKED +} + +struct ManagerStorage { + IERC20[] subCollaterals; // Subtokens handled by the manager or strategies + bytes config; // Additional configuration data +} + +struct Collateral { + uint8 isManaged; // If the collateral is managed through external strategies + uint8 isMintLive; // If minting from this asset is unpaused + uint8 isBurnLive; // If burning to this asset is unpaused + uint8 decimals; // IERC20Metadata(collateral).decimals() + uint8 onlyWhitelisted; // If only whitelisted addresses can burn or redeem for this token + uint216 normalizedStables; // Normalized amount of stablecoins issued from this collateral + uint64[] xFeeMint; // Increasing exposures in [0,BASE_9[ + int64[] yFeeMint; // Mint fees at the exposures specified in `xFeeMint` + uint64[] xFeeBurn; // Decreasing exposures in ]0,BASE_9] + int64[] yFeeBurn; // Burn fees at the exposures specified in `xFeeBurn` + bytes oracleConfig; // Data about the oracle used for the collateral + bytes whitelistData; // For whitelisted collateral, data used to verify whitelists + ManagerStorage managerData; // For managed collateral, data used to handle the strategies +} + +struct TransmuterStorage { + IAgToken agToken; // agToken handled by the system + uint8 isRedemptionLive; // If redemption is unpaused + uint8 statusReentrant; // If call is reentrant or not + uint128 normalizedStables; // Normalized amount of stablecoins issued by the system + uint128 normalizer; // To reconcile `normalizedStables` values with the actual amount + address[] collateralList; // List of collateral assets supported by the system + uint64[] xRedemptionCurve; // Increasing collateral ratios > 0 + int64[] yRedemptionCurve; // Value of the redemption fees at `xRedemptionCurve` + mapping(address => Collateral) collaterals; // Maps a collateral asset to its parameters + mapping(address => uint256) isTrusted; // If an address is trusted to update the normalizer value + mapping(address => uint256) isSellerTrusted; // If an address is trusted to sell accruing reward tokens + mapping(WhitelistType => mapping(address => uint256)) isWhitelistedForType; +} + +interface IManager { + /// @notice Returns the amount of collateral managed by the Manager + /// @return balances Balances of all the subCollaterals handled by the manager + /// @dev MUST NOT revert + function totalAssets() external view returns (uint256[] memory balances, uint256 totalValue); + + /// @notice Hook to invest `amount` of `collateral` + /// @dev MUST revert if the manager cannot accept these funds + /// @dev MUST have received the funds beforehand + function invest(uint256 amount) external; + + /// @notice Sends `amount` of `collateral` to the `to` address + /// @dev Called when `agToken` are burnt and during redemptions + // @dev MUST revert if there are not funds enough available + /// @dev MUST be callable only by the transmuter + function release(address asset, address to, uint256 amount) external; + + /// @notice Gives the maximum amount of collateral immediately available for a transfer + /// @dev Useful for integrators using `quoteIn` and `quoteOut` + function maxAvailable() external view returns (uint256); +} + +/// @title LibManager +/// @author Angle Labs, Inc. +/// @dev Managed collateral assets may be handled through external smart contracts or directly through this library +/// @dev There is no implementation at this point for a managed collateral handled through this library, and +/// a new specific `ManagerType` would need to be added in this case +library LibManager { + /// @notice Checks to which address managed funds must be transferred + function transferRecipient(bytes memory config) internal view returns (address recipient) { + (ManagerType managerType, bytes memory data) = parseManagerConfig(config); + recipient = address(this); + if (managerType == ManagerType.EXTERNAL) return abi.decode(data, (address)); + } + + /// @notice Performs a transfer of `token` for a collateral that is managed to a `to` address + /// @dev `token` may not be the actual collateral itself, as some collaterals have subcollaterals associated + /// with it + /// @dev Eventually pulls funds from strategies + function release(address token, address to, uint256 amount, bytes memory config) internal { + (ManagerType managerType, bytes memory data) = parseManagerConfig(config); + if (managerType == ManagerType.EXTERNAL) abi.decode(data, (IManager)).release(token, to, amount); + } + + /// @notice Gets the balances of all the tokens controlled through `managerData` + /// @return balances An array of size `subCollaterals` with current balances of all subCollaterals + /// including the one corresponding to the `managerData` given + /// @return totalValue The value of all the `subCollaterals` in `collateral` + /// @dev `subCollaterals` must always have as first token (index 0) the collateral itself + function totalAssets(bytes memory config) internal view returns (uint256[] memory balances, uint256 totalValue) { + (ManagerType managerType, bytes memory data) = parseManagerConfig(config); + if (managerType == ManagerType.EXTERNAL) return abi.decode(data, (IManager)).totalAssets(); + } + + /// @notice Calls a hook if needed after new funds have been transfered to a manager + function invest(uint256 amount, bytes memory config) internal { + (ManagerType managerType, bytes memory data) = parseManagerConfig(config); + if (managerType == ManagerType.EXTERNAL) abi.decode(data, (IManager)).invest(amount); + } + + /// @notice Returns available underlying tokens, for instance if liquidity is fully used and + /// not withdrawable the function will return 0 + function maxAvailable(bytes memory config) internal view returns (uint256 available) { + (ManagerType managerType, bytes memory data) = parseManagerConfig(config); + if (managerType == ManagerType.EXTERNAL) return abi.decode(data, (IManager)).maxAvailable(); + } + + /// @notice Decodes the `managerData` associated to a collateral + function parseManagerConfig( + bytes memory config + ) internal pure returns (ManagerType managerType, bytes memory data) { + (managerType, data) = abi.decode(config, (ManagerType, bytes)); + } +} + abstract contract ITransmuter { function implementation() external view returns (address) {} diff --git a/evm/src/angle/AngleUtils.sol b/evm/src/angle/AngleUtils.sol deleted file mode 100644 index a346784..0000000 --- a/evm/src/angle/AngleUtils.sol +++ /dev/null @@ -1,189 +0,0 @@ -// SPDX-License-Identifier: MIT -pragma solidity ^0.8.13; - -/** - * @dev Collection of wrapped interfaces, items and libraries for Angle - * we use them here to maintain integrity and readability of contracts - * as there are many different imports and items - */ - -import {IERC20, ISwapAdapter} from "src/interfaces/ISwapAdapter.sol"; - -/// @dev custom reserve limit factor to prevent revert errors in OrderSide.Buy -uint256 constant RESERVE_LIMIT_FACTOR = 10; - -interface IAgToken is IERC20 { - /*////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - MINTER ROLE ONLY FUNCTIONS - //////////////////////////////////////////////////////////////////////////////////////////////////////////////////*/ - - /// @notice Lets a whitelisted contract mint agTokens - /// @param account Address to mint to - /// @param amount Amount to mint - function mint(address account, uint256 amount) external; - - /// @notice Burns `amount` tokens from a `burner` address after being asked to by `sender` - /// @param amount Amount of tokens to burn - /// @param burner Address to burn from - /// @param sender Address which requested the burn from `burner` - /// @dev This method is to be called by a contract with the minter right after being requested - /// to do so by a `sender` address willing to burn tokens from another `burner` address - /// @dev The method checks the allowance between the `sender` and the `burner` - function burnFrom(uint256 amount, address burner, address sender) external; - - /// @notice Burns `amount` tokens from a `burner` address - /// @param amount Amount of tokens to burn - /// @param burner Address to burn from - /// @dev This method is to be called by a contract with a minter right on the AgToken after being - /// requested to do so by an address willing to burn tokens from its address - function burnSelf(uint256 amount, address burner) external; - - /*////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - TREASURY ONLY FUNCTIONS - //////////////////////////////////////////////////////////////////////////////////////////////////////////////////*/ - - /// @notice Adds a minter in the contract - /// @param minter Minter address to add - /// @dev Zero address checks are performed directly in the `Treasury` contract - function addMinter(address minter) external; - - /// @notice Removes a minter from the contract - /// @param minter Minter address to remove - /// @dev This function can also be called by a minter wishing to revoke itself - function removeMinter(address minter) external; - - /// @notice Sets a new treasury contract - /// @param _treasury New treasury address - function setTreasury(address _treasury) external; - - /*////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - EXTERNAL FUNCTIONS - //////////////////////////////////////////////////////////////////////////////////////////////////////////////////*/ - - /// @notice Checks whether an address has the right to mint agTokens - /// @param minter Address for which the minting right should be checked - /// @return Whether the address has the right to mint agTokens or not - function isMinter(address minter) external view returns (bool); - - /// @notice Amount of decimals of the stablecoin - function decimals() external view returns (uint8); -} - -enum ManagerType { - EXTERNAL -} - -enum WhitelistType { - BACKED -} - -struct ManagerStorage { - IERC20[] subCollaterals; // Subtokens handled by the manager or strategies - bytes config; // Additional configuration data -} - -struct Collateral { - uint8 isManaged; // If the collateral is managed through external strategies - uint8 isMintLive; // If minting from this asset is unpaused - uint8 isBurnLive; // If burning to this asset is unpaused - uint8 decimals; // IERC20Metadata(collateral).decimals() - uint8 onlyWhitelisted; // If only whitelisted addresses can burn or redeem for this token - uint216 normalizedStables; // Normalized amount of stablecoins issued from this collateral - uint64[] xFeeMint; // Increasing exposures in [0,BASE_9[ - int64[] yFeeMint; // Mint fees at the exposures specified in `xFeeMint` - uint64[] xFeeBurn; // Decreasing exposures in ]0,BASE_9] - int64[] yFeeBurn; // Burn fees at the exposures specified in `xFeeBurn` - bytes oracleConfig; // Data about the oracle used for the collateral - bytes whitelistData; // For whitelisted collateral, data used to verify whitelists - ManagerStorage managerData; // For managed collateral, data used to handle the strategies -} - -struct TransmuterStorage { - IAgToken agToken; // agToken handled by the system - uint8 isRedemptionLive; // If redemption is unpaused - uint8 statusReentrant; // If call is reentrant or not - uint128 normalizedStables; // Normalized amount of stablecoins issued by the system - uint128 normalizer; // To reconcile `normalizedStables` values with the actual amount - address[] collateralList; // List of collateral assets supported by the system - uint64[] xRedemptionCurve; // Increasing collateral ratios > 0 - int64[] yRedemptionCurve; // Value of the redemption fees at `xRedemptionCurve` - mapping(address => Collateral) collaterals; // Maps a collateral asset to its parameters - mapping(address => uint256) isTrusted; // If an address is trusted to update the normalizer value - mapping(address => uint256) isSellerTrusted; // If an address is trusted to sell accruing reward tokens - mapping(WhitelistType => mapping(address => uint256)) isWhitelistedForType; -} - -interface IManager { - /// @notice Returns the amount of collateral managed by the Manager - /// @return balances Balances of all the subCollaterals handled by the manager - /// @dev MUST NOT revert - function totalAssets() external view returns (uint256[] memory balances, uint256 totalValue); - - /// @notice Hook to invest `amount` of `collateral` - /// @dev MUST revert if the manager cannot accept these funds - /// @dev MUST have received the funds beforehand - function invest(uint256 amount) external; - - /// @notice Sends `amount` of `collateral` to the `to` address - /// @dev Called when `agToken` are burnt and during redemptions - // @dev MUST revert if there are not funds enough available - /// @dev MUST be callable only by the transmuter - function release(address asset, address to, uint256 amount) external; - - /// @notice Gives the maximum amount of collateral immediately available for a transfer - /// @dev Useful for integrators using `quoteIn` and `quoteOut` - function maxAvailable() external view returns (uint256); -} - -/// @title LibManager -/// @author Angle Labs, Inc. -/// @dev Managed collateral assets may be handled through external smart contracts or directly through this library -/// @dev There is no implementation at this point for a managed collateral handled through this library, and -/// a new specific `ManagerType` would need to be added in this case -library LibManager { - /// @notice Checks to which address managed funds must be transferred - function transferRecipient(bytes memory config) internal view returns (address recipient) { - (ManagerType managerType, bytes memory data) = parseManagerConfig(config); - recipient = address(this); - if (managerType == ManagerType.EXTERNAL) return abi.decode(data, (address)); - } - - /// @notice Performs a transfer of `token` for a collateral that is managed to a `to` address - /// @dev `token` may not be the actual collateral itself, as some collaterals have subcollaterals associated - /// with it - /// @dev Eventually pulls funds from strategies - function release(address token, address to, uint256 amount, bytes memory config) internal { - (ManagerType managerType, bytes memory data) = parseManagerConfig(config); - if (managerType == ManagerType.EXTERNAL) abi.decode(data, (IManager)).release(token, to, amount); - } - - /// @notice Gets the balances of all the tokens controlled through `managerData` - /// @return balances An array of size `subCollaterals` with current balances of all subCollaterals - /// including the one corresponding to the `managerData` given - /// @return totalValue The value of all the `subCollaterals` in `collateral` - /// @dev `subCollaterals` must always have as first token (index 0) the collateral itself - function totalAssets(bytes memory config) internal view returns (uint256[] memory balances, uint256 totalValue) { - (ManagerType managerType, bytes memory data) = parseManagerConfig(config); - if (managerType == ManagerType.EXTERNAL) return abi.decode(data, (IManager)).totalAssets(); - } - - /// @notice Calls a hook if needed after new funds have been transfered to a manager - function invest(uint256 amount, bytes memory config) internal { - (ManagerType managerType, bytes memory data) = parseManagerConfig(config); - if (managerType == ManagerType.EXTERNAL) abi.decode(data, (IManager)).invest(amount); - } - - /// @notice Returns available underlying tokens, for instance if liquidity is fully used and - /// not withdrawable the function will return 0 - function maxAvailable(bytes memory config) internal view returns (uint256 available) { - (ManagerType managerType, bytes memory data) = parseManagerConfig(config); - if (managerType == ManagerType.EXTERNAL) return abi.decode(data, (IManager)).maxAvailable(); - } - - /// @notice Decodes the `managerData` associated to a collateral - function parseManagerConfig( - bytes memory config - ) internal pure returns (ManagerType managerType, bytes memory data) { - (managerType, data) = abi.decode(config, (ManagerType, bytes)); - } -} diff --git a/evm/test/AngleAdapter.t.sol b/evm/test/AngleAdapter.t.sol new file mode 100644 index 0000000..fe0c7c8 --- /dev/null +++ b/evm/test/AngleAdapter.t.sol @@ -0,0 +1,223 @@ +// SPDX-License-Identifier: AGPL-3.0-or-later +pragma solidity ^0.8.13; + +import "forge-std/Test.sol"; +import "openzeppelin-contracts/contracts/interfaces/IERC20.sol"; +import "src/angle/AngleAdapter.sol"; +import "src/interfaces/ISwapAdapterTypes.sol"; +import "src/libraries/FractionMath.sol"; + +contract AngleAdapterTest is Test, ISwapAdapterTypes { + using FractionMath for Fraction; + + AngleAdapter adapter; + IERC20 agEUR; + IERC20 constant EURC = IERC20(0x1aBaEA1f7C830bD89Acc67eC4af516284b1bC33c); + ITransmuter constant transmuter = ITransmuter(0x00253582b2a3FE112feEC532221d9708c64cEFAb); + + uint256 constant TEST_ITERATIONS = 100; + + function setUp() public { + uint256 forkBlock = 18921770; + vm.createSelectFork(vm.rpcUrl("mainnet"), forkBlock); + adapter = new + AngleAdapter(transmuter); + agEUR = IERC20(transmuter.agToken()); + + vm.label(address(adapter), "AngleAdapter"); + vm.label(address(agEUR), "agEUR"); + vm.label(address(EURC), "EURC"); + } + + function testPriceFuzzAngle(uint256 amount0, uint256 amount1) public { + bytes32 pair = bytes32(0); + uint256[] memory limits = adapter.getLimits(pair, EURC, agEUR); + vm.assume(amount0 < limits[0] && amount0 > 0); + vm.assume(amount1 < limits[0] && amount1 > 0); + + uint256[] memory amounts = new uint256[](2); + amounts[0] = amount0; + amounts[1] = amount1; + + Fraction[] memory prices = adapter.price(pair, EURC, agEUR, amounts); + + for (uint256 i = 0; i < prices.length; i++) { + assertGt(prices[i].numerator, 0); + assertGt(prices[i].denominator, 0); + } + } + + + function testPriceDecreasingAngle() public { + bytes32 pair = bytes32(0); + uint256[] memory amounts = new uint256[](TEST_ITERATIONS); + + for (uint256 i = 0; i < TEST_ITERATIONS; i++) { + amounts[i] = 1000 * (i+1) * 10 ** 18; + } + + Fraction[] memory prices = adapter.price(pair, agEUR, EURC, amounts); + + for (uint256 i = 0; i < TEST_ITERATIONS - 1; i++) { + assertEq(prices[i].compareFractions(prices[i + 1]), 1); + assertGt(prices[i].denominator, 0); + assertGt(prices[i + 1].denominator, 0); + } + } + + function testSwapFuzzAngleMint(uint256 specifiedAmount, bool isBuy) public { + OrderSide side = isBuy ? OrderSide.Buy : OrderSide.Sell; + + bytes32 pair = bytes32(0); + uint256[] memory limits = adapter.getLimits(pair, EURC, agEUR); + + if (side == OrderSide.Buy) { + vm.assume(specifiedAmount < limits[1] && specifiedAmount > 0); + + deal(address(EURC), address(this), type(uint256).max); + EURC.approve(address(adapter), type(uint256).max); + } else { + vm.assume(specifiedAmount < limits[0] && specifiedAmount > 0); + + deal(address(EURC), address(this), specifiedAmount); + EURC.approve(address(adapter), specifiedAmount); + } + + uint256 eurc_balance = EURC.balanceOf(address(this)); + uint256 agEUR_balance = agEUR.balanceOf(address(this)); + + Trade memory trade = + adapter.swap(pair, EURC, agEUR, side, specifiedAmount); + + if (trade.calculatedAmount > 0) { + if (side == OrderSide.Buy) { + assertEq( + specifiedAmount, + agEUR.balanceOf(address(this)) - agEUR_balance + ); + assertEq( + trade.calculatedAmount, + eurc_balance - EURC.balanceOf(address(this)) + ); + } else { + assertEq( + specifiedAmount, + eurc_balance - EURC.balanceOf(address(this)) + ); + assertEq( + trade.calculatedAmount, + agEUR.balanceOf(address(this)) - agEUR_balance + ); + } + } + } + + function testSwapFuzzAngleRedeem(uint256 specifiedAmount, bool isBuy) public { + OrderSide side = isBuy ? OrderSide.Buy : OrderSide.Sell; + + bytes32 pair = bytes32(0); + uint256[] memory limits = adapter.getLimits(pair, agEUR, EURC); + console.log(limits[0], limits[1]); + + if (side == OrderSide.Buy) { + vm.assume(specifiedAmount < limits[1] && specifiedAmount > 0); + + deal(address(agEUR), address(this), type(uint256).max); + agEUR.approve(address(adapter), type(uint256).max); + } else { + vm.assume(specifiedAmount < limits[0] && specifiedAmount > 0); + + deal(address(agEUR), address(this), specifiedAmount); + agEUR.approve(address(adapter), specifiedAmount); + } + + uint256 eurc_balance = EURC.balanceOf(address(this)); + uint256 agEUR_balance = agEUR.balanceOf(address(this)); + + Trade memory trade = + adapter.swap(pair, agEUR, EURC, side, specifiedAmount); + + if (trade.calculatedAmount > 0) { + if (side == OrderSide.Buy) { + assertEq( + specifiedAmount, + EURC.balanceOf(address(this)) - eurc_balance + ); + assertEq( + trade.calculatedAmount, + agEUR_balance - agEUR.balanceOf(address(this)) + ); + } else { + assertEq( + specifiedAmount, + agEUR_balance - agEUR.balanceOf(address(this)) + ); + assertEq( + trade.calculatedAmount, + EURC.balanceOf(address(this)) - eurc_balance + ); + } + } + } + + function testSwapSellIncreasingAngle() public { + executeIncreasingSwapsAngle(OrderSide.Sell); + } + + function executeIncreasingSwapsAngle(OrderSide side) internal { + bytes32 pair = bytes32(0); + + uint256[] memory amounts = new uint256[](TEST_ITERATIONS); + for (uint256 i = 0; i < TEST_ITERATIONS; i++) { + amounts[i] = + side == OrderSide.Sell ? (100 * i * 10 ** 18) : (100 * i * 10 ** 6); + } + + Trade[] memory trades = new Trade[](TEST_ITERATIONS); + uint256 beforeSwap; + for (uint256 i = 1; i < TEST_ITERATIONS; i++) { + beforeSwap = vm.snapshot(); + + if(side == OrderSide.Sell) { + deal(address(agEUR), address(this), amounts[i]); + agEUR.approve(address(adapter), amounts[i]); + } + else { + deal(address(agEUR), address(this), type(uint256).max); + agEUR.approve(address(adapter), type(uint256).max); + } + + trades[i] = adapter.swap(pair, agEUR, EURC, side, amounts[i]); + vm.revertTo(beforeSwap); + } + + for (uint256 i = 1; i < TEST_ITERATIONS - 1; i++) { + assertLe(trades[i].calculatedAmount, trades[i + 1].calculatedAmount); + assertEq(trades[i].price.compareFractions(trades[i + 1].price), 1); + } + } + + function testSwapBuyIncreasingAngle() public { + executeIncreasingSwapsAngle(OrderSide.Buy); + } + + function testGetCapabilitiesAngle(bytes32 pair, address t0, address t1) public { + Capability[] memory res = + adapter.getCapabilities(pair, IERC20(t0), IERC20(t1)); + + assertEq(res.length, 3); + } + + function testGetTokensAngle() public { + IERC20[] memory tokens = adapter.getTokens(bytes32(0)); + + assertGe(tokens.length, 2); + } + + function testGetLimits() public { + bytes32 pair = bytes32(0); + uint256[] memory limits = adapter.getLimits(pair, agEUR, EURC); + + assertEq(limits.length, 2); + } +} From 174c4e158afd4c475c2e4126f7f6db50784a1698 Mon Sep 17 00:00:00 2001 From: domenicodev Date: Wed, 24 Jan 2024 17:33:47 +0100 Subject: [PATCH 13/25] Revert "feat: Moved imports to main adapter file" This reverts commit 96915bd158e1ba9f1c8cbcdef3c25f8f2593920c. --- evm/src/angle/AngleAdapter.sol | 182 +-------------------------- evm/src/angle/AngleUtils.sol | 189 ++++++++++++++++++++++++++++ evm/test/AngleAdapter.t.sol | 223 --------------------------------- 3 files changed, 191 insertions(+), 403 deletions(-) create mode 100644 evm/src/angle/AngleUtils.sol delete mode 100644 evm/test/AngleAdapter.t.sol diff --git a/evm/src/angle/AngleAdapter.sol b/evm/src/angle/AngleAdapter.sol index 96aeab8..55b5d2f 100644 --- a/evm/src/angle/AngleAdapter.sol +++ b/evm/src/angle/AngleAdapter.sol @@ -2,10 +2,8 @@ pragma experimental ABIEncoderV2; pragma solidity ^0.8.13; -import {IERC20, ISwapAdapter} from "src/interfaces/ISwapAdapter.sol"; - -/// @dev custom reserve limit factor to prevent revert errors in OrderSide.Buy -uint256 constant RESERVE_LIMIT_FACTOR = 10; +/// @dev Wrapped imports (incl. ISwapAdapter and IERC20) are included in utils +import "./AngleUtils.sol"; /// @title AngleAdapter /// @dev Information about prices: When swapping collateral to agEUR, the trade price will not decrease(amountOut); @@ -211,182 +209,6 @@ contract AngleAdapter is ISwapAdapter { } } -interface IAgToken is IERC20 { - /*////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - MINTER ROLE ONLY FUNCTIONS - //////////////////////////////////////////////////////////////////////////////////////////////////////////////////*/ - - /// @notice Lets a whitelisted contract mint agTokens - /// @param account Address to mint to - /// @param amount Amount to mint - function mint(address account, uint256 amount) external; - - /// @notice Burns `amount` tokens from a `burner` address after being asked to by `sender` - /// @param amount Amount of tokens to burn - /// @param burner Address to burn from - /// @param sender Address which requested the burn from `burner` - /// @dev This method is to be called by a contract with the minter right after being requested - /// to do so by a `sender` address willing to burn tokens from another `burner` address - /// @dev The method checks the allowance between the `sender` and the `burner` - function burnFrom(uint256 amount, address burner, address sender) external; - - /// @notice Burns `amount` tokens from a `burner` address - /// @param amount Amount of tokens to burn - /// @param burner Address to burn from - /// @dev This method is to be called by a contract with a minter right on the AgToken after being - /// requested to do so by an address willing to burn tokens from its address - function burnSelf(uint256 amount, address burner) external; - - /*////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - TREASURY ONLY FUNCTIONS - //////////////////////////////////////////////////////////////////////////////////////////////////////////////////*/ - - /// @notice Adds a minter in the contract - /// @param minter Minter address to add - /// @dev Zero address checks are performed directly in the `Treasury` contract - function addMinter(address minter) external; - - /// @notice Removes a minter from the contract - /// @param minter Minter address to remove - /// @dev This function can also be called by a minter wishing to revoke itself - function removeMinter(address minter) external; - - /// @notice Sets a new treasury contract - /// @param _treasury New treasury address - function setTreasury(address _treasury) external; - - /*////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - EXTERNAL FUNCTIONS - //////////////////////////////////////////////////////////////////////////////////////////////////////////////////*/ - - /// @notice Checks whether an address has the right to mint agTokens - /// @param minter Address for which the minting right should be checked - /// @return Whether the address has the right to mint agTokens or not - function isMinter(address minter) external view returns (bool); - - /// @notice Amount of decimals of the stablecoin - function decimals() external view returns (uint8); -} - -enum ManagerType { - EXTERNAL -} - -enum WhitelistType { - BACKED -} - -struct ManagerStorage { - IERC20[] subCollaterals; // Subtokens handled by the manager or strategies - bytes config; // Additional configuration data -} - -struct Collateral { - uint8 isManaged; // If the collateral is managed through external strategies - uint8 isMintLive; // If minting from this asset is unpaused - uint8 isBurnLive; // If burning to this asset is unpaused - uint8 decimals; // IERC20Metadata(collateral).decimals() - uint8 onlyWhitelisted; // If only whitelisted addresses can burn or redeem for this token - uint216 normalizedStables; // Normalized amount of stablecoins issued from this collateral - uint64[] xFeeMint; // Increasing exposures in [0,BASE_9[ - int64[] yFeeMint; // Mint fees at the exposures specified in `xFeeMint` - uint64[] xFeeBurn; // Decreasing exposures in ]0,BASE_9] - int64[] yFeeBurn; // Burn fees at the exposures specified in `xFeeBurn` - bytes oracleConfig; // Data about the oracle used for the collateral - bytes whitelistData; // For whitelisted collateral, data used to verify whitelists - ManagerStorage managerData; // For managed collateral, data used to handle the strategies -} - -struct TransmuterStorage { - IAgToken agToken; // agToken handled by the system - uint8 isRedemptionLive; // If redemption is unpaused - uint8 statusReentrant; // If call is reentrant or not - uint128 normalizedStables; // Normalized amount of stablecoins issued by the system - uint128 normalizer; // To reconcile `normalizedStables` values with the actual amount - address[] collateralList; // List of collateral assets supported by the system - uint64[] xRedemptionCurve; // Increasing collateral ratios > 0 - int64[] yRedemptionCurve; // Value of the redemption fees at `xRedemptionCurve` - mapping(address => Collateral) collaterals; // Maps a collateral asset to its parameters - mapping(address => uint256) isTrusted; // If an address is trusted to update the normalizer value - mapping(address => uint256) isSellerTrusted; // If an address is trusted to sell accruing reward tokens - mapping(WhitelistType => mapping(address => uint256)) isWhitelistedForType; -} - -interface IManager { - /// @notice Returns the amount of collateral managed by the Manager - /// @return balances Balances of all the subCollaterals handled by the manager - /// @dev MUST NOT revert - function totalAssets() external view returns (uint256[] memory balances, uint256 totalValue); - - /// @notice Hook to invest `amount` of `collateral` - /// @dev MUST revert if the manager cannot accept these funds - /// @dev MUST have received the funds beforehand - function invest(uint256 amount) external; - - /// @notice Sends `amount` of `collateral` to the `to` address - /// @dev Called when `agToken` are burnt and during redemptions - // @dev MUST revert if there are not funds enough available - /// @dev MUST be callable only by the transmuter - function release(address asset, address to, uint256 amount) external; - - /// @notice Gives the maximum amount of collateral immediately available for a transfer - /// @dev Useful for integrators using `quoteIn` and `quoteOut` - function maxAvailable() external view returns (uint256); -} - -/// @title LibManager -/// @author Angle Labs, Inc. -/// @dev Managed collateral assets may be handled through external smart contracts or directly through this library -/// @dev There is no implementation at this point for a managed collateral handled through this library, and -/// a new specific `ManagerType` would need to be added in this case -library LibManager { - /// @notice Checks to which address managed funds must be transferred - function transferRecipient(bytes memory config) internal view returns (address recipient) { - (ManagerType managerType, bytes memory data) = parseManagerConfig(config); - recipient = address(this); - if (managerType == ManagerType.EXTERNAL) return abi.decode(data, (address)); - } - - /// @notice Performs a transfer of `token` for a collateral that is managed to a `to` address - /// @dev `token` may not be the actual collateral itself, as some collaterals have subcollaterals associated - /// with it - /// @dev Eventually pulls funds from strategies - function release(address token, address to, uint256 amount, bytes memory config) internal { - (ManagerType managerType, bytes memory data) = parseManagerConfig(config); - if (managerType == ManagerType.EXTERNAL) abi.decode(data, (IManager)).release(token, to, amount); - } - - /// @notice Gets the balances of all the tokens controlled through `managerData` - /// @return balances An array of size `subCollaterals` with current balances of all subCollaterals - /// including the one corresponding to the `managerData` given - /// @return totalValue The value of all the `subCollaterals` in `collateral` - /// @dev `subCollaterals` must always have as first token (index 0) the collateral itself - function totalAssets(bytes memory config) internal view returns (uint256[] memory balances, uint256 totalValue) { - (ManagerType managerType, bytes memory data) = parseManagerConfig(config); - if (managerType == ManagerType.EXTERNAL) return abi.decode(data, (IManager)).totalAssets(); - } - - /// @notice Calls a hook if needed after new funds have been transfered to a manager - function invest(uint256 amount, bytes memory config) internal { - (ManagerType managerType, bytes memory data) = parseManagerConfig(config); - if (managerType == ManagerType.EXTERNAL) abi.decode(data, (IManager)).invest(amount); - } - - /// @notice Returns available underlying tokens, for instance if liquidity is fully used and - /// not withdrawable the function will return 0 - function maxAvailable(bytes memory config) internal view returns (uint256 available) { - (ManagerType managerType, bytes memory data) = parseManagerConfig(config); - if (managerType == ManagerType.EXTERNAL) return abi.decode(data, (IManager)).maxAvailable(); - } - - /// @notice Decodes the `managerData` associated to a collateral - function parseManagerConfig( - bytes memory config - ) internal pure returns (ManagerType managerType, bytes memory data) { - (managerType, data) = abi.decode(config, (ManagerType, bytes)); - } -} - abstract contract ITransmuter { function implementation() external view returns (address) {} diff --git a/evm/src/angle/AngleUtils.sol b/evm/src/angle/AngleUtils.sol new file mode 100644 index 0000000..a346784 --- /dev/null +++ b/evm/src/angle/AngleUtils.sol @@ -0,0 +1,189 @@ +// SPDX-License-Identifier: MIT +pragma solidity ^0.8.13; + +/** + * @dev Collection of wrapped interfaces, items and libraries for Angle + * we use them here to maintain integrity and readability of contracts + * as there are many different imports and items + */ + +import {IERC20, ISwapAdapter} from "src/interfaces/ISwapAdapter.sol"; + +/// @dev custom reserve limit factor to prevent revert errors in OrderSide.Buy +uint256 constant RESERVE_LIMIT_FACTOR = 10; + +interface IAgToken is IERC20 { + /*////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + MINTER ROLE ONLY FUNCTIONS + //////////////////////////////////////////////////////////////////////////////////////////////////////////////////*/ + + /// @notice Lets a whitelisted contract mint agTokens + /// @param account Address to mint to + /// @param amount Amount to mint + function mint(address account, uint256 amount) external; + + /// @notice Burns `amount` tokens from a `burner` address after being asked to by `sender` + /// @param amount Amount of tokens to burn + /// @param burner Address to burn from + /// @param sender Address which requested the burn from `burner` + /// @dev This method is to be called by a contract with the minter right after being requested + /// to do so by a `sender` address willing to burn tokens from another `burner` address + /// @dev The method checks the allowance between the `sender` and the `burner` + function burnFrom(uint256 amount, address burner, address sender) external; + + /// @notice Burns `amount` tokens from a `burner` address + /// @param amount Amount of tokens to burn + /// @param burner Address to burn from + /// @dev This method is to be called by a contract with a minter right on the AgToken after being + /// requested to do so by an address willing to burn tokens from its address + function burnSelf(uint256 amount, address burner) external; + + /*////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + TREASURY ONLY FUNCTIONS + //////////////////////////////////////////////////////////////////////////////////////////////////////////////////*/ + + /// @notice Adds a minter in the contract + /// @param minter Minter address to add + /// @dev Zero address checks are performed directly in the `Treasury` contract + function addMinter(address minter) external; + + /// @notice Removes a minter from the contract + /// @param minter Minter address to remove + /// @dev This function can also be called by a minter wishing to revoke itself + function removeMinter(address minter) external; + + /// @notice Sets a new treasury contract + /// @param _treasury New treasury address + function setTreasury(address _treasury) external; + + /*////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + EXTERNAL FUNCTIONS + //////////////////////////////////////////////////////////////////////////////////////////////////////////////////*/ + + /// @notice Checks whether an address has the right to mint agTokens + /// @param minter Address for which the minting right should be checked + /// @return Whether the address has the right to mint agTokens or not + function isMinter(address minter) external view returns (bool); + + /// @notice Amount of decimals of the stablecoin + function decimals() external view returns (uint8); +} + +enum ManagerType { + EXTERNAL +} + +enum WhitelistType { + BACKED +} + +struct ManagerStorage { + IERC20[] subCollaterals; // Subtokens handled by the manager or strategies + bytes config; // Additional configuration data +} + +struct Collateral { + uint8 isManaged; // If the collateral is managed through external strategies + uint8 isMintLive; // If minting from this asset is unpaused + uint8 isBurnLive; // If burning to this asset is unpaused + uint8 decimals; // IERC20Metadata(collateral).decimals() + uint8 onlyWhitelisted; // If only whitelisted addresses can burn or redeem for this token + uint216 normalizedStables; // Normalized amount of stablecoins issued from this collateral + uint64[] xFeeMint; // Increasing exposures in [0,BASE_9[ + int64[] yFeeMint; // Mint fees at the exposures specified in `xFeeMint` + uint64[] xFeeBurn; // Decreasing exposures in ]0,BASE_9] + int64[] yFeeBurn; // Burn fees at the exposures specified in `xFeeBurn` + bytes oracleConfig; // Data about the oracle used for the collateral + bytes whitelistData; // For whitelisted collateral, data used to verify whitelists + ManagerStorage managerData; // For managed collateral, data used to handle the strategies +} + +struct TransmuterStorage { + IAgToken agToken; // agToken handled by the system + uint8 isRedemptionLive; // If redemption is unpaused + uint8 statusReentrant; // If call is reentrant or not + uint128 normalizedStables; // Normalized amount of stablecoins issued by the system + uint128 normalizer; // To reconcile `normalizedStables` values with the actual amount + address[] collateralList; // List of collateral assets supported by the system + uint64[] xRedemptionCurve; // Increasing collateral ratios > 0 + int64[] yRedemptionCurve; // Value of the redemption fees at `xRedemptionCurve` + mapping(address => Collateral) collaterals; // Maps a collateral asset to its parameters + mapping(address => uint256) isTrusted; // If an address is trusted to update the normalizer value + mapping(address => uint256) isSellerTrusted; // If an address is trusted to sell accruing reward tokens + mapping(WhitelistType => mapping(address => uint256)) isWhitelistedForType; +} + +interface IManager { + /// @notice Returns the amount of collateral managed by the Manager + /// @return balances Balances of all the subCollaterals handled by the manager + /// @dev MUST NOT revert + function totalAssets() external view returns (uint256[] memory balances, uint256 totalValue); + + /// @notice Hook to invest `amount` of `collateral` + /// @dev MUST revert if the manager cannot accept these funds + /// @dev MUST have received the funds beforehand + function invest(uint256 amount) external; + + /// @notice Sends `amount` of `collateral` to the `to` address + /// @dev Called when `agToken` are burnt and during redemptions + // @dev MUST revert if there are not funds enough available + /// @dev MUST be callable only by the transmuter + function release(address asset, address to, uint256 amount) external; + + /// @notice Gives the maximum amount of collateral immediately available for a transfer + /// @dev Useful for integrators using `quoteIn` and `quoteOut` + function maxAvailable() external view returns (uint256); +} + +/// @title LibManager +/// @author Angle Labs, Inc. +/// @dev Managed collateral assets may be handled through external smart contracts or directly through this library +/// @dev There is no implementation at this point for a managed collateral handled through this library, and +/// a new specific `ManagerType` would need to be added in this case +library LibManager { + /// @notice Checks to which address managed funds must be transferred + function transferRecipient(bytes memory config) internal view returns (address recipient) { + (ManagerType managerType, bytes memory data) = parseManagerConfig(config); + recipient = address(this); + if (managerType == ManagerType.EXTERNAL) return abi.decode(data, (address)); + } + + /// @notice Performs a transfer of `token` for a collateral that is managed to a `to` address + /// @dev `token` may not be the actual collateral itself, as some collaterals have subcollaterals associated + /// with it + /// @dev Eventually pulls funds from strategies + function release(address token, address to, uint256 amount, bytes memory config) internal { + (ManagerType managerType, bytes memory data) = parseManagerConfig(config); + if (managerType == ManagerType.EXTERNAL) abi.decode(data, (IManager)).release(token, to, amount); + } + + /// @notice Gets the balances of all the tokens controlled through `managerData` + /// @return balances An array of size `subCollaterals` with current balances of all subCollaterals + /// including the one corresponding to the `managerData` given + /// @return totalValue The value of all the `subCollaterals` in `collateral` + /// @dev `subCollaterals` must always have as first token (index 0) the collateral itself + function totalAssets(bytes memory config) internal view returns (uint256[] memory balances, uint256 totalValue) { + (ManagerType managerType, bytes memory data) = parseManagerConfig(config); + if (managerType == ManagerType.EXTERNAL) return abi.decode(data, (IManager)).totalAssets(); + } + + /// @notice Calls a hook if needed after new funds have been transfered to a manager + function invest(uint256 amount, bytes memory config) internal { + (ManagerType managerType, bytes memory data) = parseManagerConfig(config); + if (managerType == ManagerType.EXTERNAL) abi.decode(data, (IManager)).invest(amount); + } + + /// @notice Returns available underlying tokens, for instance if liquidity is fully used and + /// not withdrawable the function will return 0 + function maxAvailable(bytes memory config) internal view returns (uint256 available) { + (ManagerType managerType, bytes memory data) = parseManagerConfig(config); + if (managerType == ManagerType.EXTERNAL) return abi.decode(data, (IManager)).maxAvailable(); + } + + /// @notice Decodes the `managerData` associated to a collateral + function parseManagerConfig( + bytes memory config + ) internal pure returns (ManagerType managerType, bytes memory data) { + (managerType, data) = abi.decode(config, (ManagerType, bytes)); + } +} diff --git a/evm/test/AngleAdapter.t.sol b/evm/test/AngleAdapter.t.sol deleted file mode 100644 index fe0c7c8..0000000 --- a/evm/test/AngleAdapter.t.sol +++ /dev/null @@ -1,223 +0,0 @@ -// SPDX-License-Identifier: AGPL-3.0-or-later -pragma solidity ^0.8.13; - -import "forge-std/Test.sol"; -import "openzeppelin-contracts/contracts/interfaces/IERC20.sol"; -import "src/angle/AngleAdapter.sol"; -import "src/interfaces/ISwapAdapterTypes.sol"; -import "src/libraries/FractionMath.sol"; - -contract AngleAdapterTest is Test, ISwapAdapterTypes { - using FractionMath for Fraction; - - AngleAdapter adapter; - IERC20 agEUR; - IERC20 constant EURC = IERC20(0x1aBaEA1f7C830bD89Acc67eC4af516284b1bC33c); - ITransmuter constant transmuter = ITransmuter(0x00253582b2a3FE112feEC532221d9708c64cEFAb); - - uint256 constant TEST_ITERATIONS = 100; - - function setUp() public { - uint256 forkBlock = 18921770; - vm.createSelectFork(vm.rpcUrl("mainnet"), forkBlock); - adapter = new - AngleAdapter(transmuter); - agEUR = IERC20(transmuter.agToken()); - - vm.label(address(adapter), "AngleAdapter"); - vm.label(address(agEUR), "agEUR"); - vm.label(address(EURC), "EURC"); - } - - function testPriceFuzzAngle(uint256 amount0, uint256 amount1) public { - bytes32 pair = bytes32(0); - uint256[] memory limits = adapter.getLimits(pair, EURC, agEUR); - vm.assume(amount0 < limits[0] && amount0 > 0); - vm.assume(amount1 < limits[0] && amount1 > 0); - - uint256[] memory amounts = new uint256[](2); - amounts[0] = amount0; - amounts[1] = amount1; - - Fraction[] memory prices = adapter.price(pair, EURC, agEUR, amounts); - - for (uint256 i = 0; i < prices.length; i++) { - assertGt(prices[i].numerator, 0); - assertGt(prices[i].denominator, 0); - } - } - - - function testPriceDecreasingAngle() public { - bytes32 pair = bytes32(0); - uint256[] memory amounts = new uint256[](TEST_ITERATIONS); - - for (uint256 i = 0; i < TEST_ITERATIONS; i++) { - amounts[i] = 1000 * (i+1) * 10 ** 18; - } - - Fraction[] memory prices = adapter.price(pair, agEUR, EURC, amounts); - - for (uint256 i = 0; i < TEST_ITERATIONS - 1; i++) { - assertEq(prices[i].compareFractions(prices[i + 1]), 1); - assertGt(prices[i].denominator, 0); - assertGt(prices[i + 1].denominator, 0); - } - } - - function testSwapFuzzAngleMint(uint256 specifiedAmount, bool isBuy) public { - OrderSide side = isBuy ? OrderSide.Buy : OrderSide.Sell; - - bytes32 pair = bytes32(0); - uint256[] memory limits = adapter.getLimits(pair, EURC, agEUR); - - if (side == OrderSide.Buy) { - vm.assume(specifiedAmount < limits[1] && specifiedAmount > 0); - - deal(address(EURC), address(this), type(uint256).max); - EURC.approve(address(adapter), type(uint256).max); - } else { - vm.assume(specifiedAmount < limits[0] && specifiedAmount > 0); - - deal(address(EURC), address(this), specifiedAmount); - EURC.approve(address(adapter), specifiedAmount); - } - - uint256 eurc_balance = EURC.balanceOf(address(this)); - uint256 agEUR_balance = agEUR.balanceOf(address(this)); - - Trade memory trade = - adapter.swap(pair, EURC, agEUR, side, specifiedAmount); - - if (trade.calculatedAmount > 0) { - if (side == OrderSide.Buy) { - assertEq( - specifiedAmount, - agEUR.balanceOf(address(this)) - agEUR_balance - ); - assertEq( - trade.calculatedAmount, - eurc_balance - EURC.balanceOf(address(this)) - ); - } else { - assertEq( - specifiedAmount, - eurc_balance - EURC.balanceOf(address(this)) - ); - assertEq( - trade.calculatedAmount, - agEUR.balanceOf(address(this)) - agEUR_balance - ); - } - } - } - - function testSwapFuzzAngleRedeem(uint256 specifiedAmount, bool isBuy) public { - OrderSide side = isBuy ? OrderSide.Buy : OrderSide.Sell; - - bytes32 pair = bytes32(0); - uint256[] memory limits = adapter.getLimits(pair, agEUR, EURC); - console.log(limits[0], limits[1]); - - if (side == OrderSide.Buy) { - vm.assume(specifiedAmount < limits[1] && specifiedAmount > 0); - - deal(address(agEUR), address(this), type(uint256).max); - agEUR.approve(address(adapter), type(uint256).max); - } else { - vm.assume(specifiedAmount < limits[0] && specifiedAmount > 0); - - deal(address(agEUR), address(this), specifiedAmount); - agEUR.approve(address(adapter), specifiedAmount); - } - - uint256 eurc_balance = EURC.balanceOf(address(this)); - uint256 agEUR_balance = agEUR.balanceOf(address(this)); - - Trade memory trade = - adapter.swap(pair, agEUR, EURC, side, specifiedAmount); - - if (trade.calculatedAmount > 0) { - if (side == OrderSide.Buy) { - assertEq( - specifiedAmount, - EURC.balanceOf(address(this)) - eurc_balance - ); - assertEq( - trade.calculatedAmount, - agEUR_balance - agEUR.balanceOf(address(this)) - ); - } else { - assertEq( - specifiedAmount, - agEUR_balance - agEUR.balanceOf(address(this)) - ); - assertEq( - trade.calculatedAmount, - EURC.balanceOf(address(this)) - eurc_balance - ); - } - } - } - - function testSwapSellIncreasingAngle() public { - executeIncreasingSwapsAngle(OrderSide.Sell); - } - - function executeIncreasingSwapsAngle(OrderSide side) internal { - bytes32 pair = bytes32(0); - - uint256[] memory amounts = new uint256[](TEST_ITERATIONS); - for (uint256 i = 0; i < TEST_ITERATIONS; i++) { - amounts[i] = - side == OrderSide.Sell ? (100 * i * 10 ** 18) : (100 * i * 10 ** 6); - } - - Trade[] memory trades = new Trade[](TEST_ITERATIONS); - uint256 beforeSwap; - for (uint256 i = 1; i < TEST_ITERATIONS; i++) { - beforeSwap = vm.snapshot(); - - if(side == OrderSide.Sell) { - deal(address(agEUR), address(this), amounts[i]); - agEUR.approve(address(adapter), amounts[i]); - } - else { - deal(address(agEUR), address(this), type(uint256).max); - agEUR.approve(address(adapter), type(uint256).max); - } - - trades[i] = adapter.swap(pair, agEUR, EURC, side, amounts[i]); - vm.revertTo(beforeSwap); - } - - for (uint256 i = 1; i < TEST_ITERATIONS - 1; i++) { - assertLe(trades[i].calculatedAmount, trades[i + 1].calculatedAmount); - assertEq(trades[i].price.compareFractions(trades[i + 1].price), 1); - } - } - - function testSwapBuyIncreasingAngle() public { - executeIncreasingSwapsAngle(OrderSide.Buy); - } - - function testGetCapabilitiesAngle(bytes32 pair, address t0, address t1) public { - Capability[] memory res = - adapter.getCapabilities(pair, IERC20(t0), IERC20(t1)); - - assertEq(res.length, 3); - } - - function testGetTokensAngle() public { - IERC20[] memory tokens = adapter.getTokens(bytes32(0)); - - assertGe(tokens.length, 2); - } - - function testGetLimits() public { - bytes32 pair = bytes32(0); - uint256[] memory limits = adapter.getLimits(pair, agEUR, EURC); - - assertEq(limits.length, 2); - } -} From a4f0f93e3771a4498cd4c96215feec9ef9b5906c Mon Sep 17 00:00:00 2001 From: domenicodev Date: Wed, 24 Jan 2024 17:36:08 +0100 Subject: [PATCH 14/25] feat: Moved solidity imports and declarations to main adapter file --- evm/src/angle/AngleAdapter.sol | 182 ++++++++++++++++++++++++++++++- evm/src/angle/AngleUtils.sol | 189 --------------------------------- 2 files changed, 180 insertions(+), 191 deletions(-) delete mode 100644 evm/src/angle/AngleUtils.sol diff --git a/evm/src/angle/AngleAdapter.sol b/evm/src/angle/AngleAdapter.sol index 55b5d2f..96aeab8 100644 --- a/evm/src/angle/AngleAdapter.sol +++ b/evm/src/angle/AngleAdapter.sol @@ -2,8 +2,10 @@ pragma experimental ABIEncoderV2; pragma solidity ^0.8.13; -/// @dev Wrapped imports (incl. ISwapAdapter and IERC20) are included in utils -import "./AngleUtils.sol"; +import {IERC20, ISwapAdapter} from "src/interfaces/ISwapAdapter.sol"; + +/// @dev custom reserve limit factor to prevent revert errors in OrderSide.Buy +uint256 constant RESERVE_LIMIT_FACTOR = 10; /// @title AngleAdapter /// @dev Information about prices: When swapping collateral to agEUR, the trade price will not decrease(amountOut); @@ -209,6 +211,182 @@ contract AngleAdapter is ISwapAdapter { } } +interface IAgToken is IERC20 { + /*////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + MINTER ROLE ONLY FUNCTIONS + //////////////////////////////////////////////////////////////////////////////////////////////////////////////////*/ + + /// @notice Lets a whitelisted contract mint agTokens + /// @param account Address to mint to + /// @param amount Amount to mint + function mint(address account, uint256 amount) external; + + /// @notice Burns `amount` tokens from a `burner` address after being asked to by `sender` + /// @param amount Amount of tokens to burn + /// @param burner Address to burn from + /// @param sender Address which requested the burn from `burner` + /// @dev This method is to be called by a contract with the minter right after being requested + /// to do so by a `sender` address willing to burn tokens from another `burner` address + /// @dev The method checks the allowance between the `sender` and the `burner` + function burnFrom(uint256 amount, address burner, address sender) external; + + /// @notice Burns `amount` tokens from a `burner` address + /// @param amount Amount of tokens to burn + /// @param burner Address to burn from + /// @dev This method is to be called by a contract with a minter right on the AgToken after being + /// requested to do so by an address willing to burn tokens from its address + function burnSelf(uint256 amount, address burner) external; + + /*////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + TREASURY ONLY FUNCTIONS + //////////////////////////////////////////////////////////////////////////////////////////////////////////////////*/ + + /// @notice Adds a minter in the contract + /// @param minter Minter address to add + /// @dev Zero address checks are performed directly in the `Treasury` contract + function addMinter(address minter) external; + + /// @notice Removes a minter from the contract + /// @param minter Minter address to remove + /// @dev This function can also be called by a minter wishing to revoke itself + function removeMinter(address minter) external; + + /// @notice Sets a new treasury contract + /// @param _treasury New treasury address + function setTreasury(address _treasury) external; + + /*////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + EXTERNAL FUNCTIONS + //////////////////////////////////////////////////////////////////////////////////////////////////////////////////*/ + + /// @notice Checks whether an address has the right to mint agTokens + /// @param minter Address for which the minting right should be checked + /// @return Whether the address has the right to mint agTokens or not + function isMinter(address minter) external view returns (bool); + + /// @notice Amount of decimals of the stablecoin + function decimals() external view returns (uint8); +} + +enum ManagerType { + EXTERNAL +} + +enum WhitelistType { + BACKED +} + +struct ManagerStorage { + IERC20[] subCollaterals; // Subtokens handled by the manager or strategies + bytes config; // Additional configuration data +} + +struct Collateral { + uint8 isManaged; // If the collateral is managed through external strategies + uint8 isMintLive; // If minting from this asset is unpaused + uint8 isBurnLive; // If burning to this asset is unpaused + uint8 decimals; // IERC20Metadata(collateral).decimals() + uint8 onlyWhitelisted; // If only whitelisted addresses can burn or redeem for this token + uint216 normalizedStables; // Normalized amount of stablecoins issued from this collateral + uint64[] xFeeMint; // Increasing exposures in [0,BASE_9[ + int64[] yFeeMint; // Mint fees at the exposures specified in `xFeeMint` + uint64[] xFeeBurn; // Decreasing exposures in ]0,BASE_9] + int64[] yFeeBurn; // Burn fees at the exposures specified in `xFeeBurn` + bytes oracleConfig; // Data about the oracle used for the collateral + bytes whitelistData; // For whitelisted collateral, data used to verify whitelists + ManagerStorage managerData; // For managed collateral, data used to handle the strategies +} + +struct TransmuterStorage { + IAgToken agToken; // agToken handled by the system + uint8 isRedemptionLive; // If redemption is unpaused + uint8 statusReentrant; // If call is reentrant or not + uint128 normalizedStables; // Normalized amount of stablecoins issued by the system + uint128 normalizer; // To reconcile `normalizedStables` values with the actual amount + address[] collateralList; // List of collateral assets supported by the system + uint64[] xRedemptionCurve; // Increasing collateral ratios > 0 + int64[] yRedemptionCurve; // Value of the redemption fees at `xRedemptionCurve` + mapping(address => Collateral) collaterals; // Maps a collateral asset to its parameters + mapping(address => uint256) isTrusted; // If an address is trusted to update the normalizer value + mapping(address => uint256) isSellerTrusted; // If an address is trusted to sell accruing reward tokens + mapping(WhitelistType => mapping(address => uint256)) isWhitelistedForType; +} + +interface IManager { + /// @notice Returns the amount of collateral managed by the Manager + /// @return balances Balances of all the subCollaterals handled by the manager + /// @dev MUST NOT revert + function totalAssets() external view returns (uint256[] memory balances, uint256 totalValue); + + /// @notice Hook to invest `amount` of `collateral` + /// @dev MUST revert if the manager cannot accept these funds + /// @dev MUST have received the funds beforehand + function invest(uint256 amount) external; + + /// @notice Sends `amount` of `collateral` to the `to` address + /// @dev Called when `agToken` are burnt and during redemptions + // @dev MUST revert if there are not funds enough available + /// @dev MUST be callable only by the transmuter + function release(address asset, address to, uint256 amount) external; + + /// @notice Gives the maximum amount of collateral immediately available for a transfer + /// @dev Useful for integrators using `quoteIn` and `quoteOut` + function maxAvailable() external view returns (uint256); +} + +/// @title LibManager +/// @author Angle Labs, Inc. +/// @dev Managed collateral assets may be handled through external smart contracts or directly through this library +/// @dev There is no implementation at this point for a managed collateral handled through this library, and +/// a new specific `ManagerType` would need to be added in this case +library LibManager { + /// @notice Checks to which address managed funds must be transferred + function transferRecipient(bytes memory config) internal view returns (address recipient) { + (ManagerType managerType, bytes memory data) = parseManagerConfig(config); + recipient = address(this); + if (managerType == ManagerType.EXTERNAL) return abi.decode(data, (address)); + } + + /// @notice Performs a transfer of `token` for a collateral that is managed to a `to` address + /// @dev `token` may not be the actual collateral itself, as some collaterals have subcollaterals associated + /// with it + /// @dev Eventually pulls funds from strategies + function release(address token, address to, uint256 amount, bytes memory config) internal { + (ManagerType managerType, bytes memory data) = parseManagerConfig(config); + if (managerType == ManagerType.EXTERNAL) abi.decode(data, (IManager)).release(token, to, amount); + } + + /// @notice Gets the balances of all the tokens controlled through `managerData` + /// @return balances An array of size `subCollaterals` with current balances of all subCollaterals + /// including the one corresponding to the `managerData` given + /// @return totalValue The value of all the `subCollaterals` in `collateral` + /// @dev `subCollaterals` must always have as first token (index 0) the collateral itself + function totalAssets(bytes memory config) internal view returns (uint256[] memory balances, uint256 totalValue) { + (ManagerType managerType, bytes memory data) = parseManagerConfig(config); + if (managerType == ManagerType.EXTERNAL) return abi.decode(data, (IManager)).totalAssets(); + } + + /// @notice Calls a hook if needed after new funds have been transfered to a manager + function invest(uint256 amount, bytes memory config) internal { + (ManagerType managerType, bytes memory data) = parseManagerConfig(config); + if (managerType == ManagerType.EXTERNAL) abi.decode(data, (IManager)).invest(amount); + } + + /// @notice Returns available underlying tokens, for instance if liquidity is fully used and + /// not withdrawable the function will return 0 + function maxAvailable(bytes memory config) internal view returns (uint256 available) { + (ManagerType managerType, bytes memory data) = parseManagerConfig(config); + if (managerType == ManagerType.EXTERNAL) return abi.decode(data, (IManager)).maxAvailable(); + } + + /// @notice Decodes the `managerData` associated to a collateral + function parseManagerConfig( + bytes memory config + ) internal pure returns (ManagerType managerType, bytes memory data) { + (managerType, data) = abi.decode(config, (ManagerType, bytes)); + } +} + abstract contract ITransmuter { function implementation() external view returns (address) {} diff --git a/evm/src/angle/AngleUtils.sol b/evm/src/angle/AngleUtils.sol deleted file mode 100644 index a346784..0000000 --- a/evm/src/angle/AngleUtils.sol +++ /dev/null @@ -1,189 +0,0 @@ -// SPDX-License-Identifier: MIT -pragma solidity ^0.8.13; - -/** - * @dev Collection of wrapped interfaces, items and libraries for Angle - * we use them here to maintain integrity and readability of contracts - * as there are many different imports and items - */ - -import {IERC20, ISwapAdapter} from "src/interfaces/ISwapAdapter.sol"; - -/// @dev custom reserve limit factor to prevent revert errors in OrderSide.Buy -uint256 constant RESERVE_LIMIT_FACTOR = 10; - -interface IAgToken is IERC20 { - /*////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - MINTER ROLE ONLY FUNCTIONS - //////////////////////////////////////////////////////////////////////////////////////////////////////////////////*/ - - /// @notice Lets a whitelisted contract mint agTokens - /// @param account Address to mint to - /// @param amount Amount to mint - function mint(address account, uint256 amount) external; - - /// @notice Burns `amount` tokens from a `burner` address after being asked to by `sender` - /// @param amount Amount of tokens to burn - /// @param burner Address to burn from - /// @param sender Address which requested the burn from `burner` - /// @dev This method is to be called by a contract with the minter right after being requested - /// to do so by a `sender` address willing to burn tokens from another `burner` address - /// @dev The method checks the allowance between the `sender` and the `burner` - function burnFrom(uint256 amount, address burner, address sender) external; - - /// @notice Burns `amount` tokens from a `burner` address - /// @param amount Amount of tokens to burn - /// @param burner Address to burn from - /// @dev This method is to be called by a contract with a minter right on the AgToken after being - /// requested to do so by an address willing to burn tokens from its address - function burnSelf(uint256 amount, address burner) external; - - /*////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - TREASURY ONLY FUNCTIONS - //////////////////////////////////////////////////////////////////////////////////////////////////////////////////*/ - - /// @notice Adds a minter in the contract - /// @param minter Minter address to add - /// @dev Zero address checks are performed directly in the `Treasury` contract - function addMinter(address minter) external; - - /// @notice Removes a minter from the contract - /// @param minter Minter address to remove - /// @dev This function can also be called by a minter wishing to revoke itself - function removeMinter(address minter) external; - - /// @notice Sets a new treasury contract - /// @param _treasury New treasury address - function setTreasury(address _treasury) external; - - /*////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - EXTERNAL FUNCTIONS - //////////////////////////////////////////////////////////////////////////////////////////////////////////////////*/ - - /// @notice Checks whether an address has the right to mint agTokens - /// @param minter Address for which the minting right should be checked - /// @return Whether the address has the right to mint agTokens or not - function isMinter(address minter) external view returns (bool); - - /// @notice Amount of decimals of the stablecoin - function decimals() external view returns (uint8); -} - -enum ManagerType { - EXTERNAL -} - -enum WhitelistType { - BACKED -} - -struct ManagerStorage { - IERC20[] subCollaterals; // Subtokens handled by the manager or strategies - bytes config; // Additional configuration data -} - -struct Collateral { - uint8 isManaged; // If the collateral is managed through external strategies - uint8 isMintLive; // If minting from this asset is unpaused - uint8 isBurnLive; // If burning to this asset is unpaused - uint8 decimals; // IERC20Metadata(collateral).decimals() - uint8 onlyWhitelisted; // If only whitelisted addresses can burn or redeem for this token - uint216 normalizedStables; // Normalized amount of stablecoins issued from this collateral - uint64[] xFeeMint; // Increasing exposures in [0,BASE_9[ - int64[] yFeeMint; // Mint fees at the exposures specified in `xFeeMint` - uint64[] xFeeBurn; // Decreasing exposures in ]0,BASE_9] - int64[] yFeeBurn; // Burn fees at the exposures specified in `xFeeBurn` - bytes oracleConfig; // Data about the oracle used for the collateral - bytes whitelistData; // For whitelisted collateral, data used to verify whitelists - ManagerStorage managerData; // For managed collateral, data used to handle the strategies -} - -struct TransmuterStorage { - IAgToken agToken; // agToken handled by the system - uint8 isRedemptionLive; // If redemption is unpaused - uint8 statusReentrant; // If call is reentrant or not - uint128 normalizedStables; // Normalized amount of stablecoins issued by the system - uint128 normalizer; // To reconcile `normalizedStables` values with the actual amount - address[] collateralList; // List of collateral assets supported by the system - uint64[] xRedemptionCurve; // Increasing collateral ratios > 0 - int64[] yRedemptionCurve; // Value of the redemption fees at `xRedemptionCurve` - mapping(address => Collateral) collaterals; // Maps a collateral asset to its parameters - mapping(address => uint256) isTrusted; // If an address is trusted to update the normalizer value - mapping(address => uint256) isSellerTrusted; // If an address is trusted to sell accruing reward tokens - mapping(WhitelistType => mapping(address => uint256)) isWhitelistedForType; -} - -interface IManager { - /// @notice Returns the amount of collateral managed by the Manager - /// @return balances Balances of all the subCollaterals handled by the manager - /// @dev MUST NOT revert - function totalAssets() external view returns (uint256[] memory balances, uint256 totalValue); - - /// @notice Hook to invest `amount` of `collateral` - /// @dev MUST revert if the manager cannot accept these funds - /// @dev MUST have received the funds beforehand - function invest(uint256 amount) external; - - /// @notice Sends `amount` of `collateral` to the `to` address - /// @dev Called when `agToken` are burnt and during redemptions - // @dev MUST revert if there are not funds enough available - /// @dev MUST be callable only by the transmuter - function release(address asset, address to, uint256 amount) external; - - /// @notice Gives the maximum amount of collateral immediately available for a transfer - /// @dev Useful for integrators using `quoteIn` and `quoteOut` - function maxAvailable() external view returns (uint256); -} - -/// @title LibManager -/// @author Angle Labs, Inc. -/// @dev Managed collateral assets may be handled through external smart contracts or directly through this library -/// @dev There is no implementation at this point for a managed collateral handled through this library, and -/// a new specific `ManagerType` would need to be added in this case -library LibManager { - /// @notice Checks to which address managed funds must be transferred - function transferRecipient(bytes memory config) internal view returns (address recipient) { - (ManagerType managerType, bytes memory data) = parseManagerConfig(config); - recipient = address(this); - if (managerType == ManagerType.EXTERNAL) return abi.decode(data, (address)); - } - - /// @notice Performs a transfer of `token` for a collateral that is managed to a `to` address - /// @dev `token` may not be the actual collateral itself, as some collaterals have subcollaterals associated - /// with it - /// @dev Eventually pulls funds from strategies - function release(address token, address to, uint256 amount, bytes memory config) internal { - (ManagerType managerType, bytes memory data) = parseManagerConfig(config); - if (managerType == ManagerType.EXTERNAL) abi.decode(data, (IManager)).release(token, to, amount); - } - - /// @notice Gets the balances of all the tokens controlled through `managerData` - /// @return balances An array of size `subCollaterals` with current balances of all subCollaterals - /// including the one corresponding to the `managerData` given - /// @return totalValue The value of all the `subCollaterals` in `collateral` - /// @dev `subCollaterals` must always have as first token (index 0) the collateral itself - function totalAssets(bytes memory config) internal view returns (uint256[] memory balances, uint256 totalValue) { - (ManagerType managerType, bytes memory data) = parseManagerConfig(config); - if (managerType == ManagerType.EXTERNAL) return abi.decode(data, (IManager)).totalAssets(); - } - - /// @notice Calls a hook if needed after new funds have been transfered to a manager - function invest(uint256 amount, bytes memory config) internal { - (ManagerType managerType, bytes memory data) = parseManagerConfig(config); - if (managerType == ManagerType.EXTERNAL) abi.decode(data, (IManager)).invest(amount); - } - - /// @notice Returns available underlying tokens, for instance if liquidity is fully used and - /// not withdrawable the function will return 0 - function maxAvailable(bytes memory config) internal view returns (uint256 available) { - (ManagerType managerType, bytes memory data) = parseManagerConfig(config); - if (managerType == ManagerType.EXTERNAL) return abi.decode(data, (IManager)).maxAvailable(); - } - - /// @notice Decodes the `managerData` associated to a collateral - function parseManagerConfig( - bytes memory config - ) internal pure returns (ManagerType managerType, bytes memory data) { - (managerType, data) = abi.decode(config, (ManagerType, bytes)); - } -} From f18dce5c04b22be117bea628d99c338adcd0e06d Mon Sep 17 00:00:00 2001 From: domenicodev Date: Thu, 25 Jan 2024 11:50:02 +0100 Subject: [PATCH 15/25] feat: Created AngleAdapter tests --- evm/test/AngleAdapter.t.sol | 223 ++++++++++++++++++++++++++++++++++++ 1 file changed, 223 insertions(+) create mode 100644 evm/test/AngleAdapter.t.sol diff --git a/evm/test/AngleAdapter.t.sol b/evm/test/AngleAdapter.t.sol new file mode 100644 index 0000000..433174b --- /dev/null +++ b/evm/test/AngleAdapter.t.sol @@ -0,0 +1,223 @@ +// SPDX-License-Identifier: AGPL-3.0-or-later +pragma solidity ^0.8.13; + +import "forge-std/Test.sol"; +import "openzeppelin-contracts/contracts/interfaces/IERC20.sol"; +import "src/angle/AngleAdapter.sol"; +import "src/interfaces/ISwapAdapterTypes.sol"; +import "src/libraries/FractionMath.sol"; + +contract AngleAdapterTest is Test, ISwapAdapterTypes { + using FractionMath for Fraction; + + AngleAdapter adapter; + IERC20 agEUR; + IERC20 constant EURC = IERC20(0x1aBaEA1f7C830bD89Acc67eC4af516284b1bC33c); + ITransmuter constant transmuter = ITransmuter(0x00253582b2a3FE112feEC532221d9708c64cEFAb); + + uint256 constant TEST_ITERATIONS = 100; + + function setUp() public { + uint256 forkBlock = 18921770; + vm.createSelectFork(vm.rpcUrl("mainnet"), forkBlock); + adapter = new + AngleAdapter(transmuter); + agEUR = IERC20(transmuter.agToken()); + + vm.label(address(adapter), "AngleAdapter"); + vm.label(address(agEUR), "agEUR"); + vm.label(address(EURC), "EURC"); + } + + function testPriceFuzzAngle(uint256 amount0, uint256 amount1) public { + bytes32 pair = bytes32(0); + uint256[] memory limits = adapter.getLimits(pair, EURC, agEUR); + vm.assume(amount0 < limits[0] && amount0 > 0); + vm.assume(amount1 < limits[0] && amount1 > 0); + + uint256[] memory amounts = new uint256[](2); + amounts[0] = amount0; + amounts[1] = amount1; + + Fraction[] memory prices = adapter.price(pair, EURC, agEUR, amounts); + + for (uint256 i = 0; i < prices.length; i++) { + assertGt(prices[i].numerator, 0); + assertGt(prices[i].denominator, 0); + } + } + + + function testPriceDecreasingAngle() public { + bytes32 pair = bytes32(0); + uint256[] memory amounts = new uint256[](TEST_ITERATIONS); + + for (uint256 i = 0; i < TEST_ITERATIONS; i++) { + amounts[i] = 1000 * (i+1) * 10 ** 18; + } + + Fraction[] memory prices = adapter.price(pair, agEUR, EURC, amounts); + + for (uint256 i = 0; i < TEST_ITERATIONS - 1; i++) { + assertEq(prices[i].compareFractions(prices[i + 1]), 1); + assertGt(prices[i].denominator, 0); + assertGt(prices[i + 1].denominator, 0); + } + } + + function testSwapFuzzAngleMint(uint256 specifiedAmount, bool isBuy) public { + OrderSide side = isBuy ? OrderSide.Buy : OrderSide.Sell; + + bytes32 pair = bytes32(0); + uint256[] memory limits = adapter.getLimits(pair, EURC, agEUR); + + if (side == OrderSide.Buy) { + vm.assume(specifiedAmount < limits[1] && specifiedAmount > 0); + + deal(address(EURC), address(this), type(uint256).max); + EURC.approve(address(adapter), type(uint256).max); + } else { + vm.assume(specifiedAmount < limits[0] && specifiedAmount > 0); + + deal(address(EURC), address(this), specifiedAmount); + EURC.approve(address(adapter), specifiedAmount); + } + + uint256 eurc_balance = EURC.balanceOf(address(this)); + uint256 agEUR_balance = agEUR.balanceOf(address(this)); + + Trade memory trade = + adapter.swap(pair, EURC, agEUR, side, specifiedAmount); + + if (trade.calculatedAmount > 0) { + if (side == OrderSide.Buy) { + assertEq( + specifiedAmount, + agEUR.balanceOf(address(this)) - agEUR_balance + ); + assertEq( + trade.calculatedAmount, + eurc_balance - EURC.balanceOf(address(this)) + ); + } else { + assertEq( + specifiedAmount, + eurc_balance - EURC.balanceOf(address(this)) + ); + assertEq( + trade.calculatedAmount, + agEUR.balanceOf(address(this)) - agEUR_balance + ); + } + } + } + + function testSwapFuzzAngleRedeem(uint256 specifiedAmount, bool isBuy) public { + OrderSide side = isBuy ? OrderSide.Buy : OrderSide.Sell; + + bytes32 pair = bytes32(0); + uint256[] memory limits = adapter.getLimits(pair, agEUR, EURC); + console.log(limits[0], limits[1]); + + if (side == OrderSide.Buy) { + vm.assume(specifiedAmount < limits[1] && specifiedAmount > 0); + + deal(address(agEUR), address(this), type(uint256).max); + agEUR.approve(address(adapter), type(uint256).max); + } else { + vm.assume(specifiedAmount < limits[0] && specifiedAmount > 0); + + deal(address(agEUR), address(this), specifiedAmount); + agEUR.approve(address(adapter), specifiedAmount); + } + + uint256 eurc_balance = EURC.balanceOf(address(this)); + uint256 agEUR_balance = agEUR.balanceOf(address(this)); + + Trade memory trade = + adapter.swap(pair, agEUR, EURC, side, specifiedAmount); + + if (trade.calculatedAmount > 0) { + if (side == OrderSide.Buy) { + assertEq( + specifiedAmount, + EURC.balanceOf(address(this)) - eurc_balance + ); + assertEq( + trade.calculatedAmount, + agEUR_balance - agEUR.balanceOf(address(this)) + ); + } else { + assertEq( + specifiedAmount, + agEUR_balance - agEUR.balanceOf(address(this)) + ); + assertEq( + trade.calculatedAmount, + EURC.balanceOf(address(this)) - eurc_balance + ); + } + } + } + + function testSwapSellIncreasingAngle() public { + executeIncreasingSwapsAngle(OrderSide.Sell); + } + + function executeIncreasingSwapsAngle(OrderSide side) internal { + bytes32 pair = bytes32(0); + + uint256[] memory amounts = new uint256[](TEST_ITERATIONS); + for (uint256 i = 0; i < TEST_ITERATIONS; i++) { + amounts[i] = + side == OrderSide.Sell ? (100 * i * 10 ** 18) : (100 * i * 10 ** 6); + } + + Trade[] memory trades = new Trade[](TEST_ITERATIONS); + uint256 beforeSwap; + for (uint256 i = 1; i < TEST_ITERATIONS; i++) { + beforeSwap = vm.snapshot(); + + if(side == OrderSide.Sell) { + deal(address(agEUR), address(this), amounts[i]); + agEUR.approve(address(adapter), amounts[i]); + } + else { + deal(address(agEUR), address(this), type(uint256).max); + agEUR.approve(address(adapter), type(uint256).max); + } + + trades[i] = adapter.swap(pair, agEUR, EURC, side, amounts[i]); + vm.revertTo(beforeSwap); + } + + for (uint256 i = 1; i < TEST_ITERATIONS - 1; i++) { + assertLe(trades[i].calculatedAmount, trades[i + 1].calculatedAmount); + assertEq(trades[i].price.compareFractions(trades[i + 1].price), 1); + } + } + + function testSwapBuyIncreasingAngle() public { + executeIncreasingSwapsAngle(OrderSide.Buy); + } + + function testGetCapabilitiesAngle(bytes32 pair, address t0, address t1) public { + Capability[] memory res = + adapter.getCapabilities(pair, IERC20(t0), IERC20(t1)); + + assertEq(res.length, 3); + } + + function testGetTokensAngle() public { + IERC20[] memory tokens = adapter.getTokens(bytes32(0)); + + assertGe(tokens.length, 2); + } + + function testGetLimitsAngle() public { + bytes32 pair = bytes32(0); + uint256[] memory limits = adapter.getLimits(pair, agEUR, EURC); + + assertEq(limits.length, 2); + } +} From 511ca59f5942af342bfa9f8825b77cd0f61cbd25 Mon Sep 17 00:00:00 2001 From: Ale personal Date: Sat, 16 Mar 2024 19:45:15 +0100 Subject: [PATCH 16/25] feat: Improve adapter and tests --- evm/src/angle/AngleAdapter.sol | 575 ++++++++++++++++++++++----------- evm/test/AngleAdapter.t.sol | 73 ++--- 2 files changed, 404 insertions(+), 244 deletions(-) diff --git a/evm/src/angle/AngleAdapter.sol b/evm/src/angle/AngleAdapter.sol index 96aeab8..521b688 100644 --- a/evm/src/angle/AngleAdapter.sol +++ b/evm/src/angle/AngleAdapter.sol @@ -3,36 +3,34 @@ pragma experimental ABIEncoderV2; pragma solidity ^0.8.13; import {IERC20, ISwapAdapter} from "src/interfaces/ISwapAdapter.sol"; +import {IERC20Metadata} from + "openzeppelin-contracts/contracts/token/ERC20/extensions/IERC20Metadata.sol"; /// @dev custom reserve limit factor to prevent revert errors in OrderSide.Buy uint256 constant RESERVE_LIMIT_FACTOR = 10; +uint256 constant STANDARD_TOKEN_DECIMALS = 10 ** 18; /// @title AngleAdapter -/// @dev Information about prices: When swapping collateral to agEUR, the trade price will not decrease(amountOut); -/// Instead, when swapping agEUR to collateral, it will, because agEUR is minted, and this mechanism is used to +/// @dev Information about prices: When swapping collateral to agEUR, the trade +/// price will not decrease(amountOut); +/// Instead, when swapping agEUR to collateral, it will, because agEUR is +/// minted, and this mechanism is used to /// stabilize the agEUR price. contract AngleAdapter is ISwapAdapter { - - ITransmuter transmuter; + ITransmuter immutable transmuter; constructor(ITransmuter _transmuter) { transmuter = _transmuter; } /// @inheritdoc ISwapAdapter - function price( - bytes32, - IERC20 _sellToken, - IERC20 _buyToken, - uint256[] memory _specifiedAmounts - ) external view override returns (Fraction[] memory _prices) { - _prices = new Fraction[](_specifiedAmounts.length); - address sellTokenAddress = address(_sellToken); - address buyTokenAddress = address(_buyToken); - - for (uint256 i = 0; i < _specifiedAmounts.length; i++) { - _prices[i] = getPriceAt(_specifiedAmounts[i], sellTokenAddress, buyTokenAddress, OrderSide.Sell); - } + function price(bytes32, IERC20, IERC20, uint256[] memory) + external + pure + override + returns (Fraction[] memory) + { + revert NotImplemented("AngleAdapter.price"); } /// @inheritdoc ISwapAdapter @@ -49,21 +47,27 @@ contract AngleAdapter is ISwapAdapter { uint256 gasBefore = gasleft(); if (side == OrderSide.Sell) { - trade.calculatedAmount = - sell(sellToken, buyToken, specifiedAmount); + trade.calculatedAmount = sell(sellToken, buyToken, specifiedAmount); } else { - trade.calculatedAmount = - buy(sellToken, buyToken, specifiedAmount); + trade.calculatedAmount = buy(sellToken, buyToken, specifiedAmount); } - trade.price = getPriceAt(specifiedAmount, address(sellToken), address(buyToken), side); trade.gasUsed = gasBefore - gasleft(); + uint8 decimals = side == OrderSide.Sell + ? IERC20Metadata(address(sellToken)).decimals() + : IERC20Metadata(address(buyToken)).decimals(); + trade.price = + getPriceAt(address(sellToken), address(buyToken), side, decimals); } /// @inheritdoc ISwapAdapter - /// @dev mint may have no limits, but we underestimate them to make sure, with the same amount of sellToken. - /// We use the quoteIn (incl. fee), because calculating fee requires a part of the implementation of - /// the Angle Diamond Storage, and therefore redundant functions and excessive contract size, with an high complexity. - /// In addition, we underestimate to / RESERVE_LIMIT_FACTOR to ensure swaps with OrderSide.Buy won't fail anyway. + /// @dev mint may have no limits, but we underestimate them to make sure, + /// with the same amount of sellToken. + /// We use the quoteIn (incl. fee), because calculating fee requires a part + /// of the implementation of + /// the Angle Diamond Storage, and therefore redundant functions and + /// excessive contract size, with an high complexity. + /// In addition, we underestimate to / RESERVE_LIMIT_FACTOR to ensure swaps + /// with OrderSide.Buy won't fail anyway. function getLimits(bytes32, IERC20 sellToken, IERC20 buyToken) external view @@ -75,29 +79,33 @@ contract AngleAdapter is ISwapAdapter { address buyTokenAddress = address(buyToken); address transmuterAddress = address(transmuter); - if(buyTokenAddress == transmuter.agToken()) { // mint(buy agToken) - Collateral memory collatInfo = transmuter.getCollateralInfo(sellTokenAddress); - if(collatInfo.isManaged > 0) { - limits[0] = LibManager.maxAvailable(collatInfo.managerData.config); - } - else { + if (buyTokenAddress == transmuter.agToken()) { + // mint(buy agToken) + Collateral memory collatInfo = + transmuter.getCollateralInfo(sellTokenAddress); + if (collatInfo.isManaged > 0) { + limits[0] = + LibManager.maxAvailable(collatInfo.managerData.config); + } else { limits[0] = sellToken.balanceOf(transmuterAddress); } - limits[1] = transmuter.quoteIn(limits[0], sellTokenAddress, buyTokenAddress); + limits[1] = + transmuter.quoteIn(limits[0], sellTokenAddress, buyTokenAddress); limits[1] = limits[1] / RESERVE_LIMIT_FACTOR; limits[0] = limits[0] / RESERVE_LIMIT_FACTOR; - } - else { // burn(sell agToken) - Collateral memory collatInfo = transmuter.getCollateralInfo(buyTokenAddress); - uint256 collatLimit; - if(collatInfo.isManaged > 0) { - collatLimit = LibManager.maxAvailable(collatInfo.managerData.config); + } else { + // burn(sell agToken) + Collateral memory collatInfo = + transmuter.getCollateralInfo(buyTokenAddress); + if (collatInfo.isManaged > 0) { + limits[1] = + LibManager.maxAvailable(collatInfo.managerData.config); + } else { + limits[1] = buyToken.balanceOf(transmuterAddress); } - else { - collatLimit = buyToken.balanceOf(transmuterAddress); - } - limits[0] = transmuter.quoteIn(collatLimit, buyTokenAddress, sellTokenAddress); - limits[1] = collatLimit / RESERVE_LIMIT_FACTOR; + limits[0] = + transmuter.quoteIn(limits[1], buyTokenAddress, sellTokenAddress); + limits[1] = limits[1] / RESERVE_LIMIT_FACTOR; limits[0] = limits[0] / RESERVE_LIMIT_FACTOR; } } @@ -112,11 +120,11 @@ contract AngleAdapter is ISwapAdapter { capabilities = new Capability[](3); capabilities[0] = Capability.SellOrder; capabilities[1] = Capability.BuyOrder; - capabilities[2] = Capability.PriceFunction; } /// @inheritdoc ISwapAdapter - /// @dev Since Angle has no pool IDs but supports 3 tokens(agToken and the collaterals), + /// @dev Since Angle has no pool IDs but supports 3 tokens(agToken and the + /// collaterals), /// we return all the available collaterals and the agToken(agEUR) function getTokens(bytes32) external @@ -126,7 +134,7 @@ contract AngleAdapter is ISwapAdapter { { address[] memory collateralsAddresses = transmuter.getCollateralList(); tokens = new IERC20[](collateralsAddresses.length + 1); - for(uint256 i = 0; i < collateralsAddresses.length; i++) { + for (uint256 i = 0; i < collateralsAddresses.length; i++) { tokens[i] = IERC20(collateralsAddresses[i]); } tokens[collateralsAddresses.length] = IERC20(transmuter.agToken()); @@ -142,30 +150,27 @@ contract AngleAdapter is ISwapAdapter { } /// @notice Calculates pool prices for specified amounts - /// @param amount The amount of the token being sold(if side == Sell) or bought(if side == Buy) /// @param tokenIn The token being sold /// @param tokenOut The token being bought /// @param side Order side + /// @param decimals Decimals of the sell token /// @return The price as a fraction corresponding to the provided amount. - function getPriceAt(uint256 amount, address tokenIn, address tokenOut, OrderSide side) - internal - view - returns (Fraction memory) - { + function getPriceAt( + address tokenIn, + address tokenOut, + OrderSide side, + uint8 decimals + ) internal view returns (Fraction memory) { uint256 amountOut; uint256 amountIn; - if(side == OrderSide.Sell) { - amountIn = amount; + if (side == OrderSide.Sell) { + amountIn = 10 ** decimals; amountOut = transmuter.quoteIn(amountIn, tokenIn, tokenOut); + } else { + amountOut = 10 ** decimals; + amountIn = transmuter.quoteOut(amountOut, tokenIn, tokenOut); } - else { - amountOut = amount; - amountIn = transmuter.quoteOut(amount, tokenIn, tokenOut); - } - return Fraction( - amountOut, - amountIn - ); + return Fraction(amountOut, amountIn); } /// @notice Executes a sell order on the contract. @@ -173,20 +178,20 @@ contract AngleAdapter is ISwapAdapter { /// @param buyToken The token being bought. /// @param amount The amount to be traded. /// @return calculatedAmount The amount of tokens received. - function sell( - IERC20 sellToken, - IERC20 buyToken, - uint256 amount - ) internal returns (uint256 calculatedAmount) { + function sell(IERC20 sellToken, IERC20 buyToken, uint256 amount) + internal + returns (uint256 calculatedAmount) + { address sellTokenAddress = address(sellToken); address buyTokenAddress = address(buyToken); - uint256 amountOut = transmuter.quoteIn(amount, sellTokenAddress, buyTokenAddress); + calculatedAmount = + transmuter.quoteIn(amount, sellTokenAddress, buyTokenAddress); - // TODO: use safeTransferFrom sellToken.transferFrom(msg.sender, address(this), amount); sellToken.approve(address(transmuter), amount); - transmuter.swapExactInput(amount, 0, sellTokenAddress, buyTokenAddress, msg.sender, 0); - return amountOut; + transmuter.swapExactInput( + amount, 0, sellTokenAddress, buyTokenAddress, msg.sender, 0 + ); } /// @notice Executes a buy order on the contract. @@ -194,26 +199,31 @@ contract AngleAdapter is ISwapAdapter { /// @param buyToken The token being bought. /// @param amountOut The amount of buyToken to receive. /// @return calculatedAmount The amount of tokens received. - function buy( - IERC20 sellToken, - IERC20 buyToken, - uint256 amountOut - ) internal returns (uint256 calculatedAmount) { + function buy(IERC20 sellToken, IERC20 buyToken, uint256 amountOut) + internal + returns (uint256 calculatedAmount) + { address sellTokenAddress = address(sellToken); address buyTokenAddress = address(buyToken); - uint256 amountIn = transmuter.quoteOut(amountOut, sellTokenAddress, buyTokenAddress); + calculatedAmount = + transmuter.quoteOut(amountOut, sellTokenAddress, buyTokenAddress); - // TODO: use safeTransferFrom - sellToken.transferFrom(msg.sender, address(this), amountIn); - sellToken.approve(address(transmuter), amountIn); - transmuter.swapExactOutput(amountOut, type(uint256).max, sellTokenAddress, buyTokenAddress, msg.sender, 0); - return amountIn; + sellToken.transferFrom(msg.sender, address(this), calculatedAmount); + sellToken.approve(address(transmuter), calculatedAmount); + transmuter.swapExactOutput( + amountOut, + type(uint256).max, + sellTokenAddress, + buyTokenAddress, + msg.sender, + 0 + ); } } interface IAgToken is IERC20 { /*////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - MINTER ROLE ONLY FUNCTIONS + MINTER ROLE ONLY FUNCTIONS //////////////////////////////////////////////////////////////////////////////////////////////////////////////////*/ /// @notice Lets a whitelisted contract mint agTokens @@ -221,34 +231,42 @@ interface IAgToken is IERC20 { /// @param amount Amount to mint function mint(address account, uint256 amount) external; - /// @notice Burns `amount` tokens from a `burner` address after being asked to by `sender` + /// @notice Burns `amount` tokens from a `burner` address after being asked + /// to by `sender` /// @param amount Amount of tokens to burn /// @param burner Address to burn from /// @param sender Address which requested the burn from `burner` - /// @dev This method is to be called by a contract with the minter right after being requested - /// to do so by a `sender` address willing to burn tokens from another `burner` address - /// @dev The method checks the allowance between the `sender` and the `burner` - function burnFrom(uint256 amount, address burner, address sender) external; + /// @dev This method is to be called by a contract with the minter right + /// after being requested + /// to do so by a `sender` address willing to burn tokens from another + /// `burner` address + /// @dev The method checks the allowance between the `sender` and the + /// `burner` + function burnFrom(uint256 amount, address burner, address sender) + external; /// @notice Burns `amount` tokens from a `burner` address /// @param amount Amount of tokens to burn /// @param burner Address to burn from - /// @dev This method is to be called by a contract with a minter right on the AgToken after being + /// @dev This method is to be called by a contract with a minter right on + /// the AgToken after being /// requested to do so by an address willing to burn tokens from its address function burnSelf(uint256 amount, address burner) external; /*////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - TREASURY ONLY FUNCTIONS + TREASURY ONLY FUNCTIONS //////////////////////////////////////////////////////////////////////////////////////////////////////////////////*/ /// @notice Adds a minter in the contract /// @param minter Minter address to add - /// @dev Zero address checks are performed directly in the `Treasury` contract + /// @dev Zero address checks are performed directly in the `Treasury` + /// contract function addMinter(address minter) external; /// @notice Removes a minter from the contract /// @param minter Minter address to remove - /// @dev This function can also be called by a minter wishing to revoke itself + /// @dev This function can also be called by a minter wishing to revoke + /// itself function removeMinter(address minter) external; /// @notice Sets a new treasury contract @@ -256,7 +274,7 @@ interface IAgToken is IERC20 { function setTreasury(address _treasury) external; /*////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - EXTERNAL FUNCTIONS + EXTERNAL FUNCTIONS //////////////////////////////////////////////////////////////////////////////////////////////////////////////////*/ /// @notice Checks whether an address has the right to mint agTokens @@ -277,46 +295,61 @@ enum WhitelistType { } struct ManagerStorage { - IERC20[] subCollaterals; // Subtokens handled by the manager or strategies - bytes config; // Additional configuration data + IERC20[] subCollaterals; // Subtokens handled by the manager or strategies + bytes config; // Additional configuration data } struct Collateral { - uint8 isManaged; // If the collateral is managed through external strategies - uint8 isMintLive; // If minting from this asset is unpaused - uint8 isBurnLive; // If burning to this asset is unpaused - uint8 decimals; // IERC20Metadata(collateral).decimals() - uint8 onlyWhitelisted; // If only whitelisted addresses can burn or redeem for this token - uint216 normalizedStables; // Normalized amount of stablecoins issued from this collateral - uint64[] xFeeMint; // Increasing exposures in [0,BASE_9[ - int64[] yFeeMint; // Mint fees at the exposures specified in `xFeeMint` - uint64[] xFeeBurn; // Decreasing exposures in ]0,BASE_9] - int64[] yFeeBurn; // Burn fees at the exposures specified in `xFeeBurn` - bytes oracleConfig; // Data about the oracle used for the collateral - bytes whitelistData; // For whitelisted collateral, data used to verify whitelists - ManagerStorage managerData; // For managed collateral, data used to handle the strategies + uint8 isManaged; // If the collateral is managed through external strategies + uint8 isMintLive; // If minting from this asset is unpaused + uint8 isBurnLive; // If burning to this asset is unpaused + uint8 decimals; // IERC20Metadata(collateral).decimals() + uint8 onlyWhitelisted; // If only whitelisted addresses can burn or redeem + // for this token + uint216 normalizedStables; // Normalized amount of stablecoins issued from + // this collateral + uint64[] xFeeMint; // Increasing exposures in [0,BASE_9[ + int64[] yFeeMint; // Mint fees at the exposures specified in `xFeeMint` + uint64[] xFeeBurn; // Decreasing exposures in ]0,BASE_9] + int64[] yFeeBurn; // Burn fees at the exposures specified in `xFeeBurn` + bytes oracleConfig; // Data about the oracle used for the collateral + bytes whitelistData; // For whitelisted collateral, data used to verify + // whitelists + ManagerStorage managerData; // For managed collateral, data used to handle + // the strategies } struct TransmuterStorage { - IAgToken agToken; // agToken handled by the system - uint8 isRedemptionLive; // If redemption is unpaused - uint8 statusReentrant; // If call is reentrant or not - uint128 normalizedStables; // Normalized amount of stablecoins issued by the system - uint128 normalizer; // To reconcile `normalizedStables` values with the actual amount - address[] collateralList; // List of collateral assets supported by the system - uint64[] xRedemptionCurve; // Increasing collateral ratios > 0 - int64[] yRedemptionCurve; // Value of the redemption fees at `xRedemptionCurve` - mapping(address => Collateral) collaterals; // Maps a collateral asset to its parameters - mapping(address => uint256) isTrusted; // If an address is trusted to update the normalizer value - mapping(address => uint256) isSellerTrusted; // If an address is trusted to sell accruing reward tokens + IAgToken agToken; // agToken handled by the system + uint8 isRedemptionLive; // If redemption is unpaused + uint8 statusReentrant; // If call is reentrant or not + uint128 normalizedStables; // Normalized amount of stablecoins issued by the + // system + uint128 normalizer; // To reconcile `normalizedStables` values with the + // actual amount + address[] collateralList; // List of collateral assets supported by the + // system + uint64[] xRedemptionCurve; // Increasing collateral ratios > 0 + int64[] yRedemptionCurve; // Value of the redemption fees at + // `xRedemptionCurve` + mapping(address => Collateral) collaterals; // Maps a collateral asset to + // its parameters + mapping(address => uint256) isTrusted; // If an address is trusted to update + // the normalizer value + mapping(address => uint256) isSellerTrusted; // If an address is trusted to + // sell accruing reward tokens mapping(WhitelistType => mapping(address => uint256)) isWhitelistedForType; } interface IManager { /// @notice Returns the amount of collateral managed by the Manager - /// @return balances Balances of all the subCollaterals handled by the manager + /// @return balances Balances of all the subCollaterals handled by the + /// manager /// @dev MUST NOT revert - function totalAssets() external view returns (uint256[] memory balances, uint256 totalValue); + function totalAssets() + external + view + returns (uint256[] memory balances, uint256 totalValue); /// @notice Hook to invest `amount` of `collateral` /// @dev MUST revert if the manager cannot accept these funds @@ -329,121 +362,224 @@ interface IManager { /// @dev MUST be callable only by the transmuter function release(address asset, address to, uint256 amount) external; - /// @notice Gives the maximum amount of collateral immediately available for a transfer + /// @notice Gives the maximum amount of collateral immediately available for + /// a transfer /// @dev Useful for integrators using `quoteIn` and `quoteOut` function maxAvailable() external view returns (uint256); } /// @title LibManager /// @author Angle Labs, Inc. -/// @dev Managed collateral assets may be handled through external smart contracts or directly through this library -/// @dev There is no implementation at this point for a managed collateral handled through this library, and +/// @dev Managed collateral assets may be handled through external smart +/// contracts or directly through this library +/// @dev There is no implementation at this point for a managed collateral +/// handled through this library, and /// a new specific `ManagerType` would need to be added in this case library LibManager { /// @notice Checks to which address managed funds must be transferred - function transferRecipient(bytes memory config) internal view returns (address recipient) { - (ManagerType managerType, bytes memory data) = parseManagerConfig(config); + function transferRecipient(bytes memory config) + internal + view + returns (address recipient) + { + (ManagerType managerType, bytes memory data) = + parseManagerConfig(config); recipient = address(this); - if (managerType == ManagerType.EXTERNAL) return abi.decode(data, (address)); + if (managerType == ManagerType.EXTERNAL) { + return abi.decode(data, (address)); + } } - /// @notice Performs a transfer of `token` for a collateral that is managed to a `to` address - /// @dev `token` may not be the actual collateral itself, as some collaterals have subcollaterals associated + /// @notice Performs a transfer of `token` for a collateral that is managed + /// to a `to` address + /// @dev `token` may not be the actual collateral itself, as some + /// collaterals have subcollaterals associated /// with it /// @dev Eventually pulls funds from strategies - function release(address token, address to, uint256 amount, bytes memory config) internal { - (ManagerType managerType, bytes memory data) = parseManagerConfig(config); - if (managerType == ManagerType.EXTERNAL) abi.decode(data, (IManager)).release(token, to, amount); + function release( + address token, + address to, + uint256 amount, + bytes memory config + ) internal { + (ManagerType managerType, bytes memory data) = + parseManagerConfig(config); + if (managerType == ManagerType.EXTERNAL) { + abi.decode(data, (IManager)).release(token, to, amount); + } } - /// @notice Gets the balances of all the tokens controlled through `managerData` - /// @return balances An array of size `subCollaterals` with current balances of all subCollaterals + /// @notice Gets the balances of all the tokens controlled through + /// `managerData` + /// @return balances An array of size `subCollaterals` with current balances + /// of all subCollaterals /// including the one corresponding to the `managerData` given /// @return totalValue The value of all the `subCollaterals` in `collateral` - /// @dev `subCollaterals` must always have as first token (index 0) the collateral itself - function totalAssets(bytes memory config) internal view returns (uint256[] memory balances, uint256 totalValue) { - (ManagerType managerType, bytes memory data) = parseManagerConfig(config); - if (managerType == ManagerType.EXTERNAL) return abi.decode(data, (IManager)).totalAssets(); + /// @dev `subCollaterals` must always have as first token (index 0) the + /// collateral itself + function totalAssets(bytes memory config) + internal + view + returns (uint256[] memory balances, uint256 totalValue) + { + (ManagerType managerType, bytes memory data) = + parseManagerConfig(config); + if (managerType == ManagerType.EXTERNAL) { + return abi.decode(data, (IManager)).totalAssets(); + } } - /// @notice Calls a hook if needed after new funds have been transfered to a manager + /// @notice Calls a hook if needed after new funds have been transfered to a + /// manager function invest(uint256 amount, bytes memory config) internal { - (ManagerType managerType, bytes memory data) = parseManagerConfig(config); - if (managerType == ManagerType.EXTERNAL) abi.decode(data, (IManager)).invest(amount); + (ManagerType managerType, bytes memory data) = + parseManagerConfig(config); + if (managerType == ManagerType.EXTERNAL) { + abi.decode(data, (IManager)).invest(amount); + } } - /// @notice Returns available underlying tokens, for instance if liquidity is fully used and + /// @notice Returns available underlying tokens, for instance if liquidity + /// is fully used and /// not withdrawable the function will return 0 - function maxAvailable(bytes memory config) internal view returns (uint256 available) { - (ManagerType managerType, bytes memory data) = parseManagerConfig(config); - if (managerType == ManagerType.EXTERNAL) return abi.decode(data, (IManager)).maxAvailable(); + function maxAvailable(bytes memory config) + internal + view + returns (uint256 available) + { + (ManagerType managerType, bytes memory data) = + parseManagerConfig(config); + if (managerType == ManagerType.EXTERNAL) { + return abi.decode(data, (IManager)).maxAvailable(); + } } /// @notice Decodes the `managerData` associated to a collateral - function parseManagerConfig( - bytes memory config - ) internal pure returns (ManagerType managerType, bytes memory data) { + function parseManagerConfig(bytes memory config) + internal + pure + returns (ManagerType managerType, bytes memory data) + { (managerType, data) = abi.decode(config, (ManagerType, bytes)); } } abstract contract ITransmuter { - function implementation() external view returns (address) {} function setDummyImplementation(address _implementation) external {} - function facetAddress(bytes4 _functionSelector) external view returns (address facetAddress_) {} + function facetAddress(bytes4 _functionSelector) + external + view + returns (address facetAddress_) + {} - function facetAddresses() external view returns (address[] memory facetAddresses_) {} + function facetAddresses() + external + view + returns (address[] memory facetAddresses_) + {} - function facetFunctionSelectors(address _facet) external view returns (bytes4[] memory _facetFunctionSelectors) {} + function facetFunctionSelectors(address _facet) + external + view + returns (bytes4[] memory _facetFunctionSelectors) + {} function accessControlManager() external view returns (address) {} function agToken() external view returns (address) {} - function getCollateralBurnFees( - address collateral - ) external view returns (uint64[] memory xFeeBurn, int64[] memory yFeeBurn) {} + function getCollateralBurnFees(address collateral) + external + view + returns (uint64[] memory xFeeBurn, int64[] memory yFeeBurn) + {} - function getCollateralDecimals(address collateral) external view returns (uint8) {} + function getCollateralDecimals(address collateral) + external + view + returns (uint8) + {} - function getCollateralInfo(address collateral) external view returns (Collateral memory) {} + function getCollateralInfo(address collateral) + external + view + returns (Collateral memory) + {} function getCollateralList() external view returns (address[] memory) {} - function getCollateralMintFees( - address collateral - ) external view returns (uint64[] memory xFeeMint, int64[] memory yFeeMint) {} + function getCollateralMintFees(address collateral) + external + view + returns (uint64[] memory xFeeMint, int64[] memory yFeeMint) + {} - function getCollateralRatio() external view returns (uint64 collatRatio, uint256 stablecoinsIssued) {} + function getCollateralRatio() + external + view + returns (uint64 collatRatio, uint256 stablecoinsIssued) + {} - function getCollateralWhitelistData(address collateral) external view returns (bytes memory) {} + function getCollateralWhitelistData(address collateral) + external + view + returns (bytes memory) + {} - function getIssuedByCollateral( - address collateral - ) external view returns (uint256 stablecoinsFromCollateral, uint256 stablecoinsIssued) {} + function getIssuedByCollateral(address collateral) + external + view + returns (uint256 stablecoinsFromCollateral, uint256 stablecoinsIssued) + {} - function getManagerData(address collateral) external view returns (bool, address[] memory, bytes memory) {} + function getManagerData(address collateral) + external + view + returns (bool, address[] memory, bytes memory) + {} - function getOracle( - address collateral - ) external view returns (uint8 oracleType, uint8 targetType, bytes memory oracleData, bytes memory targetData) {} + function getOracle(address collateral) + external + view + returns ( + uint8 oracleType, + uint8 targetType, + bytes memory oracleData, + bytes memory targetData + ) + {} - function getOracleValues( - address collateral - ) external view returns (uint256 mint, uint256 burn, uint256 ratio, uint256 minRatio, uint256 redemption) {} + function getOracleValues(address collateral) + external + view + returns ( + uint256 mint, + uint256 burn, + uint256 ratio, + uint256 minRatio, + uint256 redemption + ) + {} function getRedemptionFees() external view - returns (uint64[] memory xRedemptionCurve, int64[] memory yRedemptionCurve) + returns ( + uint64[] memory xRedemptionCurve, + int64[] memory yRedemptionCurve + ) {} function getTotalIssued() external view returns (uint256) {} - function isPaused(address collateral, uint8 action) external view returns (bool) {} + function isPaused(address collateral, uint8 action) + external + view + returns (bool) + {} function isTrusted(address sender) external view returns (bool) {} @@ -451,43 +587,91 @@ abstract contract ITransmuter { function isValidSelector(bytes4 selector) external view returns (bool) {} - function isWhitelistedCollateral(address collateral) external view returns (bool) {} + function isWhitelistedCollateral(address collateral) + external + view + returns (bool) + {} - function isWhitelistedForCollateral(address collateral, address sender) external returns (bool) {} + function isWhitelistedForCollateral(address collateral, address sender) + external + returns (bool) + {} - function isWhitelistedForType(uint8 whitelistType, address sender) external view returns (bool) {} + function isWhitelistedForType(uint8 whitelistType, address sender) + external + view + returns (bool) + {} - function sellRewards(uint256 minAmountOut, bytes memory payload) external returns (uint256 amountOut) {} + function sellRewards(uint256 minAmountOut, bytes memory payload) + external + returns (uint256 amountOut) + {} function addCollateral(address collateral) external {} - function adjustStablecoins(address collateral, uint128 amount, bool increase) external {} + function adjustStablecoins( + address collateral, + uint128 amount, + bool increase + ) external {} - function changeAllowance(address token, address spender, uint256 amount) external {} + function changeAllowance(address token, address spender, uint256 amount) + external + {} - function recoverERC20(address collateral, address token, address to, uint256 amount) external {} + function recoverERC20( + address collateral, + address token, + address to, + uint256 amount + ) external {} function revokeCollateral(address collateral) external {} - function setAccessControlManager(address _newAccessControlManager) external {} + function setAccessControlManager(address _newAccessControlManager) + external + {} - function setOracle(address collateral, bytes memory oracleConfig) external {} + function setOracle(address collateral, bytes memory oracleConfig) + external + {} - function setWhitelistStatus(address collateral, uint8 whitelistStatus, bytes memory whitelistData) external {} + function setWhitelistStatus( + address collateral, + uint8 whitelistStatus, + bytes memory whitelistData + ) external {} function toggleTrusted(address sender, uint8 t) external {} - function setFees(address collateral, uint64[] memory xFee, int64[] memory yFee, bool mint) external {} + function setFees( + address collateral, + uint64[] memory xFee, + int64[] memory yFee, + bool mint + ) external {} - function setRedemptionCurveParams(uint64[] memory xFee, int64[] memory yFee) external {} + function setRedemptionCurveParams(uint64[] memory xFee, int64[] memory yFee) + external + {} function togglePause(address collateral, uint8 pausedType) external {} function toggleWhitelist(uint8 whitelistType, address who) external {} - function quoteIn(uint256 amountIn, address tokenIn, address tokenOut) external view returns (uint256 amountOut) {} + function quoteIn(uint256 amountIn, address tokenIn, address tokenOut) + external + view + returns (uint256 amountOut) + {} - function quoteOut(uint256 amountOut, address tokenIn, address tokenOut) external view returns (uint256 amountIn) {} + function quoteOut(uint256 amountOut, address tokenIn, address tokenOut) + external + view + returns (uint256 amountIn) + {} function swapExactInput( uint256 amountIn, @@ -525,9 +709,11 @@ abstract contract ITransmuter { bytes memory permitData ) external returns (uint256 amountIn) {} - function quoteRedemptionCurve( - uint256 amount - ) external view returns (address[] memory tokens, uint256[] memory amounts) {} + function quoteRedemptionCurve(uint256 amount) + external + view + returns (address[] memory tokens, uint256[] memory amounts) + {} function redeem( uint256 amount, @@ -544,5 +730,8 @@ abstract contract ITransmuter { address[] memory forfeitTokens ) external returns (address[] memory tokens, uint256[] memory amounts) {} - function updateNormalizer(uint256 amount, bool increase) external returns (uint256) {} + function updateNormalizer(uint256 amount, bool increase) + external + returns (uint256) + {} } diff --git a/evm/test/AngleAdapter.t.sol b/evm/test/AngleAdapter.t.sol index 433174b..c8e23f1 100644 --- a/evm/test/AngleAdapter.t.sol +++ b/evm/test/AngleAdapter.t.sol @@ -6,6 +6,7 @@ import "openzeppelin-contracts/contracts/interfaces/IERC20.sol"; import "src/angle/AngleAdapter.sol"; import "src/interfaces/ISwapAdapterTypes.sol"; import "src/libraries/FractionMath.sol"; +import "forge-std/console.sol"; contract AngleAdapterTest is Test, ISwapAdapterTypes { using FractionMath for Fraction; @@ -13,15 +14,15 @@ contract AngleAdapterTest is Test, ISwapAdapterTypes { AngleAdapter adapter; IERC20 agEUR; IERC20 constant EURC = IERC20(0x1aBaEA1f7C830bD89Acc67eC4af516284b1bC33c); - ITransmuter constant transmuter = ITransmuter(0x00253582b2a3FE112feEC532221d9708c64cEFAb); + ITransmuter constant transmuter = + ITransmuter(0x00253582b2a3FE112feEC532221d9708c64cEFAb); uint256 constant TEST_ITERATIONS = 100; function setUp() public { uint256 forkBlock = 18921770; vm.createSelectFork(vm.rpcUrl("mainnet"), forkBlock); - adapter = new - AngleAdapter(transmuter); + adapter = new AngleAdapter(transmuter); agEUR = IERC20(transmuter.agToken()); vm.label(address(adapter), "AngleAdapter"); @@ -29,43 +30,9 @@ contract AngleAdapterTest is Test, ISwapAdapterTypes { vm.label(address(EURC), "EURC"); } - function testPriceFuzzAngle(uint256 amount0, uint256 amount1) public { - bytes32 pair = bytes32(0); - uint256[] memory limits = adapter.getLimits(pair, EURC, agEUR); - vm.assume(amount0 < limits[0] && amount0 > 0); - vm.assume(amount1 < limits[0] && amount1 > 0); - - uint256[] memory amounts = new uint256[](2); - amounts[0] = amount0; - amounts[1] = amount1; - - Fraction[] memory prices = adapter.price(pair, EURC, agEUR, amounts); - - for (uint256 i = 0; i < prices.length; i++) { - assertGt(prices[i].numerator, 0); - assertGt(prices[i].denominator, 0); - } - } - - - function testPriceDecreasingAngle() public { - bytes32 pair = bytes32(0); - uint256[] memory amounts = new uint256[](TEST_ITERATIONS); - - for (uint256 i = 0; i < TEST_ITERATIONS; i++) { - amounts[i] = 1000 * (i+1) * 10 ** 18; - } - - Fraction[] memory prices = adapter.price(pair, agEUR, EURC, amounts); - - for (uint256 i = 0; i < TEST_ITERATIONS - 1; i++) { - assertEq(prices[i].compareFractions(prices[i + 1]), 1); - assertGt(prices[i].denominator, 0); - assertGt(prices[i + 1].denominator, 0); - } - } - - function testSwapFuzzAngleMint(uint256 specifiedAmount, bool isBuy) public { + function testSwapFuzzAngleMint(uint256 specifiedAmount, bool isBuy) + public + { OrderSide side = isBuy ? OrderSide.Buy : OrderSide.Sell; bytes32 pair = bytes32(0); @@ -112,12 +79,13 @@ contract AngleAdapterTest is Test, ISwapAdapterTypes { } } - function testSwapFuzzAngleRedeem(uint256 specifiedAmount, bool isBuy) public { + function testSwapFuzzAngleRedeem(uint256 specifiedAmount, bool isBuy) + public + { OrderSide side = isBuy ? OrderSide.Buy : OrderSide.Sell; bytes32 pair = bytes32(0); uint256[] memory limits = adapter.getLimits(pair, agEUR, EURC); - console.log(limits[0], limits[1]); if (side == OrderSide.Buy) { vm.assume(specifiedAmount < limits[1] && specifiedAmount > 0); @@ -169,8 +137,9 @@ contract AngleAdapterTest is Test, ISwapAdapterTypes { uint256[] memory amounts = new uint256[](TEST_ITERATIONS); for (uint256 i = 0; i < TEST_ITERATIONS; i++) { - amounts[i] = - side == OrderSide.Sell ? (100 * i * 10 ** 18) : (100 * i * 10 ** 6); + amounts[i] = side == OrderSide.Sell + ? (100 * i * 10 ** 18) + : (100 * i * 10 ** 6); } Trade[] memory trades = new Trade[](TEST_ITERATIONS); @@ -178,22 +147,22 @@ contract AngleAdapterTest is Test, ISwapAdapterTypes { for (uint256 i = 1; i < TEST_ITERATIONS; i++) { beforeSwap = vm.snapshot(); - if(side == OrderSide.Sell) { + if (side == OrderSide.Sell) { deal(address(agEUR), address(this), amounts[i]); agEUR.approve(address(adapter), amounts[i]); - } - else { + } else { deal(address(agEUR), address(this), type(uint256).max); - agEUR.approve(address(adapter), type(uint256).max); + agEUR.approve(address(adapter), type(uint256).max); } - trades[i] = adapter.swap(pair, agEUR, EURC, side, amounts[i]); vm.revertTo(beforeSwap); } for (uint256 i = 1; i < TEST_ITERATIONS - 1; i++) { assertLe(trades[i].calculatedAmount, trades[i + 1].calculatedAmount); - assertEq(trades[i].price.compareFractions(trades[i + 1].price), 1); + assertFalse( + trades[i].price.compareFractions(trades[i + 1].price) == -1 + ); } } @@ -201,7 +170,9 @@ contract AngleAdapterTest is Test, ISwapAdapterTypes { executeIncreasingSwapsAngle(OrderSide.Buy); } - function testGetCapabilitiesAngle(bytes32 pair, address t0, address t1) public { + function testGetCapabilitiesAngle(bytes32 pair, address t0, address t1) + public + { Capability[] memory res = adapter.getCapabilities(pair, IERC20(t0), IERC20(t1)); From 045fa1cc0d045a7a1fbd8a89643c21759c316ecd Mon Sep 17 00:00:00 2001 From: Ale personal Date: Wed, 27 Mar 2024 14:59:07 +0100 Subject: [PATCH 17/25] improve: Change ITransmuter from abstract contract to interface --- evm/src/angle/AngleAdapter.sol | 131 +++++++++++++-------------------- 1 file changed, 52 insertions(+), 79 deletions(-) diff --git a/evm/src/angle/AngleAdapter.sol b/evm/src/angle/AngleAdapter.sol index 521b688..508abd6 100644 --- a/evm/src/angle/AngleAdapter.sol +++ b/evm/src/angle/AngleAdapter.sol @@ -464,82 +464,71 @@ library LibManager { } } -abstract contract ITransmuter { - function implementation() external view returns (address) {} +interface ITransmuter { + function implementation() external view returns (address); - function setDummyImplementation(address _implementation) external {} + function setDummyImplementation(address _implementation) external; function facetAddress(bytes4 _functionSelector) external view - returns (address facetAddress_) - {} + returns (address facetAddress_); function facetAddresses() external view - returns (address[] memory facetAddresses_) - {} + returns (address[] memory facetAddresses_); function facetFunctionSelectors(address _facet) external view - returns (bytes4[] memory _facetFunctionSelectors) - {} + returns (bytes4[] memory _facetFunctionSelectors); - function accessControlManager() external view returns (address) {} + function accessControlManager() external view returns (address); - function agToken() external view returns (address) {} + function agToken() external view returns (address); function getCollateralBurnFees(address collateral) external view - returns (uint64[] memory xFeeBurn, int64[] memory yFeeBurn) - {} + returns (uint64[] memory xFeeBurn, int64[] memory yFeeBurn); function getCollateralDecimals(address collateral) external view - returns (uint8) - {} + returns (uint8); function getCollateralInfo(address collateral) external view - returns (Collateral memory) - {} + returns (Collateral memory); - function getCollateralList() external view returns (address[] memory) {} + function getCollateralList() external view returns (address[] memory); function getCollateralMintFees(address collateral) external view - returns (uint64[] memory xFeeMint, int64[] memory yFeeMint) - {} + returns (uint64[] memory xFeeMint, int64[] memory yFeeMint); function getCollateralRatio() external view - returns (uint64 collatRatio, uint256 stablecoinsIssued) - {} + returns (uint64 collatRatio, uint256 stablecoinsIssued); function getCollateralWhitelistData(address collateral) external view - returns (bytes memory) - {} + returns (bytes memory); function getIssuedByCollateral(address collateral) external view - returns (uint256 stablecoinsFromCollateral, uint256 stablecoinsIssued) - {} + returns (uint256 stablecoinsFromCollateral, uint256 stablecoinsIssued); function getManagerData(address collateral) external view - returns (bool, address[] memory, bytes memory) - {} + returns (bool, address[] memory, bytes memory); function getOracle(address collateral) external @@ -549,8 +538,7 @@ abstract contract ITransmuter { uint8 targetType, bytes memory oracleData, bytes memory targetData - ) - {} + ); function getOracleValues(address collateral) external @@ -561,8 +549,7 @@ abstract contract ITransmuter { uint256 ratio, uint256 minRatio, uint256 redemption - ) - {} + ); function getRedemptionFees() external @@ -570,108 +557,96 @@ abstract contract ITransmuter { returns ( uint64[] memory xRedemptionCurve, int64[] memory yRedemptionCurve - ) - {} + ); - function getTotalIssued() external view returns (uint256) {} + function getTotalIssued() external view returns (uint256); function isPaused(address collateral, uint8 action) external view - returns (bool) - {} + returns (bool); - function isTrusted(address sender) external view returns (bool) {} + function isTrusted(address sender) external view returns (bool); - function isTrustedSeller(address sender) external view returns (bool) {} + function isTrustedSeller(address sender) external view returns (bool); - function isValidSelector(bytes4 selector) external view returns (bool) {} + function isValidSelector(bytes4 selector) external view returns (bool); function isWhitelistedCollateral(address collateral) external view - returns (bool) - {} + returns (bool); function isWhitelistedForCollateral(address collateral, address sender) external - returns (bool) - {} + returns (bool); function isWhitelistedForType(uint8 whitelistType, address sender) external view - returns (bool) - {} + returns (bool); function sellRewards(uint256 minAmountOut, bytes memory payload) external - returns (uint256 amountOut) - {} + returns (uint256 amountOut); - function addCollateral(address collateral) external {} + function addCollateral(address collateral) external; function adjustStablecoins( address collateral, uint128 amount, bool increase - ) external {} + ) external; function changeAllowance(address token, address spender, uint256 amount) - external - {} + external; function recoverERC20( address collateral, address token, address to, uint256 amount - ) external {} + ) external; - function revokeCollateral(address collateral) external {} + function revokeCollateral(address collateral) external; function setAccessControlManager(address _newAccessControlManager) - external - {} + external; function setOracle(address collateral, bytes memory oracleConfig) - external - {} + external; function setWhitelistStatus( address collateral, uint8 whitelistStatus, bytes memory whitelistData - ) external {} + ) external; - function toggleTrusted(address sender, uint8 t) external {} + function toggleTrusted(address sender, uint8 t) external; function setFees( address collateral, uint64[] memory xFee, int64[] memory yFee, bool mint - ) external {} + ) external; function setRedemptionCurveParams(uint64[] memory xFee, int64[] memory yFee) - external - {} + external; - function togglePause(address collateral, uint8 pausedType) external {} + function togglePause(address collateral, uint8 pausedType) external; - function toggleWhitelist(uint8 whitelistType, address who) external {} + function toggleWhitelist(uint8 whitelistType, address who) external; function quoteIn(uint256 amountIn, address tokenIn, address tokenOut) external view - returns (uint256 amountOut) - {} + returns (uint256 amountOut); function quoteOut(uint256 amountOut, address tokenIn, address tokenOut) external view - returns (uint256 amountIn) - {} + returns (uint256 amountIn); function swapExactInput( uint256 amountIn, @@ -680,7 +655,7 @@ abstract contract ITransmuter { address tokenOut, address to, uint256 deadline - ) external returns (uint256 amountOut) {} + ) external returns (uint256 amountOut); function swapExactInputWithPermit( uint256 amountIn, @@ -689,7 +664,7 @@ abstract contract ITransmuter { address to, uint256 deadline, bytes memory permitData - ) external returns (uint256 amountOut) {} + ) external returns (uint256 amountOut); function swapExactOutput( uint256 amountOut, @@ -698,7 +673,7 @@ abstract contract ITransmuter { address tokenOut, address to, uint256 deadline - ) external returns (uint256 amountIn) {} + ) external returns (uint256 amountIn); function swapExactOutputWithPermit( uint256 amountOut, @@ -707,20 +682,19 @@ abstract contract ITransmuter { address to, uint256 deadline, bytes memory permitData - ) external returns (uint256 amountIn) {} + ) external returns (uint256 amountIn); function quoteRedemptionCurve(uint256 amount) external view - returns (address[] memory tokens, uint256[] memory amounts) - {} + returns (address[] memory tokens, uint256[] memory amounts); function redeem( uint256 amount, address receiver, uint256 deadline, uint256[] memory minAmountOuts - ) external returns (address[] memory tokens, uint256[] memory amounts) {} + ) external returns (address[] memory tokens, uint256[] memory amounts); function redeemWithForfeit( uint256 amount, @@ -728,10 +702,9 @@ abstract contract ITransmuter { uint256 deadline, uint256[] memory minAmountOuts, address[] memory forfeitTokens - ) external returns (address[] memory tokens, uint256[] memory amounts) {} + ) external returns (address[] memory tokens, uint256[] memory amounts); function updateNormalizer(uint256 amount, bool increase) external - returns (uint256) - {} + returns (uint256); } From 77843d0695f0bdea4769ced33465f17fcdd59615 Mon Sep 17 00:00:00 2001 From: Ale personal Date: Wed, 27 Mar 2024 15:08:24 +0100 Subject: [PATCH 18/25] fix: Update manifest of Angle --- evm/src/angle/manifest.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/evm/src/angle/manifest.yaml b/evm/src/angle/manifest.yaml index 88a2f39..a6780c4 100644 --- a/evm/src/angle/manifest.yaml +++ b/evm/src/angle/manifest.yaml @@ -10,7 +10,6 @@ constants: capabilities: - SellSide - BuySide - - PriceFunction # The file containing the adapter contract contract: AngleAdapter.sol From 2d21f988dd70d787049ad71c79ef24137ff5905a Mon Sep 17 00:00:00 2001 From: Alessandro Bergamaschi <51761861+Aleione@users.noreply.github.com> Date: Wed, 27 Mar 2024 15:09:58 +0100 Subject: [PATCH 19/25] Update evm/src/angle/AngleAdapter.sol Co-authored-by: pistomat --- evm/src/angle/AngleAdapter.sol | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/evm/src/angle/AngleAdapter.sol b/evm/src/angle/AngleAdapter.sol index 508abd6..0365d13 100644 --- a/evm/src/angle/AngleAdapter.sol +++ b/evm/src/angle/AngleAdapter.sol @@ -12,9 +12,8 @@ uint256 constant STANDARD_TOKEN_DECIMALS = 10 ** 18; /// @title AngleAdapter /// @dev Information about prices: When swapping collateral to agEUR, the trade -/// price will not decrease(amountOut); -/// Instead, when swapping agEUR to collateral, it will, because agEUR is -/// minted, and this mechanism is used to +/// price will not decrease(amountOut). Instead, when swapping agEUR to +/// collateral, it will, because agEUR is minted, and this mechanism is used to /// stabilize the agEUR price. contract AngleAdapter is ISwapAdapter { ITransmuter immutable transmuter; From 81106d75f55225ea021a45ed8cf0994d10ba30fa Mon Sep 17 00:00:00 2001 From: Ale personal Date: Wed, 27 Mar 2024 15:24:15 +0100 Subject: [PATCH 20/25] improve: Optimize sell function of Angle adapter --- evm/src/angle/AngleAdapter.sol | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/evm/src/angle/AngleAdapter.sol b/evm/src/angle/AngleAdapter.sol index 0365d13..83e97ca 100644 --- a/evm/src/angle/AngleAdapter.sol +++ b/evm/src/angle/AngleAdapter.sol @@ -183,12 +183,10 @@ contract AngleAdapter is ISwapAdapter { { address sellTokenAddress = address(sellToken); address buyTokenAddress = address(buyToken); - calculatedAmount = - transmuter.quoteIn(amount, sellTokenAddress, buyTokenAddress); sellToken.transferFrom(msg.sender, address(this), amount); sellToken.approve(address(transmuter), amount); - transmuter.swapExactInput( + calculatedAmount = transmuter.swapExactInput( amount, 0, sellTokenAddress, buyTokenAddress, msg.sender, 0 ); } From 115c7c26ccbc739d64247e70786e66f615f1d72f Mon Sep 17 00:00:00 2001 From: Alessandro Bergamaschi <51761861+Aleione@users.noreply.github.com> Date: Wed, 27 Mar 2024 15:28:34 +0100 Subject: [PATCH 21/25] Update evm/src/angle/AngleAdapter.sol Co-authored-by: pistomat --- evm/src/angle/AngleAdapter.sol | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/evm/src/angle/AngleAdapter.sol b/evm/src/angle/AngleAdapter.sol index 83e97ca..ecd4b8c 100644 --- a/evm/src/angle/AngleAdapter.sol +++ b/evm/src/angle/AngleAdapter.sol @@ -59,14 +59,13 @@ contract AngleAdapter is ISwapAdapter { } /// @inheritdoc ISwapAdapter - /// @dev mint may have no limits, but we underestimate them to make sure, - /// with the same amount of sellToken. - /// We use the quoteIn (incl. fee), because calculating fee requires a part - /// of the implementation of - /// the Angle Diamond Storage, and therefore redundant functions and - /// excessive contract size, with an high complexity. - /// In addition, we underestimate to / RESERVE_LIMIT_FACTOR to ensure swaps - /// with OrderSide.Buy won't fail anyway. + /// @dev Mint may have no limits, but we underestimate them to make sure, + /// with the same amount of sellToken. We use the quoteIn (incl. fee), + /// because calculating fee requires a part of the implementation of the + /// Angle Diamond Storage, and therefore redundant functions and excessive + /// contract size, with an high complexity. In addition, we underestimate to + /// RESERVE_LIMIT_FACTOR to ensure swaps with OrderSide.Buy won't fail + /// anyway. function getLimits(bytes32, IERC20 sellToken, IERC20 buyToken) external view From 113afd04fb416c89dfd7e4077b174161ecd13ff1 Mon Sep 17 00:00:00 2001 From: Alessandro Bergamaschi <51761861+Aleione@users.noreply.github.com> Date: Wed, 27 Mar 2024 15:28:47 +0100 Subject: [PATCH 22/25] Update evm/src/angle/AngleAdapter.sol Co-authored-by: pistomat --- evm/src/angle/AngleAdapter.sol | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/evm/src/angle/AngleAdapter.sol b/evm/src/angle/AngleAdapter.sol index ecd4b8c..2b53436 100644 --- a/evm/src/angle/AngleAdapter.sol +++ b/evm/src/angle/AngleAdapter.sol @@ -122,8 +122,8 @@ contract AngleAdapter is ISwapAdapter { /// @inheritdoc ISwapAdapter /// @dev Since Angle has no pool IDs but supports 3 tokens(agToken and the - /// collaterals), - /// we return all the available collaterals and the agToken(agEUR) + /// collaterals), we return all the available collaterals and the + /// agToken(agEUR) function getTokens(bytes32) external view From 17954c3ffecb8540de0a604b743806af53c67914 Mon Sep 17 00:00:00 2001 From: Ale personal Date: Wed, 27 Mar 2024 15:33:40 +0100 Subject: [PATCH 23/25] fix: Change output number of Angle capabilities from 3 to 2 --- evm/src/angle/AngleAdapter.sol | 2 +- evm/test/AngleAdapter.t.sol | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/evm/src/angle/AngleAdapter.sol b/evm/src/angle/AngleAdapter.sol index 2b53436..19723ac 100644 --- a/evm/src/angle/AngleAdapter.sol +++ b/evm/src/angle/AngleAdapter.sol @@ -115,7 +115,7 @@ contract AngleAdapter is ISwapAdapter { override returns (Capability[] memory capabilities) { - capabilities = new Capability[](3); + capabilities = new Capability[](2); capabilities[0] = Capability.SellOrder; capabilities[1] = Capability.BuyOrder; } diff --git a/evm/test/AngleAdapter.t.sol b/evm/test/AngleAdapter.t.sol index c8e23f1..33da838 100644 --- a/evm/test/AngleAdapter.t.sol +++ b/evm/test/AngleAdapter.t.sol @@ -176,7 +176,7 @@ contract AngleAdapterTest is Test, ISwapAdapterTypes { Capability[] memory res = adapter.getCapabilities(pair, IERC20(t0), IERC20(t1)); - assertEq(res.length, 3); + assertEq(res.length, 2); } function testGetTokensAngle() public { From f2afca9b282864407c8b8079591b412489cf8ae9 Mon Sep 17 00:00:00 2001 From: Ale personal Date: Wed, 27 Mar 2024 16:58:24 +0100 Subject: [PATCH 24/25] fix: Update manifest of Angle --- evm/src/angle/manifest.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/evm/src/angle/manifest.yaml b/evm/src/angle/manifest.yaml index a6780c4..ef376f7 100644 --- a/evm/src/angle/manifest.yaml +++ b/evm/src/angle/manifest.yaml @@ -1,7 +1,7 @@ # information about the author helps us reach out in case of issues. author: - name: Propellerheads.xyz - email: alan@propellerheads.xyz + name: shadowycoders.dev + email: hello@shadowycreators.com # Protocol Constants constants: From 5ce93956ff7078e0210c3b53ace258f8218dd73b Mon Sep 17 00:00:00 2001 From: Ale personal Date: Wed, 27 Mar 2024 17:09:15 +0100 Subject: [PATCH 25/25] improve: Add docstring to the swap and price functions of Angle --- evm/src/angle/AngleAdapter.sol | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/evm/src/angle/AngleAdapter.sol b/evm/src/angle/AngleAdapter.sol index 19723ac..44842b4 100644 --- a/evm/src/angle/AngleAdapter.sol +++ b/evm/src/angle/AngleAdapter.sol @@ -23,6 +23,13 @@ contract AngleAdapter is ISwapAdapter { } /// @inheritdoc ISwapAdapter + /** + * @dev It is not possible to reproduce the swap in a view mode (like + * Bancor, Uniswap v2, etc..) as the swap produce a change of storage in + * the Angle protocol, that impacts the price post trade. Due to the + * architecture of Angle, it's not possible to calculate the storage + * modifications of Angle inside the adapter. + */ function price(bytes32, IERC20, IERC20, uint256[] memory) external pure @@ -33,6 +40,12 @@ contract AngleAdapter is ISwapAdapter { } /// @inheritdoc ISwapAdapter + /** + * @dev The price post trade is indipendent by the amount, since is the + * price with minimal fees with 0 slippage. In Angle there is no price with + * 0 slippage, so we use the PRECISE_UNIT (10^18, that is a small value) as + * input amount to have a slippage ---> 0. + */ function swap( bytes32, IERC20 sellToken,