Merge pull request #36 from bgd-labs/fix/refactor

refactor: move static-a-token to extensions
bgd-labs · Aug 21, 2024 · 0e71105 · 0e71105
2 parents 35342e4 + 1a15b4e
commit 0e71105
Show file tree

Hide file tree

Showing 33 changed files with 22 additions and 22 deletions.
diff --git a/.../contracts/dependencies/solmate/ERC20.sol → src/contracts/dependencies/solmate/ERC20.sol b/.../contracts/dependencies/solmate/ERC20.sol → src/contracts/dependencies/solmate/ERC20.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity >=0.8.0;
 
-import {ECDSA} from '../../../../contracts/dependencies/openzeppelin/ECDSA.sol';
+import {ECDSA} from '../openzeppelin/ECDSA.sol';
 
 /// @notice Modern and gas efficient ERC20 + EIP-2612 implementation.
 /// @author Solmate (https://github.com/Rari-Capital/solmate/blob/main/src/tokens/ERC20.sol)

diff --git a/...iphery/contracts/static-a-token/README.md → ...racts/extensions/static-a-token/README.md b/...iphery/contracts/static-a-token/README.md → ...racts/extensions/static-a-token/README.md
diff --git a/.../contracts/static-a-token/StataOracle.sol → ...extensions/static-a-token/StataOracle.sol b/.../contracts/static-a-token/StataOracle.sol → ...extensions/static-a-token/StataOracle.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.10;
 
-import {IPool} from '../../../contracts/interfaces/IPool.sol';
-import {IPoolAddressesProvider} from '../../../contracts/interfaces/IPoolAddressesProvider.sol';
-import {IAaveOracle} from '../../../contracts/interfaces/IAaveOracle.sol';
+import {IPool} from '../../interfaces/IPool.sol';
+import {IPoolAddressesProvider} from '../../interfaces/IPoolAddressesProvider.sol';
+import {IAaveOracle} from '../../interfaces/IAaveOracle.sol';
 import {IStataOracle} from './interfaces/IStataOracle.sol';
 import {IERC4626} from './interfaces/IERC4626.sol';
 

diff --git a/...cts/static-a-token/StaticATokenErrors.sol → ...ons/static-a-token/StaticATokenErrors.sol b/...cts/static-a-token/StaticATokenErrors.sol → ...ons/static-a-token/StaticATokenErrors.sol
diff --git a/...ts/static-a-token/StaticATokenFactory.sol → ...ns/static-a-token/StaticATokenFactory.sol b/...ts/static-a-token/StaticATokenFactory.sol → ...ns/static-a-token/StaticATokenFactory.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.10;
 
-import {IPool, DataTypes} from '../../../contracts/interfaces/IPool.sol';
+import {IPool, DataTypes} from '../../interfaces/IPool.sol';
 import {IERC20Metadata} from 'solidity-utils/contracts/oz-common/interfaces/IERC20Metadata.sol';
 import {ITransparentProxyFactory} from 'solidity-utils/contracts/transparent-proxy/interfaces/ITransparentProxyFactory.sol';
 import {Initializable} from 'solidity-utils/contracts/transparent-proxy/Initializable.sol';

diff --git a/...ntracts/static-a-token/StaticATokenLM.sol → ...ensions/static-a-token/StaticATokenLM.sol b/...ntracts/static-a-token/StaticATokenLM.sol → ...ensions/static-a-token/StaticATokenLM.sol
@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.10;
 
-import {IPool} from '../../../contracts/interfaces/IPool.sol';
-import {DataTypes, ReserveConfiguration} from '../../../contracts/protocol/libraries/configuration/ReserveConfiguration.sol';
-import {IRewardsController} from '../../../contracts/rewards/interfaces/IRewardsController.sol';
-import {WadRayMath} from '../../../contracts/protocol/libraries/math/WadRayMath.sol';
-import {MathUtils} from '../../../contracts/protocol/libraries/math/MathUtils.sol';
+import {IPool} from '../../interfaces/IPool.sol';
+import {DataTypes, ReserveConfiguration} from '../../protocol/libraries/configuration/ReserveConfiguration.sol';
+import {IRewardsController} from '../../rewards/interfaces/IRewardsController.sol';
+import {WadRayMath} from '../../protocol/libraries/math/WadRayMath.sol';
+import {MathUtils} from '../../protocol/libraries/math/MathUtils.sol';
 import {SafeCast} from 'solidity-utils/contracts/oz-common/SafeCast.sol';
 import {Initializable} from 'solidity-utils/contracts/transparent-proxy/Initializable.sol';
 import {SafeERC20} from 'solidity-utils/contracts/oz-common/SafeERC20.sol';
@@ -15,10 +15,10 @@ import {IERC20WithPermit} from 'solidity-utils/contracts/oz-common/interfaces/IE
 
 import {IStaticATokenLM} from './interfaces/IStaticATokenLM.sol';
 import {IAToken} from './interfaces/IAToken.sol';
-import {ERC20} from '../dependencies/solmate/ERC20.sol';
+import {ERC20} from '../../dependencies/solmate/ERC20.sol';
 import {IInitializableStaticATokenLM} from './interfaces/IInitializableStaticATokenLM.sol';
 import {StaticATokenErrors} from './StaticATokenErrors.sol';
-import {RayMathExplicitRounding, Rounding} from '../../../contracts/misc/libraries/RayMathExplicitRounding.sol';
+import {RayMathExplicitRounding, Rounding} from '../../misc/libraries/RayMathExplicitRounding.sol';
 import {IERC4626} from './interfaces/IERC4626.sol';
 
 /**

diff --git a/...cts/static-a-token/interfaces/IAToken.sol → ...ons/static-a-token/interfaces/IAToken.sol b/...cts/static-a-token/interfaces/IAToken.sol → ...ons/static-a-token/interfaces/IAToken.sol
diff --git a/...ts/static-a-token/interfaces/IERC4626.sol → ...ns/static-a-token/interfaces/IERC4626.sol b/...ts/static-a-token/interfaces/IERC4626.sol → ...ns/static-a-token/interfaces/IERC4626.sol
diff --git a/...terfaces/IInitializableStaticATokenLM.sol → ...terfaces/IInitializableStaticATokenLM.sol b/...terfaces/IInitializableStaticATokenLM.sol → ...terfaces/IInitializableStaticATokenLM.sol
diff --git a/...tatic-a-token/interfaces/IStataOracle.sol → ...tatic-a-token/interfaces/IStataOracle.sol b/...tatic-a-token/interfaces/IStataOracle.sol → ...tatic-a-token/interfaces/IStataOracle.sol
diff --git a/...token/interfaces/IStaticATokenFactory.sol → ...token/interfaces/IStaticATokenFactory.sol b/...token/interfaces/IStaticATokenFactory.sol → ...token/interfaces/IStaticATokenFactory.sol
diff --git a/...ic-a-token/interfaces/IStaticATokenLM.sol → ...ic-a-token/interfaces/IStaticATokenLM.sol b/...ic-a-token/interfaces/IStaticATokenLM.sol → ...ic-a-token/interfaces/IStaticATokenLM.sol
diff --git a/src/deployments/contracts/procedures/AaveV3HelpersProcedureTwo.sol b/src/deployments/contracts/procedures/AaveV3HelpersProcedureTwo.sol
@@ -3,8 +3,8 @@ pragma solidity ^0.8.0;
 
 import '../../interfaces/IMarketReportTypes.sol';
 import {TransparentProxyFactory, ITransparentProxyFactory} from 'solidity-utils/contracts/transparent-proxy/TransparentProxyFactory.sol';
-import {StaticATokenLM} from 'aave-v3-periphery/contracts/static-a-token/StaticATokenLM.sol';
-import {StaticATokenFactory} from 'aave-v3-periphery/contracts/static-a-token/StaticATokenFactory.sol';
+import {StaticATokenLM} from '../../../contracts/extensions/static-a-token/StaticATokenLM.sol';
+import {StaticATokenFactory} from '../../../contracts/extensions/static-a-token/StaticATokenFactory.sol';
 import {IErrors} from '../../interfaces/IErrors.sol';
 
 contract AaveV3HelpersProcedureTwo is IErrors {

diff --git a/...eriphery/static-a-token/StataOracle.t.sol → ...tensions/static-a-token/StataOracle.t.sol b/...eriphery/static-a-token/StataOracle.t.sol → ...tensions/static-a-token/StataOracle.t.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.10;
 
-import {StataOracle} from '../../../src/periphery/contracts/static-a-token/StataOracle.sol';
-import {StaticATokenLM} from '../../../src/periphery/contracts/static-a-token/StaticATokenLM.sol';
+import {StataOracle} from '../../../src/contracts/extensions/static-a-token/StataOracle.sol';
+import {StaticATokenLM} from '../../../src/contracts/extensions/static-a-token/StaticATokenLM.sol';
 import {BaseTest} from './TestBase.sol';
 
 contract StataOracleTest is BaseTest {

diff --git a/...phery/static-a-token/StaticATokenLM.t.sol → ...sions/static-a-token/StaticATokenLM.t.sol b/...phery/static-a-token/StaticATokenLM.t.sol → ...sions/static-a-token/StaticATokenLM.t.sol
@@ -3,13 +3,13 @@ pragma solidity ^0.8.10;
 
 import {AToken} from '../../../src/contracts/protocol/tokenization/AToken.sol';
 import {DataTypes} from '../../../src/contracts/protocol/libraries/types/DataTypes.sol';
-import {IERC20, IERC20Metadata} from '../../../src/periphery/contracts/static-a-token/StaticATokenLM.sol';
+import {IERC20, IERC20Metadata} from '../../../src/contracts/extensions/static-a-token/StaticATokenLM.sol';
 import {RayMathExplicitRounding} from '../../../src/contracts/misc/libraries/RayMathExplicitRounding.sol';
 import {PullRewardsTransferStrategy} from '../../../src/contracts/rewards/transfer-strategies/PullRewardsTransferStrategy.sol';
 import {RewardsDataTypes} from '../../../src/contracts/rewards/libraries/RewardsDataTypes.sol';
 import {ITransferStrategyBase} from '../../../src/contracts/rewards/interfaces/ITransferStrategyBase.sol';
 import {IEACAggregatorProxy} from '../../../src/contracts/helpers/interfaces/IEACAggregatorProxy.sol';
-import {IStaticATokenLM} from '../../../src/periphery/contracts/static-a-token/interfaces/IStaticATokenLM.sol';
+import {IStaticATokenLM} from '../../../src/contracts/extensions/static-a-token/interfaces/IStaticATokenLM.sol';
 import {SigUtils} from '../../utils/SigUtils.sol';
 import {BaseTest, TestnetERC20} from './TestBase.sol';
 

diff --git a/...-token/StaticATokenMetaTransactions.t.sol → ...-token/StaticATokenMetaTransactions.t.sol b/...-token/StaticATokenMetaTransactions.t.sol → ...-token/StaticATokenMetaTransactions.t.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.10;
 
 import {IERC20WithPermit} from 'solidity-utils/contracts/oz-common/interfaces/IERC20WithPermit.sol';
-import {StaticATokenLM, IStaticATokenLM, IERC20} from '../../../src/periphery/contracts/static-a-token/StaticATokenLM.sol';
+import {StaticATokenLM, IStaticATokenLM, IERC20} from '../../../src/contracts/extensions/static-a-token/StaticATokenLM.sol';
 import {SigUtils} from '../../utils/SigUtils.sol';
 import {BaseTest, IAToken, IRewardsController, DataTypes} from './TestBase.sol';
 

diff --git a/...ery/static-a-token/StaticATokenNoLM.t.sol → ...ons/static-a-token/StaticATokenNoLM.t.sol b/...ery/static-a-token/StaticATokenNoLM.t.sol → ...ons/static-a-token/StaticATokenNoLM.t.sol
diff --git a/tests/periphery/static-a-token/TestBase.sol → tests/extensions/static-a-token/TestBase.sol b/tests/periphery/static-a-token/TestBase.sol → tests/extensions/static-a-token/TestBase.sol
@@ -5,8 +5,8 @@ import {IRewardsController} from '../../../src//contracts/rewards/interfaces/IRe
 import {TransparentUpgradeableProxy} from 'solidity-utils/contracts/transparent-proxy/TransparentUpgradeableProxy.sol';
 import {ITransparentProxyFactory} from 'solidity-utils/contracts/transparent-proxy/TransparentProxyFactory.sol';
 import {IPool} from '../../../src/contracts/interfaces/IPool.sol';
-import {StaticATokenFactory} from '../../../src/periphery/contracts/static-a-token/StaticATokenFactory.sol';
-import {StaticATokenLM, IStaticATokenLM, IERC20, IERC20Metadata, ERC20} from '../../../src/periphery/contracts/static-a-token/StaticATokenLM.sol';
+import {StaticATokenFactory} from '../../../src/contracts/extensions/static-a-token/StaticATokenFactory.sol';
+import {StaticATokenLM, IStaticATokenLM, IERC20, IERC20Metadata, ERC20} from '../../../src/contracts/extensions/static-a-token/StaticATokenLM.sol';
 import {IAToken} from '../../../src/contracts/interfaces/IAToken.sol';
 import {TestnetProcedures, TestnetERC20} from '../../utils/TestnetProcedures.sol';
 import {DataTypes} from '../../../src/contracts/protocol/libraries/types/DataTypes.sol';

diff --git a/...onfig-engine/AaveV3ConfigEngineTest.t.sol → ...onfig-engine/AaveV3ConfigEngineTest.t.sol b/...onfig-engine/AaveV3ConfigEngineTest.t.sol → ...onfig-engine/AaveV3ConfigEngineTest.t.sol
diff --git a/...gine/mocks/AaveV3MockAssetEModeUpdate.sol → ...gine/mocks/AaveV3MockAssetEModeUpdate.sol b/...gine/mocks/AaveV3MockAssetEModeUpdate.sol → ...gine/mocks/AaveV3MockAssetEModeUpdate.sol
diff --git a/...g-engine/mocks/AaveV3MockBorrowUpdate.sol → ...g-engine/mocks/AaveV3MockBorrowUpdate.sol b/...g-engine/mocks/AaveV3MockBorrowUpdate.sol → ...g-engine/mocks/AaveV3MockBorrowUpdate.sol
diff --git a/.../mocks/AaveV3MockBorrowUpdateNoChange.sol → .../mocks/AaveV3MockBorrowUpdateNoChange.sol b/.../mocks/AaveV3MockBorrowUpdateNoChange.sol → .../mocks/AaveV3MockBorrowUpdateNoChange.sol
diff --git a/...nfig-engine/mocks/AaveV3MockCapUpdate.sol → ...nfig-engine/mocks/AaveV3MockCapUpdate.sol b/...nfig-engine/mocks/AaveV3MockCapUpdate.sol → ...nfig-engine/mocks/AaveV3MockCapUpdate.sol
diff --git a/...gine/mocks/AaveV3MockCollateralUpdate.sol → ...gine/mocks/AaveV3MockCollateralUpdate.sol b/...gine/mocks/AaveV3MockCollateralUpdate.sol → ...gine/mocks/AaveV3MockCollateralUpdate.sol
diff --git a/...ks/AaveV3MockCollateralUpdateNoChange.sol → ...ks/AaveV3MockCollateralUpdateNoChange.sol b/...ks/AaveV3MockCollateralUpdateNoChange.sol → ...ks/AaveV3MockCollateralUpdateNoChange.sol
diff --git a/.../AaveV3MockCollateralUpdateWrongBonus.sol → .../AaveV3MockCollateralUpdateWrongBonus.sol b/.../AaveV3MockCollateralUpdateWrongBonus.sol → .../AaveV3MockCollateralUpdateWrongBonus.sol
diff --git a/...e/mocks/AaveV3MockEModeCategoryUpdate.sol → ...e/mocks/AaveV3MockEModeCategoryUpdate.sol b/...e/mocks/AaveV3MockEModeCategoryUpdate.sol → ...e/mocks/AaveV3MockEModeCategoryUpdate.sol
diff --git a/...AaveV3MockEModeCategoryUpdateNoChange.sol → ...AaveV3MockEModeCategoryUpdateNoChange.sol b/...AaveV3MockEModeCategoryUpdateNoChange.sol → ...AaveV3MockEModeCategoryUpdateNoChange.sol
diff --git a/...config-engine/mocks/AaveV3MockListing.sol → ...config-engine/mocks/AaveV3MockListing.sol b/...config-engine/mocks/AaveV3MockListing.sol → ...config-engine/mocks/AaveV3MockListing.sol
diff --git a/...-engine/mocks/AaveV3MockListingCustom.sol → ...-engine/mocks/AaveV3MockListingCustom.sol b/...-engine/mocks/AaveV3MockListingCustom.sol → ...-engine/mocks/AaveV3MockListingCustom.sol
diff --git a/...ngine/mocks/AaveV3MockPriceFeedUpdate.sol → ...ngine/mocks/AaveV3MockPriceFeedUpdate.sol b/...ngine/mocks/AaveV3MockPriceFeedUpdate.sol → ...ngine/mocks/AaveV3MockPriceFeedUpdate.sol
diff --git a/...ig-engine/mocks/AaveV3MockRatesUpdate.sol → ...ig-engine/mocks/AaveV3MockRatesUpdate.sol b/...ig-engine/mocks/AaveV3MockRatesUpdate.sol → ...ig-engine/mocks/AaveV3MockRatesUpdate.sol
diff --git a/tests/utils/SigUtils.sol b/tests/utils/SigUtils.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.10;
 
-import {IStaticATokenLM} from '../../src/periphery/contracts/static-a-token/interfaces/IStaticATokenLM.sol';
+import {IStaticATokenLM} from '../../src/contracts/extensions/static-a-token/interfaces/IStaticATokenLM.sol';
 
 library SigUtils {
   struct Permit {