Merge branch 'fix/legacy-on-ramp' into tmp/testnet-maintenance

aave · Oct 22, 2024 · 5123c00 · 5123c00
2 parents 720a45f + 7ae1477
commit 5123c00
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 23 deletions.
diff --git a/...acts/src/v0.8/ccip/pools/GHO/diffs/UpgradeableBurnMintTokenPoolAbstract_diff.md b/...acts/src/v0.8/ccip/pools/GHO/diffs/UpgradeableBurnMintTokenPoolAbstract_diff.md
@@ -7,13 +7,13 @@ index f5eb135186..e228732855 100644
  // SPDX-License-Identifier: BUSL-1.1
 -pragma solidity 0.8.19;
 +pragma solidity ^0.8.0;
- 
+
 -import {IBurnMintERC20} from "../../shared/token/ERC20/IBurnMintERC20.sol";
 +import {IBurnMintERC20} from "../../../shared/token/ERC20/IBurnMintERC20.sol";
- 
+
 -import {TokenPool} from "./TokenPool.sol";
 +import {UpgradeableTokenPool} from "./UpgradeableTokenPool.sol";
- 
+
 -abstract contract BurnMintTokenPoolAbstract is TokenPool {
 +abstract contract UpgradeableBurnMintTokenPoolAbstract is UpgradeableTokenPool {
    /// @notice Contains the specific burn call for a pool.

diff --git a/contracts/src/v0.8/ccip/pools/GHO/diffs/UpgradeableBurnMintTokenPool_diff.md b/contracts/src/v0.8/ccip/pools/GHO/diffs/UpgradeableBurnMintTokenPool_diff.md
@@ -58,7 +58,8 @@ index 9af0f22f4c..99f8a7b42f 100644
 -  ) TokenPool(token, allowlist, armProxy, router) {}
 +    bool allowlistEnabled
 +  ) UpgradeableTokenPool(IBurnMintERC20(token), armProxy, allowlistEnabled) {}
-+
+
+-  /// @inheritdoc BurnMintTokenPoolAbstract
 +  /// @dev Initializer
 +  /// @dev The address passed as `owner` must accept ownership after initialization.
 +  /// @dev The `allowlist` is only effective if pool is set to access-controlled mode
@@ -104,8 +105,7 @@ index 9af0f22f4c..99f8a7b42f 100644
 +
 +    _setRateLimitConfig(remoteChainSelector, outboundConfig, inboundConfig);
 +  }
-
--  /// @inheritdoc BurnMintTokenPoolAbstract
++
 +  /// @inheritdoc UpgradeableBurnMintTokenPoolAbstract
    function _burn(uint256 amount) internal virtual override {
      IBurnMintERC20(address(i_token)).burn(amount);

diff --git a/contracts/src/v0.8/ccip/pools/GHO/diffs/UpgradeableTokenPool_diff.md b/contracts/src/v0.8/ccip/pools/GHO/diffs/UpgradeableTokenPool_diff.md
@@ -6,35 +6,31 @@ index b3571bb449..aa86725ef6 100644
 @@ -1,21 +1,24 @@
  // SPDX-License-Identifier: BUSL-1.1
 -pragma solidity 0.8.19;
--
++pragma solidity ^0.8.0;
+
 -import {IPool} from "../interfaces/pools/IPool.sol";
 -import {IARM} from "../interfaces/IARM.sol";
 -import {IRouter} from "../interfaces/IRouter.sol";
--
++import {IPool} from "../../interfaces/pools/IPool.sol";
++import {IARM} from "../../interfaces/IARM.sol";
++import {IRouter} from "../../interfaces/IRouter.sol";
+
 -import {OwnerIsCreator} from "../../shared/access/OwnerIsCreator.sol";
 -import {RateLimiter} from "../libraries/RateLimiter.sol";
--
++import {OwnerIsCreator} from "../../../shared/access/OwnerIsCreator.sol";
++import {RateLimiter} from "../../libraries/RateLimiter.sol";
+
 -import {IERC20} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/IERC20.sol";
 -import {IERC165} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/utils/introspection/IERC165.sol";
 -import {EnumerableSet} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/utils/structs/EnumerableSet.sol";
--
++import {IERC20} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/IERC20.sol";
++import {IERC165} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/utils/introspection/IERC165.sol";
++import {EnumerableSet} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/utils/structs/EnumerableSet.sol";
+
 -/// @notice Base abstract class with common functions for all token pools.
 -/// A token pool serves as isolated place for holding tokens and token specific logic
 -/// that may execute as tokens move across the bridge.
 -abstract contract TokenPool is IPool, OwnerIsCreator, IERC165 {
-+pragma solidity ^0.8.0;
-+
-+import {IPool} from "../../interfaces/pools/IPool.sol";
-+import {IARM} from "../../interfaces/IARM.sol";
-+import {IRouter} from "../../interfaces/IRouter.sol";
-+
-+import {OwnerIsCreator} from "../../../shared/access/OwnerIsCreator.sol";
-+import {RateLimiter} from "../../libraries/RateLimiter.sol";
-+
-+import {IERC20} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/IERC20.sol";
-+import {IERC165} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/utils/introspection/IERC165.sol";
-+import {EnumerableSet} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/utils/structs/EnumerableSet.sol";
-+
 +/// @title UpgradeableTokenPool
 +/// @author Aave Labs
 +/// @notice Upgradeable version of Chainlink's CCIP TokenPool