Merge branch 'develop' into fix/erc165Checker_fix

.changeset/mean-ravens-stare.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#internal add versioned geth wrappers for keystone prod contracts

.changeset/metal-houses-approve.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+Added TxExpirationRebroadcast feature and config for Solana TXM. #added

.changeset/wild-cats-think.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+Added the `EVM.Transactions.Enabled` config to enable or disable the transaction manager. #added

common/client/transaction_sender_test.go

@@ -258,7 +258,6 @@ func TestTransactionSender_SendTransaction(t *testing.T) {
 		_, txSender = newTestTransactionSender(t, chainID, logger.Test(t),
 			[]Node[types.ID, TestSendTxRPCClient]{fastNode, slowNode},
 			[]SendOnlyNode[types.ID, TestSendTxRPCClient]{slowSendOnly})
-
 	})
 	t.Run("Returns error if there is no healthy primary nodes", func(t *testing.T) {
 		chainID := types.RandomID()

contracts/.changeset/tame-cycles-ring.md

@@ -0,0 +1,10 @@
+---
+'@chainlink/contracts': patch
+---
+
+enable via-ir in CCIP compilation
+
+
+PR issue: CCIP-4656
+
+Solidity Review issue: CCIP-3966

contracts/foundry.toml

@@ -22,12 +22,23 @@ multiline_func_header = "params_first"
 sort_imports = true
 single_line_statement_blocks = "preserve"
 
+# This profile should be used for testing CCIP locally and in CI.
 [profile.ccip]
-solc_version = '0.8.24'
+solc_version = '0.8.26'
 src = 'src/v0.8/ccip'
 test = 'src/v0.8/ccip/test'
+evm_version = 'paris'
 optimizer_runs = 500
+
+# This profile should be used prior to any release to ensure the tests are passing with via-ir enabled. Enabling via-ir
+# locally or in CI will slow down the compilation process, so it is not recommended to use it for everyday development.
+[profile.ccip-viair]
+solc_version = '0.8.26'
+src = 'src/v0.8/ccip'
+test = 'src/v0.8/ccip/test'
 evm_version = 'paris'
+optimizer_runs = 800
+via_ir = true
 
 [profile.functions]
 solc_version = '0.8.19'

contracts/scripts/native_solc_compile_all_ccip

@@ -6,9 +6,10 @@ echo " ┌───────────────────────
 echo " │          Compiling CCIP contracts...         │"
 echo " └──────────────────────────────────────────────┘"
 
-SOLC_VERSION="0.8.24"
-OPTIMIZE_RUNS=26000
-OPTIMIZE_RUNS_OFFRAMP=500
+SOLC_VERSION="0.8.26"
+OPTIMIZE_RUNS=80000
+# This has to match the value in the `ccip-viair` foundry profile.
+OPTIMIZE_RUNS_OFFRAMP=800
 
 
 SCRIPTPATH="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
@@ -32,17 +33,14 @@ compileContract () {
       ;;
   esac
 
-  solc --overwrite --optimize --optimize-runs $optimize_runs --metadata-hash none \
+  solc --overwrite --via-ir --optimize --optimize-runs $optimize_runs --metadata-hash none \
       -o "$ROOT"/contracts/solc/v$SOLC_VERSION/"$contract" \
       --abi --bin --allow-paths "$ROOT"/contracts/src/v0.8 \
       --bin-runtime --hashes --metadata --metadata-literal --combined-json abi,hashes,metadata,srcmap,srcmap-runtime \
       --evm-version paris \
       "$ROOT"/contracts/src/v0.8/"$1"
 }
 
-
-# Solc produces and overwrites intermediary contracts.
-# Contracts should be ordered in reverse-import-complexity-order to minimize overwrite risks.
 compileContract ccip/offRamp/OffRamp.sol
 compileContract ccip/FeeQuoter.sol
 compileContract ccip/onRamp/OnRamp.sol

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

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.24;
+pragma solidity ^0.8.24;
 
 import {IReceiver} from "../keystone/interfaces/IReceiver.sol";
 import {ITypeAndVersion} from "../shared/interfaces/ITypeAndVersion.sol";

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

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.24;
+pragma solidity ^0.8.24;
 
 import {ITypeAndVersion} from "../shared/interfaces/ITypeAndVersion.sol";
 import {IFeeQuoter} from "./interfaces/IFeeQuoter.sol";

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

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.24;
+pragma solidity ^0.8.24;
 
 import {ITypeAndVersion} from "../shared/interfaces/ITypeAndVersion.sol";
 import {IEVM2AnyOnRamp} from "./interfaces/IEVM2AnyOnRamp.sol";

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

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.24;
+pragma solidity ^0.8.24;
 
 import {ITypeAndVersion} from "../shared/interfaces/ITypeAndVersion.sol";
 import {IAny2EVMMessageReceiver} from "./interfaces/IAny2EVMMessageReceiver.sol";

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

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.24;
+pragma solidity ^0.8.24;
 
 import {ITypeAndVersion} from "../../shared/interfaces/ITypeAndVersion.sol";
 

contracts/src/v0.8/ccip/capability/CCIPHome.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.24;
+pragma solidity ^0.8.24;
 
 import {ICapabilityConfiguration} from "../../keystone/interfaces/ICapabilityConfiguration.sol";
 import {INodeInfoProvider} from "../../keystone/interfaces/INodeInfoProvider.sol";

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

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.24;
+pragma solidity ^0.8.24;
 
 import {ITypeAndVersion} from "../../shared/interfaces/ITypeAndVersion.sol";
 import {IAny2EVMMessageReceiver} from "../interfaces/IAny2EVMMessageReceiver.sol";

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

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.24;
+pragma solidity ^0.8.24;
 
 import {ITypeAndVersion} from "../../shared/interfaces/ITypeAndVersion.sol";
 import {IEVM2AnyOnRampClient} from "../interfaces/IEVM2AnyOnRampClient.sol";

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

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.24;
+pragma solidity ^0.8.24;
 
 import {ITypeAndVersion} from "../../shared/interfaces/ITypeAndVersion.sol";
 import {IBurnMintERC20} from "../../shared/token/ERC20/IBurnMintERC20.sol";

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

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.24;
+pragma solidity ^0.8.24;
 
 import {ITypeAndVersion} from "../../shared/interfaces/ITypeAndVersion.sol";
 import {IBurnMintERC20} from "../../shared/token/ERC20/IBurnMintERC20.sol";

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

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.24;
+pragma solidity ^0.8.24;
 
 import {IBurnMintERC20} from "../../shared/token/ERC20/IBurnMintERC20.sol";
 

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

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.24;
+pragma solidity ^0.8.24;
 
 import {ITypeAndVersion} from "../../shared/interfaces/ITypeAndVersion.sol";
 import {IBurnMintERC20} from "../../shared/token/ERC20/IBurnMintERC20.sol";

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

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.24;
+pragma solidity ^0.8.24;
 
 import {ILiquidityContainer} from "../../liquiditymanager/interfaces/ILiquidityContainer.sol";
 import {ITypeAndVersion} from "../../shared/interfaces/ITypeAndVersion.sol";

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

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.24;
+pragma solidity ^0.8.24;
 
 import {IPoolV1} from "../interfaces/IPool.sol";
 import {IRMN} from "../interfaces/IRMN.sol";

contracts/src/v0.8/ccip/pools/USDC/BurnMintWithLockReleaseFlagTokenPool.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.24;
+pragma solidity ^0.8.24;
 
 import {IBurnMintERC20} from "../../../shared/token/ERC20/IBurnMintERC20.sol";
 

contracts/src/v0.8/ccip/pools/USDC/HybridLockReleaseUSDCTokenPool.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.24;
+pragma solidity ^0.8.24;
 
 import {ILiquidityContainer} from "../../../liquiditymanager/interfaces/ILiquidityContainer.sol";
 import {ITokenMessenger} from "../USDC/ITokenMessenger.sol";

contracts/src/v0.8/ccip/pools/USDC/USDCBridgeMigrator.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.24;
+pragma solidity ^0.8.24;
 
 import {Ownable2StepMsgSender} from "../../../shared/access/Ownable2StepMsgSender.sol";
 import {IBurnMintERC20} from "../../../shared/token/ERC20/IBurnMintERC20.sol";

contracts/src/v0.8/ccip/pools/USDC/USDCTokenPool.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.24;
+pragma solidity ^0.8.24;
 
 import {ITypeAndVersion} from "../../../shared/interfaces/ITypeAndVersion.sol";
 import {IMessageTransmitter} from "./IMessageTransmitter.sol";

contracts/src/v0.8/ccip/rmn/ARMProxy.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.24;
+pragma solidity ^0.8.24;
 
 import {ITypeAndVersion} from "../../shared/interfaces/ITypeAndVersion.sol";
 

contracts/src/v0.8/ccip/rmn/RMNHome.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.24;
+pragma solidity ^0.8.24;
 
 import {ITypeAndVersion} from "../../shared/interfaces/ITypeAndVersion.sol";
 

contracts/src/v0.8/ccip/rmn/RMNRemote.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.24;
+pragma solidity ^0.8.24;
 
 import {ITypeAndVersion} from "../../shared/interfaces/ITypeAndVersion.sol";
 import {IRMN} from "../interfaces/IRMN.sol";

contracts/src/v0.8/ccip/test/BaseTest.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.24;
+pragma solidity ^0.8.24;
 
 // Imports to any non-library are not allowed due to the significant cascading
 // compile time increase they cause when imported into this base test.

contracts/src/v0.8/ccip/test/NonceManager/NonceManager.applyPreviousRampsUpdates.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.24;
+pragma solidity ^0.8.24;
 
 import {NonceManager} from "../../NonceManager.sol";
 import {OnRampSetup} from "../onRamp/OnRamp/OnRampSetup.t.sol";

contracts/src/v0.8/ccip/test/NonceManager/NonceManager.getInboundNonce.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.24;
+pragma solidity ^0.8.24;
 
 import {NonceManager} from "../../NonceManager.sol";
 import {Internal} from "../../libraries/Internal.sol";

contracts/src/v0.8/ccip/test/NonceManager/NonceManager.getIncrementedOutboundNonce.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.24;
+pragma solidity ^0.8.24;
 
 import {NonceManager} from "../../NonceManager.sol";
 import {BaseTest} from "../BaseTest.t.sol";

contracts/src/v0.8/ccip/test/NonceManager/NonceManager.getOutboundNonce.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.24;
+pragma solidity ^0.8.24;
 
 import {IEVM2AnyOnRamp} from "../../interfaces/IEVM2AnyOnRamp.sol";
 

contracts/src/v0.8/ccip/test/TokenSetup.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.24;
+pragma solidity ^0.8.24;
 
 import {BurnMintERC20} from "../../shared/token/ERC20/BurnMintERC20.sol";
 import {BurnMintTokenPool} from "../pools/BurnMintTokenPool.sol";

contracts/src/v0.8/ccip/test/WETH9.sol

@@ -14,7 +14,7 @@
 
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-pragma solidity 0.8.24;
+pragma solidity ^0.8.24;
 
 // solhint-disable
 contract WETH9 {

contracts/src/v0.8/ccip/test/applications/PingPong/PingPong.ccipReceive.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.24;
+pragma solidity ^0.8.24;
 
 import {PingPongDemo} from "../../../applications/PingPongDemo.sol";
 import {Client} from "../../../libraries/Client.sol";

contracts/src/v0.8/ccip/test/applications/PingPong/PingPong.setCounterpart.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.24;
+pragma solidity ^0.8.24;
 
 import {PingPongDappSetup} from "./PingPongDappSetup.t.sol";
 

contracts/src/v0.8/ccip/test/applications/PingPong/PingPong.setCounterpartAddress.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.24;
+pragma solidity ^0.8.24;
 
 import {PingPongDappSetup} from "./PingPongDappSetup.t.sol";
 

contracts/src/v0.8/ccip/test/applications/PingPong/PingPong.setCounterpartChainSelector.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.24;
+pragma solidity ^0.8.24;
 
 import {PingPongDappSetup} from "./PingPongDappSetup.t.sol";
 

contracts/src/v0.8/ccip/test/applications/PingPong/PingPong.setOutOfOrderExecution.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.24;
+pragma solidity ^0.8.24;
 
 import {PingPongDemo} from "../../../applications/PingPongDemo.sol";
 import {PingPongDappSetup} from "./PingPongDappSetup.t.sol";

contracts/src/v0.8/ccip/test/applications/PingPong/PingPong.setPaused.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.24;
+pragma solidity ^0.8.24;
 
 import {PingPongDappSetup} from "./PingPongDappSetup.t.sol";
 

contracts/src/v0.8/ccip/test/applications/PingPong/PingPong.startPingPong.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.24;
+pragma solidity ^0.8.24;
 
 import {PingPongDemo} from "../../../applications/PingPongDemo.sol";
 import {Internal} from "../../../libraries/Internal.sol";

contracts/src/v0.8/ccip/test/applications/PingPong/PingPongDappSetup.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.24;
+pragma solidity ^0.8.24;
 
 import {PingPongDemo} from "../../../applications/PingPongDemo.sol";
 import {OnRampSetup} from "../../onRamp/OnRamp/OnRampSetup.t.sol";

contracts/src/v0.8/ccip/test/attacks/OnRamp/FacadeClient.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.24;
+pragma solidity ^0.8.24;
 
 import {IRouterClient} from "../../../interfaces/IRouterClient.sol";
 

contracts/src/v0.8/ccip/test/attacks/OnRamp/OnRampTokenPoolReentrancy.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.24;
+pragma solidity ^0.8.24;
 
 import {Client} from "../../../libraries/Client.sol";
 import {OnRamp} from "../../../onRamp/OnRamp.sol";

contracts/src/v0.8/ccip/test/attacks/OnRamp/ReentrantMaliciousTokenPool.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.24;
+pragma solidity ^0.8.24;
 
 import {Pool} from "../../../libraries/Pool.sol";
 import {TokenPool} from "../../../pools/TokenPool.sol";

contracts/src/v0.8/ccip/test/capability/CCIPHome/CCIPHome.applyChainConfigUpdates.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.24;
+pragma solidity ^0.8.24;
 
 import {INodeInfoProvider} from "../../../../keystone/interfaces/INodeInfoProvider.sol";
 

contracts/src/v0.8/ccip/test/capability/CCIPHome/CCIPHome.beforeCapabilityConfigSet.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.24;
+pragma solidity ^0.8.24;
 
 import {CCIPHome} from "../../../capability/CCIPHome.sol";
 import {Internal} from "../../../libraries/Internal.sol";

contracts/src/v0.8/ccip/test/capability/CCIPHome/CCIPHome.constructor.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.24;
+pragma solidity ^0.8.24;
 
 import {CCIPHome} from "../../../capability/CCIPHome.sol";
 import {CCIPHomeTestSetup} from "./CCIPHomeTestSetup.t.sol";

contracts/src/v0.8/ccip/test/capability/CCIPHome/CCIPHome.getAllConfigs.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.24;
+pragma solidity ^0.8.24;
 
 import {CCIPHome} from "../../../capability/CCIPHome.sol";
 import {Internal} from "../../../libraries/Internal.sol";