From 09c1980a12954eaaa583993b7c66d4ce9da8a336 Mon Sep 17 00:00:00 2001 From: miguelmtzinf Date: Fri, 5 Apr 2024 14:22:43 +0200 Subject: [PATCH] fix: Soften solc version and make transferOwnership internal --- contracts/foundry-lib/solidity-utils | 1 + contracts/src/v0.8/ccip/pools/BurnMintTokenPool.sol | 2 +- contracts/src/v0.8/ccip/pools/BurnMintTokenPoolAbstract.sol | 2 +- contracts/src/v0.8/ccip/pools/LockReleaseTokenPool.sol | 2 +- contracts/src/v0.8/ccip/pools/TokenPool.sol | 6 +++--- .../src/v0.8/shared/access/ConfirmedOwnerWithProposal.sol | 2 +- 6 files changed, 8 insertions(+), 7 deletions(-) create mode 160000 contracts/foundry-lib/solidity-utils diff --git a/contracts/foundry-lib/solidity-utils b/contracts/foundry-lib/solidity-utils new file mode 160000 index 0000000000..9d4d041562 --- /dev/null +++ b/contracts/foundry-lib/solidity-utils @@ -0,0 +1 @@ +Subproject commit 9d4d041562f7ac2918e216e2e7c74172afe3d2af diff --git a/contracts/src/v0.8/ccip/pools/BurnMintTokenPool.sol b/contracts/src/v0.8/ccip/pools/BurnMintTokenPool.sol index 9af0f22f4c..be28b49b4f 100644 --- a/contracts/src/v0.8/ccip/pools/BurnMintTokenPool.sol +++ b/contracts/src/v0.8/ccip/pools/BurnMintTokenPool.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BUSL-1.1 -pragma solidity 0.8.19; +pragma solidity ^0.8.0; import {ITypeAndVersion} from "../../shared/interfaces/ITypeAndVersion.sol"; import {IBurnMintERC20} from "../../shared/token/ERC20/IBurnMintERC20.sol"; diff --git a/contracts/src/v0.8/ccip/pools/BurnMintTokenPoolAbstract.sol b/contracts/src/v0.8/ccip/pools/BurnMintTokenPoolAbstract.sol index f5eb135186..feb61d74df 100644 --- a/contracts/src/v0.8/ccip/pools/BurnMintTokenPoolAbstract.sol +++ b/contracts/src/v0.8/ccip/pools/BurnMintTokenPoolAbstract.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BUSL-1.1 -pragma solidity 0.8.19; +pragma solidity ^0.8.0; import {IBurnMintERC20} from "../../shared/token/ERC20/IBurnMintERC20.sol"; diff --git a/contracts/src/v0.8/ccip/pools/LockReleaseTokenPool.sol b/contracts/src/v0.8/ccip/pools/LockReleaseTokenPool.sol index 1a17fa0398..782bc25bf5 100644 --- a/contracts/src/v0.8/ccip/pools/LockReleaseTokenPool.sol +++ b/contracts/src/v0.8/ccip/pools/LockReleaseTokenPool.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BUSL-1.1 -pragma solidity 0.8.19; +pragma solidity ^0.8.0; import {ITypeAndVersion} from "../../shared/interfaces/ITypeAndVersion.sol"; import {ILiquidityContainer} from "../../rebalancer/interfaces/ILiquidityContainer.sol"; diff --git a/contracts/src/v0.8/ccip/pools/TokenPool.sol b/contracts/src/v0.8/ccip/pools/TokenPool.sol index b3571bb449..1c26f3a78b 100644 --- a/contracts/src/v0.8/ccip/pools/TokenPool.sol +++ b/contracts/src/v0.8/ccip/pools/TokenPool.sol @@ -1,5 +1,5 @@ // 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"; @@ -74,11 +74,11 @@ abstract contract TokenPool is IPool, OwnerIsCreator, IERC165 { EnumerableSet.UintSet internal s_remoteChainSelectors; /// @dev Outbound rate limits. Corresponds to the inbound rate limit for the pool /// on the remote chain. - mapping(uint64 remoteChainSelector => RateLimiter.TokenBucket) internal s_outboundRateLimits; + mapping(uint64 => RateLimiter.TokenBucket) internal s_outboundRateLimits; /// @dev Inbound rate limits. This allows per destination chain /// token issuer specified rate limiting (e.g. issuers may trust chains to varying /// degrees and prefer different limits) - mapping(uint64 remoteChainSelector => RateLimiter.TokenBucket) internal s_inboundRateLimits; + mapping(uint64 => RateLimiter.TokenBucket) internal s_inboundRateLimits; constructor(IERC20 token, address[] memory allowlist, address armProxy, address router) { if (address(token) == address(0) || router == address(0)) revert ZeroAddressNotAllowed(); diff --git a/contracts/src/v0.8/shared/access/ConfirmedOwnerWithProposal.sol b/contracts/src/v0.8/shared/access/ConfirmedOwnerWithProposal.sol index 7b68418754..dc3db24824 100644 --- a/contracts/src/v0.8/shared/access/ConfirmedOwnerWithProposal.sol +++ b/contracts/src/v0.8/shared/access/ConfirmedOwnerWithProposal.sol @@ -45,7 +45,7 @@ contract ConfirmedOwnerWithProposal is IOwnable { } /// @notice validate, transfer ownership, and emit relevant events - function _transferOwnership(address to) private { + function _transferOwnership(address to) internal { // solhint-disable-next-line custom-errors require(to != msg.sender, "Cannot transfer to self");