Skip to content

Bump OZ 5.0.2 -> 5.3.0 #1426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RensR merged 1 commit into from
Nov 27, 2025
Merged

Bump OZ 5.0.2 -> 5.3.0 #1426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ccv/chains/evm/gobindings/generated/latest/create2_factory/create2_factory.go
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions ccv/chains/evm/gobindings/generated/latest/token_pool_factory/token_pool_factory.go
View file
Open in desktop

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions chains/evm/.gas-snapshot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ CCVConfigValidation_validateDefaultAndMandatedCCVs:test_validateDefaultAndMandat
CCVConfigValidation_validateDefaultAndMandatedCCVs:test_validateDefaultAndMandatedCCVs_OnlyMandatedProvided() (gas: 7620)
CREATE2Factory_applyAllowListUpdates:test_applyAllowListUpdates() (gas: 56082)
CREATE2Factory_applyAllowListUpdates:test_applyAllowListUpdates_SkipEmitWhen_NoOp() (gas: 29778)
CREATE2Factory_createAndCall:test_createAndCall_MultipleCalls() (gas: 252966)
CREATE2Factory_createAndCall:test_createAndCall_NoCalls() (gas: 237052)
CREATE2Factory_createAndCall:test_createAndCall_SingleCall() (gas: 248832)
CREATE2Factory_createAndTransferOwnership:test_createAndTransferOwnership() (gas: 247292)
CREATE2Factory_createAndCall:test_createAndCall_MultipleCalls() (gas: 253018)
CREATE2Factory_createAndCall:test_createAndCall_NoCalls() (gas: 237104)
CREATE2Factory_createAndCall:test_createAndCall_SingleCall() (gas: 248884)
CREATE2Factory_createAndTransferOwnership:test_createAndTransferOwnership() (gas: 247322)
CommitteeVerifier_applyAllowlistUpdates:test_applyAllowlistUpdates_AsAllowlistAdmin() (gas: 93115)
CommitteeVerifier_applyAllowlistUpdates:test_applyAllowlistUpdates_AsOwner() (gas: 94697)
CommitteeVerifier_applyDestChainConfigUpdates:test_applyDestChainConfigUpdates() (gas: 47127)
Expand Down Expand Up @@ -448,13 +448,13 @@ TokenAdminRegistry_removeRegistryModule:test_removeRegistryModule() (gas: 55228)
TokenAdminRegistry_setPool:test_setPool() (gas: 36792)
TokenAdminRegistry_setPool:test_setPool_ZeroAddressRemovesPool() (gas: 31885)
TokenAdminRegistry_transferAdminRole:test_transferAdminRole() (gas: 50684)
TokenPoolFactory_createTokenPool:test_createTokenPoolLockRelease_ExistingToken_predict() (gas: 15886349)
TokenPoolFactory_createTokenPool:test_createTokenPool_BurnFromMintTokenPool() (gas: 8835960)
TokenPoolFactory_createTokenPool:test_createTokenPool_ExistingRemoteToken_AndPredictPool() (gas: 17507830)
TokenPoolFactory_createTokenPool:test_createTokenPool_RemoteTokenHasDifferentDecimals() (gas: 17515524)
TokenPoolFactory_createTokenPool:test_createTokenPool_WithNoExistingRemoteContracts_predict() (gas: 17891482)
TokenPoolFactory_createTokenPool:test_createTokenPool_WithNoExistingTokenOnRemoteChain() (gas: 8642495)
TokenPoolFactory_createTokenPool:test_createTokenPool_WithRemoteTokenAndRemotePool() (gas: 8832478)
TokenPoolFactory_createTokenPool:test_createTokenPoolLockRelease_ExistingToken_predict() (gas: 15892845)
TokenPoolFactory_createTokenPool:test_createTokenPool_BurnFromMintTokenPool() (gas: 8836028)
TokenPoolFactory_createTokenPool:test_createTokenPool_ExistingRemoteToken_AndPredictPool() (gas: 17514378)
TokenPoolFactory_createTokenPool:test_createTokenPool_RemoteTokenHasDifferentDecimals() (gas: 17522072)
TokenPoolFactory_createTokenPool:test_createTokenPool_WithNoExistingRemoteContracts_predict() (gas: 17898100)
TokenPoolFactory_createTokenPool:test_createTokenPool_WithNoExistingTokenOnRemoteChain() (gas: 8642599)
TokenPoolFactory_createTokenPool:test_createTokenPool_WithRemoteTokenAndRemotePool() (gas: 8832546)
TokenPoolV2_applyCCVConfigUpdates:test_applyCCVConfigUpdate() (gas: 137479)
TokenPoolV2_applyCustomBlockConfirmationConfigUpdates:test_applyCustomBlockConfirmationConfigUpdates() (gas: 153600)
TokenPoolV2_applyFee:test_applyFee_CustomFinality() (gas: 80909)
Expand Down
4 changes: 2 additions & 2 deletions chains/evm/contracts/CREATE2Factory.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import {ITypeAndVersion} from "@chainlink/contracts/src/v0.8/shared/interfaces/I

import {Ownable2StepMsgSender} from "@chainlink/contracts/src/v0.8/shared/access/Ownable2StepMsgSender.sol";

import {Create2} from "@openzeppelin/contracts@5.0.2/utils/Create2.sol";
import {EnumerableSet} from "@openzeppelin/contracts@5.0.2/utils/structs/EnumerableSet.sol";
import {Create2} from "@openzeppelin/contracts@5.3.0/utils/Create2.sol";
import {EnumerableSet} from "@openzeppelin/contracts@5.3.0/utils/structs/EnumerableSet.sol";

/// @notice A contract for deploying and configuring contracts via CREATE2.
/// @dev This contract is used to deploy static, user-facing contracts (e.g. proxies)
Expand Down
2 changes: 1 addition & 1 deletion chains/evm/contracts/FeeQuoter.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {Pool} from "./libraries/Pool.sol";
import {USDPriceWith18Decimals} from "./libraries/USDPriceWith18Decimals.sol";
import {AuthorizedCallers} from "@chainlink/contracts/src/v0.8/shared/access/AuthorizedCallers.sol";

import {EnumerableSet} from "@openzeppelin/contracts@5.0.2/utils/structs/EnumerableSet.sol";
import {EnumerableSet} from "@openzeppelin/contracts@5.3.0/utils/structs/EnumerableSet.sol";

/// @notice The FeeQuoter contract responsibility is to:
/// - Store the current gas price in USD for a given destination chain.
Expand Down
2 changes: 1 addition & 1 deletion chains/evm/contracts/Router.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {CallWithExactGas} from "@chainlink/contracts/src/v0.8/shared/call/CallWi

import {IERC20} from "@openzeppelin/[email protected]/token/ERC20/IERC20.sol";
import {SafeERC20} from "@openzeppelin/[email protected]/token/ERC20/utils/SafeERC20.sol";
import {EnumerableSet} from "@openzeppelin/contracts@5.0.2/utils/structs/EnumerableSet.sol";
import {EnumerableSet} from "@openzeppelin/contracts@5.3.0/utils/structs/EnumerableSet.sol";

/// @title Router
/// @notice This is the entry point for the end user wishing to send data across chains.
Expand Down
2 changes: 1 addition & 1 deletion chains/evm/contracts/applications/CCIPReceiver.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {IAny2EVMMessageReceiverV2} from "../interfaces/IAny2EVMMessageReceiverV2

import {Client} from "../libraries/Client.sol";

import {IERC165} from "@openzeppelin/contracts@5.0.2/utils/introspection/IERC165.sol";
import {IERC165} from "@openzeppelin/contracts@5.3.0/utils/introspection/IERC165.sol";

/// @title CCIPReceiver - Base contract for CCIP applications that can receive messages.
abstract contract CCIPReceiver is IAny2EVMMessageReceiverV2, IERC165 {
Expand Down
2 changes: 1 addition & 1 deletion chains/evm/contracts/ccvs/VersionedVerifierResolver.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {ITypeAndVersion} from "@chainlink/contracts/src/v0.8/shared/interfaces/I

import {Ownable2StepMsgSender} from "@chainlink/contracts/src/v0.8/shared/access/Ownable2StepMsgSender.sol";

import {EnumerableSet} from "@openzeppelin/contracts@5.0.2/utils/structs/EnumerableSet.sol";
import {EnumerableSet} from "@openzeppelin/contracts@5.3.0/utils/structs/EnumerableSet.sol";

/// @notice Resolves and returns the appropriate verifier contract for the given outbound / inbound traffic.
/// @dev On source, the destChainSelector of a message is used to determine the verifier implementation to apply.
Expand Down
4 changes: 2 additions & 2 deletions chains/evm/contracts/ccvs/components/BaseVerifier.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import {Client} from "../../libraries/Client.sol";

import {IERC20} from "@openzeppelin/[email protected]/token/ERC20/IERC20.sol";
import {SafeERC20} from "@openzeppelin/[email protected]/token/ERC20/utils/SafeERC20.sol";
import {IERC165} from "@openzeppelin/contracts@5.0.2/utils/introspection/IERC165.sol";
import {EnumerableSet} from "@openzeppelin/contracts@5.0.2/utils/structs/EnumerableSet.sol";
import {IERC165} from "@openzeppelin/contracts@5.3.0/utils/introspection/IERC165.sol";
import {EnumerableSet} from "@openzeppelin/contracts@5.3.0/utils/structs/EnumerableSet.sol";

abstract contract BaseVerifier is ICrossChainVerifierV1, ITypeAndVersion {
using EnumerableSet for EnumerableSet.AddressSet;
Expand Down
2 changes: 1 addition & 1 deletion chains/evm/contracts/ccvs/components/SignatureQuorumValidator.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pragma solidity ^0.8.4;

import {Ownable2StepMsgSender} from "@chainlink/contracts/src/v0.8/shared/access/Ownable2StepMsgSender.sol";

import {EnumerableSet} from "@openzeppelin/contracts@5.0.2/utils/structs/EnumerableSet.sol";
import {EnumerableSet} from "@openzeppelin/contracts@5.3.0/utils/structs/EnumerableSet.sol";

contract SignatureQuorumValidator is Ownable2StepMsgSender {
using EnumerableSet for EnumerableSet.AddressSet;
Expand Down
2 changes: 1 addition & 1 deletion chains/evm/contracts/executor/Executor.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {Ownable2StepMsgSender} from "@chainlink/contracts/src/v0.8/shared/access

import {IERC20} from "@openzeppelin/[email protected]/token/ERC20/IERC20.sol";
import {SafeERC20} from "@openzeppelin/[email protected]/token/ERC20/utils/SafeERC20.sol";
import {EnumerableSet} from "@openzeppelin/contracts@5.0.2/utils/structs/EnumerableSet.sol";
import {EnumerableSet} from "@openzeppelin/contracts@5.3.0/utils/structs/EnumerableSet.sol";

/// @notice The Executor configures the supported destination chains and CCV limits for an executor.
contract Executor is IExecutor, Ownable2StepMsgSender {
Expand Down
2 changes: 1 addition & 1 deletion chains/evm/contracts/interfaces/ICrossChainVerifierV1.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pragma solidity ^0.8.0;
import {Client} from "../libraries/Client.sol";
import {MessageV1Codec} from "../libraries/MessageV1Codec.sol";

import {IERC165} from "@openzeppelin/contracts@5.0.2/utils/introspection/IERC165.sol";
import {IERC165} from "@openzeppelin/contracts@5.3.0/utils/introspection/IERC165.sol";

interface ICrossChainVerifierV1 is IERC165 {
/// @notice Verification of the message, in any way the OffRamp wants. This could be using a signature, a quorum
Expand Down
2 changes: 1 addition & 1 deletion chains/evm/contracts/interfaces/IPool.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pragma solidity ^0.8.0;

import {Pool} from "../libraries/Pool.sol";

import {IERC165} from "@openzeppelin/contracts@5.0.2/utils/introspection/IERC165.sol";
import {IERC165} from "@openzeppelin/contracts@5.3.0/utils/introspection/IERC165.sol";

/// @notice Shared public interface for multiple V1 pool types.
/// Each pool type handles a different child token model e.g. lock/unlock, mint/burn.
Expand Down
6 changes: 3 additions & 3 deletions chains/evm/contracts/offRamp/OffRamp.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import {MessageV1Codec} from "../libraries/MessageV1Codec.sol";
import {Pool} from "../libraries/Pool.sol";
import {Ownable2StepMsgSender} from "@chainlink/contracts/src/v0.8/shared/access/Ownable2StepMsgSender.sol";

import {IERC20} from "@openzeppelin/contracts@5.0.2/token/ERC20/IERC20.sol";
import {ERC165Checker} from "@openzeppelin/contracts@5.0.2/utils/introspection/ERC165Checker.sol";
import {EnumerableSet} from "@openzeppelin/contracts@5.0.2/utils/structs/EnumerableSet.sol";
import {IERC20} from "@openzeppelin/contracts@5.3.0/token/ERC20/IERC20.sol";
import {ERC165Checker} from "@openzeppelin/contracts@5.3.0/utils/introspection/ERC165Checker.sol";
import {EnumerableSet} from "@openzeppelin/contracts@5.3.0/utils/structs/EnumerableSet.sol";

contract OffRamp is ITypeAndVersion, Ownable2StepMsgSender {
using ERC165Checker for address;
Expand Down
4 changes: 2 additions & 2 deletions chains/evm/contracts/onRamp/OnRamp.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import {Ownable2StepMsgSender} from "@chainlink/contracts/src/v0.8/shared/access

import {IERC20} from "@openzeppelin/[email protected]/token/ERC20/IERC20.sol";
import {SafeERC20} from "@openzeppelin/[email protected]/token/ERC20/utils/SafeERC20.sol";
import {IERC165} from "@openzeppelin/contracts@5.0.2/utils/introspection/IERC165.sol";
import {EnumerableSet} from "@openzeppelin/contracts@5.0.2/utils/structs/EnumerableSet.sol";
import {IERC165} from "@openzeppelin/contracts@5.3.0/utils/introspection/IERC165.sol";
import {EnumerableSet} from "@openzeppelin/contracts@5.3.0/utils/structs/EnumerableSet.sol";

// TODO post process hooks?
contract OnRamp is IEVM2AnyOnRampClient, ITypeAndVersion, Ownable2StepMsgSender {
Expand Down
4 changes: 2 additions & 2 deletions chains/evm/contracts/pools/TokenPool.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import {Ownable2StepMsgSender} from "@chainlink/contracts/src/v0.8/shared/access
import {IERC20} from "@openzeppelin/[email protected]/token/ERC20/IERC20.sol";
import {IERC20Metadata} from "@openzeppelin/[email protected]/token/ERC20/extensions/IERC20Metadata.sol";
import {SafeERC20} from "@openzeppelin/[email protected]/token/ERC20/utils/SafeERC20.sol";
import {IERC165} from "@openzeppelin/contracts@5.0.2/utils/introspection/IERC165.sol";
import {EnumerableSet} from "@openzeppelin/contracts@5.0.2/utils/structs/EnumerableSet.sol";
import {IERC165} from "@openzeppelin/contracts@5.3.0/utils/introspection/IERC165.sol";
import {EnumerableSet} from "@openzeppelin/contracts@5.3.0/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
Expand Down
2 changes: 1 addition & 1 deletion chains/evm/contracts/pools/USDC/CCTPMessageTransmitterProxy.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {ITokenMessenger} from "./interfaces/ITokenMessenger.sol";

import {Ownable2StepMsgSender} from "@chainlink/contracts/src/v0.8/shared/access/Ownable2StepMsgSender.sol";
import {ITypeAndVersion} from "@chainlink/contracts/src/v0.8/shared/interfaces/ITypeAndVersion.sol";
import {EnumerableSet} from "@openzeppelin/contracts@5.0.2/utils/structs/EnumerableSet.sol";
import {EnumerableSet} from "@openzeppelin/contracts@5.3.0/utils/structs/EnumerableSet.sol";

/// @title CCTP Message Transmitter Proxy
/// @notice A proxy contract for handling messages transmitted via the Cross Chain Transfer Protocol (CCTP).
Expand Down
2 changes: 1 addition & 1 deletion chains/evm/contracts/pools/USDC/SiloedUSDCTokenPool.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {SiloedLockReleaseTokenPool} from "../SiloedLockReleaseTokenPool.sol";
import {AuthorizedCallers} from "@chainlink/contracts/src/v0.8/shared/access/AuthorizedCallers.sol";
import {IBurnMintERC20} from "@chainlink/contracts/src/v0.8/shared/token/ERC20/IBurnMintERC20.sol";
import {IERC20} from "@openzeppelin/[email protected]/token/ERC20/IERC20.sol";
import {EnumerableSet} from "@openzeppelin/contracts@5.0.2/utils/structs/EnumerableSet.sol";
import {EnumerableSet} from "@openzeppelin/contracts@5.3.0/utils/structs/EnumerableSet.sol";

/// @dev The flag used to indicate that the source pool data is coming from a chain that does not have CCTP Support,
/// and so the lock release pool should be used. The BurnMintWithLockReleaseTokenPool uses this flag as its source pool
Expand Down
8 changes: 4 additions & 4 deletions chains/evm/contracts/test/CREATE2Factory/CREATE2Factory.createAndCall.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ import {IOwnable} from "@chainlink/contracts/src/v0.8/shared/interfaces/IOwnable
import {CREATE2Factory} from "../../CREATE2Factory.sol";
import {CREATE2FactorySetup, Storage} from "./CREATE2FactorySetup.t.sol";

import {Create2} from "@openzeppelin/[email protected]/utils/Create2.sol";

contract CREATE2Factory_createAndCall is CREATE2FactorySetup {
function test_createAndCall_NoCalls() public {
address predictedAddress = s_create2Factory.computeAddress(getStorageCreationCode(1), SALT);
Expand Down Expand Up @@ -65,9 +63,11 @@ contract CREATE2Factory_createAndCall is CREATE2FactorySetup {
s_create2Factory.createAndCall(getStorageCreationCode(1), SALT, new bytes[](0));
}

function test_createAndCall_RevertWhen_Create2FailedDeployment() public {
function test_createAndCall_RevertWhen_Create2FailedDeployment_Storage_InvalidValue() public {
vm.startPrank(s_allowedCaller);
vm.expectRevert(abi.encodeWithSelector(Create2.Create2FailedDeployment.selector));

vm.expectRevert(abi.encodeWithSelector(Storage.InvalidValue.selector));

s_create2Factory.createAndCall(getStorageCreationCode(0), SALT, new bytes[](0));
}

Expand Down
10 changes: 5 additions & 5 deletions chains/evm/contracts/test/CREATE2Factory/CREATE2Factory.createAndTransferOwnership.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ pragma solidity ^0.8.24;
import {IOwnable} from "@chainlink/contracts/src/v0.8/shared/interfaces/IOwnable.sol";

import {CREATE2Factory} from "../../CREATE2Factory.sol";
import {CREATE2FactorySetup} from "./CREATE2FactorySetup.t.sol";

import {Create2} from "@openzeppelin/[email protected]/utils/Create2.sol";
import {CREATE2FactorySetup, Storage} from "./CREATE2FactorySetup.t.sol";

contract CREATE2Factory_createAndTransferOwnership is CREATE2FactorySetup {
function test_createAndTransferOwnership() public {
Expand All @@ -31,9 +29,11 @@ contract CREATE2Factory_createAndTransferOwnership is CREATE2FactorySetup {
s_create2Factory.createAndTransferOwnership(getStorageCreationCode(1), SALT, OWNER);
}

function test_createAndTransferOwnership_RevertWhen_Create2FailedDeployment() public {
function test_createAndTransferOwnership_RevertWhen_Create2FailedDeployment_Storage_InvalidValue() public {
vm.startPrank(s_allowedCaller);
vm.expectRevert(abi.encodeWithSelector(Create2.Create2FailedDeployment.selector));

vm.expectRevert(abi.encodeWithSelector(Storage.InvalidValue.selector));

s_create2Factory.createAndTransferOwnership(getStorageCreationCode(0), SALT, OWNER);
}
}
2 changes: 1 addition & 1 deletion chains/evm/contracts/test/applications/ImmutableExample/ImmutableExample.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {Client} from "../../../libraries/Client.sol";
import {RouterSetup} from "../../Router/RouterSetup.t.sol";

import {IERC20} from "@openzeppelin/[email protected]/token/ERC20/IERC20.sol";
import {ERC165Checker} from "@openzeppelin/contracts@5.0.2/utils/introspection/ERC165Checker.sol";
import {ERC165Checker} from "@openzeppelin/contracts@5.3.0/utils/introspection/ERC165Checker.sol";

contract CCIPClientExample_sanity is RouterSetup {
function test_ImmutableExamples() public {
Expand Down
2 changes: 1 addition & 1 deletion chains/evm/contracts/test/ccvs/components/BaseVerifier/BaseVerifier.supportsInterface.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {ICrossChainVerifierV1} from "../../../../interfaces/ICrossChainVerifierV

import {BaseVerifierSetup} from "./BaseVerifierSetup.t.sol";

import {IERC165} from "@openzeppelin/contracts@5.0.2/utils/introspection/IERC165.sol";
import {IERC165} from "@openzeppelin/contracts@5.3.0/utils/introspection/IERC165.sol";

contract BaseVerifier_getStorageLocation is BaseVerifierSetup {
function test_supportsInterface() public view {
Expand Down
4 changes: 2 additions & 2 deletions chains/evm/contracts/test/helpers/MultiTokenPool.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import {RateLimiter} from "../../libraries/RateLimiter.sol";
import {Ownable2StepMsgSender} from "@chainlink/contracts/src/v0.8/shared/access/Ownable2StepMsgSender.sol";

import {IERC20} from "@openzeppelin/[email protected]/token/ERC20/IERC20.sol";
import {IERC165} from "@openzeppelin/contracts@5.0.2/utils/introspection/IERC165.sol";
import {EnumerableSet} from "@openzeppelin/contracts@5.0.2/utils/structs/EnumerableSet.sol";
import {IERC165} from "@openzeppelin/contracts@5.3.0/utils/introspection/IERC165.sol";
import {EnumerableSet} from "@openzeppelin/contracts@5.3.0/utils/structs/EnumerableSet.sol";

/// @notice This contract is a proof of concept and should NOT be used in production.
abstract contract MultiTokenPool is IPoolV1, Ownable2StepMsgSender {
Expand Down
2 changes: 1 addition & 1 deletion chains/evm/contracts/test/helpers/receivers/LogMessageDataReceiver.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {ITypeAndVersion} from "@chainlink/contracts/src/v0.8/shared/interfaces/I

import {Client} from "../../../libraries/Client.sol";

import {IERC165} from "@openzeppelin/contracts@5.0.2/utils/introspection/IERC165.sol";
import {IERC165} from "@openzeppelin/contracts@5.3.0/utils/introspection/IERC165.sol";

/// @dev A contract that logs the data of a CCIP message received
contract LogMessageDataReceiver is IAny2EVMMessageReceiver, ITypeAndVersion, IERC165 {
Expand Down
4 changes: 2 additions & 2 deletions chains/evm/contracts/test/helpers/receivers/MaybeRevertMessageReceiver.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ pragma solidity ^0.8.24;

import {IAny2EVMMessageReceiver} from "../../../interfaces/IAny2EVMMessageReceiver.sol";
import {Client} from "../../../libraries/Client.sol";
import {IERC20} from "@openzeppelin/contracts@5.0.2/token/ERC20/IERC20.sol";
import {IERC165} from "@openzeppelin/contracts@5.0.2/utils/introspection/IERC165.sol";
import {IERC20} from "@openzeppelin/contracts@5.3.0/token/ERC20/IERC20.sol";
import {IERC165} from "@openzeppelin/contracts@5.3.0/utils/introspection/IERC165.sol";

contract MaybeRevertMessageReceiver is IAny2EVMMessageReceiver, IERC165 {
error ReceiveRevert();
Expand Down
2 changes: 1 addition & 1 deletion chains/evm/contracts/test/mocks/MockPoolV2.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pragma solidity ^0.8.24;

import {IPoolV2} from "../../interfaces/IPoolV2.sol";

import {IERC165} from "@openzeppelin/contracts@5.0.2/utils/introspection/IERC165.sol";
import {IERC165} from "@openzeppelin/contracts@5.3.0/utils/introspection/IERC165.sol";

contract MockPoolV2 {
address[] internal s_requiredCCVs;
Expand Down
2 changes: 1 addition & 1 deletion chains/evm/contracts/test/mocks/MockRouter.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {CallWithExactGas} from "@chainlink/contracts/src/v0.8/shared/call/CallWi

import {IERC20} from "@openzeppelin/[email protected]/token/ERC20/IERC20.sol";
import {SafeERC20} from "@openzeppelin/[email protected]/token/ERC20/utils/SafeERC20.sol";
import {ERC165Checker} from "@openzeppelin/contracts@5.0.2/utils/introspection/ERC165Checker.sol";
import {ERC165Checker} from "@openzeppelin/contracts@5.3.0/utils/introspection/ERC165Checker.sol";

contract MockCCIPRouter is IRouter, IRouterClient {
using SafeERC20 for IERC20;
Expand Down
2 changes: 1 addition & 1 deletion chains/evm/contracts/test/mocks/MockVerifier.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {ICrossChainVerifierV1} from "../../interfaces/ICrossChainVerifierV1.sol"
import {Client} from "../../libraries/Client.sol";
import {MessageV1Codec} from "../../libraries/MessageV1Codec.sol";

import {IERC165} from "@openzeppelin/contracts@5.0.2/utils/introspection/IERC165.sol";
import {IERC165} from "@openzeppelin/contracts@5.3.0/utils/introspection/IERC165.sol";

contract MockVerifier is ICrossChainVerifierResolver, ICrossChainVerifierV1 {
bytes private s_verifierResult;
Expand Down
4 changes: 2 additions & 2 deletions chains/evm/contracts/test/offRamp/OffRamp/OffRamp._getCCVsForMessage.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import {ITokenAdminRegistry} from "../../../interfaces/ITokenAdminRegistry.sol";
import {MessageV1Codec} from "../../../libraries/MessageV1Codec.sol";
import {OffRampSetup} from "./OffRampSetup.t.sol";

import {IERC165} from "@openzeppelin/contracts@5.0.2/utils/introspection/IERC165.sol";
import {EnumerableSet} from "@openzeppelin/contracts@5.0.2/utils/structs/EnumerableSet.sol";
import {IERC165} from "@openzeppelin/contracts@5.3.0/utils/introspection/IERC165.sol";
import {EnumerableSet} from "@openzeppelin/contracts@5.3.0/utils/structs/EnumerableSet.sol";

contract OffRamp__getCCVsForMessage is OffRampSetup {
using EnumerableSet for EnumerableSet.AddressSet;
Expand Down
Loading
Loading