Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/nicka/lp' into clement/zap
Browse files Browse the repository at this point in the history
  • Loading branch information
clement-ux committed Oct 9, 2024
2 parents 8147a5f + 711ba46 commit 13d1a69
Show file tree
Hide file tree
Showing 2 changed files with 55 additions and 56 deletions.
107 changes: 53 additions & 54 deletions docs/LidoARMSquashed.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/contracts/AbstractARM.sol
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ abstract contract AbstractARM is OwnableOperable, ERC20Upgradeable {
* Rate is to 36 decimals (1e36).
*/
uint256 public traderate1;

/// @notice The price that buy and sell prices can not cross scaled to 36 decimals.
uint256 public crossPrice;

/// @notice cumulative total of all withdrawal requests included the ones that have already been claimed
Expand Down Expand Up @@ -101,7 +101,7 @@ abstract contract AbstractARM is OwnableOperable, ERC20Upgradeable {
int128 public lastAvailableAssets;
/// @notice The account that can collect the performance fee
address public feeCollector;

/// @notice The address of the CapManager contract used to manage the ARM's liquidity provider and total assets caps
address public capManager;

address public zap;
Expand Down

0 comments on commit 13d1a69

Please sign in to comment.