From 9933336278276e6590786ab09cf429d32023e22e Mon Sep 17 00:00:00 2001 From: Lukas Date: Tue, 23 Jul 2024 05:35:43 +0900 Subject: [PATCH] fix: combine interface (#33) --- src/periphery/contracts/static-a-token/StaticATokenLM.sol | 3 +-- .../contracts/static-a-token/interfaces/IStaticATokenLM.sol | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/periphery/contracts/static-a-token/StaticATokenLM.sol b/src/periphery/contracts/static-a-token/StaticATokenLM.sol index 37121d11..a1e5b7f0 100644 --- a/src/periphery/contracts/static-a-token/StaticATokenLM.sol +++ b/src/periphery/contracts/static-a-token/StaticATokenLM.sol @@ -12,7 +12,7 @@ import {SafeERC20} from 'solidity-utils/contracts/oz-common/SafeERC20.sol'; import {IERC20Metadata} from 'solidity-utils/contracts/oz-common/interfaces/IERC20Metadata.sol'; import {IERC20} from 'solidity-utils/contracts/oz-common/interfaces/IERC20.sol'; import {IERC20WithPermit} from 'solidity-utils/contracts/oz-common/interfaces/IERC20WithPermit.sol'; -import {Rescuable} from 'solidity-utils/contracts/utils/Rescuable.sol'; +import {IRescuable, Rescuable} from 'solidity-utils/contracts/utils/Rescuable.sol'; import {IStaticATokenLM} from './interfaces/IStaticATokenLM.sol'; import {IAToken} from './interfaces/IAToken.sol'; @@ -33,7 +33,6 @@ contract StaticATokenLM is Initializable, ERC20('STATIC__aToken_IMPL', 'STATIC__aToken_IMPL', 18), IStaticATokenLM, - IERC4626, Rescuable { using SafeERC20 for IERC20; diff --git a/src/periphery/contracts/static-a-token/interfaces/IStaticATokenLM.sol b/src/periphery/contracts/static-a-token/interfaces/IStaticATokenLM.sol index eed469f3..b36c328b 100644 --- a/src/periphery/contracts/static-a-token/interfaces/IStaticATokenLM.sol +++ b/src/periphery/contracts/static-a-token/interfaces/IStaticATokenLM.sol @@ -2,9 +2,10 @@ pragma solidity ^0.8.10; import {IERC20} from 'solidity-utils/contracts/oz-common/interfaces/IERC20.sol'; +import {IERC4626} from './IERC4626.sol'; import {IInitializableStaticATokenLM} from './IInitializableStaticATokenLM.sol'; -interface IStaticATokenLM is IInitializableStaticATokenLM { +interface IStaticATokenLM is IInitializableStaticATokenLM, IERC4626 { struct SignatureParams { uint8 v; bytes32 r;