Merge pull request #5 from bgd-labs/feat/repo-reorg

feat: repo refactor

Makefile

@@ -7,6 +7,7 @@ update:; forge update
 
 # Build & test
 test   :; forge test -vvv --no-match-contract DeploymentsGasLimits
+test-contract :; forge test --match-contract ${filter} -vvv
 test-watch   :; forge test --watch -vvv --no-match-contract DeploymentsGasLimits
 coverage :; forge coverage --report lcov && \
 	lcov --remove ./lcov.info -o ./lcov.info.p \
@@ -34,4 +35,4 @@ coverage :; forge coverage --report lcov && \
 download :; cast etherscan-source --chain ${chain} -d src/etherscan/${chain}_${address} ${address}
 git-diff :
 	@mkdir -p diffs
-	@printf '%s\n%s\n%s\n' "\`\`\`diff" "$$(git diff --no-index --diff-algorithm=patience --ignore-space-at-eol ${before} ${after})" "\`\`\`" > diffs/${out}.md
+	@printf '%s\n%s\n%s\n' "\`\`\`diff" "$$(git diff --no-index --diff-algorithm=patience --ignore-space-at-eol ${before} ${after})" "\`\`\`" > diffs/${out}.md

certora/applyHarness.patch

@@ -1,22 +1,22 @@
-diff -ruN core/contracts/protocol/tokenization/base/ScaledBalanceTokenBase.sol core/contracts/protocol/tokenization/base/ScaledBalanceTokenBase.sol
---- core/contracts/protocol/tokenization/base/ScaledBalanceTokenBase.sol	2024-03-27 12:57:15.497294747 +0200
-+++ core/contracts/protocol/tokenization/base/ScaledBalanceTokenBase.sol	2024-03-27 13:08:22.155984803 +0200
+diff -ruN contracts/protocol/tokenization/base/ScaledBalanceTokenBase.sol contracts/protocol/tokenization/base/ScaledBalanceTokenBase.sol
+--- contracts/protocol/tokenization/base/ScaledBalanceTokenBase.sol	2024-03-27 12:57:15.497294747 +0200
++++ contracts/protocol/tokenization/base/ScaledBalanceTokenBase.sol	2024-03-27 13:08:22.155984803 +0200
 @@ -34,7 +34,7 @@
    }
- 
+
    /// @inheritdoc IScaledBalanceToken
 -  function scaledBalanceOf(address user) external view override returns (uint256) {
 +  function scaledBalanceOf(address user) public view override returns (uint256) {
      return super.balanceOf(user);
    }
- 
-diff -ruN core/instances/ATokenInstance.sol core/instances/ATokenInstance.sol
---- core/instances/ATokenInstance.sol	2024-03-27 12:57:15.497294747 +0200
-+++ core/instances/ATokenInstance.sol	2024-03-27 13:14:17.971198372 +0200
+
+diff -ruN contracts/instances/ATokenInstance.sol contracts/instances/ATokenInstance.sol
+--- contracts/instances/ATokenInstance.sol	2024-03-27 12:57:15.497294747 +0200
++++ contracts/instances/ATokenInstance.sol	2024-03-27 13:14:17.971198372 +0200
 @@ -35,15 +35,15 @@
- 
+
      _domainSeparator = _calculateDomainSeparator();
- 
+
 -    emit Initialized(
 -      underlyingAsset,
 -      address(POOL),

certora/conf/NEW-pool-no-summarizations.conf

@@ -4,13 +4,13 @@
     "certora/harness/PoolHarness.sol",
     "certora/harness/StableDebtTokenHarness.sol",
     "certora/harness/SimpleERC20.sol",
-    "src/core/instances/VariableDebtTokenInstance.sol",
-    "src/core/contracts/misc/AaveProtocolDataProvider.sol",
-    "src/core/contracts/protocol/pool/DefaultReserveInterestRateStrategyV2.sol",
-    "src/core/contracts/protocol/configuration/ACLManager.sol",
-    "src/core/contracts/protocol/libraries/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol",
-    "src/core/contracts/protocol/configuration/PriceOracleSentinel.sol",
-    "src/core/contracts/protocol/configuration/PoolAddressesProvider.sol",
+    "src/contracts/instances/VariableDebtTokenInstance.sol",
+    "src/contracts/helpers/AaveProtocolDataProvider.sol",
+    "src/contracts/misc/DefaultReserveInterestRateStrategyV2.sol",
+    "src/contracts/protocol/configuration/ACLManager.sol",
+    "src/contracts/misc/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol",
+    "src/contracts/misc/PriceOracleSentinel.sol",
+    "src/contracts/protocol/configuration/PoolAddressesProvider.sol",
   ],
   "link": [
     "ATokenHarness:POOL=PoolHarness",

certora/conf/NEW-pool-simple-properties.conf

@@ -4,11 +4,11 @@
     "certora/harness/PoolHarness.sol",
     "certora/harness/StableDebtTokenHarness.sol",
     "certora/harness/SimpleERC20.sol",
-    "src/core/instances/VariableDebtTokenInstance.sol",
-    "src/core/contracts/misc/AaveProtocolDataProvider.sol",
-    "src/core/contracts/protocol/pool/DefaultReserveInterestRateStrategyV2.sol",
-    "src/core/contracts/protocol/libraries/types/DataTypes.sol",
-    "src/core/contracts/protocol/configuration/PoolAddressesProvider.sol",
+    "src/contracts/instances/VariableDebtTokenInstance.sol",
+    "src/contracts/helpers/AaveProtocolDataProvider.sol",
+    "src/contracts/misc/DefaultReserveInterestRateStrategyV2.sol",
+    "src/contracts/protocol/libraries/types/DataTypes.sol",
+    "src/contracts/protocol/configuration/PoolAddressesProvider.sol",
   ],
   "link": [
     "ATokenHarness:POOL=PoolHarness",

certora/harness/ATokenHarness.sol

@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: agpl-3.0
 pragma solidity ^0.8.19;
 
-import {Pool} from '../munged/core/contracts/protocol/pool/Pool.sol';
-import {ATokenInstance} from '../munged/core/instances/ATokenInstance.sol';
-import {WadRayMath} from '../munged/core/contracts/protocol/libraries/math/WadRayMath.sol';
-import {ScaledBalanceTokenBase} from '../munged/core/contracts/protocol/tokenization/base/ScaledBalanceTokenBase.sol';
-import {IScaledBalanceToken} from '../munged/core/contracts/interfaces/IScaledBalanceToken.sol';
+import {Pool} from '../munged/contracts/protocol/pool/Pool.sol';
+import {ATokenInstance} from '../munged/contracts/instances/ATokenInstance.sol';
+import {WadRayMath} from '../munged/contracts/protocol/libraries/math/WadRayMath.sol';
+import {ScaledBalanceTokenBase} from '../munged/contracts/protocol/tokenization/base/ScaledBalanceTokenBase.sol';
+import {IScaledBalanceToken} from '../munged/contracts/interfaces/IScaledBalanceToken.sol';
 
-/**
+/*
  * @title Certora harness for Aave ERC20 AToken
  *
  * @dev Certora's harness contract for the verification of Aave ERC20 AToken.

certora/harness/PoolHarness.sol

@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.19;
 
-import {PoolInstance} from '../munged/core/instances/PoolInstance.sol';
-import {DataTypes} from '../munged/core/contracts/protocol/libraries/types/DataTypes.sol';
-import {ReserveLogic} from '../munged/core/contracts/protocol/libraries/logic/ReserveLogic.sol';
-import {IPoolAddressesProvider} from '../munged/core/contracts/interfaces/IPoolAddressesProvider.sol';
+import {PoolInstance} from '../munged/contracts/instances/PoolInstance.sol';
+import {DataTypes} from '../munged/contracts/protocol/libraries/types/DataTypes.sol';
+import {ReserveLogic} from '../munged/contracts/protocol/libraries/logic/ReserveLogic.sol';
+import {IPoolAddressesProvider} from '../munged/contracts/interfaces/IPoolAddressesProvider.sol';
 
-import {IERC20} from '../../src/core/contracts/dependencies/openzeppelin/contracts/IERC20.sol';
-import {ReserveConfiguration} from '../munged/core/contracts/protocol/libraries/configuration/ReserveConfiguration.sol';
+import {IERC20} from '../../src/contracts/dependencies/openzeppelin/contracts/IERC20.sol';
+import {ReserveConfiguration} from '../munged/contracts/protocol/libraries/configuration/ReserveConfiguration.sol';
 
 contract PoolHarness is PoolInstance {
   using ReserveLogic for DataTypes.ReserveData;

certora/harness/ReserveConfigurationHarness.sol

@@ -1,8 +1,9 @@
+// SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.19;
 pragma experimental ABIEncoderV2;
 
-import {ReserveConfiguration} from '../munged/core/contracts/protocol/libraries/configuration/ReserveConfiguration.sol';
-import {DataTypes} from '../munged/core/contracts/protocol/libraries/types/DataTypes.sol';
+import {ReserveConfiguration} from '../munged/contracts/protocol/libraries/configuration/ReserveConfiguration.sol';
+import {DataTypes} from '../munged/contracts/protocol/libraries/types/DataTypes.sol';
 
 contract ReserveConfigurationHarness {
   DataTypes.ReserveConfigurationMap public reservesConfig;

certora/harness/SimpleERC20.sol

@@ -1,7 +1,7 @@
-// SPDX-License-Identifier: agpl-3.0
+// SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.19;
 
-import {IERC20} from '../munged/core/contracts/dependencies/openzeppelin/contracts/IERC20.sol';
+import {IERC20} from '../munged/contracts/dependencies/openzeppelin/contracts/IERC20.sol';
 
 /**
 A simple ERC implementation used as the underlying_asset for the verification process.

certora/harness/StableDebtTokenHarness.sol

@@ -1,8 +1,9 @@
+// SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.19;
 
-import {StableDebtTokenInstance} from '../munged/core/instances/StableDebtTokenInstance.sol';
-import {IncentivizedERC20} from '../munged/core/contracts/protocol/tokenization/base/IncentivizedERC20.sol';
-import {IPool} from '../munged/core/contracts/interfaces/IPool.sol';
+import {StableDebtTokenInstance} from '../munged/contracts/instances/StableDebtTokenInstance.sol';
+import {IncentivizedERC20} from '../munged/contracts/protocol/tokenization/base/IncentivizedERC20.sol';
+import {IPool} from '../munged/contracts/interfaces/IPool.sol';
 
 contract StableDebtTokenHarness is StableDebtTokenInstance {
   constructor(IPool pool) public StableDebtTokenInstance(pool) {}

certora/harness/SymbolicPriceOracle.sol

@@ -1,6 +1,7 @@
+// SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.19;
 
-import {IPriceOracleGetter} from '../munged/interfaces/IPriceOracleGetter.sol';
+import {IPriceOracleGetter} from '../munged/contracts/interfaces/IPriceOracleGetter.sol';
 
 contract SymbolicPriceOracle is IPriceOracleGetter {
   address public base;

certora/harness/UserConfigurationHarness.sol

@@ -1,9 +1,10 @@
+// SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.19;
 pragma experimental ABIEncoderV2;
 
-import {UserConfiguration} from '../munged/core/contracts/protocol/libraries/configuration/UserConfiguration.sol';
-import {DataTypes} from '../munged/core/contracts/protocol/libraries/types/DataTypes.sol';
-import {PoolStorage} from '../munged/core/contracts/protocol/pool/PoolStorage.sol';
+import {UserConfiguration} from '../munged/contracts/protocol/libraries/configuration/UserConfiguration.sol';
+import {DataTypes} from '../munged/contracts/protocol/libraries/types/DataTypes.sol';
+import {PoolStorage} from '../munged/contracts/protocol/pool/PoolStorage.sol';
 
 /*
 A wrapper contract for calling functions from the library UserConfiguration.

certora/harness/VariableDebtTokenHarness.sol

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.19;
 
-import {VariableDebtTokenInstance} from '../munged/core/instances/VariableDebtTokenInstance.sol';
-import {WadRayMath} from '../munged/core/contracts/protocol/libraries/math/WadRayMath.sol';
-import {IPool} from '../munged/core/contracts/interfaces/IPool.sol';
+import {VariableDebtTokenInstance} from '../munged/contracts/instances/VariableDebtTokenInstance.sol';
+import {WadRayMath} from '../munged/contracts/protocol/libraries/math/WadRayMath.sol';
+import {IPool} from '../munged/contracts/interfaces/IPool.sol';
 
 contract VariableDebtTokenHarness is VariableDebtTokenInstance {
   using WadRayMath for uint256;

docs/Aave-v3.1-features.md

@@ -28,7 +28,12 @@ This new feature doesn’t create any incompatibility with Aave v3 integrations,
 
 Given its implications and criticality, virtual accounting can be considered the major feature of Aave 3.1.
 
-_Important_. Virtual balance doesn't fix the imprecision caused by other components of the protocol, its objective is to add stricter validations, reducing any type of vector to the minimum.
+**Misc considerations & acknowledged limitations**
+
+- Virtual balance doesn't fix the imprecision caused by other components of the protocol, its objective is to add stricter validations, reducing any type of attack vector to the minimum.
+- An extra "soft" protection has been added on borrowing actions (flash loan and borrow): the amount borrowed of underlying should not be higher than the aToken supply. The idea behind is to add more defenses on inflation scenarios, even if we are aware total protection is not achieved (e.g. against certain edge iteration vectors).
+  Not using `accruedToTreasury` in the calculation is intentional.
+- The addition of virtual accounting can create a situation over time that more liquidity will be available in the aToken contract than what the the virtual balance allows to withdraw/borrow. This is intended by design.
 
 <br>
 

scripts/misc/LibraryPreCompileOne.sol

@@ -71,16 +71,16 @@ contract LibraryPreCompileOne is FfiUtils, Script, DeployUtils {
     return
       string(
         abi.encodePacked(
-          'aave-v3-core/contracts/protocol/libraries/logic/BorrowLogic.sol:BorrowLogic:',
+          'src/contracts/protocol/libraries/logic/BorrowLogic.sol:BorrowLogic:',
           vm.toString(report.borrowLogic),
           ',',
-          'aave-v3-core/contracts/protocol/libraries/logic/BridgeLogic.sol:BridgeLogic:',
+          'src/contracts/protocol/libraries/logic/BridgeLogic.sol:BridgeLogic:',
           vm.toString(report.bridgeLogic),
           ',',
-          'aave-v3-core/contracts/protocol/libraries/logic/ConfiguratorLogic.sol:ConfiguratorLogic:',
+          'src/contracts/protocol/libraries/logic/ConfiguratorLogic.sol:ConfiguratorLogic:',
           vm.toString(report.configuratorLogic),
           ',',
-          'aave-v3-core/contracts/protocol/libraries/logic/EModeLogic.sol:EModeLogic:',
+          'src/contracts/protocol/libraries/logic/EModeLogic.sol:EModeLogic:',
           vm.toString(report.eModeLogic)
         )
       );

scripts/misc/LibraryPreCompileTwo.sol

@@ -71,16 +71,16 @@ contract LibraryPreCompileTwo is FfiUtils, Script, DeployUtils {
       string(
         abi.encodePacked(
           ',',
-          'aave-v3-core/contracts/protocol/libraries/logic/FlashLoanLogic.sol:FlashLoanLogic:',
+          'src/contracts/protocol/libraries/logic/FlashLoanLogic.sol:FlashLoanLogic:',
           vm.toString(report.flashLoanLogic),
           ',',
-          'aave-v3-core/contracts/protocol/libraries/logic/LiquidationLogic.sol:LiquidationLogic:',
+          'src/contracts/protocol/libraries/logic/LiquidationLogic.sol:LiquidationLogic:',
           vm.toString(report.liquidationLogic),
           ',',
-          'aave-v3-core/contracts/protocol/libraries/logic/PoolLogic.sol:PoolLogic:',
+          'src/contracts/protocol/libraries/logic/PoolLogic.sol:PoolLogic:',
           vm.toString(report.poolLogic),
           ',',
-          'aave-v3-core/contracts/protocol/libraries/logic/SupplyLogic.sol:SupplyLogic:',
+          'src/contracts/protocol/libraries/logic/SupplyLogic.sol:SupplyLogic:',
           vm.toString(report.supplyLogic)
         )
       );

src/periphery/contracts/adapters/paraswap/AaveParaSwapFeeClaimer.sol → src/contracts/extensions/paraswap-adapters/AaveParaSwapFeeClaimer.sol

@@ -3,7 +3,7 @@
 pragma solidity ^0.8.0;
 
 import {IFeeClaimer} from './interfaces/IFeeClaimer.sol';
-import {IERC20} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20.sol';
+import {IERC20} from '../../dependencies/openzeppelin/contracts/IERC20.sol';
 
 /**
  * @title AaveParaSwapFeeClaimer

src/periphery/contracts/adapters/paraswap/BaseParaSwapAdapter.sol → src/contracts/extensions/paraswap-adapters/BaseParaSwapAdapter.sol

@@ -1,16 +1,16 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.10;
 
-import {DataTypes} from 'aave-v3-core/contracts/protocol/libraries/types/DataTypes.sol';
-import {FlashLoanSimpleReceiverBase} from 'aave-v3-core/contracts/flashloan/base/FlashLoanSimpleReceiverBase.sol';
-import {GPv2SafeERC20} from 'aave-v3-core/contracts/dependencies/gnosis/contracts/GPv2SafeERC20.sol';
-import {IERC20} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20.sol';
-import {IERC20Detailed} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20Detailed.sol';
-import {IERC20WithPermit} from 'aave-v3-core/contracts/interfaces/IERC20WithPermit.sol';
-import {IPoolAddressesProvider} from 'aave-v3-core/contracts/interfaces/IPoolAddressesProvider.sol';
-import {IPriceOracleGetter} from 'aave-v3-core/contracts/interfaces/IPriceOracleGetter.sol';
-import {SafeMath} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/SafeMath.sol';
-import {Ownable} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/Ownable.sol';
+import {DataTypes} from '../../protocol/libraries/types/DataTypes.sol';
+import {FlashLoanSimpleReceiverBase} from '../../misc/flashloan/base/FlashLoanSimpleReceiverBase.sol';
+import {GPv2SafeERC20} from '../../dependencies/gnosis/contracts/GPv2SafeERC20.sol';
+import {IERC20} from '../../dependencies/openzeppelin/contracts/IERC20.sol';
+import {IERC20Detailed} from '../../dependencies/openzeppelin/contracts/IERC20Detailed.sol';
+import {IERC20WithPermit} from '../../interfaces/IERC20WithPermit.sol';
+import {IPoolAddressesProvider} from '../../interfaces/IPoolAddressesProvider.sol';
+import {IPriceOracleGetter} from '../../interfaces/IPriceOracleGetter.sol';
+import {SafeMath} from '../../dependencies/openzeppelin/contracts/SafeMath.sol';
+import {Ownable} from '../../dependencies/openzeppelin/contracts/Ownable.sol';
 
 /**
  * @title BaseParaSwapAdapter

src/periphery/contracts/adapters/paraswap/BaseParaSwapBuyAdapter.sol → src/contracts/extensions/paraswap-adapters/BaseParaSwapBuyAdapter.sol

@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.10;
 
-import {SafeERC20} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/SafeERC20.sol';
-import {SafeMath} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/SafeMath.sol';
-import {PercentageMath} from 'aave-v3-core/contracts/protocol/libraries/math/PercentageMath.sol';
-import {IPoolAddressesProvider} from 'aave-v3-core/contracts/interfaces/IPoolAddressesProvider.sol';
-import {IERC20Detailed} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20Detailed.sol';
+import {SafeERC20} from '../../dependencies/openzeppelin/contracts/SafeERC20.sol';
+import {SafeMath} from '../../dependencies/openzeppelin/contracts/SafeMath.sol';
+import {PercentageMath} from '../../protocol/libraries/math/PercentageMath.sol';
+import {IPoolAddressesProvider} from '../../interfaces/IPoolAddressesProvider.sol';
+import {IERC20Detailed} from '../../dependencies/openzeppelin/contracts/IERC20Detailed.sol';
 import {IParaSwapAugustus} from './interfaces/IParaSwapAugustus.sol';
 import {IParaSwapAugustusRegistry} from './interfaces/IParaSwapAugustusRegistry.sol';
 import {BaseParaSwapAdapter} from './BaseParaSwapAdapter.sol';

src/periphery/contracts/adapters/paraswap/BaseParaSwapSellAdapter.sol → src/contracts/extensions/paraswap-adapters/BaseParaSwapSellAdapter.sol

@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.10;
 
-import {SafeERC20} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/SafeERC20.sol';
-import {SafeMath} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/SafeMath.sol';
-import {PercentageMath} from 'aave-v3-core/contracts/protocol/libraries/math/PercentageMath.sol';
-import {IPoolAddressesProvider} from 'aave-v3-core/contracts/interfaces/IPoolAddressesProvider.sol';
-import {IERC20Detailed} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20Detailed.sol';
+import {SafeERC20} from '../../dependencies/openzeppelin/contracts/SafeERC20.sol';
+import {SafeMath} from '../../dependencies/openzeppelin/contracts/SafeMath.sol';
+import {PercentageMath} from '../../protocol/libraries/math/PercentageMath.sol';
+import {IPoolAddressesProvider} from '../../interfaces/IPoolAddressesProvider.sol';
+import {IERC20Detailed} from '../../dependencies/openzeppelin/contracts/IERC20Detailed.sol';
 import {IParaSwapAugustus} from './interfaces/IParaSwapAugustus.sol';
 import {IParaSwapAugustusRegistry} from './interfaces/IParaSwapAugustusRegistry.sol';
 import {BaseParaSwapAdapter} from './BaseParaSwapAdapter.sol';

src/periphery/contracts/adapters/paraswap/ParaSwapLiquiditySwapAdapter.sol → src/contracts/extensions/paraswap-adapters/ParaSwapLiquiditySwapAdapter.sol

@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.10;
 
-import {IERC20Detailed} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20Detailed.sol';
-import {IERC20WithPermit} from 'aave-v3-core/contracts/interfaces/IERC20WithPermit.sol';
-import {IPoolAddressesProvider} from 'aave-v3-core/contracts/interfaces/IPoolAddressesProvider.sol';
-import {SafeERC20} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/SafeERC20.sol';
-import {SafeMath} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/SafeMath.sol';
+import {IERC20Detailed} from '../../dependencies/openzeppelin/contracts/IERC20Detailed.sol';
+import {IERC20WithPermit} from '../../interfaces/IERC20WithPermit.sol';
+import {IPoolAddressesProvider} from '../../interfaces/IPoolAddressesProvider.sol';
+import {SafeERC20} from '../../dependencies/openzeppelin/contracts/SafeERC20.sol';
+import {SafeMath} from '../../dependencies/openzeppelin/contracts/SafeMath.sol';
 import {BaseParaSwapSellAdapter} from './BaseParaSwapSellAdapter.sol';
 import {IParaSwapAugustusRegistry} from './interfaces/IParaSwapAugustusRegistry.sol';
 import {IParaSwapAugustus} from './interfaces/IParaSwapAugustus.sol';