Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion contracts/interfaces/IERC7575.sol
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {IERC165} from "@openzeppelin/contracts/interfaces/IERC165.sol";
import {IERC4626} from "@openzeppelin/contracts/interfaces/IERC4626.sol";

/// @dev Multi-Asset ERC-4626 Vaults, as defined in https://eips.ethereum.org/EIPS/eip-7575
interface IERC7575 is IERC165, IERC4626 {
interface IERC7575 is IERC4626, IERC165 {
/// @dev The address of the underlying share received on deposit into the vault.
function share() external view returns (address shareTokenAddress);
}
Expand Down
2 changes: 1 addition & 1 deletion contracts/token/ERC20/extensions/ERC7540.sol
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ import {IERC7575, IERC7575Share} from "../../../interfaces/IERC7575.sol";
* accounting (notably {totalAssets}) can revert and freeze claim paths that depend on live conversions.
* ====
*/
abstract contract ERC7540 is ERC165, ERC20, IERC4626, IERC7540, IERC7575Share {
abstract contract ERC7540 is ERC20, IERC4626, ERC165, IERC7540, IERC7575Share {
using Math for uint256;

IERC20 private immutable _asset;
Expand Down
74 changes: 0 additions & 74 deletions scripts/checks/inheritance-ordering.js

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this file was updated in vanilla. It uses the "files" from package.json to filter which contract are in scope.

Would it work to "just" use that script (from vanilla here) ? Ideally we would not want to maintain 2 different versions

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

imo it would be great to parametrize vanilla script and symlink it here.
Also this PR fixes the order issue: #287

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!

This file was deleted.

1 change: 1 addition & 0 deletions scripts/checks/inheritance-ordering.js

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this file was updated in vanilla. It uses the "files" from package.json to filter which contract are in scope.

Would it work to "just" use that script (from vanilla here) ? Ideally we would not want to maintain 2 different versions

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

imo it would be great to parametrize vanilla script and symlink it here.
Also this PR fixes the order issue: #287

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!

Loading