Merge branch 'develop' into OPDATA-497/add-account-address-pub-key-fo…

…r-starknet

.changeset/five-lizards-smile.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+Remove multiple core dependencies from evm head tracker tests #internal"

.changeset/kind-cobras-hope.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+#internal fix for workflow step persistence

.changeset/twenty-zoos-do.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#internal Update metadata passed to Forwarder and Receiver

.github/workflows/ci-core.yml

@@ -75,7 +75,7 @@ jobs:
           SLACK_BOT_TOKEN: ${{ secrets.QA_SLACK_API_KEY }}
         with:
           channel-id: "#team-core"
-          slack-message: "golangci-lint failed: ${{ job.html_url }}\n${{ format('https://github.com/smartcontractkit/chainlink/actions/runs/{0}', github.run_id) }}"
+          slack-message: "golangci-lint failed: \n${{ format('https://github.com/{0}/actions/runs/{1}', github.repository, github.run_id) }}"
 
   core:
     env:
@@ -170,7 +170,7 @@ jobs:
         env:
           OUTPUT_FILE: ./output.txt
           USE_TEE: false
-          CL_DATABASE_URL: ${{ env.DB_URL }}  
+          CL_DATABASE_URL: ${{ env.DB_URL }}
         run: ./tools/bin/${{ matrix.type.cmd }} ./...
       - name: Print Filtered Test Results
         if: ${{ failure() && matrix.type.cmd == 'go_core_tests' && needs.filter.outputs.changes == 'true' }}
@@ -187,6 +187,8 @@ jobs:
           else
             echo "post_to_slack=false" >> $GITHUB_OUTPUT
           fi
+          echo "github.event_name: ${{ github.event_name }}"
+          echo "github.ref: ${{ github.ref }}"
       - name: Print postgres logs
         if: ${{ always() &&  needs.filter.outputs.changes == 'true' }}
         run: docker compose logs postgres | tee ../../../postgres_logs.txt
@@ -203,13 +205,13 @@ jobs:
             ./coverage.txt
             ./postgres_logs.txt
       - name: Notify Slack
-        if: ${{ failure() && steps.print-races.outputs.post_to_slack == 'true' && matrix.type.cmd == 'go_core_race_tests' && (github.event_name == 'merge_group' || github.event.branch == 'develop') &&  needs.filter.outputs.changes == 'true' }}
+        if: ${{ failure() && steps.print-races.outputs.post_to_slack == 'true' && matrix.type.cmd == 'go_core_race_tests' && (github.event_name == 'merge_group' || github.ref == 'refs/heads/develop') && needs.filter.outputs.changes == 'true' }}
         uses: slackapi/slack-github-action@6c661ce58804a1a20f6dc5fbee7f0381b469e001 # v1.25.0
         env:
           SLACK_BOT_TOKEN: ${{ secrets.QA_SLACK_API_KEY }}
         with:
           channel-id: "#topic-data-races"
-          slack-message: "Race tests failed: ${{ job.html_url }}\n${{ format('https://github.com/smartcontractkit/chainlink/actions/runs/{0}', github.run_id) }}"
+          slack-message: "Race tests failed: \n${{ format('https://github.com/{0}/actions/runs/{1}', github.repository, github.run_id) }}"
       - name: Collect Path Output
         id: collect-path-output
         env:

.github/workflows/integration-tests-publish.yml

@@ -54,7 +54,7 @@ jobs:
           SLACK_BOT_TOKEN: ${{ secrets.QA_SLACK_API_KEY }}
         with:
           channel-id: "#team-test-tooling-internal"
-          slack-message: ":x: :mild-panic-intensifies: Publish Integration Test Image failed: ${{ job.html_url }}\n${{ format('https://github.com/smartcontractkit/chainlink/actions/runs/{0}', github.run_id) }}"
+          slack-message: ":x: :mild-panic-intensifies: Publish Integration Test Image failed: \n${{ format('https://github.com/{0}/actions/runs/{1}', github.repository, github.run_id) }}"
   build-chainlink-image:
     environment: integration
     # Only run this build for workflow_dispatch

.github/workflows/integration-tests.yml

@@ -27,9 +27,9 @@ on:
         type: string
 
 # Only run 1 of this workflow at a time per PR
-# concurrency:
-#   group: integration-tests-chainlink-${{ github.sha }}-${{ github.run_id }}-${{ inputs.distinct_run_name }}
-#   cancel-in-progress: true
+concurrency:
+  group: ${{ github.ref }}-${{ github.repository }}-${{ github.event_name }}--e2e-tests-${{ inputs.distinct_run_name }}
+  cancel-in-progress: true
 
 env:
   # for run-test variables and environment
@@ -967,7 +967,7 @@ jobs:
           SLACK_BOT_TOKEN: ${{ secrets.QA_SLACK_API_KEY }}
         with:
           channel-id: "#team-test-tooling-internal"
-          slack-message: ":x: :mild-panic-intensifies: Node Migration Tests Failed: ${{ job.html_url }}\n${{ format('https://github.com/smartcontractkit/chainlink/actions/runs/{0}', github.run_id) }}"
+          slack-message: ":x: :mild-panic-intensifies: Node Migration Tests Failed: \n${{ format('https://github.com/{0}/actions/runs/{1}', github.repository, github.run_id) }}"
 
   ## Solana Section
   get_solana_sha:

.github/workflows/solidity-wrappers.yml

@@ -55,7 +55,7 @@ jobs:
         working-directory: ./contracts
 
       - name: Assume role capable of dispatching action
-        uses: smartcontractkit/.github/actions/setup-github-token@9e7cc0779934cae4a9028b8588c9adb64d8ce68c # setup-github-token@0.1.0 
+        uses: smartcontractkit/.github/actions/setup-github-token@ef78fa97bf3c77de6563db1175422703e9e6674f # setup-github-token@0.2.1
         id: get-gh-token
         with:
           aws-role-arn:  ${{ secrets.AWS_OIDC_CHAINLINK_CI_AUTO_PR_TOKEN_ISSUER_ROLE_ARN }}

README.md

@@ -64,18 +64,14 @@ Ethereum node versions currently tested and supported:
 
 - [Parity/Openethereum](https://github.com/openethereum/openethereum) (NOTE: Parity is deprecated and support for this client may be removed in future)
 - [Geth](https://github.com/ethereum/go-ethereum/releases)
+- [Besu](https://github.com/hyperledger/besu)
 
 [Supported but broken]
 These clients are supported by Chainlink, but have bugs that prevent Chainlink from working reliably on these execution clients.
 
 - [Nethermind](https://github.com/NethermindEth/nethermind)
   Blocking issues:
   - ~https://github.com/NethermindEth/nethermind/issues/4384~
-- [Besu](https://github.com/hyperledger/besu)
-  Blocking issues:
-  - https://github.com/hyperledger/besu/issues/4212
-  - ~https://github.com/hyperledger/besu/issues/4192~
-  - ~https://github.com/hyperledger/besu/issues/4114~
 - [Erigon](https://github.com/ledgerwatch/erigon)
   Blocking issues:
   - https://github.com/ledgerwatch/erigon/discussions/4946

contracts/.changeset/rich-crabs-smoke.md

@@ -0,0 +1,5 @@
+---
+'@chainlink/contracts': patch
+---
+
+#internal Keystone Forwarder and Feeds Consumer

contracts/src/v0.8/keystone/KeystoneFeedsConsumer.sol

@@ -2,27 +2,101 @@
 pragma solidity ^0.8.19;
 
 import {IReceiver} from "./interfaces/IReceiver.sol";
+import {ConfirmedOwner} from "../shared/access/ConfirmedOwner.sol";
 
-contract KeystoneFeedsConsumer is IReceiver {
-  event MessageReceived(bytes32 indexed workflowId, address indexed workflowOwner, uint256 nReports);
-  event FeedReceived(bytes32 indexed feedId, uint256 price, uint64 timestamp);
+contract KeystoneFeedsConsumer is IReceiver, ConfirmedOwner {
+  event FeedReceived(bytes32 indexed feedId, int192 price, uint32 timestamp);
 
-  constructor() {}
+  error UnauthorizedSender(address sender);
+  error UnauthorizedWorkflowOwner(address workflowOwner);
+  error UnauthorizedWorkflowName(bytes10 workflowName);
 
-  struct FeedReport {
-    bytes32 FeedID;
-    uint256 Price;
-    uint64 Timestamp;
+  constructor() ConfirmedOwner(msg.sender) {}
+
+  struct ReceivedFeedReport {
+    bytes32 FeedId;
+    int192 Price;
+    uint32 Timestamp;
+  }
+
+  struct StoredFeedReport {
+    int192 Price;
+    uint32 Timestamp;
+  }
+
+  mapping(bytes32 feedId => StoredFeedReport feedReport) internal s_feedReports;
+  address[] internal s_allowedSendersList;
+  mapping(address => bool) internal s_allowedSenders;
+  address[] internal s_allowedWorkflowOwnersList;
+  mapping(address => bool) internal s_allowedWorkflowOwners;
+  bytes10[] internal s_allowedWorkflowNamesList;
+  mapping(bytes10 => bool) internal s_allowedWorkflowNames;
+
+  function setConfig(
+    address[] calldata _allowedSendersList,
+    address[] calldata _allowedWorkflowOwnersList,
+    bytes10[] calldata _allowedWorkflowNamesList
+  ) external onlyOwner {
+    for (uint32 i = 0; i < s_allowedSendersList.length; i++) {
+      s_allowedSenders[s_allowedSendersList[i]] = false;
+    }
+    for (uint32 i = 0; i < _allowedSendersList.length; i++) {
+      s_allowedSenders[_allowedSendersList[i]] = true;
+    }
+    s_allowedSendersList = _allowedSendersList;
+    for (uint32 i = 0; i < s_allowedWorkflowOwnersList.length; i++) {
+      s_allowedWorkflowOwners[s_allowedWorkflowOwnersList[i]] = false;
+    }
+    for (uint32 i = 0; i < _allowedWorkflowOwnersList.length; i++) {
+      s_allowedWorkflowOwners[_allowedWorkflowOwnersList[i]] = true;
+    }
+    s_allowedWorkflowOwnersList = _allowedWorkflowOwnersList;
+    for (uint32 i = 0; i < s_allowedWorkflowNamesList.length; i++) {
+      s_allowedWorkflowNames[s_allowedWorkflowNamesList[i]] = false;
+    }
+    for (uint32 i = 0; i < _allowedWorkflowNamesList.length; i++) {
+      s_allowedWorkflowNames[_allowedWorkflowNamesList[i]] = true;
+    }
+    s_allowedWorkflowNamesList = _allowedWorkflowNamesList;
   }
 
-  function onReport(bytes32 workflowId, address workflowOwner, bytes calldata rawReport) external {
-    // TODO: validate sender and workflowOwner
+  function onReport(bytes calldata metadata, bytes calldata rawReport) external {
+    if (s_allowedSenders[msg.sender] == false) {
+      revert UnauthorizedSender(msg.sender);
+    }
+
+    (bytes10 workflowName, address workflowOwner) = _getInfo(metadata);
+    if (s_allowedWorkflowNames[workflowName] == false) {
+      revert UnauthorizedWorkflowName(workflowName);
+    }
+    if (s_allowedWorkflowOwners[workflowOwner] == false) {
+      revert UnauthorizedWorkflowOwner(workflowOwner);
+    }
 
-    FeedReport[] memory feeds = abi.decode(rawReport, (FeedReport[]));
+    ReceivedFeedReport[] memory feeds = abi.decode(rawReport, (ReceivedFeedReport[]));
     for (uint32 i = 0; i < feeds.length; i++) {
-      emit FeedReceived(feeds[i].FeedID, feeds[i].Price, feeds[i].Timestamp);
+      s_feedReports[feeds[i].FeedId] = StoredFeedReport(feeds[i].Price, feeds[i].Timestamp);
+      emit FeedReceived(feeds[i].FeedId, feeds[i].Price, feeds[i].Timestamp);
     }
+  }
+
+  // solhint-disable-next-line chainlink-solidity/explicit-returns
+  function _getInfo(bytes memory metadata) internal pure returns (bytes10 workflowName, address workflowOwner) {
+    // (first 32 bytes contain length of the byte array)
+    // workflow_cid             // offset 32, size 32
+    // workflow_name            // offset 64, size 10
+    // workflow_owner           // offset 74, size 20
+    // report_name              // offset 94, size  2
+    assembly {
+      // shift right by 22 bytes to get the actual value
+      workflowName := shr(mul(22, 8), mload(add(metadata, 64)))
+      // shift right by 12 bytes to get the actual value
+      workflowOwner := shr(mul(12, 8), mload(add(metadata, 74)))
+    }
+  }
 
-    emit MessageReceived(workflowId, workflowOwner, feeds.length);
+  function getPrice(bytes32 feedId) external view returns (int192, uint32) {
+    StoredFeedReport memory report = s_feedReports[feedId];
+    return (report.Price, report.Timestamp);
   }
 }