Merge with core

contracts/GNUmakefile

@@ -1,5 +1,5 @@
 # ALL_FOUNDRY_PRODUCTS contains a list of all products that have a foundry
-# profile defined and use the Foundry snapshots. 
+# profile defined and use the Foundry snapshots.
 ALL_FOUNDRY_PRODUCTS = llo-feeds functions shared ccip
 
 # To make a snapshot for a specific product, either set the `FOUNDRY_PROFILE` env var
@@ -39,7 +39,7 @@ abigen: ## Build & install abigen.
 
 .PHONY: mockery
 mockery: $(mockery) ## Install mockery.
-	go install github.com/vektra/mockery/v2@v2.35.4
+	go install github.com/vektra/mockery/v2@v2.38.0
 
 .PHONY: foundry
 foundry: ## Install foundry.
@@ -109,4 +109,4 @@ help:
 	@echo "       \/     \/     \/        \/             \/     \/"
 	@echo ""
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | \
-	awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
+	awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'

contracts/STYLE_GUIDE.md

@@ -1,7 +1,7 @@
 # Structure
 
-This guide is split into two sections: [Guidelines](#guidelines) and [Rules](#rules). 
-Guidelines are recommendations that should be followed but are hard to enforce in an automated way. 
+This guide is split into two sections: [Guidelines](#guidelines) and [Rules](#rules).
+Guidelines are recommendations that should be followed but are hard to enforce in an automated way.
 Rules are all enforced through CI, this can be through Solhint rules or other tools.
 
 ## Background
@@ -27,7 +27,7 @@ We will be looking into `forge fmt`, but for now we still use `prettier`.
   - This `dev` folder also has implications for when code is valid for bug bounties, so be extra careful to move functionality out of a `dev` folder.
 
 
-## comments 
+## comments
 - Besides comment above functions/structs, comments should live everywhere a reader might be confused.
   Don’t overestimate the reader of your contract, expect confusion in many places and document accordingly.
   This will help massively during audits and onboarding new team members.
@@ -78,11 +78,11 @@ uint256 networkFeeUSDCents; // good
 struct FeeTokenConfigArgs {
   address token; // ────────────╮ Token address
   uint32 networkFeeUSD; //      │ Flat network fee to charge for messages, multiples of 0.01 USD
-  //                            │ multiline comments should work like this. More fee info 
+  //                            │ multiline comments should work like this. More fee info
   uint64 gasMultiplier; // ─────╯ Price multiplier for gas costs, 1e18 based so 11e17 = 10% extra cost
   uint64 premiumMultiplier; // ─╮ Multiplier for fee-token-specific premiums
   bool enabled; // ─────────────╯ Whether this fee token is enabled
-  uint256 fee; //                 The flat fee the user pays in juels        
+  uint256 fee; //                 The flat fee the user pays in juels
 }
 ```
 ## Functions
@@ -134,7 +134,7 @@ assembly {
   // call and return whether we succeeded. ignore return data
   // call(gas,addr,value,argsOffset,argsLength,retOffset,retLength)
   success := call(gasLimit, target, 0, add(payload, 0x20), mload(payload), 0, 0)
-  
+
   // limit our copy to maxReturnBytes bytes
   let toCopy := returndatasize()
   if gt(toCopy, maxReturnBytes) {
@@ -246,7 +246,7 @@ contract AccessControlledFoo is Foo {
 contract OffchainAggregator is ITypeAndVersion {
    // solhint-disable-next-line chainlink-solidity/all-caps-constant-storage-variables
    string public constant override typeAndVersion = "OffchainAggregator 1.0.0";
-  
+
     function getData() public returns(uint256) {
         return 4;
     }
@@ -256,7 +256,7 @@ contract OffchainAggregator is ITypeAndVersion {
 contract SuperDuperAggregator is ITypeAndVersion {
     /// This is a new contract that has not been released yet, so we
     /// add a `-dev` suffix to the typeAndVersion.
-	
+
     // solhint-disable-next-line chainlink-solidity/all-caps-constant-storage-variables
     string public constant override typeAndVersion = "SuperDuperAggregator 1.1.0-dev";
 
@@ -316,8 +316,8 @@ import {IPool} from "../interfaces/pools/IPool.sol";
 import {AggregateRateLimiter} from "../AggregateRateLimiter.sol";
 import {Client} from "../libraries/Client.sol";
 
-import {SafeERC20} from "../../vendor/openzeppelin-solidity/v4.8.0/contracts/token/ERC20/utils/SafeERC20.sol";
-import {IERC20} from "../../vendor/openzeppelin-solidity/v4.8.0/contracts/token/ERC20/IERC20.sol";
+import {SafeERC20} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/utils/SafeERC20.sol";
+import {IERC20} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/IERC20.sol";
 ```
 
 ## Variables
@@ -386,6 +386,6 @@ rule: `custom-errors`
 
 ## Interfaces
 
-Interfaces should be named `IFoo` instead of `FooInterface`. This follows the patterns of popular [libraries like OpenZeppelin’s](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/token/ERC20/IERC20.sol#L9). 
+Interfaces should be named `IFoo` instead of `FooInterface`. This follows the patterns of popular [libraries like OpenZeppelin’s](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/token/ERC20/IERC20.sol#L9).
 
-rule: `tbd`
+rule: `tbd`

contracts/gas-snapshots/shared.gas-snapshot

@@ -41,6 +41,14 @@ CallWithExactGas__callWithExactGasSafeReturnData:test_CallWithExactGasSafeReturn
 CallWithExactGas__callWithExactGasSafeReturnData:test_NoContractReverts() (gas: 13949)
 CallWithExactGas__callWithExactGasSafeReturnData:test_NoGasForCallExactCheckReverts() (gas: 13239)
 CallWithExactGas__callWithExactGasSafeReturnData:test_NotEnoughGasForCallReverts() (gas: 13670)
+EnumerableMapAddresses_at:testAtSuccess() (gas: 98813)
+EnumerableMapAddresses_contains:testContainsSuccess() (gas: 97480)
+EnumerableMapAddresses_get:testGetSuccess() (gas: 98781)
+EnumerableMapAddresses_get_errorMessage:testGetErrorMessageSuccess() (gas: 99220)
+EnumerableMapAddresses_length:testLengthSuccess() (gas: 76136)
+EnumerableMapAddresses_remove:testRemoveSuccess() (gas: 78050)
+EnumerableMapAddresses_set:testSetSuccess() (gas: 99129)
+EnumerableMapAddresses_tryGet:testTryGetSuccess() (gas: 99170)
 OpStackBurnMintERC677_constructor:testConstructorSuccess() (gas: 1739317)
 OpStackBurnMintERC677_interfaceCompatibility:testBurnCompatibility() (gas: 263373)
 OpStackBurnMintERC677_interfaceCompatibility:testMintCompatibility() (gas: 137957)

contracts/src/v0.8/ccip/PriceRegistry.sol

@@ -8,7 +8,7 @@ import {OwnerIsCreator} from "./../shared/access/OwnerIsCreator.sol";
 import {Internal} from "./libraries/Internal.sol";
 import {USDPriceWith18Decimals} from "./libraries/USDPriceWith18Decimals.sol";
 
-import {EnumerableSet} from "../vendor/openzeppelin-solidity/v4.8.0/contracts/utils/structs/EnumerableSet.sol";
+import {EnumerableSet} from "../vendor/openzeppelin-solidity/v4.8.3/contracts/utils/structs/EnumerableSet.sol";
 
 /// @notice The PriceRegistry contract responsibility is to store the current gas price in USD for a given destination chain,
 /// and the price of a token in USD allowing the owner or priceUpdater to update this value.

contracts/src/v0.8/ccip/Router.sol

@@ -14,9 +14,9 @@ import {Internal} from "./libraries/Internal.sol";
 import {CallWithExactGas} from "../shared/call/CallWithExactGas.sol";
 import {OwnerIsCreator} from "../shared/access/OwnerIsCreator.sol";
 
-import {EnumerableSet} from "../vendor/openzeppelin-solidity/v4.8.0/contracts/utils/structs/EnumerableSet.sol";
-import {SafeERC20} from "../vendor/openzeppelin-solidity/v4.8.0/contracts/token/ERC20/utils/SafeERC20.sol";
-import {IERC20} from "../vendor/openzeppelin-solidity/v4.8.0/contracts/token/ERC20/IERC20.sol";
+import {EnumerableSet} from "../vendor/openzeppelin-solidity/v4.8.3/contracts/utils/structs/EnumerableSet.sol";
+import {SafeERC20} from "../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/utils/SafeERC20.sol";
+import {IERC20} from "../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/IERC20.sol";
 
 /// @title Router
 /// @notice This is the entry point for the end user wishing to send data across chains.

contracts/src/v0.8/ccip/applications/CCIPClientExample.sol

@@ -7,7 +7,7 @@ import {Client} from "../libraries/Client.sol";
 import {CCIPReceiver} from "./CCIPReceiver.sol";
 import {OwnerIsCreator} from "../../shared/access/OwnerIsCreator.sol";
 
-import {IERC20} from "../../vendor/openzeppelin-solidity/v4.8.0/contracts/token/ERC20/IERC20.sol";
+import {IERC20} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/IERC20.sol";
 
 // @notice Example of a client which supports EVM/non-EVM chains
 // @dev If chain specific logic is required for different chain families (e.g. particular

contracts/src/v0.8/ccip/applications/CCIPReceiver.sol

@@ -5,7 +5,7 @@ import {IAny2EVMMessageReceiver} from "../interfaces/IAny2EVMMessageReceiver.sol
 
 import {Client} from "../libraries/Client.sol";
 
-import {IERC165} from "../../vendor/openzeppelin-solidity/v4.8.0/contracts/utils/introspection/IERC165.sol";
+import {IERC165} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/utils/introspection/IERC165.sol";
 
 /// @title CCIPReceiver - Base contract for CCIP applications that can receive messages.
 abstract contract CCIPReceiver is IAny2EVMMessageReceiver, IERC165 {

contracts/src/v0.8/ccip/applications/DefensiveExample.sol

@@ -6,9 +6,9 @@ import {IRouterClient} from "../interfaces/IRouterClient.sol";
 import {Client} from "../libraries/Client.sol";
 import {CCIPClientExample} from "./CCIPClientExample.sol";
 
-import {IERC20} from "../../vendor/openzeppelin-solidity/v4.8.0/contracts/token/ERC20/IERC20.sol";
-import {SafeERC20} from "../../vendor/openzeppelin-solidity/v4.8.0/contracts/token/ERC20/utils/SafeERC20.sol";
-import {EnumerableMap} from "../../vendor/openzeppelin-solidity/v4.8.0/contracts/utils/structs/EnumerableMap.sol";
+import {IERC20} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/IERC20.sol";
+import {SafeERC20} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/utils/SafeERC20.sol";
+import {EnumerableMap} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/utils/structs/EnumerableMap.sol";
 
 contract DefensiveExample is CCIPClientExample {
   using EnumerableMap for EnumerableMap.Bytes32ToUintMap;

contracts/src/v0.8/ccip/applications/PingPongDemo.sol

@@ -8,7 +8,7 @@ import {OwnerIsCreator} from "../../shared/access/OwnerIsCreator.sol";
 import {Client} from "../libraries/Client.sol";
 import {CCIPReceiver} from "./CCIPReceiver.sol";
 
-import {IERC20} from "../../vendor/openzeppelin-solidity/v4.8.0/contracts/token/ERC20/IERC20.sol";
+import {IERC20} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/IERC20.sol";
 
 /// @title PingPongDemo - A simple ping-pong contract for demonstrating cross-chain communication
 contract PingPongDemo is CCIPReceiver, OwnerIsCreator, ITypeAndVersion {

contracts/src/v0.8/ccip/applications/SelfFundedPingPong.sol

@@ -6,7 +6,7 @@ import {Client} from "../libraries/Client.sol";
 import {Router} from "../Router.sol";
 import {EVM2EVMOnRamp} from "../onRamp/EVM2EVMOnRamp.sol";
 
-import {IERC20} from "../../vendor/openzeppelin-solidity/v4.8.0/contracts/token/ERC20/IERC20.sol";
+import {IERC20} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/IERC20.sol";
 
 contract SelfFundedPingPong is PingPongDemo {
   // solhint-disable-next-line chainlink-solidity/all-caps-constant-storage-variables

contracts/src/v0.8/ccip/applications/TokenProxy.sol

@@ -6,8 +6,8 @@ import {IRouterClient} from "../interfaces/IRouterClient.sol";
 import {Client} from "../libraries/Client.sol";
 import {OwnerIsCreator} from "../../shared/access/OwnerIsCreator.sol";
 
-import {SafeERC20} from "../../vendor/openzeppelin-solidity/v4.8.0/contracts/token/ERC20/utils/SafeERC20.sol";
-import {IERC20} from "../../vendor/openzeppelin-solidity/v4.8.0/contracts/token/ERC20/IERC20.sol";
+import {SafeERC20} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/utils/SafeERC20.sol";
+import {IERC20} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/IERC20.sol";
 
 contract TokenProxy is OwnerIsCreator {
   using SafeERC20 for IERC20;

contracts/src/v0.8/ccip/interfaces/IEVM2AnyOnRampClient.sol

@@ -5,7 +5,7 @@ import {IPool} from "./pools/IPool.sol";
 
 import {Client} from "../libraries/Client.sol";
 
-import {IERC20} from "../../vendor/openzeppelin-solidity/v4.8.0/contracts/token/ERC20/IERC20.sol";
+import {IERC20} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/IERC20.sol";
 
 interface IEVM2AnyOnRampClient {
   /// @notice Get the fee for a given ccip message

contracts/src/v0.8/ccip/interfaces/IWrappedNative.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import {IERC20} from "../../vendor/openzeppelin-solidity/v4.8.0/contracts/token/ERC20/IERC20.sol";
+import {IERC20} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/IERC20.sol";
 
 interface IWrappedNative is IERC20 {
   function deposit() external payable;

contracts/src/v0.8/ccip/interfaces/pools/IPool.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import {IERC20} from "../../../vendor/openzeppelin-solidity/v4.8.0/contracts/token/ERC20/IERC20.sol";
+import {IERC20} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/IERC20.sol";
 
 // Shared public interface for multiple pool types.
 // Each pool type handles a different child token model (lock/unlock, mint/burn.)

contracts/src/v0.8/ccip/offRamp/EVM2EVMOffRamp.sol

@@ -18,9 +18,9 @@ import {OCR2BaseNoChecks} from "../ocr/OCR2BaseNoChecks.sol";
 import {AggregateRateLimiter} from "../AggregateRateLimiter.sol";
 import {EnumerableMapAddresses} from "../../shared/enumerable/EnumerableMapAddresses.sol";
 
-import {IERC20} from "../../vendor/openzeppelin-solidity/v4.8.0/contracts/token/ERC20/IERC20.sol";
-import {Address} from "../../vendor/openzeppelin-solidity/v4.8.0/contracts/utils/Address.sol";
-import {ERC165Checker} from "../../vendor/openzeppelin-solidity/v4.8.0/contracts/utils/introspection/ERC165Checker.sol";
+import {IERC20} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/IERC20.sol";
+import {Address} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/utils/Address.sol";
+import {ERC165Checker} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/utils/introspection/ERC165Checker.sol";
 
 /// @notice EVM2EVMOffRamp enables OCR networks to execute multiple messages
 /// in an OffRamp in a single transaction.

contracts/src/v0.8/ccip/onRamp/EVM2EVMOnRamp.sol

@@ -16,9 +16,9 @@ import {RateLimiter} from "../libraries/RateLimiter.sol";
 import {USDPriceWith18Decimals} from "../libraries/USDPriceWith18Decimals.sol";
 import {EnumerableMapAddresses} from "../../shared/enumerable/EnumerableMapAddresses.sol";
 
-import {SafeERC20} from "../../vendor/openzeppelin-solidity/v4.8.0/contracts/token/ERC20/utils/SafeERC20.sol";
-import {IERC20} from "../../vendor/openzeppelin-solidity/v4.8.0/contracts/token/ERC20/IERC20.sol";
-import {EnumerableMap} from "../../vendor/openzeppelin-solidity/v4.8.0/contracts/utils/structs/EnumerableMap.sol";
+import {SafeERC20} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/utils/SafeERC20.sol";
+import {IERC20} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/IERC20.sol";
+import {EnumerableMap} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/utils/structs/EnumerableMap.sol";
 
 /// @notice The onRamp is a contract that handles lane-specific fee logic, NOP payments and
 /// bridgeable token support.

contracts/src/v0.8/ccip/pools/BurnFromMintTokenPool.sol

@@ -7,7 +7,7 @@ import {IBurnMintERC20} from "../../shared/token/ERC20/IBurnMintERC20.sol";
 import {TokenPool} from "./TokenPool.sol";
 import {BurnMintTokenPoolAbstract} from "./BurnMintTokenPoolAbstract.sol";
 
-import {SafeERC20} from "../../vendor/openzeppelin-solidity/v4.8.0/contracts/token/ERC20/utils/SafeERC20.sol";
+import {SafeERC20} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/utils/SafeERC20.sol";
 
 /// @notice This pool mints and burns a 3rd-party token.
 /// @dev Pool whitelisting mode is set in the constructor and cannot be modified later.

contracts/src/v0.8/ccip/pools/BurnWithFromMintTokenPool.sol

@@ -7,7 +7,7 @@ import {IBurnMintERC20} from "../../shared/token/ERC20/IBurnMintERC20.sol";
 import {TokenPool} from "./TokenPool.sol";
 import {BurnMintTokenPoolAbstract} from "./BurnMintTokenPoolAbstract.sol";
 
-import {SafeERC20} from "../../vendor/openzeppelin-solidity/v4.8.0/contracts/token/ERC20/utils/SafeERC20.sol";
+import {SafeERC20} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/utils/SafeERC20.sol";
 
 /// @notice This pool mints and burns a 3rd-party token.
 /// @dev Pool whitelisting mode is set in the constructor and cannot be modified later.

contracts/src/v0.8/ccip/pools/LockReleaseTokenPool.sol

@@ -5,8 +5,8 @@ import {ITypeAndVersion} from "../../shared/interfaces/ITypeAndVersion.sol";
 
 import {TokenPool} from "./TokenPool.sol";
 
-import {IERC20} from "../../vendor/openzeppelin-solidity/v4.8.0/contracts/token/ERC20/IERC20.sol";
-import {SafeERC20} from "../../vendor/openzeppelin-solidity/v4.8.0/contracts/token/ERC20/utils/SafeERC20.sol";
+import {IERC20} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/IERC20.sol";
+import {SafeERC20} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/utils/SafeERC20.sol";
 
 /// @notice Token pool used for tokens on their native chain. This uses a lock and release mechanism.
 /// Because of lock/unlock requiring liquidity, this pool contract also has function to add and remove