Merge branch 'develop' into CAPPL-217_expose_workflows_key_to_clo

.changeset/afraid-houses-learn.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#updated use real contracts in ccipreader_tests where possible

.changeset/thin-cats-try.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+Add support for Mercury LLO streams to feeds service. #added

.github/e2e-tests.yml

@@ -942,12 +942,12 @@ runner-test-matrix:
     triggers:
       - PR E2E Core Tests
       - Nightly E2E Tests
-    test_cmd: cd integration-tests/smoke/ccip && go test ccip_test.go -timeout 12m -test.parallel=2 -count=1 -json
+    test_cmd: cd integration-tests/smoke/ccip && go test ccip_test.go -timeout 25m -test.parallel=2 -count=1 -json
     pyroscope_env: ci-smoke-ccipv1_6-evm-simulated
     test_env_vars:
       E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
       E2E_JD_VERSION: 0.6.0
-  
+
   - id: smoke/ccip/ccip_batching_test.go:*
     path: integration-tests/smoke/ccip/ccip_batching_test.go
     test_env_type: docker
@@ -961,30 +961,30 @@ runner-test-matrix:
       E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2,SIMULATED_3
       E2E_JD_VERSION: 0.6.0
 
-  - id: smoke/ccip/ccip_usdc_test.go:*
-    path: integration-tests/smoke/ccip/ccip_usdc_test.go
+  - id: smoke/ccip/ccip_token_transfer_test.go:*
+    path: integration-tests/smoke/ccip/ccip_token_transfer_test.go
     test_env_type: docker
     runs_on: ubuntu-latest
     triggers:
       - PR E2E Core Tests
       - Nightly E2E Tests
-    test_cmd: cd integration-tests/smoke/ccip && go test ccip_usdc_test.go -timeout 18m -test.parallel=1 -count=1 -json
+    test_cmd: cd integration-tests/ && go test smoke/ccip/ccip_token_transfer_test.go -timeout 16m -test.parallel=1 -count=1 -json
     pyroscope_env: ci-smoke-ccipv1_6-evm-simulated
     test_env_vars:
-      E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2,SIMULATED_3
+      E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
       E2E_JD_VERSION: 0.6.0
 
-  - id: smoke/ccip/fee_boosting_test.go:*
-    path: integration-tests/smoke/ccip/fee_boosting_test.go
+  - id: smoke/ccip/ccip_usdc_test.go:*
+    path: integration-tests/smoke/ccip/ccip_usdc_test.go
     test_env_type: docker
     runs_on: ubuntu-latest
     triggers:
       - PR E2E Core Tests
       - Nightly E2E Tests
-    test_cmd: cd integration-tests/smoke/ccip && go test fee_boosting_test.go -timeout 15m -test.parallel=1 -count=1 -json
+    test_cmd: cd integration-tests/smoke/ccip && go test ccip_usdc_test.go -timeout 18m -test.parallel=1 -count=1 -json
     pyroscope_env: ci-smoke-ccipv1_6-evm-simulated
     test_env_vars:
-      E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
+      E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2,SIMULATED_3
       E2E_JD_VERSION: 0.6.0
 
   - id: smoke/ccip/ccip_rmn_test.go:^TestRMN_TwoMessagesOnTwoLanesIncludingBatching$
@@ -1017,21 +1017,20 @@ runner-test-matrix:
       E2E_RMN_RAGEPROXY_VERSION: master-f461a9e
       E2E_RMN_AFN2PROXY_VERSION: master-f461a9e
 
-# Enable after flaking issue is resolved
-#  - id: smoke/ccip/ccip_rmn_test.go:^TestRMN_NotEnoughObservers$
-#    path: integration-tests/smoke/ccip/ccip_rmn_test.go
-#    test_env_type: docker
-#    runs_on: ubuntu-latest
-#    triggers:
-#      - PR E2E Core Tests
-#      - Nightly E2E Tests
-#    test_cmd: cd integration-tests/smoke/ccip && go test -test.run ^TestRMN_NotEnoughObservers$ -timeout 12m -test.parallel=1 -count=1 -json
-#    pyroscope_env: ci-smoke-ccipv1_6-evm-simulated
-#    test_env_vars:
-#      E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
-#      E2E_JD_VERSION: 0.6.0
-#      E2E_RMN_RAGEPROXY_VERSION: master-f461a9e
-#      E2E_RMN_AFN2PROXY_VERSION: master-f461a9e
+  - id: smoke/ccip/ccip_rmn_test.go:^TestRMN_NotEnoughObservers$
+    path: integration-tests/smoke/ccip/ccip_rmn_test.go
+    test_env_type: docker
+    runs_on: ubuntu-latest
+    triggers:
+      - PR E2E Core Tests
+      - Nightly E2E Tests
+    test_cmd: cd integration-tests/smoke/ccip && go test -test.run ^TestRMN_NotEnoughObservers$ -timeout 12m -test.parallel=1 -count=1 -json
+    pyroscope_env: ci-smoke-ccipv1_6-evm-simulated
+    test_env_vars:
+      E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
+      E2E_JD_VERSION: 0.6.0
+      E2E_RMN_RAGEPROXY_VERSION: master-f461a9e
+      E2E_RMN_AFN2PROXY_VERSION: master-f461a9e
 
   - id: smoke/ccip/ccip_rmn_test.go:^TestRMN_DifferentSigners$
     path: integration-tests/smoke/ccip/ccip_rmn_test.go
@@ -1048,22 +1047,20 @@ runner-test-matrix:
       E2E_RMN_RAGEPROXY_VERSION: master-f461a9e
       E2E_RMN_AFN2PROXY_VERSION: master-f461a9e
 
-# Enable after flaking issue is resolved
-#  - id: smoke/ccip/ccip_rmn_test.go:^TestRMN_NotEnoughSigners$
-#    path: integration-tests/smoke/ccip/ccip_rmn_test.go
-#    test_env_type: docker
-#    runs_on: ubuntu-latest
-#    triggers:
-#      - PR E2E Core Tests
-#      - Nightly E2E Tests
-#    test_cmd: cd integration-tests/smoke/ccip && go test -test.run ^TestRMN_NotEnoughSigners$ -timeout 12m -test.parallel=1 -count=1 -json
-#    pyroscope_env: ci-smoke-ccipv1_6-evm-simulated
-#    test_env_vars:
-#      E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
-#      E2E_JD_VERSION: 0.6.0
-#      E2E_RMN_RAGEPROXY_VERSION: master-f461a9e
-#      E2E_RMN_AFN2PROXY_VERSION: master-f461a9e
-
+  - id: smoke/ccip/ccip_rmn_test.go:^TestRMN_NotEnoughSigners$
+    path: integration-tests/smoke/ccip/ccip_rmn_test.go
+    test_env_type: docker
+    runs_on: ubuntu-latest
+    triggers:
+      - PR E2E Core Tests
+      - Nightly E2E Tests
+    test_cmd: cd integration-tests/smoke/ccip && go test -test.run ^TestRMN_NotEnoughSigners$ -timeout 12m -test.parallel=1 -count=1 -json
+    pyroscope_env: ci-smoke-ccipv1_6-evm-simulated
+    test_env_vars:
+      E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
+      E2E_JD_VERSION: 0.6.0
+      E2E_RMN_RAGEPROXY_VERSION: master-f461a9e
+      E2E_RMN_AFN2PROXY_VERSION: master-f461a9e
 
   - id: smoke/ccip/ccip_rmn_test.go:^TestRMN_DifferentRmnNodesForDifferentChains$
     path: integration-tests/smoke/ccip/ccip_rmn_test.go
@@ -1080,6 +1077,35 @@ runner-test-matrix:
       E2E_RMN_RAGEPROXY_VERSION: master-f461a9e
       E2E_RMN_AFN2PROXY_VERSION: master-f461a9e
 
+  - id: smoke/ccip/ccip_rmn_test.go:^TestRMN_TwoMessagesOneSourceChainCursed$
+    path: integration-tests/smoke/ccip/ccip_rmn_test.go
+    test_env_type: docker
+    runs_on: ubuntu-latest
+    triggers:
+      - PR E2E Core Tests
+      - Nightly E2E Tests
+    test_cmd: cd integration-tests/smoke/ccip && go test -test.run ^TestRMN_TwoMessagesOneSourceChainCursed$ -timeout 12m -test.parallel=1 -count=1 -json
+    pyroscope_env: ci-smoke-ccipv1_6-evm-simulated
+    test_env_vars:
+      E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
+      E2E_JD_VERSION: 0.6.0
+      E2E_RMN_RAGEPROXY_VERSION: master-f461a9e
+      E2E_RMN_AFN2PROXY_VERSION: master-f461a9e
+
+  - id: smoke/ccip/ccip_rmn_test.go:^TestRMN_GlobalCurseTwoMessagesOnTwoLanes$
+    path: integration-tests/smoke/ccip/ccip_rmn_test.go
+    test_env_type: docker
+    runs_on: ubuntu-latest
+    triggers:
+      - PR E2E Core Tests
+      - Nightly E2E Tests
+    test_cmd: cd integration-tests/smoke/ccip && go test -test.run ^TestRMN_GlobalCurseTwoMessagesOnTwoLanes$ -timeout 12m -test.parallel=1 -count=1 -json
+    pyroscope_env: ci-smoke-ccipv1_6-evm-simulated
+    test_env_vars:
+      E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
+      E2E_JD_VERSION: 0.6.0
+      E2E_RMN_RAGEPROXY_VERSION: master-f461a9e
+      E2E_RMN_AFN2PROXY_VERSION: master-f461a9e
 
   # END: CCIPv1.6 tests
 

.github/integration-in-memory-tests.yml

@@ -8,11 +8,36 @@
 runner-test-matrix:
   # START: CCIPv1.6 tests
 
+  - id: smoke/ccip/ccip_fees_test.go:*
+    path: integration-tests/smoke/ccip/ccip_fees_test.go
+    test_env_type: in-memory
+    runs_on: ubuntu-latest
+    triggers:
+      - PR Integration CCIP Tests
+    test_cmd: cd integration-tests/smoke/ccip && go test ccip_fees_test.go -timeout 12m -test.parallel=2 -count=1 -json
+
   - id: smoke/ccip/ccip_messaging_test.go:*
     path: integration-tests/smoke/ccip/ccip_messaging_test.go
     test_env_type: in-memory
     runs_on: ubuntu-latest
     triggers:
       - PR Integration CCIP Tests
     test_cmd: cd integration-tests/smoke/ccip && go test ccip_messaging_test.go -timeout 12m -test.parallel=2 -count=1 -json
+
+  - id: smoke/ccip/ccip_fee_boosting_test.go:*
+    path: integration-tests/smoke/ccip/ccip_fee_boosting_test.go
+    test_env_type: in-memory
+    runs_on: ubuntu-latest
+    triggers:
+      - PR Integration CCIP Tests
+    test_cmd: cd integration-tests/smoke/ccip && go test ccip_fee_boosting_test.go -timeout 12m -test.parallel=2 -count=1 -json
+
+  - id: contracts/ccipreader_test.go:*
+    path: integration-tests/contracts/ccipreader_test.go
+    test_env_type: in-memory
+    runs_on: ubuntu-latest
+    triggers:
+      - PR Integration CCIP Tests
+    test_cmd: cd integration-tests/contracts && go test ccipreader_test.go -timeout 5m -test.parallel=1 -count=1 -json
+
   # END: CCIP tests

.github/workflows/crib-integration-test.yml

@@ -76,7 +76,7 @@ jobs:
           echo $GITHUB_WORKSPACE
 
       - name: Deploy and validate CRIB Environment for Core
-        uses: smartcontractkit/.github/actions/crib-deploy-environment@c1c5e0952dfb1f7748cdad9789fd2a2ae8dc7348 # crib-deploy-environment@2.1.1
+        uses: smartcontractkit/.github/actions/crib-deploy-environment@d4d9ce3fad044642d8d2f7ae5aca9f8c78b0073a # crib-deploy-environment@2.1.2
         id: deploy-crib
         with:
           github-token: ${{ steps.token.outputs.access-token }}

contracts/.changeset/chilly-rockets-share.md

@@ -0,0 +1,10 @@
+---
+'@chainlink/contracts': patch
+---
+
+Moves all audited L2EP contracts out from dev directory
+
+
+PR issue: SHIP-3191
+
+Solidity Review issue: SHIP-4050

contracts/.changeset/mean-masks-poke.md

@@ -0,0 +1,10 @@
+---
+'@chainlink/contracts': patch
+---
+
+#added new function to CCIPReaderTester getLatestPriceSequenceNumber
+
+
+PR issue: CCIP-4239
+
+Solidity Review issue: CCIP-3966

contracts/src/v0.8/ccip/test/helpers/CCIPReaderTester.sol

@@ -10,6 +10,7 @@ contract CCIPReaderTester {
   mapping(uint64 sourceChainSelector => OffRamp.SourceChainConfig sourceChainConfig) internal s_sourceChainConfigs;
   mapping(uint64 destChainSelector => uint64 sequenceNumber) internal s_destChainSeqNrs;
   mapping(uint64 sourceChainSelector => mapping(bytes sender => uint64 nonce)) internal s_senderNonce;
+  uint64 private s_latestPriceSequenceNumber;
 
   /// @notice Gets the next sequence number to be used in the onRamp
   /// @param destChainSelector The destination chain selector
@@ -52,6 +53,19 @@ contract CCIPReaderTester {
     s_sourceChainConfigs[sourceChainSelector] = sourceChainConfig;
   }
 
+  /// @notice sets the sequence number of the last price update.
+  function setLatestPriceSequenceNumber(
+    uint64 seqNr
+  ) external {
+    s_latestPriceSequenceNumber = seqNr;
+  }
+
+  /// @notice Returns the sequence number of the last price update.
+  /// @return sequenceNumber The latest price update sequence number.
+  function getLatestPriceSequenceNumber() external view returns (uint64) {
+    return s_latestPriceSequenceNumber;
+  }
+
   function emitCCIPMessageSent(uint64 destChainSelector, Internal.EVM2AnyRampMessage memory message) external {
     emit OnRamp.CCIPMessageSent(destChainSelector, message.header.sequenceNumber, message);
   }

contracts/src/v0.8/l2ep/dev/CrossDomainOwnable.sol → contracts/src/v0.8/l2ep/CrossDomainOwnable.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import {ConfirmedOwner} from "../../shared/access/ConfirmedOwner.sol";
+import {ConfirmedOwner} from "../shared/access/ConfirmedOwner.sol";
 import {ICrossDomainOwnable} from "./interfaces/ICrossDomainOwnable.sol";
 
 /**

contracts/src/v0.8/l2ep/dev/Flags.sol → contracts/src/v0.8/l2ep/Flags.sol

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.24;
 
-import {SimpleReadAccessController} from "../../shared/access/SimpleReadAccessController.sol";
-import {AccessControllerInterface} from "../../shared/interfaces/AccessControllerInterface.sol";
-import {ITypeAndVersion} from "../../shared/interfaces/ITypeAndVersion.sol";
+import {SimpleReadAccessController} from "../shared/access/SimpleReadAccessController.sol";
+import {AccessControllerInterface} from "../shared/interfaces/AccessControllerInterface.sol";
+import {ITypeAndVersion} from "../shared/interfaces/ITypeAndVersion.sol";
 
 /* dev dependencies - to be re/moved after audit */
 import {IFlags} from "./interfaces/IFlags.sol";

contracts/src/v0.8/l2ep/README.md

@@ -11,7 +11,8 @@ Emergency Protocol (L2EP) contracts. It is organized as follows:
 
 ## The `/dev` Folder
 
-The `/dev` folder contains subfolders for each chain that
+The `/dev` folder contains contracts that has not yet been audited. 
+The root folder contains subfolders for each chain that
 has an L2EP solution implemented for it (e.g. `/scroll`, `/arbitrum`,
 `/optimism`). It also contains a subfolder named `/interfaces`,
 which stores shared interface types between all the supported

contracts/src/v0.8/l2ep/dev/arbitrum/ArbitrumCrossDomainForwarder.sol → contracts/src/v0.8/l2ep/arbitrum/ArbitrumCrossDomainForwarder.sol

@@ -1,15 +1,15 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.24;
 
-import {ITypeAndVersion} from "../../../shared/interfaces/ITypeAndVersion.sol";
+import {ITypeAndVersion} from "../../shared/interfaces/ITypeAndVersion.sol";
 // solhint-disable-next-line no-unused-import
 import {IForwarder} from "../interfaces/IForwarder.sol";
 
 import {CrossDomainForwarder} from "../CrossDomainForwarder.sol";
 import {CrossDomainOwnable} from "../CrossDomainOwnable.sol";
 
-import {AddressAliasHelper} from "../../../vendor/arb-bridge-eth/v0.8.0-custom/contracts/libraries/AddressAliasHelper.sol";
-import {Address} from "../../../vendor/openzeppelin-solidity/v4.7.3/contracts/utils/Address.sol";
+import {AddressAliasHelper} from "../../vendor/arb-bridge-eth/v0.8.0-custom/contracts/libraries/AddressAliasHelper.sol";
+import {Address} from "../../vendor/openzeppelin-solidity/v4.7.3/contracts/utils/Address.sol";
 
 /**
  * @title ArbitrumCrossDomainForwarder - L1 xDomain account representation

contracts/src/v0.8/l2ep/dev/arbitrum/ArbitrumCrossDomainGovernor.sol → contracts/src/v0.8/l2ep/arbitrum/ArbitrumCrossDomainGovernor.sol

@@ -2,14 +2,14 @@
 pragma solidity ^0.8.0;
 
 // solhint-disable-next-line no-unused-import
-import {ITypeAndVersion} from "../../../shared/interfaces/ITypeAndVersion.sol";
+import {ITypeAndVersion} from "../../shared/interfaces/ITypeAndVersion.sol";
 // solhint-disable-next-line no-unused-import
 import {IForwarder} from "../interfaces/IForwarder.sol";
 import {IDelegateForwarder} from "../interfaces/IDelegateForwarder.sol";
 
 import {ArbitrumCrossDomainForwarder} from "./ArbitrumCrossDomainForwarder.sol";
 
-import {Address} from "../../../vendor/openzeppelin-solidity/v4.7.3/contracts/utils/Address.sol";
+import {Address} from "../../vendor/openzeppelin-solidity/v4.7.3/contracts/utils/Address.sol";
 
 /**
  * @title ArbitrumCrossDomainGovernor - L1 xDomain account representation (with delegatecall support) for Arbitrum

contracts/src/v0.8/l2ep/dev/arbitrum/ArbitrumSequencerUptimeFeed.sol → contracts/src/v0.8/l2ep/arbitrum/ArbitrumSequencerUptimeFeed.sol

@@ -1,14 +1,14 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.24;
 
-import {AddressAliasHelper} from "../../../vendor/arb-bridge-eth/v0.8.0-custom/contracts/libraries/AddressAliasHelper.sol";
-import {AggregatorInterface} from "../../../shared/interfaces/AggregatorInterface.sol";
-import {AggregatorV3Interface} from "../../../shared/interfaces/AggregatorV3Interface.sol";
-import {AggregatorV2V3Interface} from "../../../shared/interfaces/AggregatorV2V3Interface.sol";
-import {ITypeAndVersion} from "../../../shared/interfaces/ITypeAndVersion.sol";
+import {AddressAliasHelper} from "../../vendor/arb-bridge-eth/v0.8.0-custom/contracts/libraries/AddressAliasHelper.sol";
+import {AggregatorInterface} from "../../shared/interfaces/AggregatorInterface.sol";
+import {AggregatorV3Interface} from "../../shared/interfaces/AggregatorV3Interface.sol";
+import {AggregatorV2V3Interface} from "../../shared/interfaces/AggregatorV2V3Interface.sol";
+import {ITypeAndVersion} from "../../shared/interfaces/ITypeAndVersion.sol";
 import {IFlags} from "../interfaces/IFlags.sol";
 import {ISequencerUptimeFeed} from "../interfaces/ISequencerUptimeFeed.sol";
-import {SimpleReadAccessController} from "../../../shared/access/SimpleReadAccessController.sol";
+import {SimpleReadAccessController} from "../../shared/access/SimpleReadAccessController.sol";
 
 /**
  * @title ArbitrumSequencerUptimeFeed - L2 sequencer uptime status aggregator

contracts/src/v0.8/l2ep/dev/arbitrum/ArbitrumValidator.sol → contracts/src/v0.8/l2ep/arbitrum/ArbitrumValidator.sol

@@ -1,17 +1,17 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.24;
 
-import {AggregatorValidatorInterface} from "../../../shared/interfaces/AggregatorValidatorInterface.sol";
-import {ITypeAndVersion} from "../../../shared/interfaces/ITypeAndVersion.sol";
-import {AccessControllerInterface} from "../../../shared/interfaces/AccessControllerInterface.sol";
-import {SimpleWriteAccessController} from "../../../shared/access/SimpleWriteAccessController.sol";
+import {AggregatorValidatorInterface} from "../../shared/interfaces/AggregatorValidatorInterface.sol";
+import {ITypeAndVersion} from "../../shared/interfaces/ITypeAndVersion.sol";
+import {AccessControllerInterface} from "../../shared/interfaces/AccessControllerInterface.sol";
+import {SimpleWriteAccessController} from "../../shared/access/SimpleWriteAccessController.sol";
 
 /* ./dev dependencies - to be moved from ./dev after audit */
 import {ISequencerUptimeFeed} from "../interfaces/ISequencerUptimeFeed.sol";
 import {IArbitrumDelayedInbox} from "../interfaces/IArbitrumDelayedInbox.sol";
-import {AddressAliasHelper} from "../../../vendor/arb-bridge-eth/v0.8.0-custom/contracts/libraries/AddressAliasHelper.sol";
-import {ArbSys} from "../../../vendor/@arbitrum/nitro-contracts/src/precompiles/ArbSys.sol";
-import {Address} from "../../../vendor/openzeppelin-solidity/v4.7.3/contracts/utils/Address.sol";
+import {AddressAliasHelper} from "../../vendor/arb-bridge-eth/v0.8.0-custom/contracts/libraries/AddressAliasHelper.sol";
+import {ArbSys} from "../../vendor/@arbitrum/nitro-contracts/src/precompiles/ArbSys.sol";
+import {Address} from "../../vendor/openzeppelin-solidity/v4.7.3/contracts/utils/Address.sol";
 
 /**
  * @title ArbitrumValidator - makes xDomain L2 Flags contract call (using L2 xDomain Forwarder contract)

contracts/src/v0.8/l2ep/dev/interfaces/IArbitrumDelayedInbox.sol → contracts/src/v0.8/l2ep/interfaces/IArbitrumDelayedInbox.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import {IInbox} from "../../../vendor/arb-bridge-eth/v0.8.0-custom/contracts/bridge/interfaces/IInbox.sol";
+import {IInbox} from "../../vendor/arb-bridge-eth/v0.8.0-custom/contracts/bridge/interfaces/IInbox.sol";
 
 /**
  * @notice This interface extends Arbitrum's IInbox interface to include