fix: update imports

bgd-labs · Jan 30, 2025 · 60b2256 · 60b2256
1 parent 2496ce2
commit 60b2256
Show file tree

Hide file tree

Showing 42 changed files with 237 additions and 260 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -5,7 +5,7 @@
 
 version: 2
 updates:
-  - package-ecosystem: "gitsubmodule" # See documentation for possible values
-    directory: "/" # Location of package manifests
+  - package-ecosystem: 'gitsubmodule' # See documentation for possible values
+    directory: '/' # Location of package manifests
     schedule:
-      interval: "daily"
+      interval: 'daily'
diff --git a/.prettierignore b/.prettierignore
@@ -0,0 +1,6 @@
+lib
+out
+zkout
+reports
+cache
+broadcast
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/diffs/AMMTEST_before_AMMTEST_after.md b/diffs/AMMTEST_before_AMMTEST_after.md
@@ -2,4 +2,4 @@
 
 ```json
 {}
-```
+```
diff --git a/diffs/adi_test_adi_diffs_before_adi_test_adi_diffs_after.md b/diffs/adi_test_adi_diffs_before_adi_test_adi_diffs_after.md
@@ -19,4 +19,4 @@
     }
   }
 }
-```
+```
diff --git a/diffs/default_before_default_after.md b/diffs/default_before_default_after.md
@@ -32,4 +32,4 @@
     }
   }
 }
-```
+```
diff --git a/diffs/preTestV2RatesUpdates_postTestV2RatesUpdates.md b/diffs/preTestV2RatesUpdates_postTestV2RatesUpdates.md
@@ -4,14 +4,14 @@
 
 #### USDC ([0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48](https://etherscan.io/address/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48))
 
-| description | value before | value after |
-| --- | --- | --- |
+| description          | value before                                                                                                          | value after                                                                                                           |
+| -------------------- | --------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------- |
 | interestRateStrategy | [0xF1722FBCAc1C49bA57a77c3F4373A4bb86a46e60](https://etherscan.io/address/0xF1722FBCAc1C49bA57a77c3F4373A4bb86a46e60) | [0x3c7eb05B1C910542EC236c541f183B07787cC3ff](https://etherscan.io/address/0x3c7eb05B1C910542EC236c541f183B07787cC3ff) |
-| variableRateSlope1 | 6.5 % | 42 % |
-| stableRateSlope1 | 2 % | 69 % |
-| optimalUsageRatio | 90 % | 69 % |
-| maxExcessUsageRatio | 10 % | 31 % |
-| interestRate | ![before](/.assets/23e67c7d46dd80f36d580b243c5716c84080a34f.svg) | ![after](/.assets/64fd6acec636adec0e975e8031f8e3f7fb87bb7d.svg) |
+| variableRateSlope1   | 6.5 %                                                                                                                 | 42 %                                                                                                                  |
+| stableRateSlope1     | 2 %                                                                                                                   | 69 %                                                                                                                  |
+| optimalUsageRatio    | 90 %                                                                                                                  | 69 %                                                                                                                  |
+| maxExcessUsageRatio  | 10 %                                                                                                                  | 31 %                                                                                                                  |
+| interestRate         | ![before](/.assets/23e67c7d46dd80f36d580b243c5716c84080a34f.svg)                                                      | ![after](/.assets/64fd6acec636adec0e975e8031f8e3f7fb87bb7d.svg)                                                       |
 
 ## Raw diff
 
@@ -50,4 +50,4 @@
     }
   }
 }
-```
+```
diff --git a/diffs/zksync_before_zksync_after.md b/diffs/zksync_before_zksync_after.md
@@ -2,4 +2,4 @@
 
 ```json
 {}
-```
+```
diff --git a/lib/aave-address-book b/lib/aave-address-book
diff --git a/package.json b/package.json
@@ -7,8 +7,7 @@
     "test": "tests"
   },
   "scripts": {
-    "lint:fix": "prettier --write 'src/**/*.sol'",
-    "prettier:tests": "prettier --write 'tests/**/*.sol'"
+    "lint:fix": "prettier --write ."
   },
   "repository": {
     "type": "git",

diff --git a/scripts/AaveSwapperDeployment.s.sol b/scripts/AaveSwapperDeployment.s.sol
@@ -4,8 +4,8 @@ pragma solidity ^0.8.0;
 
 import {Script} from 'forge-std/Script.sol';
 import {MiscEthereum} from 'aave-address-book/MiscEthereum.sol';
-import {ITransparentProxyFactory, ProxyAdmin} from 'solidity-utils/contracts/transparent-proxy/interfaces/ITransparentProxyFactory.sol';
-
+import {GovernanceV3Ethereum} from 'aave-address-book/GovernanceV3Ethereum.sol';
+import {ITransparentProxyFactory} from 'solidity-utils/contracts/transparent-proxy/interfaces/ITransparentProxyFactory.sol';
 import {AaveSwapper} from 'src/swaps/AaveSwapper.sol';
 
 contract DeployAaveSwapper is Script {
@@ -15,8 +15,8 @@ contract DeployAaveSwapper is Script {
     address aaveSwapper = address(new AaveSwapper());
     ITransparentProxyFactory(MiscEthereum.TRANSPARENT_PROXY_FACTORY).create(
       aaveSwapper,
-      ProxyAdmin(MiscEthereum.PROXY_ADMIN),
-      abi.encodeWithSelector(AaveSwapper.initialize.selector)
+      GovernanceV3Ethereum.EXECUTOR_LVL_1,
+      abi.encodeWithSelector(AaveSwapper.initialize.selector, GovernanceV3Ethereum.EXECUTOR_LVL_1)
     );
 
     vm.stopBroadcast();

diff --git a/scripts/DeployBridges.s.sol b/scripts/DeployBridges.s.sol
@@ -2,7 +2,7 @@
 
 pragma solidity ^0.8.0;
 
-import {IERC20} from 'solidity-utils/contracts/oz-common/interfaces/IERC20.sol';
+import {IERC20} from 'openzeppelin-contracts/contracts/token/ERC20/IERC20.sol';
 import {GovernanceV3Ethereum} from 'aave-address-book/GovernanceV3Ethereum.sol';
 import {GovernanceV3Optimism} from 'aave-address-book/GovernanceV3Optimism.sol';
 import {GovernanceV3Polygon} from 'aave-address-book/GovernanceV3Polygon.sol';

diff --git a/scripts/V2RateStrategyFactory.s.sol b/scripts/V2RateStrategyFactory.s.sol
@@ -11,7 +11,8 @@ import {AaveV2EthereumAMM} from 'aave-address-book/AaveV2EthereumAMM.sol';
 import {AaveV2Polygon} from 'aave-address-book/AaveV2Polygon.sol';
 import {AaveV2Avalanche} from 'aave-address-book/AaveV2Avalanche.sol';
 import 'solidity-utils/contracts/utils/ScriptUtils.sol';
-import {ITransparentProxyFactory, ProxyAdmin} from 'solidity-utils/contracts/transparent-proxy/interfaces/ITransparentProxyFactory.sol';
+import {GovernanceV3Ethereum} from 'aave-address-book/GovernanceV3Ethereum.sol';
+import {ITransparentProxyFactory} from 'solidity-utils/contracts/transparent-proxy/interfaces/ITransparentProxyFactory.sol';
 import {V2RateStrategyFactory} from '../src/v2-config-engine/V2RateStrategyFactory.sol';
 
 library DeployV2RatesFactoryLib {
@@ -59,7 +60,7 @@ library DeployV2RatesFactoryLib {
     V2RateStrategyFactory ratesFactory = V2RateStrategyFactory(
       ITransparentProxyFactory(transparentProxyFactory).create(
         address(new V2RateStrategyFactory(addressesProvider)),
-        ProxyAdmin(ownerForFactory),
+        ownerForFactory,
         abi.encodeWithSelector(V2RateStrategyFactory.initialize.selector, uniqueStrategies)
       )
     );

diff --git a/src/CollectorUtils.sol b/src/CollectorUtils.sol
@@ -4,8 +4,8 @@ pragma solidity ^0.8.0;
 import {IPool, DataTypes} from 'aave-address-book/AaveV3.sol';
 import {ICollector} from 'aave-address-book/common/ICollector.sol';
 import {ILendingPool, DataTypes as V2DataTypes} from 'aave-address-book/AaveV2.sol';
-import {IERC20} from 'solidity-utils/contracts/oz-common/interfaces/IERC20.sol';
-import {SafeERC20} from 'solidity-utils/contracts/oz-common/SafeERC20.sol';
+import {IERC20} from 'openzeppelin-contracts/contracts/token/ERC20/IERC20.sol';
+import {SafeERC20} from 'openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol';
 
 import {AaveSwapper} from './swaps/AaveSwapper.sol';
 import {IChainlinkAggregator} from './interfaces/IChainlinkAggregator.sol';

diff --git a/src/CommonTestBase.sol b/src/CommonTestBase.sol
@@ -4,7 +4,7 @@ pragma solidity >=0.7.5 <0.9.0;
 import 'forge-std/StdJson.sol';
 import 'forge-std/Test.sol';
 import {VmSafe} from 'forge-std/Vm.sol';
-import {IERC20} from 'solidity-utils/contracts/oz-common/interfaces/IERC20.sol';
+import {IERC20} from 'openzeppelin-contracts/contracts/token/ERC20/IERC20.sol';
 import {MiscEthereum} from 'aave-address-book/MiscEthereum.sol';
 import {AaveV2EthereumAssets} from 'aave-address-book/AaveV2Ethereum.sol';
 import {AaveV3OptimismAssets} from 'aave-address-book/AaveV3Optimism.sol';
@@ -102,7 +102,7 @@ contract CommonTestBase is Test {
         return true;
       }
     }
-    if(block.chainid == ChainIds.AVALANCHE) {
+    if (block.chainid == ChainIds.AVALANCHE) {
       // AUSD
       if (asset == 0x00000000eFE302BEAA2b3e6e1b18d08D69a9012a) {
         vm.prank(0x2CD78aD719a8c74898c5283f5Bc70920D8A061fd);

diff --git a/src/GovV3Helpers.sol b/src/GovV3Helpers.sol
@@ -23,7 +23,6 @@ import {GovernanceV3PolygonZkEvm} from 'aave-address-book/GovernanceV3PolygonZkE
 import {GovernanceV3ZkSync} from 'aave-address-book/GovernanceV3ZkSync.sol';
 import {GovernanceV3Linea} from 'aave-address-book/GovernanceV3Linea.sol';
 import {MiscEthereum} from 'aave-address-book/MiscEthereum.sol';
-import {Address} from 'solidity-utils/contracts/oz-common/Address.sol';
 import {Create2Utils} from 'solidity-utils/contracts/utils/ScriptUtils.sol';
 import {StorageHelpers} from './StorageHelpers.sol';
 import {Create2UtilsZkSync} from 'solidity-utils/../zksync/src/contracts/utils/ScriptUtilsZkSync.sol';
@@ -399,7 +398,7 @@ library GovV3Helpers {
    * @param payloadAddress address of the payload to execute
    */
   function readyPayload(Vm vm, address payloadAddress) internal returns (uint40) {
-    require(Address.isContract(payloadAddress), 'PAYLOAD_ADDRESS_HAS_NO_CODE');
+    require(payloadAddress.code.length > 0, 'PAYLOAD_ADDRESS_HAS_NO_CODE');
     IPayloadsControllerCore payloadsController = getPayloadsController(block.chainid);
     IPayloadsControllerCore.ExecutionAction[]
       memory actions = new IPayloadsControllerCore.ExecutionAction[](1);

diff --git a/src/ProtocolV2TestBase.sol b/src/ProtocolV2TestBase.sol
@@ -3,9 +3,9 @@ pragma solidity >=0.7.5 <0.9.0;
 
 import 'forge-std/Test.sol';
 import {IAaveOracle, ILendingPool, ILendingPoolAddressesProvider, ILendingPoolConfigurator, IAaveProtocolDataProvider, DataTypes, TokenData, ILendingRateOracle, IDefaultInterestRateStrategy} from 'aave-address-book/AaveV2.sol';
-import {IERC20} from 'solidity-utils/contracts/oz-common/interfaces/IERC20.sol';
-import {IERC20Metadata} from 'solidity-utils/contracts/oz-common/interfaces/IERC20Metadata.sol';
-import {SafeERC20} from 'solidity-utils/contracts/oz-common/SafeERC20.sol';
+import {IERC20} from 'openzeppelin-contracts/contracts/token/ERC20/IERC20.sol';
+import {IERC20Metadata} from 'openzeppelin-contracts/contracts/token/ERC20/extensions/IERC20Metadata.sol';
+import {SafeERC20} from 'openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol';
 import {AaveV2EthereumAMM} from 'aave-address-book/AaveV2EthereumAMM.sol';
 import {AaveV2EthereumAssets} from 'aave-address-book/AaveV2Ethereum.sol';
 import {DiffUtils} from 'aave-v3-origin/../tests/utils/DiffUtils.sol';

diff --git a/src/ProtocolV3TestBase.sol b/src/ProtocolV3TestBase.sol
@@ -3,9 +3,9 @@ pragma solidity >=0.7.5 <0.9.0;
 
 import 'forge-std/Test.sol';
 import {IAaveOracle, IPool, IPoolAddressesProvider, IPoolDataProvider, IReserveInterestRateStrategy, DataTypes, IPoolConfigurator} from 'aave-address-book/AaveV3.sol';
-import {IERC20} from 'solidity-utils/contracts/oz-common/interfaces/IERC20.sol';
-import {IERC20Metadata} from 'solidity-utils/contracts/oz-common/interfaces/IERC20Metadata.sol';
-import {SafeERC20} from 'solidity-utils/contracts/oz-common/SafeERC20.sol';
+import {IERC20} from 'openzeppelin-contracts/contracts/token/ERC20/IERC20.sol';
+import {IERC20Metadata} from 'openzeppelin-contracts/contracts/token/ERC20/extensions/IERC20Metadata.sol';
+import {SafeERC20} from 'openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol';
 import {ReserveConfiguration} from 'aave-v3-origin/contracts/protocol/libraries/configuration/ReserveConfiguration.sol';
 import {IDefaultInterestRateStrategyV2} from 'aave-v3-origin/contracts/interfaces/IDefaultInterestRateStrategyV2.sol';
 import {AaveV3EthereumAssets} from 'aave-address-book/AaveV3Ethereum.sol';

diff --git a/src/bridges/arbitrum/AaveArbEthERC20Bridge.sol b/src/bridges/arbitrum/AaveArbEthERC20Bridge.sol
@@ -2,9 +2,9 @@
 
 pragma solidity ^0.8.0;
 
-import {IERC20} from 'solidity-utils/contracts/oz-common/interfaces/IERC20.sol';
-import {SafeERC20} from 'solidity-utils/contracts/oz-common/SafeERC20.sol';
-import {Ownable} from 'solidity-utils/contracts/oz-common/Ownable.sol';
+import {IERC20} from 'openzeppelin-contracts/contracts/token/ERC20/IERC20.sol';
+import {SafeERC20} from 'openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol';
+import {Ownable} from 'openzeppelin-contracts/contracts/access/Ownable.sol';
 import {Rescuable} from 'solidity-utils/contracts/utils/Rescuable.sol';
 import {RescuableBase, IRescuableBase} from 'solidity-utils/contracts/utils/RescuableBase.sol';
 import {AaveV3Ethereum} from 'aave-address-book/AaveV3Ethereum.sol';
@@ -61,9 +61,7 @@ contract AaveArbEthERC20Bridge is Ownable, Rescuable, IAaveArbEthERC20Bridge {
   address public constant MAINNET_OUTBOX = 0x0B9857ae2D4A3DBe74ffE1d7DF045bb7F96E4840;
 
   /// @param _owner The owner of the contract upon deployment
-  constructor(address _owner) {
-    _transferOwnership(_owner);
-  }
+  constructor(address _owner) Ownable(_owner) {}
 
   /// @inheritdoc IAaveArbEthERC20Bridge
   function bridge(

diff --git a/src/bridges/optimism/AaveOpEthERC20Bridge.sol b/src/bridges/optimism/AaveOpEthERC20Bridge.sol
@@ -2,9 +2,9 @@
 
 pragma solidity ^0.8.0;
 
-import {IERC20} from 'solidity-utils/contracts/oz-common/interfaces/IERC20.sol';
-import {SafeERC20} from 'solidity-utils/contracts/oz-common/SafeERC20.sol';
-import {Ownable} from 'solidity-utils/contracts/oz-common/Ownable.sol';
+import {IERC20} from 'openzeppelin-contracts/contracts/token/ERC20/IERC20.sol';
+import {SafeERC20} from 'openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol';
+import {Ownable} from 'openzeppelin-contracts/contracts/access/Ownable.sol';
 import {Rescuable} from 'solidity-utils/contracts/utils/Rescuable.sol';
 import {RescuableBase, IRescuableBase} from 'solidity-utils/contracts/utils/RescuableBase.sol';
 import {AaveV3Ethereum} from 'aave-address-book/AaveV3Ethereum.sol';
@@ -25,9 +25,7 @@ contract AaveOpEthERC20Bridge is Ownable, Rescuable, IAaveOpEthERC20Bridge {
   uint256 private _nonce;
 
   /// @param _owner The owner of the contract upon deployment
-  constructor(address _owner) {
-    _transferOwnership(_owner);
-  }
+  constructor(address _owner) Ownable(_owner) {}
 
   /// @inheritdoc IAaveOpEthERC20Bridge
   function bridge(address token, address l1Token, uint256 amount) external onlyOwner {

diff --git a/src/bridges/polygon/AavePolEthERC20Bridge.sol b/src/bridges/polygon/AavePolEthERC20Bridge.sol
@@ -2,9 +2,9 @@
 
 pragma solidity ^0.8.0;
 
-import {IERC20} from 'solidity-utils/contracts/oz-common/interfaces/IERC20.sol';
-import {SafeERC20} from 'solidity-utils/contracts/oz-common/SafeERC20.sol';
-import {Ownable} from 'solidity-utils/contracts/oz-common/Ownable.sol';
+import {IERC20} from 'openzeppelin-contracts/contracts/token/ERC20/IERC20.sol';
+import {SafeERC20} from 'openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol';
+import {Ownable} from 'openzeppelin-contracts/contracts/access/Ownable.sol';
 import {Rescuable} from 'solidity-utils/contracts/utils/Rescuable.sol';
 import {RescuableBase, IRescuableBase} from 'solidity-utils/contracts/utils/RescuableBase.sol';
 import {AaveV3Ethereum} from 'aave-address-book/AaveV3Ethereum.sol';
@@ -45,9 +45,7 @@ contract AavePolEthERC20Bridge is Ownable, Rescuable, IAavePolEthERC20Bridge {
   address public constant ROOT_CHAIN_MANAGER = 0xA0c68C638235ee32657e8f720a23ceC1bFc77C77;
 
   /// @param _owner The owner of the contract upon deployment
-  constructor(address _owner) {
-    _transferOwnership(_owner);
-  }
+  constructor(address _owner) Ownable(_owner) {}
 
   /// @inheritdoc IAavePolEthERC20Bridge
   function bridge(address token, uint256 amount) external onlyOwner {

diff --git a/src/bridges/polygon/AavePolEthPlasmaBridge.sol b/src/bridges/polygon/AavePolEthPlasmaBridge.sol
@@ -2,9 +2,9 @@
 
 pragma solidity ^0.8.0;
 
-import {IERC20} from 'solidity-utils/contracts/oz-common/interfaces/IERC20.sol';
-import {SafeERC20} from 'solidity-utils/contracts/oz-common/SafeERC20.sol';
-import {Ownable} from 'solidity-utils/contracts/oz-common/Ownable.sol';
+import {IERC20} from 'openzeppelin-contracts/contracts/token/ERC20/IERC20.sol';
+import {SafeERC20} from 'openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol';
+import {Ownable} from 'openzeppelin-contracts/contracts/access/Ownable.sol';
 import {Rescuable} from 'solidity-utils/contracts/utils/Rescuable.sol';
 import {RescuableBase, IRescuableBase} from 'solidity-utils/contracts/utils/RescuableBase.sol';
 import {AaveV3Ethereum} from 'aave-address-book/AaveV3Ethereum.sol';
@@ -60,9 +60,7 @@ contract AavePolEthPlasmaBridge is Ownable, Rescuable, IAavePolEthPlasmaBridge {
   address public constant MATIC_POLYGON = 0x0000000000000000000000000000000000001010;
 
   /// @param _owner The owner of the contract upon deployment
-  constructor(address _owner) {
-    _transferOwnership(_owner);
-  }
+  constructor(address _owner) Ownable(_owner) {}
 
   /// @inheritdoc IAavePolEthPlasmaBridge
   function bridge(uint256 amount) external onlyOwner {

diff --git a/src/dependencies/DefaultReserveInterestRateStrategy.sol b/src/dependencies/DefaultReserveInterestRateStrategy.sol
@@ -7,7 +7,7 @@ import {IReserveInterestRateStrategy} from './IReserveInterestRateStrategy.sol';
 import {WadRayMath} from '../dependencies/WadRayMath.sol';
 import {PercentageMath} from '../dependencies/PercentageMath.sol';
 import {ILendingPoolAddressesProvider, ILendingRateOracle} from 'aave-address-book/AaveV2.sol';
-import {IERC20} from 'solidity-utils/contracts/oz-common/interfaces/IERC20.sol';
+import {IERC20} from 'openzeppelin-contracts/contracts/token/ERC20/IERC20.sol';
 
 /**
  * @title DefaultReserveInterestRateStrategy contract

diff --git a/src/riskstewards/CapsPlusRiskSteward.sol b/src/riskstewards/CapsPlusRiskSteward.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.0;
 
 import {IACLManager, IPoolConfigurator, IPoolDataProvider} from 'aave-address-book/AaveV3.sol';
-import {Address} from 'solidity-utils/contracts/oz-common/Address.sol';
+import {Address} from 'openzeppelin-contracts/contracts/utils/Address.sol';
 import {EngineFlags} from 'aave-v3-origin/contracts/extensions/v3-config-engine/EngineFlags.sol';
 import {IAaveV3ConfigEngine} from 'aave-v3-origin/contracts/extensions/v3-config-engine/IAaveV3ConfigEngine.sol';
 import {ICapsPlusRiskSteward} from './ICapsPlusRiskSteward.sol';

diff --git a/src/riskstewards/ICapsPlusRiskSteward.sol b/src/riskstewards/ICapsPlusRiskSteward.sol
@@ -2,7 +2,6 @@
 pragma solidity ^0.8.0;
 
 import {IACLManager, IPoolConfigurator, IPoolDataProvider} from 'aave-address-book/AaveV3.sol';
-import {Address} from 'solidity-utils/contracts/oz-common/Address.sol';
 import {EngineFlags} from 'aave-v3-origin/contracts/extensions/v3-config-engine/EngineFlags.sol';
 import {IAaveV3ConfigEngine} from 'aave-v3-origin/contracts/extensions/v3-config-engine/IAaveV3ConfigEngine.sol';
 

diff --git a/src/swaps/AaveSwapper.sol b/src/swaps/AaveSwapper.sol
@@ -2,12 +2,12 @@
 
 pragma solidity ^0.8.0;
 
-import {IERC20} from 'solidity-utils/contracts/oz-common/interfaces/IERC20.sol';
-import {SafeERC20} from 'solidity-utils/contracts/oz-common/SafeERC20.sol';
+import {IERC20} from 'openzeppelin-contracts/contracts/token/ERC20/IERC20.sol';
+import {SafeERC20} from 'openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol';
+import {Initializable} from 'openzeppelin-contracts-upgradeable/contracts/proxy/utils/Initializable.sol';
 import {Rescuable} from 'solidity-utils/contracts/utils/Rescuable.sol';
 import {RescuableBase, IRescuableBase} from 'solidity-utils/contracts/utils/RescuableBase.sol';
 import {OwnableWithGuardian} from 'solidity-utils/contracts/access-control/OwnableWithGuardian.sol';
-import {Initializable} from 'solidity-utils/contracts/transparent-proxy/Initializable.sol';
 import {AaveV3Ethereum} from 'aave-address-book/AaveV3Ethereum.sol';
 import {AaveGovernanceV2} from 'aave-address-book/AaveGovernanceV2.sol';
 
@@ -26,11 +26,12 @@ contract AaveSwapper is IAaveSwapper, Initializable, OwnableWithGuardian, Rescua
   /// @inheritdoc IAaveSwapper
   address public constant BAL80WETH20 = 0x5c6Ee304399DBdB9C8Ef030aB642B10820DB8F56;
 
+  constructor()
+    OwnableWithGuardian(AaveGovernanceV2.SHORT_EXECUTOR, 0xA519a7cE7B24333055781133B13532AEabfAC81b)
+  {}
+
   /// @inheritdoc IAaveSwapper
-  function initialize() external initializer {
-    _transferOwnership(AaveGovernanceV2.SHORT_EXECUTOR);
-    _updateGuardian(0xA519a7cE7B24333055781133B13532AEabfAC81b);
-  }
+  function initialize() external initializer {}
 
   /// @inheritdoc IAaveSwapper
   function swap(

diff --git a/src/swaps/BaseSwapPayload.sol b/src/swaps/BaseSwapPayload.sol
@@ -2,8 +2,8 @@
 
 pragma solidity ^0.8.0;
 
-import {IERC20} from 'solidity-utils/contracts/oz-common/interfaces/IERC20.sol';
-import {SafeERC20} from 'solidity-utils/contracts/oz-common/SafeERC20.sol';
+import {IERC20} from 'openzeppelin-contracts/contracts/token/ERC20/IERC20.sol';
+import {SafeERC20} from 'openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol';
 import {AaveV2Ethereum} from 'aave-address-book/AaveV2Ethereum.sol';
 
 import {ISwapPayload} from './interfaces/ISwapPayload.sol';
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,4 +2,4 @@ @@
     ```json
     {}
-    ```
+    ```
+15 −0		CHANGELOG.md
+1 −1		lib/aave-v3-origin
+2 −2		package-lock.json
+1 −1		package.json