From 1881f2070c7b34e6b2195e5b9fe26e771a0233b4 Mon Sep 17 00:00:00 2001 From: DhairyaSethi <55102840+DhairyaSethi@users.noreply.github.com> Date: Thu, 19 Dec 2024 19:21:39 +0530 Subject: [PATCH] chore: reorder imports to minmize diff --- .../pools/GHO/UpgradeableBurnMintTokenPool.sol | 7 +++---- .../diffs/UpgradeableBurnMintTokenPool_diff.md | 15 +++++++-------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/contracts/src/v0.8/ccip/pools/GHO/UpgradeableBurnMintTokenPool.sol b/contracts/src/v0.8/ccip/pools/GHO/UpgradeableBurnMintTokenPool.sol index 5337471a78..8fa7b2669d 100644 --- a/contracts/src/v0.8/ccip/pools/GHO/UpgradeableBurnMintTokenPool.sol +++ b/contracts/src/v0.8/ccip/pools/GHO/UpgradeableBurnMintTokenPool.sol @@ -1,16 +1,15 @@ // SPDX-License-Identifier: BUSL-1.1 pragma solidity ^0.8.0; -import {Initializable} from "solidity-utils/contracts/transparent-proxy/Initializable.sol"; - import {ITypeAndVersion} from "../../../shared/interfaces/ITypeAndVersion.sol"; import {IBurnMintERC20} from "../../../shared/token/ERC20/IBurnMintERC20.sol"; -import {IRouter} from "../../interfaces/IRouter.sol"; - import {UpgradeableBurnMintTokenPoolAbstract} from "./UpgradeableBurnMintTokenPoolAbstract.sol"; import {UpgradeableTokenPool} from "./UpgradeableTokenPool.sol"; +import {Initializable} from "solidity-utils/contracts/transparent-proxy/Initializable.sol"; +import {IRouter} from "../../interfaces/IRouter.sol"; + /// @title UpgradeableBurnMintTokenPool /// @author Aave Labs /// @notice Upgradeable version of Chainlink's CCIP BurnMintTokenPool 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 index 4964a179b2..10e716e0f7 100644 --- a/contracts/src/v0.8/ccip/pools/GHO/diffs/UpgradeableBurnMintTokenPool_diff.md +++ b/contracts/src/v0.8/ccip/pools/GHO/diffs/UpgradeableBurnMintTokenPool_diff.md @@ -1,27 +1,26 @@ ```diff diff --git a/src/v0.8/ccip/pools/BurnMintTokenPool.sol b/src/v0.8/ccip/pools/GHO/UpgradeableBurnMintTokenPool.sol -index 30203a4ced..5337471a78 100644 +index 30203a4ced..8fa7b2669d 100644 --- a/src/v0.8/ccip/pools/BurnMintTokenPool.sol +++ b/src/v0.8/ccip/pools/GHO/UpgradeableBurnMintTokenPool.sol -@@ -1,33 +1,62 @@ +@@ -1,33 +1,61 @@ // SPDX-License-Identifier: BUSL-1.1 -pragma solidity 0.8.24; +pragma solidity ^0.8.0; -import {ITypeAndVersion} from "../../shared/interfaces/ITypeAndVersion.sol"; -import {IBurnMintERC20} from "../../shared/token/ERC20/IBurnMintERC20.sol"; -+import {Initializable} from "solidity-utils/contracts/transparent-proxy/Initializable.sol"; ++import {ITypeAndVersion} from "../../../shared/interfaces/ITypeAndVersion.sol"; ++import {IBurnMintERC20} from "../../../shared/token/ERC20/IBurnMintERC20.sol"; -import {BurnMintTokenPoolAbstract} from "./BurnMintTokenPoolAbstract.sol"; -import {TokenPool} from "./TokenPool.sol"; -+import {ITypeAndVersion} from "../../../shared/interfaces/ITypeAndVersion.sol"; -+import {IBurnMintERC20} from "../../../shared/token/ERC20/IBurnMintERC20.sol"; -+ -+import {IRouter} from "../../interfaces/IRouter.sol"; -+ +import {UpgradeableBurnMintTokenPoolAbstract} from "./UpgradeableBurnMintTokenPoolAbstract.sol"; +import {UpgradeableTokenPool} from "./UpgradeableTokenPool.sol"; + ++import {Initializable} from "solidity-utils/contracts/transparent-proxy/Initializable.sol"; ++import {IRouter} from "../../interfaces/IRouter.sol"; ++ +/// @title UpgradeableBurnMintTokenPool +/// @author Aave Labs +/// @notice Upgradeable version of Chainlink's CCIP BurnMintTokenPool