diff --git a/.changeset/flat-horses-argue.md b/.changeset/flat-horses-argue.md
new file mode 100644
index 00000000000..08f151cd5aa
--- /dev/null
+++ b/.changeset/flat-horses-argue.md
@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+#added LogPoller MaxLogsKept feature: recency count-based instead of time based log retention
diff --git a/.changeset/red-jobs-marry.md b/.changeset/red-jobs-marry.md
new file mode 100644
index 00000000000..d66ad019027
--- /dev/null
+++ b/.changeset/red-jobs-marry.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Rename DA oracle consts to be more descriptive #wip
diff --git a/.changeset/rude-spies-serve.md b/.changeset/rude-spies-serve.md
new file mode 100644
index 00000000000..d861b5cf6ba
--- /dev/null
+++ b/.changeset/rude-spies-serve.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#added new config field to FeeQuoter
diff --git a/.github/E2E_TESTS_ON_GITHUB_CI.md b/.github/E2E_TESTS_ON_GITHUB_CI.md
index 02144eff64f..26d3c9daf92 100644
--- a/.github/E2E_TESTS_ON_GITHUB_CI.md
+++ b/.github/E2E_TESTS_ON_GITHUB_CI.md
@@ -1,58 +1,90 @@
 # E2E Tests on GitHub CI
 
-E2E tests are executed on GitHub CI using the [E2E Tests Reusable Workflow](#about-the-reusable-workflow) or dedicated workflows.
+- [E2E Tests on GitHub CI](#e2e-tests-on-github-ci)
+  - [Scheduled test workflows](#scheduled-test-workflows)
+    - [PR E2E Tests](#pr-e2e-tests)
+    - [Nightly E2E Tests](#nightly-e2e-tests)
+    - [Release E2E Tests](#release-e2e-tests)
+      - [Integration (smoke) Tests](#integration-smoke-tests)
+      - [Client Compatibility Tests](#client-compatibility-tests)
+  - [On-Demand Workflows](#on-demand-workflows)
+    - [Test workflows setup in CI](#test-workflows-setup-in-ci)
+      - [Configuration Overrides](#configuration-overrides)
+      - [Test Secrets](#test-secrets)
 
-## Automatic workflows
+E2E tests are executed on GitHub CI using the [E2E Tests Reusable Workflow](https://github.com/smartcontractkit/.github/blob/main/.github/workflows/README.md) or dedicated workflows.
 
-These workflows are designed to run automatically at crucial stages of the software development process, such as on every commit in a PR, nightly or before release.
+## Scheduled test workflows
+
+These workflows are designed to run on every commit in a PR, nightly or before release (see `triggers` in [e2e-tests.yaml](./e2e-tests.yml)).
 
 ### PR E2E Tests
 
-Run on every commit in a PR to ensure changes do not introduce regressions.
+Tests triggered on every commit in a PR to ensure changes do not introduce regressions.
 
-[Link](https://github.com/smartcontractkit/chainlink/blob/develop/.github/workflows/integration-tests.yml)
+**Workflow:** [integration-tests.yml](https://github.com/smartcontractkit/chainlink/blob/develop/.github/workflows/integration-tests.yml)
 
 ### Nightly E2E Tests
 
-Conducted nightly to catch issues that may develop over time or with accumulated changes.
+Nightly E2E test runs.
 
-[Link](https://github.com/smartcontractkit/chainlink/blob/develop/.github/workflows/run-nightly-e2e-tests.yml)
+**Workflow:** [nightly-e2e-tests.yml](https://github.com/smartcontractkit/chainlink/blob/develop/.github/workflows/run-nightly-e2e-tests.yml)
 
 ### Release E2E Tests
 
-This section contains automatic workflows triggering E2E tests at release.
+E2E tests triggered on a release tag.
+
+#### Integration (smoke) Tests
+
+**Workflow:** [integration-tests.yml](https://github.com/smartcontractkit/chainlink/blob/develop/.github/workflows/integration-tests.yml)
 
 #### Client Compatibility Tests
 
-[Link](https://github.com/smartcontractkit/chainlink/actions/workflows/client-compatibility-tests.yml)
+**Workflow:** [client-compatibility-tests.yml](https://github.com/smartcontractkit/chainlink/actions/workflows/client-compatibility-tests.yml)
 
 ## On-Demand Workflows
 
-Triggered manually by QA for specific testing needs.
+These are dispatched parametrized workflows, that may be triggered manually for specific testing needs. For more details refer [integration-tests README](../integration-tests/README.md) and [per-product test run books](../integration-tests/run-books/).
 
 **Examples:**
 
+- [Selected E2E Tests Workflow](https://github.com/smartcontractkit/chainlink/actions/workflows/run-selected-e2e-tests.yml)
+- [Client Compatibility Tests](https://github.com/smartcontractkit/chainlink/actions/workflows/client-compatibility-tests.yml)
+- [Chaos Tests](https://github.com/smartcontractkit/chainlink/actions/workflows/integration-chaos-tests.yml)
+- [OCR Soak Tests](https://github.com/smartcontractkit/chainlink/actions/workflows/on-demand-ocr-soak-test.yml)
 - [On-Demand Automation Tests](https://github.com/smartcontractkit/chainlink/actions/workflows/automation-ondemand-tests.yml)
 - [CCIP Chaos Tests](https://github.com/smartcontractkit/chainlink/actions/workflows/ccip-chaos-tests.yml)
-- [OCR Soak Tests](https://github.com/smartcontractkit/chainlink/actions/workflows/on-demand-ocr-soak-test.yml)
+- [CCIP Load Tests](https://github.com/smartcontractkit/chainlink/actions/workflows/ccip-load-tests.yml)
 - [VRFv2Plus Smoke Tests](https://github.com/smartcontractkit/chainlink/actions/workflows/on-demand-vrfv2plus-smoke-tests.yml)
+- [VRFv2Plus Performance Tests](https://github.com/smartcontractkit/chainlink/actions/workflows/on-demand-vrfv2plus-performance-test.yml)
+
+### Test workflows setup in CI
 
-## Test Configs
+Most workflows may be triggered with default configs. Some, nevertheless, may be overridden.
 
-E2E tests utilize TOML files to define their parameters. Each test is equipped with a default TOML config, which can be overridden by specifying an alternative TOML config. This allows for running tests with varied parameters, such as on a non-default blockchain network. For tests executed on GitHub CI, both the default configs and any override configs must reside within the git repository. The `test_config_override_path` workflow input is used to provide a path to an override config.
+> [!TIP]
+> Use `gh` CLI commands to run workflows from local machine.
 
-Config overrides should be stored in `testconfig/*/overrides/*.toml`. Placing files here will not trigger a rebuild of the test runner image.
+#### Configuration Overrides
 
-**Important Note:** The use of `base64Config` input is deprecated in favor of `test_config_override_path`. For more details, refer to [the decision log](https://smartcontract-it.atlassian.net/wiki/spaces/TT/pages/927596563/Storing+All+Test+Configs+In+Git).
+> [!CAUTION]
+> Test configurations should not keep any [sensitive data or secrets](#test-secrets).
 
-To learn more about test configs see [CTF Test Config](https://github.com/smartcontractkit/chainlink-testing-framework/blob/main/lib/config/README.md).
+1. Reference sources:
+   1. [Integration-Tests configurations](../integration-tests/testconfig/README.md);
+   2. [CTF Test Config](https://github.com/smartcontractkit/chainlink-testing-framework/blob/main/lib/config/README.md).
+2. Defaults and overrides should be stored (committed) in repository under `../integration-tests/testconfig/<product>/overrides/<override-name>.toml` (see example [here](../integration-tests/testconfig/ocr2/overrides/base_sepolia.toml)).
+3. Use `test_config_override_path` to point to an override config. For example: `test_config_override_path="testconfig/ocr2/overrides/base_sepolia.toml"`
 
-## Test Secrets
+#### Test Secrets
 
-For security reasons, test secrets and sensitive information are not stored directly within the test config TOML files. Instead, these secrets are securely injected into tests using environment variables. For a detailed explanation on managing test secrets, refer to our [Test Secrets documentation](https://github.com/smartcontractkit/chainlink-testing-framework/blob/main/lib/config/README.md#test-secrets).
+> [!CAUTION]
+> Pay attention to never store/expose/commit your test secrets in repository.
 
-If you need to run a GitHub workflow using custom secrets, please refer to the [guide on running GitHub workflows with your test secrets](https://github.com/smartcontractkit/chainlink-testing-framework/blob/main/lib/config/README.md#run-github-workflow-with-your-test-secrets).
+Test secrets allow provisioning and override the sensitive data such as EOA's private key, RPCs, Docker registry links, etc.
 
-## About the E2E Test Reusable Workflow
+Reference sources:
 
-For information on the E2E Test Reusable Workflow, visit the documentation in the [smartcontractkit/.github repository](https://github.com/smartcontractkit/.github/blob/main/.github/workflows/README.md).
+1. [BASE64_CONFIG_OVERRIDE](../integration-tests/testconfig/README.md#base64_config_override).
+2. [CTF Test Secrets documentation](https://github.com/smartcontractkit/chainlink-testing-framework/blob/main/lib/config/README.md#test-secrets).
+3. [Guide on running GitHub workflows with your test secrets](https://github.com/smartcontractkit/chainlink-testing-framework/blob/main/lib/config/README.md#run-github-workflow-with-your-test-secrets).
diff --git a/.github/actions/golangci-lint/action.yml b/.github/actions/golangci-lint/action.yml
index 4d0109c3d20..ba9984523da 100644
--- a/.github/actions/golangci-lint/action.yml
+++ b/.github/actions/golangci-lint/action.yml
@@ -70,3 +70,4 @@ runs:
       with:
         name: golangci-lint-report
         path: ${{ inputs.go-directory }}/golangci-lint-report.xml
+        retention-days: 7
diff --git a/.github/actions/goreleaser-build-sign-publish/release.js b/.github/actions/goreleaser-build-sign-publish/release.js
index 565b03ee7f4..340c74af40c 100755
--- a/.github/actions/goreleaser-build-sign-publish/release.js
+++ b/.github/actions/goreleaser-build-sign-publish/release.js
@@ -1,25 +1,146 @@
 #!/usr/bin/env node
 const { execSync } = require("child_process");
+const fs = require("fs");
+const path = require("path");
 
 function main() {
-  const goreleaserConfig = mustGetEnv("GORELEASER_CONFIG");
-  const releaseType = mustGetEnv("RELEASE_TYPE");
-  const command = constructGoreleaserCommand(releaseType, goreleaserConfig);
-
-  if (process.env.DRY_RUN) {
-    console.log(`Generated command: ${command}`);
-    console.log("Dry run enabled. Exiting without executing the command.");
-    return;
+  const args = process.argv.slice(2);
+  const useExistingDist = args.includes("--use-existing-dist");
+  const chainlinkVersion = getVersion();
+
+  if (!useExistingDist) {
+    const goreleaserConfig = mustGetEnv("GORELEASER_CONFIG");
+    const releaseType = mustGetEnv("RELEASE_TYPE");
+    const command = constructGoreleaserCommand(
+      releaseType,
+      chainlinkVersion,
+      goreleaserConfig
+    );
+
+    if (process.env.DRY_RUN) {
+      console.log(`Generated command: ${command}`);
+      console.log("Dry run enabled. Exiting without executing the command.");
+      return;
+    } else {
+      console.log(`Executing command: ${command}`);
+      execSync(command, { stdio: "inherit" });
+    }
   } else {
-    console.log(`Executing command: ${command}`);
-    execSync(command, { stdio: "inherit" });
+    console.log(
+      "Skipping Goreleaser command execution as '--use-existing-dist' is set."
+    );
+  }
+
+  const artifactsJsonPath = findArtifactsJson();
+  const dockerImages = extractDockerImages(artifactsJsonPath);
+  const repoSha = execSync("git rev-parse HEAD", { encoding: "utf-8" }).trim();
+
+  const results = dockerImages.map((image) => {
+    try {
+      console.log(`Checking version for image: ${image}, expected version: ${chainlinkVersion}, expected SHA: ${repoSha}`);
+      const versionOutput = execSync(`docker run --rm ${image} --version`, {
+        encoding: "utf-8",
+      });
+      console.log(`Output from image ${image}: ${versionOutput}`);
+
+      const cleanedOutput = versionOutput.replace("chainlink version ", "").trim();
+      const [version, sha] = cleanedOutput.split("@");
+      if (!version || !sha) {
+        throw new Error("Version or SHA not found in output.");
+      }
+
+      if (sha.trim() !== repoSha) {
+        throw new Error(`SHA mismatch: Expected ${repoSha}, got ${sha.trim()}`);
+      }
+      if (version.trim() !== chainlinkVersion) {
+        throw new Error(
+          `Version mismatch: Expected ${chainlinkVersion}, got ${version.trim()}`
+        );
+      }
+
+      return { image, success: true, message: "Version check passed." };
+    } catch (error) {
+      return { image, success: false, message: error.message };
+    }
+  });
+
+  printSummary(results);
+  if (results.some((result) => !result.success)) {
+    process.exit(1);
   }
 }
 
-main();
+function printSummary(results) {
+  const passed = results.filter((result) => result.success);
+  const failed = results.filter((result) => !result.success);
+
+  console.log("\nSummary:");
+  console.log(`Total images checked: ${results.length}`);
+  console.log(`Passed: ${passed.length}`);
+  console.log(`Failed: ${failed.length}`);
+
+  if (passed.length > 0) {
+    console.log("\nPassed images:");
+    passed.forEach((result) =>
+      console.log(`${result.image}:\n${result.message}`)
+    );
+  }
+
+  if (failed.length > 0) {
+    console.log("\nFailed images:");
+    failed.forEach((result) =>
+      console.log(`${result.image}:\n${result.message}`)
+    );
+  }
+}
+
+function findArtifactsJson() {
+  const distDir = path.resolve(process.cwd(), "dist");
+  const files = [];
+
+  function findJsonFiles(dir) {
+    const items = fs.readdirSync(dir, { withFileTypes: true });
+    for (const item of items) {
+      const fullPath = path.join(dir, item.name);
+      if (item.isDirectory()) {
+        findJsonFiles(fullPath);
+      } else if (item.isFile() && item.name === "artifacts.json") {
+        files.push(fullPath);
+      }
+    }
+  }
+
+  findJsonFiles(distDir);
+
+  if (files.length === 0) {
+    console.error("Error: No artifacts.json found in /dist.");
+    process.exit(1);
+  } else if (files.length > 1) {
+    console.error("Error: Multiple artifacts.json files found.");
+    process.exit(1);
+  }
+
+  return files[0];
+}
+
+function extractDockerImages(artifactsJsonPath) {
+  console.log(`Reading artifacts.json from: ${artifactsJsonPath}`);
+  const artifactsJson = JSON.parse(fs.readFileSync(artifactsJsonPath, "utf-8"));
+
+  const dockerImages = artifactsJson
+    .filter((artifact) => artifact.type === "Docker Image")
+    .map((artifact) => artifact.name);
+
+  if (dockerImages.length === 0) {
+    console.error("Error: No Docker images found in artifacts.json.");
+    process.exit(1);
+  }
 
-function constructGoreleaserCommand(releaseType, goreleaserConfig) {
-  const version = getVersion();
+  console.log(`Found Docker images:\n  - ${dockerImages.join("\n  - ")}`);
+  return dockerImages;
+}
+
+function constructGoreleaserCommand(releaseType, version, goreleaserConfig) {
   const flags = [];
 
   checkReleaseType(releaseType);
@@ -59,6 +180,7 @@ function checkReleaseType(releaseType) {
     console.error(
       `Error: Invalid release type: ${releaseType}. Must be one of: ${validReleaseTypesStr}`
     );
+    process.exit(1);
   }
 }
 
@@ -74,7 +196,7 @@ function mustGetEnv(key) {
 
 function getVersion() {
   try {
-    const pkgPath = process.cwd() + "/package.json";
+    const pkgPath = path.resolve(process.cwd(), "package.json");
     console.log("Looking for chainlink version in package.json at: ", pkgPath);
     const packageJson = require(pkgPath);
     if (!packageJson.version) {
@@ -91,3 +213,5 @@ function getVersion() {
     process.exit(1);
   }
 }
+
+main();
diff --git a/.github/workflows/automation-benchmark-tests.yml b/.github/workflows/automation-benchmark-tests.yml
index d4f07aab58c..3a07ecefaa0 100644
--- a/.github/workflows/automation-benchmark-tests.yml
+++ b/.github/workflows/automation-benchmark-tests.yml
@@ -44,7 +44,7 @@ jobs:
       GRAFANA_INTERNAL_HOST: ${{ secrets.GRAFANA_INTERNAL_HOST }}
       GRAFANA_INTERNAL_URL_SHORTENER_TOKEN: ${{ secrets.GRAFANA_INTERNAL_URL_SHORTENER_TOKEN }}
       LOKI_TENANT_ID: ${{ secrets.LOKI_TENANT_ID }}
-      LOKI_URL: https://${{ secrets.GRAFANA_INTERNAL_HOST }}/loki/api/v1/push
+      LOKI_URL: ${{ secrets.LOKI_URL }}
       LOKI_BASIC_AUTH: ${{ secrets.LOKI_BASIC_AUTH }}
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}  
       AWS_REGION: ${{ secrets.QA_AWS_REGION }}
diff --git a/.github/workflows/automation-load-tests.yml b/.github/workflows/automation-load-tests.yml
index 1cbb0038ed8..71bfbfa029e 100644
--- a/.github/workflows/automation-load-tests.yml
+++ b/.github/workflows/automation-load-tests.yml
@@ -39,7 +39,7 @@ jobs:
       GRAFANA_INTERNAL_HOST: ${{ secrets.GRAFANA_INTERNAL_HOST }}
       GRAFANA_INTERNAL_URL_SHORTENER_TOKEN: ${{ secrets.GRAFANA_INTERNAL_URL_SHORTENER_TOKEN }}
       LOKI_TENANT_ID: ${{ secrets.LOKI_TENANT_ID }}
-      LOKI_URL: https://${{ secrets.GRAFANA_INTERNAL_HOST }}/loki/api/v1/push
+      LOKI_URL: ${{ secrets.LOKI_URL }}
       LOKI_BASIC_AUTH: ${{ secrets.LOKI_BASIC_AUTH }}
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}  
       AWS_REGION: ${{ secrets.QA_AWS_REGION }}
diff --git a/.github/workflows/automation-nightly-tests.yml b/.github/workflows/automation-nightly-tests.yml
index 287ca0164fb..222eac2e75b 100644
--- a/.github/workflows/automation-nightly-tests.yml
+++ b/.github/workflows/automation-nightly-tests.yml
@@ -32,7 +32,7 @@ jobs:
       GRAFANA_INTERNAL_HOST: ${{ secrets.GRAFANA_INTERNAL_HOST }}
       GRAFANA_INTERNAL_URL_SHORTENER_TOKEN: ${{ secrets.GRAFANA_INTERNAL_URL_SHORTENER_TOKEN }}
       LOKI_TENANT_ID: ${{ secrets.LOKI_TENANT_ID }}
-      LOKI_URL: https://${{ secrets.GRAFANA_INTERNAL_HOST }}/loki/api/v1/push
+      LOKI_URL: ${{ secrets.LOKI_URL }}
       LOKI_BASIC_AUTH: ${{ secrets.LOKI_BASIC_AUTH }}
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}  
       AWS_REGION: ${{ secrets.QA_AWS_REGION }}
diff --git a/.github/workflows/automation-ondemand-tests.yml b/.github/workflows/automation-ondemand-tests.yml
index ca8bf36c6ac..f85a1330e6e 100644
--- a/.github/workflows/automation-ondemand-tests.yml
+++ b/.github/workflows/automation-ondemand-tests.yml
@@ -174,7 +174,7 @@ jobs:
       GRAFANA_INTERNAL_HOST: ${{ secrets.GRAFANA_INTERNAL_HOST }}
       GRAFANA_INTERNAL_URL_SHORTENER_TOKEN: ${{ secrets.GRAFANA_INTERNAL_URL_SHORTENER_TOKEN }}
       LOKI_TENANT_ID: ${{ secrets.LOKI_TENANT_ID }}
-      LOKI_URL: https://${{ secrets.GRAFANA_INTERNAL_HOST }}/loki/api/v1/push
+      LOKI_URL: ${{ secrets.LOKI_URL }}
       LOKI_BASIC_AUTH: ${{ secrets.LOKI_BASIC_AUTH }}
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}  
       AWS_REGION: ${{ secrets.QA_AWS_REGION }}
diff --git a/.github/workflows/ccip-chaos-tests.yml b/.github/workflows/ccip-chaos-tests.yml
index 540c98d209b..cf101ce4132 100644
--- a/.github/workflows/ccip-chaos-tests.yml
+++ b/.github/workflows/ccip-chaos-tests.yml
@@ -38,7 +38,7 @@ jobs:
       GRAFANA_INTERNAL_HOST: ${{ secrets.GRAFANA_INTERNAL_HOST }}
       GRAFANA_INTERNAL_URL_SHORTENER_TOKEN: ${{ secrets.GRAFANA_INTERNAL_URL_SHORTENER_TOKEN }}
       LOKI_TENANT_ID: ${{ secrets.LOKI_TENANT_ID }}
-      LOKI_URL: https://${{ secrets.GRAFANA_INTERNAL_HOST }}/loki/api/v1/push
+      LOKI_URL: ${{ secrets.LOKI_URL }}
       LOKI_BASIC_AUTH: ${{ secrets.LOKI_BASIC_AUTH }}
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}  
       AWS_REGION: ${{ secrets.QA_AWS_REGION }}
diff --git a/.github/workflows/ccip-load-tests.yml b/.github/workflows/ccip-load-tests.yml
index 2c35a5cf588..af06571909b 100644
--- a/.github/workflows/ccip-load-tests.yml
+++ b/.github/workflows/ccip-load-tests.yml
@@ -54,7 +54,7 @@ jobs:
       GRAFANA_INTERNAL_HOST: ${{ secrets.GRAFANA_INTERNAL_HOST }}
       GRAFANA_INTERNAL_URL_SHORTENER_TOKEN: ${{ secrets.GRAFANA_INTERNAL_URL_SHORTENER_TOKEN }}
       LOKI_TENANT_ID: ${{ secrets.LOKI_TENANT_ID }}
-      LOKI_URL: ${{ secrets.LOKI_URL }} # CCIP has a different one for some reason
+      LOKI_URL: ${{ secrets.LOKI_URL }}
       LOKI_BASIC_AUTH: ${{ secrets.LOKI_BASIC_AUTH }}
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}  
       AWS_REGION: ${{ secrets.QA_AWS_REGION }}
diff --git a/.github/workflows/ci-core.yml b/.github/workflows/ci-core.yml
index 9174d7de1f5..ada0d352a98 100644
--- a/.github/workflows/ci-core.yml
+++ b/.github/workflows/ci-core.yml
@@ -224,6 +224,7 @@ jobs:
             ./race.*
             ./coverage.txt
             ./postgres_logs.txt
+          retention-days: 7
       - 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.ref == 'refs/heads/develop') && needs.filter.outputs.changes == 'true' }}
         uses: slackapi/slack-github-action@6c661ce58804a1a20f6dc5fbee7f0381b469e001 # v1.25.0
@@ -243,94 +244,6 @@ jobs:
             echo "path_output=${resultsFile}" >> $GITHUB_OUTPUT
           fi
 
-  detect-flakey-tests:
-    needs: [filter, core]
-    name: Flakey Test Detection
-    runs-on: ubuntu-latest
-    if: ${{ always() && github.actor != 'dependabot[bot]' }}
-    env:
-      CL_DATABASE_URL: postgresql://postgres:postgres@localhost:5432/chainlink_test?sslmode=disable
-    permissions:
-      id-token: write
-      contents: read
-    steps:
-      - name: Checkout the repo
-        uses: actions/checkout@v4.2.1
-      - name: Setup node
-        if: ${{ needs.filter.outputs.changes == 'true' }}
-        uses: actions/setup-node@v4.0.4
-      - name: Setup NodeJS
-        if: ${{ needs.filter.outputs.changes == 'true' }}
-        uses: ./.github/actions/setup-nodejs
-        with:
-          prod: "true"
-      - name: Setup Go
-        if: ${{ needs.filter.outputs.changes == 'true' }}
-        uses: ./.github/actions/setup-go
-      - name: Setup Postgres
-        if: ${{ needs.filter.outputs.changes == 'true' }}
-        uses: ./.github/actions/setup-postgres
-      - name: Touching core/web/assets/index.html
-        if: ${{ needs.filter.outputs.changes == 'true' }}
-        run: mkdir -p core/web/assets && touch core/web/assets/index.html
-      - name: Download Go vendor packages
-        if: ${{ needs.filter.outputs.changes == 'true' }}
-        run: go mod download
-      - name: Replace chainlink-evm deps
-        if: ${{ needs.filter.outputs.changes == 'true' && inputs.evm-ref != ''}}
-        shell: bash
-        run: go get github.com/smartcontractkit/chainlink-integrations/evm/relayer@${{ inputs.evm-ref }}
-      - name: Build binary
-        if: ${{ needs.filter.outputs.changes == 'true' }}
-        run: go build -o chainlink.test .
-      - name: Setup DB
-        if: ${{ needs.filter.outputs.changes == 'true' }}
-        run: ./chainlink.test local db preparetest
-      - name: Load test outputs
-        if: ${{ needs.filter.outputs.changes == 'true' }}
-        uses: actions/download-artifact@v4.1.8
-        with:
-          name: go_core_tests_logs
-          path: ./artifacts
-      - name: Delete go_core_tests_logs/coverage.txt
-        if: ${{ needs.filter.outputs.changes == 'true' }}
-        shell: bash
-        run: |
-          # Need to delete coverage.txt so the disk doesn't fill up
-          rm -f ./artifacts/go_core_tests_logs/coverage.txt
-      - name: Build flakey test runner
-        if: ${{ needs.filter.outputs.changes == 'true' }}
-        run: go build ./tools/flakeytests/cmd/runner
-      - name: Re-run tests
-        if: ${{ needs.filter.outputs.changes == 'true' }}
-        env:
-          GRAFANA_INTERNAL_BASIC_AUTH: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
-          GRAFANA_INTERNAL_HOST: ${{ secrets.GRAFANA_INTERNAL_HOST }}
-          GRAFANA_INTERNAL_TENANT_ID: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
-          GITHUB_EVENT_PATH: ${{ github.event_path }}
-          GITHUB_EVENT_NAME: ${{ github.event_name }}
-          GITHUB_REPO: ${{ github.repository }}
-          GITHUB_RUN_ID: ${{ github.run_id }}
-        run: |
-          ./runner \
-            -grafana_auth=$GRAFANA_INTERNAL_BASIC_AUTH \
-            -grafana_host=$GRAFANA_INTERNAL_HOST \
-            -grafana_org_id=$GRAFANA_INTERNAL_TENANT_ID \
-            -gh_sha=$GITHUB_SHA \
-            -gh_event_path=$GITHUB_EVENT_PATH \
-            -gh_event_name=$GITHUB_EVENT_NAME \
-            -gh_run_id=$GITHUB_RUN_ID \
-            -gh_repo=$GITHUB_REPO \
-            -command=./tools/bin/go_core_tests \
-            `ls -R ./artifacts/output.txt`
-      - name: Store logs artifacts
-        if: ${{ needs.filter.outputs.changes == 'true' && always() }}
-        uses: actions/upload-artifact@v4.4.3
-        with:
-          name: flakey_test_runner_logs
-          path: |
-            ./output.txt
-
   scan:
     name: SonarQube Scan
     needs: [core]
diff --git a/.github/workflows/client-compatibility-tests.yml b/.github/workflows/client-compatibility-tests.yml
index ee56a6ac24a..784d761862b 100644
--- a/.github/workflows/client-compatibility-tests.yml
+++ b/.github/workflows/client-compatibility-tests.yml
@@ -659,8 +659,8 @@ jobs:
           E2E_TEST_SELECTED_NETWORK: ${{ env.SELECTED_NETWORKS}}
           E2E_TEST_CHAINLINK_IMAGE: ${{ env.CHAINLINK_IMAGE }}
           E2E_TEST_CHAINLINK_VERSION: ${{ needs.select-versions.outputs.chainlink_image_version }}
-          E2E_TEST_LOKI_TENANT_ID: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
-          E2E_TEST_LOKI_ENDPOINT: https://${{ secrets.GRAFANA_INTERNAL_HOST }}/loki/api/v1/push
+          E2E_TEST_LOKI_TENANT_ID: ${{ secrets.LOKI_TENANT_ID }}
+          E2E_TEST_LOKI_ENDPOINT: ${{ secrets.LOKI_URL }}
           E2E_TEST_LOKI_BASIC_AUTH: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
           E2E_TEST_GRAFANA_DASHBOARD_URL: "/d/ddf75041-1e39-42af-aa46-361fe4c36e9e/ci-e2e-tests-logs"
           E2E_TEST_GRAFANA_BEARER_TOKEN: ${{ secrets.GRAFANA_INTERNAL_URL_SHORTENER_TOKEN }}
diff --git a/.github/workflows/integration-chaos-tests.yml b/.github/workflows/integration-chaos-tests.yml
index 4894977946c..3be161005f8 100644
--- a/.github/workflows/integration-chaos-tests.yml
+++ b/.github/workflows/integration-chaos-tests.yml
@@ -30,7 +30,7 @@ jobs:
       GRAFANA_INTERNAL_HOST: ${{ secrets.GRAFANA_INTERNAL_HOST }}
       GRAFANA_INTERNAL_URL_SHORTENER_TOKEN: ${{ secrets.GRAFANA_INTERNAL_URL_SHORTENER_TOKEN }}
       LOKI_TENANT_ID: ${{ secrets.LOKI_TENANT_ID }}
-      LOKI_URL: https://${{ secrets.GRAFANA_INTERNAL_HOST }}/loki/api/v1/push
+      LOKI_URL: ${{ secrets.LOKI_URL }}
       LOKI_BASIC_AUTH: ${{ secrets.LOKI_BASIC_AUTH }}
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}  
       AWS_REGION: ${{ secrets.QA_AWS_REGION }}
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index f0a3db548f7..e70e9df621a 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -233,7 +233,7 @@ jobs:
       GRAFANA_INTERNAL_HOST: ${{ secrets.GRAFANA_INTERNAL_HOST }}
       GRAFANA_INTERNAL_URL_SHORTENER_TOKEN: ${{ secrets.GRAFANA_INTERNAL_URL_SHORTENER_TOKEN }}
       LOKI_TENANT_ID: ${{ secrets.LOKI_TENANT_ID }}
-      LOKI_URL: https://${{ secrets.GRAFANA_INTERNAL_HOST }}/loki/api/v1/push
+      LOKI_URL: ${{ secrets.LOKI_URL }}
       LOKI_BASIC_AUTH: ${{ secrets.LOKI_BASIC_AUTH }}
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       AWS_REGION: ${{ secrets.QA_AWS_REGION }}
@@ -278,7 +278,7 @@ jobs:
       GRAFANA_INTERNAL_HOST: ${{ secrets.GRAFANA_INTERNAL_HOST }}
       GRAFANA_INTERNAL_URL_SHORTENER_TOKEN: ${{ secrets.GRAFANA_INTERNAL_URL_SHORTENER_TOKEN }}
       LOKI_TENANT_ID: ${{ secrets.LOKI_TENANT_ID }}
-      LOKI_URL: https://${{ secrets.GRAFANA_INTERNAL_HOST }}/loki/api/v1/push
+      LOKI_URL: ${{ secrets.LOKI_URL }}
       LOKI_BASIC_AUTH: ${{ secrets.LOKI_BASIC_AUTH }}
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       AWS_REGION: ${{ secrets.QA_AWS_REGION }}
@@ -319,7 +319,7 @@ jobs:
       GRAFANA_INTERNAL_HOST: ${{ secrets.GRAFANA_INTERNAL_HOST }}
       GRAFANA_INTERNAL_URL_SHORTENER_TOKEN: ${{ secrets.GRAFANA_INTERNAL_URL_SHORTENER_TOKEN }}
       LOKI_TENANT_ID: ${{ secrets.LOKI_TENANT_ID }}
-      LOKI_URL: https://${{ secrets.GRAFANA_INTERNAL_HOST }}/loki/api/v1/push
+      LOKI_URL: ${{ secrets.LOKI_URL }}
       LOKI_BASIC_AUTH: ${{ secrets.LOKI_BASIC_AUTH }}
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       AWS_REGION: ${{ secrets.QA_AWS_REGION }}
@@ -360,7 +360,7 @@ jobs:
       GRAFANA_INTERNAL_HOST: ${{ secrets.GRAFANA_INTERNAL_HOST }}
       GRAFANA_INTERNAL_URL_SHORTENER_TOKEN: ${{ secrets.GRAFANA_INTERNAL_URL_SHORTENER_TOKEN }}
       LOKI_TENANT_ID: ${{ secrets.LOKI_TENANT_ID }}
-      LOKI_URL: https://${{ secrets.GRAFANA_INTERNAL_HOST }}/loki/api/v1/push
+      LOKI_URL: ${{ secrets.LOKI_URL }}
       LOKI_BASIC_AUTH: ${{ secrets.LOKI_BASIC_AUTH }}
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       AWS_REGION: ${{ secrets.QA_AWS_REGION }}
diff --git a/.github/workflows/llm-action-error-reporter.yml b/.github/workflows/llm-action-error-reporter.yml
index f5012a6bb39..c0d01253c9f 100644
--- a/.github/workflows/llm-action-error-reporter.yml
+++ b/.github/workflows/llm-action-error-reporter.yml
@@ -1,7 +1,7 @@
 name: LLM Action Error Reporter
 on:
   workflow_run:
-    workflows: ["CI Core"] # This workflow will be triggered as soon as one of worfklows is completed
+    workflows: ["CI Core", "Operator UI CI"] # This workflow will be triggered as soon as one of worfklows is completed
     types:
       - completed
 
@@ -15,10 +15,9 @@ jobs:
       actions: read
     steps: 
       - name: Analyze logs
-        uses: smartcontractkit/.github/actions/llm-action-error-reporter@5efdd03d4a3311e7a0954e5b3061dbb57596ca10 # v0.2.0
+        uses: smartcontractkit/.github/actions/llm-action-error-reporter@d125ca9fe5e3b410de7c6db4a4ce3ed7a0728cd6 # v0.3.0
         with:
           parent-workflow-conclusion: ${{ github.event.workflow_run.conclusion }}
-          edit-comment: true
-          gh-token: ${{ secrets.GITHUB_TOKEN }}
-          openai-model: 'gpt-4-turbo-2024-04-09'
+          skip-on-success: true # Skip posting comment if no errors are found
+          gh-token: ${{ github.token }}
           openai-api-key: ${{ secrets.OPENAI_API_KEY }}
\ No newline at end of file
diff --git a/.github/workflows/on-demand-ocr-soak-test.yml b/.github/workflows/on-demand-ocr-soak-test.yml
index 5f4a2792c50..a96c000fa44 100644
--- a/.github/workflows/on-demand-ocr-soak-test.yml
+++ b/.github/workflows/on-demand-ocr-soak-test.yml
@@ -5,7 +5,7 @@ on:
       testToRun:
         description: Select a test to run from .github/e2e-tests.yml
         required: true
-        default: TestOCRSoak
+        default: soak/ocr_test.go:TestOCRv1Soak
         type: choice
         options:
           - soak/ocr_test.go:TestOCRv1Soak
@@ -59,7 +59,7 @@ jobs:
       GRAFANA_INTERNAL_HOST: ${{ secrets.GRAFANA_INTERNAL_HOST }}
       GRAFANA_INTERNAL_URL_SHORTENER_TOKEN: ${{ secrets.GRAFANA_INTERNAL_URL_SHORTENER_TOKEN }}
       LOKI_TENANT_ID: ${{ secrets.LOKI_TENANT_ID }}
-      LOKI_URL: https://${{ secrets.GRAFANA_INTERNAL_HOST }}/loki/api/v1/push
+      LOKI_URL: ${{ secrets.LOKI_URL }}
       LOKI_BASIC_AUTH: ${{ secrets.LOKI_BASIC_AUTH }}
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}  
       AWS_REGION: ${{ secrets.QA_AWS_REGION }}
diff --git a/.github/workflows/on-demand-vrfv2-performance-test.yml b/.github/workflows/on-demand-vrfv2-performance-test.yml
index e69de44c13a..0a9cec3db93 100644
--- a/.github/workflows/on-demand-vrfv2-performance-test.yml
+++ b/.github/workflows/on-demand-vrfv2-performance-test.yml
@@ -87,7 +87,7 @@ jobs:
       GRAFANA_INTERNAL_HOST: ${{ secrets.GRAFANA_INTERNAL_HOST }}
       GRAFANA_INTERNAL_URL_SHORTENER_TOKEN: ${{ secrets.GRAFANA_INTERNAL_URL_SHORTENER_TOKEN }}
       LOKI_TENANT_ID: ${{ secrets.LOKI_TENANT_ID }}
-      LOKI_URL: https://${{ secrets.GRAFANA_INTERNAL_HOST }}/loki/api/v1/push
+      LOKI_URL: ${{ secrets.LOKI_URL }}
       LOKI_BASIC_AUTH: ${{ secrets.LOKI_BASIC_AUTH }}
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}  
       AWS_REGION: ${{ secrets.QA_AWS_REGION }}
diff --git a/.github/workflows/on-demand-vrfv2-smoke-tests.yml b/.github/workflows/on-demand-vrfv2-smoke-tests.yml
index 8a5d70cbfe9..fcb083df708 100644
--- a/.github/workflows/on-demand-vrfv2-smoke-tests.yml
+++ b/.github/workflows/on-demand-vrfv2-smoke-tests.yml
@@ -90,7 +90,7 @@ jobs:
       GRAFANA_INTERNAL_HOST: ${{ secrets.GRAFANA_INTERNAL_HOST }}
       GRAFANA_INTERNAL_URL_SHORTENER_TOKEN: ${{ secrets.GRAFANA_INTERNAL_URL_SHORTENER_TOKEN }}
       LOKI_TENANT_ID: ${{ secrets.LOKI_TENANT_ID }}
-      LOKI_URL: https://${{ secrets.GRAFANA_INTERNAL_HOST }}/loki/api/v1/push
+      LOKI_URL: ${{ secrets.LOKI_URL }}
       LOKI_BASIC_AUTH: ${{ secrets.LOKI_BASIC_AUTH }}
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}  
       AWS_REGION: ${{ secrets.QA_AWS_REGION }}
diff --git a/.github/workflows/on-demand-vrfv2plus-performance-test.yml b/.github/workflows/on-demand-vrfv2plus-performance-test.yml
index d1f971e7013..534aea3d27d 100644
--- a/.github/workflows/on-demand-vrfv2plus-performance-test.yml
+++ b/.github/workflows/on-demand-vrfv2plus-performance-test.yml
@@ -87,7 +87,7 @@ jobs:
       GRAFANA_INTERNAL_HOST: ${{ secrets.GRAFANA_INTERNAL_HOST }}
       GRAFANA_INTERNAL_URL_SHORTENER_TOKEN: ${{ secrets.GRAFANA_INTERNAL_URL_SHORTENER_TOKEN }}
       LOKI_TENANT_ID: ${{ secrets.LOKI_TENANT_ID }}
-      LOKI_URL: https://${{ secrets.GRAFANA_INTERNAL_HOST }}/loki/api/v1/push
+      LOKI_URL: ${{ secrets.LOKI_URL }}
       LOKI_BASIC_AUTH: ${{ secrets.LOKI_BASIC_AUTH }}
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}  
       AWS_REGION: ${{ secrets.QA_AWS_REGION }}
diff --git a/.github/workflows/on-demand-vrfv2plus-smoke-tests.yml b/.github/workflows/on-demand-vrfv2plus-smoke-tests.yml
index 8aacdec27a5..9137cc64d98 100644
--- a/.github/workflows/on-demand-vrfv2plus-smoke-tests.yml
+++ b/.github/workflows/on-demand-vrfv2plus-smoke-tests.yml
@@ -90,7 +90,7 @@ jobs:
       GRAFANA_INTERNAL_HOST: ${{ secrets.GRAFANA_INTERNAL_HOST }}
       GRAFANA_INTERNAL_URL_SHORTENER_TOKEN: ${{ secrets.GRAFANA_INTERNAL_URL_SHORTENER_TOKEN }}
       LOKI_TENANT_ID: ${{ secrets.LOKI_TENANT_ID }}
-      LOKI_URL: https://${{ secrets.GRAFANA_INTERNAL_HOST }}/loki/api/v1/push
+      LOKI_URL: ${{ secrets.LOKI_URL }}
       LOKI_BASIC_AUTH: ${{ secrets.LOKI_BASIC_AUTH }}
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}  
       AWS_REGION: ${{ secrets.QA_AWS_REGION }}
diff --git a/.github/workflows/run-nightly-e2e-tests.yml b/.github/workflows/run-nightly-e2e-tests.yml
index 638f3586837..0637363ca76 100644
--- a/.github/workflows/run-nightly-e2e-tests.yml
+++ b/.github/workflows/run-nightly-e2e-tests.yml
@@ -41,7 +41,7 @@ jobs:
       GRAFANA_INTERNAL_HOST: ${{ secrets.GRAFANA_INTERNAL_HOST }}
       GRAFANA_INTERNAL_URL_SHORTENER_TOKEN: ${{ secrets.GRAFANA_INTERNAL_URL_SHORTENER_TOKEN }}
       LOKI_TENANT_ID: ${{ secrets.LOKI_TENANT_ID }}
-      LOKI_URL: https://${{ secrets.GRAFANA_INTERNAL_HOST }}/loki/api/v1/push
+      LOKI_URL: ${{ secrets.LOKI_URL }}
       LOKI_BASIC_AUTH: ${{ secrets.LOKI_BASIC_AUTH }}
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}  
       AWS_REGION: ${{ secrets.QA_AWS_REGION }}
diff --git a/.github/workflows/run-selected-e2e-tests.yml b/.github/workflows/run-selected-e2e-tests.yml
index 329fd6d9baa..b53bc756f4d 100644
--- a/.github/workflows/run-selected-e2e-tests.yml
+++ b/.github/workflows/run-selected-e2e-tests.yml
@@ -55,7 +55,7 @@ jobs:
       GRAFANA_INTERNAL_HOST: ${{ secrets.GRAFANA_INTERNAL_HOST }}
       GRAFANA_INTERNAL_URL_SHORTENER_TOKEN: ${{ secrets.GRAFANA_INTERNAL_URL_SHORTENER_TOKEN }}
       LOKI_TENANT_ID: ${{ secrets.LOKI_TENANT_ID }}
-      LOKI_URL: https://${{ secrets.GRAFANA_INTERNAL_HOST }}/loki/api/v1/push
+      LOKI_URL: ${{ secrets.LOKI_URL }}
       LOKI_BASIC_AUTH: ${{ secrets.LOKI_BASIC_AUTH }}
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}  
       AWS_REGION: ${{ secrets.QA_AWS_REGION }}
diff --git a/.goreleaser.develop.yaml b/.goreleaser.develop.yaml
index 1e054df7c45..c633e22fe62 100644
--- a/.goreleaser.develop.yaml
+++ b/.goreleaser.develop.yaml
@@ -3,6 +3,7 @@ project_name: chainlink
 env:
     - IMG_PRE={{ if index .Env "IMAGE_PREFIX"  }}{{ .Env.IMAGE_PREFIX }}{{ else }}localhost:5001{{ end }}
     - IMG_TAG={{ if index .Env "IMAGE_TAG" }}{{ .Env.IMAGE_TAG }}{{ else }}develop{{ end }}
+    - CGO_ENABLED=1
     - VERSION={{ if index .Env "CHAINLINK_VERSION" }}{{ .Env.CHAINLINK_VERSION }}{{ else }}v0.0.0-local{{ end }}
 release:
     disable: "true"
@@ -16,8 +17,14 @@ builds:
       no_unique_dist_dir: "true"
       ldflags:
         - -s -w -r=$ORIGIN/libs
-        - -X github.com/smartcontractkit/chainlink/v2/core/static.Version={{ .Env.VERSION }}
         - -X github.com/smartcontractkit/chainlink/v2/core/static.Sha={{ .FullCommit }}
+        - |-
+          -extldflags "-Wl,--dynamic-linker={{ if contains .Runtime.Goarch "amd64" -}}
+          /lib64/ld-linux-x86-64.so.2
+          {{- else if contains .Runtime.Goarch "arm64" -}}
+          /lib/ld-linux-aarch64.so.1
+          {{- end }}"
+        - -X github.com/smartcontractkit/chainlink/v2/core/static.Version={{ .Env.VERSION }}
       flags:
         - -trimpath
         - -buildmode=pie
@@ -49,8 +56,8 @@ dockers:
         - --label=org.opencontainers.image.revision={{ .FullCommit }}
         - --label=org.opencontainers.image.source=https://github.com/smartcontractkit/chainlink
         - --label=org.opencontainers.image.title=chainlink
-        - --label=org.opencontainers.image.version={{ .Env.VERSION }}
         - --label=org.opencontainers.image.url=https://github.com/smartcontractkit/chainlink
+        - --label=org.opencontainers.image.version={{ .Env.VERSION }}
       use: buildx
     - id: linux-amd64-chainlink-plugins
       goos: linux
@@ -78,8 +85,8 @@ dockers:
         - --label=org.opencontainers.image.revision={{ .FullCommit }}
         - --label=org.opencontainers.image.source=https://github.com/smartcontractkit/chainlink
         - --label=org.opencontainers.image.title=chainlink
-        - --label=org.opencontainers.image.version={{ .Env.VERSION }}
         - --label=org.opencontainers.image.url=https://github.com/smartcontractkit/chainlink
+        - --label=org.opencontainers.image.version={{ .Env.VERSION }}
       use: buildx
     - id: linux-arm64-chainlink
       goos: linux
@@ -101,8 +108,8 @@ dockers:
         - --label=org.opencontainers.image.revision={{ .FullCommit }}
         - --label=org.opencontainers.image.source=https://github.com/smartcontractkit/chainlink
         - --label=org.opencontainers.image.title=chainlink
-        - --label=org.opencontainers.image.version={{ .Env.VERSION }}
         - --label=org.opencontainers.image.url=https://github.com/smartcontractkit/chainlink
+        - --label=org.opencontainers.image.version={{ .Env.VERSION }}
       use: buildx
     - id: linux-arm64-chainlink-plugins
       goos: linux
@@ -129,8 +136,8 @@ dockers:
         - --label=org.opencontainers.image.revision={{ .FullCommit }}
         - --label=org.opencontainers.image.source=https://github.com/smartcontractkit/chainlink
         - --label=org.opencontainers.image.title=chainlink
-        - --label=org.opencontainers.image.version={{ .Env.VERSION }}
         - --label=org.opencontainers.image.url=https://github.com/smartcontractkit/chainlink
+        - --label=org.opencontainers.image.version={{ .Env.VERSION }}
       use: buildx
     - id: linux-amd64-ccip
       goos: linux
@@ -155,8 +162,8 @@ dockers:
         - --label=org.opencontainers.image.revision={{ .FullCommit }}
         - --label=org.opencontainers.image.source=https://github.com/smartcontractkit/chainlink
         - --label=org.opencontainers.image.title=chainlink
-        - --label=org.opencontainers.image.version={{ .Env.VERSION }}
         - --label=org.opencontainers.image.url=https://github.com/smartcontractkit/chainlink
+        - --label=org.opencontainers.image.version={{ .Env.VERSION }}
       use: buildx
     - id: linux-amd64-ccip-plugins
       goos: linux
@@ -186,8 +193,8 @@ dockers:
         - --label=org.opencontainers.image.revision={{ .FullCommit }}
         - --label=org.opencontainers.image.source=https://github.com/smartcontractkit/chainlink
         - --label=org.opencontainers.image.title=chainlink
-        - --label=org.opencontainers.image.version={{ .Env.VERSION }}
         - --label=org.opencontainers.image.url=https://github.com/smartcontractkit/chainlink
+        - --label=org.opencontainers.image.version={{ .Env.VERSION }}
       use: buildx
     - id: linux-arm64-ccip
       goos: linux
@@ -211,8 +218,8 @@ dockers:
         - --label=org.opencontainers.image.revision={{ .FullCommit }}
         - --label=org.opencontainers.image.source=https://github.com/smartcontractkit/chainlink
         - --label=org.opencontainers.image.title=chainlink
-        - --label=org.opencontainers.image.version={{ .Env.VERSION }}
         - --label=org.opencontainers.image.url=https://github.com/smartcontractkit/chainlink
+        - --label=org.opencontainers.image.version={{ .Env.VERSION }}
       use: buildx
     - id: linux-arm64-ccip-plugins
       goos: linux
@@ -241,8 +248,8 @@ dockers:
         - --label=org.opencontainers.image.revision={{ .FullCommit }}
         - --label=org.opencontainers.image.source=https://github.com/smartcontractkit/chainlink
         - --label=org.opencontainers.image.title=chainlink
-        - --label=org.opencontainers.image.version={{ .Env.VERSION }}
         - --label=org.opencontainers.image.url=https://github.com/smartcontractkit/chainlink
+        - --label=org.opencontainers.image.version={{ .Env.VERSION }}
       use: buildx
 docker_manifests:
     - id: tagged-chainlink
diff --git a/.goreleaser.devspace.yaml b/.goreleaser.devspace.yaml
index d0167b34cda..13027590a2b 100644
--- a/.goreleaser.devspace.yaml
+++ b/.goreleaser.devspace.yaml
@@ -1,89 +1,102 @@
-project_name: chainlink-devspace
-
 version: 2
-
+project_name: chainlink
 env:
-  - ZIG_EXEC={{ if index .Env "ZIG_EXEC"  }}{{ .Env.ZIG_EXEC }}{{ else }}zig{{ end }}
-  - IMAGE_LABEL_DESCRIPTION="node of the decentralized oracle network, bridging on and off-chain computation"
-  - IMAGE_LABEL_LICENSES="MIT"
-  - IMAGE_LABEL_SOURCE="https://github.com/smartcontractkit/{{ .ProjectName }}"
-
-before:
-  hooks:
-    - go mod tidy
-    - ./tools/bin/goreleaser_utils before_hook
-
-# See https://goreleaser.com/customization/build/
+    - IMG_PRE={{ if index .Env "IMAGE_PREFIX"  }}{{ .Env.IMAGE_PREFIX }}{{ else }}localhost:5001{{ end }}
+    - IMG_TAG={{ if index .Env "IMAGE_TAG" }}{{ .Env.IMAGE_TAG }}{{ else }}develop{{ end }}
+    - CGO_ENABLED=1
+release:
+    disable: "true"
 builds:
-  - binary: chainlink
-    id: linux-amd64
-    goos:
-      - linux
-    goarch:
-      - amd64
-    hooks:
-      post: ./tools/bin/goreleaser_utils build_post_hook {{ dir .Path }} {{ .Os }} {{ .Arch }}
-    env:
-      - CGO_ENABLED=1
-      - CC=$ZIG_EXEC cc -target x86_64-linux-gnu -Wno-error=unused-command-line-argument
-      - CCX=$ZIG_EXEC c++ -target x86_64-linux-gnu -Wno-error=unused-command-line-argument
-    flags:
-      - -trimpath
-      - -buildmode=pie
-    ldflags:
-      - -s -w -r=$ORIGIN/libs
-      - -X github.com/smartcontractkit/chainlink/v2/core/static.Version={{ .Version }}
-      - -X github.com/smartcontractkit/chainlink/v2/core/static.Sha={{ .FullCommit }}
-
-# See https://goreleaser.com/customization/docker/
+    - targets:
+        - go_first_class
+      binary: chainlink
+      hooks:
+        post:
+            - cmd: ./tools/bin/goreleaser_utils build_post_hook {{ dir .Path }}
+      no_unique_dist_dir: "true"
+      ldflags:
+        - -s -w -r=$ORIGIN/libs
+        - -X github.com/smartcontractkit/chainlink/v2/core/static.Sha={{ .FullCommit }}
+        - |-
+          -extldflags "-Wl,--dynamic-linker={{ if contains .Runtime.Goarch "amd64" -}}
+          /lib64/ld-linux-x86-64.so.2
+          {{- else if contains .Runtime.Goarch "arm64" -}}
+          /lib/ld-linux-aarch64.so.1
+          {{- end }}"
+        - -X github.com/smartcontractkit/chainlink/v2/core/static.Version={{ .Version }}
+      flags:
+        - -trimpath
+        - -buildmode=pie
+archives:
+    - format: binary
+snapshot:
+    version_template: v0.0.0-{{ .Runtime.Goarch }}-{{ .Now.Format "2006-01-02-15-04-05Z" }}
+checksum:
+    name_template: checksums.txt
 dockers:
-  - id: linux-amd64
-    dockerfile: core/chainlink.goreleaser.Dockerfile
-    use: buildx
-    goos: linux
-    goarch: amd64
-    extra_files:
-      - tmp/linux_amd64/libs
-      - tmp/linux_amd64/plugins
-      - tools/bin/ldd_fix
-    build_flag_templates:
-      - "--platform=linux/amd64"
-      - "--pull"
-      - "--build-arg=CHAINLINK_USER=chainlink"
-      - "--build-arg=COMMIT_SHA={{ .FullCommit }}"
-      - "--build-arg=CL_MEDIAN_CMD=chainlink-feeds"
-      - "--build-arg=CL_MERCURY_CMD=chainlink-mercury"
-      - "--build-arg=CL_SOLANA_CMD=chainlink-solana"
-      - "--build-arg=CL_STARKNET_CMD=chainlink-starknet"
-      - "--label=org.opencontainers.image.created={{ .Date }}"
-      - "--label=org.opencontainers.image.description={{ .Env.IMAGE_LABEL_DESCRIPTION }}"
-      - "--label=org.opencontainers.image.licenses={{ .Env.IMAGE_LABEL_LICENSES }}"
-      - "--label=org.opencontainers.image.revision={{ .FullCommit }}"
-      - "--label=org.opencontainers.image.source={{ .Env.IMAGE_LABEL_SOURCE }}"
-      - "--label=org.opencontainers.image.title={{ .ProjectName }}"
-      - "--label=org.opencontainers.image.version={{ .Version }}"
-      - "--label=org.opencontainers.image.url={{ .Env.IMAGE_LABEL_SOURCE }}"
-    image_templates:
-      - "{{ .Env.IMAGE }}"
-
-# See https://goreleaser.com/customization/docker_manifest/
+    - id: linux-amd64
+      goos: linux
+      goarch: amd64
+      dockerfile: core/chainlink.goreleaser.Dockerfile
+      image_templates:
+        - '{{ .Env.IMAGE }}'
+      extra_files:
+        - tmp/libs
+        - tmp/plugins
+      build_flag_templates:
+        - --platform=linux/amd64
+        - --pull
+        - --build-arg=CHAINLINK_USER=chainlink
+        - --build-arg=COMMIT_SHA={{ .FullCommit }}
+        - --build-arg=CL_MEDIAN_CMD=chainlink-feeds
+        - --build-arg=CL_MERCURY_CMD=chainlink-mercury
+        - --build-arg=CL_SOLANA_CMD=chainlink-solana
+        - --build-arg=CL_STARKNET_CMD=chainlink-starknet
+        - --label=org.opencontainers.image.created={{ .Date }}
+        - --label=org.opencontainers.image.description="node of the decentralized oracle network, bridging on and off-chain computation"
+        - --label=org.opencontainers.image.licenses=MIT
+        - --label=org.opencontainers.image.revision={{ .FullCommit }}
+        - --label=org.opencontainers.image.source=https://github.com/smartcontractkit/chainlink
+        - --label=org.opencontainers.image.title=chainlink
+        - --label=org.opencontainers.image.url=https://github.com/smartcontractkit/chainlink
+      use: buildx
+    - id: linux-arm64
+      goos: linux
+      goarch: arm64
+      dockerfile: core/chainlink.goreleaser.Dockerfile
+      image_templates:
+        - '{{ .Env.IMAGE }}'
+      extra_files:
+        - tmp/libs
+        - tmp/plugins
+      build_flag_templates:
+        - --platform=linux/arm64
+        - --pull
+        - --build-arg=CHAINLINK_USER=chainlink
+        - --build-arg=COMMIT_SHA={{ .FullCommit }}
+        - --build-arg=CL_MEDIAN_CMD=chainlink-feeds
+        - --build-arg=CL_MERCURY_CMD=chainlink-mercury
+        - --build-arg=CL_SOLANA_CMD=chainlink-solana
+        - --build-arg=CL_STARKNET_CMD=chainlink-starknet
+        - --label=org.opencontainers.image.created={{ .Date }}
+        - --label=org.opencontainers.image.description="node of the decentralized oracle network, bridging on and off-chain computation"
+        - --label=org.opencontainers.image.licenses=MIT
+        - --label=org.opencontainers.image.revision={{ .FullCommit }}
+        - --label=org.opencontainers.image.source=https://github.com/smartcontractkit/chainlink
+        - --label=org.opencontainers.image.title=chainlink
+        - --label=org.opencontainers.image.url=https://github.com/smartcontractkit/chainlink
+      use: buildx
 docker_manifests:
-  - name_template: "{{ .Env.IMAGE }}"
-    image_templates:
-      - "{{ .Env.IMAGE }}"
-
-checksum:
-  name_template: "checksums.txt"
-
-snapshot:
-  version_template: '{{ .Env.CHAINLINK_VERSION }}-{{ .Runtime.Goarch }}-{{ .Now.Format "2006-01-02-15-04-05Z" }}'
-
+    - name_template: '{{ .Env.IMAGE }}'
+      image_templates:
+        - '{{ .Env.IMAGE }}'
 changelog:
-  sort: asc
-  filters:
-    exclude:
-      - "^docs:"
-      - "^test:"
-# modelines, feel free to remove those if you don't want/use them:
-# yaml-language-server: $schema=https://goreleaser.com/static/schema.json
-# vim: set ts=2 sw=2 tw=0 fo=cnqoj
+    disable: "true"
+before:
+    hooks:
+        - cmd: go mod tidy
+        - cmd: ./tools/bin/goreleaser_utils before_hook
+partial:
+    by: target
+nightly:
+    version_template: v0.0.0-{{ .Runtime.Goarch }}-{{ .Now.Format "2006-01-02-15-04-05Z" }}
diff --git a/.goreleaser.production.yaml b/.goreleaser.production.yaml
index ada9b847e74..b4e19d1b31c 100644
--- a/.goreleaser.production.yaml
+++ b/.goreleaser.production.yaml
@@ -3,6 +3,7 @@ project_name: chainlink
 env:
     - IMG_PRE={{ if index .Env "IMAGE_PREFIX"  }}{{ .Env.IMAGE_PREFIX }}{{ else }}localhost:5001{{ end }}
     - IMG_TAG={{ if index .Env "IMAGE_TAG" }}{{ .Env.IMAGE_TAG }}{{ else }}develop{{ end }}
+    - CGO_ENABLED=1
     - VERSION={{ if index .Env "CHAINLINK_VERSION" }}{{ .Env.CHAINLINK_VERSION }}{{ else }}v0.0.0-local{{ end }}
 release:
     disable: "true"
@@ -16,8 +17,14 @@ builds:
       no_unique_dist_dir: "true"
       ldflags:
         - -s -w -r=$ORIGIN/libs
-        - -X github.com/smartcontractkit/chainlink/v2/core/static.Version={{ .Env.VERSION }}
         - -X github.com/smartcontractkit/chainlink/v2/core/static.Sha={{ .FullCommit }}
+        - |-
+          -extldflags "-Wl,--dynamic-linker={{ if contains .Runtime.Goarch "amd64" -}}
+          /lib64/ld-linux-x86-64.so.2
+          {{- else if contains .Runtime.Goarch "arm64" -}}
+          /lib/ld-linux-aarch64.so.1
+          {{- end }}"
+        - -X github.com/smartcontractkit/chainlink/v2/core/static.Version={{ .Env.VERSION }}
       flags:
         - -trimpath
         - -buildmode=pie
@@ -50,8 +57,8 @@ dockers:
         - --label=org.opencontainers.image.revision={{ .FullCommit }}
         - --label=org.opencontainers.image.source=https://github.com/smartcontractkit/chainlink
         - --label=org.opencontainers.image.title=chainlink
-        - --label=org.opencontainers.image.version={{ .Env.VERSION }}
         - --label=org.opencontainers.image.url=https://github.com/smartcontractkit/chainlink
+        - --label=org.opencontainers.image.version={{ .Env.VERSION }}
       use: buildx
     - id: linux-amd64-chainlink-plugins
       goos: linux
@@ -80,8 +87,8 @@ dockers:
         - --label=org.opencontainers.image.revision={{ .FullCommit }}
         - --label=org.opencontainers.image.source=https://github.com/smartcontractkit/chainlink
         - --label=org.opencontainers.image.title=chainlink
-        - --label=org.opencontainers.image.version={{ .Env.VERSION }}
         - --label=org.opencontainers.image.url=https://github.com/smartcontractkit/chainlink
+        - --label=org.opencontainers.image.version={{ .Env.VERSION }}
       use: buildx
     - id: linux-arm64-chainlink
       goos: linux
@@ -104,8 +111,8 @@ dockers:
         - --label=org.opencontainers.image.revision={{ .FullCommit }}
         - --label=org.opencontainers.image.source=https://github.com/smartcontractkit/chainlink
         - --label=org.opencontainers.image.title=chainlink
-        - --label=org.opencontainers.image.version={{ .Env.VERSION }}
         - --label=org.opencontainers.image.url=https://github.com/smartcontractkit/chainlink
+        - --label=org.opencontainers.image.version={{ .Env.VERSION }}
       use: buildx
     - id: linux-arm64-chainlink-plugins
       goos: linux
@@ -133,8 +140,8 @@ dockers:
         - --label=org.opencontainers.image.revision={{ .FullCommit }}
         - --label=org.opencontainers.image.source=https://github.com/smartcontractkit/chainlink
         - --label=org.opencontainers.image.title=chainlink
-        - --label=org.opencontainers.image.version={{ .Env.VERSION }}
         - --label=org.opencontainers.image.url=https://github.com/smartcontractkit/chainlink
+        - --label=org.opencontainers.image.version={{ .Env.VERSION }}
       use: buildx
     - id: linux-amd64-ccip
       goos: linux
@@ -160,8 +167,8 @@ dockers:
         - --label=org.opencontainers.image.revision={{ .FullCommit }}
         - --label=org.opencontainers.image.source=https://github.com/smartcontractkit/chainlink
         - --label=org.opencontainers.image.title=chainlink
-        - --label=org.opencontainers.image.version={{ .Env.VERSION }}
         - --label=org.opencontainers.image.url=https://github.com/smartcontractkit/chainlink
+        - --label=org.opencontainers.image.version={{ .Env.VERSION }}
       use: buildx
     - id: linux-amd64-ccip-plugins
       goos: linux
@@ -192,8 +199,8 @@ dockers:
         - --label=org.opencontainers.image.revision={{ .FullCommit }}
         - --label=org.opencontainers.image.source=https://github.com/smartcontractkit/chainlink
         - --label=org.opencontainers.image.title=chainlink
-        - --label=org.opencontainers.image.version={{ .Env.VERSION }}
         - --label=org.opencontainers.image.url=https://github.com/smartcontractkit/chainlink
+        - --label=org.opencontainers.image.version={{ .Env.VERSION }}
       use: buildx
     - id: linux-arm64-ccip
       goos: linux
@@ -218,8 +225,8 @@ dockers:
         - --label=org.opencontainers.image.revision={{ .FullCommit }}
         - --label=org.opencontainers.image.source=https://github.com/smartcontractkit/chainlink
         - --label=org.opencontainers.image.title=chainlink
-        - --label=org.opencontainers.image.version={{ .Env.VERSION }}
         - --label=org.opencontainers.image.url=https://github.com/smartcontractkit/chainlink
+        - --label=org.opencontainers.image.version={{ .Env.VERSION }}
       use: buildx
     - id: linux-arm64-ccip-plugins
       goos: linux
@@ -249,8 +256,8 @@ dockers:
         - --label=org.opencontainers.image.revision={{ .FullCommit }}
         - --label=org.opencontainers.image.source=https://github.com/smartcontractkit/chainlink
         - --label=org.opencontainers.image.title=chainlink
-        - --label=org.opencontainers.image.version={{ .Env.VERSION }}
         - --label=org.opencontainers.image.url=https://github.com/smartcontractkit/chainlink
+        - --label=org.opencontainers.image.version={{ .Env.VERSION }}
       use: buildx
 docker_manifests:
     - id: tagged-chainlink-chainlink-experimental-goreleaser
diff --git a/GNUmakefile b/GNUmakefile
index 4080f87b734..10ac3afcafb 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -113,6 +113,10 @@ testscripts: chainlink-test ## Install and run testscript against testdata/scrip
 testscripts-update: ## Update testdata/scripts/* files via testscript.
 	make testscripts TS_FLAGS="-u"
 
+.PHONY: start-testdb
+start-testdb:
+	docker run --name test-db-core -p 5432:5432 -e POSTGRES_PASSWORD=postgres -d postgres
+
 .PHONY: setup-testdb
 setup-testdb: ## Setup the test database.
 	./core/scripts/setup_testdb.sh
diff --git a/contracts/.changeset/heavy-balloons-cheat.md b/contracts/.changeset/heavy-balloons-cheat.md
index c0a39c5db7e..a6cc994c8d3 100644
--- a/contracts/.changeset/heavy-balloons-cheat.md
+++ b/contracts/.changeset/heavy-balloons-cheat.md
@@ -1,5 +1,5 @@
 ---
-"chainlink": patch
+'@chainlink/contracts': patch
 ---
 
 #added Add ZKSync L2EP SequencerUptimeFeed contract
diff --git a/contracts/.changeset/itchy-deers-deny.md b/contracts/.changeset/itchy-deers-deny.md
index 888d58ce311..697f451cf56 100644
--- a/contracts/.changeset/itchy-deers-deny.md
+++ b/contracts/.changeset/itchy-deers-deny.md
@@ -1,5 +1,5 @@
 ---
-"@chainlink/contracts": patch
+'@chainlink/contracts': patch
 ---
 
 More comprehensive & product-scoped Solidity Foundry pipeline
diff --git a/contracts/.changeset/tricky-cups-hammer.md b/contracts/.changeset/tricky-cups-hammer.md
new file mode 100644
index 00000000000..a6e213c9be0
--- /dev/null
+++ b/contracts/.changeset/tricky-cups-hammer.md
@@ -0,0 +1,8 @@
+---
+'@chainlink/contracts': patch
+---
+
+Make stalenessThreshold per dest chain and have 0 mean no staleness check.
+
+
+PR issue: CCIP-3414
\ No newline at end of file
diff --git a/contracts/gas-snapshots/ccip.gas-snapshot b/contracts/gas-snapshots/ccip.gas-snapshot
index 23d97ab7ff5..c5cd6f8d1c3 100644
--- a/contracts/gas-snapshots/ccip.gas-snapshot
+++ b/contracts/gas-snapshots/ccip.gas-snapshot
@@ -19,7 +19,7 @@ BurnWithFromMintTokenPool_lockOrBurn:test_ChainNotAllowed_Revert() (gas: 28842)
 BurnWithFromMintTokenPool_lockOrBurn:test_PoolBurnRevertNotHealthy_Revert() (gas: 55271)
 BurnWithFromMintTokenPool_lockOrBurn:test_PoolBurn_Success() (gas: 244092)
 BurnWithFromMintTokenPool_lockOrBurn:test_Setup_Success() (gas: 24189)
-CCIPClientExample_sanity:test_ImmutableExamples_Success() (gas: 2108234)
+CCIPClientExample_sanity:test_ImmutableExamples_Success() (gas: 2108396)
 CCIPHome__validateConfig:test__validateConfigLessTransmittersThanSigners_Success() (gas: 335794)
 CCIPHome__validateConfig:test__validateConfigSmallerFChain_Success() (gas: 468721)
 CCIPHome__validateConfig:test__validateConfig_ABIEncodedAddress_OfframpAddressCannotBeZero_Reverts() (gas: 290481)
@@ -68,7 +68,7 @@ CCIPHome_setCandidate:test_setCandidate_ConfigDigestMismatch_reverts() (gas: 138
 CCIPHome_setCandidate:test_setCandidate_success() (gas: 1357884)
 DefensiveExampleTest:test_HappyPath_Success() (gas: 200048)
 DefensiveExampleTest:test_Recovery() (gas: 424306)
-E2E:test_E2E_3MessagesMMultiOffRampSuccess_gas() (gas: 1518471)
+E2E:test_E2E_3MessagesMMultiOffRampSuccess_gas() (gas: 1518567)
 EtherSenderReceiverTest_ccipReceive:test_ccipReceive_fallbackToWethTransfer() (gas: 96909)
 EtherSenderReceiverTest_ccipReceive:test_ccipReceive_happyPath() (gas: 49796)
 EtherSenderReceiverTest_ccipReceive:test_ccipReceive_wrongToken() (gas: 17435)
@@ -90,58 +90,59 @@ EtherSenderReceiverTest_validatedMessage:test_validatedMessage_emptyDataOverwrit
 EtherSenderReceiverTest_validatedMessage:test_validatedMessage_invalidTokenAmounts() (gas: 17925)
 EtherSenderReceiverTest_validatedMessage:test_validatedMessage_tokenOverwrittenToWeth() (gas: 25329)
 EtherSenderReceiverTest_validatedMessage:test_validatedMessage_validMessage_extraArgs() (gas: 26348)
-FeeQuoter_applyDestChainConfigUpdates:test_InvalidChainFamilySelector_Revert() (gas: 16686)
-FeeQuoter_applyDestChainConfigUpdates:test_InvalidDestChainConfigDestChainSelectorEqZero_Revert() (gas: 16566)
-FeeQuoter_applyDestChainConfigUpdates:test_applyDestChainConfigUpdatesDefaultTxGasLimitEqZero_Revert() (gas: 16653)
-FeeQuoter_applyDestChainConfigUpdates:test_applyDestChainConfigUpdatesDefaultTxGasLimitGtMaxPerMessageGasLimit_Revert() (gas: 40326)
-FeeQuoter_applyDestChainConfigUpdates:test_applyDestChainConfigUpdatesZeroIntput_Success() (gas: 12527)
-FeeQuoter_applyDestChainConfigUpdates:test_applyDestChainConfigUpdates_Success() (gas: 137576)
-FeeQuoter_applyFeeTokensUpdates:test_ApplyFeeTokensUpdates_Success() (gas: 80348)
-FeeQuoter_applyFeeTokensUpdates:test_OnlyCallableByOwner_Revert() (gas: 12687)
+FeeQuoter_applyDestChainConfigUpdates:test_InvalidChainFamilySelector_Revert() (gas: 16878)
+FeeQuoter_applyDestChainConfigUpdates:test_InvalidDestChainConfigDestChainSelectorEqZero_Revert() (gas: 16758)
+FeeQuoter_applyDestChainConfigUpdates:test_applyDestChainConfigUpdatesDefaultTxGasLimitEqZero_Revert() (gas: 16800)
+FeeQuoter_applyDestChainConfigUpdates:test_applyDestChainConfigUpdatesDefaultTxGasLimitGtMaxPerMessageGasLimit_Revert() (gas: 41225)
+FeeQuoter_applyDestChainConfigUpdates:test_applyDestChainConfigUpdatesZeroIntput_Success() (gas: 12484)
+FeeQuoter_applyDestChainConfigUpdates:test_applyDestChainConfigUpdates_Success() (gas: 140316)
+FeeQuoter_applyFeeTokensUpdates:test_ApplyFeeTokensUpdates_Success() (gas: 80418)
+FeeQuoter_applyFeeTokensUpdates:test_OnlyCallableByOwner_Revert() (gas: 12709)
 FeeQuoter_applyPremiumMultiplierWeiPerEthUpdates:test_OnlyCallableByOwnerOrAdmin_Revert() (gas: 11547)
 FeeQuoter_applyPremiumMultiplierWeiPerEthUpdates:test_applyPremiumMultiplierWeiPerEthUpdatesMultipleTokens_Success() (gas: 54662)
 FeeQuoter_applyPremiumMultiplierWeiPerEthUpdates:test_applyPremiumMultiplierWeiPerEthUpdatesSingleToken_Success() (gas: 45153)
 FeeQuoter_applyPremiumMultiplierWeiPerEthUpdates:test_applyPremiumMultiplierWeiPerEthUpdatesZeroInput() (gas: 12310)
-FeeQuoter_applyTokenTransferFeeConfigUpdates:test_ApplyTokenTransferFeeConfig_Success() (gas: 87721)
-FeeQuoter_applyTokenTransferFeeConfigUpdates:test_ApplyTokenTransferFeeZeroInput() (gas: 13233)
-FeeQuoter_applyTokenTransferFeeConfigUpdates:test_InvalidDestBytesOverhead_Revert() (gas: 17344)
-FeeQuoter_applyTokenTransferFeeConfigUpdates:test_OnlyCallableByOwnerOrAdmin_Revert() (gas: 12330)
-FeeQuoter_constructor:test_InvalidLinkTokenEqZeroAddress_Revert() (gas: 106501)
-FeeQuoter_constructor:test_InvalidMaxFeeJuelsPerMsg_Revert() (gas: 110851)
-FeeQuoter_constructor:test_InvalidStalenessThreshold_Revert() (gas: 110904)
-FeeQuoter_constructor:test_Setup_Success() (gas: 4972944)
+FeeQuoter_applyTokenTransferFeeConfigUpdates:test_ApplyTokenTransferFeeConfig_Success() (gas: 87853)
+FeeQuoter_applyTokenTransferFeeConfigUpdates:test_ApplyTokenTransferFeeZeroInput() (gas: 13255)
+FeeQuoter_applyTokenTransferFeeConfigUpdates:test_InvalidDestBytesOverhead_Revert() (gas: 17366)
+FeeQuoter_applyTokenTransferFeeConfigUpdates:test_OnlyCallableByOwnerOrAdmin_Revert() (gas: 12352)
+FeeQuoter_constructor:test_InvalidLinkTokenEqZeroAddress_Revert() (gas: 106579)
+FeeQuoter_constructor:test_InvalidMaxFeeJuelsPerMsg_Revert() (gas: 110929)
+FeeQuoter_constructor:test_InvalidStalenessThreshold_Revert() (gas: 110982)
+FeeQuoter_constructor:test_Setup_Success() (gas: 5013710)
 FeeQuoter_convertTokenAmount:test_ConvertTokenAmount_Success() (gas: 68361)
 FeeQuoter_convertTokenAmount:test_LinkTokenNotSupported_Revert() (gas: 29076)
-FeeQuoter_getDataAvailabilityCost:test_EmptyMessageCalculatesDataAvailabilityCost_Success() (gas: 94759)
-FeeQuoter_getDataAvailabilityCost:test_SimpleMessageCalculatesDataAvailabilityCostUnsupportedDestChainSelector_Success() (gas: 14736)
-FeeQuoter_getDataAvailabilityCost:test_SimpleMessageCalculatesDataAvailabilityCost_Success() (gas: 20573)
-FeeQuoter_getTokenAndGasPrices:test_GetFeeTokenAndGasPrices_Success() (gas: 68298)
-FeeQuoter_getTokenAndGasPrices:test_StaleGasPrice_Revert() (gas: 16892)
-FeeQuoter_getTokenAndGasPrices:test_UnsupportedChain_Revert() (gas: 16188)
-FeeQuoter_getTokenAndGasPrices:test_ZeroGasPrice_Success() (gas: 43667)
+FeeQuoter_getDataAvailabilityCost:test_EmptyMessageCalculatesDataAvailabilityCost_Success() (gas: 96045)
+FeeQuoter_getDataAvailabilityCost:test_SimpleMessageCalculatesDataAvailabilityCostUnsupportedDestChainSelector_Success() (gas: 14774)
+FeeQuoter_getDataAvailabilityCost:test_SimpleMessageCalculatesDataAvailabilityCost_Success() (gas: 20809)
+FeeQuoter_getTokenAndGasPrices:test_GetFeeTokenAndGasPrices_Success() (gas: 72793)
+FeeQuoter_getTokenAndGasPrices:test_StaleGasPrice_Revert() (gas: 26309)
+FeeQuoter_getTokenAndGasPrices:test_StalenessCheckDisabled_Success() (gas: 111759)
+FeeQuoter_getTokenAndGasPrices:test_UnsupportedChain_Revert() (gas: 16081)
+FeeQuoter_getTokenAndGasPrices:test_ZeroGasPrice_Success() (gas: 109015)
 FeeQuoter_getTokenPrice:test_GetTokenPriceFromFeed_Success() (gas: 66273)
 FeeQuoter_getTokenPrices:test_GetTokenPrices_Success() (gas: 78388)
-FeeQuoter_getTokenTransferCost:test_CustomTokenBpsFee_Success() (gas: 39244)
-FeeQuoter_getTokenTransferCost:test_FeeTokenBpsFee_Success() (gas: 34880)
-FeeQuoter_getTokenTransferCost:test_LargeTokenTransferChargesMaxFeeAndGas_Success() (gas: 27976)
-FeeQuoter_getTokenTransferCost:test_MixedTokenTransferFee_Success() (gas: 97513)
-FeeQuoter_getTokenTransferCost:test_NoTokenTransferChargesZeroFee_Success() (gas: 20468)
-FeeQuoter_getTokenTransferCost:test_SmallTokenTransferChargesMinFeeAndGas_Success() (gas: 27784)
-FeeQuoter_getTokenTransferCost:test_ZeroAmountTokenTransferChargesMinFeeAndGas_Success() (gas: 27807)
-FeeQuoter_getTokenTransferCost:test_ZeroFeeConfigChargesMinFee_Success() (gas: 40376)
-FeeQuoter_getTokenTransferCost:test_getTokenTransferCost_selfServeUsesDefaults_Success() (gas: 29503)
-FeeQuoter_getValidatedFee:test_DestinationChainNotEnabled_Revert() (gas: 18315)
-FeeQuoter_getValidatedFee:test_EmptyMessage_Success() (gas: 82344)
-FeeQuoter_getValidatedFee:test_EnforceOutOfOrder_Revert() (gas: 52638)
-FeeQuoter_getValidatedFee:test_HighGasMessage_Success() (gas: 238762)
-FeeQuoter_getValidatedFee:test_InvalidEVMAddress_Revert() (gas: 22533)
-FeeQuoter_getValidatedFee:test_MessageGasLimitTooHigh_Revert() (gas: 29847)
-FeeQuoter_getValidatedFee:test_MessageTooLarge_Revert() (gas: 100292)
-FeeQuoter_getValidatedFee:test_MessageWithDataAndTokenTransfer_Success() (gas: 141937)
-FeeQuoter_getValidatedFee:test_NotAFeeToken_Revert() (gas: 21172)
-FeeQuoter_getValidatedFee:test_SingleTokenMessage_Success() (gas: 113287)
-FeeQuoter_getValidatedFee:test_TooManyTokens_Revert() (gas: 22691)
-FeeQuoter_getValidatedFee:test_ZeroDataAvailabilityMultiplier_Success() (gas: 62692)
+FeeQuoter_getTokenTransferCost:test_CustomTokenBpsFee_Success() (gas: 39239)
+FeeQuoter_getTokenTransferCost:test_FeeTokenBpsFee_Success() (gas: 34876)
+FeeQuoter_getTokenTransferCost:test_LargeTokenTransferChargesMaxFeeAndGas_Success() (gas: 27972)
+FeeQuoter_getTokenTransferCost:test_MixedTokenTransferFee_Success() (gas: 97567)
+FeeQuoter_getTokenTransferCost:test_NoTokenTransferChargesZeroFee_Success() (gas: 20441)
+FeeQuoter_getTokenTransferCost:test_SmallTokenTransferChargesMinFeeAndGas_Success() (gas: 27780)
+FeeQuoter_getTokenTransferCost:test_ZeroAmountTokenTransferChargesMinFeeAndGas_Success() (gas: 27803)
+FeeQuoter_getTokenTransferCost:test_ZeroFeeConfigChargesMinFee_Success() (gas: 40372)
+FeeQuoter_getTokenTransferCost:test_getTokenTransferCost_selfServeUsesDefaults_Success() (gas: 29499)
+FeeQuoter_getValidatedFee:test_DestinationChainNotEnabled_Revert() (gas: 18354)
+FeeQuoter_getValidatedFee:test_EmptyMessage_Success() (gas: 82824)
+FeeQuoter_getValidatedFee:test_EnforceOutOfOrder_Revert() (gas: 53482)
+FeeQuoter_getValidatedFee:test_HighGasMessage_Success() (gas: 239286)
+FeeQuoter_getValidatedFee:test_InvalidEVMAddress_Revert() (gas: 22571)
+FeeQuoter_getValidatedFee:test_MessageGasLimitTooHigh_Revert() (gas: 29879)
+FeeQuoter_getValidatedFee:test_MessageTooLarge_Revert() (gas: 100330)
+FeeQuoter_getValidatedFee:test_MessageWithDataAndTokenTransfer_Success() (gas: 142541)
+FeeQuoter_getValidatedFee:test_NotAFeeToken_Revert() (gas: 21211)
+FeeQuoter_getValidatedFee:test_SingleTokenMessage_Success() (gas: 113804)
+FeeQuoter_getValidatedFee:test_TooManyTokens_Revert() (gas: 22729)
+FeeQuoter_getValidatedFee:test_ZeroDataAvailabilityMultiplier_Success() (gas: 63687)
 FeeQuoter_getValidatedTokenPrice:test_GetValidatedTokenPriceFromFeedErc20Above18Decimals_Success() (gas: 1973956)
 FeeQuoter_getValidatedTokenPrice:test_GetValidatedTokenPriceFromFeedErc20Below18Decimals_Success() (gas: 1973914)
 FeeQuoter_getValidatedTokenPrice:test_GetValidatedTokenPriceFromFeedFeedAt0Decimals_Success() (gas: 1954033)
@@ -156,32 +157,32 @@ FeeQuoter_getValidatedTokenPrice:test_StaleFeeToken_Success() (gas: 61764)
 FeeQuoter_getValidatedTokenPrice:test_TokenNotSupportedFeed_Revert() (gas: 116495)
 FeeQuoter_getValidatedTokenPrice:test_TokenNotSupported_Revert() (gas: 14103)
 FeeQuoter_getValidatedTokenPrice:test_UnderflowFeedPrice_Revert() (gas: 1972078)
-FeeQuoter_onReport:test_OnReport_StaleUpdate_Revert() (gas: 43631)
-FeeQuoter_onReport:test_onReport_InvalidForwarder_Reverts() (gas: 23492)
-FeeQuoter_onReport:test_onReport_Success() (gas: 80094)
-FeeQuoter_onReport:test_onReport_UnsupportedToken_Reverts() (gas: 26860)
-FeeQuoter_parseEVMExtraArgsFromBytes:test_EVMExtraArgsDefault_Success() (gas: 17307)
-FeeQuoter_parseEVMExtraArgsFromBytes:test_EVMExtraArgsEnforceOutOfOrder_Revert() (gas: 21428)
-FeeQuoter_parseEVMExtraArgsFromBytes:test_EVMExtraArgsGasLimitTooHigh_Revert() (gas: 18516)
-FeeQuoter_parseEVMExtraArgsFromBytes:test_EVMExtraArgsInvalidExtraArgsTag_Revert() (gas: 18034)
-FeeQuoter_parseEVMExtraArgsFromBytes:test_EVMExtraArgsV1_Success() (gas: 18390)
-FeeQuoter_parseEVMExtraArgsFromBytes:test_EVMExtraArgsV2_Success() (gas: 18512)
-FeeQuoter_processMessageArgs:test_processMessageArgs_InvalidEVMAddressDestToken_Revert() (gas: 44703)
+FeeQuoter_onReport:test_OnReport_StaleUpdate_Revert() (gas: 43675)
+FeeQuoter_onReport:test_onReport_InvalidForwarder_Reverts() (gas: 23514)
+FeeQuoter_onReport:test_onReport_Success() (gas: 80116)
+FeeQuoter_onReport:test_onReport_UnsupportedToken_Reverts() (gas: 26882)
+FeeQuoter_parseEVMExtraArgsFromBytes:test_EVMExtraArgsDefault_Success() (gas: 17427)
+FeeQuoter_parseEVMExtraArgsFromBytes:test_EVMExtraArgsEnforceOutOfOrder_Revert() (gas: 21545)
+FeeQuoter_parseEVMExtraArgsFromBytes:test_EVMExtraArgsGasLimitTooHigh_Revert() (gas: 18636)
+FeeQuoter_parseEVMExtraArgsFromBytes:test_EVMExtraArgsInvalidExtraArgsTag_Revert() (gas: 18154)
+FeeQuoter_parseEVMExtraArgsFromBytes:test_EVMExtraArgsV1_Success() (gas: 18513)
+FeeQuoter_parseEVMExtraArgsFromBytes:test_EVMExtraArgsV2_Success() (gas: 18636)
+FeeQuoter_processMessageArgs:test_processMessageArgs_InvalidEVMAddressDestToken_Revert() (gas: 44725)
 FeeQuoter_processMessageArgs:test_processMessageArgs_InvalidExtraArgs_Revert() (gas: 19936)
 FeeQuoter_processMessageArgs:test_processMessageArgs_MalformedEVMExtraArgs_Revert() (gas: 20333)
 FeeQuoter_processMessageArgs:test_processMessageArgs_MessageFeeTooHigh_Revert() (gas: 17904)
-FeeQuoter_processMessageArgs:test_processMessageArgs_SourceTokenDataTooLarge_Revert() (gas: 122709)
-FeeQuoter_processMessageArgs:test_processMessageArgs_TokenAmountArraysMismatching_Revert() (gas: 42032)
-FeeQuoter_processMessageArgs:test_processMessageArgs_WitEVMExtraArgsV2_Success() (gas: 28518)
+FeeQuoter_processMessageArgs:test_processMessageArgs_SourceTokenDataTooLarge_Revert() (gas: 122753)
+FeeQuoter_processMessageArgs:test_processMessageArgs_TokenAmountArraysMismatching_Revert() (gas: 42054)
+FeeQuoter_processMessageArgs:test_processMessageArgs_WitEVMExtraArgsV2_Success() (gas: 28578)
 FeeQuoter_processMessageArgs:test_processMessageArgs_WithConvertedTokenAmount_Success() (gas: 29949)
-FeeQuoter_processMessageArgs:test_processMessageArgs_WithCorrectPoolReturnData_Success() (gas: 76145)
-FeeQuoter_processMessageArgs:test_processMessageArgs_WithEVMExtraArgsV1_Success() (gas: 28116)
-FeeQuoter_processMessageArgs:test_processMessageArgs_WithEmptyEVMExtraArgs_Success() (gas: 25987)
+FeeQuoter_processMessageArgs:test_processMessageArgs_WithCorrectPoolReturnData_Success() (gas: 76189)
+FeeQuoter_processMessageArgs:test_processMessageArgs_WithEVMExtraArgsV1_Success() (gas: 28176)
+FeeQuoter_processMessageArgs:test_processMessageArgs_WithEmptyEVMExtraArgs_Success() (gas: 26047)
 FeeQuoter_processMessageArgs:test_processMessageArgs_WithLinkTokenAmount_Success() (gas: 19523)
 FeeQuoter_updatePrices:test_OnlyCallableByUpdater_Revert() (gas: 12154)
 FeeQuoter_updatePrices:test_OnlyGasPrice_Success() (gas: 23796)
 FeeQuoter_updatePrices:test_OnlyTokenPrice_Success() (gas: 28528)
-FeeQuoter_updatePrices:test_UpdatableByAuthorizedCaller_Success() (gas: 74598)
+FeeQuoter_updatePrices:test_UpdatableByAuthorizedCaller_Success() (gas: 74596)
 FeeQuoter_updatePrices:test_UpdateMultiplePrices_Success() (gas: 145320)
 FeeQuoter_updateTokenPriceFeeds:test_FeedNotUpdated() (gas: 50898)
 FeeQuoter_updateTokenPriceFeeds:test_FeedUnset_Success() (gas: 63825)
@@ -337,10 +338,10 @@ NonceManager_OffRampUpgrade:test_UpgradedNonceStartsAtV1Nonce_Success() (gas: 25
 NonceManager_OffRampUpgrade:test_UpgradedOffRampNonceSkipsIfMsgInFlight_Success() (gas: 221424)
 NonceManager_OffRampUpgrade:test_UpgradedSenderNoncesReadsPreviousRamp_Success() (gas: 60382)
 NonceManager_OffRampUpgrade:test_Upgraded_Success() (gas: 153546)
-NonceManager_OnRampUpgrade:test_UpgradeNonceNewSenderStartsAtZero_Success() (gas: 165998)
-NonceManager_OnRampUpgrade:test_UpgradeNonceStartsAtV1Nonce_Success() (gas: 195535)
+NonceManager_OnRampUpgrade:test_UpgradeNonceNewSenderStartsAtZero_Success() (gas: 166058)
+NonceManager_OnRampUpgrade:test_UpgradeNonceStartsAtV1Nonce_Success() (gas: 195655)
 NonceManager_OnRampUpgrade:test_UpgradeSenderNoncesReadsPreviousRamp_Success() (gas: 139121)
-NonceManager_OnRampUpgrade:test_Upgrade_Success() (gas: 105121)
+NonceManager_OnRampUpgrade:test_Upgrade_Success() (gas: 105181)
 NonceManager_applyPreviousRampsUpdates:test_MultipleRampsUpdates() (gas: 123141)
 NonceManager_applyPreviousRampsUpdates:test_PreviousRampAlreadySetOffRamp_Revert() (gas: 43073)
 NonceManager_applyPreviousRampsUpdates:test_PreviousRampAlreadySetOnRampAndOffRamp_Revert() (gas: 64380)
@@ -372,8 +373,8 @@ OffRamp_commit:test_FailedRMNVerification_Reverts() (gas: 61590)
 OffRamp_commit:test_InvalidIntervalMinLargerThanMax_Revert() (gas: 68151)
 OffRamp_commit:test_InvalidInterval_Revert() (gas: 64291)
 OffRamp_commit:test_InvalidRootRevert() (gas: 63356)
-OffRamp_commit:test_NoConfigWithOtherConfigPresent_Revert() (gas: 6674771)
-OffRamp_commit:test_NoConfig_Revert() (gas: 6258377)
+OffRamp_commit:test_NoConfigWithOtherConfigPresent_Revert() (gas: 6674770)
+OffRamp_commit:test_NoConfig_Revert() (gas: 6258376)
 OffRamp_commit:test_OnlyGasPriceUpdates_Success() (gas: 113033)
 OffRamp_commit:test_OnlyPriceUpdateStaleReport_Revert() (gas: 121381)
 OffRamp_commit:test_OnlyTokenPriceUpdates_Success() (gas: 113032)
@@ -398,12 +399,12 @@ OffRamp_execute:test_IncorrectArrayType_Revert() (gas: 17639)
 OffRamp_execute:test_LargeBatch_Success() (gas: 3426335)
 OffRamp_execute:test_MultipleReportsWithPartialValidationFailures_Success() (gas: 372990)
 OffRamp_execute:test_MultipleReports_Success() (gas: 300979)
-OffRamp_execute:test_NoConfigWithOtherConfigPresent_Revert() (gas: 7083600)
-OffRamp_execute:test_NoConfig_Revert() (gas: 6308075)
+OffRamp_execute:test_NoConfigWithOtherConfigPresent_Revert() (gas: 7083599)
+OffRamp_execute:test_NoConfig_Revert() (gas: 6308074)
 OffRamp_execute:test_NonArray_Revert() (gas: 27562)
 OffRamp_execute:test_SingleReport_Success() (gas: 176354)
 OffRamp_execute:test_UnauthorizedTransmitter_Revert() (gas: 148372)
-OffRamp_execute:test_WrongConfigWithSigners_Revert() (gas: 7086349)
+OffRamp_execute:test_WrongConfigWithSigners_Revert() (gas: 7086348)
 OffRamp_execute:test_ZeroReports_Revert() (gas: 17361)
 OffRamp_executeSingleMessage:test_MessageSender_Revert() (gas: 18511)
 OffRamp_executeSingleMessage:test_NonContractWithTokens_Success() (gas: 244079)
@@ -482,7 +483,7 @@ OffRamp_trialExecute:test_RateLimitError_Success() (gas: 219355)
 OffRamp_trialExecute:test_TokenHandlingErrorIsCaught_Success() (gas: 227977)
 OffRamp_trialExecute:test_TokenPoolIsNotAContract_Success() (gas: 295396)
 OffRamp_trialExecute:test_trialExecute_Success() (gas: 277874)
-OnRampTokenPoolReentrancy:test_OnRampTokenPoolReentrancy_Success() (gas: 250720)
+OnRampTokenPoolReentrancy:test_OnRampTokenPoolReentrancy_Success() (gas: 250817)
 OnRamp_applyAllowListUpdates:test_applyAllowListUpdates_InvalidAllowListRequestDisabledAllowListWithAdds() (gas: 18018)
 OnRamp_applyAllowListUpdates:test_applyAllowListUpdates_Revert() (gas: 67797)
 OnRamp_applyAllowListUpdates:test_applyAllowListUpdates_Success() (gas: 325198)
@@ -494,12 +495,12 @@ OnRamp_constructor:test_Constructor_InvalidConfigNonceManagerEqAddressZero_Rever
 OnRamp_constructor:test_Constructor_InvalidConfigRMNProxyEqAddressZero_Revert() (gas: 98224)
 OnRamp_constructor:test_Constructor_InvalidConfigTokenAdminRegistryEqAddressZero_Revert() (gas: 93237)
 OnRamp_constructor:test_Constructor_Success() (gas: 2753310)
-OnRamp_forwardFromRouter:test_ForwardFromRouterExtraArgsV2AllowOutOfOrderTrue_Success() (gas: 115285)
-OnRamp_forwardFromRouter:test_ForwardFromRouterExtraArgsV2_Success() (gas: 146108)
-OnRamp_forwardFromRouter:test_ForwardFromRouterSuccessCustomExtraArgs() (gas: 145683)
-OnRamp_forwardFromRouter:test_ForwardFromRouterSuccessEmptyExtraArgs() (gas: 143910)
-OnRamp_forwardFromRouter:test_ForwardFromRouterSuccessLegacyExtraArgs() (gas: 145880)
-OnRamp_forwardFromRouter:test_ForwardFromRouter_Success() (gas: 145278)
+OnRamp_forwardFromRouter:test_ForwardFromRouterExtraArgsV2AllowOutOfOrderTrue_Success() (gas: 115345)
+OnRamp_forwardFromRouter:test_ForwardFromRouterExtraArgsV2_Success() (gas: 146168)
+OnRamp_forwardFromRouter:test_ForwardFromRouterSuccessCustomExtraArgs() (gas: 145743)
+OnRamp_forwardFromRouter:test_ForwardFromRouterSuccessEmptyExtraArgs() (gas: 143970)
+OnRamp_forwardFromRouter:test_ForwardFromRouterSuccessLegacyExtraArgs() (gas: 145940)
+OnRamp_forwardFromRouter:test_ForwardFromRouter_Success() (gas: 145338)
 OnRamp_forwardFromRouter:test_ForwardFromRouter_Success_ConfigurableSourceRouter() (gas: 140701)
 OnRamp_forwardFromRouter:test_InvalidExtraArgsTag_Revert() (gas: 38554)
 OnRamp_forwardFromRouter:test_MessageInterceptionError_Revert() (gas: 143029)
@@ -508,20 +509,20 @@ OnRamp_forwardFromRouter:test_MultiCannotSendZeroTokens_Revert() (gas: 36505)
 OnRamp_forwardFromRouter:test_OriginalSender_Revert() (gas: 18269)
 OnRamp_forwardFromRouter:test_Paused_Revert() (gas: 38454)
 OnRamp_forwardFromRouter:test_Permissions_Revert() (gas: 23663)
-OnRamp_forwardFromRouter:test_ShouldIncrementNonceOnlyOnOrdered_Success() (gas: 186330)
-OnRamp_forwardFromRouter:test_ShouldIncrementSeqNumAndNonce_Success() (gas: 212714)
-OnRamp_forwardFromRouter:test_ShouldStoreLinkFees() (gas: 146912)
-OnRamp_forwardFromRouter:test_ShouldStoreNonLinkFees() (gas: 161017)
-OnRamp_forwardFromRouter:test_SourceTokenDataTooLarge_Revert() (gas: 3615241)
+OnRamp_forwardFromRouter:test_ShouldIncrementNonceOnlyOnOrdered_Success() (gas: 186510)
+OnRamp_forwardFromRouter:test_ShouldIncrementSeqNumAndNonce_Success() (gas: 212894)
+OnRamp_forwardFromRouter:test_ShouldStoreLinkFees() (gas: 146972)
+OnRamp_forwardFromRouter:test_ShouldStoreNonLinkFees() (gas: 161077)
+OnRamp_forwardFromRouter:test_SourceTokenDataTooLarge_Revert() (gas: 3615263)
 OnRamp_forwardFromRouter:test_UnAllowedOriginalSender_Revert() (gas: 24010)
 OnRamp_forwardFromRouter:test_UnsupportedToken_Revert() (gas: 75844)
 OnRamp_forwardFromRouter:test_forwardFromRouter_UnsupportedToken_Revert() (gas: 38577)
-OnRamp_forwardFromRouter:test_forwardFromRouter_WithInterception_Success() (gas: 280170)
-OnRamp_getFee:test_EmptyMessage_Success() (gas: 98469)
-OnRamp_getFee:test_EnforceOutOfOrder_Revert() (gas: 64623)
-OnRamp_getFee:test_GetFeeOfZeroForTokenMessage_Success() (gas: 86111)
-OnRamp_getFee:test_NotAFeeTokenButPricedToken_Revert() (gas: 35053)
-OnRamp_getFee:test_SingleTokenMessage_Success() (gas: 113640)
+OnRamp_forwardFromRouter:test_forwardFromRouter_WithInterception_Success() (gas: 280252)
+OnRamp_getFee:test_EmptyMessage_Success() (gas: 98597)
+OnRamp_getFee:test_EnforceOutOfOrder_Revert() (gas: 65467)
+OnRamp_getFee:test_GetFeeOfZeroForTokenMessage_Success() (gas: 86990)
+OnRamp_getFee:test_NotAFeeTokenButPricedToken_Revert() (gas: 35092)
+OnRamp_getFee:test_SingleTokenMessage_Success() (gas: 113770)
 OnRamp_getFee:test_Unhealthy_Revert() (gas: 17039)
 OnRamp_getSupportedTokens:test_GetSupportedTokens_Revert() (gas: 10474)
 OnRamp_getTokenPool:test_GetTokenPool_Success() (gas: 35348)
@@ -532,11 +533,11 @@ OnRamp_setDynamicConfig:test_setDynamicConfig_InvalidConfigOnlyOwner_Revert() (g
 OnRamp_setDynamicConfig:test_setDynamicConfig_InvalidConfigReentrancyGuardEnteredEqTrue_Revert() (gas: 13243)
 OnRamp_setDynamicConfig:test_setDynamicConfig_Success() (gas: 56347)
 OnRamp_withdrawFeeTokens:test_WithdrawFeeTokens_Success() (gas: 97302)
-PingPong_ccipReceive:test_CcipReceive_Success() (gas: 172562)
+PingPong_ccipReceive:test_CcipReceive_Success() (gas: 172594)
 PingPong_plumbing:test_OutOfOrderExecution_Success() (gas: 20240)
 PingPong_plumbing:test_Pausing_Success() (gas: 17718)
-PingPong_startPingPong:test_StartPingPong_With_OOO_Success() (gas: 153698)
-PingPong_startPingPong:test_StartPingPong_With_Sequenced_Ordered_Success() (gas: 179335)
+PingPong_startPingPong:test_StartPingPong_With_OOO_Success() (gas: 153730)
+PingPong_startPingPong:test_StartPingPong_With_Sequenced_Ordered_Success() (gas: 179367)
 RMNHome__validateStaticAndDynamicConfig:test_validateStaticAndDynamicConfig_DuplicateOffchainPublicKey_reverts() (gas: 18822)
 RMNHome__validateStaticAndDynamicConfig:test_validateStaticAndDynamicConfig_DuplicatePeerId_reverts() (gas: 18660)
 RMNHome__validateStaticAndDynamicConfig:test_validateStaticAndDynamicConfig_DuplicateSourceChain_reverts() (gas: 20371)
@@ -604,23 +605,23 @@ Router_applyRampUpdates:test_OffRampMismatch_Revert() (gas: 89366)
 Router_applyRampUpdates:test_OffRampUpdatesWithRouting() (gas: 10663332)
 Router_applyRampUpdates:test_OnRampDisable() (gas: 56007)
 Router_applyRampUpdates:test_OnlyOwner_Revert() (gas: 12334)
-Router_ccipSend:test_CCIPSendLinkFeeNoTokenSuccess_gas() (gas: 131213)
-Router_ccipSend:test_CCIPSendLinkFeeOneTokenSuccess_gas() (gas: 220934)
-Router_ccipSend:test_FeeTokenAmountTooLow_Revert() (gas: 71620)
+Router_ccipSend:test_CCIPSendLinkFeeNoTokenSuccess_gas() (gas: 131245)
+Router_ccipSend:test_CCIPSendLinkFeeOneTokenSuccess_gas() (gas: 220967)
+Router_ccipSend:test_FeeTokenAmountTooLow_Revert() (gas: 71652)
 Router_ccipSend:test_InvalidMsgValue() (gas: 32267)
-Router_ccipSend:test_NativeFeeTokenInsufficientValue() (gas: 69308)
-Router_ccipSend:test_NativeFeeTokenOverpay_Success() (gas: 192880)
-Router_ccipSend:test_NativeFeeTokenZeroValue() (gas: 61356)
-Router_ccipSend:test_NativeFeeToken_Success() (gas: 191506)
-Router_ccipSend:test_NonLinkFeeToken_Success() (gas: 226310)
+Router_ccipSend:test_NativeFeeTokenInsufficientValue() (gas: 69340)
+Router_ccipSend:test_NativeFeeTokenOverpay_Success() (gas: 192944)
+Router_ccipSend:test_NativeFeeTokenZeroValue() (gas: 61388)
+Router_ccipSend:test_NativeFeeToken_Success() (gas: 191570)
+Router_ccipSend:test_NonLinkFeeToken_Success() (gas: 226364)
 Router_ccipSend:test_UnsupportedDestinationChain_Revert() (gas: 24900)
 Router_ccipSend:test_WhenNotHealthy_Revert() (gas: 44902)
-Router_ccipSend:test_WrappedNativeFeeToken_Success() (gas: 193750)
-Router_ccipSend:test_ccipSend_nativeFeeNoTokenSuccess_gas() (gas: 140474)
-Router_ccipSend:test_ccipSend_nativeFeeOneTokenSuccess_gas() (gas: 230108)
+Router_ccipSend:test_WrappedNativeFeeToken_Success() (gas: 193814)
+Router_ccipSend:test_ccipSend_nativeFeeNoTokenSuccess_gas() (gas: 140506)
+Router_ccipSend:test_ccipSend_nativeFeeOneTokenSuccess_gas() (gas: 230141)
 Router_constructor:test_Constructor_Success() (gas: 13076)
 Router_getArmProxy:test_getArmProxy() (gas: 10573)
-Router_getFee:test_GetFeeSupportedChain_Success() (gas: 51661)
+Router_getFee:test_GetFeeSupportedChain_Success() (gas: 51693)
 Router_getFee:test_UnsupportedDestinationChain_Revert() (gas: 17150)
 Router_getSupportedTokens:test_GetSupportedTokens_Revert() (gas: 10474)
 Router_recoverTokens:test_RecoverTokensInvalidRecipient_Revert() (gas: 11334)
diff --git a/contracts/src/v0.8/ccip/FeeQuoter.sol b/contracts/src/v0.8/ccip/FeeQuoter.sol
index 8ae10d36a77..9e0aba355c1 100644
--- a/contracts/src/v0.8/ccip/FeeQuoter.sol
+++ b/contracts/src/v0.8/ccip/FeeQuoter.sol
@@ -29,7 +29,6 @@ contract FeeQuoter is AuthorizedCallers, IFeeQuoter, ITypeAndVersion, IReceiver,
 
   error TokenNotSupported(address token);
   error FeeTokenNotSupported(address token);
-  error ChainNotSupported(uint64 chain);
   error StaleGasPrice(uint64 destChainSelector, uint256 threshold, uint256 timePassed);
   error StaleKeystoneUpdate(address token, uint256 feedTimestamp, uint256 storedTimeStamp);
   error DataFeedValueOutOfUint224Range();
@@ -76,7 +75,8 @@ contract FeeQuoter is AuthorizedCallers, IFeeQuoter, ITypeAndVersion, IReceiver,
   struct StaticConfig {
     uint96 maxFeeJuelsPerMsg; // ─╮ Maximum fee that can be charged for a message
     address linkToken; // ────────╯ LINK token address
-    uint32 stalenessThreshold; // The amount of time a gas price can be stale before it is considered invalid.
+    // The amount of time a token price can be stale before it is considered invalid (gas price staleness is configured per dest chain)
+    uint32 tokenPriceStalenessThreshold;
   }
 
   /// @dev The struct representing the received CCIP feed report from keystone IReceiver.onReport()
@@ -103,6 +103,7 @@ contract FeeQuoter is AuthorizedCallers, IFeeQuoter, ITypeAndVersion, IReceiver,
     uint32 defaultTxGasLimit; //─────────────────╮ Default gas limit for a tx
     uint64 gasMultiplierWeiPerEth; //            │ Multiplier for gas costs, 1e18 based so 11e17 = 10% extra cost.
     uint32 networkFeeUSDCents; //                │ Flat network fee to charge for messages, multiples of 0.01 USD
+    uint32 gasPriceStalenessThreshold; //        │ The amount of time a gas price can be stale before it is considered invalid (0 means disabled)
     bool enforceOutOfOrder; //                   │ Whether to enforce the allowOutOfOrderExecution extraArg value to be true.
     bytes4 chainFamilySelector; // ──────────────╯ Selector that identifies the destination chain's family. Used to determine the correct validations to perform for the dest chain.
   }
@@ -202,8 +203,8 @@ contract FeeQuoter is AuthorizedCallers, IFeeQuoter, ITypeAndVersion, IReceiver,
 
   /// @dev Subset of tokens which prices tracked by this registry which are fee tokens.
   EnumerableSet.AddressSet private s_feeTokens;
-  /// @dev The amount of time a gas price can be stale before it is considered invalid.
-  uint32 private immutable i_stalenessThreshold;
+  /// @dev The amount of time a token price can be stale before it is considered invalid.
+  uint32 private immutable i_tokenPriceStalenessThreshold;
 
   constructor(
     StaticConfig memory staticConfig,
@@ -216,14 +217,14 @@ contract FeeQuoter is AuthorizedCallers, IFeeQuoter, ITypeAndVersion, IReceiver,
   ) AuthorizedCallers(priceUpdaters) {
     if (
       staticConfig.linkToken == address(0) || staticConfig.maxFeeJuelsPerMsg == 0
-        || staticConfig.stalenessThreshold == 0
+        || staticConfig.tokenPriceStalenessThreshold == 0
     ) {
       revert InvalidStaticConfig();
     }
 
     i_linkToken = staticConfig.linkToken;
     i_maxFeeJuelsPerMsg = staticConfig.maxFeeJuelsPerMsg;
-    i_stalenessThreshold = staticConfig.stalenessThreshold;
+    i_tokenPriceStalenessThreshold = staticConfig.tokenPriceStalenessThreshold;
 
     _applyFeeTokensUpdates(feeTokens, new address[](0));
     _updateTokenPriceFeeds(tokenPriceFeeds);
@@ -243,7 +244,7 @@ contract FeeQuoter is AuthorizedCallers, IFeeQuoter, ITypeAndVersion, IReceiver,
     Internal.TimestampedPackedUint224 memory tokenPrice = s_usdPerToken[token];
 
     // If the token price is not stale, return it
-    if (block.timestamp - tokenPrice.timestamp < i_stalenessThreshold) {
+    if (block.timestamp - tokenPrice.timestamp < i_tokenPriceStalenessThreshold) {
       return tokenPrice;
     }
 
@@ -313,14 +314,12 @@ contract FeeQuoter is AuthorizedCallers, IFeeQuoter, ITypeAndVersion, IReceiver,
   function getTokenAndGasPrices(
     address token,
     uint64 destChainSelector
-  ) public view returns (uint224 tokenPrice, uint224 gasPriceValue) {
-    Internal.TimestampedPackedUint224 memory gasPrice = s_usdPerUnitGasByDestChainSelector[destChainSelector];
-    // We do allow a gas price of 0, but no stale or unset gas prices
-    if (gasPrice.timestamp == 0) revert ChainNotSupported(destChainSelector);
-    uint256 timePassed = block.timestamp - gasPrice.timestamp;
-    if (timePassed > i_stalenessThreshold) revert StaleGasPrice(destChainSelector, i_stalenessThreshold, timePassed);
-
-    return (_getValidatedTokenPrice(token), gasPrice.value);
+  ) external view returns (uint224 tokenPrice, uint224 gasPriceValue) {
+    if (!s_destChainConfigs[destChainSelector].isEnabled) revert DestinationChainNotEnabled(destChainSelector);
+    return (
+      _getValidatedTokenPrice(token),
+      _getValidatedGasPrice(destChainSelector, s_destChainConfigs[destChainSelector].gasPriceStalenessThreshold)
+    );
   }
 
   /// @notice Convert a given token amount to target token amount.
@@ -384,6 +383,27 @@ contract FeeQuoter is AuthorizedCallers, IFeeQuoter, ITypeAndVersion, IReceiver,
     return Internal.TimestampedPackedUint224({value: rebasedValue, timestamp: uint32(block.timestamp)});
   }
 
+  /// @dev Gets the fee token price and the gas price, both denominated in dollars.
+  /// @param destChainSelector The destination chain to get the gas price for.
+  /// @param gasPriceStalenessThreshold The amount of time a gas price can be stale before it is considered invalid.
+  /// @return gasPriceValue The price of gas in 1e18 dollars per base unit.
+  function _getValidatedGasPrice(
+    uint64 destChainSelector,
+    uint32 gasPriceStalenessThreshold
+  ) private view returns (uint224 gasPriceValue) {
+    Internal.TimestampedPackedUint224 memory gasPrice = s_usdPerUnitGasByDestChainSelector[destChainSelector];
+    // If the staleness threshold is 0, we consider the gas price to be always valid
+    if (gasPriceStalenessThreshold != 0) {
+      // We do allow a gas price of 0, but no stale or unset gas prices
+      uint256 timePassed = block.timestamp - gasPrice.timestamp;
+      if (timePassed > gasPriceStalenessThreshold) {
+        revert StaleGasPrice(destChainSelector, gasPriceStalenessThreshold, timePassed);
+      }
+    }
+
+    return gasPrice.value;
+  }
+
   // ================================================================
   // │                         Fee tokens                           │
   // ================================================================
@@ -523,7 +543,8 @@ contract FeeQuoter is AuthorizedCallers, IFeeQuoter, ITypeAndVersion, IReceiver,
     _validateMessage(destChainConfig, message.data.length, numberOfTokens, message.receiver);
 
     // The below call asserts that feeToken is a supported token
-    (uint224 feeTokenPrice, uint224 packedGasPrice) = getTokenAndGasPrices(message.feeToken, destChainSelector);
+    uint224 feeTokenPrice = _getValidatedTokenPrice(message.feeToken);
+    uint224 packedGasPrice = _getValidatedGasPrice(destChainSelector, destChainConfig.gasPriceStalenessThreshold);
 
     // Calculate premiumFee in USD with 18 decimals precision first.
     // If message-only and no token transfers, a flat network fee is charged.
@@ -1014,7 +1035,7 @@ contract FeeQuoter is AuthorizedCallers, IFeeQuoter, ITypeAndVersion, IReceiver,
     return StaticConfig({
       maxFeeJuelsPerMsg: i_maxFeeJuelsPerMsg,
       linkToken: i_linkToken,
-      stalenessThreshold: i_stalenessThreshold
+      tokenPriceStalenessThreshold: i_tokenPriceStalenessThreshold
     });
   }
 }
diff --git a/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.t.sol b/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.t.sol
index 3356b257cb2..07cfe05e891 100644
--- a/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.t.sol
+++ b/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.t.sol
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity 0.8.24;
 
-import {IFeeQuoter} from "../../interfaces/IFeeQuoter.sol";
-
 import {KeystoneFeedsPermissionHandler} from "../../../keystone/KeystoneFeedsPermissionHandler.sol";
 import {AuthorizedCallers} from "../../../shared/access/AuthorizedCallers.sol";
 import {MockV3Aggregator} from "../../../tests/MockV3Aggregator.sol";
@@ -35,7 +33,7 @@ contract FeeQuoter_constructor is FeeQuoterSetup {
     FeeQuoter.StaticConfig memory staticConfig = FeeQuoter.StaticConfig({
       linkToken: s_sourceTokens[0],
       maxFeeJuelsPerMsg: MAX_MSG_FEES_JUELS,
-      stalenessThreshold: uint32(TWELVE_HOURS)
+      tokenPriceStalenessThreshold: uint32(TWELVE_HOURS)
     });
     s_feeQuoter = new FeeQuoterHelper(
       staticConfig,
@@ -93,7 +91,7 @@ contract FeeQuoter_constructor is FeeQuoterSetup {
     FeeQuoter.StaticConfig memory staticConfig = FeeQuoter.StaticConfig({
       linkToken: s_sourceTokens[0],
       maxFeeJuelsPerMsg: MAX_MSG_FEES_JUELS,
-      stalenessThreshold: 0
+      tokenPriceStalenessThreshold: 0
     });
 
     vm.expectRevert(FeeQuoter.InvalidStaticConfig.selector);
@@ -113,7 +111,7 @@ contract FeeQuoter_constructor is FeeQuoterSetup {
     FeeQuoter.StaticConfig memory staticConfig = FeeQuoter.StaticConfig({
       linkToken: address(0),
       maxFeeJuelsPerMsg: MAX_MSG_FEES_JUELS,
-      stalenessThreshold: uint32(TWELVE_HOURS)
+      tokenPriceStalenessThreshold: uint32(TWELVE_HOURS)
     });
 
     vm.expectRevert(FeeQuoter.InvalidStaticConfig.selector);
@@ -133,7 +131,7 @@ contract FeeQuoter_constructor is FeeQuoterSetup {
     FeeQuoter.StaticConfig memory staticConfig = FeeQuoter.StaticConfig({
       linkToken: s_sourceTokens[0],
       maxFeeJuelsPerMsg: 0,
-      stalenessThreshold: uint32(TWELVE_HOURS)
+      tokenPriceStalenessThreshold: uint32(TWELVE_HOURS)
     });
 
     vm.expectRevert(FeeQuoter.InvalidStaticConfig.selector);
@@ -173,7 +171,7 @@ contract FeeQuoter_getTokenPrice is FeeQuoterSetup {
     uint256 originalTimestampValue = block.timestamp;
 
     // Above staleness threshold
-    vm.warp(originalTimestampValue + s_feeQuoter.getStaticConfig().stalenessThreshold + 1);
+    vm.warp(originalTimestampValue + s_feeQuoter.getStaticConfig().tokenPriceStalenessThreshold + 1);
 
     address sourceToken = _initialiseSingleTokenPriceFeed();
     Internal.TimestampedPackedUint224 memory tokenPriceAnswer = s_feeQuoter.getTokenPrice(sourceToken);
@@ -596,8 +594,35 @@ contract FeeQuoter_getTokenAndGasPrices is FeeQuoterSetup {
     assertEq(gasPrice, priceUpdates.gasPriceUpdates[0].usdPerUnitGas);
   }
 
+  function test_StalenessCheckDisabled_Success() public {
+    uint64 neverStaleChainSelector = 345678;
+    FeeQuoter.DestChainConfigArgs[] memory destChainConfigArgs = _generateFeeQuoterDestChainConfigArgs();
+    destChainConfigArgs[0].destChainSelector = neverStaleChainSelector;
+    destChainConfigArgs[0].destChainConfig.gasPriceStalenessThreshold = 0; // disables the staleness check
+
+    s_feeQuoter.applyDestChainConfigUpdates(destChainConfigArgs);
+
+    Internal.GasPriceUpdate[] memory gasPriceUpdates = new Internal.GasPriceUpdate[](1);
+    gasPriceUpdates[0] = Internal.GasPriceUpdate({destChainSelector: neverStaleChainSelector, usdPerUnitGas: 999});
+
+    Internal.PriceUpdates memory priceUpdates =
+      Internal.PriceUpdates({tokenPriceUpdates: new Internal.TokenPriceUpdate[](0), gasPriceUpdates: gasPriceUpdates});
+    s_feeQuoter.updatePrices(priceUpdates);
+
+    // this should have no affect! But we do it anyway to make sure the staleness check is disabled
+    vm.warp(block.timestamp + 52_000_000 weeks); // 1M-ish years
+
+    (, uint224 gasPrice) = s_feeQuoter.getTokenAndGasPrices(s_sourceFeeToken, neverStaleChainSelector);
+
+    assertEq(gasPrice, 999);
+  }
+
   function test_ZeroGasPrice_Success() public {
     uint64 zeroGasDestChainSelector = 345678;
+    FeeQuoter.DestChainConfigArgs[] memory destChainConfigArgs = _generateFeeQuoterDestChainConfigArgs();
+    destChainConfigArgs[0].destChainSelector = zeroGasDestChainSelector;
+
+    s_feeQuoter.applyDestChainConfigUpdates(destChainConfigArgs);
     Internal.GasPriceUpdate[] memory gasPriceUpdates = new Internal.GasPriceUpdate[](1);
     gasPriceUpdates[0] = Internal.GasPriceUpdate({destChainSelector: zeroGasDestChainSelector, usdPerUnitGas: 0});
 
@@ -607,11 +632,11 @@ contract FeeQuoter_getTokenAndGasPrices is FeeQuoterSetup {
 
     (, uint224 gasPrice) = s_feeQuoter.getTokenAndGasPrices(s_sourceFeeToken, zeroGasDestChainSelector);
 
-    assertEq(gasPrice, priceUpdates.gasPriceUpdates[0].usdPerUnitGas);
+    assertEq(gasPrice, 0);
   }
 
   function test_UnsupportedChain_Revert() public {
-    vm.expectRevert(abi.encodeWithSelector(FeeQuoter.ChainNotSupported.selector, DEST_CHAIN_SELECTOR + 1));
+    vm.expectRevert(abi.encodeWithSelector(FeeQuoter.DestinationChainNotEnabled.selector, DEST_CHAIN_SELECTOR + 1));
     s_feeQuoter.getTokenAndGasPrices(s_sourceTokens[0], DEST_CHAIN_SELECTOR + 1);
   }
 
diff --git a/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoterSetup.t.sol b/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoterSetup.t.sol
index 056c749c712..f1a00be78c3 100644
--- a/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoterSetup.t.sol
+++ b/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoterSetup.t.sol
@@ -162,7 +162,7 @@ contract FeeQuoterSetup is TokenSetup {
       FeeQuoter.StaticConfig({
         linkToken: s_sourceTokens[0],
         maxFeeJuelsPerMsg: MAX_MSG_FEES_JUELS,
-        stalenessThreshold: uint32(TWELVE_HOURS)
+        tokenPriceStalenessThreshold: uint32(TWELVE_HOURS)
       }),
       priceUpdaters,
       feeTokens,
@@ -254,6 +254,7 @@ contract FeeQuoterSetup is TokenSetup {
         defaultTxGasLimit: GAS_LIMIT,
         gasMultiplierWeiPerEth: 5e17,
         networkFeeUSDCents: 1_00,
+        gasPriceStalenessThreshold: uint32(TWELVE_HOURS),
         enforceOutOfOrder: false,
         chainFamilySelector: Internal.CHAIN_FAMILY_SELECTOR_EVM
       })
diff --git a/core/capabilities/ccip/ocrimpls/contract_transmitter_test.go b/core/capabilities/ccip/ocrimpls/contract_transmitter_test.go
index 7cfb48901ef..64a504e8842 100644
--- a/core/capabilities/ccip/ocrimpls/contract_transmitter_test.go
+++ b/core/capabilities/ccip/ocrimpls/contract_transmitter_test.go
@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/utils/tests"
+
 	"github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/ocrimpls"
 	cctypes "github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/types"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/config/toml"
@@ -600,7 +601,7 @@ type TestDAOracleConfig struct {
 	evmconfig.DAOracle
 }
 
-func (d *TestDAOracleConfig) OracleType() toml.OracleType { return toml.OPStack }
+func (d *TestDAOracleConfig) OracleType() toml.DAOracleType { return toml.DAOracleOPStack }
 func (d *TestDAOracleConfig) OracleAddress() *types.EIP55Address {
 	a, err := types.NewEIP55Address("0x420000000000000000000000000000000000000F")
 	if err != nil {
diff --git a/core/capabilities/encoder_factory.go b/core/capabilities/encoder_factory.go
index 73e129bd855..6e6932fbb75 100644
--- a/core/capabilities/encoder_factory.go
+++ b/core/capabilities/encoder_factory.go
@@ -3,16 +3,21 @@ package capabilities
 import (
 	"fmt"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/capabilities/consensus/ocr3"
+	"github.com/smartcontractkit/chainlink-common/pkg/capabilities/consensus/ocr3/ocr3cap"
 	"github.com/smartcontractkit/chainlink-common/pkg/capabilities/consensus/ocr3/types"
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/values"
+
 	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm"
 )
 
 func NewEncoder(name string, config *values.Map, lggr logger.Logger) (types.Encoder, error) {
-	switch name {
-	case "EVM":
+	switch ocr3cap.Encoder(name) {
+	case ocr3cap.EncoderEVM:
 		return evm.NewEVMEncoder(config)
+	case ocr3cap.EncoderValueMap:
+		return ocr3.ValueMapEncoder{}, nil
 	// TODO: add a "no-op" encoder for users who only want to use dynamic ones?
 	// https://smartcontract-it.atlassian.net/browse/CAPPL-88
 	default:
diff --git a/core/capabilities/encoder_factory_test.go b/core/capabilities/encoder_factory_test.go
new file mode 100644
index 00000000000..a7f9a7bee8d
--- /dev/null
+++ b/core/capabilities/encoder_factory_test.go
@@ -0,0 +1,33 @@
+package capabilities
+
+import (
+	"testing"
+
+	"github.com/smartcontractkit/chainlink-common/pkg/capabilities/consensus/ocr3/ocr3cap"
+	"github.com/smartcontractkit/chainlink-common/pkg/values"
+
+	"github.com/smartcontractkit/chainlink/v2/core/logger"
+
+	"github.com/stretchr/testify/require"
+)
+
+func Test_NewEncoder(t *testing.T) {
+	t.Parallel()
+	t.Run("All ocr3 encoder types return a factory", func(t *testing.T) {
+		evmEncoding, err := values.NewMap(map[string]any{"abi": "bytes[] Full_reports"})
+		require.NoError(t, err)
+
+		config := map[ocr3cap.Encoder]*values.Map{ocr3cap.EncoderEVM: evmEncoding}
+
+		for _, tt := range ocr3cap.Encoders() {
+			encoder, err2 := NewEncoder(string(tt), config[tt], logger.NullLogger)
+			require.NoError(t, err2)
+			require.NotNil(t, encoder)
+		}
+	})
+
+	t.Run("Invalid encoder returns an error", func(t *testing.T) {
+		_, err2 := NewEncoder("NotReal", values.EmptyMap(), logger.NullLogger)
+		require.Error(t, err2)
+	})
+}
diff --git a/core/capabilities/integration_tests/framework/capabilities_registry.go b/core/capabilities/integration_tests/framework/capabilities_registry.go
new file mode 100644
index 00000000000..604c1d082d8
--- /dev/null
+++ b/core/capabilities/integration_tests/framework/capabilities_registry.go
@@ -0,0 +1,129 @@
+package framework
+
+import (
+	"context"
+
+	"github.com/ethereum/go-ethereum"
+	"github.com/ethereum/go-ethereum/accounts/abi/bind"
+	"github.com/ethereum/go-ethereum/common"
+	"google.golang.org/protobuf/proto"
+
+	"github.com/smartcontractkit/chainlink-common/pkg/capabilities/pb"
+	"github.com/smartcontractkit/chainlink-common/pkg/values"
+	kcr "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/keystone/generated/capabilities_registry"
+
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+type CapabilitiesRegistry struct {
+	t              *testing.T
+	backend        *EthBlockchain
+	contract       *kcr.CapabilitiesRegistry
+	addr           common.Address
+	nodeOperatorID uint32
+	nextDonID      int
+}
+
+func NewCapabilitiesRegistry(ctx context.Context, t *testing.T, backend *EthBlockchain) *CapabilitiesRegistry {
+	addr, _, contract, err := kcr.DeployCapabilitiesRegistry(backend.transactionOpts, backend)
+	require.NoError(t, err)
+	backend.Commit()
+
+	_, err = contract.AddNodeOperators(backend.transactionOpts, []kcr.CapabilitiesRegistryNodeOperator{
+		{
+			Admin: backend.transactionOpts.From,
+			Name:  "TEST_NODE_OPERATOR",
+		},
+	})
+	require.NoError(t, err)
+	blockHash := backend.Commit()
+
+	logs, err := backend.FilterLogs(ctx, ethereum.FilterQuery{
+		BlockHash: &blockHash,
+		FromBlock: nil,
+		ToBlock:   nil,
+		Addresses: nil,
+		Topics:    nil,
+	})
+
+	require.NoError(t, err)
+
+	recLog, err := contract.ParseNodeOperatorAdded(logs[0])
+	require.NoError(t, err)
+
+	nopID := recLog.NodeOperatorId
+
+	return &CapabilitiesRegistry{t: t, addr: addr, contract: contract, backend: backend, nodeOperatorID: nopID}
+}
+
+func (r *CapabilitiesRegistry) getAddress() common.Address {
+	return r.addr
+}
+
+type capability struct {
+	donCapabilityConfig *pb.CapabilityConfig
+	registryConfig      kcr.CapabilitiesRegistryCapability
+}
+
+// SetupDON sets up a new DON with the given capabilities and returns the DON ID
+func (r *CapabilitiesRegistry) setupDON(donInfo DonConfiguration, capabilities []capability) int {
+	var hashedCapabilityIDs [][32]byte
+
+	for _, c := range capabilities {
+		id, err := r.contract.GetHashedCapabilityId(&bind.CallOpts{}, c.registryConfig.LabelledName, c.registryConfig.Version)
+		require.NoError(r.t, err)
+		hashedCapabilityIDs = append(hashedCapabilityIDs, id)
+	}
+
+	var registryCapabilities []kcr.CapabilitiesRegistryCapability
+	for _, c := range capabilities {
+		registryCapabilities = append(registryCapabilities, c.registryConfig)
+	}
+
+	_, err := r.contract.AddCapabilities(r.backend.transactionOpts, registryCapabilities)
+	require.NoError(r.t, err)
+
+	r.backend.Commit()
+
+	nodes := []kcr.CapabilitiesRegistryNodeParams{}
+	for _, peerID := range donInfo.peerIDs {
+		n, innerErr := peerToNode(r.nodeOperatorID, peerID)
+		require.NoError(r.t, innerErr)
+
+		n.HashedCapabilityIds = hashedCapabilityIDs
+		nodes = append(nodes, n)
+	}
+
+	_, err = r.contract.AddNodes(r.backend.transactionOpts, nodes)
+	require.NoError(r.t, err)
+	r.backend.Commit()
+
+	ps, err := peers(donInfo.peerIDs)
+	require.NoError(r.t, err)
+
+	var capabilityConfigurations []kcr.CapabilitiesRegistryCapabilityConfiguration
+	for i, c := range capabilities {
+		configBinary, err2 := proto.Marshal(c.donCapabilityConfig)
+		require.NoError(r.t, err2)
+
+		capabilityConfigurations = append(capabilityConfigurations, kcr.CapabilitiesRegistryCapabilityConfiguration{
+			CapabilityId: hashedCapabilityIDs[i],
+			Config:       configBinary,
+		})
+	}
+
+	_, err = r.contract.AddDON(r.backend.transactionOpts, ps, capabilityConfigurations, true, donInfo.AcceptsWorkflows, donInfo.F)
+	require.NoError(r.t, err)
+	r.backend.Commit()
+
+	r.nextDonID++
+	return r.nextDonID
+}
+
+func newCapabilityConfig() *pb.CapabilityConfig {
+	return &pb.CapabilityConfig{
+		DefaultConfig: values.Proto(values.EmptyMap()).GetMapValue(),
+	}
+}
diff --git a/core/capabilities/integration_tests/framework/don.go b/core/capabilities/integration_tests/framework/don.go
new file mode 100644
index 00000000000..15a767a6d8e
--- /dev/null
+++ b/core/capabilities/integration_tests/framework/don.go
@@ -0,0 +1,386 @@
+package framework
+
+import (
+	"context"
+	"fmt"
+	"strconv"
+	"testing"
+	"time"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/stretchr/testify/require"
+	"google.golang.org/protobuf/types/known/durationpb"
+
+	"github.com/smartcontractkit/libocr/offchainreporting2plus/ocr3types"
+
+	"github.com/smartcontractkit/chainlink/v2/core/services/registrysyncer"
+
+	commoncap "github.com/smartcontractkit/chainlink-common/pkg/capabilities"
+	"github.com/smartcontractkit/chainlink-common/pkg/capabilities/consensus/ocr3"
+	"github.com/smartcontractkit/chainlink-common/pkg/capabilities/pb"
+	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
+	coretypes "github.com/smartcontractkit/chainlink-common/pkg/types/core"
+	"github.com/smartcontractkit/chainlink-common/pkg/values"
+	"github.com/smartcontractkit/chainlink/v2/core/capabilities"
+	remotetypes "github.com/smartcontractkit/chainlink/v2/core/capabilities/remote/types"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
+	kcr "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/keystone/generated/capabilities_registry"
+	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
+	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
+	"github.com/smartcontractkit/chainlink/v2/core/logger"
+	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
+	"github.com/smartcontractkit/chainlink/v2/core/services/job"
+	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ethkey"
+	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ocr2key"
+	p2ptypes "github.com/smartcontractkit/chainlink/v2/core/services/p2p/types"
+	"github.com/smartcontractkit/chainlink/v2/core/services/standardcapabilities"
+	"github.com/smartcontractkit/chainlink/v2/core/utils/testutils/heavyweight"
+)
+
+type DonContext struct {
+	EthBlockchain      *EthBlockchain
+	p2pNetwork         *MockRageP2PNetwork
+	capabilityRegistry *CapabilitiesRegistry
+}
+
+func CreateDonContext(ctx context.Context, t *testing.T) DonContext {
+	ethBlockchain := NewEthBlockchain(t, 1000, 1*time.Second)
+	rageP2PNetwork := NewMockRageP2PNetwork(t, 1000)
+	capabilitiesRegistry := NewCapabilitiesRegistry(ctx, t, ethBlockchain)
+
+	servicetest.Run(t, rageP2PNetwork)
+	servicetest.Run(t, ethBlockchain)
+	return DonContext{EthBlockchain: ethBlockchain, p2pNetwork: rageP2PNetwork, capabilityRegistry: capabilitiesRegistry}
+}
+
+type capabilityNode struct {
+	*cltest.TestApplication
+	registry  *capabilities.Registry
+	key       ethkey.KeyV2
+	KeyBundle ocr2key.KeyBundle
+	peerID    peer
+	start     func()
+}
+
+type DON struct {
+	t                      *testing.T
+	config                 DonConfiguration
+	lggr                   logger.Logger
+	nodes                  []*capabilityNode
+	standardCapabilityJobs []*job.Job
+	externalCapabilities   []capability
+	capabilitiesRegistry   *CapabilitiesRegistry
+
+	nodeConfigModifiers []func(c *chainlink.Config, node *capabilityNode)
+
+	addOCR3NonStandardCapability bool
+
+	triggerFactories []TriggerFactory
+	targetFactories  []TargetFactory
+}
+
+func NewDON(ctx context.Context, t *testing.T, lggr logger.Logger, donConfig DonConfiguration,
+	dependentDONs []commoncap.DON, donContext DonContext) *DON {
+	don := &DON{t: t, lggr: lggr.Named(donConfig.name), config: donConfig, capabilitiesRegistry: donContext.capabilityRegistry}
+
+	for i, member := range donConfig.Members {
+		dispatcher := donContext.p2pNetwork.NewDispatcherForNode(member)
+		capabilityRegistry := capabilities.NewRegistry(lggr)
+
+		nodeInfo := commoncap.Node{
+			PeerID:         &member,
+			WorkflowDON:    donConfig.DON,
+			CapabilityDONs: dependentDONs,
+		}
+
+		cn := &capabilityNode{
+			registry:  capabilityRegistry,
+			key:       donConfig.keys[i],
+			KeyBundle: donConfig.KeyBundles[i],
+			peerID:    donConfig.peerIDs[i],
+		}
+		don.nodes = append(don.nodes, cn)
+
+		cn.start = func() {
+			node := startNewNode(ctx, t, lggr.Named(donConfig.name+"-"+strconv.Itoa(i)), nodeInfo, donContext.EthBlockchain,
+				donContext.capabilityRegistry.getAddress(), dispatcher,
+				peerWrapper{peer: p2pPeer{member}}, capabilityRegistry,
+				donConfig.keys[i], func(c *chainlink.Config) {
+					for _, modifier := range don.nodeConfigModifiers {
+						modifier(c, cn)
+					}
+				})
+
+			require.NoError(t, node.Start(testutils.Context(t)))
+			cn.TestApplication = node
+		}
+	}
+
+	return don
+}
+
+// Initialise must be called after all capabilities have been added to the DONs and before Start is called
+func (d *DON) Initialise() {
+	if len(d.externalCapabilities) > 0 {
+		id := d.capabilitiesRegistry.setupDON(d.config, d.externalCapabilities)
+
+		//nolint:gosec // disable G115
+		d.config.DON.ID = uint32(id)
+	}
+}
+
+func (d *DON) GetID() uint32 {
+	if d.config.DON.ID == 0 {
+		panic("DON ID not set, call Initialise() first")
+	}
+
+	return d.config.ID
+}
+
+func (d *DON) GetConfigVersion() uint32 {
+	return d.config.ConfigVersion
+}
+
+func (d *DON) GetF() uint8 {
+	return d.config.F
+}
+
+func (d *DON) GetPeerIDs() []peer {
+	return d.config.peerIDs
+}
+
+func (d *DON) Start(ctx context.Context, t *testing.T) {
+	for _, triggerFactory := range d.triggerFactories {
+		for _, node := range d.nodes {
+			trigger := triggerFactory.CreateNewTrigger(t)
+			err := node.registry.Add(ctx, trigger)
+			require.NoError(t, err)
+		}
+	}
+
+	for _, targetFactory := range d.targetFactories {
+		for _, node := range d.nodes {
+			target := targetFactory.CreateNewTarget(t)
+			err := node.registry.Add(ctx, target)
+			require.NoError(t, err)
+		}
+	}
+
+	for _, node := range d.nodes {
+		node.start()
+	}
+
+	if d.addOCR3NonStandardCapability {
+		libocr := NewMockLibOCR(t, d.config.F, 1*time.Second)
+		servicetest.Run(t, libocr)
+
+		for _, node := range d.nodes {
+			addOCR3Capability(ctx, t, d.lggr, node.registry, libocr, d.config.F, node.KeyBundle)
+		}
+	}
+
+	for _, capabilityJob := range d.standardCapabilityJobs {
+		err := d.AddJob(ctx, capabilityJob)
+		require.NoError(t, err)
+	}
+}
+
+const StandardCapabilityTemplateJobSpec = `
+type = "standardcapabilities"
+schemaVersion = 1
+name = "%s"
+command="%s"
+config="%s"
+`
+
+func (d *DON) AddStandardCapability(name string, command string, config string) {
+	spec := fmt.Sprintf(StandardCapabilityTemplateJobSpec, name, command, config)
+	capabilitiesSpecJob, err := standardcapabilities.ValidatedStandardCapabilitiesSpec(spec)
+	require.NoError(d.t, err)
+
+	d.standardCapabilityJobs = append(d.standardCapabilityJobs, &capabilitiesSpecJob)
+}
+
+// TODO - add configuration for remote support - do this for each capability as an option
+func (d *DON) AddTargetCapability(targetFactory TargetFactory) {
+	d.targetFactories = append(d.targetFactories, targetFactory)
+}
+
+func (d *DON) AddExternalTriggerCapability(triggerFactory TriggerFactory) {
+	d.triggerFactories = append(d.triggerFactories, triggerFactory)
+
+	// Arguably this should be a parameter to AddExternalTriggerCapability, but for now we're just using the default
+	// See TODO about local/remote exposure
+	defaultTriggerCapabilityConfig := newCapabilityConfig()
+	defaultTriggerCapabilityConfig.RemoteConfig = &pb.CapabilityConfig_RemoteTriggerConfig{
+		RemoteTriggerConfig: &pb.RemoteTriggerConfig{
+			RegistrationRefresh: durationpb.New(1000 * time.Millisecond),
+			RegistrationExpiry:  durationpb.New(60000 * time.Millisecond),
+			// F + 1
+			MinResponsesToAggregate: uint32(d.config.F) + 1,
+		},
+	}
+
+	triggerCapability := capability{
+		donCapabilityConfig: defaultTriggerCapabilityConfig,
+		registryConfig: kcr.CapabilitiesRegistryCapability{
+			LabelledName:   triggerFactory.GetTriggerName(),
+			Version:        triggerFactory.GetTriggerVersion(),
+			CapabilityType: uint8(registrysyncer.ContractCapabilityTypeTrigger),
+		},
+	}
+
+	d.externalCapabilities = append(d.externalCapabilities, triggerCapability)
+}
+
+func (d *DON) AddJob(ctx context.Context, j *job.Job) error {
+	for _, node := range d.nodes {
+		err := node.AddJobV2(ctx, j)
+		if err != nil {
+			return fmt.Errorf("failed to add job: %w", err)
+		}
+	}
+
+	return nil
+}
+
+type TriggerFactory interface {
+	CreateNewTrigger(t *testing.T) commoncap.TriggerCapability
+	GetTriggerID() string
+	GetTriggerName() string
+	GetTriggerVersion() string
+}
+
+type TargetFactory interface {
+	CreateNewTarget(t *testing.T) commoncap.TargetCapability
+	GetTargetID() string
+	GetTargetName() string
+	GetTargetVersion() string
+}
+
+func startNewNode(ctx context.Context,
+	t *testing.T, lggr logger.Logger, nodeInfo commoncap.Node,
+	ethBlockchain *EthBlockchain, capRegistryAddr common.Address,
+	dispatcher remotetypes.Dispatcher,
+	peerWrapper p2ptypes.PeerWrapper,
+	localCapabilities *capabilities.Registry,
+	keyV2 ethkey.KeyV2,
+	setupCfg func(c *chainlink.Config),
+) *cltest.TestApplication {
+	config, _ := heavyweight.FullTestDBV2(t, func(c *chainlink.Config, s *chainlink.Secrets) {
+		c.Capabilities.ExternalRegistry.ChainID = ptr(fmt.Sprintf("%d", testutils.SimulatedChainID))
+		c.Capabilities.ExternalRegistry.Address = ptr(capRegistryAddr.String())
+		c.Capabilities.Peering.V2.Enabled = ptr(true)
+		c.Feature.FeedsManager = ptr(false)
+
+		if setupCfg != nil {
+			setupCfg(c)
+		}
+	})
+
+	n, err := ethBlockchain.NonceAt(ctx, ethBlockchain.transactionOpts.From, nil)
+	require.NoError(t, err)
+
+	tx := cltest.NewLegacyTransaction(
+		n, keyV2.Address,
+		assets.Ether(1).ToInt(),
+		21000,
+		assets.GWei(1).ToInt(),
+		nil)
+	signedTx, err := ethBlockchain.transactionOpts.Signer(ethBlockchain.transactionOpts.From, tx)
+	require.NoError(t, err)
+	err = ethBlockchain.SendTransaction(ctx, signedTx)
+	require.NoError(t, err)
+	ethBlockchain.Commit()
+
+	return cltest.NewApplicationWithConfigV2AndKeyOnSimulatedBlockchain(t, config, ethBlockchain.SimulatedBackend, nodeInfo,
+		dispatcher, peerWrapper, localCapabilities, keyV2, lggr)
+}
+
+// Functions below this point are for adding non-standard capabilities to a DON, deliberately verbose. Eventually these
+// should be replaced with standard capabilities.
+
+func (d *DON) AddOCR3NonStandardCapability() {
+	d.addOCR3NonStandardCapability = true
+
+	ocr := kcr.CapabilitiesRegistryCapability{
+		LabelledName:   "offchain_reporting",
+		Version:        "1.0.0",
+		CapabilityType: uint8(registrysyncer.ContractCapabilityTypeConsensus),
+	}
+
+	d.externalCapabilities = append(d.externalCapabilities, capability{
+		donCapabilityConfig: newCapabilityConfig(),
+		registryConfig:      ocr,
+	})
+}
+
+func (d *DON) AddEthereumWriteTargetNonStandardCapability(forwarderAddr common.Address) error {
+	d.nodeConfigModifiers = append(d.nodeConfigModifiers, func(c *chainlink.Config, node *capabilityNode) {
+		eip55Address := types.EIP55AddressFromAddress(forwarderAddr)
+		c.EVM[0].Chain.Workflow.ForwarderAddress = &eip55Address
+		c.EVM[0].Chain.Workflow.FromAddress = &node.key.EIP55Address
+	})
+
+	writeChain := kcr.CapabilitiesRegistryCapability{
+		LabelledName:   "write_geth-testnet",
+		Version:        "1.0.0",
+		CapabilityType: uint8(registrysyncer.ContractCapabilityTypeTarget),
+	}
+
+	targetCapabilityConfig := newCapabilityConfig()
+
+	configWithLimit, err := values.WrapMap(map[string]any{"gasLimit": 500000})
+	if err != nil {
+		return fmt.Errorf("failed to wrap map: %w", err)
+	}
+
+	targetCapabilityConfig.DefaultConfig = values.Proto(configWithLimit).GetMapValue()
+
+	targetCapabilityConfig.RemoteConfig = &pb.CapabilityConfig_RemoteTargetConfig{
+		RemoteTargetConfig: &pb.RemoteTargetConfig{
+			RequestHashExcludedAttributes: []string{"signed_report.Signatures"},
+		},
+	}
+
+	d.externalCapabilities = append(d.externalCapabilities, capability{
+		donCapabilityConfig: targetCapabilityConfig,
+		registryConfig:      writeChain,
+	})
+
+	return nil
+}
+
+func addOCR3Capability(ctx context.Context, t *testing.T, lggr logger.Logger, capabilityRegistry *capabilities.Registry,
+	libocr *MockLibOCR, donF uint8, ocr2KeyBundle ocr2key.KeyBundle) {
+	requestTimeout := 10 * time.Minute
+	cfg := ocr3.Config{
+		Logger:            lggr,
+		EncoderFactory:    capabilities.NewEncoder,
+		AggregatorFactory: capabilities.NewAggregator,
+		RequestTimeout:    &requestTimeout,
+	}
+
+	ocr3Capability := ocr3.NewOCR3(cfg)
+	servicetest.Run(t, ocr3Capability)
+
+	pluginCfg := coretypes.ReportingPluginServiceConfig{}
+	pluginFactory, err := ocr3Capability.NewReportingPluginFactory(ctx, pluginCfg, nil,
+		nil, nil, nil, capabilityRegistry, nil, nil)
+	require.NoError(t, err)
+
+	repConfig := ocr3types.ReportingPluginConfig{
+		F: int(donF),
+	}
+	plugin, _, err := pluginFactory.NewReportingPlugin(ctx, repConfig)
+	require.NoError(t, err)
+
+	transmitter := ocr3.NewContractTransmitter(lggr, capabilityRegistry, "")
+
+	libocr.AddNode(plugin, transmitter, ocr2KeyBundle)
+}
+
+func Context(tb testing.TB) context.Context {
+	return testutils.Context(tb)
+}
diff --git a/core/capabilities/integration_tests/framework/don_configuration.go b/core/capabilities/integration_tests/framework/don_configuration.go
new file mode 100644
index 00000000000..2fd1afd6554
--- /dev/null
+++ b/core/capabilities/integration_tests/framework/don_configuration.go
@@ -0,0 +1,67 @@
+package framework
+
+import (
+	"fmt"
+
+	commoncap "github.com/smartcontractkit/chainlink-common/pkg/capabilities"
+	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ethkey"
+	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ocr2key"
+	p2ptypes "github.com/smartcontractkit/chainlink/v2/core/services/p2p/types"
+)
+
+type DonConfiguration struct {
+	commoncap.DON
+	name       string
+	keys       []ethkey.KeyV2
+	KeyBundles []ocr2key.KeyBundle
+	peerIDs    []peer
+}
+
+// NewDonConfigurationParams exists purely to make it obvious in the test code what DON configuration is being used
+type NewDonConfigurationParams struct {
+	Name             string
+	NumNodes         int
+	F                uint8
+	AcceptsWorkflows bool
+}
+
+func NewDonConfiguration(don NewDonConfigurationParams) (DonConfiguration, error) {
+	if !(don.NumNodes >= int(3*don.F+1)) {
+		return DonConfiguration{}, fmt.Errorf("invalid configuration, number of nodes must be at least 3*F+1")
+	}
+
+	keyBundles, peerIDs, err := getKeyBundlesAndPeerIDs(don.NumNodes)
+	if err != nil {
+		return DonConfiguration{}, fmt.Errorf("failed to get key bundles and peer IDs: %w", err)
+	}
+
+	donPeers := make([]p2ptypes.PeerID, len(peerIDs))
+	var donKeys []ethkey.KeyV2
+	for i := 0; i < len(peerIDs); i++ {
+		peerID := p2ptypes.PeerID{}
+		err = peerID.UnmarshalText([]byte(peerIDs[i].PeerID))
+		if err != nil {
+			return DonConfiguration{}, fmt.Errorf("failed to unmarshal peer ID: %w", err)
+		}
+		donPeers[i] = peerID
+		newKey, err := ethkey.NewV2()
+		if err != nil {
+			return DonConfiguration{}, fmt.Errorf("failed to create key: %w", err)
+		}
+		donKeys = append(donKeys, newKey)
+	}
+
+	donConfiguration := DonConfiguration{
+		DON: commoncap.DON{
+			Members:          donPeers,
+			F:                don.F,
+			ConfigVersion:    1,
+			AcceptsWorkflows: don.AcceptsWorkflows,
+		},
+		name:       don.Name,
+		peerIDs:    peerIDs,
+		keys:       donKeys,
+		KeyBundles: keyBundles,
+	}
+	return donConfiguration, nil
+}
diff --git a/core/capabilities/integration_tests/framework/ethereum.go b/core/capabilities/integration_tests/framework/ethereum.go
new file mode 100644
index 00000000000..47558dacfcb
--- /dev/null
+++ b/core/capabilities/integration_tests/framework/ethereum.go
@@ -0,0 +1,79 @@
+package framework
+
+import (
+	"context"
+	"os"
+	"sync"
+	"testing"
+	"time"
+
+	"github.com/ethereum/go-ethereum/accounts/abi/bind"
+	"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
+	"github.com/ethereum/go-ethereum/core"
+	"github.com/ethereum/go-ethereum/eth/ethconfig"
+	gethlog "github.com/ethereum/go-ethereum/log"
+
+	"github.com/smartcontractkit/chainlink-common/pkg/services"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
+	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
+	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
+)
+
+type EthBlockchain struct {
+	services.StateMachine
+	*backends.SimulatedBackend
+	transactionOpts *bind.TransactOpts
+
+	blockTimeProcessingTime time.Duration
+
+	stopCh services.StopChan
+	wg     sync.WaitGroup
+}
+
+func NewEthBlockchain(t *testing.T, initialEth int, blockTimeProcessingTime time.Duration) *EthBlockchain {
+	transactOpts := testutils.MustNewSimTransactor(t) // config contract deployer and owner
+	genesisData := core.GenesisAlloc{transactOpts.From: {Balance: assets.Ether(initialEth).ToInt()}}
+	//nolint:gosec // disable G115
+	backend := cltest.NewSimulatedBackend(t, genesisData, uint32(ethconfig.Defaults.Miner.GasCeil))
+	gethlog.SetDefault(gethlog.NewLogger(gethlog.NewTerminalHandlerWithLevel(os.Stderr, gethlog.LevelWarn, true)))
+	backend.Commit()
+
+	return &EthBlockchain{SimulatedBackend: backend, stopCh: make(services.StopChan),
+		blockTimeProcessingTime: blockTimeProcessingTime, transactionOpts: transactOpts}
+}
+
+func (b *EthBlockchain) Start(ctx context.Context) error {
+	return b.StartOnce("EthBlockchain", func() error {
+		b.wg.Add(1)
+		go func() {
+			defer b.wg.Done()
+			ticker := time.NewTicker(b.blockTimeProcessingTime)
+			defer ticker.Stop()
+
+			for {
+				select {
+				case <-b.stopCh:
+					return
+				case <-ctx.Done():
+					return
+				case <-ticker.C:
+					b.SimulatedBackend.Commit()
+				}
+			}
+		}()
+
+		return nil
+	})
+}
+
+func (b *EthBlockchain) Close() error {
+	return b.StopOnce("EthBlockchain", func() error {
+		close(b.stopCh)
+		b.wg.Wait()
+		return nil
+	})
+}
+
+func (b *EthBlockchain) TransactionOpts() *bind.TransactOpts {
+	return b.transactionOpts
+}
diff --git a/core/capabilities/integration_tests/mock_dispatcher.go b/core/capabilities/integration_tests/framework/mock_dispatcher.go
similarity index 77%
rename from core/capabilities/integration_tests/mock_dispatcher.go
rename to core/capabilities/integration_tests/framework/mock_dispatcher.go
index 1230e59427d..f208933f1f1 100644
--- a/core/capabilities/integration_tests/mock_dispatcher.go
+++ b/core/capabilities/integration_tests/framework/mock_dispatcher.go
@@ -1,4 +1,4 @@
-package integration_tests
+package framework
 
 import (
 	"context"
@@ -16,9 +16,9 @@ import (
 	"google.golang.org/protobuf/proto"
 )
 
-// testAsyncMessageBroker backs the dispatchers created for each node in the test and effectively
+// MockRageP2PNetwork backs the dispatchers created for each node in the test and effectively
 // acts as the rageP2P network layer.
-type testAsyncMessageBroker struct {
+type MockRageP2PNetwork struct {
 	services.StateMachine
 	t *testing.T
 
@@ -31,8 +31,8 @@ type testAsyncMessageBroker struct {
 	mux sync.Mutex
 }
 
-func newTestAsyncMessageBroker(t *testing.T, chanBufferSize int) *testAsyncMessageBroker {
-	return &testAsyncMessageBroker{
+func NewMockRageP2PNetwork(t *testing.T, chanBufferSize int) *MockRageP2PNetwork {
+	return &MockRageP2PNetwork{
 		t:                  t,
 		stopCh:             make(services.StopChan),
 		chanBufferSize:     chanBufferSize,
@@ -40,14 +40,14 @@ func newTestAsyncMessageBroker(t *testing.T, chanBufferSize int) *testAsyncMessa
 	}
 }
 
-func (a *testAsyncMessageBroker) Start(ctx context.Context) error {
-	return a.StartOnce("testAsyncMessageBroker", func() error {
+func (a *MockRageP2PNetwork) Start(ctx context.Context) error {
+	return a.StartOnce("MockRageP2PNetwork", func() error {
 		return nil
 	})
 }
 
-func (a *testAsyncMessageBroker) Close() error {
-	return a.StopOnce("testAsyncMessageBroker", func() error {
+func (a *MockRageP2PNetwork) Close() error {
+	return a.StopOnce("MockRageP2PNetwork", func() error {
 		close(a.stopCh)
 		a.wg.Wait()
 		return nil
@@ -55,7 +55,7 @@ func (a *testAsyncMessageBroker) Close() error {
 }
 
 // NewDispatcherForNode creates a new dispatcher for a node with the given peer ID.
-func (a *testAsyncMessageBroker) NewDispatcherForNode(nodePeerID p2ptypes.PeerID) remotetypes.Dispatcher {
+func (a *MockRageP2PNetwork) NewDispatcherForNode(nodePeerID p2ptypes.PeerID) remotetypes.Dispatcher {
 	return &brokerDispatcher{
 		callerPeerID: nodePeerID,
 		broker:       a,
@@ -63,15 +63,15 @@ func (a *testAsyncMessageBroker) NewDispatcherForNode(nodePeerID p2ptypes.PeerID
 	}
 }
 
-func (a *testAsyncMessageBroker) HealthReport() map[string]error {
+func (a *MockRageP2PNetwork) HealthReport() map[string]error {
 	return nil
 }
 
-func (a *testAsyncMessageBroker) Name() string {
-	return "testAsyncMessageBroker"
+func (a *MockRageP2PNetwork) Name() string {
+	return "MockRageP2PNetwork"
 }
 
-func (a *testAsyncMessageBroker) registerReceiverNode(nodePeerID p2ptypes.PeerID, capabilityId string, capabilityDonID uint32, receiver remotetypes.Receiver) {
+func (a *MockRageP2PNetwork) registerReceiverNode(nodePeerID p2ptypes.PeerID, capabilityID string, capabilityDonID uint32, receiver remotetypes.Receiver) {
 	a.mux.Lock()
 	defer a.mux.Unlock()
 
@@ -83,14 +83,14 @@ func (a *testAsyncMessageBroker) registerReceiverNode(nodePeerID p2ptypes.PeerID
 
 	node.registerReceiverCh <- &registerReceiverRequest{
 		receiverKey: receiverKey{
-			capabilityId: capabilityId,
+			capabilityId: capabilityID,
 			donId:        capabilityDonID,
 		},
 		receiver: receiver,
 	}
 }
 
-func (a *testAsyncMessageBroker) Send(msg *remotetypes.MessageBody) {
+func (a *MockRageP2PNetwork) Send(msg *remotetypes.MessageBody) {
 	peerID := toPeerID(msg.Receiver)
 	node, ok := a.peerIDToBrokerNode[peerID]
 	if !ok {
@@ -115,7 +115,7 @@ type registerReceiverRequest struct {
 	receiver remotetypes.Receiver
 }
 
-func (a *testAsyncMessageBroker) newNode() *brokerNode {
+func (a *MockRageP2PNetwork) newNode() *brokerNode {
 	n := &brokerNode{
 		receiveCh:          make(chan *remotetypes.MessageBody, a.chanBufferSize),
 		registerReceiverCh: make(chan *registerReceiverRequest, a.chanBufferSize),
@@ -190,7 +190,7 @@ func (t *brokerDispatcher) SetReceiver(capabilityId string, donId uint32, receiv
 	}
 	t.receivers[k] = receiver
 
-	t.broker.(*testAsyncMessageBroker).registerReceiverNode(t.callerPeerID, capabilityId, donId, receiver)
+	t.broker.(*MockRageP2PNetwork).registerReceiverNode(t.callerPeerID, capabilityId, donId, receiver)
 	return nil
 }
 func (t *brokerDispatcher) RemoveReceiver(capabilityId string, donId uint32) {}
diff --git a/core/capabilities/integration_tests/mock_libocr.go b/core/capabilities/integration_tests/framework/mock_libocr.go
similarity index 87%
rename from core/capabilities/integration_tests/mock_libocr.go
rename to core/capabilities/integration_tests/framework/mock_libocr.go
index 7a046296283..7e22c3c39b7 100644
--- a/core/capabilities/integration_tests/mock_libocr.go
+++ b/core/capabilities/integration_tests/framework/mock_libocr.go
@@ -1,4 +1,4 @@
-package integration_tests
+package framework
 
 import (
 	"bytes"
@@ -26,9 +26,9 @@ type libocrNode struct {
 	key ocr2key.KeyBundle
 }
 
-// mockLibOCR is a mock libocr implementation for testing purposes that simulates libocr protocol rounds without having
+// MockLibOCR is a mock libocr implementation for testing purposes that simulates libocr protocol rounds without having
 // to setup the libocr network
-type mockLibOCR struct {
+type MockLibOCR struct {
 	services.StateMachine
 	t *testing.T
 
@@ -43,8 +43,8 @@ type mockLibOCR struct {
 	wg     sync.WaitGroup
 }
 
-func newMockLibOCR(t *testing.T, f uint8, protocolRoundInterval time.Duration) *mockLibOCR {
-	return &mockLibOCR{
+func NewMockLibOCR(t *testing.T, f uint8, protocolRoundInterval time.Duration) *MockLibOCR {
+	return &MockLibOCR{
 		t: t,
 		f: f, outcomeCtx: ocr3types.OutcomeContext{
 			SeqNr:           0,
@@ -57,8 +57,8 @@ func newMockLibOCR(t *testing.T, f uint8, protocolRoundInterval time.Duration) *
 	}
 }
 
-func (m *mockLibOCR) Start(ctx context.Context) error {
-	return m.StartOnce("mockLibOCR", func() error {
+func (m *MockLibOCR) Start(ctx context.Context) error {
+	return m.StartOnce("MockLibOCR", func() error {
 		m.wg.Add(1)
 		go func() {
 			defer m.wg.Done()
@@ -84,19 +84,23 @@ func (m *mockLibOCR) Start(ctx context.Context) error {
 	})
 }
 
-func (m *mockLibOCR) Close() error {
-	return m.StopOnce("mockLibOCR", func() error {
+func (m *MockLibOCR) Close() error {
+	return m.StopOnce("MockLibOCR", func() error {
 		close(m.stopCh)
 		m.wg.Wait()
 		return nil
 	})
 }
 
-func (m *mockLibOCR) AddNode(plugin ocr3types.ReportingPlugin[[]byte], transmitter *ocr3.ContractTransmitter, key ocr2key.KeyBundle) {
+func (m *MockLibOCR) AddNode(plugin ocr3types.ReportingPlugin[[]byte], transmitter *ocr3.ContractTransmitter, key ocr2key.KeyBundle) {
 	m.nodes = append(m.nodes, &libocrNode{plugin, transmitter, key})
 }
 
-func (m *mockLibOCR) simulateProtocolRound(ctx context.Context) error {
+func (m *MockLibOCR) simulateProtocolRound(ctx context.Context) error {
+	if len(m.nodes) == 0 {
+		return nil
+	}
+
 	// randomly select a leader
 	leader := m.nodes[rand.Intn(len(m.nodes))]
 
@@ -177,7 +181,7 @@ func (m *mockLibOCR) simulateProtocolRound(ctx context.Context) error {
 				continue
 			}
 
-			// For each node select a random set of f+1 signatures to mimic libocr behaviour
+			// For each node select a random set of F+1 signatures to mimic libocr behaviour
 			s := rand.NewSource(time.Now().UnixNano())
 			r := rand.New(s)
 			indices := r.Perm(len(signatures))
diff --git a/core/capabilities/integration_tests/framework/mock_target.go b/core/capabilities/integration_tests/framework/mock_target.go
new file mode 100644
index 00000000000..e9c03deaca2
--- /dev/null
+++ b/core/capabilities/integration_tests/framework/mock_target.go
@@ -0,0 +1,93 @@
+package framework
+
+import (
+	"context"
+	"testing"
+
+	"github.com/smartcontractkit/chainlink-common/pkg/capabilities"
+	"github.com/smartcontractkit/chainlink-common/pkg/services"
+)
+
+var (
+	_ capabilities.ActionCapability = &mockTarget{}
+)
+
+type TargetSink struct {
+	services.StateMachine
+	targetID   string
+	targetName string
+	version    string
+
+	targets []mockTarget
+	Sink    chan capabilities.CapabilityRequest
+}
+
+func NewTargetSink(targetName string, version string) *TargetSink {
+	return &TargetSink{
+		targetID:   targetName + "@" + version,
+		targetName: targetName,
+		version:    version,
+		Sink:       make(chan capabilities.CapabilityRequest, 1000),
+	}
+}
+
+func (ts *TargetSink) GetTargetVersion() string {
+	return ts.version
+}
+
+func (ts *TargetSink) GetTargetName() string {
+	return ts.targetName
+}
+
+func (ts *TargetSink) GetTargetID() string {
+	return ts.targetID
+}
+
+func (ts *TargetSink) Start(ctx context.Context) error {
+	return ts.StartOnce("TargetSinkService", func() error {
+		return nil
+	})
+}
+
+func (ts *TargetSink) Close() error {
+	return ts.StopOnce("TargetSinkService", func() error {
+		return nil
+	})
+}
+
+func (ts *TargetSink) CreateNewTarget(t *testing.T) capabilities.TargetCapability {
+	target := mockTarget{
+		t:        t,
+		targetID: ts.targetID,
+		ch:       ts.Sink,
+	}
+	ts.targets = append(ts.targets, target)
+	return &target
+}
+
+type mockTarget struct {
+	t        *testing.T
+	targetID string
+	ch       chan capabilities.CapabilityRequest
+}
+
+func (mt *mockTarget) Execute(ctx context.Context, rawRequest capabilities.CapabilityRequest) (capabilities.CapabilityResponse, error) {
+	mt.ch <- rawRequest
+	return capabilities.CapabilityResponse{}, nil
+}
+
+func (mt *mockTarget) Info(ctx context.Context) (capabilities.CapabilityInfo, error) {
+	return capabilities.MustNewCapabilityInfo(
+		mt.targetID,
+		capabilities.CapabilityTypeTarget,
+		"mock target for target ID "+mt.targetID,
+	), nil
+}
+
+func (mt *mockTarget) RegisterToWorkflow(ctx context.Context, request capabilities.RegisterToWorkflowRequest) error {
+	return nil
+}
+
+func (mt *mockTarget) UnregisterFromWorkflow(ctx context.Context, request capabilities.UnregisterFromWorkflowRequest) error {
+	return nil
+}
diff --git a/core/capabilities/integration_tests/framework/mock_trigger.go b/core/capabilities/integration_tests/framework/mock_trigger.go
new file mode 100644
index 00000000000..afc874af6c3
--- /dev/null
+++ b/core/capabilities/integration_tests/framework/mock_trigger.go
@@ -0,0 +1,155 @@
+package framework
+
+import (
+	"context"
+	"sync"
+	"testing"
+
+	"github.com/google/uuid"
+
+	"github.com/smartcontractkit/chainlink-common/pkg/capabilities"
+	"github.com/smartcontractkit/chainlink-common/pkg/services"
+	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
+	"github.com/smartcontractkit/chainlink-common/pkg/values"
+)
+
+// TriggerSink is a TriggerFactory implementation that sends output to all triggers created by it.
+type TriggerSink struct {
+	services.StateMachine
+	triggerID   string
+	triggerName string
+	version     string
+
+	triggers []mockTrigger
+
+	stopCh services.StopChan
+	wg     sync.WaitGroup
+}
+
+func NewTriggerSink(t *testing.T, triggerName string, version string) *TriggerSink {
+	triggersFactory := &TriggerSink{
+		triggerID:   triggerName + "@" + version,
+		triggerName: triggerName,
+		version:     version,
+		stopCh:      make(services.StopChan),
+	}
+	servicetest.Run(t, triggersFactory)
+	return triggersFactory
+}
+
+func (r *TriggerSink) GetTriggerVersion() string {
+	return r.version
+}
+
+func (r *TriggerSink) GetTriggerName() string {
+	return r.triggerName
+}
+
+func (r *TriggerSink) GetTriggerID() string {
+	return r.triggerID
+}
+
+func (r *TriggerSink) Start(ctx context.Context) error {
+	return r.StartOnce("TriggerSink", func() error {
+		return nil
+	})
+}
+
+func (r *TriggerSink) Close() error {
+	return r.StopOnce("TriggerSink", func() error {
+		close(r.stopCh)
+		r.wg.Wait()
+		return nil
+	})
+}
+
+func (r *TriggerSink) SendOutput(outputs *values.Map) {
+	triggerEvent := capabilities.TriggerEvent{
+		TriggerType: r.triggerID,
+		ID:          uuid.New().String(),
+		Outputs:     outputs,
+	}
+
+	resp := capabilities.TriggerResponse{
+		Event: triggerEvent,
+	}
+
+	for _, trigger := range r.triggers {
+		trigger.sendResponse(resp)
+	}
+}
+
+func (r *TriggerSink) CreateNewTrigger(t *testing.T) capabilities.TriggerCapability {
+	trigger := newMockTrigger(t, r.triggerID, &r.wg, r.stopCh)
+	r.triggers = append(r.triggers, trigger)
+	return &trigger
+}
+
+type mockTrigger struct {
+	t         *testing.T
+	triggerID string
+	cancel    context.CancelFunc
+	toSend    chan capabilities.TriggerResponse
+
+	wg     *sync.WaitGroup
+	stopCh services.StopChan
+}
+
+func newMockTrigger(t *testing.T, triggerID string, wg *sync.WaitGroup, stopCh services.StopChan) mockTrigger {
+	return mockTrigger{
+		t:         t,
+		triggerID: triggerID,
+		toSend:    make(chan capabilities.TriggerResponse, 1000),
+		wg:        wg,
+		stopCh:    stopCh,
+	}
+}
+
+func (s *mockTrigger) sendResponse(resp capabilities.TriggerResponse) {
+	s.toSend <- resp
+}
+
+func (s *mockTrigger) Info(ctx context.Context) (capabilities.CapabilityInfo, error) {
+	return capabilities.MustNewCapabilityInfo(
+		s.triggerID,
+		capabilities.CapabilityTypeTrigger,
+		"mock trigger for trigger id "+s.triggerID,
+	), nil
+}
+
+func (s *mockTrigger) RegisterTrigger(ctx context.Context, request capabilities.TriggerRegistrationRequest) (<-chan capabilities.TriggerResponse, error) {
+	if s.cancel != nil {
+		s.t.Fatal("trigger already registered")
+	}
+
+	responseCh := make(chan capabilities.TriggerResponse)
+
+	ctxWithCancel, cancel := context.WithCancel(context.Background())
+	s.cancel = cancel
+	s.wg.Add(1)
+	go func() {
+		defer s.wg.Done()
+		for {
+			select {
+			case <-s.stopCh:
+				return
+			case <-ctxWithCancel.Done():
+				return
+			case resp := <-s.toSend:
+				responseCh <- resp
+			}
+		}
+	}()
+
+	return responseCh, nil
+}
+
+func (s *mockTrigger) UnregisterTrigger(ctx context.Context, request capabilities.TriggerRegistrationRequest) error {
+	if s.cancel == nil {
+		s.t.Fatal("trigger not registered")
+	}
+
+	s.cancel()
+	s.cancel = nil
+	return nil
+}
diff --git a/core/capabilities/integration_tests/framework/peer.go b/core/capabilities/integration_tests/framework/peer.go
new file mode 100644
index 00000000000..1ea24fba3ca
--- /dev/null
+++ b/core/capabilities/integration_tests/framework/peer.go
@@ -0,0 +1,182 @@
+package framework
+
+import (
+	"context"
+	"crypto/rand"
+	"encoding/hex"
+	"fmt"
+	"strings"
+
+	"github.com/mr-tron/base58"
+
+	ragetypes "github.com/smartcontractkit/libocr/ragep2p/types"
+
+	kcr "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/keystone/generated/capabilities_registry"
+	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
+	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/chaintype"
+	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ocr2key"
+	p2ptypes "github.com/smartcontractkit/chainlink/v2/core/services/p2p/types"
+)
+
+type peer struct {
+	PeerID string
+	Signer string
+}
+
+func peerIDToBytes(peerID string) ([32]byte, error) {
+	var peerIDB ragetypes.PeerID
+	err := peerIDB.UnmarshalText([]byte(peerID))
+	if err != nil {
+		return [32]byte{}, err
+	}
+
+	return peerIDB, nil
+}
+
+func peers(ps []peer) ([][32]byte, error) {
+	out := [][32]byte{}
+	for _, p := range ps {
+		b, err := peerIDToBytes(p.PeerID)
+		if err != nil {
+			return nil, err
+		}
+
+		out = append(out, b)
+	}
+
+	return out, nil
+}
+
+func peerToNode(nopID uint32, p peer) (kcr.CapabilitiesRegistryNodeParams, error) {
+	peerIDB, err := peerIDToBytes(p.PeerID)
+	if err != nil {
+		return kcr.CapabilitiesRegistryNodeParams{}, fmt.Errorf("failed to convert peerID: %w", err)
+	}
+
+	sig := strings.TrimPrefix(p.Signer, "0x")
+	signerB, err := hex.DecodeString(sig)
+	if err != nil {
+		return kcr.CapabilitiesRegistryNodeParams{}, fmt.Errorf("failed to convert signer: %w", err)
+	}
+
+	var sigb [32]byte
+	copy(sigb[:], signerB)
+
+	return kcr.CapabilitiesRegistryNodeParams{
+		NodeOperatorId:      nopID,
+		P2pId:               peerIDB,
+		Signer:              sigb,
+		EncryptionPublicKey: testutils.Random32Byte(),
+	}, nil
+}
+
+func getKeyBundlesAndPeerIDs(numNodes int) ([]ocr2key.KeyBundle, []peer, error) {
+	var keyBundles []ocr2key.KeyBundle
+	var donPeerIDs []peer
+	for i := 0; i < numNodes; i++ {
+		peerID := NewPeerID()
+
+		keyBundle, err := ocr2key.New(chaintype.EVM)
+		if err != nil {
+			return nil, nil, fmt.Errorf("failed to create key bundle: %w", err)
+		}
+
+		keyBundles = append(keyBundles, keyBundle)
+
+		pk := keyBundle.PublicKey()
+
+		p := peer{
+			PeerID: peerID,
+			Signer: fmt.Sprintf("0x%x", pk),
+		}
+
+		donPeerIDs = append(donPeerIDs, p)
+	}
+	return keyBundles, donPeerIDs, nil
+}
+
+type peerWrapper struct {
+	peer p2pPeer
+}
+
+func (t peerWrapper) Start(ctx context.Context) error {
+	return nil
+}
+
+func (t peerWrapper) Close() error {
+	return nil
+}
+
+func (t peerWrapper) Ready() error {
+	return nil
+}
+
+func (t peerWrapper) HealthReport() map[string]error {
+	return nil
+}
+
+func (t peerWrapper) Name() string {
+	return "peerWrapper"
+}
+
+func (t peerWrapper) GetPeer() p2ptypes.Peer {
+	return t.peer
+}
+
+type p2pPeer struct {
+	id p2ptypes.PeerID
+}
+
+func (t p2pPeer) Start(ctx context.Context) error {
+	return nil
+}
+
+func (t p2pPeer) Close() error {
+	return nil
+}
+
+func (t p2pPeer) Ready() error {
+	return nil
+}
+
+func (t p2pPeer) HealthReport() map[string]error {
+	return nil
+}
+
+func (t p2pPeer) Name() string {
+	return "p2pPeer"
+}
+
+func (t p2pPeer) ID() p2ptypes.PeerID {
+	return t.id
+}
+
+func (t p2pPeer) UpdateConnections(peers map[p2ptypes.PeerID]p2ptypes.StreamConfig) error {
+	return nil
+}
+
+func (t p2pPeer) Send(peerID p2ptypes.PeerID, msg []byte) error {
+	return nil
+}
+
+func (t p2pPeer) Receive() <-chan p2ptypes.Message {
+	return nil
+}
+
+func NewPeerID() string {
+	var privKey [32]byte
+	_, err := rand.Read(privKey[:])
+	if err != nil {
+		panic(err)
+	}
+
+	peerID := append(libp2pMagic(), privKey[:]...)
+
+	return base58.Encode(peerID[:])
+}
+
+func libp2pMagic() []byte {
+	return []byte{0x00, 0x24, 0x08, 0x01, 0x12, 0x20}
+}
+
+func ptr[T any](t T) *T { return &t }
diff --git a/core/capabilities/integration_tests/keystone/contracts_setup.go b/core/capabilities/integration_tests/keystone/contracts_setup.go
new file mode 100644
index 00000000000..396c74c7458
--- /dev/null
+++ b/core/capabilities/integration_tests/keystone/contracts_setup.go
@@ -0,0 +1,49 @@
+package keystone
+
+import (
+	"testing"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/stretchr/testify/require"
+
+	"github.com/smartcontractkit/chainlink/v2/core/capabilities/integration_tests/framework"
+	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/keystone/generated/feeds_consumer"
+	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/keystone/generated/forwarder"
+)
+
+func SetupForwarderContract(t *testing.T, reportCreator *framework.DON,
+	backend *framework.EthBlockchain) (common.Address, *forwarder.KeystoneForwarder) {
+	addr, _, fwd, err := forwarder.DeployKeystoneForwarder(backend.TransactionOpts(), backend)
+	require.NoError(t, err)
+	backend.Commit()
+
+	var signers []common.Address
+	for _, p := range reportCreator.GetPeerIDs() {
+		signers = append(signers, common.HexToAddress(p.Signer))
+	}
+
+	_, err = fwd.SetConfig(backend.TransactionOpts(), reportCreator.GetID(), reportCreator.GetConfigVersion(), reportCreator.GetF(), signers)
+	require.NoError(t, err)
+	backend.Commit()
+
+	return addr, fwd
+}
+
+func SetupConsumerContract(t *testing.T, backend *framework.EthBlockchain,
+	forwarderAddress common.Address, workflowOwner string, workflowName string) (common.Address, *feeds_consumer.KeystoneFeedsConsumer) {
+	addr, _, consumer, err := feeds_consumer.DeployKeystoneFeedsConsumer(backend.TransactionOpts(), backend)
+	require.NoError(t, err)
+	backend.Commit()
+
+	var nameBytes [10]byte
+	copy(nameBytes[:], workflowName)
+
+	ownerAddr := common.HexToAddress(workflowOwner)
+
+	_, err = consumer.SetConfig(backend.TransactionOpts(), []common.Address{forwarderAddress}, []common.Address{ownerAddr}, [][10]byte{nameBytes})
+	require.NoError(t, err)
+
+	backend.Commit()
+
+	return addr, consumer
+}
diff --git a/core/capabilities/integration_tests/keystone/keystone_test.go b/core/capabilities/integration_tests/keystone/keystone_test.go
new file mode 100644
index 00000000000..033bb8a2c76
--- /dev/null
+++ b/core/capabilities/integration_tests/keystone/keystone_test.go
@@ -0,0 +1,127 @@
+package keystone
+
+import (
+	"context"
+	"crypto/rand"
+	"encoding/hex"
+	"math/big"
+	"testing"
+	"time"
+
+	"github.com/ethereum/go-ethereum/accounts/abi/bind"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"go.uber.org/zap/zapcore"
+
+	"github.com/smartcontractkit/chainlink-common/pkg/capabilities/datastreams"
+	"github.com/smartcontractkit/chainlink-common/pkg/values"
+	"github.com/smartcontractkit/chainlink/v2/core/capabilities/integration_tests/framework"
+	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/keystone/generated/feeds_consumer"
+	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
+	"github.com/smartcontractkit/chainlink/v2/core/logger"
+	reporttypes "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/v3/types"
+)
+
+func Test_AllAtOnceTransmissionSchedule(t *testing.T) {
+	testTransmissionSchedule(t, "2s", "allAtOnce")
+}
+
+func Test_OneAtATimeTransmissionSchedule(t *testing.T) {
+	testTransmissionSchedule(t, "2s", "oneAtATime")
+}
+
+func testTransmissionSchedule(t *testing.T, deltaStage string, schedule string) {
+	ctx := testutils.Context(t)
+	lggr := logger.TestLogger(t)
+	lggr.SetLogLevel(zapcore.InfoLevel)
+
+	workflowDonConfiguration, err := framework.NewDonConfiguration(framework.NewDonConfigurationParams{Name: "Workflow", NumNodes: 7, F: 2, AcceptsWorkflows: true})
+	require.NoError(t, err)
+	triggerDonConfiguration, err := framework.NewDonConfiguration(framework.NewDonConfigurationParams{Name: "Trigger", NumNodes: 7, F: 2})
+	require.NoError(t, err)
+	targetDonConfiguration, err := framework.NewDonConfiguration(framework.NewDonConfigurationParams{Name: "Target", NumNodes: 4, F: 1})
+	require.NoError(t, err)
+
+	triggerSink := framework.NewTriggerSink(t, "streams-trigger", "1.0.0")
+	workflowDon, consumer := setupKeystoneDons(ctx, t, lggr, workflowDonConfiguration, triggerDonConfiguration,
+		targetDonConfiguration, triggerSink)
+
+	feedCount := 3
+	var feedIDs []string
+	for i := 0; i < feedCount; i++ {
+		feedIDs = append(feedIDs, newFeedID(t))
+	}
+
+	job := createKeystoneWorkflowJob(t, workflowName, workflowOwnerID, feedIDs, consumer.Address(), deltaStage, schedule)
+	err = workflowDon.AddJob(ctx, &job)
+	require.NoError(t, err)
+
+	reports := []*datastreams.FeedReport{
+		createFeedReport(t, big.NewInt(1), 5, feedIDs[0], triggerDonConfiguration.KeyBundles),
+		createFeedReport(t, big.NewInt(3), 7, feedIDs[1], triggerDonConfiguration.KeyBundles),
+		createFeedReport(t, big.NewInt(2), 6, feedIDs[2], triggerDonConfiguration.KeyBundles),
+	}
+
+	wrappedReports, err := wrapReports(reports, 12, datastreams.Metadata{})
+	require.NoError(t, err)
+
+	triggerSink.SendOutput(wrappedReports)
+
+	waitForConsumerReports(ctx, t, consumer, reports)
+}
+
+func wrapReports(reportList []*datastreams.FeedReport,
+	timestamp int64, meta datastreams.Metadata) (*values.Map, error) {
+	var rl []datastreams.FeedReport
+	for _, r := range reportList {
+		rl = append(rl, *r)
+	}
+
+	return values.WrapMap(datastreams.StreamsTriggerEvent{
+		Payload:   rl,
+		Metadata:  meta,
+		Timestamp: timestamp,
+	})
+}
+
+func newFeedID(t *testing.T) string {
+	buf := [32]byte{}
+	_, err := rand.Read(buf[:])
+	require.NoError(t, err)
+	return "0x" + hex.EncodeToString(buf[:])
+}
+
+func waitForConsumerReports(ctx context.Context, t *testing.T, consumer *feeds_consumer.KeystoneFeedsConsumer, triggerFeedReports []*datastreams.FeedReport) {
+	feedsReceived := make(chan *feeds_consumer.KeystoneFeedsConsumerFeedReceived, 1000)
+	feedsSub, err := consumer.WatchFeedReceived(&bind.WatchOpts{}, feedsReceived, nil)
+	require.NoError(t, err)
+
+	feedToReport := map[string]*datastreams.FeedReport{}
+	for _, report := range triggerFeedReports {
+		feedToReport[report.FeedID] = report
+	}
+
+	ctxWithTimeout, cancel := context.WithTimeout(ctx, 1*time.Minute)
+	defer cancel()
+	feedCount := 0
+	for {
+		select {
+		case <-ctxWithTimeout.Done():
+			t.Fatalf("timed out waiting for feed reports, expected %d, received %d", len(triggerFeedReports), feedCount)
+		case err := <-feedsSub.Err():
+			require.NoError(t, err)
+		case feed := <-feedsReceived:
+			feedID := "0x" + hex.EncodeToString(feed.FeedId[:])
+			report := feedToReport[feedID]
+			decodedReport, err := reporttypes.Decode(report.FullReport)
+			require.NoError(t, err)
+			assert.Equal(t, decodedReport.BenchmarkPrice, feed.Price)
+			assert.Equal(t, decodedReport.ObservationsTimestamp, feed.Timestamp)
+
+			feedCount++
+			if feedCount == len(triggerFeedReports) {
+				return
+			}
+		}
+	}
+}
diff --git a/core/capabilities/integration_tests/keystone/setup.go b/core/capabilities/integration_tests/keystone/setup.go
new file mode 100644
index 00000000000..d337b16bf5b
--- /dev/null
+++ b/core/capabilities/integration_tests/keystone/setup.go
@@ -0,0 +1,138 @@
+package keystone
+
+import (
+	"context"
+	"encoding/hex"
+	"math/big"
+	"testing"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/stretchr/testify/require"
+
+	"github.com/smartcontractkit/libocr/offchainreporting2plus/chains/evmutil"
+
+	commoncap "github.com/smartcontractkit/chainlink-common/pkg/capabilities"
+	"github.com/smartcontractkit/chainlink-common/pkg/capabilities/datastreams"
+	v3 "github.com/smartcontractkit/chainlink-common/pkg/types/mercury/v3"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/tests"
+	"github.com/smartcontractkit/chainlink/v2/core/capabilities/integration_tests/framework"
+	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/keystone/generated/feeds_consumer"
+
+	ocrTypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types"
+
+	"github.com/smartcontractkit/chainlink/v2/core/logger"
+	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ocr2key"
+	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/v3/reportcodec"
+)
+
+var (
+	workflowName    = "abcdef0123"
+	workflowOwnerID = "0100000000000000000000000000000000000001"
+)
+
+func setupKeystoneDons(ctx context.Context, t *testing.T, lggr logger.SugaredLogger,
+	workflowDonInfo framework.DonConfiguration,
+	triggerDonInfo framework.DonConfiguration,
+	targetDonInfo framework.DonConfiguration,
+	trigger framework.TriggerFactory) (workflowDon *framework.DON, consumer *feeds_consumer.KeystoneFeedsConsumer) {
+	donContext := framework.CreateDonContext(ctx, t)
+
+	workflowDon = createKeystoneWorkflowDon(ctx, t, lggr, workflowDonInfo, triggerDonInfo, targetDonInfo, donContext)
+
+	forwarderAddr, _ := SetupForwarderContract(t, workflowDon, donContext.EthBlockchain)
+	_, consumer = SetupConsumerContract(t, donContext.EthBlockchain, forwarderAddr, workflowOwnerID, workflowName)
+
+	writeTargetDon := createKeystoneWriteTargetDon(ctx, t, lggr, targetDonInfo, donContext, forwarderAddr)
+
+	triggerDon := createKeystoneTriggerDon(ctx, t, lggr, triggerDonInfo, donContext, trigger)
+
+	workflowDon.Start(ctx, t)
+	triggerDon.Start(ctx, t)
+	writeTargetDon.Start(ctx, t)
+
+	return workflowDon, consumer
+}
+
+func createKeystoneTriggerDon(ctx context.Context, t *testing.T, lggr logger.SugaredLogger, triggerDonInfo framework.DonConfiguration,
+	donContext framework.DonContext, trigger framework.TriggerFactory) *framework.DON {
+	triggerDon := framework.NewDON(ctx, t, lggr, triggerDonInfo,
+		[]commoncap.DON{}, donContext)
+
+	triggerDon.AddExternalTriggerCapability(trigger)
+	triggerDon.Initialise()
+	return triggerDon
+}
+
+func createKeystoneWriteTargetDon(ctx context.Context, t *testing.T, lggr logger.SugaredLogger, targetDonInfo framework.DonConfiguration, donContext framework.DonContext, forwarderAddr common.Address) *framework.DON {
+	writeTargetDon := framework.NewDON(ctx, t, lggr, targetDonInfo,
+		[]commoncap.DON{}, donContext)
+	err := writeTargetDon.AddEthereumWriteTargetNonStandardCapability(forwarderAddr)
+	require.NoError(t, err)
+	writeTargetDon.Initialise()
+	return writeTargetDon
+}
+
+func createKeystoneWorkflowDon(ctx context.Context, t *testing.T, lggr logger.SugaredLogger, workflowDonInfo framework.DonConfiguration,
+	triggerDonInfo framework.DonConfiguration, targetDonInfo framework.DonConfiguration, donContext framework.DonContext) *framework.DON {
+	workflowDon := framework.NewDON(ctx, t, lggr, workflowDonInfo,
+		[]commoncap.DON{triggerDonInfo.DON, targetDonInfo.DON},
+		donContext)
+
+	workflowDon.AddOCR3NonStandardCapability()
+	workflowDon.Initialise()
+	return workflowDon
+}
+
+func createFeedReport(t *testing.T, price *big.Int, observationTimestamp int64,
+	feedIDString string,
+	keyBundles []ocr2key.KeyBundle) *datastreams.FeedReport {
+	reportCtx := ocrTypes.ReportContext{}
+	rawCtx := RawReportContext(reportCtx)
+
+	bytes, err := hex.DecodeString(feedIDString[2:])
+	require.NoError(t, err)
+	var feedIDBytes [32]byte
+	copy(feedIDBytes[:], bytes)
+
+	report := &datastreams.FeedReport{
+		FeedID:               feedIDString,
+		FullReport:           newReport(t, feedIDBytes, price, observationTimestamp),
+		BenchmarkPrice:       price.Bytes(),
+		ObservationTimestamp: observationTimestamp,
+		Signatures:           [][]byte{},
+		ReportContext:        rawCtx,
+	}
+
+	for _, key := range keyBundles {
+		sig, err := key.Sign(reportCtx, report.FullReport)
+		require.NoError(t, err)
+		report.Signatures = append(report.Signatures, sig)
+	}
+
+	return report
+}
+
+func RawReportContext(reportCtx ocrTypes.ReportContext) []byte {
+	rc := evmutil.RawReportContext(reportCtx)
+	flat := []byte{}
+	for _, r := range rc {
+		flat = append(flat, r[:]...)
+	}
+	return flat
+}
+
+func newReport(t *testing.T, feedID [32]byte, price *big.Int, timestamp int64) []byte {
+	ctx := tests.Context(t)
+	v3Codec := reportcodec.NewReportCodec(feedID, logger.TestLogger(t))
+	raw, err := v3Codec.BuildReport(ctx, v3.ReportFields{
+		BenchmarkPrice: price,
+		//nolint:gosec // disable G115
+		Timestamp: uint32(timestamp),
+		Bid:       big.NewInt(0),
+		Ask:       big.NewInt(0),
+		LinkFee:   big.NewInt(0),
+		NativeFee: big.NewInt(0),
+	})
+	require.NoError(t, err)
+	return raw
+}
diff --git a/core/capabilities/integration_tests/workflow.go b/core/capabilities/integration_tests/keystone/workflow.go
similarity index 79%
rename from core/capabilities/integration_tests/workflow.go
rename to core/capabilities/integration_tests/keystone/workflow.go
index d116a1ec639..1686fd2d6dd 100644
--- a/core/capabilities/integration_tests/workflow.go
+++ b/core/capabilities/integration_tests/keystone/workflow.go
@@ -1,14 +1,12 @@
-package integration_tests
+package keystone
 
 import (
 	"fmt"
 	"testing"
 
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/stretchr/testify/require"
 
-	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
-	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
+	"github.com/smartcontractkit/chainlink/v2/core/services/job"
 	"github.com/smartcontractkit/chainlink/v2/core/testdata/testspecs"
 )
 
@@ -49,13 +47,13 @@ targets:
       schedule: %s
 `
 
-func addWorkflowJob(t *testing.T, app *cltest.TestApplication,
+func createKeystoneWorkflowJob(t *testing.T,
 	workflowName string,
 	workflowOwner string,
 	feedIDs []string,
 	consumerAddr common.Address,
 	deltaStage string,
-	schedule string) {
+	schedule string) job.Job {
 	triggerFeedIDs := ""
 	for _, feedID := range feedIDs {
 		triggerFeedIDs += fmt.Sprintf("        - \"%s\"\n", feedID)
@@ -68,8 +66,5 @@ func addWorkflowJob(t *testing.T, app *cltest.TestApplication,
 
 	workflowJobSpec := testspecs.GenerateWorkflowJobSpec(t, fmt.Sprintf(hardcodedWorkflow, workflowName, workflowOwner, triggerFeedIDs, aggregationFeeds,
 		consumerAddr.String(), deltaStage, schedule))
-	job := workflowJobSpec.Job()
-
-	err := app.AddJobV2(testutils.Context(t), &job)
-	require.NoError(t, err)
+	return workflowJobSpec.Job()
 }
diff --git a/core/capabilities/integration_tests/keystone_contracts_setup.go b/core/capabilities/integration_tests/keystone_contracts_setup.go
deleted file mode 100644
index 14b7aa1086d..00000000000
--- a/core/capabilities/integration_tests/keystone_contracts_setup.go
+++ /dev/null
@@ -1,369 +0,0 @@
-package integration_tests
-
-import (
-	"context"
-	"encoding/hex"
-	"fmt"
-	"log"
-	"os"
-	"strings"
-	"sync"
-	"testing"
-	"time"
-
-	"github.com/ethereum/go-ethereum"
-	"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/eth/ethconfig"
-	gethlog "github.com/ethereum/go-ethereum/log"
-	"github.com/stretchr/testify/require"
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/types/known/durationpb"
-
-	ragetypes "github.com/smartcontractkit/libocr/ragep2p/types"
-
-	"github.com/smartcontractkit/chainlink-common/pkg/capabilities/pb"
-	"github.com/smartcontractkit/chainlink-common/pkg/values"
-
-	"github.com/smartcontractkit/chainlink-common/pkg/services"
-
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/keystone/generated/feeds_consumer"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/keystone/generated/forwarder"
-	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
-	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
-
-	"github.com/ethereum/go-ethereum/accounts/abi/bind"
-
-	kcr "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/keystone/generated/capabilities_registry"
-)
-
-const (
-	CapabilityTypeTrigger   = 0
-	CapabilityTypeAction    = 1
-	CapabilityTypeConsensus = 2
-	CapabilityTypeTarget    = 3
-)
-
-type peer struct {
-	PeerID string
-	Signer string
-}
-
-func peerIDToBytes(peerID string) ([32]byte, error) {
-	var peerIDB ragetypes.PeerID
-	err := peerIDB.UnmarshalText([]byte(peerID))
-	if err != nil {
-		return [32]byte{}, err
-	}
-
-	return peerIDB, nil
-}
-
-func peers(ps []peer) ([][32]byte, error) {
-	out := [][32]byte{}
-	for _, p := range ps {
-		b, err := peerIDToBytes(p.PeerID)
-		if err != nil {
-			return nil, err
-		}
-
-		out = append(out, b)
-	}
-
-	return out, nil
-}
-
-func peerToNode(nopID uint32, p peer) (kcr.CapabilitiesRegistryNodeParams, error) {
-	peerIDB, err := peerIDToBytes(p.PeerID)
-	if err != nil {
-		return kcr.CapabilitiesRegistryNodeParams{}, fmt.Errorf("failed to convert peerID: %w", err)
-	}
-
-	sig := strings.TrimPrefix(p.Signer, "0x")
-	signerB, err := hex.DecodeString(sig)
-	if err != nil {
-		return kcr.CapabilitiesRegistryNodeParams{}, fmt.Errorf("failed to convert signer: %w", err)
-	}
-
-	var sigb [32]byte
-	copy(sigb[:], signerB)
-
-	return kcr.CapabilitiesRegistryNodeParams{
-		NodeOperatorId:      nopID,
-		P2pId:               peerIDB,
-		Signer:              sigb,
-		EncryptionPublicKey: testutils.Random32Byte(),
-	}, nil
-}
-
-func setupCapabilitiesRegistryContract(ctx context.Context, t *testing.T, workflowDon donInfo, triggerDon donInfo,
-	targetDon donInfo,
-	transactOpts *bind.TransactOpts, backend *ethBackend) common.Address {
-	addr, _, reg, err := kcr.DeployCapabilitiesRegistry(transactOpts, backend)
-	require.NoError(t, err)
-
-	backend.Commit()
-
-	streamsTrigger := kcr.CapabilitiesRegistryCapability{
-		LabelledName:   "streams-trigger",
-		Version:        "1.0.0",
-		CapabilityType: CapabilityTypeTrigger,
-	}
-	sid, err := reg.GetHashedCapabilityId(&bind.CallOpts{}, streamsTrigger.LabelledName, streamsTrigger.Version)
-	require.NoError(t, err)
-
-	writeChain := kcr.CapabilitiesRegistryCapability{
-		LabelledName: "write_geth-testnet",
-		Version:      "1.0.0",
-
-		CapabilityType: CapabilityTypeTarget,
-	}
-	wid, err := reg.GetHashedCapabilityId(&bind.CallOpts{}, writeChain.LabelledName, writeChain.Version)
-	if err != nil {
-		log.Printf("failed to call GetHashedCapabilityId: %s", err)
-	}
-
-	ocr := kcr.CapabilitiesRegistryCapability{
-		LabelledName:   "offchain_reporting",
-		Version:        "1.0.0",
-		CapabilityType: CapabilityTypeConsensus,
-	}
-	ocrid, err := reg.GetHashedCapabilityId(&bind.CallOpts{}, ocr.LabelledName, ocr.Version)
-	require.NoError(t, err)
-
-	_, err = reg.AddCapabilities(transactOpts, []kcr.CapabilitiesRegistryCapability{
-		streamsTrigger,
-		writeChain,
-		ocr,
-	})
-	require.NoError(t, err)
-	backend.Commit()
-
-	_, err = reg.AddNodeOperators(transactOpts, []kcr.CapabilitiesRegistryNodeOperator{
-		{
-			Admin: transactOpts.From,
-			Name:  "TEST_NODE_OPERATOR",
-		},
-	})
-	require.NoError(t, err)
-	blockHash := backend.Commit()
-
-	logs, err := backend.FilterLogs(ctx, ethereum.FilterQuery{
-		BlockHash: &blockHash,
-		FromBlock: nil,
-		ToBlock:   nil,
-		Addresses: nil,
-		Topics:    nil,
-	})
-
-	require.NoError(t, err)
-
-	recLog, err := reg.ParseNodeOperatorAdded(logs[0])
-	require.NoError(t, err)
-
-	nopID := recLog.NodeOperatorId
-	nodes := []kcr.CapabilitiesRegistryNodeParams{}
-	for _, wfPeer := range workflowDon.peerIDs {
-		n, innerErr := peerToNode(nopID, wfPeer)
-		require.NoError(t, innerErr)
-
-		n.HashedCapabilityIds = [][32]byte{ocrid}
-		nodes = append(nodes, n)
-	}
-
-	for _, triggerPeer := range triggerDon.peerIDs {
-		n, innerErr := peerToNode(nopID, triggerPeer)
-		require.NoError(t, innerErr)
-
-		n.HashedCapabilityIds = [][32]byte{sid}
-		nodes = append(nodes, n)
-	}
-
-	for _, targetPeer := range targetDon.peerIDs {
-		n, innerErr := peerToNode(nopID, targetPeer)
-		require.NoError(t, innerErr)
-
-		n.HashedCapabilityIds = [][32]byte{wid}
-		nodes = append(nodes, n)
-	}
-
-	_, err = reg.AddNodes(transactOpts, nodes)
-	require.NoError(t, err)
-
-	// workflow DON
-	ps, err := peers(workflowDon.peerIDs)
-	require.NoError(t, err)
-
-	cc := newCapabilityConfig()
-	ccb, err := proto.Marshal(cc)
-	require.NoError(t, err)
-
-	cfgs := []kcr.CapabilitiesRegistryCapabilityConfiguration{
-		{
-			CapabilityId: ocrid,
-			Config:       ccb,
-		},
-	}
-
-	_, err = reg.AddDON(transactOpts, ps, cfgs, false, true, workflowDon.F)
-	require.NoError(t, err)
-
-	// trigger DON
-	ps, err = peers(triggerDon.peerIDs)
-	require.NoError(t, err)
-
-	triggerCapabilityConfig := newCapabilityConfig()
-	triggerCapabilityConfig.RemoteConfig = &pb.CapabilityConfig_RemoteTriggerConfig{
-		RemoteTriggerConfig: &pb.RemoteTriggerConfig{
-			RegistrationRefresh: durationpb.New(1000 * time.Millisecond),
-			RegistrationExpiry:  durationpb.New(60000 * time.Millisecond),
-			// F + 1
-			MinResponsesToAggregate: uint32(triggerDon.F) + 1,
-		},
-	}
-
-	configb, err := proto.Marshal(triggerCapabilityConfig)
-	require.NoError(t, err)
-
-	cfgs = []kcr.CapabilitiesRegistryCapabilityConfiguration{
-		{
-			CapabilityId: sid,
-			Config:       configb,
-		},
-	}
-
-	_, err = reg.AddDON(transactOpts, ps, cfgs, true, false, triggerDon.F)
-	require.NoError(t, err)
-
-	// target DON
-	ps, err = peers(targetDon.peerIDs)
-	require.NoError(t, err)
-
-	targetCapabilityConfig := newCapabilityConfig()
-
-	configWithLimit, err := values.WrapMap(map[string]any{"gasLimit": 500000})
-	require.NoError(t, err)
-
-	targetCapabilityConfig.DefaultConfig = values.Proto(configWithLimit).GetMapValue()
-
-	targetCapabilityConfig.RemoteConfig = &pb.CapabilityConfig_RemoteTargetConfig{
-		RemoteTargetConfig: &pb.RemoteTargetConfig{
-			RequestHashExcludedAttributes: []string{"signed_report.Signatures"},
-		},
-	}
-
-	remoteTargetConfigBytes, err := proto.Marshal(targetCapabilityConfig)
-	require.NoError(t, err)
-
-	cfgs = []kcr.CapabilitiesRegistryCapabilityConfiguration{
-		{
-			CapabilityId: wid,
-			Config:       remoteTargetConfigBytes,
-		},
-	}
-
-	_, err = reg.AddDON(transactOpts, ps, cfgs, true, false, targetDon.F)
-	require.NoError(t, err)
-
-	backend.Commit()
-
-	return addr
-}
-
-func newCapabilityConfig() *pb.CapabilityConfig {
-	return &pb.CapabilityConfig{
-		DefaultConfig: values.Proto(values.EmptyMap()).GetMapValue(),
-	}
-}
-
-func setupForwarderContract(t *testing.T, workflowDon donInfo,
-	transactOpts *bind.TransactOpts, backend *ethBackend) (common.Address, *forwarder.KeystoneForwarder) {
-	addr, _, fwd, err := forwarder.DeployKeystoneForwarder(transactOpts, backend)
-	require.NoError(t, err)
-	backend.Commit()
-
-	var signers []common.Address
-	for _, p := range workflowDon.peerIDs {
-		signers = append(signers, common.HexToAddress(p.Signer))
-	}
-
-	_, err = fwd.SetConfig(transactOpts, workflowDon.ID, workflowDon.ConfigVersion, workflowDon.F, signers)
-	require.NoError(t, err)
-	backend.Commit()
-
-	return addr, fwd
-}
-
-func setupConsumerContract(t *testing.T, transactOpts *bind.TransactOpts, backend *ethBackend,
-	forwarderAddress common.Address, workflowOwner string, workflowName string) (common.Address, *feeds_consumer.KeystoneFeedsConsumer) {
-	addr, _, consumer, err := feeds_consumer.DeployKeystoneFeedsConsumer(transactOpts, backend)
-	require.NoError(t, err)
-	backend.Commit()
-
-	var nameBytes [10]byte
-	copy(nameBytes[:], workflowName)
-
-	ownerAddr := common.HexToAddress(workflowOwner)
-
-	_, err = consumer.SetConfig(transactOpts, []common.Address{forwarderAddress}, []common.Address{ownerAddr}, [][10]byte{nameBytes})
-	require.NoError(t, err)
-
-	backend.Commit()
-
-	return addr, consumer
-}
-
-type ethBackend struct {
-	services.StateMachine
-	*backends.SimulatedBackend
-
-	blockTimeProcessingTime time.Duration
-
-	stopCh services.StopChan
-	wg     sync.WaitGroup
-}
-
-func setupBlockchain(t *testing.T, initialEth int, blockTimeProcessingTime time.Duration) (*ethBackend, *bind.TransactOpts) {
-	transactOpts := testutils.MustNewSimTransactor(t) // config contract deployer and owner
-	genesisData := core.GenesisAlloc{transactOpts.From: {Balance: assets.Ether(initialEth).ToInt()}}
-	backend := cltest.NewSimulatedBackend(t, genesisData, uint32(ethconfig.Defaults.Miner.GasCeil))
-	gethlog.SetDefault(gethlog.NewLogger(gethlog.NewTerminalHandlerWithLevel(os.Stderr, gethlog.LevelWarn, true)))
-	backend.Commit()
-
-	return &ethBackend{SimulatedBackend: backend, stopCh: make(services.StopChan),
-		blockTimeProcessingTime: blockTimeProcessingTime}, transactOpts
-}
-
-func (b *ethBackend) Start(ctx context.Context) error {
-	return b.StartOnce("ethBackend", func() error {
-		b.wg.Add(1)
-		go func() {
-			defer b.wg.Done()
-			ticker := time.NewTicker(b.blockTimeProcessingTime)
-			defer ticker.Stop()
-
-			for {
-				select {
-				case <-b.stopCh:
-					return
-				case <-ctx.Done():
-					return
-				case <-ticker.C:
-					b.SimulatedBackend.Commit()
-				}
-			}
-		}()
-
-		return nil
-	})
-}
-
-func (b *ethBackend) Close() error {
-	return b.StopOnce("ethBackend", func() error {
-		close(b.stopCh)
-		b.wg.Wait()
-		return nil
-	})
-}
diff --git a/core/capabilities/integration_tests/mock_trigger.go b/core/capabilities/integration_tests/mock_trigger.go
deleted file mode 100644
index 35b05b054cc..00000000000
--- a/core/capabilities/integration_tests/mock_trigger.go
+++ /dev/null
@@ -1,143 +0,0 @@
-package integration_tests
-
-import (
-	"context"
-	"sync"
-	"testing"
-
-	"github.com/smartcontractkit/chainlink-common/pkg/capabilities"
-	"github.com/smartcontractkit/chainlink-common/pkg/capabilities/datastreams"
-	"github.com/smartcontractkit/chainlink-common/pkg/services"
-	"github.com/smartcontractkit/chainlink-common/pkg/values"
-)
-
-const triggerID = "streams-trigger@1.0.0"
-
-type reportsSink struct {
-	services.StateMachine
-	triggers []streamsTrigger
-
-	stopCh services.StopChan
-	wg     sync.WaitGroup
-}
-
-func newReportsSink() *reportsSink {
-	return &reportsSink{
-		stopCh: make(services.StopChan),
-	}
-}
-
-func (r *reportsSink) Start(ctx context.Context) error {
-	return r.StartOnce("reportsSink", func() error {
-		return nil
-	})
-}
-
-func (r *reportsSink) Close() error {
-	return r.StopOnce("reportsSink", func() error {
-		close(r.stopCh)
-		r.wg.Wait()
-		return nil
-	})
-}
-
-func (r *reportsSink) sendReports(reportList []*datastreams.FeedReport) {
-	for _, trigger := range r.triggers {
-		resp, err := wrapReports(reportList, "1", 12, datastreams.Metadata{})
-		if err != nil {
-			panic(err)
-		}
-		trigger.sendResponse(resp)
-	}
-}
-
-func (r *reportsSink) getNewTrigger(t *testing.T) *streamsTrigger {
-	trigger := streamsTrigger{t: t, toSend: make(chan capabilities.TriggerResponse, 1000),
-		wg: &r.wg, stopCh: r.stopCh}
-	r.triggers = append(r.triggers, trigger)
-	return &trigger
-}
-
-type streamsTrigger struct {
-	t      *testing.T
-	cancel context.CancelFunc
-	toSend chan capabilities.TriggerResponse
-
-	wg     *sync.WaitGroup
-	stopCh services.StopChan
-}
-
-func (s *streamsTrigger) sendResponse(resp capabilities.TriggerResponse) {
-	s.toSend <- resp
-}
-
-func (s *streamsTrigger) Info(ctx context.Context) (capabilities.CapabilityInfo, error) {
-	return capabilities.MustNewCapabilityInfo(
-		triggerID,
-		capabilities.CapabilityTypeTrigger,
-		"issues a trigger when a report is received.",
-	), nil
-}
-
-func (s *streamsTrigger) RegisterTrigger(ctx context.Context, request capabilities.TriggerRegistrationRequest) (<-chan capabilities.TriggerResponse, error) {
-	if s.cancel != nil {
-		s.t.Fatal("trigger already registered")
-	}
-
-	responseCh := make(chan capabilities.TriggerResponse)
-
-	ctxWithCancel, cancel := context.WithCancel(context.Background())
-	s.cancel = cancel
-	s.wg.Add(1)
-	go func() {
-		defer s.wg.Done()
-		for {
-			select {
-			case <-s.stopCh:
-				return
-			case <-ctxWithCancel.Done():
-				return
-			case resp := <-s.toSend:
-				responseCh <- resp
-			}
-		}
-	}()
-
-	return responseCh, nil
-}
-
-func (s *streamsTrigger) UnregisterTrigger(ctx context.Context, request capabilities.TriggerRegistrationRequest) error {
-	if s.cancel == nil {
-		s.t.Fatal("trigger not registered")
-	}
-
-	s.cancel()
-	s.cancel = nil
-	return nil
-}
-
-func wrapReports(reportList []*datastreams.FeedReport, eventID string, timestamp int64, meta datastreams.Metadata) (capabilities.TriggerResponse, error) {
-	rl := []datastreams.FeedReport{}
-	for _, r := range reportList {
-		rl = append(rl, *r)
-	}
-	outputs, err := values.WrapMap(datastreams.StreamsTriggerEvent{
-		Payload:   rl,
-		Metadata:  meta,
-		Timestamp: timestamp,
-	})
-	if err != nil {
-		return capabilities.TriggerResponse{}, err
-	}
-
-	triggerEvent := capabilities.TriggerEvent{
-		TriggerType: triggerID,
-		ID:          eventID,
-		Outputs:     outputs,
-	}
-
-	// Create a new TriggerResponse with the MercuryTriggerEvent
-	return capabilities.TriggerResponse{
-		Event: triggerEvent,
-	}, nil
-}
diff --git a/core/capabilities/integration_tests/setup.go b/core/capabilities/integration_tests/setup.go
deleted file mode 100644
index e499c0fe3fa..00000000000
--- a/core/capabilities/integration_tests/setup.go
+++ /dev/null
@@ -1,440 +0,0 @@
-package integration_tests
-
-import (
-	"context"
-	"crypto/rand"
-	"encoding/hex"
-	"fmt"
-	"math/big"
-	"strconv"
-	"testing"
-	"time"
-
-	"github.com/ethereum/go-ethereum/accounts/abi/bind"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/mr-tron/base58"
-	"github.com/stretchr/testify/require"
-	"go.uber.org/zap/zapcore"
-
-	"github.com/smartcontractkit/libocr/offchainreporting2plus/chains/evmutil"
-	"github.com/smartcontractkit/libocr/offchainreporting2plus/ocr3types"
-	ocrTypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types"
-
-	commoncap "github.com/smartcontractkit/chainlink-common/pkg/capabilities"
-	"github.com/smartcontractkit/chainlink-common/pkg/capabilities/consensus/ocr3"
-	"github.com/smartcontractkit/chainlink-common/pkg/capabilities/datastreams"
-	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
-	coretypes "github.com/smartcontractkit/chainlink-common/pkg/types/core"
-	v3 "github.com/smartcontractkit/chainlink-common/pkg/types/mercury/v3"
-	"github.com/smartcontractkit/chainlink-common/pkg/utils/tests"
-
-	"github.com/smartcontractkit/chainlink/v2/core/capabilities"
-	remotetypes "github.com/smartcontractkit/chainlink/v2/core/capabilities/remote/types"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/keystone/generated/feeds_consumer"
-	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
-	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
-	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
-	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/chaintype"
-	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ethkey"
-	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ocr2key"
-	p2ptypes "github.com/smartcontractkit/chainlink/v2/core/services/p2p/types"
-	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/v3/reportcodec"
-	"github.com/smartcontractkit/chainlink/v2/core/utils/testutils/heavyweight"
-)
-
-const (
-	// As a  default set the logging to info otherwise 10s/100s of MB of logs are created on each test run
-	TestLogLevel = zapcore.InfoLevel
-)
-
-var (
-	workflowName    = "abcdef0123"
-	workflowOwnerID = "0100000000000000000000000000000000000001"
-)
-
-type donInfo struct {
-	commoncap.DON
-	keys       []ethkey.KeyV2
-	keyBundles []ocr2key.KeyBundle
-	peerIDs    []peer
-}
-
-func setupStreamDonsWithTransmissionSchedule(ctx context.Context, t *testing.T, workflowDonInfo donInfo, triggerDonInfo donInfo, targetDonInfo donInfo,
-	feedCount int, deltaStage string, schedule string) (*feeds_consumer.KeystoneFeedsConsumer, []string, *reportsSink) {
-	lggr := logger.TestLogger(t)
-	lggr.SetLogLevel(TestLogLevel)
-
-	ethBlockchain, transactor := setupBlockchain(t, 1000, 1*time.Second)
-	capabilitiesRegistryAddr := setupCapabilitiesRegistryContract(ctx, t, workflowDonInfo, triggerDonInfo, targetDonInfo, transactor, ethBlockchain)
-	forwarderAddr, _ := setupForwarderContract(t, workflowDonInfo, transactor, ethBlockchain)
-	consumerAddr, consumer := setupConsumerContract(t, transactor, ethBlockchain, forwarderAddr, workflowOwnerID, workflowName)
-
-	var feedIDs []string
-	for i := 0; i < feedCount; i++ {
-		feedIDs = append(feedIDs, newFeedID(t))
-	}
-
-	sink := newReportsSink()
-
-	libocr := newMockLibOCR(t, workflowDonInfo.F, 1*time.Second)
-	workflowDonNodes, _, _ := createDons(ctx, t, lggr, sink,
-		workflowDonInfo, triggerDonInfo, targetDonInfo,
-		ethBlockchain, capabilitiesRegistryAddr, forwarderAddr,
-		workflowDonInfo.keyBundles, transactor, libocr)
-	for _, node := range workflowDonNodes {
-		addWorkflowJob(t, node, workflowName, workflowOwnerID, feedIDs, consumerAddr, deltaStage, schedule)
-	}
-
-	servicetest.Run(t, ethBlockchain)
-	servicetest.Run(t, libocr)
-	servicetest.Run(t, sink)
-	return consumer, feedIDs, sink
-}
-
-func createDons(ctx context.Context, t *testing.T, lggr logger.Logger, reportsSink *reportsSink,
-	workflowDon donInfo,
-	triggerDon donInfo,
-	targetDon donInfo,
-	simulatedEthBlockchain *ethBackend,
-	capRegistryAddr common.Address,
-	forwarderAddr common.Address,
-	workflowNodeKeyBundles []ocr2key.KeyBundle,
-	transactor *bind.TransactOpts,
-	libocr *mockLibOCR,
-) ([]*cltest.TestApplication, []*cltest.TestApplication, []*cltest.TestApplication) {
-	broker := newTestAsyncMessageBroker(t, 1000)
-
-	var triggerNodes []*cltest.TestApplication
-	for i, triggerPeer := range triggerDon.Members {
-		triggerPeerDispatcher := broker.NewDispatcherForNode(triggerPeer)
-		nodeInfo := commoncap.Node{
-			PeerID: &triggerPeer,
-		}
-
-		capabilityRegistry := capabilities.NewRegistry(lggr)
-		trigger := reportsSink.getNewTrigger(t)
-		err := capabilityRegistry.Add(ctx, trigger)
-		require.NoError(t, err)
-
-		triggerNode := startNewNode(ctx, t, lggr.Named("Trigger-"+strconv.Itoa(i)), nodeInfo, simulatedEthBlockchain, capRegistryAddr, triggerPeerDispatcher,
-			testPeerWrapper{peer: testPeer{triggerPeer}}, capabilityRegistry, nil, transactor,
-			triggerDon.keys[i])
-
-		require.NoError(t, triggerNode.Start(testutils.Context(t)))
-		triggerNodes = append(triggerNodes, triggerNode)
-	}
-
-	var targetNodes []*cltest.TestApplication
-	for i, targetPeer := range targetDon.Members {
-		targetPeerDispatcher := broker.NewDispatcherForNode(targetPeer)
-		nodeInfo := commoncap.Node{
-			PeerID: &targetPeer,
-		}
-
-		capabilityRegistry := capabilities.NewRegistry(lggr)
-
-		targetNode := startNewNode(ctx, t, lggr.Named("Target-"+strconv.Itoa(i)), nodeInfo, simulatedEthBlockchain, capRegistryAddr, targetPeerDispatcher,
-			testPeerWrapper{peer: testPeer{targetPeer}}, capabilityRegistry, &forwarderAddr, transactor,
-			targetDon.keys[i])
-
-		require.NoError(t, targetNode.Start(testutils.Context(t)))
-		targetNodes = append(triggerNodes, targetNode)
-	}
-
-	var workflowNodes []*cltest.TestApplication
-	for i, workflowPeer := range workflowDon.Members {
-		workflowPeerDispatcher := broker.NewDispatcherForNode(workflowPeer)
-		capabilityRegistry := capabilities.NewRegistry(lggr)
-
-		requestTimeout := 10 * time.Minute
-		cfg := ocr3.Config{
-			Logger:            lggr,
-			EncoderFactory:    capabilities.NewEncoder,
-			AggregatorFactory: capabilities.NewAggregator,
-			RequestTimeout:    &requestTimeout,
-		}
-
-		ocr3Capability := ocr3.NewOCR3(cfg)
-		servicetest.Run(t, ocr3Capability)
-
-		pluginCfg := coretypes.ReportingPluginServiceConfig{}
-		pluginFactory, err := ocr3Capability.NewReportingPluginFactory(ctx, pluginCfg, nil,
-			nil, nil, nil, capabilityRegistry, nil, nil)
-		require.NoError(t, err)
-
-		repConfig := ocr3types.ReportingPluginConfig{
-			F: int(workflowDon.F),
-		}
-		plugin, _, err := pluginFactory.NewReportingPlugin(ctx, repConfig)
-		require.NoError(t, err)
-
-		transmitter := ocr3.NewContractTransmitter(lggr, capabilityRegistry, "")
-
-		libocr.AddNode(plugin, transmitter, workflowNodeKeyBundles[i])
-
-		nodeInfo := commoncap.Node{
-			PeerID:         &workflowPeer,
-			WorkflowDON:    workflowDon.DON,
-			CapabilityDONs: []commoncap.DON{triggerDon.DON, targetDon.DON},
-		}
-
-		workflowNode := startNewNode(ctx, t, lggr.Named("Workflow-"+strconv.Itoa(i)), nodeInfo, simulatedEthBlockchain, capRegistryAddr, workflowPeerDispatcher,
-			testPeerWrapper{peer: testPeer{workflowPeer}}, capabilityRegistry, nil, transactor,
-			workflowDon.keys[i])
-
-		require.NoError(t, workflowNode.Start(testutils.Context(t)))
-		workflowNodes = append(workflowNodes, workflowNode)
-	}
-
-	servicetest.Run(t, broker)
-
-	return workflowNodes, triggerNodes, targetNodes
-}
-
-func startNewNode(ctx context.Context,
-	t *testing.T, lggr logger.Logger, nodeInfo commoncap.Node,
-	backend *ethBackend, capRegistryAddr common.Address,
-	dispatcher remotetypes.Dispatcher,
-	peerWrapper p2ptypes.PeerWrapper,
-	localCapabilities *capabilities.Registry,
-	forwarderAddress *common.Address,
-	transactor *bind.TransactOpts,
-	keyV2 ethkey.KeyV2,
-) *cltest.TestApplication {
-	config, _ := heavyweight.FullTestDBV2(t, func(c *chainlink.Config, s *chainlink.Secrets) {
-		c.Capabilities.ExternalRegistry.ChainID = ptr(fmt.Sprintf("%d", testutils.SimulatedChainID))
-		c.Capabilities.ExternalRegistry.Address = ptr(capRegistryAddr.String())
-		c.Capabilities.Peering.V2.Enabled = ptr(true)
-
-		if forwarderAddress != nil {
-			eip55Address := types.EIP55AddressFromAddress(*forwarderAddress)
-			c.EVM[0].Chain.Workflow.ForwarderAddress = &eip55Address
-			c.EVM[0].Chain.Workflow.FromAddress = &keyV2.EIP55Address
-		}
-
-		c.Feature.FeedsManager = ptr(false)
-	})
-
-	n, err := backend.NonceAt(ctx, transactor.From, nil)
-	require.NoError(t, err)
-
-	tx := cltest.NewLegacyTransaction(
-		n, keyV2.Address,
-		assets.Ether(1).ToInt(),
-		21000,
-		assets.GWei(1).ToInt(),
-		nil)
-	signedTx, err := transactor.Signer(transactor.From, tx)
-	require.NoError(t, err)
-	err = backend.SendTransaction(ctx, signedTx)
-	require.NoError(t, err)
-	backend.Commit()
-
-	return cltest.NewApplicationWithConfigV2AndKeyOnSimulatedBlockchain(t, config, backend.SimulatedBackend, nodeInfo,
-		dispatcher, peerWrapper, localCapabilities, keyV2, lggr)
-}
-
-type don struct {
-	id       uint32
-	numNodes int
-	f        uint8
-}
-
-func createDonInfo(t *testing.T, don don) donInfo {
-	keyBundles, peerIDs := getKeyBundlesAndPeerIDs(t, don.numNodes)
-
-	donPeers := make([]p2ptypes.PeerID, len(peerIDs))
-	var donKeys []ethkey.KeyV2
-	for i := 0; i < len(peerIDs); i++ {
-		peerID := p2ptypes.PeerID{}
-		require.NoError(t, peerID.UnmarshalText([]byte(peerIDs[i].PeerID)))
-		donPeers[i] = peerID
-		newKey, err := ethkey.NewV2()
-		require.NoError(t, err)
-		donKeys = append(donKeys, newKey)
-	}
-
-	triggerDonInfo := donInfo{
-		DON: commoncap.DON{
-			ID:            don.id,
-			Members:       donPeers,
-			F:             don.f,
-			ConfigVersion: 1,
-		},
-		peerIDs:    peerIDs,
-		keys:       donKeys,
-		keyBundles: keyBundles,
-	}
-	return triggerDonInfo
-}
-
-func createFeedReport(t *testing.T, price *big.Int, observationTimestamp int64,
-	feedIDString string,
-	keyBundles []ocr2key.KeyBundle) *datastreams.FeedReport {
-	reportCtx := ocrTypes.ReportContext{}
-	rawCtx := RawReportContext(reportCtx)
-
-	bytes, err := hex.DecodeString(feedIDString[2:])
-	require.NoError(t, err)
-	var feedIDBytes [32]byte
-	copy(feedIDBytes[:], bytes)
-
-	report := &datastreams.FeedReport{
-		FeedID:               feedIDString,
-		FullReport:           newReport(t, feedIDBytes, price, observationTimestamp),
-		BenchmarkPrice:       price.Bytes(),
-		ObservationTimestamp: observationTimestamp,
-		Signatures:           [][]byte{},
-		ReportContext:        rawCtx,
-	}
-
-	for _, key := range keyBundles {
-		sig, err := key.Sign(reportCtx, report.FullReport)
-		require.NoError(t, err)
-		report.Signatures = append(report.Signatures, sig)
-	}
-
-	return report
-}
-
-func getKeyBundlesAndPeerIDs(t *testing.T, numNodes int) ([]ocr2key.KeyBundle, []peer) {
-	var keyBundles []ocr2key.KeyBundle
-	var donPeerIDs []peer
-	for i := 0; i < numNodes; i++ {
-		peerID := NewPeerID()
-
-		keyBundle, err := ocr2key.New(chaintype.EVM)
-		require.NoError(t, err)
-		keyBundles = append(keyBundles, keyBundle)
-
-		pk := keyBundle.PublicKey()
-
-		p := peer{
-			PeerID: peerID,
-			Signer: fmt.Sprintf("0x%x", pk),
-		}
-
-		donPeerIDs = append(donPeerIDs, p)
-	}
-	return keyBundles, donPeerIDs
-}
-
-func newFeedID(t *testing.T) string {
-	buf := [32]byte{}
-	_, err := rand.Read(buf[:])
-	require.NoError(t, err)
-	return "0x" + hex.EncodeToString(buf[:])
-}
-
-func newReport(t *testing.T, feedID [32]byte, price *big.Int, timestamp int64) []byte {
-	ctx := tests.Context(t)
-	v3Codec := reportcodec.NewReportCodec(feedID, logger.TestLogger(t))
-	raw, err := v3Codec.BuildReport(ctx, v3.ReportFields{
-		BenchmarkPrice: price,
-		Timestamp:      uint32(timestamp),
-		Bid:            big.NewInt(0),
-		Ask:            big.NewInt(0),
-		LinkFee:        big.NewInt(0),
-		NativeFee:      big.NewInt(0),
-	})
-	require.NoError(t, err)
-	return raw
-}
-
-type testPeerWrapper struct {
-	peer testPeer
-}
-
-func (t testPeerWrapper) Start(ctx context.Context) error {
-	return nil
-}
-
-func (t testPeerWrapper) Close() error {
-	return nil
-}
-
-func (t testPeerWrapper) Ready() error {
-	return nil
-}
-
-func (t testPeerWrapper) HealthReport() map[string]error {
-	return nil
-}
-
-func (t testPeerWrapper) Name() string {
-	return "testPeerWrapper"
-}
-
-func (t testPeerWrapper) GetPeer() p2ptypes.Peer {
-	return t.peer
-}
-
-type testPeer struct {
-	id p2ptypes.PeerID
-}
-
-func (t testPeer) Start(ctx context.Context) error {
-	return nil
-}
-
-func (t testPeer) Close() error {
-	return nil
-}
-
-func (t testPeer) Ready() error {
-	return nil
-}
-
-func (t testPeer) HealthReport() map[string]error {
-	return nil
-}
-
-func (t testPeer) Name() string {
-	return "testPeer"
-}
-
-func (t testPeer) ID() p2ptypes.PeerID {
-	return t.id
-}
-
-func (t testPeer) UpdateConnections(peers map[p2ptypes.PeerID]p2ptypes.StreamConfig) error {
-	return nil
-}
-
-func (t testPeer) Send(peerID p2ptypes.PeerID, msg []byte) error {
-	return nil
-}
-
-func (t testPeer) Receive() <-chan p2ptypes.Message {
-	return nil
-}
-
-func NewPeerID() string {
-	var privKey [32]byte
-	_, err := rand.Read(privKey[:])
-	if err != nil {
-		panic(err)
-	}
-
-	peerID := append(libp2pMagic(), privKey[:]...)
-
-	return base58.Encode(peerID[:])
-}
-
-func libp2pMagic() []byte {
-	return []byte{0x00, 0x24, 0x08, 0x01, 0x12, 0x20}
-}
-
-func ptr[T any](t T) *T { return &t }
-
-func RawReportContext(reportCtx ocrTypes.ReportContext) []byte {
-	rc := evmutil.RawReportContext(reportCtx)
-	flat := []byte{}
-	for _, r := range rc {
-		flat = append(flat, r[:]...)
-	}
-	return flat
-}
diff --git a/core/capabilities/integration_tests/streams_test.go b/core/capabilities/integration_tests/streams_test.go
deleted file mode 100644
index 06c56f722fb..00000000000
--- a/core/capabilities/integration_tests/streams_test.go
+++ /dev/null
@@ -1,99 +0,0 @@
-package integration_tests
-
-import (
-	"context"
-	"encoding/hex"
-	"math/big"
-	"testing"
-	"time"
-
-	"github.com/ethereum/go-ethereum/accounts/abi/bind"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
-	"github.com/smartcontractkit/chainlink-common/pkg/capabilities/datastreams"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/keystone/generated/feeds_consumer"
-	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
-	reporttypes "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/v3/types"
-)
-
-func Test_AllAtOnceTransmissionSchedule(t *testing.T) {
-	ctx := testutils.Context(t)
-
-	// The don IDs set in the below calls are inferred from the order in which the dons are added to the capabilities registry
-	// in the setupCapabilitiesRegistryContract function, should this order change the don IDs will need updating.
-	workflowDonInfo := createDonInfo(t, don{id: 1, numNodes: 7, f: 2})
-	triggerDonInfo := createDonInfo(t, don{id: 2, numNodes: 7, f: 2})
-	targetDonInfo := createDonInfo(t, don{id: 3, numNodes: 4, f: 1})
-
-	consumer, feedIDs, triggerSink := setupStreamDonsWithTransmissionSchedule(ctx, t, workflowDonInfo, triggerDonInfo, targetDonInfo, 3,
-		"2s", "allAtOnce")
-
-	reports := []*datastreams.FeedReport{
-		createFeedReport(t, big.NewInt(1), 5, feedIDs[0], triggerDonInfo.keyBundles),
-		createFeedReport(t, big.NewInt(3), 7, feedIDs[1], triggerDonInfo.keyBundles),
-		createFeedReport(t, big.NewInt(2), 6, feedIDs[2], triggerDonInfo.keyBundles),
-	}
-
-	triggerSink.sendReports(reports)
-
-	waitForConsumerReports(ctx, t, consumer, reports)
-}
-
-func Test_OneAtATimeTransmissionSchedule(t *testing.T) {
-	ctx := testutils.Context(t)
-
-	// The don IDs set in the below calls are inferred from the order in which the dons are added to the capabilities registry
-	// in the setupCapabilitiesRegistryContract function, should this order change the don IDs will need updating.
-	workflowDonInfo := createDonInfo(t, don{id: 1, numNodes: 7, f: 2})
-	triggerDonInfo := createDonInfo(t, don{id: 2, numNodes: 7, f: 2})
-	targetDonInfo := createDonInfo(t, don{id: 3, numNodes: 4, f: 1})
-
-	consumer, feedIDs, triggerSink := setupStreamDonsWithTransmissionSchedule(ctx, t, workflowDonInfo, triggerDonInfo, targetDonInfo, 3,
-		"2s", "oneAtATime")
-
-	reports := []*datastreams.FeedReport{
-		createFeedReport(t, big.NewInt(1), 5, feedIDs[0], triggerDonInfo.keyBundles),
-		createFeedReport(t, big.NewInt(3), 7, feedIDs[1], triggerDonInfo.keyBundles),
-		createFeedReport(t, big.NewInt(2), 6, feedIDs[2], triggerDonInfo.keyBundles),
-	}
-
-	triggerSink.sendReports(reports)
-
-	waitForConsumerReports(ctx, t, consumer, reports)
-}
-
-func waitForConsumerReports(ctx context.Context, t *testing.T, consumer *feeds_consumer.KeystoneFeedsConsumer, triggerFeedReports []*datastreams.FeedReport) {
-	feedsReceived := make(chan *feeds_consumer.KeystoneFeedsConsumerFeedReceived, 1000)
-	feedsSub, err := consumer.WatchFeedReceived(&bind.WatchOpts{}, feedsReceived, nil)
-	require.NoError(t, err)
-
-	feedToReport := map[string]*datastreams.FeedReport{}
-	for _, report := range triggerFeedReports {
-		feedToReport[report.FeedID] = report
-	}
-
-	ctxWithTimeout, cancel := context.WithTimeout(ctx, 1*time.Minute)
-	defer cancel()
-	feedCount := 0
-	for {
-		select {
-		case <-ctxWithTimeout.Done():
-			t.Fatalf("timed out waiting for feed reports, expected %d, received %d", len(triggerFeedReports), feedCount)
-		case err := <-feedsSub.Err():
-			require.NoError(t, err)
-		case feed := <-feedsReceived:
-			feedID := "0x" + hex.EncodeToString(feed.FeedId[:])
-			report := feedToReport[feedID]
-			decodedReport, err := reporttypes.Decode(report.FullReport)
-			require.NoError(t, err)
-			assert.Equal(t, decodedReport.BenchmarkPrice, feed.Price)
-			assert.Equal(t, decodedReport.ObservationsTimestamp, feed.Timestamp)
-
-			feedCount++
-			if feedCount == len(triggerFeedReports) {
-				return
-			}
-		}
-	}
-}
diff --git a/core/capabilities/webapi/target/target.go b/core/capabilities/webapi/target/target.go
index 508d322a7d6..0723298b435 100644
--- a/core/capabilities/webapi/target/target.go
+++ b/core/capabilities/webapi/target/target.go
@@ -63,7 +63,6 @@ func getMessageID(req capabilities.CapabilityRequest) (string, error) {
 		return "", fmt.Errorf("workflow execution ID is invalid: %w", err)
 	}
 	messageID := []string{
-		req.Metadata.WorkflowID,
 		req.Metadata.WorkflowExecutionID,
 		webapicapabilities.MethodWebAPITarget,
 	}
diff --git a/core/chains/evm/config/chain_scoped_gas_estimator.go b/core/chains/evm/config/chain_scoped_gas_estimator.go
index 49e438fc67c..1e04690b12f 100644
--- a/core/chains/evm/config/chain_scoped_gas_estimator.go
+++ b/core/chains/evm/config/chain_scoped_gas_estimator.go
@@ -127,7 +127,7 @@ type daOracleConfig struct {
 	c toml.DAOracle
 }
 
-func (d *daOracleConfig) OracleType() toml.OracleType {
+func (d *daOracleConfig) OracleType() toml.DAOracleType {
 	return d.c.OracleType
 }
 
diff --git a/core/chains/evm/config/config.go b/core/chains/evm/config/config.go
index db08512a146..6d4bcf159b5 100644
--- a/core/chains/evm/config/config.go
+++ b/core/chains/evm/config/config.go
@@ -165,7 +165,7 @@ type BlockHistory interface {
 }
 
 type DAOracle interface {
-	OracleType() toml.OracleType
+	OracleType() toml.DAOracleType
 	OracleAddress() *types.EIP55Address
 	CustomGasPriceCalldata() string
 }
diff --git a/core/chains/evm/config/toml/config.go b/core/chains/evm/config/toml/config.go
index dff73cacb47..4655a9798c3 100644
--- a/core/chains/evm/config/toml/config.go
+++ b/core/chains/evm/config/toml/config.go
@@ -759,19 +759,27 @@ func (u *FeeHistoryEstimator) setFrom(f *FeeHistoryEstimator) {
 }
 
 type DAOracle struct {
-	OracleType             OracleType
+	OracleType             DAOracleType
 	OracleAddress          *types.EIP55Address
 	CustomGasPriceCalldata string
 }
 
-type OracleType string
+type DAOracleType string
 
 const (
-	OPStack  = OracleType("opstack")
-	Arbitrum = OracleType("arbitrum")
-	ZKSync   = OracleType("zksync")
+	DAOracleOPStack  = DAOracleType("opstack")
+	DAOracleArbitrum = DAOracleType("arbitrum")
+	DAOracleZKSync   = DAOracleType("zksync")
 )
 
+func (o DAOracleType) IsValid() bool {
+	switch o {
+	case "", DAOracleOPStack, DAOracleArbitrum, DAOracleZKSync:
+		return true
+	}
+	return false
+}
+
 func (d *DAOracle) setFrom(f *DAOracle) {
 	d.OracleType = f.OracleType
 	if v := f.OracleAddress; v != nil {
diff --git a/core/chains/evm/gas/models_test.go b/core/chains/evm/gas/models_test.go
index 28ad5260d8a..936a4810569 100644
--- a/core/chains/evm/gas/models_test.go
+++ b/core/chains/evm/gas/models_test.go
@@ -72,7 +72,7 @@ func TestWrappedEvmEstimator(t *testing.T) {
 		assert.Nil(t, l1Oracle)
 
 		// expect l1Oracle
-		daOracle := rollups.CreateTestDAOracle(t, toml.OPStack, "0x420000000000000000000000000000000000000F", "")
+		daOracle := rollups.CreateTestDAOracle(t, toml.DAOracleOPStack, "0x420000000000000000000000000000000000000F", "")
 		oracle, err := rollups.NewL1GasOracle(lggr, nil, chaintype.ChainOptimismBedrock, daOracle)
 		require.NoError(t, err)
 		// cast oracle to L1Oracle interface
diff --git a/core/chains/evm/gas/rollups/da_oracle_test_helper.go b/core/chains/evm/gas/rollups/da_oracle_test_helper.go
index 57c81c007c0..6dfa96d3118 100644
--- a/core/chains/evm/gas/rollups/da_oracle_test_helper.go
+++ b/core/chains/evm/gas/rollups/da_oracle_test_helper.go
@@ -13,7 +13,7 @@ type TestDAOracle struct {
 	toml.DAOracle
 }
 
-func (d *TestDAOracle) OracleType() toml.OracleType {
+func (d *TestDAOracle) OracleType() toml.DAOracleType {
 	return d.DAOracle.OracleType
 }
 
@@ -25,7 +25,7 @@ func (d *TestDAOracle) CustomGasPriceCalldata() string {
 	return d.DAOracle.CustomGasPriceCalldata
 }
 
-func CreateTestDAOracle(t *testing.T, oracleType toml.OracleType, oracleAddress string, customGasPriceCalldata string) *TestDAOracle {
+func CreateTestDAOracle(t *testing.T, oracleType toml.DAOracleType, oracleAddress string, customGasPriceCalldata string) *TestDAOracle {
 	oracleAddr, err := types.NewEIP55Address(oracleAddress)
 	require.NoError(t, err)
 
diff --git a/core/chains/evm/gas/rollups/l1_oracle.go b/core/chains/evm/gas/rollups/l1_oracle.go
index e03b27b3176..826210ab9bf 100644
--- a/core/chains/evm/gas/rollups/l1_oracle.go
+++ b/core/chains/evm/gas/rollups/l1_oracle.go
@@ -57,11 +57,11 @@ func NewL1GasOracle(lggr logger.Logger, ethClient l1OracleClient, chainType chai
 	var err error
 	if daOracle != nil {
 		switch daOracle.OracleType() {
-		case toml.OPStack:
+		case toml.DAOracleOPStack:
 			l1Oracle, err = NewOpStackL1GasOracle(lggr, ethClient, chainType, daOracle)
-		case toml.Arbitrum:
+		case toml.DAOracleArbitrum:
 			l1Oracle, err = NewArbitrumL1GasOracle(lggr, ethClient)
-		case toml.ZKSync:
+		case toml.DAOracleZKSync:
 			l1Oracle = NewZkSyncL1GasOracle(lggr, ethClient)
 		default:
 			err = fmt.Errorf("unsupported DA oracle type %s. Going forward all chain configs should specify an oracle type", daOracle.OracleType())
diff --git a/core/chains/evm/gas/rollups/l1_oracle_test.go b/core/chains/evm/gas/rollups/l1_oracle_test.go
index 82dc7925293..fc3cd68d821 100644
--- a/core/chains/evm/gas/rollups/l1_oracle_test.go
+++ b/core/chains/evm/gas/rollups/l1_oracle_test.go
@@ -30,7 +30,7 @@ func TestL1Oracle(t *testing.T) {
 	t.Run("Unsupported ChainType returns nil", func(t *testing.T) {
 		ethClient := mocks.NewL1OracleClient(t)
 
-		daOracle := CreateTestDAOracle(t, toml.OPStack, utils.RandomAddress().String(), "")
+		daOracle := CreateTestDAOracle(t, toml.DAOracleOPStack, utils.RandomAddress().String(), "")
 		oracle, err := NewL1GasOracle(logger.Test(t), ethClient, chaintype.ChainCelo, daOracle)
 		require.NoError(t, err)
 		assert.Nil(t, oracle)
@@ -43,7 +43,7 @@ func TestL1Oracle_GasPrice(t *testing.T) {
 	t.Run("Calling GasPrice on unstarted L1Oracle returns error", func(t *testing.T) {
 		ethClient := mocks.NewL1OracleClient(t)
 
-		daOracle := CreateTestDAOracle(t, toml.OPStack, utils.RandomAddress().String(), "")
+		daOracle := CreateTestDAOracle(t, toml.DAOracleOPStack, utils.RandomAddress().String(), "")
 		oracle, err := NewL1GasOracle(logger.Test(t), ethClient, chaintype.ChainOptimismBedrock, daOracle)
 		require.NoError(t, err)
 
@@ -67,7 +67,7 @@ func TestL1Oracle_GasPrice(t *testing.T) {
 			assert.Nil(t, blockNumber)
 		}).Return(common.BigToHash(l1BaseFee).Bytes(), nil)
 
-		daOracle := CreateTestDAOracle(t, toml.Arbitrum, "0x0000000000000000000000000000000000000000", "")
+		daOracle := CreateTestDAOracle(t, toml.DAOracleArbitrum, "0x0000000000000000000000000000000000000000", "")
 		oracle, err := NewL1GasOracle(logger.Test(t), ethClient, chaintype.ChainArbitrum, daOracle)
 		require.NoError(t, err)
 		servicetest.RunHealthy(t, oracle)
@@ -97,7 +97,7 @@ func TestL1Oracle_GasPrice(t *testing.T) {
 			assert.Nil(t, blockNumber)
 		}).Return(common.BigToHash(l1BaseFee).Bytes(), nil)
 
-		daOracle := CreateTestDAOracle(t, toml.OPStack, oracleAddress, "")
+		daOracle := CreateTestDAOracle(t, toml.DAOracleOPStack, oracleAddress, "")
 		oracle, err := NewL1GasOracle(logger.Test(t), ethClient, chaintype.ChainKroma, daOracle)
 		require.NoError(t, err)
 		servicetest.RunHealthy(t, oracle)
@@ -127,7 +127,7 @@ func TestL1Oracle_GasPrice(t *testing.T) {
 			assert.Nil(t, blockNumber)
 		}).Return(common.BigToHash(l1BaseFee).Bytes(), nil)
 
-		daOracle := CreateTestDAOracle(t, toml.OPStack, oracleAddress, "")
+		daOracle := CreateTestDAOracle(t, toml.DAOracleOPStack, oracleAddress, "")
 		oracle, err := NewL1GasOracle(logger.Test(t), ethClient, chaintype.ChainOptimismBedrock, daOracle)
 		require.NoError(t, err)
 		servicetest.RunHealthy(t, oracle)
@@ -156,7 +156,7 @@ func TestL1Oracle_GasPrice(t *testing.T) {
 			assert.Nil(t, blockNumber)
 		}).Return(common.BigToHash(l1BaseFee).Bytes(), nil)
 
-		daOracle := CreateTestDAOracle(t, toml.OPStack, oracleAddress, "")
+		daOracle := CreateTestDAOracle(t, toml.DAOracleOPStack, oracleAddress, "")
 		oracle, err := NewL1GasOracle(logger.Test(t), ethClient, chaintype.ChainScroll, daOracle)
 		require.NoError(t, err)
 		servicetest.RunHealthy(t, oracle)
@@ -194,7 +194,7 @@ func TestL1Oracle_GasPrice(t *testing.T) {
 			assert.Nil(t, blockNumber)
 		}).Return(common.BigToHash(gasPerPubByteL2).Bytes(), nil)
 
-		daOracle := CreateTestDAOracle(t, toml.ZKSync, "0x0000000000000000000000000000000000000000", "")
+		daOracle := CreateTestDAOracle(t, toml.DAOracleZKSync, "0x0000000000000000000000000000000000000000", "")
 		oracle, err := NewL1GasOracle(logger.Test(t), ethClient, chaintype.ChainZkSync, daOracle)
 		require.NoError(t, err)
 		servicetest.RunHealthy(t, oracle)
diff --git a/core/chains/evm/gas/rollups/op_l1_oracle_test.go b/core/chains/evm/gas/rollups/op_l1_oracle_test.go
index 8d5fd357baf..0b67cc7178d 100644
--- a/core/chains/evm/gas/rollups/op_l1_oracle_test.go
+++ b/core/chains/evm/gas/rollups/op_l1_oracle_test.go
@@ -103,7 +103,7 @@ func TestOPL1Oracle_ReadV1GasPrice(t *testing.T) {
 				assert.Nil(t, blockNumber)
 			}).Return(common.BigToHash(l1BaseFee).Bytes(), nil).Once()
 
-			daOracle := CreateTestDAOracle(t, toml.OPStack, "0x0000000000000000000000000000000000001234", "")
+			daOracle := CreateTestDAOracle(t, toml.DAOracleOPStack, "0x0000000000000000000000000000000000001234", "")
 			oracle, err := NewOpStackL1GasOracle(logger.Test(t), ethClient, chaintype.ChainOptimismBedrock, daOracle)
 			require.NoError(t, err)
 			gasPrice, err := oracle.GetDAGasPrice(tests.Context(t))
@@ -226,7 +226,7 @@ func TestOPL1Oracle_CalculateEcotoneGasPrice(t *testing.T) {
 		ethClient := setupUpgradeCheck(t, oracleAddress, false, true)
 		mockBatchContractCall(t, ethClient, oracleAddress, baseFee, baseFeeScalar, blobBaseFee, blobBaseFeeScalar, decimals)
 
-		daOracle := CreateTestDAOracle(t, toml.OPStack, oracleAddress, "")
+		daOracle := CreateTestDAOracle(t, toml.DAOracleOPStack, oracleAddress, "")
 		oracle, err := NewOpStackL1GasOracle(logger.Test(t), ethClient, chaintype.ChainOptimismBedrock, daOracle)
 		require.NoError(t, err)
 		gasPrice, err := oracle.GetDAGasPrice(tests.Context(t))
@@ -246,7 +246,7 @@ func TestOPL1Oracle_CalculateEcotoneGasPrice(t *testing.T) {
 			rpcElements[1].Result = &badData
 		}).Return(nil).Once()
 
-		daOracle := CreateTestDAOracle(t, toml.OPStack, oracleAddress, "")
+		daOracle := CreateTestDAOracle(t, toml.DAOracleOPStack, oracleAddress, "")
 		oracle, err := NewOpStackL1GasOracle(logger.Test(t), ethClient, chaintype.ChainOptimismBedrock, daOracle)
 		require.NoError(t, err)
 		_, err = oracle.GetDAGasPrice(tests.Context(t))
@@ -257,7 +257,7 @@ func TestOPL1Oracle_CalculateEcotoneGasPrice(t *testing.T) {
 		ethClient := setupUpgradeCheck(t, oracleAddress, false, true)
 		ethClient.On("BatchCallContext", mock.Anything, mock.IsType([]rpc.BatchElem{})).Return(fmt.Errorf("revert")).Once()
 
-		daOracle := CreateTestDAOracle(t, toml.OPStack, oracleAddress, "")
+		daOracle := CreateTestDAOracle(t, toml.DAOracleOPStack, oracleAddress, "")
 		oracle, err := NewOpStackL1GasOracle(logger.Test(t), ethClient, chaintype.ChainOptimismBedrock, daOracle)
 		require.NoError(t, err)
 		_, err = oracle.GetDAGasPrice(tests.Context(t))
@@ -273,7 +273,7 @@ func TestOPL1Oracle_CalculateEcotoneGasPrice(t *testing.T) {
 			rpcElements[1].Error = fmt.Errorf("revert")
 		}).Return(nil).Once()
 
-		daOracle := CreateTestDAOracle(t, toml.OPStack, oracleAddress, "")
+		daOracle := CreateTestDAOracle(t, toml.DAOracleOPStack, oracleAddress, "")
 		oracle, err := NewOpStackL1GasOracle(logger.Test(t), ethClient, chaintype.ChainOptimismBedrock, daOracle)
 		require.NoError(t, err)
 		_, err = oracle.GetDAGasPrice(tests.Context(t))
@@ -295,7 +295,7 @@ func TestOPL1Oracle_CalculateFjordGasPrice(t *testing.T) {
 		ethClient := setupUpgradeCheck(t, oracleAddress, true, true)
 		mockBatchContractCall(t, ethClient, oracleAddress, baseFee, baseFeeScalar, blobBaseFee, blobBaseFeeScalar, decimals)
 
-		daOracle := CreateTestDAOracle(t, toml.OPStack, oracleAddress, "")
+		daOracle := CreateTestDAOracle(t, toml.DAOracleOPStack, oracleAddress, "")
 		oracle, err := NewOpStackL1GasOracle(logger.Test(t), ethClient, chaintype.ChainOptimismBedrock, daOracle)
 		require.NoError(t, err)
 		gasPrice, err := oracle.GetDAGasPrice(tests.Context(t))
@@ -315,7 +315,7 @@ func TestOPL1Oracle_CalculateFjordGasPrice(t *testing.T) {
 			rpcElements[1].Result = &badData
 		}).Return(nil).Once()
 
-		daOracle := CreateTestDAOracle(t, toml.OPStack, oracleAddress, "")
+		daOracle := CreateTestDAOracle(t, toml.DAOracleOPStack, oracleAddress, "")
 		oracle, err := NewOpStackL1GasOracle(logger.Test(t), ethClient, chaintype.ChainOptimismBedrock, daOracle)
 		require.NoError(t, err)
 		_, err = oracle.GetDAGasPrice(tests.Context(t))
@@ -326,7 +326,7 @@ func TestOPL1Oracle_CalculateFjordGasPrice(t *testing.T) {
 		ethClient := setupUpgradeCheck(t, oracleAddress, true, true)
 		ethClient.On("BatchCallContext", mock.Anything, mock.IsType([]rpc.BatchElem{})).Return(fmt.Errorf("revert")).Once()
 
-		daOracle := CreateTestDAOracle(t, toml.OPStack, oracleAddress, "")
+		daOracle := CreateTestDAOracle(t, toml.DAOracleOPStack, oracleAddress, "")
 		oracle, err := NewOpStackL1GasOracle(logger.Test(t), ethClient, chaintype.ChainOptimismBedrock, daOracle)
 		require.NoError(t, err)
 		_, err = oracle.GetDAGasPrice(tests.Context(t))
@@ -342,7 +342,7 @@ func TestOPL1Oracle_CalculateFjordGasPrice(t *testing.T) {
 			rpcElements[1].Error = fmt.Errorf("revert")
 		}).Return(nil).Once()
 
-		daOracle := CreateTestDAOracle(t, toml.OPStack, oracleAddress, "")
+		daOracle := CreateTestDAOracle(t, toml.DAOracleOPStack, oracleAddress, "")
 		oracle, err := NewOpStackL1GasOracle(logger.Test(t), ethClient, chaintype.ChainOptimismBedrock, daOracle)
 		require.NoError(t, err)
 		_, err = oracle.GetDAGasPrice(tests.Context(t))
diff --git a/core/chains/evm/logpoller/log_poller.go b/core/chains/evm/logpoller/log_poller.go
index b19e3f53c39..eeba2b43df4 100644
--- a/core/chains/evm/logpoller/log_poller.go
+++ b/core/chains/evm/logpoller/log_poller.go
@@ -134,7 +134,8 @@ type logPoller struct {
 	// Usually the only way to recover is to manually remove the offending logs and block from the database.
 	// LogPoller keeps running in infinite loop, so whenever the invalid state is removed from the database it should
 	// recover automatically without needing to restart the LogPoller.
-	finalityViolated *atomic.Bool
+	finalityViolated           atomic.Bool
+	countBasedLogPruningActive atomic.Bool
 }
 
 type Opts struct {
@@ -179,7 +180,6 @@ func NewLogPoller(orm ORM, ec Client, lggr logger.Logger, headTracker HeadTracke
 		clientErrors:             opts.ClientErrors,
 		filters:                  make(map[string]Filter),
 		filterDirty:              true, // Always build Filter on first call to cache an empty filter if nothing registered yet.
-		finalityViolated:         new(atomic.Bool),
 	}
 }
 
@@ -217,6 +217,12 @@ func (filter *Filter) Contains(other *Filter) bool {
 	if other == nil {
 		return true
 	}
+	if other.Retention != filter.Retention {
+		return false
+	}
+	if other.MaxLogsKept != filter.MaxLogsKept {
+		return false
+	}
 	addresses := make(map[common.Address]interface{})
 	for _, addr := range filter.Addresses {
 		addresses[addr] = struct{}{}
@@ -282,7 +288,7 @@ func (lp *logPoller) RegisterFilter(ctx context.Context, filter Filter) error {
 			lp.lggr.Warnw("Filter already present, no-op", "name", filter.Name, "filter", filter)
 			return nil
 		}
-		lp.lggr.Warnw("Updating existing filter with more events or addresses", "name", filter.Name, "filter", filter)
+		lp.lggr.Warnw("Updating existing filter", "name", filter.Name, "filter", filter)
 	}
 
 	if err := lp.orm.InsertFilter(ctx, filter); err != nil {
@@ -290,6 +296,9 @@ func (lp *logPoller) RegisterFilter(ctx context.Context, filter Filter) error {
 	}
 	lp.filters[filter.Name] = filter
 	lp.filterDirty = true
+	if filter.MaxLogsKept > 0 {
+		lp.countBasedLogPruningActive.Store(true)
+	}
 	return nil
 }
 
@@ -545,18 +554,38 @@ func (lp *logPoller) GetReplayFromBlock(ctx context.Context, requested int64) (i
 	return mathutil.Min(requested, lastProcessed.BlockNumber), nil
 }
 
+// loadFilters loads the filters from db, and activates count-based Log Pruning
+// if required by any of the filters
 func (lp *logPoller) loadFilters(ctx context.Context) error {
+	filters, err := lp.lockAndLoadFilters(ctx)
+	if err != nil {
+		return pkgerrors.Wrapf(err, "Failed to load initial filters from db, retrying")
+	}
+	if lp.countBasedLogPruningActive.Load() {
+		return nil
+	}
+	for _, filter := range filters {
+		if filter.MaxLogsKept != 0 {
+			lp.countBasedLogPruningActive.Store(true)
+			return nil
+		}
+	}
+	return nil
+}
+
+// lockAndLoadFilters is the part of loadFilters() requiring a filterMu lock
+func (lp *logPoller) lockAndLoadFilters(ctx context.Context) (filters map[string]Filter, err error) {
 	lp.filterMu.Lock()
 	defer lp.filterMu.Unlock()
-	filters, err := lp.orm.LoadFilters(ctx)
 
+	filters, err = lp.orm.LoadFilters(ctx)
 	if err != nil {
-		return pkgerrors.Wrapf(err, "Failed to load initial filters from db, retrying")
+		return filters, err
 	}
 
 	lp.filters = filters
 	lp.filterDirty = true
-	return nil
+	return filters, nil
 }
 
 // tickStaggeredDelay chooses a uniformly random amount of time to delay between minDelay and minDelay + period
@@ -665,31 +694,41 @@ func (lp *logPoller) backgroundWorkerRun() {
 		case <-ctx.Done():
 			return
 		case <-blockPruneTick:
+			lp.lggr.Infow("pruning old blocks")
 			blockPruneTick = tickWithDefaultJitter(blockPruneInterval)
 			if allRemoved, err := lp.PruneOldBlocks(ctx); err != nil {
-				lp.lggr.Errorw("Unable to prune old blocks", "err", err)
+				lp.lggr.Errorw("unable to prune old blocks", "err", err)
 			} else if !allRemoved {
 				// Tick faster when cleanup can't keep up with the pace of new blocks
 				blockPruneTick = tickWithDefaultJitter(blockPruneShortInterval)
+				lp.lggr.Warnw("reached page limit while pruning old blocks")
+			} else {
+				lp.lggr.Debugw("finished pruning old blocks")
 			}
 		case <-logPruneTick:
 			logPruneTick = tickWithDefaultJitter(logPruneInterval)
+			lp.lggr.Infof("pruning expired logs")
 			if allRemoved, err := lp.PruneExpiredLogs(ctx); err != nil {
-				lp.lggr.Errorw("Unable to prune expired logs", "err", err)
+				lp.lggr.Errorw("unable to prune expired logs", "err", err)
 			} else if !allRemoved {
+				lp.lggr.Warnw("reached page limit while pruning expired logs")
 				// Tick faster when cleanup can't keep up with the pace of new logs
 				logPruneTick = tickWithDefaultJitter(logPruneShortInterval)
-			} else if successfulExpiredLogPrunes == 20 {
+			} else if successfulExpiredLogPrunes >= 20 {
 				// Only prune unmatched logs if we've successfully pruned all expired logs at least 20 times
 				// since the last time unmatched logs were pruned
+				lp.lggr.Infof("finished pruning expired logs: pruning unmatched logs")
 				if allRemoved, err := lp.PruneUnmatchedLogs(ctx); err != nil {
-					lp.lggr.Errorw("Unable to prune unmatched logs", "err", err)
+					lp.lggr.Errorw("unable to prune unmatched logs", "err", err)
 				} else if !allRemoved {
+					lp.lggr.Warnw("reached page limit while pruning unmatched logs")
 					logPruneTick = tickWithDefaultJitter(logPruneShortInterval)
 				} else {
+					lp.lggr.Debugw("finished pruning unmatched logs")
 					successfulExpiredLogPrunes = 0
 				}
 			} else {
+				lp.lggr.Debugw("finished pruning expired logs")
 				successfulExpiredLogPrunes++
 			}
 		}
@@ -1097,7 +1136,8 @@ func (lp *logPoller) findBlockAfterLCA(ctx context.Context, current *evmtypes.He
 }
 
 // PruneOldBlocks removes blocks that are > lp.keepFinalizedBlocksDepth behind the latest finalized block.
-// Returns whether all blocks eligible for pruning were removed. If logPrunePageSize is set to 0, it will always return true.
+// Returns whether all blocks eligible for pruning were removed. If logPrunePageSize is set to 0, then it
+// will always return true unless there is an actual error.
 func (lp *logPoller) PruneOldBlocks(ctx context.Context) (bool, error) {
 	latestBlock, err := lp.orm.SelectLatestBlock(ctx)
 	if err != nil {
@@ -1121,13 +1161,39 @@ func (lp *logPoller) PruneOldBlocks(ctx context.Context) (bool, error) {
 	return lp.logPrunePageSize == 0 || rowsRemoved < lp.logPrunePageSize, err
 }
 
-// PruneExpiredLogs logs that are older than their retention period defined in Filter.
-// Returns whether all logs eligible for pruning were removed. If logPrunePageSize is set to 0, it will always return true.
+// PruneExpiredLogs will attempt to remove any logs which have passed their retention period. Returns whether all expired
+// logs were removed. If logPrunePageSize is set to 0, it will always return true unless an actual error is encountered
 func (lp *logPoller) PruneExpiredLogs(ctx context.Context) (bool, error) {
+	done := true
+
 	rowsRemoved, err := lp.orm.DeleteExpiredLogs(ctx, lp.logPrunePageSize)
-	return lp.logPrunePageSize == 0 || rowsRemoved < lp.logPrunePageSize, err
+	if err != nil {
+		lp.lggr.Errorw("Unable to find excess logs for pruning", "err", err)
+		return false, err
+	} else if lp.logPrunePageSize != 0 && rowsRemoved == lp.logPrunePageSize {
+		done = false
+	}
+
+	if !lp.countBasedLogPruningActive.Load() {
+		return done, err
+	}
+
+	rowIDs, err := lp.orm.SelectExcessLogIDs(ctx, lp.logPrunePageSize)
+	if err != nil {
+		lp.lggr.Errorw("Unable to find excess logs for pruning", "err", err)
+		return false, err
+	}
+	rowsRemoved, err = lp.orm.DeleteLogsByRowID(ctx, rowIDs)
+	if err != nil {
+		lp.lggr.Errorw("Unable to prune excess logs", "err", err)
+	} else if lp.logPrunePageSize != 0 && rowsRemoved == lp.logPrunePageSize {
+		done = false
+	}
+	return done, err
 }
 
+// PruneUnmatchedLogs will attempt to remove any logs which no longer match a registered filter. Returns whether all unmatched
+// logs were removed. If logPrunePageSize is set to 0, it will always return true unless an actual error is encountered
 func (lp *logPoller) PruneUnmatchedLogs(ctx context.Context) (bool, error) {
 	ids, err := lp.orm.SelectUnmatchedLogIDs(ctx, lp.logPrunePageSize)
 	if err != nil {
diff --git a/core/chains/evm/logpoller/observability.go b/core/chains/evm/logpoller/observability.go
index 59b93fffdaf..776fe5bf215 100644
--- a/core/chains/evm/logpoller/observability.go
+++ b/core/chains/evm/logpoller/observability.go
@@ -136,9 +136,9 @@ func (o *ObservedORM) DeleteLogsAndBlocksAfter(ctx context.Context, start int64)
 	})
 }
 
-func (o *ObservedORM) DeleteLogsByRowID(ctx context.Context, rowIDs []uint64) (int64, error) {
-	return withObservedExecAndRowsAffected(o, "DeleteLogsByRowID", del, func() (int64, error) {
-		return o.ORM.DeleteLogsByRowID(ctx, rowIDs)
+func (o *ObservedORM) DeleteExpiredLogs(ctx context.Context, limit int64) (int64, error) {
+	return withObservedExecAndRowsAffected(o, "DeleteExpiredLogs", del, func() (int64, error) {
+		return o.ORM.DeleteExpiredLogs(ctx, limit)
 	})
 }
 
@@ -148,9 +148,15 @@ func (o *ObservedORM) SelectUnmatchedLogIDs(ctx context.Context, limit int64) (i
 	})
 }
 
-func (o *ObservedORM) DeleteExpiredLogs(ctx context.Context, limit int64) (int64, error) {
-	return withObservedExecAndRowsAffected(o, "DeleteExpiredLogs", del, func() (int64, error) {
-		return o.ORM.DeleteExpiredLogs(ctx, limit)
+func (o *ObservedORM) SelectExcessLogIDs(ctx context.Context, limit int64) ([]uint64, error) {
+	return withObservedQueryAndResults[uint64](o, "SelectExcessLogIDs", func() ([]uint64, error) {
+		return o.ORM.SelectExcessLogIDs(ctx, limit)
+	})
+}
+
+func (o *ObservedORM) DeleteLogsByRowID(ctx context.Context, rowIDs []uint64) (int64, error) {
+	return withObservedExecAndRowsAffected(o, "DeleteLogsByRowID", del, func() (int64, error) {
+		return o.ORM.DeleteLogsByRowID(ctx, rowIDs)
 	})
 }
 
diff --git a/core/chains/evm/logpoller/orm.go b/core/chains/evm/logpoller/orm.go
index 30cd19e0447..4d7cf33ebec 100644
--- a/core/chains/evm/logpoller/orm.go
+++ b/core/chains/evm/logpoller/orm.go
@@ -40,6 +40,7 @@ type ORM interface {
 	DeleteLogsAndBlocksAfter(ctx context.Context, start int64) error
 	SelectUnmatchedLogIDs(ctx context.Context, limit int64) (ids []uint64, err error)
 	DeleteExpiredLogs(ctx context.Context, limit int64) (int64, error)
+	SelectExcessLogIDs(ctx context.Context, limit int64) (rowIDs []uint64, err error)
 
 	GetBlocksRange(ctx context.Context, start int64, end int64) ([]LogPollerBlock, error)
 	SelectBlockByNumber(ctx context.Context, blockNumber int64) (*LogPollerBlock, error)
@@ -294,24 +295,36 @@ func (o *DSORM) SelectLatestLogByEventSigWithConfs(ctx context.Context, eventSig
 	return &l, nil
 }
 
-// DeleteBlocksBefore delete blocks before and including end. When limit is set, it will delete at most limit blocks.
-// Otherwise, it will delete all blocks at once.
-func (o *DSORM) DeleteBlocksBefore(ctx context.Context, end int64, limit int64) (int64, error) {
-	var result sql.Result
-	var err error
+type RangeQueryer[T comparable] struct {
+	chainID *ubig.Big
+	ds      sqlutil.DataSource
+	query   func(ctx context.Context, r *RangeQueryer[T], lower, upper int64) (rowsAffected int64, err error)
+	acc     []T
+}
 
+func NewRangeQueryer[T comparable](evmChainID *big.Int, ds sqlutil.DataSource, query func(ctx context.Context, r *RangeQueryer[T], lower, upper int64) (rowsAffected int64, err error)) *RangeQueryer[T] {
+	return &RangeQueryer[T]{
+		chainID: ubig.New(evmChainID),
+		ds:      ds,
+		query:   query,
+	}
+}
+
+// ExecPagedQuery runs a query accepting an upper limit block (end) in a fast paged way. limit is the maximum number
+// of results to be returned, but it is also used to break the query up into smaller queries restricted to limit # of blocks.
+// The first range of blocks will be from MIN(block_number) to MIN(block_number) + limit. The iterative process ends either once
+// the limit on results is reached or block_number = end. The query will never be executed on blocks where block_number > end, and
+// it will never be executed on block_number = B unless it has also been executed on all blocks with block_number < B
+// r.AddResults(moreResults []T) should be called if this is a query returning results (ie, SELECT). These will be accumulated in
+// r.acc and can be retrieved later with r.AllResults()
+func (r *RangeQueryer[T]) ExecPagedQuery(ctx context.Context, limit, end int64) (rowsAffected int64, err error) {
 	if limit == 0 {
-		result, err = o.ds.ExecContext(ctx, `DELETE FROM evm.log_poller_blocks
-			WHERE block_number <= $1 AND evm_chain_id = $2`, end, ubig.New(o.chainID))
-		if err != nil {
-			return 0, err
-		}
-		return result.RowsAffected()
+		return r.query(ctx, r, 0, end)
 	}
 
-	var limitBlock int64
-	err = o.ds.GetContext(ctx, &limitBlock, `SELECT MIN(block_number) FROM evm.log_poller_blocks
-		WHERE evm_chain_id = $1`, ubig.New(o.chainID))
+	var start int64
+	err = r.ds.GetContext(ctx, &start, `SELECT MIN(block_number) FROM evm.log_poller_blocks
+		WHERE evm_chain_id = $1`, r.chainID)
 	if err != nil {
 		if errors.Is(err, sql.ErrNoRows) {
 			return 0, nil
@@ -320,27 +333,46 @@ func (o *DSORM) DeleteBlocksBefore(ctx context.Context, end int64, limit int64)
 	}
 
 	// Remove up to limit blocks at a time, until we've reached the limit or removed everything eligible for deletion
-	var deleted, rows int64
-	for limitBlock += (limit - 1); deleted < limit; limitBlock += limit {
-		if limitBlock > end {
-			limitBlock = end
-		}
-		result, err = o.ds.ExecContext(ctx, `DELETE FROM evm.log_poller_blocks WHERE block_number <= $1 AND evm_chain_id = $2`, limitBlock, ubig.New(o.chainID))
-		if err != nil {
-			return deleted, err
+	var upper int64
+	for lower := start; rowsAffected < limit; lower = upper + 1 {
+		upper = lower + limit - 1
+		if upper > end {
+			upper = end
 		}
 
-		if rows, err = result.RowsAffected(); err != nil {
-			return deleted, err
+		rows, err2 := r.query(ctx, r, lower, upper)
+		if err2 != nil {
+			return rowsAffected, err2
 		}
+		rowsAffected += rows
 
-		deleted += rows
-
-		if limitBlock == end {
+		if upper >= end {
 			break
 		}
 	}
-	return deleted, err
+	return rowsAffected, nil
+}
+
+func (r *RangeQueryer[T]) AddResults(moreResults []T) {
+	r.acc = append(r.acc, moreResults...)
+}
+
+func (r *RangeQueryer[T]) AllResults() []T {
+	return r.acc
+}
+
+// DeleteBlocksBefore delete blocks before and including end. When limit is set, it will delete at most limit blocks.
+// Otherwise, it will delete all blocks at once.
+func (o *DSORM) DeleteBlocksBefore(ctx context.Context, end int64, limit int64) (int64, error) {
+	q := NewRangeQueryer[uint64](o.chainID, o.ds, func(ctx context.Context, r *RangeQueryer[uint64], lower, upper int64) (int64, error) {
+		result, err := r.ds.ExecContext(ctx, `DELETE FROM evm.log_poller_blocks WHERE evm_chain_id = $1 AND block_number >= $2 AND block_number <= $3`,
+			r.chainID, lower, upper)
+		if err != nil {
+			return 0, err
+		}
+		return result.RowsAffected()
+	})
+	return q.ExecPagedQuery(ctx, limit, end)
 }
 
 func (o *DSORM) DeleteLogsAndBlocksAfter(ctx context.Context, start int64) error {
@@ -386,23 +418,79 @@ type Exp struct {
 }
 
 func (o *DSORM) SelectUnmatchedLogIDs(ctx context.Context, limit int64) (ids []uint64, err error) {
-	query := `
-		SELECT l.id FROM evm.logs l LEFT JOIN (
+	batchLogsSubQuery := `SELECT id, evm_chain_id, address, event_sig FROM evm.logs
+                                WHERE evm_chain_id = $1 AND block_number >= $2 AND block_number <= $3`
+
+	query := fmt.Sprintf(`
+		SELECT l.id FROM (%s) l LEFT JOIN (
 			SELECT evm_chain_id, address, event
 			FROM evm.log_poller_filters
 				WHERE evm_chain_id = $1
 				GROUP BY evm_chain_id, address, event
 		) r ON l.evm_chain_id = r.evm_chain_id AND l.address = r.address AND l.event_sig = r.event
 		WHERE l.evm_chain_id = $1 AND r.evm_chain_id IS NULL
-	`
+	`, batchLogsSubQuery)
 
-	if limit == 0 {
-		err = o.ds.SelectContext(ctx, &ids, query, ubig.New(o.chainID))
+	latestBlock, err := o.SelectLatestBlock(ctx)
+	if err != nil {
 		return ids, err
 	}
-	err = o.ds.SelectContext(ctx, &ids, fmt.Sprintf("%s LIMIT %d", query, limit), ubig.New(o.chainID))
 
-	return ids, err
+	r := NewRangeQueryer[uint64](o.chainID, o.ds, func(ctx context.Context, r *RangeQueryer[uint64], lower, upper int64) (int64, error) {
+		var rowIDs []uint64
+		err2 := r.ds.SelectContext(ctx, &rowIDs, query, r.chainID, lower, upper)
+		if err2 != nil {
+			return 0, err2
+		}
+		r.AddResults(rowIDs)
+		return int64(len(rowIDs)), nil
+	})
+
+	_, err = r.ExecPagedQuery(ctx, limit, latestBlock.FinalizedBlockNumber)
+
+	return r.AllResults(), err
+}
+
+// SelectExcessLogIDs finds any logs old enough that MaxLogsKept has been exceeded for every filter they match.
+func (o *DSORM) SelectExcessLogIDs(ctx context.Context, limit int64) (results []uint64, err error) {
+	// Roll up the filter table into 1 row per filter
+	withSubQuery := `
+		SELECT name,
+				ARRAY_AGG(address) AS addresses, ARRAY_AGG(event) AS events,
+				MAX(max_logs_kept) AS max_logs_kept -- Should all be the same, just need MAX for GROUP BY
+			FROM evm.log_poller_filters WHERE evm_chain_id=$1
+			GROUP BY name`
+
+	// Count logs matching each filter in reverse order, labeling anything after the filter.max_logs_kept'th with old=true
+	countLogsSubQuery := `
+		SELECT l.id, block_number, log_index, max_logs_kept != 0 AND
+				ROW_NUMBER() OVER(PARTITION BY f.name ORDER BY block_number, log_index DESC) > max_logs_kept AS old
+			FROM filters f JOIN evm.logs l ON
+				l.address = ANY(f.addresses) AND l.event_sig = ANY(f.events)
+			WHERE evm_chain_id = $1 AND block_number >= $2 AND block_number <= $3
+	`
+
+	// Return all logs considered "old" by every filter they match
+	query := fmt.Sprintf(`WITH filters AS ( %s ) SELECT id FROM ( %s ) x GROUP BY id, block_number, log_index HAVING BOOL_AND(old)`,
+		withSubQuery, countLogsSubQuery)
+
+	latestBlock, err := o.SelectLatestBlock(ctx)
+	if err != nil {
+		return results, err
+	}
+
+	r := NewRangeQueryer[uint64](o.chainID, o.ds, func(ctx context.Context, r *RangeQueryer[uint64], lower, upper int64) (int64, error) {
+		var rowIDs []uint64
+		err = r.ds.SelectContext(ctx, &rowIDs, query, r.chainID, lower, upper)
+		if err != nil {
+			return 0, err
+		}
+		r.AddResults(rowIDs)
+		return int64(len(rowIDs)), err
+	})
+	_, err = r.ExecPagedQuery(ctx, limit, latestBlock.FinalizedBlockNumber)
+
+	return r.AllResults(), err
 }
 
 // DeleteExpiredLogs removes any logs which either:
diff --git a/core/chains/evm/logpoller/orm_test.go b/core/chains/evm/logpoller/orm_test.go
index 7ebc97bb835..6e618ba9cef 100644
--- a/core/chains/evm/logpoller/orm_test.go
+++ b/core/chains/evm/logpoller/orm_test.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"database/sql"
+	"errors"
 	"fmt"
 	"math"
 	"math/big"
@@ -11,10 +12,11 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/mock"
+
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
 
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/jackc/pgx/v4"
 	pkgerrors "github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -456,7 +458,7 @@ func TestORM(t *testing.T) {
 	require.Equal(t, 2, len(lgs))
 
 	require.NoError(t, o1.InsertBlock(ctx, common.HexToHash("0x1237"), 16, time.Now(), 0))
-	require.NoError(t, o1.InsertBlock(ctx, common.HexToHash("0x1238"), 17, time.Now(), 0))
+	require.NoError(t, o1.InsertBlock(ctx, common.HexToHash("0x1238"), 17, time.Now(), 17))
 
 	filter0 := logpoller.Filter{
 		Name:      "permanent retention filter",
@@ -545,16 +547,160 @@ func TestORM(t *testing.T) {
 	assert.Zero(t, len(logs))
 }
 
-type PgxLogger struct {
-	lggr logger.Logger
-}
+func TestORM_SelectExcessLogs(t *testing.T) {
+	t.Parallel()
+	th := SetupTH(t, lpOpts)
+	o1 := th.ORM
+	o2 := th.ORM2
+	ctx := testutils.Context(t)
 
-func NewPgxLogger(lggr logger.Logger) PgxLogger {
-	return PgxLogger{lggr}
-}
+	topic := common.HexToHash("0x1599")
+	topic2 := common.HexToHash("0x1600")
 
-func (l PgxLogger) Log(ctx context.Context, log pgx.LogLevel, msg string, data map[string]interface{}) {
+	blockHashes := []common.Hash{common.HexToHash("0x1234"), common.HexToHash("0x1235"), common.HexToHash("0x1236")}
 
+	// Insert blocks for active chain
+	for i := int64(0); i < 3; i++ {
+		blockNumber := 10 + i
+		require.NoError(t, o1.InsertBlock(ctx, blockHashes[i], blockNumber, time.Now(), blockNumber))
+		b1, err := o1.SelectBlockByHash(ctx, blockHashes[i])
+		require.NoError(t, err)
+		require.Equal(t, blockNumber, b1.BlockNumber)
+	}
+
+	// Insert block from a different chain
+	require.NoError(t, o2.InsertBlock(ctx, common.HexToHash("0x1234"), 17, time.Now(), 17))
+	b, err := o2.SelectBlockByHash(ctx, common.HexToHash("0x1234"))
+	require.NoError(t, err)
+	require.Equal(t, int64(17), b.BlockNumber)
+
+	for i := int64(0); i < 7; i++ {
+		require.NoError(t, o1.InsertLogs(ctx, []logpoller.Log{
+			{
+				EvmChainId:     ubig.New(th.ChainID),
+				LogIndex:       i,
+				BlockHash:      common.HexToHash("0x1234"),
+				BlockNumber:    int64(10),
+				EventSig:       topic,
+				Topics:         [][]byte{topic[:]},
+				Address:        common.HexToAddress("0x1234"),
+				TxHash:         common.HexToHash("0x1888"),
+				Data:           []byte("hello"),
+				BlockTimestamp: time.Now(),
+			},
+			{
+				EvmChainId:     ubig.New(th.ChainID),
+				LogIndex:       i,
+				BlockHash:      common.HexToHash("0x1234"),
+				BlockNumber:    int64(11),
+				EventSig:       topic,
+				Topics:         [][]byte{topic[:]},
+				Address:        common.HexToAddress("0x1235"),
+				TxHash:         common.HexToHash("0x1888"),
+				Data:           []byte("hello"),
+				BlockTimestamp: time.Now(),
+			},
+			{
+				EvmChainId:     ubig.New(th.ChainID),
+				LogIndex:       i,
+				BlockHash:      common.HexToHash("0x1234"),
+				BlockNumber:    int64(12),
+				EventSig:       topic2,
+				Topics:         [][]byte{topic2[:]},
+				Address:        common.HexToAddress("0x1235"),
+				TxHash:         common.HexToHash("0x1888"),
+				Data:           []byte("hello"),
+				BlockTimestamp: time.Now(),
+			},
+		}))
+	}
+
+	logs, err := o1.SelectLogsByBlockRange(ctx, 1, 12)
+	require.NoError(t, err)
+	require.Len(t, logs, 21)
+
+	// Insert a log on a different chain, to make sure
+	// it's not affected by any operations on the chain LogPoller
+	// is managing.
+	require.NoError(t, o2.InsertLogs(ctx, []logpoller.Log{
+		{
+			EvmChainId:     ubig.New(th.ChainID2),
+			LogIndex:       8,
+			BlockHash:      common.HexToHash("0x1238"),
+			BlockNumber:    int64(17),
+			EventSig:       topic2,
+			Topics:         [][]byte{topic2[:]},
+			Address:        common.HexToAddress("0x1236"),
+			TxHash:         common.HexToHash("0x1888"),
+			Data:           []byte("same log on unrelated chain"),
+			BlockTimestamp: time.Now(),
+		},
+	}))
+
+	logs, err = o2.SelectLogsByBlockRange(ctx, 1, 17)
+	require.NoError(t, err)
+	require.Len(t, logs, 1)
+
+	filter1 := logpoller.Filter{
+		Name:        "MaxLogsKept = 0 (addr 1234 topic1)",
+		Addresses:   []common.Address{common.HexToAddress("0x1234")},
+		EventSigs:   types.HashArray{topic},
+		MaxLogsKept: 0,
+	}
+
+	filter12 := logpoller.Filter{ // retain both topic1 and topic2 on contract3 for at least 1ms
+		Name:        "MaxLogsKept = 1 (addr 1235 topic1 & topic2)",
+		Addresses:   []common.Address{common.HexToAddress("0x1235")},
+		EventSigs:   types.HashArray{topic, topic2},
+		Retention:   time.Millisecond,
+		MaxLogsKept: 1,
+	}
+	filter2 := logpoller.Filter{ // retain topic2 on contract3 for at least 1 hour
+		Name:        "MaxLogsKept = 5 (addr 1235 topic2)",
+		Addresses:   []common.Address{common.HexToAddress("0x1235")},
+		EventSigs:   types.HashArray{topic2},
+		MaxLogsKept: 5,
+	}
+
+	// Test inserting filters and reading them back
+	require.NoError(t, o1.InsertFilter(ctx, filter1))
+	require.NoError(t, o1.InsertFilter(ctx, filter12))
+	require.NoError(t, o1.InsertFilter(ctx, filter2))
+
+	filters, err := o1.LoadFilters(ctx)
+	require.NoError(t, err)
+	require.Len(t, filters, 3)
+	assert.Equal(t, filter1, filters["MaxLogsKept = 0 (addr 1234 topic1)"])
+	assert.Equal(t, filter12, filters["MaxLogsKept = 1 (addr 1235 topic1 & topic2)"])
+	assert.Equal(t, filter2, filters["MaxLogsKept = 5 (addr 1235 topic2)"])
+
+	ids, err := o1.SelectUnmatchedLogIDs(ctx, 0)
+	require.NoError(t, err)
+	require.Len(t, ids, 0)
+
+	// Number of excess logs eligible for pruning:
+	// 2 of the 7 matching filter2 + 6 of the 7 matching filter12 but not filter2 = 8 total of 21
+
+	// Test SelectExcessLogIDs with limit less than # blocks
+	// ( should only consider blocks 10 & 11, returning 6 excess events from block 11
+	// but ignoring the 2 in block 12 )
+	ids, err = o1.SelectExcessLogIDs(ctx, 2)
+	require.NoError(t, err)
+	assert.Len(t, ids, 6)
+
+	// Test SelectExcessLogIDs with limit greater than # blocks:
+	ids, err = o1.SelectExcessLogIDs(ctx, 4)
+	require.NoError(t, err)
+	assert.Len(t, ids, 8)
+
+	// Test SelectExcessLogIDs with no limit
+	ids, err = o1.SelectExcessLogIDs(ctx, 10)
+	require.NoError(t, err)
+	assert.Len(t, ids, 8)
+
+	deleted, err := o1.DeleteLogsByRowID(ctx, ids)
+	require.NoError(t, err)
+	assert.Equal(t, int64(8), deleted)
 }
 
 func TestLogPollerFilters(t *testing.T) {
@@ -1166,6 +1312,70 @@ func TestORM_SelectLogsWithSigsByBlockRangeFilter(t *testing.T) {
 	assertion(t, logs, err, startBlock, endBlock)
 }
 
+type mockQueryExecutor struct {
+	mock.Mock
+}
+
+func (m *mockQueryExecutor) Exec(ctx context.Context, r *logpoller.RangeQueryer[uint64], lower, upper int64) (int64, error) {
+	res := m.Called(lower, upper)
+	return int64(res.Int(0)), res.Error(1)
+}
+
+func Test_ExecPagedQuery(t *testing.T) {
+	t.Parallel()
+	ctx := testutils.Context(t)
+	lggr := logger.Test(t)
+	chainID := testutils.NewRandomEVMChainID()
+	db := pgtest.NewSqlxDB(t)
+	o := logpoller.NewORM(chainID, db, lggr)
+
+	m := mockQueryExecutor{}
+
+	queryError := errors.New("some error")
+	m.On("Exec", int64(0), int64(0)).Return(0, queryError).Once()
+
+	// Should handle errors gracefully
+	r := logpoller.NewRangeQueryer(chainID, db, m.Exec)
+	_, err := r.ExecPagedQuery(ctx, 0, 0)
+	assert.ErrorIs(t, err, queryError)
+
+	m.On("Exec", int64(0), int64(60)).Return(4, nil).Once()
+
+	// Query should only get executed once with limitBlock=end if called with limit=0
+	numResults, err := r.ExecPagedQuery(ctx, 0, 60)
+	require.NoError(t, err)
+	assert.Equal(t, int64(4), numResults)
+
+	// Should report actual db errors
+	_, err = r.ExecPagedQuery(ctx, 300, 1000)
+	assert.Error(t, err)
+
+	require.NoError(t, o.InsertBlock(ctx, common.HexToHash("0x1234"), 42, time.Now(), 0))
+
+	m.On("Exec", mock.Anything, mock.Anything).Return(3, nil)
+
+	// Should get called with limitBlock = 342, 642, 942, 1000
+	numResults, err = r.ExecPagedQuery(ctx, 300, 1000)
+	require.NoError(t, err)
+	assert.Equal(t, int64(12), numResults) // 3 results in each of 4 calls
+	m.AssertNumberOfCalls(t, "Exec", 6)    // 4 new calls, plus the prior 2
+	expectedLimitBlocks := [][]int64{{42, 341}, {342, 641}, {642, 941}, {942, 1000}}
+	for _, expected := range expectedLimitBlocks {
+		m.AssertCalled(t, "Exec", expected[0], expected[1])
+	}
+
+	// Should not go all the way to 1000, but stop after ~ 13 results have
+	//  been returned
+	numResults, err = r.ExecPagedQuery(ctx, 15, 1000)
+	require.NoError(t, err)
+	assert.Equal(t, int64(15), numResults)
+	m.AssertNumberOfCalls(t, "Exec", 11)
+	expectedLimitBlocks = [][]int64{{42, 56}, {57, 71}, {72, 86}, {87, 101}, {102, 116}} // upper[n] = 42 + 15 * n - 1 for n = 1, 2, 3, 4, 5, lower[n] = upper[n-1] + 1
+	for _, expected := range expectedLimitBlocks {
+		m.AssertCalled(t, "Exec", expected[0], expected[1])
+	}
+}
+
 func TestORM_DeleteBlocksBefore(t *testing.T) {
 	th := SetupTH(t, lpOpts)
 	o1 := th.ORM
diff --git a/core/chains/evm/txmgr/test_helpers.go b/core/chains/evm/txmgr/test_helpers.go
index 5b5295432da..960d921e879 100644
--- a/core/chains/evm/txmgr/test_helpers.go
+++ b/core/chains/evm/txmgr/test_helpers.go
@@ -82,7 +82,7 @@ type TestDAOracleConfig struct {
 	evmconfig.DAOracle
 }
 
-func (d *TestDAOracleConfig) OracleType() toml.OracleType { return toml.OPStack }
+func (d *TestDAOracleConfig) OracleType() toml.DAOracleType { return toml.DAOracleOPStack }
 func (d *TestDAOracleConfig) OracleAddress() *types.EIP55Address {
 	a, err := types.NewEIP55Address("0x420000000000000000000000000000000000000F")
 	if err != nil {
diff --git a/core/gethwrappers/ccip/deployment_test/deployment_test.go b/core/gethwrappers/ccip/deployment_test/deployment_test.go
index a9c9dc1dd45..698b30c2066 100644
--- a/core/gethwrappers/ccip/deployment_test/deployment_test.go
+++ b/core/gethwrappers/ccip/deployment_test/deployment_test.go
@@ -73,9 +73,9 @@ func TestDeployAllV1_6(t *testing.T) {
 		owner,
 		chain,
 		fee_quoter.FeeQuoterStaticConfig{
-			MaxFeeJuelsPerMsg:  big.NewInt(1e18),
-			LinkToken:          common.HexToAddress("0x1"),
-			StalenessThreshold: 10,
+			MaxFeeJuelsPerMsg:            big.NewInt(1e18),
+			LinkToken:                    common.HexToAddress("0x1"),
+			TokenPriceStalenessThreshold: 10,
 		},
 		[]common.Address{common.HexToAddress("0x1")},
 		[]common.Address{common.HexToAddress("0x2")},
diff --git a/core/gethwrappers/ccip/generated/fee_quoter/fee_quoter.go b/core/gethwrappers/ccip/generated/fee_quoter/fee_quoter.go
index e6b31769246..6688a606860 100644
--- a/core/gethwrappers/ccip/generated/fee_quoter/fee_quoter.go
+++ b/core/gethwrappers/ccip/generated/fee_quoter/fee_quoter.go
@@ -63,6 +63,7 @@ type FeeQuoterDestChainConfig struct {
 	DefaultTxGasLimit                 uint32
 	GasMultiplierWeiPerEth            uint64
 	NetworkFeeUSDCents                uint32
+	GasPriceStalenessThreshold        uint32
 	EnforceOutOfOrder                 bool
 	ChainFamilySelector               [4]byte
 }
@@ -78,9 +79,9 @@ type FeeQuoterPremiumMultiplierWeiPerEthArgs struct {
 }
 
 type FeeQuoterStaticConfig struct {
-	MaxFeeJuelsPerMsg  *big.Int
-	LinkToken          common.Address
-	StalenessThreshold uint32
+	MaxFeeJuelsPerMsg            *big.Int
+	LinkToken                    common.Address
+	TokenPriceStalenessThreshold uint32
 }
 
 type FeeQuoterTokenPriceFeedConfig struct {
@@ -154,8 +155,8 @@ type KeystoneFeedsPermissionHandlerPermission struct {
 }
 
 var FeeQuoterMetaData = &bind.MetaData{
-	ABI: "[{\"inputs\":[{\"components\":[{\"internalType\":\"uint96\",\"name\":\"maxFeeJuelsPerMsg\",\"type\":\"uint96\"},{\"internalType\":\"address\",\"name\":\"linkToken\",\"type\":\"address\"},{\"internalType\":\"uint32\",\"name\":\"stalenessThreshold\",\"type\":\"uint32\"}],\"internalType\":\"structFeeQuoter.StaticConfig\",\"name\":\"staticConfig\",\"type\":\"tuple\"},{\"internalType\":\"address[]\",\"name\":\"priceUpdaters\",\"type\":\"address[]\"},{\"internalType\":\"address[]\",\"name\":\"feeTokens\",\"type\":\"address[]\"},{\"components\":[{\"internalType\":\"address\",\"name\":\"sourceToken\",\"type\":\"address\"},{\"components\":[{\"internalType\":\"address\",\"name\":\"dataFeedAddress\",\"type\":\"address\"},{\"internalType\":\"uint8\",\"name\":\"tokenDecimals\",\"type\":\"uint8\"}],\"internalType\":\"structFeeQuoter.TokenPriceFeedConfig\",\"name\":\"feedConfig\",\"type\":\"tuple\"}],\"internalType\":\"structFeeQuoter.TokenPriceFeedUpdate[]\",\"name\":\"tokenPriceFeeds\",\"type\":\"tuple[]\"},{\"components\":[{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"components\":[{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"},{\"components\":[{\"internalType\":\"uint32\",\"name\":\"minFeeUSDCents\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"maxFeeUSDCents\",\"type\":\"uint32\"},{\"internalType\":\"uint16\",\"name\":\"deciBps\",\"type\":\"uint16\"},{\"internalType\":\"uint32\",\"name\":\"destGasOverhead\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"destBytesOverhead\",\"type\":\"uint32\"},{\"internalType\":\"bool\",\"name\":\"isEnabled\",\"type\":\"bool\"}],\"internalType\":\"structFeeQuoter.TokenTransferFeeConfig\",\"name\":\"tokenTransferFeeConfig\",\"type\":\"tuple\"}],\"internalType\":\"structFeeQuoter.TokenTransferFeeConfigSingleTokenArgs[]\",\"name\":\"tokenTransferFeeConfigs\",\"type\":\"tuple[]\"}],\"internalType\":\"structFeeQuoter.TokenTransferFeeConfigArgs[]\",\"name\":\"tokenTransferFeeConfigArgs\",\"type\":\"tuple[]\"},{\"components\":[{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"},{\"internalType\":\"uint64\",\"name\":\"premiumMultiplierWeiPerEth\",\"type\":\"uint64\"}],\"internalType\":\"structFeeQuoter.PremiumMultiplierWeiPerEthArgs[]\",\"name\":\"premiumMultiplierWeiPerEthArgs\",\"type\":\"tuple[]\"},{\"components\":[{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"components\":[{\"internalType\":\"bool\",\"name\":\"isEnabled\",\"type\":\"bool\"},{\"internalType\":\"uint16\",\"name\":\"maxNumberOfTokensPerMsg\",\"type\":\"uint16\"},{\"internalType\":\"uint32\",\"name\":\"maxDataBytes\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"maxPerMsgGasLimit\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"destGasOverhead\",\"type\":\"uint32\"},{\"internalType\":\"uint16\",\"name\":\"destGasPerPayloadByte\",\"type\":\"uint16\"},{\"internalType\":\"uint32\",\"name\":\"destDataAvailabilityOverheadGas\",\"type\":\"uint32\"},{\"internalType\":\"uint16\",\"name\":\"destGasPerDataAvailabilityByte\",\"type\":\"uint16\"},{\"internalType\":\"uint16\",\"name\":\"destDataAvailabilityMultiplierBps\",\"type\":\"uint16\"},{\"internalType\":\"uint16\",\"name\":\"defaultTokenFeeUSDCents\",\"type\":\"uint16\"},{\"internalType\":\"uint32\",\"name\":\"defaultTokenDestGasOverhead\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"defaultTxGasLimit\",\"type\":\"uint32\"},{\"internalType\":\"uint64\",\"name\":\"gasMultiplierWeiPerEth\",\"type\":\"uint64\"},{\"internalType\":\"uint32\",\"name\":\"networkFeeUSDCents\",\"type\":\"uint32\"},{\"internalType\":\"bool\",\"name\":\"enforceOutOfOrder\",\"type\":\"bool\"},{\"internalType\":\"bytes4\",\"name\":\"chainFamilySelector\",\"type\":\"bytes4\"}],\"internalType\":\"structFeeQuoter.DestChainConfig\",\"name\":\"destChainConfig\",\"type\":\"tuple\"}],\"internalType\":\"structFeeQuoter.DestChainConfigArgs[]\",\"name\":\"destChainConfigArgs\",\"type\":\"tuple[]\"}],\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"chain\",\"type\":\"uint64\"}],\"name\":\"ChainNotSupported\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"DataFeedValueOutOfUint224Range\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"}],\"name\":\"DestinationChainNotEnabled\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"ExtraArgOutOfOrderExecutionMustBeTrue\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"}],\"name\":\"FeeTokenNotSupported\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"},{\"internalType\":\"uint32\",\"name\":\"destBytesOverhead\",\"type\":\"uint32\"}],\"name\":\"InvalidDestBytesOverhead\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"}],\"name\":\"InvalidDestChainConfig\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"bytes\",\"name\":\"encodedAddress\",\"type\":\"bytes\"}],\"name\":\"InvalidEVMAddress\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InvalidExtraArgsTag\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InvalidStaticConfig\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"msgFeeJuels\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"maxFeeJuelsPerMsg\",\"type\":\"uint256\"}],\"name\":\"MessageFeeTooHigh\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"MessageGasLimitTooHigh\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"maxSize\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"actualSize\",\"type\":\"uint256\"}],\"name\":\"MessageTooLarge\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"forwarder\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"workflowOwner\",\"type\":\"address\"},{\"internalType\":\"bytes10\",\"name\":\"workflowName\",\"type\":\"bytes10\"},{\"internalType\":\"bytes2\",\"name\":\"reportName\",\"type\":\"bytes2\"}],\"name\":\"ReportForwarderUnauthorized\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"}],\"name\":\"SourceTokenDataTooLarge\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"uint256\",\"name\":\"threshold\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"timePassed\",\"type\":\"uint256\"}],\"name\":\"StaleGasPrice\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"feedTimestamp\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"storedTimeStamp\",\"type\":\"uint256\"}],\"name\":\"StaleKeystoneUpdate\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"}],\"name\":\"TokenNotSupported\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"caller\",\"type\":\"address\"}],\"name\":\"UnauthorizedCaller\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"UnsupportedNumberOfTokens\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"ZeroAddressNotAllowed\",\"type\":\"error\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"address\",\"name\":\"caller\",\"type\":\"address\"}],\"name\":\"AuthorizedCallerAdded\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"address\",\"name\":\"caller\",\"type\":\"address\"}],\"name\":\"AuthorizedCallerRemoved\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"components\":[{\"internalType\":\"bool\",\"name\":\"isEnabled\",\"type\":\"bool\"},{\"internalType\":\"uint16\",\"name\":\"maxNumberOfTokensPerMsg\",\"type\":\"uint16\"},{\"internalType\":\"uint32\",\"name\":\"maxDataBytes\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"maxPerMsgGasLimit\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"destGasOverhead\",\"type\":\"uint32\"},{\"internalType\":\"uint16\",\"name\":\"destGasPerPayloadByte\",\"type\":\"uint16\"},{\"internalType\":\"uint32\",\"name\":\"destDataAvailabilityOverheadGas\",\"type\":\"uint32\"},{\"internalType\":\"uint16\",\"name\":\"destGasPerDataAvailabilityByte\",\"type\":\"uint16\"},{\"internalType\":\"uint16\",\"name\":\"destDataAvailabilityMultiplierBps\",\"type\":\"uint16\"},{\"internalType\":\"uint16\",\"name\":\"defaultTokenFeeUSDCents\",\"type\":\"uint16\"},{\"internalType\":\"uint32\",\"name\":\"defaultTokenDestGasOverhead\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"defaultTxGasLimit\",\"type\":\"uint32\"},{\"internalType\":\"uint64\",\"name\":\"gasMultiplierWeiPerEth\",\"type\":\"uint64\"},{\"internalType\":\"uint32\",\"name\":\"networkFeeUSDCents\",\"type\":\"uint32\"},{\"internalType\":\"bool\",\"name\":\"enforceOutOfOrder\",\"type\":\"bool\"},{\"internalType\":\"bytes4\",\"name\":\"chainFamilySelector\",\"type\":\"bytes4\"}],\"indexed\":false,\"internalType\":\"structFeeQuoter.DestChainConfig\",\"name\":\"destChainConfig\",\"type\":\"tuple\"}],\"name\":\"DestChainAdded\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"components\":[{\"internalType\":\"bool\",\"name\":\"isEnabled\",\"type\":\"bool\"},{\"internalType\":\"uint16\",\"name\":\"maxNumberOfTokensPerMsg\",\"type\":\"uint16\"},{\"internalType\":\"uint32\",\"name\":\"maxDataBytes\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"maxPerMsgGasLimit\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"destGasOverhead\",\"type\":\"uint32\"},{\"internalType\":\"uint16\",\"name\":\"destGasPerPayloadByte\",\"type\":\"uint16\"},{\"internalType\":\"uint32\",\"name\":\"destDataAvailabilityOverheadGas\",\"type\":\"uint32\"},{\"internalType\":\"uint16\",\"name\":\"destGasPerDataAvailabilityByte\",\"type\":\"uint16\"},{\"internalType\":\"uint16\",\"name\":\"destDataAvailabilityMultiplierBps\",\"type\":\"uint16\"},{\"internalType\":\"uint16\",\"name\":\"defaultTokenFeeUSDCents\",\"type\":\"uint16\"},{\"internalType\":\"uint32\",\"name\":\"defaultTokenDestGasOverhead\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"defaultTxGasLimit\",\"type\":\"uint32\"},{\"internalType\":\"uint64\",\"name\":\"gasMultiplierWeiPerEth\",\"type\":\"uint64\"},{\"internalType\":\"uint32\",\"name\":\"networkFeeUSDCents\",\"type\":\"uint32\"},{\"internalType\":\"bool\",\"name\":\"enforceOutOfOrder\",\"type\":\"bool\"},{\"internalType\":\"bytes4\",\"name\":\"chainFamilySelector\",\"type\":\"bytes4\"}],\"indexed\":false,\"internalType\":\"structFeeQuoter.DestChainConfig\",\"name\":\"destChainConfig\",\"type\":\"tuple\"}],\"name\":\"DestChainConfigUpdated\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"feeToken\",\"type\":\"address\"}],\"name\":\"FeeTokenAdded\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"feeToken\",\"type\":\"address\"}],\"name\":\"FeeTokenRemoved\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"from\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"}],\"name\":\"OwnershipTransferRequested\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"from\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"}],\"name\":\"OwnershipTransferred\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"uint64\",\"name\":\"premiumMultiplierWeiPerEth\",\"type\":\"uint64\"}],\"name\":\"PremiumMultiplierWeiPerEthUpdated\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"},{\"components\":[{\"internalType\":\"address\",\"name\":\"dataFeedAddress\",\"type\":\"address\"},{\"internalType\":\"uint8\",\"name\":\"tokenDecimals\",\"type\":\"uint8\"}],\"indexed\":false,\"internalType\":\"structFeeQuoter.TokenPriceFeedConfig\",\"name\":\"priceFeedConfig\",\"type\":\"tuple\"}],\"name\":\"PriceFeedPerTokenUpdated\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"reportId\",\"type\":\"bytes32\"},{\"components\":[{\"internalType\":\"address\",\"name\":\"forwarder\",\"type\":\"address\"},{\"internalType\":\"bytes10\",\"name\":\"workflowName\",\"type\":\"bytes10\"},{\"internalType\":\"bytes2\",\"name\":\"reportName\",\"type\":\"bytes2\"},{\"internalType\":\"address\",\"name\":\"workflowOwner\",\"type\":\"address\"},{\"internalType\":\"bool\",\"name\":\"isAllowed\",\"type\":\"bool\"}],\"indexed\":false,\"internalType\":\"structKeystoneFeedsPermissionHandler.Permission\",\"name\":\"permission\",\"type\":\"tuple\"}],\"name\":\"ReportPermissionSet\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"}],\"name\":\"TokenTransferFeeConfigDeleted\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"},{\"components\":[{\"internalType\":\"uint32\",\"name\":\"minFeeUSDCents\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"maxFeeUSDCents\",\"type\":\"uint32\"},{\"internalType\":\"uint16\",\"name\":\"deciBps\",\"type\":\"uint16\"},{\"internalType\":\"uint32\",\"name\":\"destGasOverhead\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"destBytesOverhead\",\"type\":\"uint32\"},{\"internalType\":\"bool\",\"name\":\"isEnabled\",\"type\":\"bool\"}],\"indexed\":false,\"internalType\":\"structFeeQuoter.TokenTransferFeeConfig\",\"name\":\"tokenTransferFeeConfig\",\"type\":\"tuple\"}],\"name\":\"TokenTransferFeeConfigUpdated\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"value\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"timestamp\",\"type\":\"uint256\"}],\"name\":\"UsdPerTokenUpdated\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"destChain\",\"type\":\"uint64\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"value\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"timestamp\",\"type\":\"uint256\"}],\"name\":\"UsdPerUnitGasUpdated\",\"type\":\"event\"},{\"inputs\":[],\"name\":\"FEE_BASE_DECIMALS\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"KEYSTONE_PRICE_DECIMALS\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"acceptOwnership\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"address[]\",\"name\":\"addedCallers\",\"type\":\"address[]\"},{\"internalType\":\"address[]\",\"name\":\"removedCallers\",\"type\":\"address[]\"}],\"internalType\":\"structAuthorizedCallers.AuthorizedCallerArgs\",\"name\":\"authorizedCallerArgs\",\"type\":\"tuple\"}],\"name\":\"applyAuthorizedCallerUpdates\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"components\":[{\"internalType\":\"bool\",\"name\":\"isEnabled\",\"type\":\"bool\"},{\"internalType\":\"uint16\",\"name\":\"maxNumberOfTokensPerMsg\",\"type\":\"uint16\"},{\"internalType\":\"uint32\",\"name\":\"maxDataBytes\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"maxPerMsgGasLimit\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"destGasOverhead\",\"type\":\"uint32\"},{\"internalType\":\"uint16\",\"name\":\"destGasPerPayloadByte\",\"type\":\"uint16\"},{\"internalType\":\"uint32\",\"name\":\"destDataAvailabilityOverheadGas\",\"type\":\"uint32\"},{\"internalType\":\"uint16\",\"name\":\"destGasPerDataAvailabilityByte\",\"type\":\"uint16\"},{\"internalType\":\"uint16\",\"name\":\"destDataAvailabilityMultiplierBps\",\"type\":\"uint16\"},{\"internalType\":\"uint16\",\"name\":\"defaultTokenFeeUSDCents\",\"type\":\"uint16\"},{\"internalType\":\"uint32\",\"name\":\"defaultTokenDestGasOverhead\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"defaultTxGasLimit\",\"type\":\"uint32\"},{\"internalType\":\"uint64\",\"name\":\"gasMultiplierWeiPerEth\",\"type\":\"uint64\"},{\"internalType\":\"uint32\",\"name\":\"networkFeeUSDCents\",\"type\":\"uint32\"},{\"internalType\":\"bool\",\"name\":\"enforceOutOfOrder\",\"type\":\"bool\"},{\"internalType\":\"bytes4\",\"name\":\"chainFamilySelector\",\"type\":\"bytes4\"}],\"internalType\":\"structFeeQuoter.DestChainConfig\",\"name\":\"destChainConfig\",\"type\":\"tuple\"}],\"internalType\":\"structFeeQuoter.DestChainConfigArgs[]\",\"name\":\"destChainConfigArgs\",\"type\":\"tuple[]\"}],\"name\":\"applyDestChainConfigUpdates\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address[]\",\"name\":\"feeTokensToAdd\",\"type\":\"address[]\"},{\"internalType\":\"address[]\",\"name\":\"feeTokensToRemove\",\"type\":\"address[]\"}],\"name\":\"applyFeeTokensUpdates\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"},{\"internalType\":\"uint64\",\"name\":\"premiumMultiplierWeiPerEth\",\"type\":\"uint64\"}],\"internalType\":\"structFeeQuoter.PremiumMultiplierWeiPerEthArgs[]\",\"name\":\"premiumMultiplierWeiPerEthArgs\",\"type\":\"tuple[]\"}],\"name\":\"applyPremiumMultiplierWeiPerEthUpdates\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"components\":[{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"},{\"components\":[{\"internalType\":\"uint32\",\"name\":\"minFeeUSDCents\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"maxFeeUSDCents\",\"type\":\"uint32\"},{\"internalType\":\"uint16\",\"name\":\"deciBps\",\"type\":\"uint16\"},{\"internalType\":\"uint32\",\"name\":\"destGasOverhead\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"destBytesOverhead\",\"type\":\"uint32\"},{\"internalType\":\"bool\",\"name\":\"isEnabled\",\"type\":\"bool\"}],\"internalType\":\"structFeeQuoter.TokenTransferFeeConfig\",\"name\":\"tokenTransferFeeConfig\",\"type\":\"tuple\"}],\"internalType\":\"structFeeQuoter.TokenTransferFeeConfigSingleTokenArgs[]\",\"name\":\"tokenTransferFeeConfigs\",\"type\":\"tuple[]\"}],\"internalType\":\"structFeeQuoter.TokenTransferFeeConfigArgs[]\",\"name\":\"tokenTransferFeeConfigArgs\",\"type\":\"tuple[]\"},{\"components\":[{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"}],\"internalType\":\"structFeeQuoter.TokenTransferFeeConfigRemoveArgs[]\",\"name\":\"tokensToUseDefaultFeeConfigs\",\"type\":\"tuple[]\"}],\"name\":\"applyTokenTransferFeeConfigUpdates\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"fromToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"fromTokenAmount\",\"type\":\"uint256\"},{\"internalType\":\"address\",\"name\":\"toToken\",\"type\":\"address\"}],\"name\":\"convertTokenAmount\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getAllAuthorizedCallers\",\"outputs\":[{\"internalType\":\"address[]\",\"name\":\"\",\"type\":\"address[]\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"}],\"name\":\"getDestChainConfig\",\"outputs\":[{\"components\":[{\"internalType\":\"bool\",\"name\":\"isEnabled\",\"type\":\"bool\"},{\"internalType\":\"uint16\",\"name\":\"maxNumberOfTokensPerMsg\",\"type\":\"uint16\"},{\"internalType\":\"uint32\",\"name\":\"maxDataBytes\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"maxPerMsgGasLimit\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"destGasOverhead\",\"type\":\"uint32\"},{\"internalType\":\"uint16\",\"name\":\"destGasPerPayloadByte\",\"type\":\"uint16\"},{\"internalType\":\"uint32\",\"name\":\"destDataAvailabilityOverheadGas\",\"type\":\"uint32\"},{\"internalType\":\"uint16\",\"name\":\"destGasPerDataAvailabilityByte\",\"type\":\"uint16\"},{\"internalType\":\"uint16\",\"name\":\"destDataAvailabilityMultiplierBps\",\"type\":\"uint16\"},{\"internalType\":\"uint16\",\"name\":\"defaultTokenFeeUSDCents\",\"type\":\"uint16\"},{\"internalType\":\"uint32\",\"name\":\"defaultTokenDestGasOverhead\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"defaultTxGasLimit\",\"type\":\"uint32\"},{\"internalType\":\"uint64\",\"name\":\"gasMultiplierWeiPerEth\",\"type\":\"uint64\"},{\"internalType\":\"uint32\",\"name\":\"networkFeeUSDCents\",\"type\":\"uint32\"},{\"internalType\":\"bool\",\"name\":\"enforceOutOfOrder\",\"type\":\"bool\"},{\"internalType\":\"bytes4\",\"name\":\"chainFamilySelector\",\"type\":\"bytes4\"}],\"internalType\":\"structFeeQuoter.DestChainConfig\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"}],\"name\":\"getDestinationChainGasPrice\",\"outputs\":[{\"components\":[{\"internalType\":\"uint224\",\"name\":\"value\",\"type\":\"uint224\"},{\"internalType\":\"uint32\",\"name\":\"timestamp\",\"type\":\"uint32\"}],\"internalType\":\"structInternal.TimestampedPackedUint224\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getFeeTokens\",\"outputs\":[{\"internalType\":\"address[]\",\"name\":\"\",\"type\":\"address[]\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"}],\"name\":\"getPremiumMultiplierWeiPerEth\",\"outputs\":[{\"internalType\":\"uint64\",\"name\":\"premiumMultiplierWeiPerEth\",\"type\":\"uint64\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getStaticConfig\",\"outputs\":[{\"components\":[{\"internalType\":\"uint96\",\"name\":\"maxFeeJuelsPerMsg\",\"type\":\"uint96\"},{\"internalType\":\"address\",\"name\":\"linkToken\",\"type\":\"address\"},{\"internalType\":\"uint32\",\"name\":\"stalenessThreshold\",\"type\":\"uint32\"}],\"internalType\":\"structFeeQuoter.StaticConfig\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"},{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"}],\"name\":\"getTokenAndGasPrices\",\"outputs\":[{\"internalType\":\"uint224\",\"name\":\"tokenPrice\",\"type\":\"uint224\"},{\"internalType\":\"uint224\",\"name\":\"gasPriceValue\",\"type\":\"uint224\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"}],\"name\":\"getTokenPrice\",\"outputs\":[{\"components\":[{\"internalType\":\"uint224\",\"name\":\"value\",\"type\":\"uint224\"},{\"internalType\":\"uint32\",\"name\":\"timestamp\",\"type\":\"uint32\"}],\"internalType\":\"structInternal.TimestampedPackedUint224\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"}],\"name\":\"getTokenPriceFeedConfig\",\"outputs\":[{\"components\":[{\"internalType\":\"address\",\"name\":\"dataFeedAddress\",\"type\":\"address\"},{\"internalType\":\"uint8\",\"name\":\"tokenDecimals\",\"type\":\"uint8\"}],\"internalType\":\"structFeeQuoter.TokenPriceFeedConfig\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address[]\",\"name\":\"tokens\",\"type\":\"address[]\"}],\"name\":\"getTokenPrices\",\"outputs\":[{\"components\":[{\"internalType\":\"uint224\",\"name\":\"value\",\"type\":\"uint224\"},{\"internalType\":\"uint32\",\"name\":\"timestamp\",\"type\":\"uint32\"}],\"internalType\":\"structInternal.TimestampedPackedUint224[]\",\"name\":\"\",\"type\":\"tuple[]\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"}],\"name\":\"getTokenTransferFeeConfig\",\"outputs\":[{\"components\":[{\"internalType\":\"uint32\",\"name\":\"minFeeUSDCents\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"maxFeeUSDCents\",\"type\":\"uint32\"},{\"internalType\":\"uint16\",\"name\":\"deciBps\",\"type\":\"uint16\"},{\"internalType\":\"uint32\",\"name\":\"destGasOverhead\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"destBytesOverhead\",\"type\":\"uint32\"},{\"internalType\":\"bool\",\"name\":\"isEnabled\",\"type\":\"bool\"}],\"internalType\":\"structFeeQuoter.TokenTransferFeeConfig\",\"name\":\"tokenTransferFeeConfig\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"components\":[{\"internalType\":\"bytes\",\"name\":\"receiver\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"},{\"components\":[{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"internalType\":\"structClient.EVMTokenAmount[]\",\"name\":\"tokenAmounts\",\"type\":\"tuple[]\"},{\"internalType\":\"address\",\"name\":\"feeToken\",\"type\":\"address\"},{\"internalType\":\"bytes\",\"name\":\"extraArgs\",\"type\":\"bytes\"}],\"internalType\":\"structClient.EVM2AnyMessage\",\"name\":\"message\",\"type\":\"tuple\"}],\"name\":\"getValidatedFee\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"feeTokenAmount\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"}],\"name\":\"getValidatedTokenPrice\",\"outputs\":[{\"internalType\":\"uint224\",\"name\":\"\",\"type\":\"uint224\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes\",\"name\":\"metadata\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"report\",\"type\":\"bytes\"}],\"name\":\"onReport\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"owner\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"address\",\"name\":\"feeToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"feeTokenAmount\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"extraArgs\",\"type\":\"bytes\"},{\"components\":[{\"internalType\":\"address\",\"name\":\"sourcePoolAddress\",\"type\":\"address\"},{\"internalType\":\"bytes\",\"name\":\"destTokenAddress\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"extraData\",\"type\":\"bytes\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"destExecData\",\"type\":\"bytes\"}],\"internalType\":\"structInternal.EVM2AnyTokenTransfer[]\",\"name\":\"onRampTokenTransfers\",\"type\":\"tuple[]\"},{\"components\":[{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"internalType\":\"structClient.EVMTokenAmount[]\",\"name\":\"sourceTokenAmounts\",\"type\":\"tuple[]\"}],\"name\":\"processMessageArgs\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"msgFeeJuels\",\"type\":\"uint256\"},{\"internalType\":\"bool\",\"name\":\"isOutOfOrderExecution\",\"type\":\"bool\"},{\"internalType\":\"bytes\",\"name\":\"convertedExtraArgs\",\"type\":\"bytes\"},{\"internalType\":\"bytes[]\",\"name\":\"destExecDataPerToken\",\"type\":\"bytes[]\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"address\",\"name\":\"forwarder\",\"type\":\"address\"},{\"internalType\":\"bytes10\",\"name\":\"workflowName\",\"type\":\"bytes10\"},{\"internalType\":\"bytes2\",\"name\":\"reportName\",\"type\":\"bytes2\"},{\"internalType\":\"address\",\"name\":\"workflowOwner\",\"type\":\"address\"},{\"internalType\":\"bool\",\"name\":\"isAllowed\",\"type\":\"bool\"}],\"internalType\":\"structKeystoneFeedsPermissionHandler.Permission[]\",\"name\":\"permissions\",\"type\":\"tuple[]\"}],\"name\":\"setReportPermissions\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"}],\"name\":\"transferOwnership\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"typeAndVersion\",\"outputs\":[{\"internalType\":\"string\",\"name\":\"\",\"type\":\"string\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"components\":[{\"internalType\":\"address\",\"name\":\"sourceToken\",\"type\":\"address\"},{\"internalType\":\"uint224\",\"name\":\"usdPerToken\",\"type\":\"uint224\"}],\"internalType\":\"structInternal.TokenPriceUpdate[]\",\"name\":\"tokenPriceUpdates\",\"type\":\"tuple[]\"},{\"components\":[{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"uint224\",\"name\":\"usdPerUnitGas\",\"type\":\"uint224\"}],\"internalType\":\"structInternal.GasPriceUpdate[]\",\"name\":\"gasPriceUpdates\",\"type\":\"tuple[]\"}],\"internalType\":\"structInternal.PriceUpdates\",\"name\":\"priceUpdates\",\"type\":\"tuple\"}],\"name\":\"updatePrices\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"address\",\"name\":\"sourceToken\",\"type\":\"address\"},{\"components\":[{\"internalType\":\"address\",\"name\":\"dataFeedAddress\",\"type\":\"address\"},{\"internalType\":\"uint8\",\"name\":\"tokenDecimals\",\"type\":\"uint8\"}],\"internalType\":\"structFeeQuoter.TokenPriceFeedConfig\",\"name\":\"feedConfig\",\"type\":\"tuple\"}],\"internalType\":\"structFeeQuoter.TokenPriceFeedUpdate[]\",\"name\":\"tokenPriceFeedUpdates\",\"type\":\"tuple[]\"}],\"name\":\"updateTokenPriceFeeds\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"}]",
-	Bin: "0x60e06040523480156200001157600080fd5b506040516200776138038062007761833981016040819052620000349162001834565b8533806000816200008c5760405162461bcd60e51b815260206004820152601860248201527f43616e6e6f7420736574206f776e657220746f207a65726f000000000000000060448201526064015b60405180910390fd5b600080546001600160a01b0319166001600160a01b0384811691909117909155811615620000bf57620000bf8162000207565b5050604080518082018252838152815160008152602080820190935291810191909152620000ee9150620002b2565b5060208701516001600160a01b0316158062000112575086516001600160601b0316155b80620001265750604087015163ffffffff16155b15620001455760405163d794ef9560e01b815260040160405180910390fd5b6020878101516001600160a01b031660a05287516001600160601b031660805260408089015163ffffffff1660c05280516000815291820190526200018c90869062000401565b620001978462000549565b620001a2816200061a565b620001ad8262000a5a565b60408051600080825260208201909252620001fa91859190620001f3565b6040805180820190915260008082526020820152815260200190600190039081620001cb5790505b5062000b26565b5050505050505062001ae5565b336001600160a01b03821603620002615760405162461bcd60e51b815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c66000000000000000000604482015260640162000083565b600180546001600160a01b0319166001600160a01b0383811691821790925560008054604051929316917fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae12789190a350565b602081015160005b815181101562000342576000828281518110620002db57620002db62001953565b60209081029190910101519050620002f560028262000e5f565b1562000338576040516001600160a01b03821681527fc3803387881faad271c47728894e3e36fac830ffc8602ca6fc07733cbda775809060200160405180910390a15b50600101620002ba565b50815160005b8151811015620003fb57600082828151811062000369576200036962001953565b6020026020010151905060006001600160a01b0316816001600160a01b031603620003a7576040516342bcdf7f60e11b815260040160405180910390fd5b620003b460028262000e7f565b506040516001600160a01b03821681527feb1b9b92e50b7f88f9ff25d56765095ac6e91540eee214906f4036a908ffbdef9060200160405180910390a15060010162000348565b50505050565b60005b8251811015620004a2576200044083828151811062000427576200042762001953565b6020026020010151600b62000e7f60201b90919060201c565b1562000499578281815181106200045b576200045b62001953565b60200260200101516001600160a01b03167fdf1b1bd32a69711488d71554706bb130b1fc63a5fa1a2cd85e8440f84065ba2360405160405180910390a25b60010162000404565b5060005b81518110156200054457620004e2828281518110620004c957620004c962001953565b6020026020010151600b62000e9660201b90919060201c565b156200053b57818181518110620004fd57620004fd62001953565b60200260200101516001600160a01b03167f1795838dc8ab2ffc5f431a1729a6afa0b587f982f7b2be0b9d7187a1ef547f9160405160405180910390a25b600101620004a6565b505050565b60005b8151811015620006165760008282815181106200056d576200056d62001953565b6020908102919091018101518051818301516001600160a01b0380831660008181526007875260409081902084518154868a018051929096166001600160a81b03199091168117600160a01b60ff9384160217909255825191825293519093169683019690965293955091939092917f08a5f7f5bb38a81d8e43aca13ecd76431dbf8816ae4699affff7b00b2fc1c464910160405180910390a25050508060010190506200054c565b5050565b60005b8151811015620006165760008282815181106200063e576200063e62001953565b6020026020010151905060008383815181106200065f576200065f62001953565b6020026020010151600001519050600082602001519050816001600160401b03166000148062000698575061016081015163ffffffff16155b80620006ba57506101e08101516001600160e01b031916630a04b54b60e21b14155b80620006da5750806060015163ffffffff1681610160015163ffffffff16115b15620007055760405163c35aa79d60e01b81526001600160401b038316600482015260240162000083565b6001600160401b038216600090815260096020526040812060010154600160881b900460e01b6001600160e01b03191690036200078557816001600160401b03167fd31c671936387b2f84ed402b553bd50c0e9c20408ea4e91a836d77b8180fb7248260405162000777919062001969565b60405180910390a2620007c9565b816001600160401b03167f1edd6f3553cfa16f10b95b195abae3a1cfca4783de4843f95d674b1e1df5ab2082604051620007c0919062001969565b60405180910390a25b8060096000846001600160401b03166001600160401b0316815260200190815260200160002060008201518160000160006101000a81548160ff02191690831515021790555060208201518160000160016101000a81548161ffff021916908361ffff16021790555060408201518160000160036101000a81548163ffffffff021916908363ffffffff16021790555060608201518160000160076101000a81548163ffffffff021916908363ffffffff160217905550608082015181600001600b6101000a81548163ffffffff021916908363ffffffff16021790555060a082015181600001600f6101000a81548161ffff021916908361ffff16021790555060c08201518160000160116101000a81548163ffffffff021916908363ffffffff16021790555060e08201518160000160156101000a81548161ffff021916908361ffff1602179055506101008201518160000160176101000a81548161ffff021916908361ffff1602179055506101208201518160000160196101000a81548161ffff021916908361ffff16021790555061014082015181600001601b6101000a81548163ffffffff021916908363ffffffff1602179055506101608201518160010160006101000a81548163ffffffff021916908363ffffffff1602179055506101808201518160010160046101000a8154816001600160401b0302191690836001600160401b031602179055506101a082015181600101600c6101000a81548163ffffffff021916908363ffffffff1602179055506101c08201518160010160106101000a81548160ff0219169083151502179055506101e08201518160010160116101000a81548163ffffffff021916908360e01c02179055509050505050508060010190506200061d565b60005b81518110156200061657600082828151811062000a7e5762000a7e62001953565b6020026020010151600001519050600083838151811062000aa35762000aa362001953565b6020908102919091018101518101516001600160a01b03841660008181526008845260409081902080546001600160401b0319166001600160401b0385169081179091559051908152919350917fbb77da6f7210cdd16904228a9360133d1d7dfff99b1bc75f128da5b53e28f97d910160405180910390a2505060010162000a5d565b60005b825181101562000d9957600083828151811062000b4a5762000b4a62001953565b6020026020010151905060008160000151905060005b82602001515181101562000d8a5760008360200151828151811062000b895762000b8962001953565b602002602001015160200151905060008460200151838151811062000bb25762000bb262001953565b6020026020010151600001519050602063ffffffff16826080015163ffffffff16101562000c115760808201516040516312766e0160e11b81526001600160a01b038316600482015263ffffffff909116602482015260440162000083565b6001600160401b0384166000818152600a602090815260408083206001600160a01b0386168085529083529281902086518154938801518389015160608a015160808b015160a08c01511515600160901b0260ff60901b1963ffffffff928316600160701b021664ffffffffff60701b199383166a01000000000000000000000263ffffffff60501b1961ffff90961668010000000000000000029590951665ffffffffffff60401b19968416640100000000026001600160401b0319909b16939097169290921798909817939093169390931717919091161792909217909155519091907f94967ae9ea7729ad4f54021c1981765d2b1d954f7c92fbec340aa0a54f46b8b59062000d77908690600060c08201905063ffffffff80845116835280602085015116602084015261ffff60408501511660408401528060608501511660608401528060808501511660808401525060a0830151151560a083015292915050565b60405180910390a3505060010162000b60565b50505080600101905062000b29565b5060005b81518110156200054457600082828151811062000dbe5762000dbe62001953565b6020026020010151600001519050600083838151811062000de35762000de362001953565b6020908102919091018101518101516001600160401b0384166000818152600a845260408082206001600160a01b038516808452955280822080546001600160981b03191690555192945090917f4de5b1bcbca6018c11303a2c3f4a4b4f22a1c741d8c4ba430d246ac06c5ddf8b9190a3505060010162000d9d565b600062000e76836001600160a01b03841662000ead565b90505b92915050565b600062000e76836001600160a01b03841662000fb1565b600062000e76836001600160a01b03841662001003565b6000818152600183016020526040812054801562000fa657600062000ed460018362001aad565b855490915060009062000eea9060019062001aad565b905081811462000f5657600086600001828154811062000f0e5762000f0e62001953565b906000526020600020015490508087600001848154811062000f345762000f3462001953565b6000918252602080832090910192909255918252600188019052604090208390555b855486908062000f6a5762000f6a62001acf565b60019003818190600052602060002001600090559055856001016000868152602001908152602001600020600090556001935050505062000e79565b600091505062000e79565b600081815260018301602052604081205462000ffa5750815460018181018455600084815260208082209093018490558454848252828601909352604090209190915562000e79565b50600062000e79565b6000818152600183016020526040812054801562000fa65760006200102a60018362001aad565b8554909150600090620010409060019062001aad565b905080821462000f5657600086600001828154811062000f0e5762000f0e62001953565b634e487b7160e01b600052604160045260246000fd5b604080519081016001600160401b03811182821017156200109f576200109f62001064565b60405290565b60405160c081016001600160401b03811182821017156200109f576200109f62001064565b60405161020081016001600160401b03811182821017156200109f576200109f62001064565b604051601f8201601f191681016001600160401b03811182821017156200111b576200111b62001064565b604052919050565b80516001600160a01b03811681146200113b57600080fd5b919050565b805163ffffffff811681146200113b57600080fd5b6000606082840312156200116857600080fd5b604051606081016001600160401b03811182821017156200118d576200118d62001064565b604052825190915081906001600160601b0381168114620011ad57600080fd5b8152620011bd6020840162001123565b6020820152620011d06040840162001140565b60408201525092915050565b60006001600160401b03821115620011f857620011f862001064565b5060051b60200190565b600082601f8301126200121457600080fd5b815160206200122d6200122783620011dc565b620010f0565b8083825260208201915060208460051b8701019350868411156200125057600080fd5b602086015b848110156200127757620012698162001123565b835291830191830162001255565b509695505050505050565b600082601f8301126200129457600080fd5b81516020620012a76200122783620011dc565b82815260609283028501820192828201919087851115620012c757600080fd5b8387015b858110156200135a5780890382811215620012e65760008081fd5b620012f06200107a565b620012fb8362001123565b8152604080601f1984011215620013125760008081fd5b6200131c6200107a565b92506200132b88850162001123565b835283015160ff81168114620013415760008081fd5b82880152808701919091528452928401928101620012cb565b5090979650505050505050565b80516001600160401b03811681146200113b57600080fd5b805161ffff811681146200113b57600080fd5b805180151581146200113b57600080fd5b600082601f830112620013b557600080fd5b81516020620013c86200122783620011dc565b82815260059290921b84018101918181019086841115620013e857600080fd5b8286015b84811015620012775780516001600160401b03808211156200140d57600080fd5b908801906040601f19838c0381018213156200142857600080fd5b620014326200107a565b6200143f89860162001367565b815282850151848111156200145357600080fd5b8086019550508c603f8601126200146957600080fd5b8885015193506200147e6200122785620011dc565b84815260e09094028501830193898101908e8611156200149d57600080fd5b958401955b858710156200157657868f0360e0811215620014bd57600080fd5b620014c76200107a565b620014d28962001123565b815260c08683011215620014e557600080fd5b620014ef620010a5565b9150620014fe8d8a0162001140565b82526200150d878a0162001140565b8d8301526200151f60608a016200137f565b878301526200153160808a0162001140565b60608301526200154460a08a0162001140565b60808301526200155760c08a0162001392565b60a0830152808d0191909152825260e09690960195908a0190620014a2565b828b015250875250505092840192508301620013ec565b600082601f8301126200159f57600080fd5b81516020620015b26200122783620011dc565b82815260069290921b84018101918181019086841115620015d257600080fd5b8286015b84811015620012775760408189031215620015f15760008081fd5b620015fb6200107a565b620016068262001123565b81526200161585830162001367565b81860152835291830191604001620015d6565b80516001600160e01b0319811681146200113b57600080fd5b600082601f8301126200165357600080fd5b81516020620016666200122783620011dc565b82815261022092830285018201928282019190878511156200168757600080fd5b8387015b858110156200135a5780890382811215620016a65760008081fd5b620016b06200107a565b620016bb8362001367565b815261020080601f1984011215620016d35760008081fd5b620016dd620010ca565b9250620016ec88850162001392565b83526040620016fd8186016200137f565b8985015260606200171081870162001140565b82860152608091506200172582870162001140565b9085015260a06200173886820162001140565b8286015260c091506200174d8287016200137f565b9085015260e06200176086820162001140565b828601526101009150620017768287016200137f565b908501526101206200178a8682016200137f565b828601526101409150620017a08287016200137f565b90850152610160620017b486820162001140565b828601526101809150620017ca82870162001140565b908501526101a0620017de86820162001367565b828601526101c09150620017f482870162001140565b908501526101e06200180886820162001392565b828601526200181983870162001628565b9085015250508087019190915284529284019281016200168b565b6000806000806000806000610120888a0312156200185157600080fd5b6200185d898962001155565b60608901519097506001600160401b03808211156200187b57600080fd5b620018898b838c0162001202565b975060808a0151915080821115620018a057600080fd5b620018ae8b838c0162001202565b965060a08a0151915080821115620018c557600080fd5b620018d38b838c0162001282565b955060c08a0151915080821115620018ea57600080fd5b620018f88b838c01620013a3565b945060e08a01519150808211156200190f57600080fd5b6200191d8b838c016200158d565b93506101008a01519150808211156200193557600080fd5b50620019448a828b0162001641565b91505092959891949750929550565b634e487b7160e01b600052603260045260246000fd5b815115158152610200810160208301516200198a602084018261ffff169052565b506040830151620019a3604084018263ffffffff169052565b506060830151620019bc606084018263ffffffff169052565b506080830151620019d5608084018263ffffffff169052565b5060a0830151620019ec60a084018261ffff169052565b5060c083015162001a0560c084018263ffffffff169052565b5060e083015162001a1c60e084018261ffff169052565b506101008381015161ffff9081169184019190915261012080850151909116908301526101408084015163ffffffff9081169184019190915261016080850151821690840152610180808501516001600160401b0316908401526101a080850151909116908301526101c0808401511515908301526101e0928301516001600160e01b031916929091019190915290565b8181038181111562000e7957634e487b7160e01b600052601160045260246000fd5b634e487b7160e01b600052603160045260246000fd5b60805160a05160c051615c1b62001b46600039600081816102fa0152818161184d01528181611ee90152611f520152600081816102be01528181610e900152610ef001526000818161028a01528181610f190152610f890152615c1b6000f3fe608060405234801561001057600080fd5b50600436106101d95760003560e01c806379ba509711610104578063a69c64c0116100a2578063d63d3af211610071578063d63d3af214610a88578063d8694ccd14610a90578063f2fde38b14610aa3578063ffdb4b3714610ab657600080fd5b8063a69c64c0146109ad578063bf78e03f146109c0578063cdc73d5114610a6d578063d02641a014610a7557600080fd5b806382b49eb0116100de57806382b49eb0146107ef5780638da5cb5b1461095f57806391a2749a146109875780639ea600261461099a57600080fd5b806379ba5097146107c15780637afac322146107c9578063805f2132146107dc57600080fd5b8063407e10861161017c5780634ab35b0b1161014b5780634ab35b0b14610457578063514e8cff146104975780636def4ce71461053a578063770e2dc4146107ae57600080fd5b8063407e1086146103ee57806341ed29e714610401578063430d138c1461041457806345ac924d1461043757600080fd5b8063181f5a77116101b8578063181f5a77146103735780632451a627146103bc578063325c868e146103d15780633937306f146103d957600080fd5b806241e5be146101de578063061877e31461020457806306285c691461025d575b600080fd5b6101f16101ec36600461431b565b610afe565b6040519081526020015b60405180910390f35b610244610212366004614357565b73ffffffffffffffffffffffffffffffffffffffff1660009081526008602052604090205467ffffffffffffffff1690565b60405167ffffffffffffffff90911681526020016101fb565b610327604080516060810182526000808252602082018190529181019190915260405180606001604052807f00000000000000000000000000000000000000000000000000000000000000006bffffffffffffffffffffffff1681526020017f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff1681526020017f000000000000000000000000000000000000000000000000000000000000000063ffffffff16815250905090565b6040805182516bffffffffffffffffffffffff16815260208084015173ffffffffffffffffffffffffffffffffffffffff16908201529181015163ffffffff16908201526060016101fb565b6103af6040518060400160405280601381526020017f46656551756f74657220312e362e302d6465760000000000000000000000000081525081565b6040516101fb91906143d6565b6103c4610b6c565b6040516101fb91906143e9565b6101f1602481565b6103ec6103e7366004614443565b610b7d565b005b6103ec6103fc3660046145e5565b610e32565b6103ec61040f366004614717565b610e46565b6104276104223660046148f1565b610e88565b6040516101fb94939291906149e5565b61044a610445366004614a84565b611098565b6040516101fb9190614ac6565b61046a610465366004614357565b611163565b6040517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff90911681526020016101fb565b61052d6104a5366004614b41565b60408051808201909152600080825260208201525067ffffffffffffffff166000908152600560209081526040918290208251808401909352547bffffffffffffffffffffffffffffffffffffffffffffffffffffffff811683527c0100000000000000000000000000000000000000000000000000000000900463ffffffff169082015290565b6040516101fb9190614b5c565b6107a1610548366004614b41565b6040805161020081018252600080825260208201819052918101829052606081018290526080810182905260a0810182905260c0810182905260e08101829052610100810182905261012081018290526101408101829052610160810182905261018081018290526101a081018290526101c081018290526101e08101919091525067ffffffffffffffff908116600090815260096020908152604091829020825161020081018452815460ff8082161515835261ffff61010080840482169685019690965263ffffffff630100000084048116978501979097526701000000000000008304871660608501526b0100000000000000000000008304871660808501526f010000000000000000000000000000008304811660a085015271010000000000000000000000000000000000808404881660c086015275010000000000000000000000000000000000000000008404821660e08087019190915277010000000000000000000000000000000000000000000000850483169786019790975279010000000000000000000000000000000000000000000000000084049091166101208501527b01000000000000000000000000000000000000000000000000000000909204861661014084015260019093015480861661016084015264010000000081049096166101808301526c0100000000000000000000000086049094166101a0820152700100000000000000000000000000000000850490911615156101c08201527fffffffff0000000000000000000000000000000000000000000000000000000092909304901b166101e082015290565b6040516101fb9190614b97565b6103ec6107bc366004614dae565b61116e565b6103ec611180565b6103ec6107d73660046150c8565b61127d565b6103ec6107ea36600461512c565b61128f565b6108ff6107fd366004615198565b6040805160c081018252600080825260208201819052918101829052606081018290526080810182905260a08101919091525067ffffffffffffffff919091166000908152600a6020908152604080832073ffffffffffffffffffffffffffffffffffffffff94909416835292815290829020825160c081018452905463ffffffff8082168352640100000000820481169383019390935268010000000000000000810461ffff16938201939093526a01000000000000000000008304821660608201526e01000000000000000000000000000083049091166080820152720100000000000000000000000000000000000090910460ff16151560a082015290565b6040516101fb9190600060c08201905063ffffffff80845116835280602085015116602084015261ffff60408501511660408401528060608501511660608401528060808501511660808401525060a0830151151560a083015292915050565b60005460405173ffffffffffffffffffffffffffffffffffffffff90911681526020016101fb565b6103ec6109953660046151c2565b611777565b6103ec6109a8366004615283565b611788565b6103ec6109bb366004615490565b611799565b610a396109ce366004614357565b6040805180820182526000808252602091820181905273ffffffffffffffffffffffffffffffffffffffff93841681526007825282902082518084019093525492831682527401000000000000000000000000000000000000000090920460ff169181019190915290565b60408051825173ffffffffffffffffffffffffffffffffffffffff16815260209283015160ff1692810192909252016101fb565b6103c46117aa565b61052d610a83366004614357565b6117b6565b6101f1601281565b6101f1610a9e366004615555565b6118fa565b6103ec610ab1366004614357565b611e04565b610ac9610ac43660046155aa565b611e15565b604080517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff9384168152929091166020830152016101fb565b6000610b0982611fa0565b7bffffffffffffffffffffffffffffffffffffffffffffffffffffffff16610b3085611fa0565b610b58907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1685615603565b610b62919061561a565b90505b9392505050565b6060610b78600261203a565b905090565b610b85612047565b6000610b918280615655565b9050905060005b81811015610cdb576000610bac8480615655565b83818110610bbc57610bbc6156bd565b905060400201803603810190610bd29190615718565b604080518082018252602080840180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff908116845263ffffffff42818116858701908152885173ffffffffffffffffffffffffffffffffffffffff9081166000908152600690975295889020965190519092167c010000000000000000000000000000000000000000000000000000000002919092161790935584519051935194955016927f52f50aa6d1a95a4595361ecf953d095f125d442e4673716dede699e049de148a92610cca9290917bffffffffffffffffffffffffffffffffffffffffffffffffffffffff929092168252602082015260400190565b60405180910390a250600101610b98565b506000610ceb6020840184615655565b9050905060005b81811015610e2c576000610d096020860186615655565b83818110610d1957610d196156bd565b905060400201803603810190610d2f9190615755565b604080518082018252602080840180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff908116845263ffffffff42818116858701908152885167ffffffffffffffff9081166000908152600590975295889020965190519092167c010000000000000000000000000000000000000000000000000000000002919092161790935584519051935194955016927fdd84a3fa9ef9409f550d54d6affec7e9c480c878c6ab27b78912a03e1b371c6e92610e1b9290917bffffffffffffffffffffffffffffffffffffffffffffffffffffffff929092168252602082015260400190565b60405180910390a250600101610cf2565b50505050565b610e3a61208c565b610e438161210d565b50565b610e4e61208c565b60005b8151811015610e8457610e7c828281518110610e6f57610e6f6156bd565b602002602001015161220b565b600101610e51565b5050565b6000806060807f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff168c73ffffffffffffffffffffffffffffffffffffffff1603610ee9578a9350610f17565b610f148c8c7f0000000000000000000000000000000000000000000000000000000000000000610afe565b93505b7f00000000000000000000000000000000000000000000000000000000000000006bffffffffffffffffffffffff16841115610fbb576040517f6a92a483000000000000000000000000000000000000000000000000000000008152600481018590526bffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001660248201526044015b60405180910390fd5b67ffffffffffffffff8d1660009081526009602052604081206001015463ffffffff1690610fea8c8c846123dd565b9050806020015194506110008f8b8b8b8b612586565b92508585611080836040805182516024820152602092830151151560448083019190915282518083039091018152606490910190915290810180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167f181dcf100000000000000000000000000000000000000000000000000000000017905290565b95509550955050509950995099509995505050505050565b60608160008167ffffffffffffffff8111156110b6576110b661447e565b6040519080825280602002602001820160405280156110fb57816020015b60408051808201909152600080825260208201528152602001906001900390816110d45790505b50905060005b828110156111585761113386868381811061111e5761111e6156bd565b9050602002016020810190610a839190614357565b828281518110611145576111456156bd565b6020908102919091010152600101611101565b509150505b92915050565b600061115d82611fa0565b61117661208c565b610e8482826128f3565b60015473ffffffffffffffffffffffffffffffffffffffff163314611201576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4d7573742062652070726f706f736564206f776e6572000000000000000000006044820152606401610fb2565b60008054337fffffffffffffffffffffffff00000000000000000000000000000000000000008083168217845560018054909116905560405173ffffffffffffffffffffffffffffffffffffffff90921692909183917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a350565b61128561208c565b610e848282612d05565b60008060006112d387878080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250612e4c92505050565b9250925092506112e533838584612e67565b60006112f385870187615778565b905060005b815181101561176c57600060076000848481518110611319576113196156bd565b6020908102919091018101515173ffffffffffffffffffffffffffffffffffffffff16825281019190915260400160009081205474010000000000000000000000000000000000000000900460ff1691508190036113da57828281518110611383576113836156bd565b6020908102919091010151516040517f06439c6b00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff9091166004820152602401610fb2565b60006114236012838686815181106113f4576113f46156bd565b6020026020010151602001517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff16612fbf565b90506006600085858151811061143b5761143b6156bd565b60200260200101516000015173ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600001601c9054906101000a900463ffffffff1663ffffffff168484815181106114ad576114ad6156bd565b60200260200101516040015163ffffffff1610156115b7578383815181106114d7576114d76156bd565b6020026020010151600001518484815181106114f5576114f56156bd565b60200260200101516040015160066000878781518110611517576115176156bd565b6020908102919091018101515173ffffffffffffffffffffffffffffffffffffffff90811683529082019290925260409081016000205490517f191ec70600000000000000000000000000000000000000000000000000000000815293909116600484015263ffffffff91821660248401527c01000000000000000000000000000000000000000000000000000000009004166044820152606401610fb2565b6040518060400160405280827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1681526020018585815181106115f8576115f86156bd565b60200260200101516040015163ffffffff1681525060066000868681518110611623576116236156bd565b6020908102919091018101515173ffffffffffffffffffffffffffffffffffffffff168252818101929092526040016000208251929091015163ffffffff167c0100000000000000000000000000000000000000000000000000000000027bffffffffffffffffffffffffffffffffffffffffffffffffffffffff90921691909117905583518490849081106116bb576116bb6156bd565b60200260200101516000015173ffffffffffffffffffffffffffffffffffffffff167f52f50aa6d1a95a4595361ecf953d095f125d442e4673716dede699e049de148a82868681518110611711576117116156bd565b60200260200101516040015160405161175a9291907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff92909216825263ffffffff16602082015260400190565b60405180910390a250506001016112f8565b505050505050505050565b61177f61208c565b610e438161308b565b61179061208c565b610e4381613217565b6117a161208c565b610e43816136bd565b6060610b78600b61203a565b604080518082019091526000808252602082015273ffffffffffffffffffffffffffffffffffffffff82166000908152600660209081526040918290208251808401909352547bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8116835263ffffffff7c010000000000000000000000000000000000000000000000000000000090910481169183018290527f00000000000000000000000000000000000000000000000000000000000000001690611878904261583f565b10156118845792915050565b73ffffffffffffffffffffffffffffffffffffffff8381166000908152600760209081526040918290208251808401909352549283168083527401000000000000000000000000000000000000000090930460ff1690820152906118e9575092915050565b6118f2816137a7565b949350505050565b67ffffffffffffffff8083166000908152600960209081526040808320815161020081018352815460ff808216151580845261ffff61010080850482169886019890985263ffffffff630100000085048116978601979097526701000000000000008404871660608601526b0100000000000000000000008404871660808601526f010000000000000000000000000000008404811660a086015271010000000000000000000000000000000000808504881660c087015275010000000000000000000000000000000000000000008504821660e08088019190915277010000000000000000000000000000000000000000000000860483169987019990995279010000000000000000000000000000000000000000000000000085049091166101208601527b01000000000000000000000000000000000000000000000000000000909304861661014085015260019094015480861661016085015264010000000081049098166101808401526c0100000000000000000000000088049094166101a0830152700100000000000000000000000000000000870490931615156101c08201527fffffffff000000000000000000000000000000000000000000000000000000009290950490921b166101e0840152909190611b14576040517f99ac52f200000000000000000000000000000000000000000000000000000000815267ffffffffffffffff85166004820152602401610fb2565b611b2f611b276080850160608601614357565b600b90613936565b611b8e57611b436080840160608501614357565b6040517f2502348c00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff9091166004820152602401610fb2565b6000611b9d6040850185615655565b9150611bf9905082611bb26020870187615852565b905083611bbf8880615852565b8080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525061396592505050565b600080611c15611c0f6080880160608901614357565b88611e15565b9092509050600080808515611c5857611c4c878b611c3960808d0160608e01614357565b88611c4760408f018f615655565b613a0f565b91945092509050611c78565b6101a0870151611c759063ffffffff16662386f26fc10000615603565b92505b61010087015160009061ffff1615611cbc57611cb9886dffffffffffffffffffffffffffff607088901c16611cb060208e018e615852565b90508a86613ce7565b90505b61018088015160009067ffffffffffffffff16611ce5611cdf60808e018e615852565b8c613d97565b600001518563ffffffff168b60a0015161ffff168e8060200190611d099190615852565b611d14929150615603565b8c6080015163ffffffff16611d2991906158b7565b611d3391906158b7565b611d3d91906158b7565b611d57906dffffffffffffffffffffffffffff8916615603565b611d619190615603565b9050867bffffffffffffffffffffffffffffffffffffffffffffffffffffffff168282600860008f6060016020810190611d9b9190614357565b73ffffffffffffffffffffffffffffffffffffffff168152602081019190915260400160002054611dd69067ffffffffffffffff1689615603565b611de091906158b7565b611dea91906158b7565b611df4919061561a565b9c9b505050505050505050505050565b611e0c61208c565b610e4381613e58565b67ffffffffffffffff811660009081526005602090815260408083208151808301909252547bffffffffffffffffffffffffffffffffffffffffffffffffffffffff811682527c0100000000000000000000000000000000000000000000000000000000900463ffffffff1691810182905282918203611ecd576040517f2e59db3a00000000000000000000000000000000000000000000000000000000815267ffffffffffffffff85166004820152602401610fb2565b6000816020015163ffffffff1642611ee5919061583f565b90507f000000000000000000000000000000000000000000000000000000000000000063ffffffff16811115611f86576040517ff08bcb3e00000000000000000000000000000000000000000000000000000000815267ffffffffffffffff8616600482015263ffffffff7f000000000000000000000000000000000000000000000000000000000000000016602482015260448101829052606401610fb2565b611f8f86611fa0565b9151919350909150505b9250929050565b600080611fac836117b6565b9050806020015163ffffffff1660001480611fe4575080517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff16155b15612033576040517f06439c6b00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff84166004820152602401610fb2565b5192915050565b60606000610b6583613f4d565b612052600233613936565b61208a576040517fd86ad9cf000000000000000000000000000000000000000000000000000000008152336004820152602401610fb2565b565b60005473ffffffffffffffffffffffffffffffffffffffff16331461208a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4f6e6c792063616c6c61626c65206279206f776e6572000000000000000000006044820152606401610fb2565b60005b8151811015610e8457600082828151811061212d5761212d6156bd565b60209081029190910181015180518183015173ffffffffffffffffffffffffffffffffffffffff80831660008181526007875260409081902084518154868a018051929096167fffffffffffffffffffffff00000000000000000000000000000000000000000090911681177401000000000000000000000000000000000000000060ff9384160217909255825191825293519093169683019690965293955091939092917f08a5f7f5bb38a81d8e43aca13ecd76431dbf8816ae4699affff7b00b2fc1c464910160405180910390a2505050806001019050612110565b60006122c482600001518360600151846020015185604001516040805173ffffffffffffffffffffffffffffffffffffffff80871660208301528516918101919091527fffffffffffffffffffff00000000000000000000000000000000000000000000831660608201527fffff0000000000000000000000000000000000000000000000000000000000008216608082015260009060a001604051602081830303815290604052805190602001209050949350505050565b60808301516000828152600460205260409081902080549215157fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00909316929092179091555190915081907f32a4ba3fa3351b11ad555d4c8ec70a744e8705607077a946807030d64b6ab1a3906123d1908590600060a08201905073ffffffffffffffffffffffffffffffffffffffff8084511683527fffffffffffffffffffff0000000000000000000000000000000000000000000060208501511660208401527fffff00000000000000000000000000000000000000000000000000000000000060408501511660408401528060608501511660608401525060808301511515608083015292915050565b60405180910390a25050565b6040805180820190915260008082526020820152600083900361241e57506040805180820190915267ffffffffffffffff8216815260006020820152610b65565b600061242a84866158ca565b9050600061243b8560048189615910565b8080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152509293505050507fffffffff0000000000000000000000000000000000000000000000000000000082167fe7e230f000000000000000000000000000000000000000000000000000000000016124d857808060200190518101906124cf919061593a565b92505050610b65565b7f6859a837000000000000000000000000000000000000000000000000000000007fffffffff00000000000000000000000000000000000000000000000000000000831601612554576040518060400160405280828060200190518101906125409190615966565b815260006020909101529250610b65915050565b6040517f5247fdce00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b67ffffffffffffffff8086166000908152600960205260409020600101546060917101000000000000000000000000000000000090910460e01b9085908111156125d2576125d261447e565b60405190808252806020026020018201604052801561260557816020015b60608152602001906001900390816125f05790505b50915060005b858110156128e8576000858583818110612627576126276156bd565b61263d9260206040909202019081019150614357565b90506000888884818110612653576126536156bd565b9050602002810190612665919061597f565b612673906040810190615852565b91505060208111156127235767ffffffffffffffff8a166000908152600a6020908152604080832073ffffffffffffffffffffffffffffffffffffffff861684529091529020546e010000000000000000000000000000900463ffffffff16811115612723576040517f36f536ca00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff83166004820152602401610fb2565b612793848a8a86818110612739576127396156bd565b905060200281019061274b919061597f565b612759906020810190615852565b8080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250613fa992505050565b67ffffffffffffffff8a166000818152600a6020908152604080832073ffffffffffffffffffffffffffffffffffffffff871684528252808320815160c081018352905463ffffffff8082168352640100000000820481168386015268010000000000000000820461ffff16838501526a01000000000000000000008204811660608401526e010000000000000000000000000000820481166080840152720100000000000000000000000000000000000090910460ff16151560a08301908152958552600990935290832054935190937b01000000000000000000000000000000000000000000000000000000900490911691906128925781612898565b82606001515b6040805163ffffffff83166020820152919250016040516020818303038152906040528887815181106128cd576128cd6156bd565b6020026020010181905250505050505080600101905061260b565b505095945050505050565b60005b8251811015612c1c576000838281518110612913576129136156bd565b6020026020010151905060008160000151905060005b826020015151811015612c0e5760008360200151828151811061294e5761294e6156bd565b6020026020010151602001519050600084602001518381518110612974576129746156bd565b6020026020010151600001519050602063ffffffff16826080015163ffffffff1610156129f75760808201516040517f24ecdc0200000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff8316600482015263ffffffff9091166024820152604401610fb2565b67ffffffffffffffff84166000818152600a6020908152604080832073ffffffffffffffffffffffffffffffffffffffff86168085529083529281902086518154938801518389015160608a015160808b015160a08c015115157201000000000000000000000000000000000000027fffffffffffffffffffffffffff00ffffffffffffffffffffffffffffffffffff63ffffffff9283166e01000000000000000000000000000002167fffffffffffffffffffffffffff0000000000ffffffffffffffffffffffffffff9383166a0100000000000000000000027fffffffffffffffffffffffffffffffffffff00000000ffffffffffffffffffff61ffff9096166801000000000000000002959095167fffffffffffffffffffffffffffffffffffff000000000000ffffffffffffffff968416640100000000027fffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000909b16939097169290921798909817939093169390931717919091161792909217909155519091907f94967ae9ea7729ad4f54021c1981765d2b1d954f7c92fbec340aa0a54f46b8b590612bfc908690600060c08201905063ffffffff80845116835280602085015116602084015261ffff60408501511660408401528060608501511660608401528060808501511660808401525060a0830151151560a083015292915050565b60405180910390a35050600101612929565b5050508060010190506128f6565b5060005b8151811015612d00576000828281518110612c3d57612c3d6156bd565b60200260200101516000015190506000838381518110612c5f57612c5f6156bd565b60209081029190910181015181015167ffffffffffffffff84166000818152600a8452604080822073ffffffffffffffffffffffffffffffffffffffff8516808452955280822080547fffffffffffffffffffffffffff000000000000000000000000000000000000001690555192945090917f4de5b1bcbca6018c11303a2c3f4a4b4f22a1c741d8c4ba430d246ac06c5ddf8b9190a35050600101612c20565b505050565b60005b8251811015612da857612d3e838281518110612d2657612d266156bd565b6020026020010151600b613ffb90919063ffffffff16565b15612da057828181518110612d5557612d556156bd565b602002602001015173ffffffffffffffffffffffffffffffffffffffff167fdf1b1bd32a69711488d71554706bb130b1fc63a5fa1a2cd85e8440f84065ba2360405160405180910390a25b600101612d08565b5060005b8151811015612d0057612de2828281518110612dca57612dca6156bd565b6020026020010151600b61401d90919063ffffffff16565b15612e4457818181518110612df957612df96156bd565b602002602001015173ffffffffffffffffffffffffffffffffffffffff167f1795838dc8ab2ffc5f431a1729a6afa0b587f982f7b2be0b9d7187a1ef547f9160405160405180910390a25b600101612dac565b6040810151604a820151605e90920151909260609290921c91565b6040805173ffffffffffffffffffffffffffffffffffffffff868116602080840191909152908616828401527fffffffffffffffffffff00000000000000000000000000000000000000000000851660608301527fffff00000000000000000000000000000000000000000000000000000000000084166080808401919091528351808403909101815260a09092018352815191810191909120600081815260049092529190205460ff16612fb8576040517f097e17ff00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff8087166004830152851660248201527fffffffffffffffffffff00000000000000000000000000000000000000000000841660448201527fffff00000000000000000000000000000000000000000000000000000000000083166064820152608401610fb2565b5050505050565b600080612fcc84866159bd565b9050600060248260ff16111561300657612fea602460ff841661583f565b612ff590600a615af6565b612fff908561561a565b905061302c565b61301460ff8316602461583f565b61301f90600a615af6565b6130299085615603565b90505b7bffffffffffffffffffffffffffffffffffffffffffffffffffffffff811115613082576040517f10cb51d100000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b95945050505050565b602081015160005b81518110156131265760008282815181106130b0576130b06156bd565b602002602001015190506130ce81600261403f90919063ffffffff16565b1561311d5760405173ffffffffffffffffffffffffffffffffffffffff821681527fc3803387881faad271c47728894e3e36fac830ffc8602ca6fc07733cbda775809060200160405180910390a15b50600101613093565b50815160005b8151811015610e2c576000828281518110613149576131496156bd565b60200260200101519050600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff16036131b9576040517f8579befe00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6131c4600282613ffb565b5060405173ffffffffffffffffffffffffffffffffffffffff821681527feb1b9b92e50b7f88f9ff25d56765095ac6e91540eee214906f4036a908ffbdef9060200160405180910390a15060010161312c565b60005b8151811015610e84576000828281518110613237576132376156bd565b602002602001015190506000838381518110613255576132556156bd565b60200260200101516000015190506000826020015190508167ffffffffffffffff166000148061328e575061016081015163ffffffff16155b806132e057506101e08101517fffffffff00000000000000000000000000000000000000000000000000000000167f2812d52c0000000000000000000000000000000000000000000000000000000014155b806132ff5750806060015163ffffffff1681610160015163ffffffff16115b15613342576040517fc35aa79d00000000000000000000000000000000000000000000000000000000815267ffffffffffffffff83166004820152602401610fb2565b67ffffffffffffffff821660009081526009602052604081206001015471010000000000000000000000000000000000900460e01b7fffffffff000000000000000000000000000000000000000000000000000000001690036133e6578167ffffffffffffffff167fd31c671936387b2f84ed402b553bd50c0e9c20408ea4e91a836d77b8180fb724826040516133d99190614b97565b60405180910390a2613429565b8167ffffffffffffffff167f1edd6f3553cfa16f10b95b195abae3a1cfca4783de4843f95d674b1e1df5ab20826040516134209190614b97565b60405180910390a25b80600960008467ffffffffffffffff1667ffffffffffffffff16815260200190815260200160002060008201518160000160006101000a81548160ff02191690831515021790555060208201518160000160016101000a81548161ffff021916908361ffff16021790555060408201518160000160036101000a81548163ffffffff021916908363ffffffff16021790555060608201518160000160076101000a81548163ffffffff021916908363ffffffff160217905550608082015181600001600b6101000a81548163ffffffff021916908363ffffffff16021790555060a082015181600001600f6101000a81548161ffff021916908361ffff16021790555060c08201518160000160116101000a81548163ffffffff021916908363ffffffff16021790555060e08201518160000160156101000a81548161ffff021916908361ffff1602179055506101008201518160000160176101000a81548161ffff021916908361ffff1602179055506101208201518160000160196101000a81548161ffff021916908361ffff16021790555061014082015181600001601b6101000a81548163ffffffff021916908363ffffffff1602179055506101608201518160010160006101000a81548163ffffffff021916908363ffffffff1602179055506101808201518160010160046101000a81548167ffffffffffffffff021916908367ffffffffffffffff1602179055506101a082015181600101600c6101000a81548163ffffffff021916908363ffffffff1602179055506101c08201518160010160106101000a81548160ff0219169083151502179055506101e08201518160010160116101000a81548163ffffffff021916908360e01c021790555090505050505080600101905061321a565b60005b8151811015610e845760008282815181106136dd576136dd6156bd565b602002602001015160000151905060008383815181106136ff576136ff6156bd565b60209081029190910181015181015173ffffffffffffffffffffffffffffffffffffffff841660008181526008845260409081902080547fffffffffffffffffffffffffffffffffffffffffffffffff00000000000000001667ffffffffffffffff85169081179091559051908152919350917fbb77da6f7210cdd16904228a9360133d1d7dfff99b1bc75f128da5b53e28f97d910160405180910390a250506001016136c0565b604080518082019091526000808252602082015260008260000151905060008173ffffffffffffffffffffffffffffffffffffffff1663feaf968c6040518163ffffffff1660e01b815260040160a060405180830381865afa158015613811573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906138359190615b1c565b5050509150506000811215613876576040517f10cb51d100000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60006138f58373ffffffffffffffffffffffffffffffffffffffff1663313ce5676040518163ffffffff1660e01b8152600401602060405180830381865afa1580156138c6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906138ea9190615b6c565b866020015184612fbf565b604080518082019091527bffffffffffffffffffffffffffffffffffffffffffffffffffffffff909116815263ffffffff4216602082015295945050505050565b73ffffffffffffffffffffffffffffffffffffffff811660009081526001830160205260408120541515610b65565b836040015163ffffffff168311156139be5760408085015190517f8693378900000000000000000000000000000000000000000000000000000000815263ffffffff909116600482015260248101849052604401610fb2565b836020015161ffff16821115613a00576040517f4c056b6a00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b610e2c846101e0015182613fa9565b6000808083815b81811015613cd9576000878783818110613a3257613a326156bd565b905060400201803603810190613a489190615b89565b67ffffffffffffffff8c166000908152600a60209081526040808320845173ffffffffffffffffffffffffffffffffffffffff168452825291829020825160c081018452905463ffffffff8082168352640100000000820481169383019390935268010000000000000000810461ffff16938201939093526a01000000000000000000008304821660608201526e01000000000000000000000000000083049091166080820152720100000000000000000000000000000000000090910460ff16151560a0820181905291925090613b68576101208d0151613b359061ffff16662386f26fc10000615603565b613b3f90886158b7565b96508c610140015186613b529190615bc2565b9550613b5f602086615bc2565b94505050613cd1565b604081015160009061ffff1615613c215760008c73ffffffffffffffffffffffffffffffffffffffff16846000015173ffffffffffffffffffffffffffffffffffffffff1614613bc4578351613bbd90611fa0565b9050613bc7565b508a5b620186a0836040015161ffff16613c098660200151847bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1661406190919063ffffffff16565b613c139190615603565b613c1d919061561a565b9150505b6060820151613c309088615bc2565b9650816080015186613c429190615bc2565b8251909650600090613c619063ffffffff16662386f26fc10000615603565b905080821015613c8057613c75818a6158b7565b985050505050613cd1565b6000836020015163ffffffff16662386f26fc10000613c9f9190615603565b905080831115613cbf57613cb3818b6158b7565b99505050505050613cd1565b613cc9838b6158b7565b995050505050505b600101613a16565b505096509650969350505050565b60008063ffffffff8316613cfd61012086615603565b613d09876101c06158b7565b613d1391906158b7565b613d1d91906158b7565b905060008760c0015163ffffffff168860e0015161ffff1683613d409190615603565b613d4a91906158b7565b61010089015190915061ffff16613d716dffffffffffffffffffffffffffff891683615603565b613d7b9190615603565b613d8b90655af3107a4000615603565b98975050505050505050565b60408051808201909152600080825260208201526000613dc3858585610160015163ffffffff166123dd565b9050826060015163ffffffff1681600001511115613e0d576040517f4c4fc93a00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b826101c001518015613e2157508060200151155b15610b62576040517fee433e9900000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b3373ffffffffffffffffffffffffffffffffffffffff821603613ed7576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c660000000000000000006044820152606401610fb2565b600180547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff83811691821790925560008054604051929316917fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae12789190a350565b606081600001805480602002602001604051908101604052809291908181526020018280548015613f9d57602002820191906000526020600020905b815481526020019060010190808311613f89575b50505050509050919050565b7fd7ed2ad4000000000000000000000000000000000000000000000000000000007fffffffff00000000000000000000000000000000000000000000000000000000831601610e8457612d008161409e565b6000610b658373ffffffffffffffffffffffffffffffffffffffff8416614151565b6000610b658373ffffffffffffffffffffffffffffffffffffffff84166141a0565b6000610b658373ffffffffffffffffffffffffffffffffffffffff841661429a565b6000670de0b6b3a7640000614094837bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8616615603565b610b65919061561a565b600081516020146140dd57816040517f8d666f60000000000000000000000000000000000000000000000000000000008152600401610fb291906143d6565b6000828060200190518101906140f39190615966565b905073ffffffffffffffffffffffffffffffffffffffff811180614118575061040081105b1561115d57826040517f8d666f60000000000000000000000000000000000000000000000000000000008152600401610fb291906143d6565b60008181526001830160205260408120546141985750815460018181018455600084815260208082209093018490558454848252828601909352604090209190915561115d565b50600061115d565b600081815260018301602052604081205480156142895760006141c460018361583f565b85549091506000906141d89060019061583f565b905080821461423d5760008660000182815481106141f8576141f86156bd565b906000526020600020015490508087600001848154811061421b5761421b6156bd565b6000918252602080832090910192909255918252600188019052604090208390555b855486908061424e5761424e615bdf565b60019003818190600052602060002001600090559055856001016000868152602001908152602001600020600090556001935050505061115d565b600091505061115d565b5092915050565b600081815260018301602052604081205480156142895760006142be60018361583f565b85549091506000906142d29060019061583f565b905081811461423d5760008660000182815481106141f8576141f86156bd565b803573ffffffffffffffffffffffffffffffffffffffff8116811461431657600080fd5b919050565b60008060006060848603121561433057600080fd5b614339846142f2565b92506020840135915061434e604085016142f2565b90509250925092565b60006020828403121561436957600080fd5b610b65826142f2565b6000815180845260005b818110156143985760208185018101518683018201520161437c565b5060006020828601015260207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f83011685010191505092915050565b602081526000610b656020830184614372565b6020808252825182820181905260009190848201906040850190845b8181101561443757835173ffffffffffffffffffffffffffffffffffffffff1683529284019291840191600101614405565b50909695505050505050565b60006020828403121561445557600080fd5b813567ffffffffffffffff81111561446c57600080fd5b820160408185031215610b6557600080fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6040805190810167ffffffffffffffff811182821017156144d0576144d061447e565b60405290565b60405160a0810167ffffffffffffffff811182821017156144d0576144d061447e565b60405160c0810167ffffffffffffffff811182821017156144d0576144d061447e565b604051610200810167ffffffffffffffff811182821017156144d0576144d061447e565b6040516060810167ffffffffffffffff811182821017156144d0576144d061447e565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016810167ffffffffffffffff811182821017156145aa576145aa61447e565b604052919050565b600067ffffffffffffffff8211156145cc576145cc61447e565b5060051b60200190565b60ff81168114610e4357600080fd5b600060208083850312156145f857600080fd5b823567ffffffffffffffff81111561460f57600080fd5b8301601f8101851361462057600080fd5b803561463361462e826145b2565b614563565b8181526060918202830184019184820191908884111561465257600080fd5b938501935b838510156146f257848903818112156146705760008081fd5b6146786144ad565b614681876142f2565b81526040807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0840112156146b55760008081fd5b6146bd6144ad565b92506146ca8989016142f2565b83528701356146d8816145d6565b828901528088019190915283529384019391850191614657565b50979650505050505050565b8015158114610e4357600080fd5b8035614316816146fe565b6000602080838503121561472a57600080fd5b823567ffffffffffffffff81111561474157600080fd5b8301601f8101851361475257600080fd5b803561476061462e826145b2565b81815260a0918202830184019184820191908884111561477f57600080fd5b938501935b838510156146f25780858a03121561479c5760008081fd5b6147a46144d6565b6147ad866142f2565b8152868601357fffffffffffffffffffff00000000000000000000000000000000000000000000811681146147e25760008081fd5b818801526040868101357fffff0000000000000000000000000000000000000000000000000000000000008116811461481b5760008081fd5b90820152606061482c8782016142f2565b9082015260808681013561483f816146fe565b9082015283529384019391850191614784565b803567ffffffffffffffff8116811461431657600080fd5b60008083601f84011261487c57600080fd5b50813567ffffffffffffffff81111561489457600080fd5b602083019150836020828501011115611f9957600080fd5b60008083601f8401126148be57600080fd5b50813567ffffffffffffffff8111156148d657600080fd5b6020830191508360208260051b8501011115611f9957600080fd5b600080600080600080600080600060c08a8c03121561490f57600080fd5b6149188a614852565b985061492660208b016142f2565b975060408a0135965060608a013567ffffffffffffffff8082111561494a57600080fd5b6149568d838e0161486a565b909850965060808c013591508082111561496f57600080fd5b61497b8d838e016148ac565b909650945060a08c013591508082111561499457600080fd5b818c0191508c601f8301126149a857600080fd5b8135818111156149b757600080fd5b8d60208260061b85010111156149cc57600080fd5b6020830194508093505050509295985092959850929598565b848152600060208515158184015260806040840152614a076080840186614372565b8381036060850152845180825282820190600581901b8301840184880160005b83811015614a73577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0868403018552614a61838351614372565b94870194925090860190600101614a27565b50909b9a5050505050505050505050565b60008060208385031215614a9757600080fd5b823567ffffffffffffffff811115614aae57600080fd5b614aba858286016148ac565b90969095509350505050565b602080825282518282018190526000919060409081850190868401855b82811015614b3457614b2484835180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff16825260209081015163ffffffff16910152565b9284019290850190600101614ae3565b5091979650505050505050565b600060208284031215614b5357600080fd5b610b6582614852565b81517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff16815260208083015163ffffffff16908201526040810161115d565b81511515815261020081016020830151614bb7602084018261ffff169052565b506040830151614bcf604084018263ffffffff169052565b506060830151614be7606084018263ffffffff169052565b506080830151614bff608084018263ffffffff169052565b5060a0830151614c1560a084018261ffff169052565b5060c0830151614c2d60c084018263ffffffff169052565b5060e0830151614c4360e084018261ffff169052565b506101008381015161ffff9081169184019190915261012080850151909116908301526101408084015163ffffffff90811691840191909152610160808501518216908401526101808085015167ffffffffffffffff16908401526101a080850151909116908301526101c0808401511515908301526101e0808401517fffffffff000000000000000000000000000000000000000000000000000000008116828501525b505092915050565b803563ffffffff8116811461431657600080fd5b803561ffff8116811461431657600080fd5b600082601f830112614d2757600080fd5b81356020614d3761462e836145b2565b82815260069290921b84018101918181019086841115614d5657600080fd5b8286015b84811015614da35760408189031215614d735760008081fd5b614d7b6144ad565b614d8482614852565b8152614d918583016142f2565b81860152835291830191604001614d5a565b509695505050505050565b60008060408385031215614dc157600080fd5b67ffffffffffffffff83351115614dd757600080fd5b83601f843585010112614de957600080fd5b614df961462e84358501356145b2565b8335840180358083526020808401939260059290921b90910101861015614e1f57600080fd5b602085358601015b85358601803560051b0160200181101561502c5767ffffffffffffffff81351115614e5157600080fd5b8035863587010160407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0828a03011215614e8a57600080fd5b614e926144ad565b614e9e60208301614852565b815267ffffffffffffffff60408301351115614eb957600080fd5b88603f604084013584010112614ece57600080fd5b614ee461462e60206040850135850101356145b2565b6020604084810135850182810135808552928401939260e00201018b1015614f0b57600080fd5b6040808501358501015b6040858101358601602081013560e002010181101561500d5760e0818d031215614f3e57600080fd5b614f466144ad565b614f4f826142f2565b815260c07fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0838f03011215614f8357600080fd5b614f8b6144f9565b614f9760208401614cf0565b8152614fa560408401614cf0565b6020820152614fb660608401614d04565b6040820152614fc760808401614cf0565b6060820152614fd860a08401614cf0565b6080820152614fea60c08401356146fe565b60c083013560a0820152602082810191909152908452929092019160e001614f15565b5080602084015250508085525050602083019250602081019050614e27565b5092505067ffffffffffffffff6020840135111561504957600080fd5b6150598460208501358501614d16565b90509250929050565b600082601f83011261507357600080fd5b8135602061508361462e836145b2565b8083825260208201915060208460051b8701019350868411156150a557600080fd5b602086015b84811015614da3576150bb816142f2565b83529183019183016150aa565b600080604083850312156150db57600080fd5b823567ffffffffffffffff808211156150f357600080fd5b6150ff86838701615062565b9350602085013591508082111561511557600080fd5b5061512285828601615062565b9150509250929050565b6000806000806040858703121561514257600080fd5b843567ffffffffffffffff8082111561515a57600080fd5b6151668883890161486a565b9096509450602087013591508082111561517f57600080fd5b5061518c8782880161486a565b95989497509550505050565b600080604083850312156151ab57600080fd5b6151b483614852565b9150615059602084016142f2565b6000602082840312156151d457600080fd5b813567ffffffffffffffff808211156151ec57600080fd5b908301906040828603121561520057600080fd5b6152086144ad565b82358281111561521757600080fd5b61522387828601615062565b82525060208301358281111561523857600080fd5b61524487828601615062565b60208301525095945050505050565b80357fffffffff000000000000000000000000000000000000000000000000000000008116811461431657600080fd5b6000602080838503121561529657600080fd5b823567ffffffffffffffff8111156152ad57600080fd5b8301601f810185136152be57600080fd5b80356152cc61462e826145b2565b81815261022091820283018401918482019190888411156152ec57600080fd5b938501935b838510156146f2578489038181121561530a5760008081fd5b6153126144ad565b61531b87614852565b8152610200807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0840112156153505760008081fd5b61535861451c565b925061536589890161470c565b83526040615374818a01614d04565b8a8501526060615385818b01614cf0565b8286015260809150615398828b01614cf0565b9085015260a06153a98a8201614cf0565b8286015260c091506153bc828b01614d04565b9085015260e06153cd8a8201614cf0565b8286015261010091506153e1828b01614d04565b908501526101206153f38a8201614d04565b828601526101409150615407828b01614d04565b908501526101606154198a8201614cf0565b82860152610180915061542d828b01614cf0565b908501526101a061543f8a8201614852565b828601526101c09150615453828b01614cf0565b908501526101e06154658a820161470c565b82860152615474838b01615253565b90850152505080880191909152835293840193918501916152f1565b600060208083850312156154a357600080fd5b823567ffffffffffffffff8111156154ba57600080fd5b8301601f810185136154cb57600080fd5b80356154d961462e826145b2565b81815260069190911b820183019083810190878311156154f857600080fd5b928401925b8284101561554a57604084890312156155165760008081fd5b61551e6144ad565b615527856142f2565b8152615534868601614852565b81870152825260409390930192908401906154fd565b979650505050505050565b6000806040838503121561556857600080fd5b61557183614852565b9150602083013567ffffffffffffffff81111561558d57600080fd5b830160a0818603121561559f57600080fd5b809150509250929050565b600080604083850312156155bd57600080fd5b6155c6836142f2565b915061505960208401614852565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b808202811582820484141761115d5761115d6155d4565b600082615650577f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b500490565b60008083357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe184360301811261568a57600080fd5b83018035915067ffffffffffffffff8211156156a557600080fd5b6020019150600681901b3603821315611f9957600080fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b80357bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8116811461431657600080fd5b60006040828403121561572a57600080fd5b6157326144ad565b61573b836142f2565b8152615749602084016156ec565b60208201529392505050565b60006040828403121561576757600080fd5b61576f6144ad565b61573b83614852565b6000602080838503121561578b57600080fd5b823567ffffffffffffffff8111156157a257600080fd5b8301601f810185136157b357600080fd5b80356157c161462e826145b2565b818152606091820283018401918482019190888411156157e057600080fd5b938501935b838510156146f25780858a0312156157fd5760008081fd5b615805614540565b61580e866142f2565b815261581b8787016156ec565b87820152604061582c818801614cf0565b90820152835293840193918501916157e5565b8181038181111561115d5761115d6155d4565b60008083357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe184360301811261588757600080fd5b83018035915067ffffffffffffffff8211156158a257600080fd5b602001915036819003821315611f9957600080fd5b8082018082111561115d5761115d6155d4565b7fffffffff000000000000000000000000000000000000000000000000000000008135818116916004851015614ce85760049490940360031b84901b1690921692915050565b6000808585111561592057600080fd5b8386111561592d57600080fd5b5050820193919092039150565b60006040828403121561594c57600080fd5b6159546144ad565b825181526020830151615749816146fe565b60006020828403121561597857600080fd5b5051919050565b600082357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff618336030181126159b357600080fd5b9190910192915050565b60ff818116838216019081111561115d5761115d6155d4565b600181815b80851115615a2f57817fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff04821115615a1557615a156155d4565b80851615615a2257918102915b93841c93908002906159db565b509250929050565b600082615a465750600161115d565b81615a535750600061115d565b8160018114615a695760028114615a7357615a8f565b600191505061115d565b60ff841115615a8457615a846155d4565b50506001821b61115d565b5060208310610133831016604e8410600b8410161715615ab2575081810a61115d565b615abc83836159d6565b807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff04821115615aee57615aee6155d4565b029392505050565b6000610b658383615a37565b805169ffffffffffffffffffff8116811461431657600080fd5b600080600080600060a08688031215615b3457600080fd5b615b3d86615b02565b9450602086015193506040860151925060608601519150615b6060808701615b02565b90509295509295909350565b600060208284031215615b7e57600080fd5b8151610b65816145d6565b600060408284031215615b9b57600080fd5b615ba36144ad565b615bac836142f2565b8152602083013560208201528091505092915050565b63ffffffff818116838216019080821115614293576142936155d4565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603160045260246000fdfea164736f6c6343000818000a",
+	ABI: "[{\"inputs\":[{\"components\":[{\"internalType\":\"uint96\",\"name\":\"maxFeeJuelsPerMsg\",\"type\":\"uint96\"},{\"internalType\":\"address\",\"name\":\"linkToken\",\"type\":\"address\"},{\"internalType\":\"uint32\",\"name\":\"tokenPriceStalenessThreshold\",\"type\":\"uint32\"}],\"internalType\":\"structFeeQuoter.StaticConfig\",\"name\":\"staticConfig\",\"type\":\"tuple\"},{\"internalType\":\"address[]\",\"name\":\"priceUpdaters\",\"type\":\"address[]\"},{\"internalType\":\"address[]\",\"name\":\"feeTokens\",\"type\":\"address[]\"},{\"components\":[{\"internalType\":\"address\",\"name\":\"sourceToken\",\"type\":\"address\"},{\"components\":[{\"internalType\":\"address\",\"name\":\"dataFeedAddress\",\"type\":\"address\"},{\"internalType\":\"uint8\",\"name\":\"tokenDecimals\",\"type\":\"uint8\"}],\"internalType\":\"structFeeQuoter.TokenPriceFeedConfig\",\"name\":\"feedConfig\",\"type\":\"tuple\"}],\"internalType\":\"structFeeQuoter.TokenPriceFeedUpdate[]\",\"name\":\"tokenPriceFeeds\",\"type\":\"tuple[]\"},{\"components\":[{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"components\":[{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"},{\"components\":[{\"internalType\":\"uint32\",\"name\":\"minFeeUSDCents\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"maxFeeUSDCents\",\"type\":\"uint32\"},{\"internalType\":\"uint16\",\"name\":\"deciBps\",\"type\":\"uint16\"},{\"internalType\":\"uint32\",\"name\":\"destGasOverhead\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"destBytesOverhead\",\"type\":\"uint32\"},{\"internalType\":\"bool\",\"name\":\"isEnabled\",\"type\":\"bool\"}],\"internalType\":\"structFeeQuoter.TokenTransferFeeConfig\",\"name\":\"tokenTransferFeeConfig\",\"type\":\"tuple\"}],\"internalType\":\"structFeeQuoter.TokenTransferFeeConfigSingleTokenArgs[]\",\"name\":\"tokenTransferFeeConfigs\",\"type\":\"tuple[]\"}],\"internalType\":\"structFeeQuoter.TokenTransferFeeConfigArgs[]\",\"name\":\"tokenTransferFeeConfigArgs\",\"type\":\"tuple[]\"},{\"components\":[{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"},{\"internalType\":\"uint64\",\"name\":\"premiumMultiplierWeiPerEth\",\"type\":\"uint64\"}],\"internalType\":\"structFeeQuoter.PremiumMultiplierWeiPerEthArgs[]\",\"name\":\"premiumMultiplierWeiPerEthArgs\",\"type\":\"tuple[]\"},{\"components\":[{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"components\":[{\"internalType\":\"bool\",\"name\":\"isEnabled\",\"type\":\"bool\"},{\"internalType\":\"uint16\",\"name\":\"maxNumberOfTokensPerMsg\",\"type\":\"uint16\"},{\"internalType\":\"uint32\",\"name\":\"maxDataBytes\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"maxPerMsgGasLimit\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"destGasOverhead\",\"type\":\"uint32\"},{\"internalType\":\"uint16\",\"name\":\"destGasPerPayloadByte\",\"type\":\"uint16\"},{\"internalType\":\"uint32\",\"name\":\"destDataAvailabilityOverheadGas\",\"type\":\"uint32\"},{\"internalType\":\"uint16\",\"name\":\"destGasPerDataAvailabilityByte\",\"type\":\"uint16\"},{\"internalType\":\"uint16\",\"name\":\"destDataAvailabilityMultiplierBps\",\"type\":\"uint16\"},{\"internalType\":\"uint16\",\"name\":\"defaultTokenFeeUSDCents\",\"type\":\"uint16\"},{\"internalType\":\"uint32\",\"name\":\"defaultTokenDestGasOverhead\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"defaultTxGasLimit\",\"type\":\"uint32\"},{\"internalType\":\"uint64\",\"name\":\"gasMultiplierWeiPerEth\",\"type\":\"uint64\"},{\"internalType\":\"uint32\",\"name\":\"networkFeeUSDCents\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"gasPriceStalenessThreshold\",\"type\":\"uint32\"},{\"internalType\":\"bool\",\"name\":\"enforceOutOfOrder\",\"type\":\"bool\"},{\"internalType\":\"bytes4\",\"name\":\"chainFamilySelector\",\"type\":\"bytes4\"}],\"internalType\":\"structFeeQuoter.DestChainConfig\",\"name\":\"destChainConfig\",\"type\":\"tuple\"}],\"internalType\":\"structFeeQuoter.DestChainConfigArgs[]\",\"name\":\"destChainConfigArgs\",\"type\":\"tuple[]\"}],\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"inputs\":[],\"name\":\"DataFeedValueOutOfUint224Range\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"}],\"name\":\"DestinationChainNotEnabled\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"ExtraArgOutOfOrderExecutionMustBeTrue\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"}],\"name\":\"FeeTokenNotSupported\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"},{\"internalType\":\"uint32\",\"name\":\"destBytesOverhead\",\"type\":\"uint32\"}],\"name\":\"InvalidDestBytesOverhead\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"}],\"name\":\"InvalidDestChainConfig\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"bytes\",\"name\":\"encodedAddress\",\"type\":\"bytes\"}],\"name\":\"InvalidEVMAddress\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InvalidExtraArgsTag\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InvalidStaticConfig\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"msgFeeJuels\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"maxFeeJuelsPerMsg\",\"type\":\"uint256\"}],\"name\":\"MessageFeeTooHigh\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"MessageGasLimitTooHigh\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"maxSize\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"actualSize\",\"type\":\"uint256\"}],\"name\":\"MessageTooLarge\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"forwarder\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"workflowOwner\",\"type\":\"address\"},{\"internalType\":\"bytes10\",\"name\":\"workflowName\",\"type\":\"bytes10\"},{\"internalType\":\"bytes2\",\"name\":\"reportName\",\"type\":\"bytes2\"}],\"name\":\"ReportForwarderUnauthorized\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"}],\"name\":\"SourceTokenDataTooLarge\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"uint256\",\"name\":\"threshold\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"timePassed\",\"type\":\"uint256\"}],\"name\":\"StaleGasPrice\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"feedTimestamp\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"storedTimeStamp\",\"type\":\"uint256\"}],\"name\":\"StaleKeystoneUpdate\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"}],\"name\":\"TokenNotSupported\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"caller\",\"type\":\"address\"}],\"name\":\"UnauthorizedCaller\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"UnsupportedNumberOfTokens\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"ZeroAddressNotAllowed\",\"type\":\"error\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"address\",\"name\":\"caller\",\"type\":\"address\"}],\"name\":\"AuthorizedCallerAdded\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"address\",\"name\":\"caller\",\"type\":\"address\"}],\"name\":\"AuthorizedCallerRemoved\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"components\":[{\"internalType\":\"bool\",\"name\":\"isEnabled\",\"type\":\"bool\"},{\"internalType\":\"uint16\",\"name\":\"maxNumberOfTokensPerMsg\",\"type\":\"uint16\"},{\"internalType\":\"uint32\",\"name\":\"maxDataBytes\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"maxPerMsgGasLimit\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"destGasOverhead\",\"type\":\"uint32\"},{\"internalType\":\"uint16\",\"name\":\"destGasPerPayloadByte\",\"type\":\"uint16\"},{\"internalType\":\"uint32\",\"name\":\"destDataAvailabilityOverheadGas\",\"type\":\"uint32\"},{\"internalType\":\"uint16\",\"name\":\"destGasPerDataAvailabilityByte\",\"type\":\"uint16\"},{\"internalType\":\"uint16\",\"name\":\"destDataAvailabilityMultiplierBps\",\"type\":\"uint16\"},{\"internalType\":\"uint16\",\"name\":\"defaultTokenFeeUSDCents\",\"type\":\"uint16\"},{\"internalType\":\"uint32\",\"name\":\"defaultTokenDestGasOverhead\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"defaultTxGasLimit\",\"type\":\"uint32\"},{\"internalType\":\"uint64\",\"name\":\"gasMultiplierWeiPerEth\",\"type\":\"uint64\"},{\"internalType\":\"uint32\",\"name\":\"networkFeeUSDCents\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"gasPriceStalenessThreshold\",\"type\":\"uint32\"},{\"internalType\":\"bool\",\"name\":\"enforceOutOfOrder\",\"type\":\"bool\"},{\"internalType\":\"bytes4\",\"name\":\"chainFamilySelector\",\"type\":\"bytes4\"}],\"indexed\":false,\"internalType\":\"structFeeQuoter.DestChainConfig\",\"name\":\"destChainConfig\",\"type\":\"tuple\"}],\"name\":\"DestChainAdded\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"components\":[{\"internalType\":\"bool\",\"name\":\"isEnabled\",\"type\":\"bool\"},{\"internalType\":\"uint16\",\"name\":\"maxNumberOfTokensPerMsg\",\"type\":\"uint16\"},{\"internalType\":\"uint32\",\"name\":\"maxDataBytes\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"maxPerMsgGasLimit\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"destGasOverhead\",\"type\":\"uint32\"},{\"internalType\":\"uint16\",\"name\":\"destGasPerPayloadByte\",\"type\":\"uint16\"},{\"internalType\":\"uint32\",\"name\":\"destDataAvailabilityOverheadGas\",\"type\":\"uint32\"},{\"internalType\":\"uint16\",\"name\":\"destGasPerDataAvailabilityByte\",\"type\":\"uint16\"},{\"internalType\":\"uint16\",\"name\":\"destDataAvailabilityMultiplierBps\",\"type\":\"uint16\"},{\"internalType\":\"uint16\",\"name\":\"defaultTokenFeeUSDCents\",\"type\":\"uint16\"},{\"internalType\":\"uint32\",\"name\":\"defaultTokenDestGasOverhead\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"defaultTxGasLimit\",\"type\":\"uint32\"},{\"internalType\":\"uint64\",\"name\":\"gasMultiplierWeiPerEth\",\"type\":\"uint64\"},{\"internalType\":\"uint32\",\"name\":\"networkFeeUSDCents\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"gasPriceStalenessThreshold\",\"type\":\"uint32\"},{\"internalType\":\"bool\",\"name\":\"enforceOutOfOrder\",\"type\":\"bool\"},{\"internalType\":\"bytes4\",\"name\":\"chainFamilySelector\",\"type\":\"bytes4\"}],\"indexed\":false,\"internalType\":\"structFeeQuoter.DestChainConfig\",\"name\":\"destChainConfig\",\"type\":\"tuple\"}],\"name\":\"DestChainConfigUpdated\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"feeToken\",\"type\":\"address\"}],\"name\":\"FeeTokenAdded\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"feeToken\",\"type\":\"address\"}],\"name\":\"FeeTokenRemoved\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"from\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"}],\"name\":\"OwnershipTransferRequested\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"from\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"}],\"name\":\"OwnershipTransferred\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"uint64\",\"name\":\"premiumMultiplierWeiPerEth\",\"type\":\"uint64\"}],\"name\":\"PremiumMultiplierWeiPerEthUpdated\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"},{\"components\":[{\"internalType\":\"address\",\"name\":\"dataFeedAddress\",\"type\":\"address\"},{\"internalType\":\"uint8\",\"name\":\"tokenDecimals\",\"type\":\"uint8\"}],\"indexed\":false,\"internalType\":\"structFeeQuoter.TokenPriceFeedConfig\",\"name\":\"priceFeedConfig\",\"type\":\"tuple\"}],\"name\":\"PriceFeedPerTokenUpdated\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"reportId\",\"type\":\"bytes32\"},{\"components\":[{\"internalType\":\"address\",\"name\":\"forwarder\",\"type\":\"address\"},{\"internalType\":\"bytes10\",\"name\":\"workflowName\",\"type\":\"bytes10\"},{\"internalType\":\"bytes2\",\"name\":\"reportName\",\"type\":\"bytes2\"},{\"internalType\":\"address\",\"name\":\"workflowOwner\",\"type\":\"address\"},{\"internalType\":\"bool\",\"name\":\"isAllowed\",\"type\":\"bool\"}],\"indexed\":false,\"internalType\":\"structKeystoneFeedsPermissionHandler.Permission\",\"name\":\"permission\",\"type\":\"tuple\"}],\"name\":\"ReportPermissionSet\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"}],\"name\":\"TokenTransferFeeConfigDeleted\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"},{\"components\":[{\"internalType\":\"uint32\",\"name\":\"minFeeUSDCents\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"maxFeeUSDCents\",\"type\":\"uint32\"},{\"internalType\":\"uint16\",\"name\":\"deciBps\",\"type\":\"uint16\"},{\"internalType\":\"uint32\",\"name\":\"destGasOverhead\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"destBytesOverhead\",\"type\":\"uint32\"},{\"internalType\":\"bool\",\"name\":\"isEnabled\",\"type\":\"bool\"}],\"indexed\":false,\"internalType\":\"structFeeQuoter.TokenTransferFeeConfig\",\"name\":\"tokenTransferFeeConfig\",\"type\":\"tuple\"}],\"name\":\"TokenTransferFeeConfigUpdated\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"value\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"timestamp\",\"type\":\"uint256\"}],\"name\":\"UsdPerTokenUpdated\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"destChain\",\"type\":\"uint64\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"value\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"timestamp\",\"type\":\"uint256\"}],\"name\":\"UsdPerUnitGasUpdated\",\"type\":\"event\"},{\"inputs\":[],\"name\":\"FEE_BASE_DECIMALS\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"KEYSTONE_PRICE_DECIMALS\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"acceptOwnership\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"address[]\",\"name\":\"addedCallers\",\"type\":\"address[]\"},{\"internalType\":\"address[]\",\"name\":\"removedCallers\",\"type\":\"address[]\"}],\"internalType\":\"structAuthorizedCallers.AuthorizedCallerArgs\",\"name\":\"authorizedCallerArgs\",\"type\":\"tuple\"}],\"name\":\"applyAuthorizedCallerUpdates\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"components\":[{\"internalType\":\"bool\",\"name\":\"isEnabled\",\"type\":\"bool\"},{\"internalType\":\"uint16\",\"name\":\"maxNumberOfTokensPerMsg\",\"type\":\"uint16\"},{\"internalType\":\"uint32\",\"name\":\"maxDataBytes\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"maxPerMsgGasLimit\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"destGasOverhead\",\"type\":\"uint32\"},{\"internalType\":\"uint16\",\"name\":\"destGasPerPayloadByte\",\"type\":\"uint16\"},{\"internalType\":\"uint32\",\"name\":\"destDataAvailabilityOverheadGas\",\"type\":\"uint32\"},{\"internalType\":\"uint16\",\"name\":\"destGasPerDataAvailabilityByte\",\"type\":\"uint16\"},{\"internalType\":\"uint16\",\"name\":\"destDataAvailabilityMultiplierBps\",\"type\":\"uint16\"},{\"internalType\":\"uint16\",\"name\":\"defaultTokenFeeUSDCents\",\"type\":\"uint16\"},{\"internalType\":\"uint32\",\"name\":\"defaultTokenDestGasOverhead\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"defaultTxGasLimit\",\"type\":\"uint32\"},{\"internalType\":\"uint64\",\"name\":\"gasMultiplierWeiPerEth\",\"type\":\"uint64\"},{\"internalType\":\"uint32\",\"name\":\"networkFeeUSDCents\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"gasPriceStalenessThreshold\",\"type\":\"uint32\"},{\"internalType\":\"bool\",\"name\":\"enforceOutOfOrder\",\"type\":\"bool\"},{\"internalType\":\"bytes4\",\"name\":\"chainFamilySelector\",\"type\":\"bytes4\"}],\"internalType\":\"structFeeQuoter.DestChainConfig\",\"name\":\"destChainConfig\",\"type\":\"tuple\"}],\"internalType\":\"structFeeQuoter.DestChainConfigArgs[]\",\"name\":\"destChainConfigArgs\",\"type\":\"tuple[]\"}],\"name\":\"applyDestChainConfigUpdates\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address[]\",\"name\":\"feeTokensToAdd\",\"type\":\"address[]\"},{\"internalType\":\"address[]\",\"name\":\"feeTokensToRemove\",\"type\":\"address[]\"}],\"name\":\"applyFeeTokensUpdates\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"},{\"internalType\":\"uint64\",\"name\":\"premiumMultiplierWeiPerEth\",\"type\":\"uint64\"}],\"internalType\":\"structFeeQuoter.PremiumMultiplierWeiPerEthArgs[]\",\"name\":\"premiumMultiplierWeiPerEthArgs\",\"type\":\"tuple[]\"}],\"name\":\"applyPremiumMultiplierWeiPerEthUpdates\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"components\":[{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"},{\"components\":[{\"internalType\":\"uint32\",\"name\":\"minFeeUSDCents\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"maxFeeUSDCents\",\"type\":\"uint32\"},{\"internalType\":\"uint16\",\"name\":\"deciBps\",\"type\":\"uint16\"},{\"internalType\":\"uint32\",\"name\":\"destGasOverhead\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"destBytesOverhead\",\"type\":\"uint32\"},{\"internalType\":\"bool\",\"name\":\"isEnabled\",\"type\":\"bool\"}],\"internalType\":\"structFeeQuoter.TokenTransferFeeConfig\",\"name\":\"tokenTransferFeeConfig\",\"type\":\"tuple\"}],\"internalType\":\"structFeeQuoter.TokenTransferFeeConfigSingleTokenArgs[]\",\"name\":\"tokenTransferFeeConfigs\",\"type\":\"tuple[]\"}],\"internalType\":\"structFeeQuoter.TokenTransferFeeConfigArgs[]\",\"name\":\"tokenTransferFeeConfigArgs\",\"type\":\"tuple[]\"},{\"components\":[{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"}],\"internalType\":\"structFeeQuoter.TokenTransferFeeConfigRemoveArgs[]\",\"name\":\"tokensToUseDefaultFeeConfigs\",\"type\":\"tuple[]\"}],\"name\":\"applyTokenTransferFeeConfigUpdates\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"fromToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"fromTokenAmount\",\"type\":\"uint256\"},{\"internalType\":\"address\",\"name\":\"toToken\",\"type\":\"address\"}],\"name\":\"convertTokenAmount\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getAllAuthorizedCallers\",\"outputs\":[{\"internalType\":\"address[]\",\"name\":\"\",\"type\":\"address[]\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"}],\"name\":\"getDestChainConfig\",\"outputs\":[{\"components\":[{\"internalType\":\"bool\",\"name\":\"isEnabled\",\"type\":\"bool\"},{\"internalType\":\"uint16\",\"name\":\"maxNumberOfTokensPerMsg\",\"type\":\"uint16\"},{\"internalType\":\"uint32\",\"name\":\"maxDataBytes\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"maxPerMsgGasLimit\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"destGasOverhead\",\"type\":\"uint32\"},{\"internalType\":\"uint16\",\"name\":\"destGasPerPayloadByte\",\"type\":\"uint16\"},{\"internalType\":\"uint32\",\"name\":\"destDataAvailabilityOverheadGas\",\"type\":\"uint32\"},{\"internalType\":\"uint16\",\"name\":\"destGasPerDataAvailabilityByte\",\"type\":\"uint16\"},{\"internalType\":\"uint16\",\"name\":\"destDataAvailabilityMultiplierBps\",\"type\":\"uint16\"},{\"internalType\":\"uint16\",\"name\":\"defaultTokenFeeUSDCents\",\"type\":\"uint16\"},{\"internalType\":\"uint32\",\"name\":\"defaultTokenDestGasOverhead\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"defaultTxGasLimit\",\"type\":\"uint32\"},{\"internalType\":\"uint64\",\"name\":\"gasMultiplierWeiPerEth\",\"type\":\"uint64\"},{\"internalType\":\"uint32\",\"name\":\"networkFeeUSDCents\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"gasPriceStalenessThreshold\",\"type\":\"uint32\"},{\"internalType\":\"bool\",\"name\":\"enforceOutOfOrder\",\"type\":\"bool\"},{\"internalType\":\"bytes4\",\"name\":\"chainFamilySelector\",\"type\":\"bytes4\"}],\"internalType\":\"structFeeQuoter.DestChainConfig\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"}],\"name\":\"getDestinationChainGasPrice\",\"outputs\":[{\"components\":[{\"internalType\":\"uint224\",\"name\":\"value\",\"type\":\"uint224\"},{\"internalType\":\"uint32\",\"name\":\"timestamp\",\"type\":\"uint32\"}],\"internalType\":\"structInternal.TimestampedPackedUint224\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getFeeTokens\",\"outputs\":[{\"internalType\":\"address[]\",\"name\":\"\",\"type\":\"address[]\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"}],\"name\":\"getPremiumMultiplierWeiPerEth\",\"outputs\":[{\"internalType\":\"uint64\",\"name\":\"premiumMultiplierWeiPerEth\",\"type\":\"uint64\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getStaticConfig\",\"outputs\":[{\"components\":[{\"internalType\":\"uint96\",\"name\":\"maxFeeJuelsPerMsg\",\"type\":\"uint96\"},{\"internalType\":\"address\",\"name\":\"linkToken\",\"type\":\"address\"},{\"internalType\":\"uint32\",\"name\":\"tokenPriceStalenessThreshold\",\"type\":\"uint32\"}],\"internalType\":\"structFeeQuoter.StaticConfig\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"},{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"}],\"name\":\"getTokenAndGasPrices\",\"outputs\":[{\"internalType\":\"uint224\",\"name\":\"tokenPrice\",\"type\":\"uint224\"},{\"internalType\":\"uint224\",\"name\":\"gasPriceValue\",\"type\":\"uint224\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"}],\"name\":\"getTokenPrice\",\"outputs\":[{\"components\":[{\"internalType\":\"uint224\",\"name\":\"value\",\"type\":\"uint224\"},{\"internalType\":\"uint32\",\"name\":\"timestamp\",\"type\":\"uint32\"}],\"internalType\":\"structInternal.TimestampedPackedUint224\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"}],\"name\":\"getTokenPriceFeedConfig\",\"outputs\":[{\"components\":[{\"internalType\":\"address\",\"name\":\"dataFeedAddress\",\"type\":\"address\"},{\"internalType\":\"uint8\",\"name\":\"tokenDecimals\",\"type\":\"uint8\"}],\"internalType\":\"structFeeQuoter.TokenPriceFeedConfig\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address[]\",\"name\":\"tokens\",\"type\":\"address[]\"}],\"name\":\"getTokenPrices\",\"outputs\":[{\"components\":[{\"internalType\":\"uint224\",\"name\":\"value\",\"type\":\"uint224\"},{\"internalType\":\"uint32\",\"name\":\"timestamp\",\"type\":\"uint32\"}],\"internalType\":\"structInternal.TimestampedPackedUint224[]\",\"name\":\"\",\"type\":\"tuple[]\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"}],\"name\":\"getTokenTransferFeeConfig\",\"outputs\":[{\"components\":[{\"internalType\":\"uint32\",\"name\":\"minFeeUSDCents\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"maxFeeUSDCents\",\"type\":\"uint32\"},{\"internalType\":\"uint16\",\"name\":\"deciBps\",\"type\":\"uint16\"},{\"internalType\":\"uint32\",\"name\":\"destGasOverhead\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"destBytesOverhead\",\"type\":\"uint32\"},{\"internalType\":\"bool\",\"name\":\"isEnabled\",\"type\":\"bool\"}],\"internalType\":\"structFeeQuoter.TokenTransferFeeConfig\",\"name\":\"tokenTransferFeeConfig\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"components\":[{\"internalType\":\"bytes\",\"name\":\"receiver\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"},{\"components\":[{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"internalType\":\"structClient.EVMTokenAmount[]\",\"name\":\"tokenAmounts\",\"type\":\"tuple[]\"},{\"internalType\":\"address\",\"name\":\"feeToken\",\"type\":\"address\"},{\"internalType\":\"bytes\",\"name\":\"extraArgs\",\"type\":\"bytes\"}],\"internalType\":\"structClient.EVM2AnyMessage\",\"name\":\"message\",\"type\":\"tuple\"}],\"name\":\"getValidatedFee\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"feeTokenAmount\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"}],\"name\":\"getValidatedTokenPrice\",\"outputs\":[{\"internalType\":\"uint224\",\"name\":\"\",\"type\":\"uint224\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes\",\"name\":\"metadata\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"report\",\"type\":\"bytes\"}],\"name\":\"onReport\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"owner\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"address\",\"name\":\"feeToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"feeTokenAmount\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"extraArgs\",\"type\":\"bytes\"},{\"components\":[{\"internalType\":\"address\",\"name\":\"sourcePoolAddress\",\"type\":\"address\"},{\"internalType\":\"bytes\",\"name\":\"destTokenAddress\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"extraData\",\"type\":\"bytes\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"destExecData\",\"type\":\"bytes\"}],\"internalType\":\"structInternal.EVM2AnyTokenTransfer[]\",\"name\":\"onRampTokenTransfers\",\"type\":\"tuple[]\"},{\"components\":[{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"internalType\":\"structClient.EVMTokenAmount[]\",\"name\":\"sourceTokenAmounts\",\"type\":\"tuple[]\"}],\"name\":\"processMessageArgs\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"msgFeeJuels\",\"type\":\"uint256\"},{\"internalType\":\"bool\",\"name\":\"isOutOfOrderExecution\",\"type\":\"bool\"},{\"internalType\":\"bytes\",\"name\":\"convertedExtraArgs\",\"type\":\"bytes\"},{\"internalType\":\"bytes[]\",\"name\":\"destExecDataPerToken\",\"type\":\"bytes[]\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"address\",\"name\":\"forwarder\",\"type\":\"address\"},{\"internalType\":\"bytes10\",\"name\":\"workflowName\",\"type\":\"bytes10\"},{\"internalType\":\"bytes2\",\"name\":\"reportName\",\"type\":\"bytes2\"},{\"internalType\":\"address\",\"name\":\"workflowOwner\",\"type\":\"address\"},{\"internalType\":\"bool\",\"name\":\"isAllowed\",\"type\":\"bool\"}],\"internalType\":\"structKeystoneFeedsPermissionHandler.Permission[]\",\"name\":\"permissions\",\"type\":\"tuple[]\"}],\"name\":\"setReportPermissions\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"}],\"name\":\"transferOwnership\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"typeAndVersion\",\"outputs\":[{\"internalType\":\"string\",\"name\":\"\",\"type\":\"string\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"components\":[{\"internalType\":\"address\",\"name\":\"sourceToken\",\"type\":\"address\"},{\"internalType\":\"uint224\",\"name\":\"usdPerToken\",\"type\":\"uint224\"}],\"internalType\":\"structInternal.TokenPriceUpdate[]\",\"name\":\"tokenPriceUpdates\",\"type\":\"tuple[]\"},{\"components\":[{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"uint224\",\"name\":\"usdPerUnitGas\",\"type\":\"uint224\"}],\"internalType\":\"structInternal.GasPriceUpdate[]\",\"name\":\"gasPriceUpdates\",\"type\":\"tuple[]\"}],\"internalType\":\"structInternal.PriceUpdates\",\"name\":\"priceUpdates\",\"type\":\"tuple\"}],\"name\":\"updatePrices\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"address\",\"name\":\"sourceToken\",\"type\":\"address\"},{\"components\":[{\"internalType\":\"address\",\"name\":\"dataFeedAddress\",\"type\":\"address\"},{\"internalType\":\"uint8\",\"name\":\"tokenDecimals\",\"type\":\"uint8\"}],\"internalType\":\"structFeeQuoter.TokenPriceFeedConfig\",\"name\":\"feedConfig\",\"type\":\"tuple\"}],\"internalType\":\"structFeeQuoter.TokenPriceFeedUpdate[]\",\"name\":\"tokenPriceFeedUpdates\",\"type\":\"tuple[]\"}],\"name\":\"updateTokenPriceFeeds\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"}]",
+	Bin: "0x60e06040523480156200001157600080fd5b506040516200787038038062007870833981016040819052620000349162001871565b8533806000816200008c5760405162461bcd60e51b815260206004820152601860248201527f43616e6e6f7420736574206f776e657220746f207a65726f000000000000000060448201526064015b60405180910390fd5b600080546001600160a01b0319166001600160a01b0384811691909117909155811615620000bf57620000bf8162000207565b5050604080518082018252838152815160008152602080820190935291810191909152620000ee9150620002b2565b5060208701516001600160a01b0316158062000112575086516001600160601b0316155b80620001265750604087015163ffffffff16155b15620001455760405163d794ef9560e01b815260040160405180910390fd5b6020878101516001600160a01b031660a05287516001600160601b031660805260408089015163ffffffff1660c05280516000815291820190526200018c90869062000401565b620001978462000549565b620001a2816200061a565b620001ad8262000a82565b60408051600080825260208201909252620001fa91859190620001f3565b6040805180820190915260008082526020820152815260200190600190039081620001cb5790505b5062000b4e565b5050505050505062001b2f565b336001600160a01b03821603620002615760405162461bcd60e51b815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c66000000000000000000604482015260640162000083565b600180546001600160a01b0319166001600160a01b0383811691821790925560008054604051929316917fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae12789190a350565b602081015160005b815181101562000342576000828281518110620002db57620002db62001990565b60209081029190910101519050620002f560028262000e87565b1562000338576040516001600160a01b03821681527fc3803387881faad271c47728894e3e36fac830ffc8602ca6fc07733cbda775809060200160405180910390a15b50600101620002ba565b50815160005b8151811015620003fb57600082828151811062000369576200036962001990565b6020026020010151905060006001600160a01b0316816001600160a01b031603620003a7576040516342bcdf7f60e11b815260040160405180910390fd5b620003b460028262000ea7565b506040516001600160a01b03821681527feb1b9b92e50b7f88f9ff25d56765095ac6e91540eee214906f4036a908ffbdef9060200160405180910390a15060010162000348565b50505050565b60005b8251811015620004a2576200044083828151811062000427576200042762001990565b6020026020010151600b62000ea760201b90919060201c565b1562000499578281815181106200045b576200045b62001990565b60200260200101516001600160a01b03167fdf1b1bd32a69711488d71554706bb130b1fc63a5fa1a2cd85e8440f84065ba2360405160405180910390a25b60010162000404565b5060005b81518110156200054457620004e2828281518110620004c957620004c962001990565b6020026020010151600b62000ebe60201b90919060201c565b156200053b57818181518110620004fd57620004fd62001990565b60200260200101516001600160a01b03167f1795838dc8ab2ffc5f431a1729a6afa0b587f982f7b2be0b9d7187a1ef547f9160405160405180910390a25b600101620004a6565b505050565b60005b8151811015620006165760008282815181106200056d576200056d62001990565b6020908102919091018101518051818301516001600160a01b0380831660008181526007875260409081902084518154868a018051929096166001600160a81b03199091168117600160a01b60ff9384160217909255825191825293519093169683019690965293955091939092917f08a5f7f5bb38a81d8e43aca13ecd76431dbf8816ae4699affff7b00b2fc1c464910160405180910390a25050508060010190506200054c565b5050565b60005b8151811015620006165760008282815181106200063e576200063e62001990565b6020026020010151905060008383815181106200065f576200065f62001990565b6020026020010151600001519050600082602001519050816001600160401b03166000148062000698575061016081015163ffffffff16155b80620006ba57506102008101516001600160e01b031916630a04b54b60e21b14155b80620006da5750806060015163ffffffff1681610160015163ffffffff16115b15620007055760405163c35aa79d60e01b81526001600160401b038316600482015260240162000083565b6001600160401b038216600090815260096020526040812060010154600160a81b900460e01b6001600160e01b03191690036200078557816001600160401b03167f525e3d4e0c31cef19cf9426af8d2c0ddd2d576359ca26bed92aac5fadda4626582604051620007779190620019a6565b60405180910390a2620007c9565b816001600160401b03167f283b699f411baff8f1c29fe49f32a828c8151596244b8e7e4c164edd6569a83582604051620007c09190620019a6565b60405180910390a25b8060096000846001600160401b03166001600160401b0316815260200190815260200160002060008201518160000160006101000a81548160ff02191690831515021790555060208201518160000160016101000a81548161ffff021916908361ffff16021790555060408201518160000160036101000a81548163ffffffff021916908363ffffffff16021790555060608201518160000160076101000a81548163ffffffff021916908363ffffffff160217905550608082015181600001600b6101000a81548163ffffffff021916908363ffffffff16021790555060a082015181600001600f6101000a81548161ffff021916908361ffff16021790555060c08201518160000160116101000a81548163ffffffff021916908363ffffffff16021790555060e08201518160000160156101000a81548161ffff021916908361ffff1602179055506101008201518160000160176101000a81548161ffff021916908361ffff1602179055506101208201518160000160196101000a81548161ffff021916908361ffff16021790555061014082015181600001601b6101000a81548163ffffffff021916908363ffffffff1602179055506101608201518160010160006101000a81548163ffffffff021916908363ffffffff1602179055506101808201518160010160046101000a8154816001600160401b0302191690836001600160401b031602179055506101a082015181600101600c6101000a81548163ffffffff021916908363ffffffff1602179055506101c08201518160010160106101000a81548163ffffffff021916908363ffffffff1602179055506101e08201518160010160146101000a81548160ff0219169083151502179055506102008201518160010160156101000a81548163ffffffff021916908360e01c02179055509050505050508060010190506200061d565b60005b81518110156200061657600082828151811062000aa65762000aa662001990565b6020026020010151600001519050600083838151811062000acb5762000acb62001990565b6020908102919091018101518101516001600160a01b03841660008181526008845260409081902080546001600160401b0319166001600160401b0385169081179091559051908152919350917fbb77da6f7210cdd16904228a9360133d1d7dfff99b1bc75f128da5b53e28f97d910160405180910390a2505060010162000a85565b60005b825181101562000dc157600083828151811062000b725762000b7262001990565b6020026020010151905060008160000151905060005b82602001515181101562000db25760008360200151828151811062000bb15762000bb162001990565b602002602001015160200151905060008460200151838151811062000bda5762000bda62001990565b6020026020010151600001519050602063ffffffff16826080015163ffffffff16101562000c395760808201516040516312766e0160e11b81526001600160a01b038316600482015263ffffffff909116602482015260440162000083565b6001600160401b0384166000818152600a602090815260408083206001600160a01b0386168085529083529281902086518154938801518389015160608a015160808b015160a08c01511515600160901b0260ff60901b1963ffffffff928316600160701b021664ffffffffff60701b199383166a01000000000000000000000263ffffffff60501b1961ffff90961668010000000000000000029590951665ffffffffffff60401b19968416640100000000026001600160401b0319909b16939097169290921798909817939093169390931717919091161792909217909155519091907f94967ae9ea7729ad4f54021c1981765d2b1d954f7c92fbec340aa0a54f46b8b59062000d9f908690600060c08201905063ffffffff80845116835280602085015116602084015261ffff60408501511660408401528060608501511660608401528060808501511660808401525060a0830151151560a083015292915050565b60405180910390a3505060010162000b88565b50505080600101905062000b51565b5060005b81518110156200054457600082828151811062000de65762000de662001990565b6020026020010151600001519050600083838151811062000e0b5762000e0b62001990565b6020908102919091018101518101516001600160401b0384166000818152600a845260408082206001600160a01b038516808452955280822080546001600160981b03191690555192945090917f4de5b1bcbca6018c11303a2c3f4a4b4f22a1c741d8c4ba430d246ac06c5ddf8b9190a3505060010162000dc5565b600062000e9e836001600160a01b03841662000ed5565b90505b92915050565b600062000e9e836001600160a01b03841662000fd9565b600062000e9e836001600160a01b0384166200102b565b6000818152600183016020526040812054801562000fce57600062000efc60018362001af7565b855490915060009062000f129060019062001af7565b905081811462000f7e57600086600001828154811062000f365762000f3662001990565b906000526020600020015490508087600001848154811062000f5c5762000f5c62001990565b6000918252602080832090910192909255918252600188019052604090208390555b855486908062000f925762000f9262001b19565b60019003818190600052602060002001600090559055856001016000868152602001908152602001600020600090556001935050505062000ea1565b600091505062000ea1565b6000818152600183016020526040812054620010225750815460018181018455600084815260208082209093018490558454848252828601909352604090209190915562000ea1565b50600062000ea1565b6000818152600183016020526040812054801562000fce5760006200105260018362001af7565b8554909150600090620010689060019062001af7565b905080821462000f7e57600086600001828154811062000f365762000f3662001990565b634e487b7160e01b600052604160045260246000fd5b604080519081016001600160401b0381118282101715620010c757620010c76200108c565b60405290565b60405160c081016001600160401b0381118282101715620010c757620010c76200108c565b60405161022081016001600160401b0381118282101715620010c757620010c76200108c565b604051601f8201601f191681016001600160401b03811182821017156200114357620011436200108c565b604052919050565b80516001600160a01b03811681146200116357600080fd5b919050565b805163ffffffff811681146200116357600080fd5b6000606082840312156200119057600080fd5b604051606081016001600160401b0381118282101715620011b557620011b56200108c565b604052825190915081906001600160601b0381168114620011d557600080fd5b8152620011e5602084016200114b565b6020820152620011f86040840162001168565b60408201525092915050565b60006001600160401b038211156200122057620012206200108c565b5060051b60200190565b600082601f8301126200123c57600080fd5b81516020620012556200124f8362001204565b62001118565b8083825260208201915060208460051b8701019350868411156200127857600080fd5b602086015b848110156200129f5762001291816200114b565b83529183019183016200127d565b509695505050505050565b600082601f830112620012bc57600080fd5b81516020620012cf6200124f8362001204565b82815260609283028501820192828201919087851115620012ef57600080fd5b8387015b858110156200138257808903828112156200130e5760008081fd5b62001318620010a2565b62001323836200114b565b8152604080601f19840112156200133a5760008081fd5b62001344620010a2565b9250620013538885016200114b565b835283015160ff81168114620013695760008081fd5b82880152808701919091528452928401928101620012f3565b5090979650505050505050565b80516001600160401b03811681146200116357600080fd5b805161ffff811681146200116357600080fd5b805180151581146200116357600080fd5b600082601f830112620013dd57600080fd5b81516020620013f06200124f8362001204565b82815260059290921b840181019181810190868411156200141057600080fd5b8286015b848110156200129f5780516001600160401b03808211156200143557600080fd5b908801906040601f19838c0381018213156200145057600080fd5b6200145a620010a2565b620014678986016200138f565b815282850151848111156200147b57600080fd5b8086019550508c603f8601126200149157600080fd5b888501519350620014a66200124f8562001204565b84815260e09094028501830193898101908e861115620014c557600080fd5b958401955b858710156200159e57868f0360e0811215620014e557600080fd5b620014ef620010a2565b620014fa896200114b565b815260c086830112156200150d57600080fd5b62001517620010cd565b9150620015268d8a0162001168565b825262001535878a0162001168565b8d8301526200154760608a01620013a7565b878301526200155960808a0162001168565b60608301526200156c60a08a0162001168565b60808301526200157f60c08a01620013ba565b60a0830152808d0191909152825260e09690960195908a0190620014ca565b828b01525087525050509284019250830162001414565b600082601f830112620015c757600080fd5b81516020620015da6200124f8362001204565b82815260069290921b84018101918181019086841115620015fa57600080fd5b8286015b848110156200129f5760408189031215620016195760008081fd5b62001623620010a2565b6200162e826200114b565b81526200163d8583016200138f565b81860152835291830191604001620015fe565b80516001600160e01b0319811681146200116357600080fd5b600082601f8301126200167b57600080fd5b815160206200168e6200124f8362001204565b8281526102409283028501820192828201919087851115620016af57600080fd5b8387015b85811015620013825780890382811215620016ce5760008081fd5b620016d8620010a2565b620016e3836200138f565b815261022080601f1984011215620016fb5760008081fd5b62001705620010f2565b925062001714888501620013ba565b8352604062001725818601620013a7565b8985015260606200173881870162001168565b82860152608091506200174d82870162001168565b9085015260a06200176086820162001168565b8286015260c0915062001775828701620013a7565b9085015260e06200178886820162001168565b8286015261010091506200179e828701620013a7565b90850152610120620017b2868201620013a7565b828601526101409150620017c8828701620013a7565b90850152610160620017dc86820162001168565b828601526101809150620017f282870162001168565b908501526101a0620018068682016200138f565b828601526101c091506200181c82870162001168565b908501526101e06200183086820162001168565b82860152610200915062001846828701620013ba565b908501526200185785830162001650565b9084015250808701919091528452928401928101620016b3565b6000806000806000806000610120888a0312156200188e57600080fd5b6200189a89896200117d565b60608901519097506001600160401b0380821115620018b857600080fd5b620018c68b838c016200122a565b975060808a0151915080821115620018dd57600080fd5b620018eb8b838c016200122a565b965060a08a01519150808211156200190257600080fd5b620019108b838c01620012aa565b955060c08a01519150808211156200192757600080fd5b620019358b838c01620013cb565b945060e08a01519150808211156200194c57600080fd5b6200195a8b838c01620015b5565b93506101008a01519150808211156200197257600080fd5b50620019818a828b0162001669565b91505092959891949750929550565b634e487b7160e01b600052603260045260246000fd5b81511515815261022081016020830151620019c7602084018261ffff169052565b506040830151620019e0604084018263ffffffff169052565b506060830151620019f9606084018263ffffffff169052565b50608083015162001a12608084018263ffffffff169052565b5060a083015162001a2960a084018261ffff169052565b5060c083015162001a4260c084018263ffffffff169052565b5060e083015162001a5960e084018261ffff169052565b506101008381015161ffff9081169184019190915261012080850151909116908301526101408084015163ffffffff9081169184019190915261016080850151821690840152610180808501516001600160401b0316908401526101a0808501518216908401526101c080850151909116908301526101e080840151151590830152610200928301516001600160e01b031916929091019190915290565b8181038181111562000ea157634e487b7160e01b600052601160045260246000fd5b634e487b7160e01b600052603160045260246000fd5b60805160a05160c051615cee62001b82600039600081816102fa01526118750152600081816102be01528181610eb80152610f1801526000818161028a01528181610f410152610fb10152615cee6000f3fe608060405234801561001057600080fd5b50600436106101d95760003560e01c8063770e2dc411610104578063a69c64c0116100a2578063d63d3af211610071578063d63d3af214610ab0578063d8694ccd14610ab8578063f2fde38b14610acb578063ffdb4b3714610ade57600080fd5b8063a69c64c0146109d5578063bf78e03f146109e8578063cdc73d5114610a95578063d02641a014610a9d57600080fd5b8063805f2132116100de578063805f21321461081757806382b49eb01461082a5780638da5cb5b1461099a57806391a2749a146109c257600080fd5b8063770e2dc4146107e957806379ba5097146107fc5780637afac3221461080457600080fd5b8063407e10861161017c5780634ab35b0b1161014b5780634ab35b0b14610457578063514e8cff146104975780636cb5f3dd1461053a5780636def4ce71461054d57600080fd5b8063407e1086146103ee57806341ed29e714610401578063430d138c1461041457806345ac924d1461043757600080fd5b8063181f5a77116101b8578063181f5a77146103735780632451a627146103bc578063325c868e146103d15780633937306f146103d957600080fd5b806241e5be146101de578063061877e31461020457806306285c691461025d575b600080fd5b6101f16101ec3660046143ce565b610b26565b6040519081526020015b60405180910390f35b61024461021236600461440a565b73ffffffffffffffffffffffffffffffffffffffff1660009081526008602052604090205467ffffffffffffffff1690565b60405167ffffffffffffffff90911681526020016101fb565b610327604080516060810182526000808252602082018190529181019190915260405180606001604052807f00000000000000000000000000000000000000000000000000000000000000006bffffffffffffffffffffffff1681526020017f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff1681526020017f000000000000000000000000000000000000000000000000000000000000000063ffffffff16815250905090565b6040805182516bffffffffffffffffffffffff16815260208084015173ffffffffffffffffffffffffffffffffffffffff16908201529181015163ffffffff16908201526060016101fb565b6103af6040518060400160405280601381526020017f46656551756f74657220312e362e302d6465760000000000000000000000000081525081565b6040516101fb9190614489565b6103c4610b94565b6040516101fb919061449c565b6101f1602481565b6103ec6103e73660046144f6565b610ba5565b005b6103ec6103fc366004614698565b610e5a565b6103ec61040f3660046147ca565b610e6e565b6104276104223660046149a4565b610eb0565b6040516101fb9493929190614a98565b61044a610445366004614b37565b6110c0565b6040516101fb9190614b79565b61046a61046536600461440a565b61118b565b6040517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff90911681526020016101fb565b61052d6104a5366004614bf4565b60408051808201909152600080825260208201525067ffffffffffffffff166000908152600560209081526040918290208251808401909352547bffffffffffffffffffffffffffffffffffffffffffffffffffffffff811683527c0100000000000000000000000000000000000000000000000000000000900463ffffffff169082015290565b6040516101fb9190614c0f565b6103ec610548366004614ca0565b611196565b6107dc61055b366004614bf4565b6040805161022081018252600080825260208201819052918101829052606081018290526080810182905260a0810182905260c0810182905260e08101829052610100810182905261012081018290526101408101829052610160810182905261018081018290526101a081018290526101c081018290526101e081018290526102008101919091525067ffffffffffffffff908116600090815260096020908152604091829020825161022081018452815460ff8082161515835261ffff61010080840482169685019690965263ffffffff630100000084048116978501979097526701000000000000008304871660608501526b0100000000000000000000008304871660808501526f010000000000000000000000000000008304811660a0850152710100000000000000000000000000000000008304871660c08501527501000000000000000000000000000000000000000000808404821660e08087019190915277010000000000000000000000000000000000000000000000850483169786019790975279010000000000000000000000000000000000000000000000000084049091166101208501527b01000000000000000000000000000000000000000000000000000000909204861661014084015260019093015480861661016084015264010000000081049096166101808301526c01000000000000000000000000860485166101a083015270010000000000000000000000000000000086049094166101c082015274010000000000000000000000000000000000000000850490911615156101e08201527fffffffff0000000000000000000000000000000000000000000000000000000092909304901b1661020082015290565b6040516101fb9190614ec0565b6103ec6107f73660046150be565b6111a7565b6103ec6111b9565b6103ec6108123660046153d8565b6112b6565b6103ec61082536600461543c565b6112c8565b61093a6108383660046154a8565b6040805160c081018252600080825260208201819052918101829052606081018290526080810182905260a08101919091525067ffffffffffffffff919091166000908152600a6020908152604080832073ffffffffffffffffffffffffffffffffffffffff94909416835292815290829020825160c081018452905463ffffffff8082168352640100000000820481169383019390935268010000000000000000810461ffff16938201939093526a01000000000000000000008304821660608201526e01000000000000000000000000000083049091166080820152720100000000000000000000000000000000000090910460ff16151560a082015290565b6040516101fb9190600060c08201905063ffffffff80845116835280602085015116602084015261ffff60408501511660408401528060608501511660608401528060808501511660808401525060a0830151151560a083015292915050565b60005460405173ffffffffffffffffffffffffffffffffffffffff90911681526020016101fb565b6103ec6109d03660046154d2565b6117b0565b6103ec6109e3366004615563565b6117c1565b610a616109f636600461440a565b6040805180820182526000808252602091820181905273ffffffffffffffffffffffffffffffffffffffff93841681526007825282902082518084019093525492831682527401000000000000000000000000000000000000000090920460ff169181019190915290565b60408051825173ffffffffffffffffffffffffffffffffffffffff16815260209283015160ff1692810192909252016101fb565b6103c46117d2565b61052d610aab36600461440a565b6117de565b6101f1601281565b6101f1610ac6366004615628565b611922565b6103ec610ad936600461440a565b611e5a565b610af1610aec36600461567d565b611e6b565b604080517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff9384168152929091166020830152016101fb565b6000610b3182611f23565b7bffffffffffffffffffffffffffffffffffffffffffffffffffffffff16610b5885611f23565b610b80907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff16856156d6565b610b8a91906156ed565b90505b9392505050565b6060610ba06002611fbd565b905090565b610bad611fca565b6000610bb98280615728565b9050905060005b81811015610d03576000610bd48480615728565b83818110610be457610be4615790565b905060400201803603810190610bfa91906157eb565b604080518082018252602080840180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff908116845263ffffffff42818116858701908152885173ffffffffffffffffffffffffffffffffffffffff9081166000908152600690975295889020965190519092167c010000000000000000000000000000000000000000000000000000000002919092161790935584519051935194955016927f52f50aa6d1a95a4595361ecf953d095f125d442e4673716dede699e049de148a92610cf29290917bffffffffffffffffffffffffffffffffffffffffffffffffffffffff929092168252602082015260400190565b60405180910390a250600101610bc0565b506000610d136020840184615728565b9050905060005b81811015610e54576000610d316020860186615728565b83818110610d4157610d41615790565b905060400201803603810190610d579190615828565b604080518082018252602080840180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff908116845263ffffffff42818116858701908152885167ffffffffffffffff9081166000908152600590975295889020965190519092167c010000000000000000000000000000000000000000000000000000000002919092161790935584519051935194955016927fdd84a3fa9ef9409f550d54d6affec7e9c480c878c6ab27b78912a03e1b371c6e92610e439290917bffffffffffffffffffffffffffffffffffffffffffffffffffffffff929092168252602082015260400190565b60405180910390a250600101610d1a565b50505050565b610e6261200f565b610e6b81612090565b50565b610e7661200f565b60005b8151811015610eac57610ea4828281518110610e9757610e97615790565b602002602001015161218e565b600101610e79565b5050565b6000806060807f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff168c73ffffffffffffffffffffffffffffffffffffffff1603610f11578a9350610f3f565b610f3c8c8c7f0000000000000000000000000000000000000000000000000000000000000000610b26565b93505b7f00000000000000000000000000000000000000000000000000000000000000006bffffffffffffffffffffffff16841115610fe3576040517f6a92a483000000000000000000000000000000000000000000000000000000008152600481018590526bffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001660248201526044015b60405180910390fd5b67ffffffffffffffff8d1660009081526009602052604081206001015463ffffffff16906110128c8c84612360565b9050806020015194506110288f8b8b8b8b612509565b925085856110a8836040805182516024820152602092830151151560448083019190915282518083039091018152606490910190915290810180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167f181dcf100000000000000000000000000000000000000000000000000000000017905290565b95509550955050509950995099509995505050505050565b60608160008167ffffffffffffffff8111156110de576110de614531565b60405190808252806020026020018201604052801561112357816020015b60408051808201909152600080825260208201528152602001906001900390816110fc5790505b50905060005b828110156111805761115b86868381811061114657611146615790565b9050602002016020810190610aab919061440a565b82828151811061116d5761116d615790565b6020908102919091010152600101611129565b509150505b92915050565b600061118582611f23565b61119e61200f565b610e6b8161287a565b6111af61200f565b610eac8282612d4c565b60015473ffffffffffffffffffffffffffffffffffffffff16331461123a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4d7573742062652070726f706f736564206f776e6572000000000000000000006044820152606401610fda565b60008054337fffffffffffffffffffffffff00000000000000000000000000000000000000008083168217845560018054909116905560405173ffffffffffffffffffffffffffffffffffffffff90921692909183917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a350565b6112be61200f565b610eac828261315e565b600080600061130c87878080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152506132a592505050565b92509250925061131e338385846132c0565b600061132c8587018761584b565b905060005b81518110156117a55760006007600084848151811061135257611352615790565b6020908102919091018101515173ffffffffffffffffffffffffffffffffffffffff16825281019190915260400160009081205474010000000000000000000000000000000000000000900460ff169150819003611413578282815181106113bc576113bc615790565b6020908102919091010151516040517f06439c6b00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff9091166004820152602401610fda565b600061145c60128386868151811061142d5761142d615790565b6020026020010151602001517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff16613418565b90506006600085858151811061147457611474615790565b60200260200101516000015173ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600001601c9054906101000a900463ffffffff1663ffffffff168484815181106114e6576114e6615790565b60200260200101516040015163ffffffff1610156115f05783838151811061151057611510615790565b60200260200101516000015184848151811061152e5761152e615790565b6020026020010151604001516006600087878151811061155057611550615790565b6020908102919091018101515173ffffffffffffffffffffffffffffffffffffffff90811683529082019290925260409081016000205490517f191ec70600000000000000000000000000000000000000000000000000000000815293909116600484015263ffffffff91821660248401527c01000000000000000000000000000000000000000000000000000000009004166044820152606401610fda565b6040518060400160405280827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff16815260200185858151811061163157611631615790565b60200260200101516040015163ffffffff168152506006600086868151811061165c5761165c615790565b6020908102919091018101515173ffffffffffffffffffffffffffffffffffffffff168252818101929092526040016000208251929091015163ffffffff167c0100000000000000000000000000000000000000000000000000000000027bffffffffffffffffffffffffffffffffffffffffffffffffffffffff90921691909117905583518490849081106116f4576116f4615790565b60200260200101516000015173ffffffffffffffffffffffffffffffffffffffff167f52f50aa6d1a95a4595361ecf953d095f125d442e4673716dede699e049de148a8286868151811061174a5761174a615790565b6020026020010151604001516040516117939291907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff92909216825263ffffffff16602082015260400190565b60405180910390a25050600101611331565b505050505050505050565b6117b861200f565b610e6b816134e4565b6117c961200f565b610e6b81613670565b6060610ba0600b611fbd565b604080518082019091526000808252602082015273ffffffffffffffffffffffffffffffffffffffff82166000908152600660209081526040918290208251808401909352547bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8116835263ffffffff7c010000000000000000000000000000000000000000000000000000000090910481169183018290527f000000000000000000000000000000000000000000000000000000000000000016906118a09042615912565b10156118ac5792915050565b73ffffffffffffffffffffffffffffffffffffffff8381166000908152600760209081526040918290208251808401909352549283168083527401000000000000000000000000000000000000000090930460ff169082015290611911575092915050565b61191a8161375a565b949350505050565b67ffffffffffffffff8083166000908152600960209081526040808320815161022081018352815460ff808216151580845261ffff61010080850482169886019890985263ffffffff630100000085048116978601979097526701000000000000008404871660608601526b0100000000000000000000008404871660808601526f010000000000000000000000000000008404811660a0860152710100000000000000000000000000000000008404871660c08601527501000000000000000000000000000000000000000000808504821660e08088019190915277010000000000000000000000000000000000000000000000860483169987019990995279010000000000000000000000000000000000000000000000000085049091166101208601527b01000000000000000000000000000000000000000000000000000000909304861661014085015260019094015480861661016085015264010000000081049098166101808401526c01000000000000000000000000880485166101a084015270010000000000000000000000000000000088049094166101c083015274010000000000000000000000000000000000000000870490931615156101e08201527fffffffff000000000000000000000000000000000000000000000000000000009290950490921b16610200840152909190611b5c576040517f99ac52f200000000000000000000000000000000000000000000000000000000815267ffffffffffffffff85166004820152602401610fda565b611b77611b6f608085016060860161440a565b600b906138e9565b611bd657611b8b608084016060850161440a565b6040517f2502348c00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff9091166004820152602401610fda565b6000611be56040850185615728565b9150611c41905082611bfa6020870187615925565b905083611c078880615925565b8080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525061391892505050565b6000611c5b611c56608087016060880161440a565b611f23565b90506000611c6e87856101c001516139c2565b9050600080808515611cae57611ca2878b611c8f60808d0160608e0161440a565b88611c9d60408f018f615728565b613ac2565b91945092509050611cce565b6101a0870151611ccb9063ffffffff16662386f26fc100006156d6565b92505b61010087015160009061ffff1615611d1257611d0f886dffffffffffffffffffffffffffff607088901c16611d0660208e018e615925565b90508a86613d9a565b90505b61018088015160009067ffffffffffffffff16611d3b611d3560808e018e615925565b8c613e4a565b600001518563ffffffff168b60a0015161ffff168e8060200190611d5f9190615925565b611d6a9291506156d6565b8c6080015163ffffffff16611d7f919061598a565b611d89919061598a565b611d93919061598a565b611dad906dffffffffffffffffffffffffffff89166156d6565b611db791906156d6565b9050867bffffffffffffffffffffffffffffffffffffffffffffffffffffffff168282600860008f6060016020810190611df1919061440a565b73ffffffffffffffffffffffffffffffffffffffff168152602081019190915260400160002054611e2c9067ffffffffffffffff16896156d6565b611e36919061598a565b611e40919061598a565b611e4a91906156ed565b9c9b505050505050505050505050565b611e6261200f565b610e6b81613f0b565b67ffffffffffffffff8116600090815260096020526040812054819060ff16611ecc576040517f99ac52f200000000000000000000000000000000000000000000000000000000815267ffffffffffffffff84166004820152602401610fda565b611ed584611f23565b67ffffffffffffffff8416600090815260096020526040902060010154611f17908590700100000000000000000000000000000000900463ffffffff166139c2565b915091505b9250929050565b600080611f2f836117de565b9050806020015163ffffffff1660001480611f67575080517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff16155b15611fb6576040517f06439c6b00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff84166004820152602401610fda565b5192915050565b60606000610b8d83614000565b611fd56002336138e9565b61200d576040517fd86ad9cf000000000000000000000000000000000000000000000000000000008152336004820152602401610fda565b565b60005473ffffffffffffffffffffffffffffffffffffffff16331461200d576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4f6e6c792063616c6c61626c65206279206f776e6572000000000000000000006044820152606401610fda565b60005b8151811015610eac5760008282815181106120b0576120b0615790565b60209081029190910181015180518183015173ffffffffffffffffffffffffffffffffffffffff80831660008181526007875260409081902084518154868a018051929096167fffffffffffffffffffffff00000000000000000000000000000000000000000090911681177401000000000000000000000000000000000000000060ff9384160217909255825191825293519093169683019690965293955091939092917f08a5f7f5bb38a81d8e43aca13ecd76431dbf8816ae4699affff7b00b2fc1c464910160405180910390a2505050806001019050612093565b600061224782600001518360600151846020015185604001516040805173ffffffffffffffffffffffffffffffffffffffff80871660208301528516918101919091527fffffffffffffffffffff00000000000000000000000000000000000000000000831660608201527fffff0000000000000000000000000000000000000000000000000000000000008216608082015260009060a001604051602081830303815290604052805190602001209050949350505050565b60808301516000828152600460205260409081902080549215157fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00909316929092179091555190915081907f32a4ba3fa3351b11ad555d4c8ec70a744e8705607077a946807030d64b6ab1a390612354908590600060a08201905073ffffffffffffffffffffffffffffffffffffffff8084511683527fffffffffffffffffffff0000000000000000000000000000000000000000000060208501511660208401527fffff00000000000000000000000000000000000000000000000000000000000060408501511660408401528060608501511660608401525060808301511515608083015292915050565b60405180910390a25050565b604080518082019091526000808252602082015260008390036123a157506040805180820190915267ffffffffffffffff8216815260006020820152610b8d565b60006123ad848661599d565b905060006123be85600481896159e3565b8080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152509293505050507fffffffff0000000000000000000000000000000000000000000000000000000082167fe7e230f0000000000000000000000000000000000000000000000000000000000161245b57808060200190518101906124529190615a0d565b92505050610b8d565b7f6859a837000000000000000000000000000000000000000000000000000000007fffffffff000000000000000000000000000000000000000000000000000000008316016124d7576040518060400160405280828060200190518101906124c39190615a39565b815260006020909101529250610b8d915050565b6040517f5247fdce00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b67ffffffffffffffff808616600090815260096020526040902060010154606091750100000000000000000000000000000000000000000090910460e01b90859081111561255957612559614531565b60405190808252806020026020018201604052801561258c57816020015b60608152602001906001900390816125775790505b50915060005b8581101561286f5760008585838181106125ae576125ae615790565b6125c4926020604090920201908101915061440a565b905060008888848181106125da576125da615790565b90506020028101906125ec9190615a52565b6125fa906040810190615925565b91505060208111156126aa5767ffffffffffffffff8a166000908152600a6020908152604080832073ffffffffffffffffffffffffffffffffffffffff861684529091529020546e010000000000000000000000000000900463ffffffff168111156126aa576040517f36f536ca00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff83166004820152602401610fda565b61271a848a8a868181106126c0576126c0615790565b90506020028101906126d29190615a52565b6126e0906020810190615925565b8080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525061405c92505050565b67ffffffffffffffff8a166000818152600a6020908152604080832073ffffffffffffffffffffffffffffffffffffffff871684528252808320815160c081018352905463ffffffff8082168352640100000000820481168386015268010000000000000000820461ffff16838501526a01000000000000000000008204811660608401526e010000000000000000000000000000820481166080840152720100000000000000000000000000000000000090910460ff16151560a08301908152958552600990935290832054935190937b0100000000000000000000000000000000000000000000000000000090049091169190612819578161281f565b82606001515b6040805163ffffffff831660208201529192500160405160208183030381529060405288878151811061285457612854615790565b60200260200101819052505050505050806001019050612592565b505095945050505050565b60005b8151811015610eac57600082828151811061289a5761289a615790565b6020026020010151905060008383815181106128b8576128b8615790565b60200260200101516000015190506000826020015190508167ffffffffffffffff16600014806128f1575061016081015163ffffffff16155b8061294357506102008101517fffffffff00000000000000000000000000000000000000000000000000000000167f2812d52c0000000000000000000000000000000000000000000000000000000014155b806129625750806060015163ffffffff1681610160015163ffffffff16115b156129a5576040517fc35aa79d00000000000000000000000000000000000000000000000000000000815267ffffffffffffffff83166004820152602401610fda565b67ffffffffffffffff82166000908152600960205260408120600101547501000000000000000000000000000000000000000000900460e01b7fffffffff00000000000000000000000000000000000000000000000000000000169003612a4d578167ffffffffffffffff167f525e3d4e0c31cef19cf9426af8d2c0ddd2d576359ca26bed92aac5fadda4626582604051612a409190614ec0565b60405180910390a2612a90565b8167ffffffffffffffff167f283b699f411baff8f1c29fe49f32a828c8151596244b8e7e4c164edd6569a83582604051612a879190614ec0565b60405180910390a25b80600960008467ffffffffffffffff1667ffffffffffffffff16815260200190815260200160002060008201518160000160006101000a81548160ff02191690831515021790555060208201518160000160016101000a81548161ffff021916908361ffff16021790555060408201518160000160036101000a81548163ffffffff021916908363ffffffff16021790555060608201518160000160076101000a81548163ffffffff021916908363ffffffff160217905550608082015181600001600b6101000a81548163ffffffff021916908363ffffffff16021790555060a082015181600001600f6101000a81548161ffff021916908361ffff16021790555060c08201518160000160116101000a81548163ffffffff021916908363ffffffff16021790555060e08201518160000160156101000a81548161ffff021916908361ffff1602179055506101008201518160000160176101000a81548161ffff021916908361ffff1602179055506101208201518160000160196101000a81548161ffff021916908361ffff16021790555061014082015181600001601b6101000a81548163ffffffff021916908363ffffffff1602179055506101608201518160010160006101000a81548163ffffffff021916908363ffffffff1602179055506101808201518160010160046101000a81548167ffffffffffffffff021916908367ffffffffffffffff1602179055506101a082015181600101600c6101000a81548163ffffffff021916908363ffffffff1602179055506101c08201518160010160106101000a81548163ffffffff021916908363ffffffff1602179055506101e08201518160010160146101000a81548160ff0219169083151502179055506102008201518160010160156101000a81548163ffffffff021916908360e01c021790555090505050505080600101905061287d565b60005b8251811015613075576000838281518110612d6c57612d6c615790565b6020026020010151905060008160000151905060005b82602001515181101561306757600083602001518281518110612da757612da7615790565b6020026020010151602001519050600084602001518381518110612dcd57612dcd615790565b6020026020010151600001519050602063ffffffff16826080015163ffffffff161015612e505760808201516040517f24ecdc0200000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff8316600482015263ffffffff9091166024820152604401610fda565b67ffffffffffffffff84166000818152600a6020908152604080832073ffffffffffffffffffffffffffffffffffffffff86168085529083529281902086518154938801518389015160608a015160808b015160a08c015115157201000000000000000000000000000000000000027fffffffffffffffffffffffffff00ffffffffffffffffffffffffffffffffffff63ffffffff9283166e01000000000000000000000000000002167fffffffffffffffffffffffffff0000000000ffffffffffffffffffffffffffff9383166a0100000000000000000000027fffffffffffffffffffffffffffffffffffff00000000ffffffffffffffffffff61ffff9096166801000000000000000002959095167fffffffffffffffffffffffffffffffffffff000000000000ffffffffffffffff968416640100000000027fffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000909b16939097169290921798909817939093169390931717919091161792909217909155519091907f94967ae9ea7729ad4f54021c1981765d2b1d954f7c92fbec340aa0a54f46b8b590613055908690600060c08201905063ffffffff80845116835280602085015116602084015261ffff60408501511660408401528060608501511660608401528060808501511660808401525060a0830151151560a083015292915050565b60405180910390a35050600101612d82565b505050806001019050612d4f565b5060005b815181101561315957600082828151811061309657613096615790565b602002602001015160000151905060008383815181106130b8576130b8615790565b60209081029190910181015181015167ffffffffffffffff84166000818152600a8452604080822073ffffffffffffffffffffffffffffffffffffffff8516808452955280822080547fffffffffffffffffffffffffff000000000000000000000000000000000000001690555192945090917f4de5b1bcbca6018c11303a2c3f4a4b4f22a1c741d8c4ba430d246ac06c5ddf8b9190a35050600101613079565b505050565b60005b82518110156132015761319783828151811061317f5761317f615790565b6020026020010151600b6140ae90919063ffffffff16565b156131f9578281815181106131ae576131ae615790565b602002602001015173ffffffffffffffffffffffffffffffffffffffff167fdf1b1bd32a69711488d71554706bb130b1fc63a5fa1a2cd85e8440f84065ba2360405160405180910390a25b600101613161565b5060005b81518110156131595761323b82828151811061322357613223615790565b6020026020010151600b6140d090919063ffffffff16565b1561329d5781818151811061325257613252615790565b602002602001015173ffffffffffffffffffffffffffffffffffffffff167f1795838dc8ab2ffc5f431a1729a6afa0b587f982f7b2be0b9d7187a1ef547f9160405160405180910390a25b600101613205565b6040810151604a820151605e90920151909260609290921c91565b6040805173ffffffffffffffffffffffffffffffffffffffff868116602080840191909152908616828401527fffffffffffffffffffff00000000000000000000000000000000000000000000851660608301527fffff00000000000000000000000000000000000000000000000000000000000084166080808401919091528351808403909101815260a09092018352815191810191909120600081815260049092529190205460ff16613411576040517f097e17ff00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff8087166004830152851660248201527fffffffffffffffffffff00000000000000000000000000000000000000000000841660448201527fffff00000000000000000000000000000000000000000000000000000000000083166064820152608401610fda565b5050505050565b6000806134258486615a90565b9050600060248260ff16111561345f57613443602460ff8416615912565b61344e90600a615bc9565b61345890856156ed565b9050613485565b61346d60ff83166024615912565b61347890600a615bc9565b61348290856156d6565b90505b7bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8111156134db576040517f10cb51d100000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b95945050505050565b602081015160005b815181101561357f57600082828151811061350957613509615790565b602002602001015190506135278160026140f290919063ffffffff16565b156135765760405173ffffffffffffffffffffffffffffffffffffffff821681527fc3803387881faad271c47728894e3e36fac830ffc8602ca6fc07733cbda775809060200160405180910390a15b506001016134ec565b50815160005b8151811015610e545760008282815181106135a2576135a2615790565b60200260200101519050600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1603613612576040517f8579befe00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b61361d6002826140ae565b5060405173ffffffffffffffffffffffffffffffffffffffff821681527feb1b9b92e50b7f88f9ff25d56765095ac6e91540eee214906f4036a908ffbdef9060200160405180910390a150600101613585565b60005b8151811015610eac57600082828151811061369057613690615790565b602002602001015160000151905060008383815181106136b2576136b2615790565b60209081029190910181015181015173ffffffffffffffffffffffffffffffffffffffff841660008181526008845260409081902080547fffffffffffffffffffffffffffffffffffffffffffffffff00000000000000001667ffffffffffffffff85169081179091559051908152919350917fbb77da6f7210cdd16904228a9360133d1d7dfff99b1bc75f128da5b53e28f97d910160405180910390a25050600101613673565b604080518082019091526000808252602082015260008260000151905060008173ffffffffffffffffffffffffffffffffffffffff1663feaf968c6040518163ffffffff1660e01b815260040160a060405180830381865afa1580156137c4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906137e89190615bef565b5050509150506000811215613829576040517f10cb51d100000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60006138a88373ffffffffffffffffffffffffffffffffffffffff1663313ce5676040518163ffffffff1660e01b8152600401602060405180830381865afa158015613879573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061389d9190615c3f565b866020015184613418565b604080518082019091527bffffffffffffffffffffffffffffffffffffffffffffffffffffffff909116815263ffffffff4216602082015295945050505050565b73ffffffffffffffffffffffffffffffffffffffff811660009081526001830160205260408120541515610b8d565b836040015163ffffffff168311156139715760408085015190517f8693378900000000000000000000000000000000000000000000000000000000815263ffffffff909116600482015260248101849052604401610fda565b836020015161ffff168211156139b3576040517f4c056b6a00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b610e548461020001518261405c565b67ffffffffffffffff821660009081526005602090815260408083208151808301909252547bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8116825263ffffffff7c010000000000000000000000000000000000000000000000000000000090910481169282019290925290831615613aba576000816020015163ffffffff1642613a579190615912565b90508363ffffffff16811115613ab8576040517ff08bcb3e00000000000000000000000000000000000000000000000000000000815267ffffffffffffffff8616600482015263ffffffff8516602482015260448101829052606401610fda565b505b519392505050565b6000808083815b81811015613d8c576000878783818110613ae557613ae5615790565b905060400201803603810190613afb9190615c5c565b67ffffffffffffffff8c166000908152600a60209081526040808320845173ffffffffffffffffffffffffffffffffffffffff168452825291829020825160c081018452905463ffffffff8082168352640100000000820481169383019390935268010000000000000000810461ffff16938201939093526a01000000000000000000008304821660608201526e01000000000000000000000000000083049091166080820152720100000000000000000000000000000000000090910460ff16151560a0820181905291925090613c1b576101208d0151613be89061ffff16662386f26fc100006156d6565b613bf2908861598a565b96508c610140015186613c059190615c95565b9550613c12602086615c95565b94505050613d84565b604081015160009061ffff1615613cd45760008c73ffffffffffffffffffffffffffffffffffffffff16846000015173ffffffffffffffffffffffffffffffffffffffff1614613c77578351613c7090611f23565b9050613c7a565b508a5b620186a0836040015161ffff16613cbc8660200151847bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1661411490919063ffffffff16565b613cc691906156d6565b613cd091906156ed565b9150505b6060820151613ce39088615c95565b9650816080015186613cf59190615c95565b8251909650600090613d149063ffffffff16662386f26fc100006156d6565b905080821015613d3357613d28818a61598a565b985050505050613d84565b6000836020015163ffffffff16662386f26fc10000613d5291906156d6565b905080831115613d7257613d66818b61598a565b99505050505050613d84565b613d7c838b61598a565b995050505050505b600101613ac9565b505096509650969350505050565b60008063ffffffff8316613db0610120866156d6565b613dbc876101c061598a565b613dc6919061598a565b613dd0919061598a565b905060008760c0015163ffffffff168860e0015161ffff1683613df391906156d6565b613dfd919061598a565b61010089015190915061ffff16613e246dffffffffffffffffffffffffffff8916836156d6565b613e2e91906156d6565b613e3e90655af3107a40006156d6565b98975050505050505050565b60408051808201909152600080825260208201526000613e76858585610160015163ffffffff16612360565b9050826060015163ffffffff1681600001511115613ec0576040517f4c4fc93a00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b826101e001518015613ed457508060200151155b15610b8a576040517fee433e9900000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b3373ffffffffffffffffffffffffffffffffffffffff821603613f8a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c660000000000000000006044820152606401610fda565b600180547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff83811691821790925560008054604051929316917fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae12789190a350565b60608160000180548060200260200160405190810160405280929190818152602001828054801561405057602002820191906000526020600020905b81548152602001906001019080831161403c575b50505050509050919050565b7fd7ed2ad4000000000000000000000000000000000000000000000000000000007fffffffff00000000000000000000000000000000000000000000000000000000831601610eac5761315981614151565b6000610b8d8373ffffffffffffffffffffffffffffffffffffffff8416614204565b6000610b8d8373ffffffffffffffffffffffffffffffffffffffff8416614253565b6000610b8d8373ffffffffffffffffffffffffffffffffffffffff841661434d565b6000670de0b6b3a7640000614147837bffffffffffffffffffffffffffffffffffffffffffffffffffffffff86166156d6565b610b8d91906156ed565b6000815160201461419057816040517f8d666f60000000000000000000000000000000000000000000000000000000008152600401610fda9190614489565b6000828060200190518101906141a69190615a39565b905073ffffffffffffffffffffffffffffffffffffffff8111806141cb575061040081105b1561118557826040517f8d666f60000000000000000000000000000000000000000000000000000000008152600401610fda9190614489565b600081815260018301602052604081205461424b57508154600181810184556000848152602080822090930184905584548482528286019093526040902091909155611185565b506000611185565b6000818152600183016020526040812054801561433c576000614277600183615912565b855490915060009061428b90600190615912565b90508082146142f05760008660000182815481106142ab576142ab615790565b90600052602060002001549050808760000184815481106142ce576142ce615790565b6000918252602080832090910192909255918252600188019052604090208390555b855486908061430157614301615cb2565b600190038181906000526020600020016000905590558560010160008681526020019081526020016000206000905560019350505050611185565b6000915050611185565b5092915050565b6000818152600183016020526040812054801561433c576000614371600183615912565b855490915060009061438590600190615912565b90508181146142f05760008660000182815481106142ab576142ab615790565b803573ffffffffffffffffffffffffffffffffffffffff811681146143c957600080fd5b919050565b6000806000606084860312156143e357600080fd5b6143ec846143a5565b925060208401359150614401604085016143a5565b90509250925092565b60006020828403121561441c57600080fd5b610b8d826143a5565b6000815180845260005b8181101561444b5760208185018101518683018201520161442f565b5060006020828601015260207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f83011685010191505092915050565b602081526000610b8d6020830184614425565b6020808252825182820181905260009190848201906040850190845b818110156144ea57835173ffffffffffffffffffffffffffffffffffffffff16835292840192918401916001016144b8565b50909695505050505050565b60006020828403121561450857600080fd5b813567ffffffffffffffff81111561451f57600080fd5b820160408185031215610b8d57600080fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6040805190810167ffffffffffffffff8111828210171561458357614583614531565b60405290565b60405160a0810167ffffffffffffffff8111828210171561458357614583614531565b604051610220810167ffffffffffffffff8111828210171561458357614583614531565b60405160c0810167ffffffffffffffff8111828210171561458357614583614531565b6040516060810167ffffffffffffffff8111828210171561458357614583614531565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016810167ffffffffffffffff8111828210171561465d5761465d614531565b604052919050565b600067ffffffffffffffff82111561467f5761467f614531565b5060051b60200190565b60ff81168114610e6b57600080fd5b600060208083850312156146ab57600080fd5b823567ffffffffffffffff8111156146c257600080fd5b8301601f810185136146d357600080fd5b80356146e66146e182614665565b614616565b8181526060918202830184019184820191908884111561470557600080fd5b938501935b838510156147a557848903818112156147235760008081fd5b61472b614560565b614734876143a5565b81526040807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0840112156147685760008081fd5b614770614560565b925061477d8989016143a5565b835287013561478b81614689565b82890152808801919091528352938401939185019161470a565b50979650505050505050565b8015158114610e6b57600080fd5b80356143c9816147b1565b600060208083850312156147dd57600080fd5b823567ffffffffffffffff8111156147f457600080fd5b8301601f8101851361480557600080fd5b80356148136146e182614665565b81815260a0918202830184019184820191908884111561483257600080fd5b938501935b838510156147a55780858a03121561484f5760008081fd5b614857614589565b614860866143a5565b8152868601357fffffffffffffffffffff00000000000000000000000000000000000000000000811681146148955760008081fd5b818801526040868101357fffff000000000000000000000000000000000000000000000000000000000000811681146148ce5760008081fd5b9082015260606148df8782016143a5565b908201526080868101356148f2816147b1565b9082015283529384019391850191614837565b803567ffffffffffffffff811681146143c957600080fd5b60008083601f84011261492f57600080fd5b50813567ffffffffffffffff81111561494757600080fd5b602083019150836020828501011115611f1c57600080fd5b60008083601f84011261497157600080fd5b50813567ffffffffffffffff81111561498957600080fd5b6020830191508360208260051b8501011115611f1c57600080fd5b600080600080600080600080600060c08a8c0312156149c257600080fd5b6149cb8a614905565b98506149d960208b016143a5565b975060408a0135965060608a013567ffffffffffffffff808211156149fd57600080fd5b614a098d838e0161491d565b909850965060808c0135915080821115614a2257600080fd5b614a2e8d838e0161495f565b909650945060a08c0135915080821115614a4757600080fd5b818c0191508c601f830112614a5b57600080fd5b813581811115614a6a57600080fd5b8d60208260061b8501011115614a7f57600080fd5b6020830194508093505050509295985092959850929598565b848152600060208515158184015260806040840152614aba6080840186614425565b8381036060850152845180825282820190600581901b8301840184880160005b83811015614b26577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0868403018552614b14838351614425565b94870194925090860190600101614ada565b50909b9a5050505050505050505050565b60008060208385031215614b4a57600080fd5b823567ffffffffffffffff811115614b6157600080fd5b614b6d8582860161495f565b90969095509350505050565b602080825282518282018190526000919060409081850190868401855b82811015614be757614bd784835180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff16825260209081015163ffffffff16910152565b9284019290850190600101614b96565b5091979650505050505050565b600060208284031215614c0657600080fd5b610b8d82614905565b81517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff16815260208083015163ffffffff169082015260408101611185565b803561ffff811681146143c957600080fd5b803563ffffffff811681146143c957600080fd5b80357fffffffff00000000000000000000000000000000000000000000000000000000811681146143c957600080fd5b60006020808385031215614cb357600080fd5b823567ffffffffffffffff811115614cca57600080fd5b8301601f81018513614cdb57600080fd5b8035614ce96146e182614665565b8181526102409182028301840191848201919088841115614d0957600080fd5b938501935b838510156147a55784890381811215614d275760008081fd5b614d2f614560565b614d3887614905565b8152610220807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe084011215614d6d5760008081fd5b614d756145ac565b9250614d828989016147bf565b83526040614d91818a01614c4a565b8a8501526060614da2818b01614c5c565b8286015260809150614db5828b01614c5c565b9085015260a0614dc68a8201614c5c565b8286015260c09150614dd9828b01614c4a565b9085015260e0614dea8a8201614c5c565b828601526101009150614dfe828b01614c4a565b90850152610120614e108a8201614c4a565b828601526101409150614e24828b01614c4a565b90850152610160614e368a8201614c5c565b828601526101809150614e4a828b01614c5c565b908501526101a0614e5c8a8201614905565b828601526101c09150614e70828b01614c5c565b908501526101e0614e828a8201614c5c565b828601526102009150614e96828b016147bf565b90850152614ea5898301614c70565b90840152508088019190915283529384019391850191614d0e565b81511515815261022081016020830151614ee0602084018261ffff169052565b506040830151614ef8604084018263ffffffff169052565b506060830151614f10606084018263ffffffff169052565b506080830151614f28608084018263ffffffff169052565b5060a0830151614f3e60a084018261ffff169052565b5060c0830151614f5660c084018263ffffffff169052565b5060e0830151614f6c60e084018261ffff169052565b506101008381015161ffff9081169184019190915261012080850151909116908301526101408084015163ffffffff90811691840191909152610160808501518216908401526101808085015167ffffffffffffffff16908401526101a0808501518216908401526101c080850151909116908301526101e080840151151590830152610200808401517fffffffff000000000000000000000000000000000000000000000000000000008116828501525b505092915050565b600082601f83011261503757600080fd5b813560206150476146e183614665565b82815260069290921b8401810191818101908684111561506657600080fd5b8286015b848110156150b357604081890312156150835760008081fd5b61508b614560565b61509482614905565b81526150a18583016143a5565b8186015283529183019160400161506a565b509695505050505050565b600080604083850312156150d157600080fd5b67ffffffffffffffff833511156150e757600080fd5b83601f8435850101126150f957600080fd5b6151096146e18435850135614665565b8335840180358083526020808401939260059290921b9091010186101561512f57600080fd5b602085358601015b85358601803560051b0160200181101561533c5767ffffffffffffffff8135111561516157600080fd5b8035863587010160407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0828a0301121561519a57600080fd5b6151a2614560565b6151ae60208301614905565b815267ffffffffffffffff604083013511156151c957600080fd5b88603f6040840135840101126151de57600080fd5b6151f46146e16020604085013585010135614665565b6020604084810135850182810135808552928401939260e00201018b101561521b57600080fd5b6040808501358501015b6040858101358601602081013560e002010181101561531d5760e0818d03121561524e57600080fd5b615256614560565b61525f826143a5565b815260c07fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0838f0301121561529357600080fd5b61529b6145d0565b6152a760208401614c5c565b81526152b560408401614c5c565b60208201526152c660608401614c4a565b60408201526152d760808401614c5c565b60608201526152e860a08401614c5c565b60808201526152fa60c08401356147b1565b60c083013560a0820152602082810191909152908452929092019160e001615225565b5080602084015250508085525050602083019250602081019050615137565b5092505067ffffffffffffffff6020840135111561535957600080fd5b6153698460208501358501615026565b90509250929050565b600082601f83011261538357600080fd5b813560206153936146e183614665565b8083825260208201915060208460051b8701019350868411156153b557600080fd5b602086015b848110156150b3576153cb816143a5565b83529183019183016153ba565b600080604083850312156153eb57600080fd5b823567ffffffffffffffff8082111561540357600080fd5b61540f86838701615372565b9350602085013591508082111561542557600080fd5b5061543285828601615372565b9150509250929050565b6000806000806040858703121561545257600080fd5b843567ffffffffffffffff8082111561546a57600080fd5b6154768883890161491d565b9096509450602087013591508082111561548f57600080fd5b5061549c8782880161491d565b95989497509550505050565b600080604083850312156154bb57600080fd5b6154c483614905565b9150615369602084016143a5565b6000602082840312156154e457600080fd5b813567ffffffffffffffff808211156154fc57600080fd5b908301906040828603121561551057600080fd5b615518614560565b82358281111561552757600080fd5b61553387828601615372565b82525060208301358281111561554857600080fd5b61555487828601615372565b60208301525095945050505050565b6000602080838503121561557657600080fd5b823567ffffffffffffffff81111561558d57600080fd5b8301601f8101851361559e57600080fd5b80356155ac6146e182614665565b81815260069190911b820183019083810190878311156155cb57600080fd5b928401925b8284101561561d57604084890312156155e95760008081fd5b6155f1614560565b6155fa856143a5565b8152615607868601614905565b81870152825260409390930192908401906155d0565b979650505050505050565b6000806040838503121561563b57600080fd5b61564483614905565b9150602083013567ffffffffffffffff81111561566057600080fd5b830160a0818603121561567257600080fd5b809150509250929050565b6000806040838503121561569057600080fd5b615699836143a5565b915061536960208401614905565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b8082028115828204841417611185576111856156a7565b600082615723577f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b500490565b60008083357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe184360301811261575d57600080fd5b83018035915067ffffffffffffffff82111561577857600080fd5b6020019150600681901b3603821315611f1c57600080fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b80357bffffffffffffffffffffffffffffffffffffffffffffffffffffffff811681146143c957600080fd5b6000604082840312156157fd57600080fd5b615805614560565b61580e836143a5565b815261581c602084016157bf565b60208201529392505050565b60006040828403121561583a57600080fd5b615842614560565b61580e83614905565b6000602080838503121561585e57600080fd5b823567ffffffffffffffff81111561587557600080fd5b8301601f8101851361588657600080fd5b80356158946146e182614665565b818152606091820283018401918482019190888411156158b357600080fd5b938501935b838510156147a55780858a0312156158d05760008081fd5b6158d86145f3565b6158e1866143a5565b81526158ee8787016157bf565b8782015260406158ff818801614c5c565b90820152835293840193918501916158b8565b81810381811115611185576111856156a7565b60008083357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe184360301811261595a57600080fd5b83018035915067ffffffffffffffff82111561597557600080fd5b602001915036819003821315611f1c57600080fd5b80820180821115611185576111856156a7565b7fffffffff00000000000000000000000000000000000000000000000000000000813581811691600485101561501e5760049490940360031b84901b1690921692915050565b600080858511156159f357600080fd5b83861115615a0057600080fd5b5050820193919092039150565b600060408284031215615a1f57600080fd5b615a27614560565b82518152602083015161581c816147b1565b600060208284031215615a4b57600080fd5b5051919050565b600082357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff61833603018112615a8657600080fd5b9190910192915050565b60ff8181168382160190811115611185576111856156a7565b600181815b80851115615b0257817fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff04821115615ae857615ae86156a7565b80851615615af557918102915b93841c9390800290615aae565b509250929050565b600082615b1957506001611185565b81615b2657506000611185565b8160018114615b3c5760028114615b4657615b62565b6001915050611185565b60ff841115615b5757615b576156a7565b50506001821b611185565b5060208310610133831016604e8410600b8410161715615b85575081810a611185565b615b8f8383615aa9565b807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff04821115615bc157615bc16156a7565b029392505050565b6000610b8d8383615b0a565b805169ffffffffffffffffffff811681146143c957600080fd5b600080600080600060a08688031215615c0757600080fd5b615c1086615bd5565b9450602086015193506040860151925060608601519150615c3360808701615bd5565b90509295509295909350565b600060208284031215615c5157600080fd5b8151610b8d81614689565b600060408284031215615c6e57600080fd5b615c76614560565b615c7f836143a5565b8152602083013560208201528091505092915050565b63ffffffff818116838216019080821115614346576143466156a7565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603160045260246000fdfea164736f6c6343000818000a",
 }
 
 var FeeQuoterABI = FeeQuoterMetaData.ABI
@@ -2851,11 +2852,11 @@ func (FeeQuoterAuthorizedCallerRemoved) Topic() common.Hash {
 }
 
 func (FeeQuoterDestChainAdded) Topic() common.Hash {
-	return common.HexToHash("0xd31c671936387b2f84ed402b553bd50c0e9c20408ea4e91a836d77b8180fb724")
+	return common.HexToHash("0x525e3d4e0c31cef19cf9426af8d2c0ddd2d576359ca26bed92aac5fadda46265")
 }
 
 func (FeeQuoterDestChainConfigUpdated) Topic() common.Hash {
-	return common.HexToHash("0x1edd6f3553cfa16f10b95b195abae3a1cfca4783de4843f95d674b1e1df5ab20")
+	return common.HexToHash("0x283b699f411baff8f1c29fe49f32a828c8151596244b8e7e4c164edd6569a835")
 }
 
 func (FeeQuoterFeeTokenAdded) Topic() common.Hash {
diff --git a/core/gethwrappers/ccip/generation/generated-wrapper-dependency-versions-do-not-edit.txt b/core/gethwrappers/ccip/generation/generated-wrapper-dependency-versions-do-not-edit.txt
index 78c25cd4dc0..94b47ce6ef9 100644
--- a/core/gethwrappers/ccip/generation/generated-wrapper-dependency-versions-do-not-edit.txt
+++ b/core/gethwrappers/ccip/generation/generated-wrapper-dependency-versions-do-not-edit.txt
@@ -5,7 +5,7 @@ burn_with_from_mint_token_pool: ../../../contracts/solc/v0.8.24/BurnWithFromMint
 ccip_encoding_utils: ../../../contracts/solc/v0.8.24/ICCIPEncodingUtils/ICCIPEncodingUtils.abi ../../../contracts/solc/v0.8.24/ICCIPEncodingUtils/ICCIPEncodingUtils.bin a074f2ecf2749a1d5afc4cd9bfa48677f09c2be4e076776f87c6feb767432ecb
 ccip_home: ../../../contracts/solc/v0.8.24/CCIPHome/CCIPHome.abi ../../../contracts/solc/v0.8.24/CCIPHome/CCIPHome.bin 079b70ad36b4a9522518df82f01bdb8480fb9bb8de5791ef17ea1ddf044814be
 ether_sender_receiver: ../../../contracts/solc/v0.8.24/EtherSenderReceiver/EtherSenderReceiver.abi ../../../contracts/solc/v0.8.24/EtherSenderReceiver/EtherSenderReceiver.bin 09510a3f773f108a3c231e8d202835c845ded862d071ec54c4f89c12d868b8de
-fee_quoter: ../../../contracts/solc/v0.8.24/FeeQuoter/FeeQuoter.abi ../../../contracts/solc/v0.8.24/FeeQuoter/FeeQuoter.bin 6806f01f305df73a923361f128b8962e9a8d3e7338a9a5b5fbe0636e6c9fc35f
+fee_quoter: ../../../contracts/solc/v0.8.24/FeeQuoter/FeeQuoter.abi ../../../contracts/solc/v0.8.24/FeeQuoter/FeeQuoter.bin 503823a939ff99fe3bdaaef7a89cd4bbe475e260d3921335dbf9c80d4f584b76
 lock_release_token_pool: ../../../contracts/solc/v0.8.24/LockReleaseTokenPool/LockReleaseTokenPool.abi ../../../contracts/solc/v0.8.24/LockReleaseTokenPool/LockReleaseTokenPool.bin e6a8ec9e8faccb1da7d90e0f702ed72975964f97dc3222b54cfcca0a0ba3fea2
 maybe_revert_message_receiver: ../../../contracts/solc/v0.8.24/MaybeRevertMessageReceiver/MaybeRevertMessageReceiver.abi ../../../contracts/solc/v0.8.24/MaybeRevertMessageReceiver/MaybeRevertMessageReceiver.bin d73956c26232ebcc4a5444429fa99cbefed960e323be9b5a24925885c2e477d5
 message_hasher: ../../../contracts/solc/v0.8.24/MessageHasher/MessageHasher.abi ../../../contracts/solc/v0.8.24/MessageHasher/MessageHasher.bin ec2d3a92348d8e7b8f0d359b62a45157b9d2c750c01fbcf991826c4392f6e218
diff --git a/core/internal/cltest/cltest.go b/core/internal/cltest/cltest.go
index d3af33d85bf..b4a7e871117 100644
--- a/core/internal/cltest/cltest.go
+++ b/core/internal/cltest/cltest.go
@@ -200,11 +200,12 @@ func NewJobPipelineV2(t testing.TB, cfg pipeline.BridgeConfig, jpcfg JobPipeline
 type TestApplication struct {
 	t testing.TB
 	*chainlink.ChainlinkApplication
-	Logger  logger.Logger
-	Server  *httptest.Server
-	Started bool
-	Backend *backends.SimulatedBackend
-	Keys    []ethkey.KeyV2
+	Logger             logger.Logger
+	Server             *httptest.Server
+	Started            bool
+	Backend            *backends.SimulatedBackend
+	Keys               []ethkey.KeyV2
+	CapabilityRegistry *capabilities.Registry
 }
 
 // NewApplicationEVMDisabled creates a new application with default config but EVM disabled
diff --git a/core/scripts/go.mod b/core/scripts/go.mod
index e2ed341146c..d58d6745bfb 100644
--- a/core/scripts/go.mod
+++ b/core/scripts/go.mod
@@ -24,7 +24,7 @@ require (
 	github.com/prometheus/client_golang v1.20.0
 	github.com/shopspring/decimal v1.4.0
 	github.com/smartcontractkit/chainlink-automation v0.8.0
-	github.com/smartcontractkit/chainlink-common v0.3.1-0.20241014122810-6c3cc4d0dc87
+	github.com/smartcontractkit/chainlink-common v0.3.1-0.20241016173514-b7b7f6310ac2
 	github.com/smartcontractkit/chainlink/integration-tests v0.0.0-00010101000000-000000000000
 	github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000
 	github.com/smartcontractkit/libocr v0.0.0-20241007185508-adbe57025f12
diff --git a/core/scripts/go.sum b/core/scripts/go.sum
index a523c075b2e..2ccaed63c10 100644
--- a/core/scripts/go.sum
+++ b/core/scripts/go.sum
@@ -1074,8 +1074,8 @@ github.com/smartcontractkit/chainlink-automation v0.8.0 h1:hFz2EHU06bkEfhcqhK8Jd
 github.com/smartcontractkit/chainlink-automation v0.8.0/go.mod h1:ObdjDfgGIaiE48Bb3yYcx1CeGBm392WlEw92U83LlUA=
 github.com/smartcontractkit/chainlink-ccip v0.0.0-20241014104242-9227e5c976a7 h1:aMG3BllvgeL/vsqkebuAhWoIWOnitKnN1VxibdzGnYo=
 github.com/smartcontractkit/chainlink-ccip v0.0.0-20241014104242-9227e5c976a7/go.mod h1:H4BTXnZBhwRdsAFjqWZpB1/f3IZnuB/Ql7pXPmokzXg=
-github.com/smartcontractkit/chainlink-common v0.3.1-0.20241014122810-6c3cc4d0dc87 h1:48qauRZcdxAOrgeko4RTm9ti4GGbSfzkcI4Dr/1FmjU=
-github.com/smartcontractkit/chainlink-common v0.3.1-0.20241014122810-6c3cc4d0dc87/go.mod h1:tsGgeEJc5SUSlfVGSX0wR0EkRU3pM58D6SKF97V68ko=
+github.com/smartcontractkit/chainlink-common v0.3.1-0.20241016173514-b7b7f6310ac2 h1:WERgv6CtOMVLCa0d1YhO3BrP94TwDT+QSVKvH5PZ5Xw=
+github.com/smartcontractkit/chainlink-common v0.3.1-0.20241016173514-b7b7f6310ac2/go.mod h1:tsGgeEJc5SUSlfVGSX0wR0EkRU3pM58D6SKF97V68ko=
 github.com/smartcontractkit/chainlink-cosmos v0.5.1 h1:2xeZWh+4/w7xalTdAu8jqgFuxZ291aYTEwZhlQEv/BY=
 github.com/smartcontractkit/chainlink-cosmos v0.5.1/go.mod h1:c1wUtVxXUqW4PzuCQhuHaBDZFv9XAQjhKTqam7GLGIU=
 github.com/smartcontractkit/chainlink-data-streams v0.1.0 h1:wcRJRm7eqfbgN+Na+GjAe0/IUn6XwmSagFHqIWHHBGk=
diff --git a/core/services/ocr2/delegate.go b/core/services/ocr2/delegate.go
index adb68398e9e..2536e11a402 100644
--- a/core/services/ocr2/delegate.go
+++ b/core/services/ocr2/delegate.go
@@ -634,7 +634,8 @@ func (d *Delegate) newServicesGenericPlugin(
 
 	provider, err := relayer.NewPluginProvider(ctx, types.RelayArgs{
 		ExternalJobID: jb.ExternalJobID,
-		JobID:         spec.ID,
+		JobID:         jb.ID,
+		OracleSpecID:  spec.ID,
 		ContractID:    spec.ContractID,
 		New:           d.isNewlyCreatedJob,
 		RelayConfig:   spec.RelayConfig.Bytes(),
diff --git a/core/services/ocr2/plugins/median/services.go b/core/services/ocr2/plugins/median/services.go
index 866044fcc92..c696bef8607 100644
--- a/core/services/ocr2/plugins/median/services.go
+++ b/core/services/ocr2/plugins/median/services.go
@@ -63,7 +63,6 @@ func NewMedianServices(ctx context.Context,
 	cfg MedianConfig,
 	chEnhancedTelem chan ocrcommon.EnhancedTelemetryData,
 	errorLog loop.ErrorLog,
-
 ) (srvs []job.ServiceCtx, err error) {
 	var pluginConfig config.PluginConfig
 	err = json.Unmarshal(jb.OCR2OracleSpec.PluginConfig.Bytes(), &pluginConfig)
@@ -86,6 +85,7 @@ func NewMedianServices(ctx context.Context,
 	provider, err := relayer.NewPluginProvider(ctx, types.RelayArgs{
 		ExternalJobID: jb.ExternalJobID,
 		JobID:         jb.ID,
+		OracleSpecID:  *jb.OCR2OracleSpecID,
 		ContractID:    spec.ContractID,
 		New:           isNewlyCreatedJob,
 		RelayConfig:   spec.RelayConfig.Bytes(),
diff --git a/core/services/registrysyncer/syncer.go b/core/services/registrysyncer/syncer.go
index 4e9dd471bde..bcbc1fd5a0e 100644
--- a/core/services/registrysyncer/syncer.go
+++ b/core/services/registrysyncer/syncer.go
@@ -378,15 +378,24 @@ func deepCopyLocalRegistry(lr *LocalRegistry) LocalRegistry {
 	return lrCopy
 }
 
+type ContractCapabilityType uint8
+
+const (
+	ContractCapabilityTypeTrigger ContractCapabilityType = iota
+	ContractCapabilityTypeAction
+	ContractCapabilityTypeConsensus
+	ContractCapabilityTypeTarget
+)
+
 func toCapabilityType(capabilityType uint8) capabilities.CapabilityType {
-	switch capabilityType {
-	case 0:
+	switch ContractCapabilityType(capabilityType) {
+	case ContractCapabilityTypeTrigger:
 		return capabilities.CapabilityTypeTrigger
-	case 1:
+	case ContractCapabilityTypeAction:
 		return capabilities.CapabilityTypeAction
-	case 2:
+	case ContractCapabilityTypeConsensus:
 		return capabilities.CapabilityTypeConsensus
-	case 3:
+	case ContractCapabilityTypeTarget:
 		return capabilities.CapabilityTypeTarget
 	default:
 		return capabilities.CapabilityTypeUnknown
diff --git a/core/services/registrysyncer/syncer_test.go b/core/services/registrysyncer/syncer_test.go
index 8aaa49eab0a..03f9bffcf92 100644
--- a/core/services/registrysyncer/syncer_test.go
+++ b/core/services/registrysyncer/syncer_test.go
@@ -144,6 +144,7 @@ func (l *launcher) Launch(ctx context.Context, localRegistry *registrysyncer.Loc
 
 type orm struct {
 	ormMock               *syncerMocks.ORM
+	mu                    sync.RWMutex
 	latestLocalRegistryCh chan struct{}
 	addLocalRegistryCh    chan struct{}
 }
@@ -159,17 +160,23 @@ func newORM(t *testing.T) *orm {
 }
 
 func (o *orm) Cleanup() {
+	o.mu.Lock()
+	defer o.mu.Unlock()
 	close(o.latestLocalRegistryCh)
 	close(o.addLocalRegistryCh)
 }
 
 func (o *orm) AddLocalRegistry(ctx context.Context, localRegistry registrysyncer.LocalRegistry) error {
+	o.mu.Lock()
+	defer o.mu.Unlock()
 	o.addLocalRegistryCh <- struct{}{}
 	err := o.ormMock.AddLocalRegistry(ctx, localRegistry)
 	return err
 }
 
 func (o *orm) LatestLocalRegistry(ctx context.Context) (*registrysyncer.LocalRegistry, error) {
+	o.mu.Lock()
+	defer o.mu.Unlock()
 	o.latestLocalRegistryCh <- struct{}{}
 	return o.ormMock.LatestLocalRegistry(ctx)
 }
diff --git a/core/services/relay/evm/contract_transmitter.go b/core/services/relay/evm/contract_transmitter.go
index 65f0e42fc41..aead9f6ca8a 100644
--- a/core/services/relay/evm/contract_transmitter.go
+++ b/core/services/relay/evm/contract_transmitter.go
@@ -56,6 +56,12 @@ func WithRetention(retention time.Duration) OCRTransmitterOption {
 	}
 }
 
+func WithMaxLogsKept(maxLogsKept uint64) OCRTransmitterOption {
+	return func(ct *contractTransmitter) {
+		ct.maxLogsKept = maxLogsKept
+	}
+}
+
 func WithReportToEthMetadata(reportToEvmTxMeta ReportToEthMetadata) OCRTransmitterOption {
 	return func(ct *contractTransmitter) {
 		if reportToEvmTxMeta != nil {
@@ -76,6 +82,7 @@ type contractTransmitter struct {
 	reportToEvmTxMeta ReportToEthMetadata
 	excludeSigs       bool
 	retention         time.Duration
+	maxLogsKept       uint64
 }
 
 func transmitterFilterName(addr common.Address) string {
@@ -108,15 +115,14 @@ func NewOCRContractTransmitter(
 		reportToEvmTxMeta:   reportToEvmTxMetaNoop,
 		excludeSigs:         false,
 		retention:           0,
+		maxLogsKept:         0,
 	}
 
 	for _, opt := range opts {
 		opt(newContractTransmitter)
 	}
 
-	// TODO It would be better to keep MaxLogsKept = 1 for the OCR contract transmitter instead of Retention. We are always interested only in the latest log.
-	// Although MaxLogsKept is present in the Filter struct, it is not supported by LogPoller yet.
-	err := lp.RegisterFilter(ctx, logpoller.Filter{Name: transmitterFilterName(address), EventSigs: []common.Hash{transmitted.ID}, Addresses: []common.Address{address}, Retention: newContractTransmitter.retention})
+	err := lp.RegisterFilter(ctx, logpoller.Filter{Name: transmitterFilterName(address), EventSigs: []common.Hash{transmitted.ID}, Addresses: []common.Address{address}, Retention: newContractTransmitter.retention, MaxLogsKept: newContractTransmitter.maxLogsKept})
 	if err != nil {
 		return nil, err
 	}
diff --git a/core/services/relay/evm/evm.go b/core/services/relay/evm/evm.go
index 49d937c82c6..0f270328bb9 100644
--- a/core/services/relay/evm/evm.go
+++ b/core/services/relay/evm/evm.go
@@ -863,7 +863,7 @@ func (r *Relayer) NewMedianProvider(ctx context.Context, rargs commontypes.Relay
 		return nil, err
 	}
 
-	medianContract, err := newMedianContract(configWatcher.ContractConfigTracker(), configWatcher.contractAddress, configWatcher.chain, rargs.JobID, r.ds, lggr)
+	medianContract, err := newMedianContract(configWatcher.ContractConfigTracker(), configWatcher.contractAddress, configWatcher.chain, rargs.JobID, rargs.OracleSpecID, r.ds, lggr)
 	if err != nil {
 		return nil, err
 	}
diff --git a/core/services/relay/evm/median.go b/core/services/relay/evm/median.go
index 60a63994bdc..1dddb201ebb 100644
--- a/core/services/relay/evm/median.go
+++ b/core/services/relay/evm/median.go
@@ -31,7 +31,7 @@ type medianContract struct {
 	requestRoundTracker *RequestRoundTracker
 }
 
-func newMedianContract(configTracker types.ContractConfigTracker, contractAddress common.Address, chain legacyevm.Chain, specID int32, ds sqlutil.DataSource, lggr logger.Logger) (*medianContract, error) {
+func newMedianContract(configTracker types.ContractConfigTracker, contractAddress common.Address, chain legacyevm.Chain, jobID int32, oracleSpecID int32, ds sqlutil.DataSource, lggr logger.Logger) (*medianContract, error) {
 	lggr = logger.Named(lggr, "MedianContract")
 	contract, err := offchain_aggregator_wrapper.NewOffchainAggregator(contractAddress, chain.Client())
 	if err != nil {
@@ -57,10 +57,10 @@ func newMedianContract(configTracker types.ContractConfigTracker, contractAddres
 			contractFilterer,
 			chain.Client(),
 			chain.LogBroadcaster(),
-			specID,
+			jobID,
 			lggr,
 			ds,
-			NewRoundRequestedDB(ds, specID, lggr),
+			NewRoundRequestedDB(ds, oracleSpecID, lggr),
 			chain.Config().EVM(),
 		),
 	}, nil
diff --git a/core/services/workflows/models.go b/core/services/workflows/models.go
index bf75fe432ee..f6adb737264 100644
--- a/core/services/workflows/models.go
+++ b/core/services/workflows/models.go
@@ -6,6 +6,7 @@ import (
 	"sync/atomic"
 
 	"github.com/dominikbraun/graph"
+
 	"github.com/smartcontractkit/chainlink-common/pkg/workflows/sdk"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/capabilities"
diff --git a/flake.lock b/flake.lock
index 77dddea4060..71af2318c95 100644
--- a/flake.lock
+++ b/flake.lock
@@ -40,6 +40,24 @@
         "type": "github"
       }
     },
+    "goreleaser-nur": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1726594821,
+        "narHash": "sha256-ORImH+i+zOCMOdztNDqGDbyyFRC/FKmgbX8w50TNbQY=",
+        "owner": "goreleaser",
+        "repo": "nur",
+        "rev": "bd2ee272ddfffbda9377a472131728e83ce2332d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "goreleaser",
+        "repo": "nur",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1666753130,
@@ -55,6 +73,22 @@
       }
     },
     "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1624561540,
+        "narHash": "sha256-izJ2PYZMGMsSkg+e7c9A1x3t/yOLT+qzUM6WQsc2tqo=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "c6a049a3d32293b24c0f894a840872cf67fd7c11",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1725103162,
         "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
@@ -70,11 +104,28 @@
         "type": "github"
       }
     },
+    "nur": {
+      "locked": {
+        "lastModified": 1727912806,
+        "narHash": "sha256-LDOTTOGPaEP233gBrL8dnPGopc1lqcJFe0VB/+K/yWc=",
+        "owner": "nix-community",
+        "repo": "NUR",
+        "rev": "9d9bcd30fec126b08b49020b7af08bc1aad66210",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "NUR",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "flake-utils": "flake-utils",
         "foundry": "foundry",
-        "nixpkgs": "nixpkgs_2"
+        "goreleaser-nur": "goreleaser-nur",
+        "nixpkgs": "nixpkgs_3",
+        "nur": "nur"
       }
     },
     "systems": {
diff --git a/flake.nix b/flake.nix
index 7e188857ba4..0d1aac2f05d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,6 +6,8 @@
     foundry.url = "github:shazow/foundry.nix/monthly";
     flake-utils.url = "github:numtide/flake-utils";
     foundry.inputs.flake-utils.follows = "flake-utils";
+    nur.url = "github:nix-community/NUR";
+    goreleaser-nur.url = "github:goreleaser/nur";
   };
 
   outputs = inputs @ {
@@ -13,15 +15,30 @@
     nixpkgs,
     flake-utils,
     foundry,
+    nur,
+    goreleaser-nur,
     ...
   }:
     flake-utils.lib.eachDefaultSystem (system: let
-      pkgs = import nixpkgs {
-        inherit system;
-        overlays = [foundry.overlay];
-      };
+        isCrib = builtins.getEnv "IS_CRIB" == "true"; 
+        pkgs = import nixpkgs { inherit system; 
+          config = { allowUnfree = true; }; 
+          overlays = [
+            (final: prev: {
+              nur = import nur
+                {
+                  pkgs = prev;
+                  repoOverrides = {
+                    goreleaser = import goreleaser-nur { pkgs = prev; };
+                  };
+                };
+            })
+            foundry.overlay 
+          ];
+         };
     in rec {
       devShell = pkgs.callPackage ./shell.nix {
+        isCrib = isCrib;
         inherit pkgs;
       };
       formatter = pkgs.nixpkgs-fmt;
diff --git a/go.mod b/go.mod
index 7ad7cba1809..939d70b9a8d 100644
--- a/go.mod
+++ b/go.mod
@@ -76,7 +76,7 @@ require (
 	github.com/smartcontractkit/chain-selectors v1.0.27
 	github.com/smartcontractkit/chainlink-automation v0.8.0
 	github.com/smartcontractkit/chainlink-ccip v0.0.0-20241014104242-9227e5c976a7
-	github.com/smartcontractkit/chainlink-common v0.3.1-0.20241014122810-6c3cc4d0dc87
+	github.com/smartcontractkit/chainlink-common v0.3.1-0.20241016173514-b7b7f6310ac2
 	github.com/smartcontractkit/chainlink-cosmos v0.5.1
 	github.com/smartcontractkit/chainlink-data-streams v0.1.0
 	github.com/smartcontractkit/chainlink-feeds v0.1.1
diff --git a/go.sum b/go.sum
index c9a77eca8de..9f0a8267599 100644
--- a/go.sum
+++ b/go.sum
@@ -1057,8 +1057,8 @@ github.com/smartcontractkit/chainlink-automation v0.8.0 h1:hFz2EHU06bkEfhcqhK8Jd
 github.com/smartcontractkit/chainlink-automation v0.8.0/go.mod h1:ObdjDfgGIaiE48Bb3yYcx1CeGBm392WlEw92U83LlUA=
 github.com/smartcontractkit/chainlink-ccip v0.0.0-20241014104242-9227e5c976a7 h1:aMG3BllvgeL/vsqkebuAhWoIWOnitKnN1VxibdzGnYo=
 github.com/smartcontractkit/chainlink-ccip v0.0.0-20241014104242-9227e5c976a7/go.mod h1:H4BTXnZBhwRdsAFjqWZpB1/f3IZnuB/Ql7pXPmokzXg=
-github.com/smartcontractkit/chainlink-common v0.3.1-0.20241014122810-6c3cc4d0dc87 h1:48qauRZcdxAOrgeko4RTm9ti4GGbSfzkcI4Dr/1FmjU=
-github.com/smartcontractkit/chainlink-common v0.3.1-0.20241014122810-6c3cc4d0dc87/go.mod h1:tsGgeEJc5SUSlfVGSX0wR0EkRU3pM58D6SKF97V68ko=
+github.com/smartcontractkit/chainlink-common v0.3.1-0.20241016173514-b7b7f6310ac2 h1:WERgv6CtOMVLCa0d1YhO3BrP94TwDT+QSVKvH5PZ5Xw=
+github.com/smartcontractkit/chainlink-common v0.3.1-0.20241016173514-b7b7f6310ac2/go.mod h1:tsGgeEJc5SUSlfVGSX0wR0EkRU3pM58D6SKF97V68ko=
 github.com/smartcontractkit/chainlink-cosmos v0.5.1 h1:2xeZWh+4/w7xalTdAu8jqgFuxZ291aYTEwZhlQEv/BY=
 github.com/smartcontractkit/chainlink-cosmos v0.5.1/go.mod h1:c1wUtVxXUqW4PzuCQhuHaBDZFv9XAQjhKTqam7GLGIU=
 github.com/smartcontractkit/chainlink-data-streams v0.1.0 h1:wcRJRm7eqfbgN+Na+GjAe0/IUn6XwmSagFHqIWHHBGk=
diff --git a/integration-tests/Makefile b/integration-tests/Makefile
index 1e6828fd35c..e28b133e1f5 100644
--- a/integration-tests/Makefile
+++ b/integration-tests/Makefile
@@ -102,20 +102,20 @@ test_smoke_product: ## Run smoke tests for specific product ex: make test_smoke_
 
 # Chaos
 .PHONY: test_chaos_pods_raw
-test_chaos_pods_raw:
+test_chaos_pods_raw: ## Run all chaos pod tests
 	go test -timeout 2h -v -count=1 $(args) -p 2 -run 'Test/.*pod-chaos' ./chaos
 
 .PHONY: test_chaos_network_raw
-test_chaos_network_raw:
+test_chaos_network_raw: ## Run all chaos network tests
 	go test -timeout 2h -v -count=1 $(args) -p 2 -run 'Test/.*network-chaos' ./chaos
 
 .PHONY: test_chaos_pods
-test_chaos_pods: install_gotestloghelper ## Run all chaos pod tests
+test_chaos_pods: install_gotestloghelper ## Run all chaos pod tests with decorated output
 	TEST_LOG_LEVEL="disabled" \
 	go test -timeout 2h -count=1 -json $(args) -run 'Test/.*pod-chaos' ./chaos 2>&1 | tee ./gotest.log | gotestloghelper -json -hidepassingtests -tlogprefix -color -singlepackage
 
 .PHONY: test_chaos_network
-test_chaos_network: install_gotestloghelper ## Run all chaos network tests
+test_chaos_network: install_gotestloghelper ## Run all chaos network tests with decorated output
 	TEST_LOG_LEVEL="disabled" \
 	go test -timeout 2h -count=1 -json $(args) -run 'Test/.*network-chaos' ./chaos 2>&1 | tee ./gotest.log | gotestloghelper -json -hidepassingtests -tlogprefix -color -singlepackage
 
@@ -123,6 +123,14 @@ test_chaos_network: install_gotestloghelper ## Run all chaos network tests
 test_chaos_verbose: ## Run all smoke tests with verbose logging
 	go test -timeout 24h -count=1 -v $(args) ./chaos
 
+.PHONY: test_chaos_ocr
+test_chaos_ocr: ## Run only OCR chaos tests
+	go test -timeout 2h -v -count=1 $(args) -p 2 -run 'TestOCRChaos' ./chaos
+
+.PHONY: test_chaos_automation
+test_chaos_automation: ## Run only Automation chaos tests
+	go test -timeout 2h -v -count=1 $(args) -p 2 -run 'TestAutomationChaos' ./chaos
+
 # Migrations
 .PHONY: test_node_migrations
 test_node_migrations: install_gotestloghelper ## Run all node migration tests.
diff --git a/integration-tests/README.md b/integration-tests/README.md
index 5647a62316e..97e890789a1 100644
--- a/integration-tests/README.md
+++ b/integration-tests/README.md
@@ -1,137 +1,162 @@
 # Integration Tests
 
-Here lives the integration tests for chainlink, utilizing our [chainlink-testing-framework](https://github.com/smartcontractkit/chainlink-testing-framework).
+- [Integration Tests](#integration-tests)
+  - [Summary](#summary)
+  - [Guidelines](#guidelines)
+    - [Pre-requisites](#pre-requisites)
+      - [Test and node configuration](#test-and-node-configuration)
+    - [Run Tests](#run-tests)
+      - [Locally (in Docker)](#locally-in-docker)
+        - [All tests in a suite](#all-tests-in-a-suite)
+        - [A single test](#a-single-test)
+      - [In Kubernetes](#in-kubernetes)
+        - [From local machine](#from-local-machine)
+      - [CI/GitHub Actions](#cigithub-actions)
 
-## NOTE: Move to Testcontainers
+## Summary
 
-If you have previously run these smoke tests using GitHub Actions or some sort of Kubernetes setup, that method is no longer necessary. We have moved the majority of our tests to utilize plain Docker containers (with the help of [Testcontainers](https://golang.testcontainers.org/)). This should make tests faster, more stable, and enable you to run them on your local machine without much hassle.
+This directory represent a place for different types of integration and system level tests. It utilizes [Chainlink Testing Framework (CTF)](https://github.com/smartcontractkit/chainlink-testing-framework).
 
-## Requirements
+> [!TIP]
+> **Testcontainers (Dockerized tests)**
+> If you want to have faster, locally running, more stable tests, utilize plain Docker containers (with the help of [Testcontainers](https://golang.testcontainers.org/)) instead of using GitHub Actions or Kubernetes.
 
-1. [Go](https://go.dev/)
-2. [Docker](https://www.docker.com/)
-3. You'll probably want to [increase the resources available to Docker](https://stackoverflow.com/questions/44533319/how-to-assign-more-memory-to-docker-container) as most tests require quite a few containers (e.g. OCR requires 6 Chainlink nodes, 6 databases, a simulated blockchain, and a mock server).
+## Guidelines
 
-## Configure
+### Pre-requisites
 
-We have finished the first pass at moving all test configuration from env vars to TOML files. All product-related configuration is already in TOML files, but env vars are still used to control the log level, Slack notifications, and Kubernetes-related settings. See the [example.env](./example.env) file for how to set these environment variables.
+1. [Installed Go](https://go.dev/)
+2. For local testing, [Installed Docker](https://www.docker.com/). Consider [increasing resources limits needed by Docker](https://stackoverflow.com/questions/44533319/how-to-assign-more-memory-to-docker-container) as most tests require building several containers for a Decentralized Oracle Network (e.g. OCR requires 6 nodes, 6 DBs, and a mock server).
+3. For remote testing, access to Kubernetes cluster/AWS Docker registry (if you are pulling images from private links).
+4. Docker image. If there is no image to pull from a registry, you may run tests against a custom build. Run the following command to build the image:
 
-We have defined some sensible defaults for all products, you can find them in `./testconfig/<product>/<product>.toml` files. Each product folder contains an `example.toml` file that describes all options. If you wish to override these values, you can do so by creating a `./testconfig/overrides.toml`. A detailed description of TOML configuration can be found in the [testconfig README](./testconfig/README.md), but if you want to run some tests using default values all you need to do is provide the Chainlink image and version you want to run tests on:
-```toml
-# ./testconfig/overrides.toml
-
-[ChainlinkImage]
-image = "your image name"
-version = "your tag"
-```
-
-The `./testconfig/overrides.toml` file **should never be committed** and has been added to the [.gitignore](../.gitignore) file as it can often contain secrets like private keys and RPC URLs.
-
-For more information on how to configure the tests, see the [testconfig README](./testconfig/README.md).
-
-## Build
-
-If you'd like to run the tests on a local build of Chainlink, you can point to your own docker image, or build a fresh one with `make`.
-
-`make build_docker_image image=<image-name> tag=<tag>`
+    ```bash
+    make build_docker_image image=<your-image-name> tag=<your-tag>
+    ```
 
-e.g.
+    Example: `make build_docker_image image=chainlink tag=test-tag`
 
-`make build_docker_image image=chainlink tag=test-tag`
+5. RPC node/s (for testnets/mainnets).
+6. EOA's (wallet) Private Key (see [How to export an account's private key](https://support.metamask.io/ru/managing-my-wallet/secret-recovery-phrase-and-private-keys/how-to-export-an-accounts-private-key/))
+7. Sufficient amount of native token and LINK on EOA per a target chain.
 
-## Run
+#### Test and node configuration
 
-Ensure you have created a `./testconfig/overrides.toml` file with your desired Chainlink image and version.
+1. Setup `.env` file in the root of `integration-tests` directory. See [example.env](./example.env) for how to set test-runner log level (not a node's log level), Slack notifications, and Kubernetes-related settings.
 
-`go test ./smoke/<product>_test.go`
+   1. Ensure to **update you environment** with the following commands:
+      1. `cd integration-tests`
+      2. `source .env`
 
-Most test files have a couple of tests, it's recommended to look into the file and focus on a specific one if possible. 90% of the time this will probably be the `Basic` test. See [ocr_test.go](./smoke/ocr_test.go) for example, which contains the `TestOCRBasic` test.
+2. Setup test secrets. See "how-to" details in the [Test Secrets in CTF](https://github.com/smartcontractkit/chainlink-testing-framework/blob/main/lib/config/README.md#test-secrets). If you want to run tests in CI, you will have to push test secrets to GitHub (see [Run GitHub Workflow with your test secrets](https://github.com/smartcontractkit/chainlink-testing-framework/blob/main/lib/config/README.md#run-github-workflow-with-your-test-secrets)).
 
-`go test ./smoke/ocr_test.go -run TestOCRBasic`
+3. Provide test and node configuration (for more details refer to [testconfig README](./testconfig/README.md) and `example.toml` files):
+   1. **Defaults** for all products are defined in `./testconfig/<product>/<product>.toml` files.
+   2. To **override default values**, create a `./testconfig/overrides.toml` file (yes, in the root of `testconfig`, not a product directory) specifying the values to override by your test (see some examples in [./testconfig/ocr2/overrides](./testconfig/ocr2/overrides)).
 
-It's generally recommended to run only one test at a time on a local machine as it needs a lot of docker containers and can peg your resources otherwise. You will see docker containers spin up on your machine for each component of the test where you can inspect logs.
+   > [!IMPORTANT]
+   > **Image version and node configs**
+   > 1. Pay attention to the `[ChainlinkImage].version` to test against the necessary remotely accessible version or [custom build](#pre-requisites).
+   > 2. When running OCR-related tests, pay attention to which version of OCR you enable/override in your `overrides.toml`.
+   > 3. Do not commit any sensitive data.
 
-### Configure Seth
+4. [Optional] Configure Seth (or use defaults), an evm client used by tests. Detailed instructions on how to configure it can be found in the [Seth README](./README_SETH.md) and [Seth repository](https://github.com/smartcontractkit/chainlink-testing-framework/tree/main/seth).
 
-Our new evm client is Seth. Detailed instructions on how to configure it can be found in the [Seth README](./README_SETH.md) in this repo as well as in [Seth repository](https://github.com/smartcontractkit/chainlink-testing-framework/tree/main/seth).
+   > [!IMPORTANT]
+   > **Simulated mode (no test secrets needed)**
+   > Tests may run in a simulated mode, on a simulated chain (1337). In the `overrides.toml` file, set the following:
+   > 1. `[Network].selected_networks=["simulated"]`
+   > 2. `[[Seth.networks]].name = "Default"`
 
-## Analyze
+### Run Tests
 
-You can see the results of each test in the terminal with normal `go test` output. If a test fails, logs of each Chainlink container will dump into the `smoke/logs/` folder for later analysis. You can also see these logs in CI uploaded as GitHub artifacts.
+#### Locally (in Docker)
 
-## Running Soak, Performance, Benchmark, and Chaos Tests
+> [!NOTE]
+> **Resources utilization by Docker**
+> It's recommended to run only one test at a time (run tests sequentially) on a local machine as it needs a lot of docker containers and can peg your resources otherwise. You will see docker containers spin up on your machine for each component of the test where you can inspect logs.
 
-These tests remain bound to a Kubernetes run environment, and require more complex setup and running instructions not documented here. We endeavor to make these easier to run and configure, but for the time being please seek a member of the QA/Test Tooling team if you want to run these.
+##### All tests in a suite
 
-### How to run reorg tests
-Run soak/ocr_test.go with reorg below finality and `FinalityTagEnabled=false`
+1. Run CLI command(with `override.toml`):
 
-```bash
-make test_soak_ocr_reorg_1
-```
+   ```bash
+   BASE64_CONFIG_OVERRIDE=$(cat ./testconfig/overrides.toml | base64) go test -v -p 1 ./smoke/<product>_test.go
+   ```
 
-Run soak/ocr_test.go with reorg below finality and `FinalityTagEnabled=true`:
+   Example:
 
-```bash
-make test_soak_ocr_reorg_2
-```
+   ```bash
+   BASE64_CONFIG_OVERRIDE=$(cat ./testconfig/overrides.toml | base64) go test -v -p 1 ./smoke/ocr_test.go
+   ```
 
-Run reorg/automation_reorg_test.go with reorg settings:
+   > [!WARNING]
+   > **Parallelized tests and nonce issues**
+   > Most tests are paralelized by default. To avoid nonce-related issues, it is recommended to run tests with disabled parallelization, e.g. with `-p 1`.
 
-1. Use Simulated Geth network and put GethReorgConfig in overrides.toml
+2. Alternatively, you may use `make` commands (see more in [Makefile .PHONY lines](./Makefile)) for running suites of tests.
+    Example:
 
-    ```toml
-    [Network]
-    selected_networks=["simulated"]
-    [Network.GethReorgConfig]
-    enabled = true
-    depth = 10
-    delay_create = "3s"
+    ```bash
+    make test_smoke_product product="ocr" ./scripts/run_product_tests
     ```
 
-2. Then run the test:
+3. Logs of each Chainlink container will dump into the `smoke/logs/`.
+4. To enable debugging of HTTP and RPC clients set the following env vars:
+
     ```bash
-    make test_reorg_automation
+    export SETH_LOG_LEVEL=debug
+    export RESTY_DEBUG=true
     ```
 
-Run reorg above finality docker test:
+##### A single test
+
+Run CLI command (with `override.toml`):
 
 ```bash
-go test -v -run ^TestReorgAboveFinality_FinalityTagDisabled$ ./smoke
+BASE64_CONFIG_OVERRIDE=$(cat ./testconfig/overrides.toml | base64) go test -v -timeout 15m -run <"TestNameToRun"> ./<directory_name_with_tests>
 ```
 
-### How to run gas simulation tests
-
-Run soak/ocr_test.go with gas spike:
+Example:
 
 ```bash
-make test_soak_ocr_gas_spike
+BASE64_CONFIG_OVERRIDE=$(cat ./testconfig/overrides.toml | base64) go test -v -timeout 15m -run "TestOCRv2Basic" ./smoke
 ```
 
-Run soak/ocr_test.go with changing gas limit creating block congestion:
+#### In Kubernetes
 
-```bash
-make test_soak_ocr_gas_limit_change
-```
+Such tests as Soak, Performance, Benchmark, and Chaos Tests remain bound to a Kubernetes run environment.
 
-Note: you can update gas simulation params for the tests below in in testconfig/ocr.toml
+1. Refer [Tests Run Books](./run-books/) to get more details on how to run specific per-product tests.
+2. Logs in CI are uploaded as GitHub artifacts.
 
-### How to run tests with RPC node failure
+##### From local machine
 
-Run soak/ocr_test.go with RPC network chaos by bringing down network to RPC node for all Chainlink Nodes:
+1. Ensure all necessary configurations are provided (see [Test and node configuration](#test-and-node-configuration)).
+2. Log in to your Kubernetes cluster (with `aws sso login`)
+3. Run tests with the following CLI command:
 
-```bash
-make test_soak_ocr_rpc_down_all_cl_nodes
-```
+   ```bash
+   BASE64_CONFIG_OVERRIDE=$(cat ./testconfig/overrides.toml | base64) go test -v -timeout <max_test_timeout> -p 1 -run '<TestName>' ./<test_directory>
+   ```
 
-Run soak/ocr_test.go with RPC network chaos by bringing down network to RPC node for 50 percent of Chainlink Nodes:
+   OR with `make` commands:
 
-```bash
-make test_soak_ocr_rpc_down_half_cl_nodes
-```
+   ```bash
+   BASE64_CONFIG_OVERRIDE=$(cat ./testconfig/overrides.toml | base64) make test_<your_test>
+   ```
 
-### Debugging HTTP and RPC clients
-```bash
-export SETH_LOG_LEVEL=debug
-export RESTY_DEBUG=true
-```
+   Example (see make-commands in [Makefile .PHONY lines](./Makefile)):
+
+   ```bash
+   BASE64_CONFIG_OVERRIDE=$(cat ./testconfig/overrides.toml | base64) make test_chaos_ocr/make test_soak_ocr2/test_node_migrations
+   ```
+
+4. Use Kubernetes namespace printed out in logs to monitor and analyze test runs.
+5. Navigate to Grafana dashboards to for test results and logs.
+
+#### CI/GitHub Actions
+
+1. Ensure all necessary configurations are provided (see [Test and node configuration](#test-and-node-configuration)).
+2. Follow instructions provided in [E2E Tests on GitHub CI](../.github/E2E_TESTS_ON_GITHUB_CI.md).
+3. Refer [Tests Run Books](./run-books/) to get more details on how to run specific per-product tests.
diff --git a/integration-tests/deployment/README.md b/integration-tests/deployment/README.md
index c0ac1bbc530..a87d627063b 100644
--- a/integration-tests/deployment/README.md
+++ b/integration-tests/deployment/README.md
@@ -56,4 +56,15 @@ func TestDoSomething(t *testing.T)
     // Send traffic, run assertions etc.
 }
 ```
-- Changesets are exposed and applied via a different repo. 
\ No newline at end of file
+- Changesets are exposed and applied via a different repo. 
+
+/deployment/llo
+- package name `llodeployment`
+- Similar to /deploymet/ccip, these are product-specific deployment/configuration workflows
+- Tests can use deployment/memory for fast integration testing
+
+/deployment/llo/changeset
+- package name `changeset` imported as `llochangesets`
+- Similar to deployment/ccip/changesets
+- These function like scripts describing state transitions
+  you wish to apply to _persistent_ environments like testnet/mainnet
diff --git a/integration-tests/deployment/ccip/deploy.go b/integration-tests/deployment/ccip/deploy.go
index 309a47b7b31..2f7aa43245b 100644
--- a/integration-tests/deployment/ccip/deploy.go
+++ b/integration-tests/deployment/ccip/deploy.go
@@ -567,9 +567,9 @@ func DeployChainContracts(
 				chain.DeployerKey,
 				chain.Client,
 				fee_quoter.FeeQuoterStaticConfig{
-					MaxFeeJuelsPerMsg:  big.NewInt(0).Mul(big.NewInt(2e2), big.NewInt(1e18)),
-					LinkToken:          contractConfig.LinkToken.Address(),
-					StalenessThreshold: uint32(24 * 60 * 60),
+					MaxFeeJuelsPerMsg:            big.NewInt(0).Mul(big.NewInt(2e2), big.NewInt(1e18)),
+					LinkToken:                    contractConfig.LinkToken.Address(),
+					TokenPriceStalenessThreshold: uint32(24 * 60 * 60),
 				},
 				[]common.Address{mcmsContracts.Timelock.Address},                                     // timelock should be able to update, ramps added after
 				[]common.Address{contractConfig.Weth9.Address(), contractConfig.LinkToken.Address()}, // fee tokens
diff --git a/integration-tests/deployment/ccip/deploy_home_chain.go b/integration-tests/deployment/ccip/deploy_home_chain.go
index 316f8604fd5..24c438c0510 100644
--- a/integration-tests/deployment/ccip/deploy_home_chain.go
+++ b/integration-tests/deployment/ccip/deploy_home_chain.go
@@ -570,7 +570,7 @@ func setupExecDON(
 
 	execCandidateDigest, err := ccipHome.GetCandidateDigest(nil, donID, execConfig.PluginType)
 	if err != nil {
-		return fmt.Errorf("get commit candidate digest: %w", err)
+		return fmt.Errorf("get exec candidate digest 1st time: %w", err)
 	}
 
 	if execCandidateDigest == [32]byte{} {
@@ -605,11 +605,24 @@ func setupExecDON(
 	if err != nil {
 		return fmt.Errorf("update don w/ exec config: %w", err)
 	}
-
-	if _, err := deployment.ConfirmIfNoError(home, tx, err); err != nil {
+	bn, err := deployment.ConfirmIfNoError(home, tx, err)
+	if err != nil {
 		return fmt.Errorf("confirm update don w/ exec config: %w", err)
 	}
-
+	if bn == 0 {
+		return fmt.Errorf("UpdateDON tx not confirmed")
+	}
+	// check if candidate digest is promoted
+	pEvent, err := ccipHome.FilterConfigPromoted(&bind.FilterOpts{
+		Context: context.Background(),
+		Start:   bn,
+	}, [][32]byte{execCandidateDigest})
+	if err != nil {
+		return fmt.Errorf("filter exec config promoted: %w", err)
+	}
+	if !pEvent.Next() {
+		return fmt.Errorf("exec config not promoted")
+	}
 	// check that candidate digest is empty.
 	execCandidateDigest, err = ccipHome.GetCandidateDigest(nil, donID, execConfig.PluginType)
 	if err != nil {
diff --git a/integration-tests/deployment/ccip/view/v1_6/feequoter.go b/integration-tests/deployment/ccip/view/v1_6/feequoter.go
index a2694e96a48..776f91c2e50 100644
--- a/integration-tests/deployment/ccip/view/v1_6/feequoter.go
+++ b/integration-tests/deployment/ccip/view/v1_6/feequoter.go
@@ -22,9 +22,9 @@ type FeeQuoterView struct {
 }
 
 type FeeQuoterStaticConfig struct {
-	MaxFeeJuelsPerMsg  string `json:"maxFeeJuelsPerMsg,omitempty"`
-	LinkToken          string `json:"linkToken,omitempty"`
-	StalenessThreshold uint32 `json:"stalenessThreshold,omitempty"`
+	MaxFeeJuelsPerMsg            string `json:"maxFeeJuelsPerMsg,omitempty"`
+	LinkToken                    string `json:"linkToken,omitempty"`
+	TokenPriceStalenessThreshold uint32 `json:"tokenPriseStalenessThreshold,omitempty"`
 }
 
 type FeeQuoterDestChainConfig struct {
@@ -78,9 +78,9 @@ func GenerateFeeQuoterView(fqContract *fee_quoter.FeeQuoter, router *router1_2.R
 		return FeeQuoterView{}, err
 	}
 	fq.StaticConfig = FeeQuoterStaticConfig{
-		MaxFeeJuelsPerMsg:  staticConfig.MaxFeeJuelsPerMsg.String(),
-		LinkToken:          staticConfig.LinkToken.Hex(),
-		StalenessThreshold: staticConfig.StalenessThreshold,
+		MaxFeeJuelsPerMsg:            staticConfig.MaxFeeJuelsPerMsg.String(),
+		LinkToken:                    staticConfig.LinkToken.Hex(),
+		TokenPriceStalenessThreshold: staticConfig.TokenPriceStalenessThreshold,
 	}
 	// find router contract in dependencies
 	fq.DestinationChainConfig = make(map[uint64]FeeQuoterDestChainConfig)
diff --git a/integration-tests/deployment/clo/env.go b/integration-tests/deployment/clo/env.go
index d2680f13e58..302f9794eaf 100644
--- a/integration-tests/deployment/clo/env.go
+++ b/integration-tests/deployment/clo/env.go
@@ -24,7 +24,7 @@ func NewDonEnv(t *testing.T, cfg DonEnvConfig) *deployment.Environment {
 	for _, nop := range cfg.Nops {
 		for _, node := range nop.Nodes {
 			for _, chain := range node.ChainConfigs {
-				if chain.Ocr1Config.IsBootstrap {
+				if chain.Ocr2Config.IsBootstrap {
 					t.Fatalf("Don nodes should not be bootstraps nop %s node %s chain %s", nop.ID, node.ID, chain.Network.ChainID)
 				}
 			}
@@ -47,13 +47,16 @@ func NewDonEnv(t *testing.T, cfg DonEnvConfig) *deployment.Environment {
 	return &out
 }
 
-func NewDonEnvWithMemoryChains(t *testing.T, cfg DonEnvConfig) *deployment.Environment {
+func NewDonEnvWithMemoryChains(t *testing.T, cfg DonEnvConfig, ignore func(*models.NodeChainConfig) bool) *deployment.Environment {
 	e := NewDonEnv(t, cfg)
 	// overwrite the chains with memory chains
 	chains := make(map[uint64]struct{})
 	for _, nop := range cfg.Nops {
 		for _, node := range nop.Nodes {
 			for _, chain := range node.ChainConfigs {
+				if ignore(chain) {
+					continue
+				}
 				id, err := strconv.ParseUint(chain.Network.ChainID, 10, 64)
 				require.NoError(t, err, "failed to parse chain id to uint64")
 				chains[id] = struct{}{}
diff --git a/integration-tests/deployment/clo/models/models_gen.go b/integration-tests/deployment/clo/models/models_gen.go
index 836eb7e7add..baea1dbcbed 100644
--- a/integration-tests/deployment/clo/models/models_gen.go
+++ b/integration-tests/deployment/clo/models/models_gen.go
@@ -2475,17 +2475,20 @@ const (
 	ChainTypeEvm      ChainType = "EVM"
 	ChainTypeSolana   ChainType = "SOLANA"
 	ChainTypeStarknet ChainType = "STARKNET"
+	ChainTypeAptos ChainType = "APTOS"
+
 )
 
 var AllChainType = []ChainType{
 	ChainTypeEvm,
 	ChainTypeSolana,
 	ChainTypeStarknet,
+	ChainTypeAptos,
 }
 
 func (e ChainType) IsValid() bool {
 	switch e {
-	case ChainTypeEvm, ChainTypeSolana, ChainTypeStarknet:
+	case ChainTypeEvm, ChainTypeSolana, ChainTypeStarknet, ChainTypeAptos:
 		return true
 	}
 	return false
diff --git a/integration-tests/deployment/clo/testdata/workflow_nodes.json b/integration-tests/deployment/clo/testdata/workflow_nodes.json
index ade92a8d9f8..78a8f706ae8 100644
--- a/integration-tests/deployment/clo/testdata/workflow_nodes.json
+++ b/integration-tests/deployment/clo/testdata/workflow_nodes.json
@@ -15,6 +15,28 @@
         "name": "Chainlink Sepolia Prod Keystone One 9",
         "publicKey": "412dc6fe48ea4e34baaa77da2e3b032d39b938597b6f3d61fe7ed183a827a431",
         "chainConfigs": [
+          {
+            "network": {
+              "id": "1401",
+              "chainID": "2",
+              "chainType": "APTOS",
+              "name": "APTOS TEST"
+            },
+            "ocr2Config": {
+              "enabled": true,
+              "p2pKeyBundle": {
+                "peerID": "p2p_12D3KooWBCMCCZZ8x57AXvJvpCujqhZzTjWXbReaRE8TxNr5dM4U",
+                "publicKey": "147d5cc651819b093cd2fdff9760f0f0f77b7ef7798d9e24fc6a350b7300e5d9"
+              },
+              "ocrKeyBundle": {
+                "bundleID": "d834cf7c830df7510228b33b138c018ff16b4eecf82273ed3bcd862bbbc046d4",
+                "configPublicKey": "6a1f37f06833c55ecf46233439ea6179a835bac6f2b2dee725b747c121813149",
+                "offchainPublicKey": "ff1144bbf648e6f76c58d0ce53a9a2cbe9a284d52db8691a714cac8e3a96b8b4",
+                "onchainSigningAddress": "4fa557850e4d5c21b3963c97414c1f37792700c4d3b8abdb904b765fd47e39bf"
+              },
+              "plugins": {}
+            }
+          },
           {
             "network": {
               "id": "140",
@@ -103,6 +125,28 @@
         "name": "Chainlink Sepolia Prod Keystone One 8",
         "publicKey": "1141dd1e46797ced9b0fbad49115f18507f6f6e6e3cc86e7e5ba169e58645adc",
         "chainConfigs": [
+          {
+            "network": {
+              "id": "1402",
+              "chainID": "2",
+              "chainType": "APTOS",
+              "name": "APTOS TEST"
+            },
+            "ocr2Config": {
+              "enabled": true,
+              "p2pKeyBundle": {
+                "peerID": "p2p_12D3KooWAUagqMycsro27kFznSQRHbhfCBLx8nKD4ptTiUGDe38c",
+                "publicKey": "09ca39cd924653c72fbb0e458b629c3efebdad3e29e7cd0b5760754d919ed829"
+              },
+              "ocrKeyBundle": {
+                "bundleID": "6726df46033038b724a4e6371807b6aa09efc829d0a3f7a5db4fd7df4b69fea7",
+                "configPublicKey": "0874e6cd5c8e651ab0ff564a474832ed9eaf2c5025b553f908d04921d9777d50",
+                "offchainPublicKey": "c791d2b9d3562f991af68ab7164a19734d551a9404d91c9571fdcdc5dcb237ca",
+                "onchainSigningAddress": "bddafb20cc50d89e0ae2f244908c27b1d639615d8186b28c357669de3359f208"
+              },
+              "plugins": {}
+            }
+          },
           {
             "network": {
               "id": "140",
@@ -191,6 +235,28 @@
         "name": "Chainlink Sepolia Prod Keystone One 7",
         "publicKey": "b473091fe1d4dbbc26ad71c67b4432f8f4280e06bab5e2122a92f4ab8b6ff2f5",
         "chainConfigs": [
+          {
+            "network": {
+              "id": "1403",
+              "chainID": "2",
+              "chainType": "APTOS",
+              "name": "APTOS TEST"
+            },
+            "ocr2Config": {
+              "enabled": true,
+              "p2pKeyBundle": {
+                "peerID": "p2p_12D3KooWQMCj73V5xmCd6C5VsJr7rbFG2TF9LwVcLiiBqXps9MgC",
+                "publicKey": "d7e9f2252b09edf0802a65b60bc9956691747894cb3ab9fefd072adf742eb9f1"
+              },
+              "ocrKeyBundle": {
+                "bundleID": "14082da0f33b4cec842bc1e1002e617a194ed4a81105603bd6c1edf784aa3743",
+                "configPublicKey": "209eea27e73b0ecc1c49b3ea274e4a18a1f5ed62fd79f443f0b5b9cc6019356e",
+                "offchainPublicKey": "cf0684a0e59399fe9b92cfc740d9696f925e78ee7d0273947e5f7b830070eaaa",
+                "onchainSigningAddress": "96dc85670c49caa986de4ad288e680e9afb0f5491160dcbb4868ca718e194fc8"
+              },
+              "plugins": {}
+            }
+          },
           {
             "network": {
               "id": "140",
@@ -279,6 +345,28 @@
         "name": "Chainlink Sepolia Prod Keystone One 6",
         "publicKey": "75ac63fc97a31e31168084e0de8ccd2bea90059b609d962f3e43fc296cdba28d",
         "chainConfigs": [
+          {
+            "network": {
+              "id": "1404",
+              "chainID": "2",
+              "chainType": "APTOS",
+              "name": "APTOS TEST"
+            },
+            "ocr2Config": {
+              "enabled": true,
+              "p2pKeyBundle": {
+                "peerID": "p2p_12D3KooWNJ8de3PUURZ2oucrVTpnRTqNBTUYwHLQjK9LzN3E6Mfn",
+                "publicKey": "b96933429b1a81c811e1195389d7733e936b03e8086e75ea1fa92c61564b6c31"
+              },
+              "ocrKeyBundle": {
+                "bundleID": "b419e9e3f1256aa2907a1a396bdf27ba5002a30eee440ab96cb60369429ce277",
+                "configPublicKey": "3ae1a1c713e4ad63f67191fd93620c9eebe44e1d5f3264036ec0fbcd59cf9664",
+                "offchainPublicKey": "6fc8c3fb55b39577abbab20028bee93d1d6d8a888dd298354b95d4af3ccb6009",
+                "onchainSigningAddress": "4a94c75cb9fe8b1fba86fd4b71ad130943281fdefad10216c46eb2285d60950f"
+              },
+              "plugins": {}
+            }
+          },
           {
             "network": {
               "id": "140",
@@ -367,6 +455,28 @@
         "name": "Chainlink Sepolia Prod Keystone One 5",
         "publicKey": "4542f4fd2ed150c8c976b39802fe3d994aec3ac94fd11e7817f693b1c9a1dabb",
         "chainConfigs": [
+          {
+            "network": {
+              "id": "14005",
+              "chainID": "2",
+              "chainType": "APTOS",
+              "name": "APTOS TEST"
+            },
+            "ocr2Config": {
+              "enabled": true,
+              "p2pKeyBundle": {
+                "peerID": "p2p_12D3KooWR8d5kbZb7YiQWKpT1J1PfMqNaGAmb4jBFx9DWag4hpSZ",
+                "publicKey": "e38c9f2760db006f070e9cc1bc1c2269ad033751adaa85d022fb760cbc5b5ef6"
+              },
+              "ocrKeyBundle": {
+                "bundleID": "44b5f46bfbb04d0984469298ec43c350ec6b2cd4556b18265ebac1b6cc329c7c",
+                "configPublicKey": "263bee0d09d90e0e618c4cdd630d1437f7377f2d544df57f39ddd47984970555",
+                "offchainPublicKey": "11674b98849d8e070ac69d37c284b3091fcd374913f52b2b83ce2d9a4a4e0213",
+                "onchainSigningAddress": "425d1354a7b8180252a221040c718cac0ba0251c7efe31a2acefbba578dc2153"
+              },
+              "plugins": {}
+            }
+          },
           {
             "network": {
               "id": "140",
@@ -455,6 +565,28 @@
         "name": "Chainlink Sepolia Prod Keystone One 4",
         "publicKey": "07e0ffc57b6263604df517b94bd986169451a3c90600a855bb19212dc575de54",
         "chainConfigs": [
+          {
+            "network": {
+              "id": "1406",
+              "chainID": "2",
+              "chainType": "APTOS",
+              "name": "APTOS TEST"
+            },
+            "ocr2Config": {
+              "enabled": true,
+              "p2pKeyBundle": {
+                "peerID": "p2p_12D3KooWHqR1w26yHatTSZQW3xbRct9SxWzVj9X4SpU916Hy8jYg",
+                "publicKey": "77224be9d052343b1d17156a1e463625c0d746468d4f5a44cddd452365b1d4ed"
+              },
+              "ocrKeyBundle": {
+                "bundleID": "b1ab478c1322bc4f8227be50898a8044efc70cf0156ec53cf132119db7e94dea",
+                "configPublicKey": "96ae354418e50dcd5b3dae62e8f0bc911bbce7f761220837aacdaa6f82bd0f29",
+                "offchainPublicKey": "b34bb49788541de8b6cfb321799a41927a391a4eb135c74f6cb14eec0531ee6f",
+                "onchainSigningAddress": "1221e131ef21014a6a99ed22376eb869746a3b5e30fd202cf79e44efaeb8c5c2"
+              },
+              "plugins": {}
+            }
+          },
           {
             "network": {
               "id": "140",
@@ -541,9 +673,31 @@
     "nodes": [
       {
         "id": "786",
-        "name": "\tChainlink Sepolia Prod Keystone One 3",
+        "name": "Chainlink Sepolia Prod Keystone One 3",
         "publicKey": "487901e0c0a9d3c66e7cfc50f3a9e3cdbfdf1b0107273d73d94a91d278545516",
         "chainConfigs": [
+          {
+            "network": {
+              "id": "1417",
+              "chainID": "2",
+              "chainType": "APTOS",
+              "name": "APTOS TEST"
+            },
+            "ocr2Config": {
+              "enabled": true,
+              "p2pKeyBundle": {
+                "peerID": "p2p_12D3KooWCcVLytqinD8xMn27NvomcQhj2mqMVzyGemz6oPwv1SMT",
+                "publicKey": "298834a041a056df58c839cb53d99b78558693042e54dff238f504f16d18d4b6"
+              },
+              "ocrKeyBundle": {
+                "bundleID": "5811a96a0c3b5f5b52973eee10e5771cf5953d37d5616ea71f7ae76f09f6e332",
+                "configPublicKey": "a7f3435bfbaabebd1572142ff1aec9ed98758d9bb098f1fcc77262fcae7f4171",
+                "offchainPublicKey": "886044b333af681ab4bf3be663122524ece9725e110ac2a64cda8526cad6983e",
+                "onchainSigningAddress": "046faf34ebfe42510251e6098bc34fa3dd5f2de38ac07e47f2d1b34ac770639f"
+              },
+              "plugins": {}
+            }
+          },
           {
             "network": {
               "id": "140",
@@ -661,6 +815,28 @@
               "plugins": {}
             }
           },
+          {
+            "network": {
+              "id": "1408",
+              "chainID": "2",
+              "chainType": "APTOS",
+              "name": "APTOS TEST"
+            },
+            "ocr2Config": {
+              "enabled": true,
+              "p2pKeyBundle": {
+                "peerID": "p2p_12D3KooWGDmBKZ7B3PynGrvfHTJMEecpjfHts9YK5NWk8oJuxcAo",
+                "publicKey": "5f247f61a6d5bfdd1d5064db0bd25fe443648133c6131975edb23481424e3d9c"
+              },
+              "ocrKeyBundle": {
+                "bundleID": "e57c608a899d80e510913d2c7ef55758ee81e9eb73eb531003af1564307fd133",
+                "configPublicKey": "412a4bed6b064c17168871d28dbb965cc0a898f7b19eb3fa7cd01d3e3d10b66c",
+                "offchainPublicKey": "450aa794c87198a595761a8c18f0f1590046c8092960036638d002256af95254",
+                "onchainSigningAddress": "ba20d3da9b07663f1e8039081a514649fd61a48be2d241bc63537ee47d028fcd"
+              },
+              "plugins": {}
+            }
+          },
           {
             "network": {
               "id": "129",
@@ -722,6 +898,28 @@
         "name": "Chainlink Sepolia Prod Keystone One 1",
         "publicKey": "28b91143ec9111796a7d63e14c1cf6bb01b4ed59667ab54f5bc72ebe49c881be",
         "chainConfigs": [
+          {
+            "network": {
+              "id": "1409",
+              "chainID": "2",
+              "chainType": "APTOS",
+              "name": "APTOS TEST"
+            },
+            "ocr2Config": {
+              "enabled": true,
+              "p2pKeyBundle": {
+                "peerID": "p2p_12D3KooWCbDiL7sP9BVby5KaZqPpaVP1RBokoa9ShzH5WhkYX46v",
+                "publicKey": "2934f31f278e5c60618f85861bd6add54a4525d79a642019bdc87d75d26372c3"
+              },
+              "ocrKeyBundle": {
+                "bundleID": "4b6418b8ab88ea1244c3c48eb5f4c86f9f0301aebffcac4fcfac5cdfb7cf6933",
+                "configPublicKey": "a38dbe521643479d78ab5477cae78161a5de0030c95098e3fbb09add6aca9508",
+                "offchainPublicKey": "7718dcbf40173dbd876720aa64028a6b18bf9a87543fc83a549515c4937962e3",
+                "onchainSigningAddress": "247d0189f65f58be83a4e7d87ff338aaf8956e9acb9fcc783f34f9edc29d1b40"
+              },
+              "plugins": {}
+            }
+          },
           {
             "network": {
               "id": "140",
@@ -811,6 +1009,28 @@
         "name": "Chainlink Sepolia Prod Keystone One 0",
         "publicKey": "403b72f0b1b3b5f5a91bcfedb7f28599767502a04b5b7e067fcf3782e23eeb9c",
         "chainConfigs": [
+          {
+            "network": {
+              "id": "1411",
+              "chainID": "2",
+              "chainType": "APTOS",
+              "name": "APTOS TEST"
+            },
+            "ocr2Config": {
+              "enabled": true,
+              "p2pKeyBundle": {
+                "peerID": "p2p_12D3KooWMWUKdoAc2ruZf9f55p7NVFj7AFiPm67xjQ8BZBwkqyYv",
+                "publicKey": "adb6bf005cdb23f21e11b82d66b9f62628c2939640ed93028bf0dad3923c5a8b"
+              },
+              "ocrKeyBundle": {
+                "bundleID": "b4504e84ea307cc2afffca0206bd4bf8e98acc5a03c9bd47b2456e3845a5d1fa",
+                "configPublicKey": "559ea4ee5774a31d97914a4220d6a47094ae8e2cf0806e80e1eacd851f3e6757",
+                "offchainPublicKey": "4ec55bbe76a6b1fdc885c59da85a8fe44cf06afe1e4719f0824a731937526c52",
+                "onchainSigningAddress": "b8834eaa062f0df4ccfe7832253920071ec14dc4f78b13ecdda10b824e2dd3b6"
+              },
+              "plugins": {}
+            }
+          },
           {
             "network": {
               "id": "140",
diff --git a/integration-tests/deployment/devenv/chain.go b/integration-tests/deployment/devenv/chain.go
index 10a888c1d0a..bf58aff6e37 100644
--- a/integration-tests/deployment/devenv/chain.go
+++ b/integration-tests/deployment/devenv/chain.go
@@ -8,7 +8,6 @@ import (
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/ethclient"
-	"github.com/sethvargo/go-retry"
 	chainselectors "github.com/smartcontractkit/chain-selectors"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
@@ -60,30 +59,28 @@ func NewChains(logger logger.Logger, configs []ChainConfig) (map[uint64]deployme
 				if tx == nil {
 					return 0, fmt.Errorf("tx was nil, nothing to confirm")
 				}
-				err := retry.Do(context.Background(),
-					retry.WithMaxDuration(3*time.Minute, retry.NewFibonacci(1*time.Second)),
-					func(ctx context.Context) error {
-						chainId, err := ec.ChainID(ctx)
-						if err != nil {
-							return fmt.Errorf("failed to get chain id: %w", err)
-						}
-						receipt, err := bind.WaitMined(ctx, ec, tx)
-						if err != nil {
-							return retry.RetryableError(fmt.Errorf("failed to get receipt for chain %d: %w", chainId, err))
-						}
-						if receipt != nil {
-							blockNumber = receipt.BlockNumber.Uint64()
-						}
-						if receipt.Status == 0 {
-							errReason, err := deployment.GetErrorReasonFromTx(ec, chainCfg.DeployerKey.From, *tx, receipt)
-							if err == nil && errReason != "" {
-								return fmt.Errorf("tx %s reverted,error reason: %s", tx.Hash().Hex(), errReason)
-							}
-							return fmt.Errorf("tx %s reverted, could not decode error reason", tx.Hash().Hex())
-						}
-						return nil
-					})
-				return blockNumber, err
+				ctx, cancel := context.WithTimeout(context.Background(), 3*time.Minute)
+				defer cancel()
+				chainId, err := ec.ChainID(ctx)
+				if err != nil {
+					return blockNumber, fmt.Errorf("failed to get chain id: %w", err)
+				}
+				receipt, err := bind.WaitMined(ctx, ec, tx)
+				if err != nil {
+					return blockNumber, fmt.Errorf("failed to get confirmed receipt for chain %d: %w", chainId, err)
+				}
+				if receipt == nil {
+					return blockNumber, fmt.Errorf("receipt was nil for tx %s", tx.Hash().Hex())
+				}
+				blockNumber = receipt.BlockNumber.Uint64()
+				if receipt.Status == 0 {
+					errReason, err := deployment.GetErrorReasonFromTx(ec, chainCfg.DeployerKey.From, *tx, receipt)
+					if err == nil && errReason != "" {
+						return blockNumber, fmt.Errorf("tx %s reverted,error reason: %s", tx.Hash().Hex(), errReason)
+					}
+					return blockNumber, fmt.Errorf("tx %s reverted, could not decode error reason", tx.Hash().Hex())
+				}
+				return blockNumber, nil
 			},
 		}
 	}
diff --git a/integration-tests/deployment/keystone/deploy_test.go b/integration-tests/deployment/keystone/deploy_test.go
index 13adfc09740..9ffd0b0a8b1 100644
--- a/integration-tests/deployment/keystone/deploy_test.go
+++ b/integration-tests/deployment/keystone/deploy_test.go
@@ -1,7 +1,6 @@
 package keystone_test
 
 import (
-	"context"
 	"encoding/json"
 	"fmt"
 	"os"
@@ -13,6 +12,8 @@ import (
 
 	chainsel "github.com/smartcontractkit/chain-selectors"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/tests"
+
 	"github.com/smartcontractkit/chainlink/integration-tests/deployment"
 	"github.com/smartcontractkit/chainlink/integration-tests/deployment/clo"
 	"github.com/smartcontractkit/chainlink/integration-tests/deployment/clo/models"
@@ -22,6 +23,7 @@ import (
 )
 
 func TestDeploy(t *testing.T) {
+	t.Skip("TODO: KS-478 fix this test")
 	lggr := logger.TestLogger(t)
 
 	wfNops := loadTestNops(t, "../clo/testdata/workflow_nodes.json")
@@ -57,8 +59,7 @@ func TestDeploy(t *testing.T) {
 		MaxFaultyOracles: len(wfNops) / 3,
 	}
 
-	ctx := context.Background()
-
+	ctx := tests.Context(t)
 	// explicitly deploy the contracts
 	cs, err := keystone.DeployContracts(lggr, env, registryChainSel)
 	require.NoError(t, err)
@@ -157,12 +158,17 @@ func TestDeploy(t *testing.T) {
 
 func makeMultiDonTestEnv(t *testing.T, lggr logger.Logger, dons []keystone.DonCapabilities) *deployment.Environment {
 	var donToEnv = make(map[string]*deployment.Environment)
+	// chain selector lib doesn't support chain id 2 and we don't use it in tests
+	// because it's not an evm chain
+	ignoreAptos := func(c *models.NodeChainConfig) bool {
+		return c.Network.ChainID == "2" // aptos chain
+	}
 	for _, don := range dons {
 		env := clo.NewDonEnvWithMemoryChains(t, clo.DonEnvConfig{
 			DonName: don.Name,
 			Nops:    don.Nops,
 			Logger:  lggr,
-		})
+		}, ignoreAptos)
 		donToEnv[don.Name] = env
 	}
 	menv := clo.NewTestEnv(t, lggr, donToEnv)
diff --git a/integration-tests/deployment/keystone/types.go b/integration-tests/deployment/keystone/types.go
index d49d2180436..18c0e1dd75f 100644
--- a/integration-tests/deployment/keystone/types.go
+++ b/integration-tests/deployment/keystone/types.go
@@ -2,6 +2,7 @@ package keystone
 
 import (
 	"encoding/hex"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"sort"
@@ -17,6 +18,7 @@ import (
 	v1 "github.com/smartcontractkit/chainlink/integration-tests/deployment/jd/node/v1"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/keystone/generated/capabilities_registry"
 	kcr "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/keystone/generated/capabilities_registry"
+	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/chaintype"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/p2pkey"
 )
 
@@ -61,10 +63,11 @@ type ocr2Node struct {
 	EncryptionPublicKey [32]byte
 	IsBoostrap          bool
 	// useful when have to register the ocr3 contract config
-	p2pKeyBundle   *v1.OCR2Config_P2PKeyBundle
-	ocrKeyBundle   *v1.OCR2Config_OCRKeyBundle
-	csaKey         string // *v1.Node.PublicKey
-	accountAddress string
+	p2pKeyBundle       *v1.OCR2Config_P2PKeyBundle
+	ethOcr2KeyBundle   *v1.OCR2Config_OCRKeyBundle
+	aptosOcr2KeyBundle *v1.OCR2Config_OCRKeyBundle
+	csaKey             string // *v1.Node.PublicKey
+	accountAddress     string
 }
 
 func (o *ocr2Node) signerAddress() common.Address {
@@ -75,10 +78,10 @@ func (o *ocr2Node) toNodeKeys() NodeKeys {
 	return NodeKeys{
 		EthAddress:            o.accountAddress,
 		P2PPeerID:             o.p2pKeyBundle.PeerId,
-		OCR2BundleID:          o.ocrKeyBundle.BundleId,
-		OCR2OnchainPublicKey:  o.ocrKeyBundle.OnchainSigningAddress,
-		OCR2OffchainPublicKey: o.ocrKeyBundle.OffchainPublicKey,
-		OCR2ConfigPublicKey:   o.ocrKeyBundle.ConfigPublicKey,
+		OCR2BundleID:          o.ethOcr2KeyBundle.BundleId,
+		OCR2OnchainPublicKey:  o.ethOcr2KeyBundle.OnchainSigningAddress,
+		OCR2OffchainPublicKey: o.ethOcr2KeyBundle.OffchainPublicKey,
+		OCR2ConfigPublicKey:   o.ethOcr2KeyBundle.ConfigPublicKey,
 		CSAPublicKey:          o.csaKey,
 		// default value of encryption public key is the CSA public key
 		// TODO: DEVSVCS-760
@@ -87,10 +90,15 @@ func (o *ocr2Node) toNodeKeys() NodeKeys {
 	}
 }
 
-func newOcr2Node(id string, ccfg *v1.ChainConfig, csaPubKey string) (*ocr2Node, error) {
-	if ccfg == nil {
+func newOcr2Node(id string, ccfgs map[chaintype.ChainType]*v1.ChainConfig, csaPubKey string) (*ocr2Node, error) {
+	if ccfgs == nil {
 		return nil, errors.New("nil ocr2config")
 	}
+	evmCC, exists := ccfgs[chaintype.EVM]
+	if !exists {
+		return nil, errors.New("no evm chain config for node id " + id)
+	}
+
 	if csaPubKey == "" {
 		return nil, errors.New("empty csa public key")
 	}
@@ -105,7 +113,7 @@ func newOcr2Node(id string, ccfg *v1.ChainConfig, csaPubKey string) (*ocr2Node,
 	var csaKeyb [32]byte
 	copy(csaKeyb[:], csaKey)
 
-	ocfg := ccfg.Ocr2Config
+	ocfg := evmCC.Ocr2Config
 	p := p2pkey.PeerID{}
 	if err := p.UnmarshalString(ocfg.P2PKeyBundle.PeerId); err != nil {
 		return nil, fmt.Errorf("failed to unmarshal peer id %s: %w", ocfg.P2PKeyBundle.PeerId, err)
@@ -123,17 +131,24 @@ func newOcr2Node(id string, ccfg *v1.ChainConfig, csaPubKey string) (*ocr2Node,
 	var sigb [32]byte
 	copy(sigb[:], signerB)
 
-	return &ocr2Node{
+	n := &ocr2Node{
 		ID:                  id,
 		Signer:              sigb,
 		P2PKey:              p,
 		EncryptionPublicKey: csaKeyb,
 		IsBoostrap:          ocfg.IsBootstrap,
 		p2pKeyBundle:        ocfg.P2PKeyBundle,
-		ocrKeyBundle:        ocfg.OcrKeyBundle,
-		accountAddress:      ccfg.AccountAddress,
+		ethOcr2KeyBundle:    evmCC.Ocr2Config.OcrKeyBundle,
+		aptosOcr2KeyBundle:  nil,
+		accountAddress:      evmCC.AccountAddress,
 		csaKey:              csaPubKey,
-	}, nil
+	}
+	// aptos chain config is optional
+	if aptosCC, exists := ccfgs[chaintype.Aptos]; exists {
+		n.aptosOcr2KeyBundle = aptosCC.Ocr2Config.OcrKeyBundle
+	}
+
+	return n, nil
 }
 
 func makeNodeKeysSlice(nodes []*ocr2Node) []NodeKeys {
@@ -210,12 +225,14 @@ func mapDonsToCaps(dons []DonCapabilities) map[string][]kcr.CapabilitiesRegistry
 }
 
 // mapDonsToNodes returns a map of don name to simplified representation of their nodes
+// all nodes must have evm config and ocr3 capability nodes are must also have an aptos chain config
 func mapDonsToNodes(dons []DonCapabilities, excludeBootstraps bool) (map[string][]*ocr2Node, error) {
 	donToOcr2Nodes := make(map[string][]*ocr2Node)
 	// get the nodes for each don from the offchain client, get ocr2 config from one of the chain configs for the node b/c
 	// they are equivalent, and transform to ocr2node representation
 
 	for _, don := range dons {
+		isOCR3 := hasOCR3Capability(don.Capabilities)
 		for _, nop := range don.Nops {
 			for _, node := range nop.Nodes {
 				csaPubKey := node.PublicKey
@@ -226,9 +243,27 @@ func mapDonsToNodes(dons []DonCapabilities, excludeBootstraps bool) (map[string]
 				if len(node.ChainConfigs) == 0 {
 					return nil, fmt.Errorf("no chain configs for node %s. cannot obtain keys", node.ID)
 				}
-				chain := node.ChainConfigs[0]
-				ccfg := chainConfigFromClo(chain)
-				ocr2n, err := newOcr2Node(node.ID, ccfg, *csaPubKey)
+				// all nodes should have an evm chain config, specifically the registry chain
+				evmCC, exists := firstChainConfigByType(node.ChainConfigs, chaintype.EVM)
+				if !exists {
+					return nil, fmt.Errorf("no evm chain config for node %s", node.ID)
+				}
+				cfgs := map[chaintype.ChainType]*v1.ChainConfig{
+					chaintype.EVM: evmCC,
+				}
+				// wf nodes need to have aptos chain config
+				if isOCR3 {
+					aptosCC, exists := firstChainConfigByType(node.ChainConfigs, chaintype.Aptos)
+					if !exists {
+						debug, err := json.Marshal(node.ChainConfigs)
+						if err != nil {
+							debug = []byte("unmarshallable chain configs")
+						}
+						return nil, fmt.Errorf("ocr3 capability don no aptos chain config for node %s, configs %s", node.ID, debug)
+					}
+					cfgs[chaintype.Aptos] = aptosCC
+				}
+				ocr2n, err := newOcr2Node(node.ID, cfgs, *csaPubKey)
 				if err != nil {
 					return nil, fmt.Errorf("failed to create ocr2 node for node %s: %w", node.ID, err)
 				}
@@ -247,6 +282,25 @@ func mapDonsToNodes(dons []DonCapabilities, excludeBootstraps bool) (map[string]
 	return donToOcr2Nodes, nil
 }
 
+func firstChainConfigByType(ccfgs []*models.NodeChainConfig, t chaintype.ChainType) (*v1.ChainConfig, bool) {
+	for _, c := range ccfgs {
+		//nolint:staticcheck //ignore EqualFold it broke ci for some reason (go version skew btw local and ci?)
+		if strings.ToLower(c.Network.ChainType.String()) == strings.ToLower(string(t)) {
+			return chainConfigFromClo(c), true
+		}
+	}
+	return nil, false
+}
+
+func hasOCR3Capability(caps []kcr.CapabilitiesRegistryCapability) bool {
+	for _, c := range caps {
+		if c.CapabilityType == 2 {
+			return true
+		}
+	}
+	return false
+}
+
 // RegisteredDon is a representation of a don that exists in the in the capabilities registry all with the enriched node data
 type RegisteredDon struct {
 	Name  string
diff --git a/integration-tests/deployment/keystone/types_test.go b/integration-tests/deployment/keystone/types_test.go
new file mode 100644
index 00000000000..3c920085e9a
--- /dev/null
+++ b/integration-tests/deployment/keystone/types_test.go
@@ -0,0 +1,403 @@
+package keystone
+
+import (
+	"encoding/json"
+	"os"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/test-go/testify/require"
+
+	"github.com/smartcontractkit/chainlink/integration-tests/deployment/clo/models"
+	v1 "github.com/smartcontractkit/chainlink/integration-tests/deployment/jd/node/v1"
+	kcr "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/keystone/generated/capabilities_registry"
+	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/chaintype"
+)
+
+func Test_newOcr2Node(t *testing.T) {
+	type args struct {
+		id        string
+		ccfgs     map[chaintype.ChainType]*v1.ChainConfig
+		csaPubKey string
+	}
+	tests := []struct {
+		name      string
+		args      args
+		wantAptos bool
+		wantErr   bool
+	}{
+		{
+			name: "no aptos",
+			args: args{
+				id: "1",
+				ccfgs: map[chaintype.ChainType]*v1.ChainConfig{
+					chaintype.EVM: {
+
+						Ocr2Config: &v1.OCR2Config{
+							P2PKeyBundle: &v1.OCR2Config_P2PKeyBundle{
+								PeerId:    "p2p_12D3KooWMWUKdoAc2ruZf9f55p7NVFj7AFiPm67xjQ8BZBwkqyYv",
+								PublicKey: "pubKey",
+							},
+							OcrKeyBundle: &v1.OCR2Config_OCRKeyBundle{
+								BundleId:              "bundleId",
+								ConfigPublicKey:       "03dacd15fc96c965c648e3623180de002b71a97cf6eeca9affb91f461dcd6ce1",
+								OffchainPublicKey:     "03dacd15fc96c965c648e3623180de002b71a97cf6eeca9affb91f461dcd6ce1",
+								OnchainSigningAddress: "b35409a8d4f9a18da55c5b2bb08a3f5f68d44442",
+							},
+						},
+					},
+				},
+				csaPubKey: "1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef",
+			},
+		},
+		{
+			name: "with aptos",
+			args: args{
+				id: "1",
+				ccfgs: map[chaintype.ChainType]*v1.ChainConfig{
+					chaintype.EVM: {
+
+						Ocr2Config: &v1.OCR2Config{
+							P2PKeyBundle: &v1.OCR2Config_P2PKeyBundle{
+								PeerId:    "p2p_12D3KooWMWUKdoAc2ruZf9f55p7NVFj7AFiPm67xjQ8BZBwkqyYv",
+								PublicKey: "pubKey",
+							},
+							OcrKeyBundle: &v1.OCR2Config_OCRKeyBundle{
+								BundleId:              "bundleId",
+								ConfigPublicKey:       "03dacd15fc96c965c648e3623180de002b71a97cf6eeca9affb91f461dcd6ce1",
+								OffchainPublicKey:     "03dacd15fc96c965c648e3623180de002b71a97cf6eeca9affb91f461dcd6ce1",
+								OnchainSigningAddress: "b35409a8d4f9a18da55c5b2bb08a3f5f68d44442",
+							},
+						},
+					},
+					chaintype.Aptos: {
+
+						Ocr2Config: &v1.OCR2Config{
+							P2PKeyBundle: &v1.OCR2Config_P2PKeyBundle{
+								PeerId:    "p2p_12D3KooWMWUKdoAc2ruZf9f55p7NVFj7AFiPm67xjQ8BZB11111",
+								PublicKey: "pubKey",
+							},
+							OcrKeyBundle: &v1.OCR2Config_OCRKeyBundle{
+								BundleId:              "bundleId2",
+								ConfigPublicKey:       "0000015fc96c965c648e3623180de002b71a97cf6eeca9affb91f461dcd6ce1",
+								OffchainPublicKey:     "03dacd15fc96c965c648e3623180de002b71a97cf6eeca9affb91f461dcd6ce1",
+								OnchainSigningAddress: "111409a8d4f9a18da55c5b2bb08a3f5f68d44777",
+							},
+						},
+					},
+				},
+				csaPubKey: "1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef",
+			},
+			wantAptos: true,
+		},
+		{
+			name: "bad csa key",
+			args: args{
+				id: "1",
+				ccfgs: map[chaintype.ChainType]*v1.ChainConfig{
+					chaintype.EVM: {
+
+						Ocr2Config: &v1.OCR2Config{
+							P2PKeyBundle: &v1.OCR2Config_P2PKeyBundle{
+								PeerId:    "p2p_12D3KooWMWUKdoAc2ruZf9f55p7NVFj7AFiPm67xjQ8BZBwkqyYv",
+								PublicKey: "pubKey",
+							},
+							OcrKeyBundle: &v1.OCR2Config_OCRKeyBundle{
+								BundleId:              "bundleId",
+								ConfigPublicKey:       "03dacd15fc96c965c648e3623180de002b71a97cf6eeca9affb91f461dcd6ce1",
+								OffchainPublicKey:     "03dacd15fc96c965c648e3623180de002b71a97cf6eeca9affb91f461dcd6ce1",
+								OnchainSigningAddress: "b35409a8d4f9a18da55c5b2bb08a3f5f68d44442",
+							},
+						},
+					},
+				},
+				csaPubKey: "not hex",
+			},
+			wantErr: true,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := newOcr2Node(tt.args.id, tt.args.ccfgs, tt.args.csaPubKey)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("newOcr2Node() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if tt.wantErr {
+				return
+			}
+			assert.NotNil(t, got.ethOcr2KeyBundle)
+			assert.NotNil(t, got.p2pKeyBundle)
+			assert.NotNil(t, got.Signer)
+			assert.NotNil(t, got.EncryptionPublicKey)
+			assert.NotEmpty(t, got.csaKey)
+			assert.NotEmpty(t, got.P2PKey)
+			assert.Equal(t, tt.wantAptos, got.aptosOcr2KeyBundle != nil)
+		})
+	}
+}
+
+func Test_mapDonsToNodes(t *testing.T) {
+	t.Skip("TODO: KS-478 fix this test")
+	var (
+		pubKey   = "03dacd15fc96c965c648e3623180de002b71a97cf6eeca9affb91f461dcd6ce1"
+		evmSig   = "b35409a8d4f9a18da55c5b2bb08a3f5f68d44442"
+		aptosSig = "b35409a8d4f9a18da55c5b2bb08a3f5f68d44442b35409a8d4f9a18da55c5b2bb08a3f5f68d44442"
+		peerID   = "p2p_12D3KooWMWUKdoAc2ruZf9f55p7NVFj7AFiPm67xjQ8BZBwkqyYv"
+		// todo: these should be defined in common
+		writerCap = 3
+		ocr3Cap   = 2
+	)
+	type args struct {
+		dons              []DonCapabilities
+		excludeBootstraps bool
+	}
+	tests := []struct {
+		name    string
+		args    args
+		wantErr bool
+	}{
+		{
+			name: "writer evm only",
+			args: args{
+				dons: []DonCapabilities{
+					{
+						Name: "ok writer",
+						Nops: []*models.NodeOperator{
+							{
+								Nodes: []*models.Node{
+									{
+										PublicKey: &pubKey,
+										ChainConfigs: []*models.NodeChainConfig{
+											{
+												ID: "1",
+												Network: &models.Network{
+													ChainType: models.ChainTypeEvm,
+												},
+												Ocr2Config: &models.NodeOCR2Config{
+													P2pKeyBundle: &models.NodeOCR2ConfigP2PKeyBundle{
+														PeerID: peerID,
+													},
+													OcrKeyBundle: &models.NodeOCR2ConfigOCRKeyBundle{
+														ConfigPublicKey:       pubKey,
+														OffchainPublicKey:     pubKey,
+														OnchainSigningAddress: evmSig,
+													},
+												},
+											},
+										},
+									},
+								},
+							},
+						},
+						Capabilities: []kcr.CapabilitiesRegistryCapability{
+							{
+								LabelledName:   "writer",
+								Version:        "1",
+								CapabilityType: uint8(writerCap),
+							},
+						},
+					},
+				},
+			},
+			wantErr: false,
+		},
+		{
+			name: "err if no evm chain",
+			args: args{
+				dons: []DonCapabilities{
+					{
+						Name: "bad chain",
+						Nops: []*models.NodeOperator{
+							{
+								Nodes: []*models.Node{
+									{
+										PublicKey: &pubKey,
+										ChainConfigs: []*models.NodeChainConfig{
+											{
+												ID: "1",
+												Network: &models.Network{
+													ChainType: models.ChainTypeSolana,
+												},
+												Ocr2Config: &models.NodeOCR2Config{
+													P2pKeyBundle: &models.NodeOCR2ConfigP2PKeyBundle{
+														PeerID: peerID,
+													},
+													OcrKeyBundle: &models.NodeOCR2ConfigOCRKeyBundle{
+														ConfigPublicKey:       pubKey,
+														OffchainPublicKey:     pubKey,
+														OnchainSigningAddress: evmSig,
+													},
+												},
+											},
+										},
+									},
+								},
+							},
+						},
+						Capabilities: []kcr.CapabilitiesRegistryCapability{
+							{
+								LabelledName:   "writer",
+								Version:        "1",
+								CapabilityType: uint8(writerCap),
+							},
+						},
+					},
+				},
+			},
+			wantErr: true,
+		},
+		{
+			name: "ocr3 cap err if no aptos chain",
+			args: args{
+				dons: []DonCapabilities{
+					{
+						Name: "bad chain",
+						Nops: []*models.NodeOperator{
+							{
+								Nodes: []*models.Node{
+									{
+										PublicKey: &pubKey,
+										ChainConfigs: []*models.NodeChainConfig{
+											{
+												ID: "1",
+												Network: &models.Network{
+													ChainType: models.ChainTypeEvm,
+												},
+												Ocr2Config: &models.NodeOCR2Config{
+													P2pKeyBundle: &models.NodeOCR2ConfigP2PKeyBundle{
+														PeerID: peerID,
+													},
+													OcrKeyBundle: &models.NodeOCR2ConfigOCRKeyBundle{
+														ConfigPublicKey:       pubKey,
+														OffchainPublicKey:     pubKey,
+														OnchainSigningAddress: evmSig,
+													},
+												},
+											},
+										},
+									},
+								},
+							},
+						},
+						Capabilities: []kcr.CapabilitiesRegistryCapability{
+							{
+								LabelledName:   "ocr3",
+								Version:        "1",
+								CapabilityType: uint8(ocr3Cap),
+							},
+						},
+					},
+				},
+			},
+			wantErr: true,
+		},
+		{
+			name: "ocr3 cap evm & aptos",
+			args: args{
+				dons: []DonCapabilities{
+					{
+						Name: "bad chain",
+						Nops: []*models.NodeOperator{
+							{
+								Nodes: []*models.Node{
+									{
+										PublicKey: &pubKey,
+										ChainConfigs: []*models.NodeChainConfig{
+											{
+												ID: "1",
+												Network: &models.Network{
+													ChainType: models.ChainTypeEvm,
+												},
+												Ocr2Config: &models.NodeOCR2Config{
+													P2pKeyBundle: &models.NodeOCR2ConfigP2PKeyBundle{
+														PeerID: peerID,
+													},
+													OcrKeyBundle: &models.NodeOCR2ConfigOCRKeyBundle{
+														ConfigPublicKey:       pubKey,
+														OffchainPublicKey:     pubKey,
+														OnchainSigningAddress: evmSig,
+													},
+												},
+											},
+											{
+												ID: "2",
+												Network: &models.Network{
+													ChainType: models.ChainTypeAptos,
+												},
+												Ocr2Config: &models.NodeOCR2Config{
+													P2pKeyBundle: &models.NodeOCR2ConfigP2PKeyBundle{
+														PeerID: peerID,
+													},
+													OcrKeyBundle: &models.NodeOCR2ConfigOCRKeyBundle{
+														ConfigPublicKey:       pubKey,
+														OffchainPublicKey:     pubKey,
+														OnchainSigningAddress: aptosSig,
+													},
+												},
+											},
+										},
+									},
+								},
+							},
+						},
+						Capabilities: []kcr.CapabilitiesRegistryCapability{
+							{
+								LabelledName:   "ocr3",
+								Version:        "1",
+								CapabilityType: uint8(ocr3Cap),
+							},
+						},
+					},
+				},
+			},
+			wantErr: false,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			_, err := mapDonsToNodes(tt.args.dons, tt.args.excludeBootstraps)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("mapDonsToNodes() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+		})
+	}
+	// make sure the clo test data is correct
+	wfNops := loadTestNops(t, "../clo/testdata/workflow_nodes.json")
+	cwNops := loadTestNops(t, "../clo/testdata/chain_writer_nodes.json")
+	assetNops := loadTestNops(t, "../clo/testdata/asset_nodes.json")
+	require.Len(t, wfNops, 10)
+	require.Len(t, cwNops, 10)
+	require.Len(t, assetNops, 16)
+
+	wfDon := DonCapabilities{
+		Name:         WFDonName,
+		Nops:         wfNops,
+		Capabilities: []kcr.CapabilitiesRegistryCapability{OCR3Cap},
+	}
+	cwDon := DonCapabilities{
+		Name:         TargetDonName,
+		Nops:         cwNops,
+		Capabilities: []kcr.CapabilitiesRegistryCapability{WriteChainCap},
+	}
+	assetDon := DonCapabilities{
+		Name:         StreamDonName,
+		Nops:         assetNops,
+		Capabilities: []kcr.CapabilitiesRegistryCapability{StreamTriggerCap},
+	}
+	_, err := mapDonsToNodes([]DonCapabilities{wfDon}, false)
+	require.NoError(t, err, "failed to map wf don")
+	_, err = mapDonsToNodes([]DonCapabilities{cwDon}, false)
+	require.NoError(t, err, "failed to map cw don")
+	_, err = mapDonsToNodes([]DonCapabilities{assetDon}, false)
+	require.NoError(t, err, "failed to map asset don")
+}
+
+func loadTestNops(t *testing.T, pth string) []*models.NodeOperator {
+	f, err := os.ReadFile(pth)
+	require.NoError(t, err)
+	var nops []*models.NodeOperator
+	require.NoError(t, json.Unmarshal(f, &nops))
+	return nops
+}
diff --git a/integration-tests/deployment/llo/README.md b/integration-tests/deployment/llo/README.md
new file mode 100644
index 00000000000..208a1e2358b
--- /dev/null
+++ b/integration-tests/deployment/llo/README.md
@@ -0,0 +1,5 @@
+### LLO Deployments and Configurations
+
+This module contains workflows for deploying and configuring Data Streams LLO contracts.
+
+The contracts in question can be found under contracts/src/v0.8/llo-feeds.
diff --git a/integration-tests/deployment/llo/changeset/deploy.go b/integration-tests/deployment/llo/changeset/deploy.go
new file mode 100644
index 00000000000..cecd70a7f49
--- /dev/null
+++ b/integration-tests/deployment/llo/changeset/deploy.go
@@ -0,0 +1,18 @@
+package changeset
+
+import (
+	"github.com/smartcontractkit/chainlink/integration-tests/deployment"
+	llodeployment "github.com/smartcontractkit/chainlink/integration-tests/deployment/llo"
+)
+
+func DeployChannelConfigStoreChangeSet(env deployment.Environment, c llodeployment.DeployLLOContractConfig) (deployment.ChangesetOutput, error) {
+	ab := deployment.NewMemoryAddressBook()
+	err := llodeployment.DeployChannelConfigStore(env, ab, c)
+	if err != nil {
+		env.Logger.Errorw("Failed to deploy ChannelConfigStore", "err", err, "addresses", ab)
+		return deployment.ChangesetOutput{AddressBook: ab}, deployment.MaybeDataErr(err)
+	}
+	return deployment.ChangesetOutput{
+		AddressBook: ab,
+	}, nil
+}
diff --git a/integration-tests/deployment/llo/changeset/deploy_test.go b/integration-tests/deployment/llo/changeset/deploy_test.go
new file mode 100644
index 00000000000..584470b7555
--- /dev/null
+++ b/integration-tests/deployment/llo/changeset/deploy_test.go
@@ -0,0 +1,29 @@
+package changeset
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/smartcontractkit/chainlink/integration-tests/deployment/llo"
+)
+
+func TestDeployChannelConfigStoreChangeSet(t *testing.T) {
+	e := newMemoryEnv(t)
+	c := llo.DeployLLOContractConfig{
+		ChainsToDeploy: []uint64{TestChain.Selector},
+	}
+	out, err := DeployChannelConfigStoreChangeSet(e, c)
+	require.NoError(t, err)
+
+	ab, err := out.AddressBook.Addresses()
+	require.NoError(t, err)
+	require.Len(t, ab, 1)
+
+	for sel, addrMap := range ab {
+		require.Equal(t, TestChain.Selector, sel)
+		for _, tv := range addrMap {
+			require.Equal(t, tv.Type, llo.ChannelConfigStore)
+		}
+	}
+}
diff --git a/integration-tests/deployment/llo/changeset/helpers_test.go b/integration-tests/deployment/llo/changeset/helpers_test.go
new file mode 100644
index 00000000000..ae1d7eb41a9
--- /dev/null
+++ b/integration-tests/deployment/llo/changeset/helpers_test.go
@@ -0,0 +1,33 @@
+package changeset
+
+import (
+	"testing"
+
+	chain_selectors "github.com/smartcontractkit/chain-selectors"
+	"go.uber.org/zap/zapcore"
+
+	"github.com/smartcontractkit/chainlink/integration-tests/deployment"
+	"github.com/smartcontractkit/chainlink/integration-tests/deployment/memory"
+	"github.com/smartcontractkit/chainlink/v2/core/logger"
+)
+
+var (
+	// TestChain is the chain used by the in-memory environment.
+	TestChain = chain_selectors.Chain{
+		EvmChainID: 90000001,
+		Selector:   909606746561742123,
+		Name:       "Test Chain",
+		VarName:    "",
+	}
+)
+
+func newMemoryEnv(t *testing.T) deployment.Environment {
+	lggr := logger.TestLogger(t)
+	memEnvConf := memory.MemoryEnvironmentConfig{
+		Chains:         1,
+		Nodes:          4,
+		Bootstraps:     1,
+		RegistryConfig: deployment.CapabilityRegistryConfig{},
+	}
+	return memory.NewMemoryEnvironment(t, lggr, zapcore.InfoLevel, memEnvConf)
+}
diff --git a/integration-tests/deployment/llo/deploy.go b/integration-tests/deployment/llo/deploy.go
new file mode 100644
index 00000000000..19ae48be574
--- /dev/null
+++ b/integration-tests/deployment/llo/deploy.go
@@ -0,0 +1,126 @@
+package llo
+
+import (
+	"fmt"
+
+	"github.com/ethereum/go-ethereum/accounts/abi/bind"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/pkg/errors"
+
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+
+	"github.com/smartcontractkit/chainlink/integration-tests/deployment"
+	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/llo-feeds/generated/channel_config_store"
+)
+
+type DeployLLOContractConfig struct {
+	ChainsToDeploy []uint64 // Chain Selectors
+}
+
+// LLOContract covers contracts such as channel_config_store.ChannelConfigStore and fee_manager.FeeManager.
+type LLOContract interface {
+	// Caller:
+	Owner(opts *bind.CallOpts) (common.Address, error)
+	SupportsInterface(opts *bind.CallOpts, interfaceId [4]byte) (bool, error)
+	TypeAndVersion(opts *bind.CallOpts) (string, error)
+	// Transactor:
+	AcceptOwnership(opts *bind.TransactOpts) (*types.Transaction, error)
+	TransferOwnership(opts *bind.TransactOpts, to common.Address) (*types.Transaction, error)
+}
+
+type ContractDeploy[C LLOContract] struct {
+	Address  common.Address
+	Contract C
+	Tx       *types.Transaction
+	Tv       deployment.TypeAndVersion
+	Err      error
+}
+
+var (
+	ChannelConfigStore deployment.ContractType = "ChannelConfigStore"
+)
+
+func DeployChannelConfigStore(e deployment.Environment, ab deployment.AddressBook, c DeployLLOContractConfig) error {
+	nodes, err := deployment.NodeInfo(e.NodeIDs, e.Offchain)
+	if err != nil || len(nodes) == 0 {
+		e.Logger.Errorw("Failed to get node info", "err", err)
+		return err
+	}
+
+	for _, chainSel := range c.ChainsToDeploy {
+		chain, ok := e.Chains[chainSel]
+		if !ok {
+			return fmt.Errorf("Chain %d not found", chainSel)
+		}
+		_, err = deployChannelConfigStoreToChain(e, chain, ab)
+		if err != nil {
+			return err
+		}
+		chainAddresses, err := ab.AddressesForChain(chain.Selector)
+		if err != nil {
+			e.Logger.Errorw("Failed to get chain addresses", "err", err)
+			return err
+		}
+		chainState, err := LoadChainState(chain, chainAddresses)
+		if err != nil {
+			e.Logger.Errorw("Failed to load chain state", "err", err)
+			return err
+		}
+		if chainState.ChannelConfigStore == nil {
+			errNoCCS := errors.New("no ChannelConfigStore on chain")
+			e.Logger.Error(errNoCCS)
+			return errNoCCS
+		}
+	}
+
+	return nil
+}
+
+// deployChannelConfigStoreToChain deploys ChannelConfigStore to a specific chain.
+//
+// Note that this function modifies the given address book variable.
+func deployChannelConfigStoreToChain(e deployment.Environment, chain deployment.Chain, ab deployment.AddressBook) (*ContractDeploy[*channel_config_store.ChannelConfigStore], error) {
+	return deployContract(e.Logger, chain, ab, func(chain deployment.Chain) ContractDeploy[*channel_config_store.ChannelConfigStore] {
+		ccsAddr, ccsTx, ccs, err := channel_config_store.DeployChannelConfigStore(
+			chain.DeployerKey,
+			chain.Client,
+		)
+		if err != nil {
+			return ContractDeploy[*channel_config_store.ChannelConfigStore]{
+				Err: err,
+			}
+		}
+		return ContractDeploy[*channel_config_store.ChannelConfigStore]{
+			Address:  ccsAddr,
+			Contract: ccs,
+			Tx:       ccsTx,
+			Tv:       deployment.NewTypeAndVersion(ChannelConfigStore, deployment.Version1_0_0),
+			Err:      nil,
+		}
+	})
+}
+
+func deployContract[C LLOContract](
+	lggr logger.Logger,
+	chain deployment.Chain,
+	addressBook deployment.AddressBook,
+	deploy func(chain deployment.Chain) ContractDeploy[C],
+) (*ContractDeploy[C], error) {
+	contractDeploy := deploy(chain)
+	if contractDeploy.Err != nil {
+		lggr.Errorw("Failed to deploy contract", "err", contractDeploy.Err)
+		return nil, contractDeploy.Err
+	}
+	_, err := chain.Confirm(contractDeploy.Tx)
+	if err != nil {
+		lggr.Errorw("Failed to confirm deployment", "err", err)
+		return nil, err
+	}
+	err = addressBook.Save(chain.Selector, contractDeploy.Address.String(), contractDeploy.Tv)
+	if err != nil {
+		lggr.Errorw("Failed to save contract address", "err", err)
+		return nil, err
+	}
+	return &contractDeploy, nil
+}
diff --git a/integration-tests/deployment/llo/state.go b/integration-tests/deployment/llo/state.go
new file mode 100644
index 00000000000..6c149431c18
--- /dev/null
+++ b/integration-tests/deployment/llo/state.go
@@ -0,0 +1,34 @@
+package llo
+
+import (
+	"fmt"
+
+	"github.com/ethereum/go-ethereum/common"
+
+	"github.com/smartcontractkit/chainlink/integration-tests/deployment"
+	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/llo-feeds/generated/channel_config_store"
+)
+
+// LLOChainState holds a Go binding for all the currently deployed LLO contracts
+// on a chain. If a binding is nil, it means here is no such contract on the chain.
+type LLOChainState struct {
+	ChannelConfigStore *channel_config_store.ChannelConfigStore
+}
+
+// LoadChainState Loads all state for a chain into state
+func LoadChainState(chain deployment.Chain, addresses map[string]deployment.TypeAndVersion) (LLOChainState, error) {
+	var state LLOChainState
+	for address, tvStr := range addresses {
+		switch tvStr.String() {
+		case deployment.NewTypeAndVersion(ChannelConfigStore, deployment.Version1_0_0).String():
+			ccs, err := channel_config_store.NewChannelConfigStore(common.HexToAddress(address), chain.Client)
+			if err != nil {
+				return state, err
+			}
+			state.ChannelConfigStore = ccs
+		default:
+			return state, fmt.Errorf("unknown contract %s", tvStr)
+		}
+	}
+	return state, nil
+}
diff --git a/integration-tests/deployment/memory/chain.go b/integration-tests/deployment/memory/chain.go
index 1cbf2f9df71..0f3badc7dca 100644
--- a/integration-tests/deployment/memory/chain.go
+++ b/integration-tests/deployment/memory/chain.go
@@ -14,6 +14,8 @@ import (
 	"github.com/ethereum/go-ethereum/params"
 	chainsel "github.com/smartcontractkit/chain-selectors"
 	"github.com/stretchr/testify/require"
+
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/tests"
 )
 
 type EVMChain struct {
@@ -36,9 +38,10 @@ func tweakChainTimestamp(t *testing.T, backend *backends.SimulatedBackend, tweak
 }
 
 func fundAddress(t *testing.T, from *bind.TransactOpts, to common.Address, amount *big.Int, backend *backends.SimulatedBackend) {
-	nonce, err := backend.PendingNonceAt(Context(t), from.From)
+	ctx := tests.Context(t)
+	nonce, err := backend.PendingNonceAt(ctx, from.From)
 	require.NoError(t, err)
-	gp, err := backend.SuggestGasPrice(Context(t))
+	gp, err := backend.SuggestGasPrice(ctx)
 	require.NoError(t, err)
 	rawTx := gethtypes.NewTx(&gethtypes.LegacyTx{
 		Nonce:    nonce,
@@ -49,7 +52,7 @@ func fundAddress(t *testing.T, from *bind.TransactOpts, to common.Address, amoun
 	})
 	signedTx, err := from.Signer(from.From, rawTx)
 	require.NoError(t, err)
-	err = backend.SendTransaction(Context(t), signedTx)
+	err = backend.SendTransaction(ctx, signedTx)
 	require.NoError(t, err)
 	backend.Commit()
 }
diff --git a/integration-tests/deployment/memory/node.go b/integration-tests/deployment/memory/node.go
index dc364f69993..d60e4258db0 100644
--- a/integration-tests/deployment/memory/node.go
+++ b/integration-tests/deployment/memory/node.go
@@ -19,6 +19,7 @@ import (
 	"github.com/smartcontractkit/chainlink-common/pkg/config"
 	"github.com/smartcontractkit/chainlink-common/pkg/loop"
 	"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/tests"
 
 	"github.com/smartcontractkit/chainlink/integration-tests/deployment"
 
@@ -42,22 +43,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/plugins"
 )
 
-func Context(tb testing.TB) context.Context {
-	ctx := context.Background()
-	var cancel func()
-	switch t := tb.(type) {
-	case *testing.T:
-		if d, ok := t.Deadline(); ok {
-			ctx, cancel = context.WithDeadline(ctx, d)
-		}
-	}
-	if cancel == nil {
-		ctx, cancel = context.WithCancel(ctx)
-	}
-	tb.Cleanup(cancel)
-	return ctx
-}
-
 type Node struct {
 	App chainlink.Application
 	// Transmitter key/OCR keys for this node
@@ -207,7 +192,7 @@ type Keys struct {
 
 func CreateKeys(t *testing.T,
 	app chainlink.Application, chains map[uint64]EVMChain) Keys {
-	ctx := Context(t)
+	ctx := tests.Context(t)
 	require.NoError(t, app.GetKeyStore().Unlock(ctx, "password"))
 	_, err := app.GetKeyStore().P2P().Create(ctx)
 	require.NoError(t, err)
@@ -220,7 +205,7 @@ func CreateKeys(t *testing.T,
 	transmitters := make(map[uint64]common.Address)
 	for chainID, chain := range chains {
 		cid := big.NewInt(int64(chainID))
-		addrs, err2 := app.GetKeyStore().Eth().EnabledAddressesForChain(Context(t), cid)
+		addrs, err2 := app.GetKeyStore().Eth().EnabledAddressesForChain(ctx, cid)
 		require.NoError(t, err2)
 		if len(addrs) == 1 {
 			// just fund the address
@@ -228,9 +213,9 @@ func CreateKeys(t *testing.T,
 			transmitters[chainID] = addrs[0]
 		} else {
 			// create key and fund it
-			_, err3 := app.GetKeyStore().Eth().Create(Context(t), cid)
+			_, err3 := app.GetKeyStore().Eth().Create(ctx, cid)
 			require.NoError(t, err3, "failed to create key for chain", chainID)
-			sendingKeys, err3 := app.GetKeyStore().Eth().EnabledAddressesForChain(Context(t), cid)
+			sendingKeys, err3 := app.GetKeyStore().Eth().EnabledAddressesForChain(ctx, cid)
 			require.NoError(t, err3)
 			require.Len(t, sendingKeys, 1)
 			fundAddress(t, chain.DeployerKey, sendingKeys[0], assets.Ether(10).ToInt(), chain.Backend)
diff --git a/integration-tests/deployment/memory/node_test.go b/integration-tests/deployment/memory/node_test.go
index 4a791bfc1fb..035e6d03106 100644
--- a/integration-tests/deployment/memory/node_test.go
+++ b/integration-tests/deployment/memory/node_test.go
@@ -7,6 +7,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zapcore"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/tests"
 	"github.com/smartcontractkit/chainlink/integration-tests/deployment"
 )
 
@@ -15,7 +16,7 @@ func TestNode(t *testing.T) {
 	ports := freeport.GetN(t, 1)
 	node := NewNode(t, ports[0], chains, zapcore.DebugLevel, false, deployment.CapabilityRegistryConfig{})
 	// We expect 3 transmitter keys
-	keys, err := node.App.GetKeyStore().Eth().GetAll(Context(t))
+	keys, err := node.App.GetKeyStore().Eth().GetAll(tests.Context(t))
 	require.NoError(t, err)
 	require.Len(t, keys, 3)
 	// We expect 3 chains supported
diff --git a/integration-tests/go.mod b/integration-tests/go.mod
index 3fd83398ead..c8fabc84dc2 100644
--- a/integration-tests/go.mod
+++ b/integration-tests/go.mod
@@ -40,7 +40,7 @@ require (
 	github.com/smartcontractkit/chain-selectors v1.0.27
 	github.com/smartcontractkit/chainlink-automation v0.8.0
 	github.com/smartcontractkit/chainlink-ccip v0.0.0-20241014104242-9227e5c976a7
-	github.com/smartcontractkit/chainlink-common v0.3.1-0.20241014122810-6c3cc4d0dc87
+	github.com/smartcontractkit/chainlink-common v0.3.1-0.20241016173514-b7b7f6310ac2
 	github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.0
 	github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.11-0.20241011153842-b2804aed25b4
 	github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0
diff --git a/integration-tests/go.sum b/integration-tests/go.sum
index 4be605913fb..16d05018a29 100644
--- a/integration-tests/go.sum
+++ b/integration-tests/go.sum
@@ -1404,8 +1404,8 @@ github.com/smartcontractkit/chainlink-automation v0.8.0 h1:hFz2EHU06bkEfhcqhK8Jd
 github.com/smartcontractkit/chainlink-automation v0.8.0/go.mod h1:ObdjDfgGIaiE48Bb3yYcx1CeGBm392WlEw92U83LlUA=
 github.com/smartcontractkit/chainlink-ccip v0.0.0-20241014104242-9227e5c976a7 h1:aMG3BllvgeL/vsqkebuAhWoIWOnitKnN1VxibdzGnYo=
 github.com/smartcontractkit/chainlink-ccip v0.0.0-20241014104242-9227e5c976a7/go.mod h1:H4BTXnZBhwRdsAFjqWZpB1/f3IZnuB/Ql7pXPmokzXg=
-github.com/smartcontractkit/chainlink-common v0.3.1-0.20241014122810-6c3cc4d0dc87 h1:48qauRZcdxAOrgeko4RTm9ti4GGbSfzkcI4Dr/1FmjU=
-github.com/smartcontractkit/chainlink-common v0.3.1-0.20241014122810-6c3cc4d0dc87/go.mod h1:tsGgeEJc5SUSlfVGSX0wR0EkRU3pM58D6SKF97V68ko=
+github.com/smartcontractkit/chainlink-common v0.3.1-0.20241016173514-b7b7f6310ac2 h1:WERgv6CtOMVLCa0d1YhO3BrP94TwDT+QSVKvH5PZ5Xw=
+github.com/smartcontractkit/chainlink-common v0.3.1-0.20241016173514-b7b7f6310ac2/go.mod h1:tsGgeEJc5SUSlfVGSX0wR0EkRU3pM58D6SKF97V68ko=
 github.com/smartcontractkit/chainlink-cosmos v0.5.1 h1:2xeZWh+4/w7xalTdAu8jqgFuxZ291aYTEwZhlQEv/BY=
 github.com/smartcontractkit/chainlink-cosmos v0.5.1/go.mod h1:c1wUtVxXUqW4PzuCQhuHaBDZFv9XAQjhKTqam7GLGIU=
 github.com/smartcontractkit/chainlink-data-streams v0.1.0 h1:wcRJRm7eqfbgN+Na+GjAe0/IUn6XwmSagFHqIWHHBGk=
diff --git a/integration-tests/load/go.mod b/integration-tests/load/go.mod
index f411341671d..2c77f9dc2b8 100644
--- a/integration-tests/load/go.mod
+++ b/integration-tests/load/go.mod
@@ -15,7 +15,7 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/rs/zerolog v1.33.0
 	github.com/slack-go/slack v0.12.2
-	github.com/smartcontractkit/chainlink-common v0.3.1-0.20241014122810-6c3cc4d0dc87
+	github.com/smartcontractkit/chainlink-common v0.3.1-0.20241016173514-b7b7f6310ac2
 	github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.11-0.20241011153842-b2804aed25b4
 	github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.1
 	github.com/smartcontractkit/chainlink-testing-framework/wasp v1.50.0
diff --git a/integration-tests/load/go.sum b/integration-tests/load/go.sum
index 08971a251d6..66751cf23fa 100644
--- a/integration-tests/load/go.sum
+++ b/integration-tests/load/go.sum
@@ -1381,8 +1381,8 @@ github.com/smartcontractkit/chainlink-automation v0.8.0 h1:hFz2EHU06bkEfhcqhK8Jd
 github.com/smartcontractkit/chainlink-automation v0.8.0/go.mod h1:ObdjDfgGIaiE48Bb3yYcx1CeGBm392WlEw92U83LlUA=
 github.com/smartcontractkit/chainlink-ccip v0.0.0-20241014104242-9227e5c976a7 h1:aMG3BllvgeL/vsqkebuAhWoIWOnitKnN1VxibdzGnYo=
 github.com/smartcontractkit/chainlink-ccip v0.0.0-20241014104242-9227e5c976a7/go.mod h1:H4BTXnZBhwRdsAFjqWZpB1/f3IZnuB/Ql7pXPmokzXg=
-github.com/smartcontractkit/chainlink-common v0.3.1-0.20241014122810-6c3cc4d0dc87 h1:48qauRZcdxAOrgeko4RTm9ti4GGbSfzkcI4Dr/1FmjU=
-github.com/smartcontractkit/chainlink-common v0.3.1-0.20241014122810-6c3cc4d0dc87/go.mod h1:tsGgeEJc5SUSlfVGSX0wR0EkRU3pM58D6SKF97V68ko=
+github.com/smartcontractkit/chainlink-common v0.3.1-0.20241016173514-b7b7f6310ac2 h1:WERgv6CtOMVLCa0d1YhO3BrP94TwDT+QSVKvH5PZ5Xw=
+github.com/smartcontractkit/chainlink-common v0.3.1-0.20241016173514-b7b7f6310ac2/go.mod h1:tsGgeEJc5SUSlfVGSX0wR0EkRU3pM58D6SKF97V68ko=
 github.com/smartcontractkit/chainlink-cosmos v0.5.1 h1:2xeZWh+4/w7xalTdAu8jqgFuxZ291aYTEwZhlQEv/BY=
 github.com/smartcontractkit/chainlink-cosmos v0.5.1/go.mod h1:c1wUtVxXUqW4PzuCQhuHaBDZFv9XAQjhKTqam7GLGIU=
 github.com/smartcontractkit/chainlink-data-streams v0.1.0 h1:wcRJRm7eqfbgN+Na+GjAe0/IUn6XwmSagFHqIWHHBGk=
diff --git a/integration-tests/run-books/OCR.md b/integration-tests/run-books/OCR.md
new file mode 100644
index 00000000000..159b7d98062
--- /dev/null
+++ b/integration-tests/run-books/OCR.md
@@ -0,0 +1,252 @@
+
+# OCR Tests Run-Book
+
+- [OCR Tests Run-Book](#ocr-tests-run-book)
+  - [Summary](#summary)
+  - [Instructions](#instructions)
+    - [Pre-requisites](#pre-requisites)
+    - [Run Tests](#run-tests)
+      - [COMMON COMMANDS](#common-commands)
+        - [Docker](#docker)
+        - [Kubernetes](#kubernetes)
+        - [CI (with overrides)](#ci-with-overrides)
+      - [SMOKE](#smoke)
+        - [Docker](#docker-1)
+        - [CI](#ci)
+      - [SOAK](#soak)
+        - [Kubernetes](#kubernetes-1)
+        - [CI](#ci-1)
+      - [LOAD](#load)
+      - [CHAOS](#chaos)
+        - [Kubernetes](#kubernetes-2)
+        - [CI](#ci-2)
+      - [MIGRATION (core version upgrade)](#migration-core-version-upgrade)
+        - [Docker](#docker-2)
+
+## Summary
+
+This run-book is a guideline for running on demand OCR tests against any blockchain.
+
+## Instructions
+
+### Pre-requisites
+
+> [!IMPORTANT]
+>
+> 1. Ensure [main Pre-requisites](../README.md#pre-requisites) are met.
+> 2. Pay attention to the OCR version enabled in `overreride.toml`.
+> 3. Use `-p 1` to disable tests parallelization and avoid nonce-related issues (or comment `t.Parallel()`).
+> 4. For running tests in Kubernetes and CI, ensure test secrets are provided/uploaded to GitHub (ref. [CTF README#test-secrets](https://github.com/smartcontractkit/chainlink-testing-framework/blob/main/lib/config/README.md#test-secrets)).
+
+### Run Tests
+
+Below you may find instructions for running tests in different environments.
+
+#### COMMON COMMANDS
+
+Reuse the commands below to run different tests by their types/suites.
+
+##### Docker
+
+Any test suite/test can be run in Docker using the following `go` command (overrides are automatically injected):
+
+```bash
+go test -v -timeout <max_test_timeout> -p 1 <./path/to/_test.go file>
+```
+
+Example:
+
+```bash
+go test -v -timeout 60m -p 1 ./smoke/ocr2_test.go
+```
+
+##### Kubernetes
+
+Run:
+
+```bash
+BASE64_CONFIG_OVERRIDE=$(cat ./testconfig/overrides.toml | base64) go test -v -timeout <max_test_timeout> -p 1 -run '<TestName>' ./<test_directory>
+```
+
+Example:
+
+```bash
+# Go
+BASE64_CONFIG_OVERRIDE=$(cat ./testconfig/overrides.toml | base64) go test -v -p 1 -run 'TestOCRChaos' ./chaos
+
+- - - - - - - - - - - - - -
+
+# Make
+BASE64_CONFIG_OVERRIDE=$(cat ./testconfig/overrides.toml | base64) make test_soak_ocr
+```
+
+##### CI (with overrides)
+
+For the most tests run [Selected E2E Tests Workflow](https://github.com/smartcontractkit/chainlink/actions/workflows/run-selected-e2e-tests.yml) in GitHub, either manually or using `gh` command unless the otherwise stated:
+
+```bash
+gh workflow run "run-selected-e2e-tests.yml" \
+--ref <branch> \
+-f chainlink_version="v<your.version>" \ # Optional, default is image created from develop branch. Not needed if you run tests against existing environment
+-f workflow_run_name="Any name" \ # Optional
+-f test_ids="<test_ID>" \ # see /chainlink/.github/e2e-tests.yml for IDS
+-f test_secrets_override_key=<your uploaded to GH secrets key> \ # Optional, can be obtained when secrets are uploaded to GitHub
+-f test_config_override_path=<path/to/product/override.toml which should be committed in `integration-tests/testconfig/ocr2/overrides` folder> \ # Optional
+-f with_existing_remote_runner_version=<remote-runner version> \ # Optional
+```
+
+Example:
+
+```bash
+gh workflow run "run-selected-e2e-tests.yml" \
+--ref develop \
+-f chainlink_version="v2.17.0-beta0" \
+-f test_ids="smoke/ocr2_test.go:*" \
+-f workflow_run_name="Smoke:OCR2:2.17.0-beta0" \
+-f test_secrets_override_key=YOUR_TEST_SECRETS_ID \
+-f test_config_override_path=./testconfig/ocr2/overrides/base_sepolia.toml
+```
+
+#### SMOKE
+
+##### Docker
+
+Refer [COMMON COMMANDS#Docker](#docker). Override `<./path/to/_test.go file>` as follows:
+
+- With forwarders:
+  `./smoke/forwarder_ocr_test.go`
+  `./smoke/forwarder_ocr2_test.go`
+
+- No forwarders:
+  `./smoke/ocr_test.go`
+  `./smoke/ocr2_test.go`
+
+##### CI
+
+Refer [COMMON COMMANDS#CI](#ci). Override `test_ids` as follows:
+
+`smoke/ocr_test.go:*` - all OCR1 tests
+`smoke/ocr2_test.go:*` - all OCR2 tests
+
+#### SOAK
+
+> [!IMPORTANT]
+> These tests require logging in to Kubernetes cluster (`aws sso login`).
+> Do not use `-timeout` flag for Soak tests with Go command. It is set in `overrides.toml`
+
+Refer [Test config README](../testconfig/README.md) for more details about Soak tests configuration.
+
+##### Kubernetes
+
+Refer [COMMON COMMANDS#Kubernetes](#kubernetes). Override path as follows:
+
+- With forwarders:
+  `-run 'TestForwarderOCRv1Soak' ./soak` or `make test_soak_forwarder_ocr1`
+  `-run 'TestForwarderOCRv2Soak' ./soak` or `make test_soak_forwarder_ocr2`
+
+- No forwarders:
+  `-run 'TestOCRv1Soak' ./soak` or `make test_soak_ocr`
+  `-run 'TestOCRv2Soak' ./soak` or `make test_soak_ocr2`
+
+- With reorg below finality and `FinalityTagEnabled=false`:
+  `-run 'TestOCRSoak_GethReorgBelowFinality_FinalityTagDisabled' ./soak` or `make test_soak_ocr_reorg_1`
+
+- With reorg below finality and `FinalityTagEnabled=true`:
+  `-run 'TestOCRSoak_GethReorgBelowFinality_FinalityTagEnabled' ./soak` or `make test_soak_ocr_reorg_2`
+
+- With gas spike:
+  `-run 'TestOCRSoak_GasSpike' ./soak` or `make test_soak_ocr_gas_spike`
+
+- With change of a block gas limit (creating block congestion):
+  `-run 'TestOCRSoak_ChangeBlockGasLimit' ./soak` or `make test_soak_ocr_gas_limit_change`
+
+- All RPCs get down for all nodes:
+  `-run 'TestOCRSoak_RPCDownForAllCLNodes' ./soak` or `make test_soak_ocr_rpc_down_all_cl_nodes`
+
+- 50% of nodes get RPCs down:
+  `-run 'TestOCRSoak_RPCDownForHalfCLNodes' ./soak` or `make test_soak_ocr_rpc_down_half_cl_nodes`
+
+##### CI
+
+Use [On Demand OCR Soak Test](https://github.com/smartcontractkit/chainlink/actions/workflows/on-demand-ocr-soak-test.yml) workflow in GitHub.
+
+OR
+
+Run [On Demand OCR Soak Test](https://github.com/smartcontractkit/chainlink/actions/workflows/run-on-demand-ocr-soak-test.yml) workflow with `gh` as follows:
+
+```bash
+gh workflow run "on-demand-ocr-soak-test.yml" \
+--ref <branch> \
+-f chainlink_version="v<your.version>" \ # Optional, default is image created from develop branch. Not needed if you run tests against existing environment
+-f testToRun="soak/ocr_test.go:<TestName>" \ # see /chainlink/.github/workflows/on-demand-ocr-soak-test.yml for options
+-f test_secrets_override_key=<your uploaded to GH secrets key> \ # Optional, can be obtained when secrets are uploaded to GitHub
+-f test_config_override_path=<path/to/product/override.toml which should be committed in `integration-tests/testconfig/ocr2/overrides` folder> \ # Optional
+-f slackMemberID="YOUR_SLACK_MEMBER_ID" \ # Optional ("your profile -> three dots -> Copy Memeber ID")
+```
+
+Example:
+
+```bash
+gh workflow run "on-demand-ocr-soak-test.yml" \
+--ref develop \
+-f chainlink_version="v2.17.0-beta0" \
+-f testToRun="soak/ocr_test.go:TestOCRv2Soak" \
+-f test_config_override_path="/integration-tests/testconfig/ocr2/overrides/base_sepolia.toml" \
+-f test_secrets_override_key=BASE_TESTSECRETS_YOUR_ID \ # RPC links in testsecret should correspond to the selected chain
+-f slackMemberID="YOUR_SLACK_MEMBER_ID"
+```
+
+The following values may be used in the `testToRun` field (ref. [Soak#Kubernetes](#kubernetes) for more details):
+`soak/ocr_test.go:TestOCRv1Soak`
+`soak/ocr_test.go:TestOCRv2Soak`
+`soak/ocr_test.go:TestForwarderOCRv1Soak`
+`soak/ocr_test.go:TestForwarderOCRv2Soak`
+`soak/ocr_test.go:TestOCRSoak_GethReorgBelowFinality_FinalityTagDisabled`
+`soak/ocr_test.go:TestOCRSoak_GethReorgBelowFinality_FinalityTagEnabled`
+`soak/ocr_test.go:TestOCRSoak_GasSpike`
+`soak/ocr_test.go:TestOCRSoak_ChangeBlockGasLimit`
+`soak/ocr_test.go:TestOCRSoak_RPCDownForAllCLNodes`
+`soak/ocr_test.go:TestOCRSoak_RPCDownForHalfCLNodes`
+
+#### LOAD
+
+Ref: [Load Tests README](../load/ocr/README.md)
+
+#### CHAOS
+
+> [!IMPORTANT]
+> 1. These tests require logging in to Kubernetes cluster (`aws sso login`).
+> 2. There are only OCR1 chaos tests.
+
+##### Kubernetes
+
+Refer [COMMON COMMANDS#Kubernetes](#kubernetes). Override path as follows:
+
+`-run 'TestOCRChaos' ./chaos`
+
+OR
+
+`make test_ocr_chaos`
+
+##### CI
+
+Refer [COMMON COMMANDS#CI](#ci-with-overrides). Override `test_ids` as follows:
+
+`chaos/ocr_chaos_test.go`
+
+#### MIGRATION (core version upgrade)
+
+##### Docker
+
+1. Refer [Test configurations README](../testconfig/README.md#migration-tests) to provide necessary configuration.
+2. Run tests:
+
+    ```bash
+    # Go
+    BASE64_CONFIG_OVERRIDE=$(cat ./testconfig/overrides.toml | base64) go test -v -p 1 ./smoke/<product>_test.go
+
+    - - - - - - - - - - - - 
+
+    # Make command
+    BASE64_CONFIG_OVERRIDE=$(cat ./testconfig/overrides.toml | base64) make test_node_migrations_verbose
+    ```
diff --git a/integration-tests/run-books/VRF.md b/integration-tests/run-books/VRF.md
new file mode 100644
index 00000000000..ed0b7775e76
--- /dev/null
+++ b/integration-tests/run-books/VRF.md
@@ -0,0 +1,65 @@
+# VRF Tests Run Book 
+* All test configs should be placed in the [integration-tests/testconfig](../testconfig) folder  
+* All test configs for running tests in live testnets should be under [integration-tests/testconfig/vrfv2plus/overrides](../testconfig/vrfv2plus/overrides) folder 
+
+
+## Functional Tests
+### In CI - using On Demand Workflows
+```bash
+gh workflow run "on-demand-vrfv2plus-smoke-tests.yml" \
+--ref develop \
+-f=test_secrets_override_key=<your testsecrets id> \
+-f test_config_override_path=<path to test toml config which should be in `integration-tests/testconfig/vrfv2plus/overrides` folder> \
+-f test_suite="Selected Tests" \ # Optional, Options - "All Tests", "Selected Tests". Default is "All Tests". If "Selected Tests" is selected, then `test_list_regex` should be provided 
+-f test_list_regex="<regex for tests to run>" \ # Optional, default is "TestVRFv2Plus$/(Link_Billing|Native_Billing|Direct_Funding)|TestVRFV2PlusWithBHS" which are P0 tests
+-f chainlink_version="<>" # Optional, default is image created from develop branch. Not needed if you run tests against existing environment
+-f notify_user_id_on_failure=<your slack user id> # Optional, default is empty. If provided, will notify the user on slack if the tests fail
+```
+
+#### Examples:
+Run P0 tests against existing environment (Staging) on Arbitrum Sepolia
+```bash
+gh workflow run "on-demand-vrfv2plus-smoke-tests.yml" \
+--ref develop \
+-f=test_secrets_override_key=<your testsecrets id> \
+-f test_config_override_path=integration-tests/testconfig/vrfv2plus/overrides/staging/arbitrum_sepolia_staging_test_config.toml \
+-f test_suite="Selected Tests" 
+```
+
+Run all tests deploying all contracts, CL nodes with `2.15.0` version on Base Sepolia
+```bash
+gh workflow run "on-demand-vrfv2plus-smoke-tests.yml" \
+--ref develop \
+-f=test_secrets_override_key=<your testsecrets id> \
+-f test_config_override_path=integration-tests/testconfig/vrfv2plus/overrides/new_env/base_sepolia_new_env_test_config.toml \
+-f test_suite="All Tests" \
+-f chainlink_version="2.15.0" 
+```
+
+### Locally
+```bash
+cd integration-tests
+TEST_LOG_LEVEL=debug \
+BASE64_CONFIG_OVERRIDE=$(cat <full path to chain's test toml config> | base64) \
+go test -v -timeout 15m -run "<regex for tests to run>" ./smoke
+```
+
+## Performance Tests
+```bash
+gh workflow run "on-demand-vrfv2plus-performance-test.yml" \
+--ref develop \
+-f=test_secrets_override_key=<your testsecrets id> \
+-f test_config_override_path=<path to test toml config which should be in `integration-tests/testconfig/vrfv2plus/overrides` folder> \
+-f performanceTestType=“Smoke” # Options - "Smoke", "Soak", "Stress", "Load".
+-f test_list_regex="<regex for tests to run>" # Optional, default is "TestVRFV2PlusPerformance"
+```
+
+#### Examples:
+Run SOAK tests against existing environment (Staging) on Base Sepolia
+```bash
+gh workflow run "on-demand-vrfv2plus-performance-test.yml" \
+--ref develop \
+-f=test_secrets_override_key=<your testsecrets id> \
+-f test_config_override_path=integration-tests/testconfig/vrfv2plus/overrides/staging/base_sepolia_staging_test_config.toml \
+-f performanceTestType=“Soak”
+```
diff --git a/integration-tests/smoke/ocr_test.go b/integration-tests/smoke/ocr_test.go
index a19adb5c022..e3172e23b8c 100644
--- a/integration-tests/smoke/ocr_test.go
+++ b/integration-tests/smoke/ocr_test.go
@@ -105,20 +105,21 @@ func prepareORCv1SmokeTestEnv(t *testing.T, l zerolog.Logger, firstRoundResult i
 	nodeClients := env.ClCluster.NodeAPIs()
 	bootstrapNode, workerNodes := nodeClients[0], nodeClients[1:]
 
-	err = actions.FundChainlinkNodesFromRootAddress(l, sethClient, contracts.ChainlinkClientToChainlinkNodeWithKeysAndAddress(workerNodes), big.NewFloat(*config.Common.ChainlinkNodeFunding))
-	require.NoError(t, err, "Error funding Chainlink nodes")
-
 	t.Cleanup(func() {
 		// ignore error, we will see failures in the logs anyway
 		_ = actions.ReturnFundsFromNodes(l, sethClient, contracts.ChainlinkClientToChainlinkNodeWithKeysAndAddress(env.ClCluster.NodeAPIs()))
 	})
 
 	linkContract, err := actions.LinkTokenContract(l, sethClient, config.OCR)
-	require.NoError(t, err, "Error loading/deploying link token contract")
+	require.NoError(t, err, "Error loading/deploying LinkToken contract")
 
 	ocrInstances, err := actions.SetupOCRv1Contracts(l, sethClient, config.OCR, common.HexToAddress(linkContract.Address()), contracts.ChainlinkClientToChainlinkNodeWithKeysAndAddress(workerNodes))
 	require.NoError(t, err, "Error deploying OCR contracts")
 
+	// there is no need to fund the nodes unless the OCR contract and job are configured
+	err = actions.FundChainlinkNodesFromRootAddress(l, sethClient, contracts.ChainlinkClientToChainlinkNodeWithKeysAndAddress(workerNodes), big.NewFloat(*config.Common.ChainlinkNodeFunding))
+	require.NoError(t, err, "Error funding Chainlink nodes")
+
 	err = actions.CreateOCRJobsLocal(ocrInstances, bootstrapNode, workerNodes, 5, env.MockAdapter, big.NewInt(sethClient.ChainID))
 	require.NoError(t, err, "Error creating OCR jobs")
 
diff --git a/integration-tests/testconfig/README.md b/integration-tests/testconfig/README.md
index c43aeda0008..b60cd850a42 100644
--- a/integration-tests/testconfig/README.md
+++ b/integration-tests/testconfig/README.md
@@ -1,138 +1,120 @@
-# TOML is the Ultimate Choice!
-
-## Introduction
-
-Final implementation has undergone minor adjustments in comparison to the approach by Adam Hamric, Anindita Ghosh, and Sergey Kudasov stated in the ADR. The primary changes are as follows:
-
-* `TEST_LOG_LEVEL` remains an environment variable, pending the release of version 2.
-* `TEST_TYPE` is also kept as an environment variable to facilitate dynamic configuration selection by some tests.
-* TOML configuration of Chainlink nodes themselves has not been added, awaiting version 2.
-* The hierarchy of configuration overrides has been streamlined for simplicity.
-
-By design, all test configurations are intended to reside within the `testconfig` package, organized into application-specific folders. However, the system can locate these configurations in any folder within the `integration-tests` directory, selecting the first one found. To identify the configurations in use, execute tests with the `debug` log level.
-
-The `testconfig` package serves as a centralized resource for accessing configurations across all products, including shared settings like logging and network preferences, as well as initial funding for Chainlink nodes. Product configurations, if present, are subjected to validation based on logical assumptions and observed code values. The `TestConfig` structure includes a `Save()` method, allowing for the preservation of test configurations after all adjustments have been applied.
-
-## Configuration and Overrides
-
-The order of precedence for overrides is as follows:
-
-* [File `default.toml`](#defaulttoml)
-* [Product-specific file, e.g., `[product_name].toml`](#product-specific-configurations)
-* [File `overrides.toml`](#overridestoml)
-* [Environment variable `BASE64_CONFIG_OVERRIDE`](#base64_config_override)
+# Test Configurations
+
+- [Test Configurations](#test-configurations)
+  - [Summary](#summary)
+  - [Configurations Files and Overrides Precedence](#configurations-files-and-overrides-precedence)
+    - [Test Secrets (optional)](#test-secrets-optional)
+    - [default.toml](#defaulttoml)
+    - [\<product\>.toml](#producttoml)
+    - [overrides.toml (optional)](#overridestoml-optional)
+    - [`BASE64_CONFIG_OVERRIDE`](#base64_config_override)
+  - [Node configurations](#node-configurations)
+    - [Spec Properties](#spec-properties)
+      - [BaseConfigTOML](#baseconfigtoml)
+    - [Network configurations](#network-configurations)
+      - [Spec Properties](#spec-properties-1)
+        - [CommonChainConfigTOML](#commonchainconfigtoml)
+        - [ChainConfigTOMLByChainID](#chainconfigtomlbychainid)
+    - [Programmatic configuration](#programmatic-configuration)
+    - [Embedded configurations](#embedded-configurations)
+  - [Test type and case specific configurations](#test-type-and-case-specific-configurations)
+  - [Product-specific configurations](#product-specific-configurations)
+    - [Migration tests](#migration-tests)
+    - [Automation](#automation)
+      - [Specific test secrets](#specific-test-secrets)
+    - [OCR](#ocr)
+      - [Common OCR configurations](#common-ocr-configurations)
+      - [Reuse OCR contracts](#reuse-ocr-contracts)
+  - [Worthy to note](#worthy-to-note)
+  - [Reusing `testconfig` in other projects](#reusing-testconfig-in-other-projects)
+
+> [!NOTE]
+> **Current state and v2**
+>
+> - There are still several configuration files required to run tests: `.env`, `default.toml, <per-product>.toml`, `testsecrets`.
+> - `TEST_LOG_LEVEL` is still kept as an environment variable to facilitate dynamic configuration selection by some tests.
+> - Configuration of Chainlink nodes with TOML files separated from test configuration is aimed at v2.
+
+> [!IMPORTANT]
+> **Contributing**
+>
+> It's crucial to incorporate all new test configuration settings directly into the TOML configuration files, steering clear of using environment variables for this purpose. Our goal is to centralize all configuration details, including examples, within the same package. This approach simplifies the process of understanding the available configuration options and identifying the appropriate values to use for each setting.
+
+## Summary
+
+The `testconfig` package represents a storage of test configurations per product/service.
+
+> [!TIP]
+> 1. The `testconfig.go` may `Save()` your specification to a configuration file.
+> 2. To identify the configurations in use, run tests with the `TEST_LOG_LEVEL=debug`.
+
+## Configurations Files and Overrides Precedence
+
+Overrides work in the order of the following precedence (1 overrides 2 and so on):
+
+1. [Environment variable `BASE64_CONFIG_OVERRIDE`](#base64_config_override)
+2. [overrides.toml](#overridestoml-optional)
+3. [\<product\>.toml](#producttoml)
+4. [default.toml](#defaulttoml)
+5. [testsecrets](#test-secrets-optional)
+
+### Test Secrets (optional)
+
+Test secrets are necessary for remote environments (CI, Kubernetes). For more details, visit [Test Secrets in CTF](https://github.com/smartcontractkit/chainlink-testing-framework/blob/main/lib/config/README.md#test-secrets).
 
 ### default.toml
 
-That file is envisioned to contain fundamental and universally applicable settings, such as logging configurations, private Ethereum network settings or Seth networks settings for known networks.
+[default.toml](default.toml) represents common default test settings for logging, network, node and chain client.
 
-### Product-specific configurations
+> [!TIP]
+> It is recommended to provide [product-specific configurations](#producttoml) with explicitly defined values to override default configs.
 
-Product-specific configurations, such as those in `[product_name].toml`, house the bulk of default and variant settings, supporting default configurations like the following in `log_poller.toml`, which should be used by all Log Poller tests:
+### \<product\>.toml
 
-```toml
-# product defaults
-[LogPoller]
-[LogPoller.General]
-generator = "looped"
-contracts = 2
-events_per_tx = 4
-use_finality_tag = true
-log_poll_interval = "500ms"
-# 0 disables backup poller
-backup_log_poller_block_delay = 0
-
-[LogPoller.Looped]
-execution_count = 100
-min_emit_wait_time_ms = 200
-max_emit_wait_time_ms = 500
-```
+Product-specific default configurations stored in `./testconfig/<product_directory>/<product>.toml` (e.g. [ocr2.toml](./ocr2/ocr2.toml)). They explicitly define a [node configuration](#node-configurations), [test type-specific configurations](#test-type-and-case-specific-configurations), and override any [default settings](#defaulttoml) per product/service.
 
-### overrides.toml
+### overrides.toml (optional)
 
-This file is recommended for local use to adjust dynamic variables or modify predefined settings. At the very minimum it should contain the Chainlink image and version, as shown in the example below:
+> [!CAUTION]
+> Even though `overrides.toml` is git-ignored, pay attention to avoid storing any sensitive data in this file, especially in override-files for remote environments (which are not git-ignored).
 
-```toml
-[ChainlinkImage]
-version = "your tag"
-```
+The `overrides.toml` enables tests parametrization. When provided, it overrides default and per-product configurations.
+
+1. **For local runs**, store overrides as follows `./testconfig/overrides.toml`.
+2. **For remote environments** (CI, Kubernetes), commit overrides to repository under `../integration-tests/testconfig/<product>/overrides/<override-name>.toml` (e.g. [OCR2 overrides](../integration-tests/testconfig/ocr2/overrides/base_sepolia.toml)). See more in [E2E Tests on GitHub CI with overrides](../../.github/E2E_TESTS_ON_GITHUB_CI.md#test-workflows-setup-in-ci).
 
 Alternatively, set `E2E_TEST_CHAINLINK_IMAGE` and `E2E_TEST_CHAINLINK_VERSION` in `~/.testsecrets`
 
 ### `BASE64_CONFIG_OVERRIDE`
 
-This environment variable is primarily intended for use in continuous integration environments, enabling the substitution of default settings with confidential or user-specific parameters. For instance:
-
-```bash
-cat << EOF > config.toml
-[Network]
-selected_networks=["$SELECTED_NETWORKS"]
+This environment variable is used for overriding defaults in remote testing ([CI - On Demand Workflows](../../.github/E2E_TESTS_ON_GITHUB_CI.md#on-demand-workflows) and Kubernetes) when triggered from local machine.
 
-[ChainlinkImage]
-version="$CHAINLINK_VERSION"
-postgres_version="$CHAINLINK_POSTGRES_VERSION"
+Example:
 
-[Logging]
-test_log_collect=false
-run_id="$RUN_ID"
+```bash
+# Go test
+BASE64_CONFIG_OVERRIDE=$(cat ./testconfig/overrides.toml | base64) go test <test args>
 
-[Logging.LogStream]
-log_targets=["$LOG_TARGETS"]
-EOF
+- - - - - - - - - - - - -
 
-BASE64_CONFIG_OVERRIDE=$(cat config.toml | base64 -w 0)
-echo ::add-mask::$BASE64_CONFIG_OVERRIDE
-echo "BASE64_CONFIG_OVERRIDE=$BASE64_CONFIG_OVERRIDE" >> $GITHUB_ENV
+# Make command
+BASE64_CONFIG_OVERRIDE=$(cat ./testconfig/overrides.toml | base64) make test_<test>
 ```
 
-**It is highly recommended to use reusable GHA actions present in [.actions](../../../.github/.actions) to generate and apply the base64-encoded configuration.** Own implementation of `BASE64_CONFIG_OVERRIDE` generation is discouraged and should be used only if existing actions do not cover the use case. But even in that case it might be a better idea to extend existing actions.
-This variable is automatically relayed to Kubernetes-based tests, eliminating the need for manual intervention in test scripts.
-
-## Test Secrets
+## Node configurations
 
-Test secrets are not stored directly within the `TestConfig` TOML for security reasons. Instead, they are passed into `TestConfig` via environment variables. This ensures sensitive data is handled securely throughout our testing processes.
+A node configuration consists of two main blocks:
 
-For detailed instructions on how to set test secrets both locally and within CI environments, please visit: [Test Secrets Guide in CTF](https://github.com/smartcontractkit/chainlink-testing-framework/blob/main/config/README.md#test-secrets)
+- Network/chain configuration
+- Node-specific configuration
 
-### All test secrets
+### Spec Properties
 
-See [All E2E Test Secrets in CTF](https://github.com/smartcontractkit/chainlink-testing-framework/blob/main/config/README.md#all-e2e-test-secrets).
+#### BaseConfigTOML
 
-### Core repo specific test secrets
+A node's configuration unrelated to network settings is defined in `[NodeConfig].BaseConfigTOML="""your_config_here"""`, if none - defaults are used.
 
-| Secret                        | Env Var                                                             | Example                                      | Description                                                                          |
-| ----------------------------- | ------------------------------------------------------------------- | -------------------------------------------- | ------------------------------------------------------------------------------------ |
-| Data Streams Url              | `E2E_TEST_DATA_STREAMS_URL`                                         | `E2E_TEST_DATA_STREAMS_URL=url`              | Required by some automation tests to connect to data streams.                         |
-| Data Streams Username         | `E2E_TEST_DATA_STREAMS_USERNAME`                                    | `E2E_TEST_DATA_STREAMS_USERNAME=username`    | Required by some automation tests to connect to data streams.    |
-| Data Streams Password         | `E2E_TEST_DATA_STREAMS_PASSWORD`                                    | `E2E_TEST_DATA_STREAMS_PASSWORD=password`    | Required by some automation tests to connect to data streams. |
-
-## Named Configurations
-
-Named configurations allow for the customization of settings through unique identifiers, such as a test name or type, acting as specific overrides. Here's how you can define and use these configurations:
-
-For instance, to tailor configurations for a particular test, you might define it as follows:
-
-```toml
-# Here the configuration name is "TestLogManyFiltersPollerFinalityTag"
-[TestLogManyFiltersPollerFinalityTag.LogPoller.General]
-contracts = 300
-```
-
-Alternatively, for a configuration that applies to a certain type of test, as seen in `vrfv2.toml`, you could specify:
-
-```toml
-# Here the configuration name is "Soak"
-[Soak.VRFv2.Common]
-cancel_subs_after_test_run = true
-```
-
-When processing TOML files, the system initially searches for a general (unnamed) configuration. If a named configuration is found, it can specifically override the general (unnamed) settings, providing a targeted approach to configuration management based on distinct identifiers like test names or types.
-
-### Chainlink Node TOML config
-
-Find default node config in `testconfig/default.toml`
-
-To set custom config for Chainlink Node use `NodeConfig.BaseConfigTOML` in TOML. Example:
+Example:
 
 ```toml
 [NodeConfig]
@@ -142,25 +124,30 @@ FeedsManager = true
 LogPoller = true
 UICSAKeys = true
 
-[Log]
-Level = 'debug'
-JSONConsole = true
-
-[Log.File]
-MaxSize = '0b'
-
 [OCR]
 Enabled = true
-DefaultTransactionQueueDepth = 0
 """
 ```
 
-Note that you cannot override individual values in BaseConfigTOML. You must provide the entire configuration.
-This corresponds to [Config struct](../../core/services/chainlink/config.go) in Chainlink Node that excludes all chain-specific configuration, which is built based on selected_networks and either Chainlink Node's defaults for each network, or `ChainConfigTOMLByChainID` (if an entry with matching chain id is defined) or `CommonChainConfigTOML` (if no entry with matching chain id is defined).
+### Network configurations
+
+Chain-specific configuration is composed of the following blocks:
+
+- `[Network].selected_networks` - a list of networks to run tests on.
+- `ChainConfigTOMLByChainID` (if an entry with matching chain id is defined) OR `CommonChainConfigTOML` (if no entry with matching chain id is defined).
 
-If BaseConfigTOML is empty, then default base config provided by the Chainlink Node is used. If tracing is enabled unique id will be generated and shared between all Chainlink nodes in the same test.
+> [!NOTE]
+>
+> 1. If a `ChainConfigTOMLByChainID` or `CommonChainConfigTOML` is specified, they will override any defaults a Chainlink Node might have for the given network.
+> 2. To override default [BaseConfigTOML](#baseconfigtoml) and/or [CommonChainConfigTOML](#commonchainconfigtoml) provide the entire blocks as if it would be completely new configuration.
 
-To set base config for EVM chains use `NodeConfig.CommonChainConfigTOML`. Example:
+#### Spec Properties
+
+##### CommonChainConfigTOML
+
+A network-specific node config for EVM chains: `[NodeConfig].CommonChainConfigTOML="""your_config_here"""`.
+
+Example:
 
 ```toml
 CommonChainConfigTOML = """
@@ -175,9 +162,11 @@ FeeCapDefault = '200 gwei'
 """
 ```
 
-This is the default configuration used for all EVM chains unless `ChainConfigTOMLByChainID` is specified. Do remember that if either `ChainConfigTOMLByChainID` or `CommonChainConfigTOML` is defined, it will override any defaults that Chainlink Node might have for the given network. Part of the configuration that defines blockchain node URLs is always dynamically generated based on the EVMNetwork configuration.
+##### ChainConfigTOMLByChainID
 
-To set custom per-chain config use `[NodeConfig.ChainConfigTOMLByChainID]`. Example:
+The `[NodeConfig.ChainConfigTOMLByChainID]` is a custom per-chain config that overrides the [`CommonChainConfigTOML`](#commonchainconfigtoml). See examples in product directories, e.g. [ocr2/example.toml](./ocr2/example.toml).
+
+Example:
 
 ```toml
 [NodeConfig.ChainConfigTOMLByChainID]
@@ -187,168 +176,212 @@ To set custom per-chain config use `[NodeConfig.ChainConfigTOMLByChainID]`. Exam
 PriceMax = '400 gwei'
 LimitDefault = 100000000
 FeeCapDefault = '200 gwei'
-BumpThreshold = 60
-BumpPercent = 20
-BumpMin = '100 gwei'
 """
 ```
 
-For more examples see `example.toml` in product TOML configs like `testconfig/automation/example.toml`. If either ChainConfigTOMLByChainID or CommonChainConfigTOML is defined, it will override any defaults that Chainlink Node might have for the given network. Part of the configuration that defines blockchain node URLs is always dynamically generated based on the EVMNetwork configuration.
-Currently, all networks are treated as EVM networks. There's no way to provide Solana, Starknet, Cosmos or Aptos configuration yet.
+> [!NOTE]
+> Currently, all networks are treated as EVM networks. There's no way to provide Solana, Starknet, Cosmos or Aptos configuration yet.
 
-### OCR tests contract config
-In order to allow running OCR soak/load/smoke tests with already deployed contracts, we have provided an experimental feature for providing addresses of LINK token and OCR contracts in the TOML config. Additionally, user can choose, whether existing OCR contracts should be configured or not.
-If no contract addresses are provided, the tests will deploy new contracts.
+### Programmatic configuration
 
-The feature is highly configurable and it possible to use existing LINK token contract, but deploy new OCR contracts or vice versa. Both OCRv1 and OCRv2 contracts are supported.
+To set env vars for a Dockerized test use `docker.test_env_builder.WithCLNodeOptions(test_env.WithNodeEnvVars(envs))`.
 
-To use existing LINK and OCRv1 contracts, provide the following configuration in the TOML file:
-```toml
-[OCR.Contracts]
-link_token = "0x88d1239894D9582f5849E5b5a964da9e5730f1E6"
-offchain_aggregators = ["0xc1ce3815d6e7f3705265c2577F1342344752A5Eb"]
-```
+Example:
 
-For OCRv2, provide the following configuration:
-```toml
-[OCR2.Contracts]
-link_token = "0x88d1239894D9582f5849E5b5a964da9e5730f1E6"
-offchain_aggregators = ["0xc1ce3815d6e7f3705265c2577F1342344752A5Eb"]
+```go
+envs := map[string]string{
+    "CL_LOOPP_HOSTNAME": "hostname",
+}
+
+nodeEnvVars := test_env.WithNodeEnvVars(envs)
+
+testEnv, err := test_env.NewCLTestEnvBuilder().
+    WithTestInstance(t).
+    WithTestConfig(&config).
+    WithPrivateEthereumNetwork(privateNetwork.EthereumNetworkConfig).
+    WithMockAdapter().
+    WithCLNodes(clNodeCount).
+    WithCLNodeOptions(nodeEnvVars).
+    WithFunding(big.NewFloat(.1)).
+    WithStandardCleanup().
+    WithSeth().
+    Build()
 ```
 
-If you want to disable them, you can set `use = false` or remove the addresses from the configuration.
+### Embedded configurations
 
-If you want to use existing OCRv1 contract, without configuring it, you can set `configure = false` in the configuration:
-```toml
-[OCR.Contracts]
-link_token = "0x88d1239894D9582f5849E5b5a964da9e5730f1E6"
-offchain_aggregators = ["0xc1ce3815d6e7f3705265c2577F1342344752A5Eb"]
+For the reason Go automatically excludes TOML files during the compilation of binaries, the [config_embed.go](./configs_embed.go) deliberately incorporates all the default configurations into the the compiled binary with a custom build tag `-o embed`. Hence, only `overrides.toml` may be potentially needed to execute tests.
 
-# notice that this address needs to match the one in offchain_aggregators
-[OCR.Contracts.Settings."0xc1ce3815d6e7f3705265c2577F1342344752A5Eb"]
-configure = false
-```
+## Test type and case specific configurations
+
+These configurations represent unique identifiers used for customization of different test runs per product. When found, they take precedence and overrides the general (unnamed) settings (mentioned above).
+
+Examples:
 
-Be aware that using multiple existing OCR contracts, but configuring only some of them is not supported. This is not a valid configuration:
 ```toml
-[OCR.Contracts]
-link_token = "0x88d1239894D9582f5849E5b5a964da9e5730f1E6"
-offchain_aggregators = ["0xc1ce3815d6e7f3705265c2577F1342344752A5Eb", "0x2f4FA21fCd917C448C160caafEC874032F404c08"]
+# Specific per test configuration "TestLogPollerManyFiltersFinalityTag" for LogPoller
+[TestLogPollerManyFiltersFinalityTag.LogPoller.General]
+contracts = 300
 
-# notice that this address needs to match the one in offchain_aggregators
-[OCR.Contracts.Settings."0xc1ce3815d6e7f3705265c2577F1342344752A5Eb"]
-configure = false
+# "Soak" test configuration for VRFv2
+[Soak.VRFv2.Common]
+cancel_subs_after_test_run = true
 
-# if setting for a given address is not present, we assume it should be used and configured
-# so in this case "0x2f4FA21fCd917C448C160caafEC874032F404c08" will be evaluated as configure = true,
-# but "0xc1ce3815d6e7f3705265c2577F1342344752A5Eb" is set to configure = false.
-# this will fail configuration validation
+# "Load" test configuration for OCR2
+[Load.OCR2]
+[Load.OCR2.Common]
+eth_funds = 3
 ```
 
-This, more explicit version is also invalid:
-```toml
-[OCR.Contracts]
-link_token = "0x88d1239894D9582f5849E5b5a964da9e5730f1E6"
-offchain_aggregators = ["0xc1ce3815d6e7f3705265c2577F1342344752A5Eb", "0x2f4FA21fCd917C448C160caafEC874032F404c08"]
+## Product-specific configurations
 
-# notice that this address needs to match the one in offchain_aggregators
-[OCR.Contracts.Settings."0xc1ce3815d6e7f3705265c2577F1342344752A5Eb"]
-configure = false
+> [!TIP]
+> Find which configurations are applicable to a specific product in structs of the `testconfig/product directory/config.go (or <product>.go)`.
+> Examples: [ocr2/ocr2.go](./ocr2/ocr2.go), [automation/config.go](./automation/config.go).
 
-[OCR.Contracts.Settings."0x2f4FA21fCd917C448C160caafEC874032F404c08"]
-configure = true
-```
+### Migration tests
 
-Similarly, this one is also invalid:
-```toml
-[OCR.Contracts]
-link_token = "0x88d1239894D9582f5849E5b5a964da9e5730f1E6"
-offchain_aggregators = ["0xc1ce3815d6e7f3705265c2577F1342344752A5Eb", "0x2f4FA21fCd917C448C160caafEC874032F404c08"]
+1. Set `E2E_TEST_CHAINLINK_UPGRADE_IMAGE` in [testsecrets](#test-secrets-optional).
 
-# notice that this address needs to match the one in offchain_aggregators
-[OCR.Contracts.Settings."0xc1ce3815d6e7f3705265c2577F1342344752A5Eb"]
-use = false
+   ```bash
+   E2E_TEST_CHAINLINK_UPGRADE_IMAGE="public.ecr.aws/chainlink/chainlink"
+   ```
 
-[OCR.Contracts.Settings."0x2f4FA21fCd917C448C160caafEC874032F404c08"]
-use = true
-```
+2. In `overrides.toml` set image to upgrade to:
+
+    ```toml
+    # image to upgrade to
+    [ChainlinkUpgradeImage]
+    version="2.17.0-beta0"
+    ```
+
+3. Run tests:
+
+    ```bash
+    # Go
+    BASE64_CONFIG_OVERRIDE=$(cat ./testconfig/overrides.toml | base64) go test -v -p 1 ./smoke/<product>_test.go
 
-There are no settings available for LINK token contract.
+    - - - - - - - - - - - - 
+
+    # Make command
+    BASE64_CONFIG_OVERRIDE=$(cat ./testconfig/overrides.toml | base64) make test_node_migrations_verbose
+    ```
+
+### Automation
+
+#### Specific test secrets
+
+| Secret                        | Env Var                                                             | Example                                      | Description                                                                          |
+| ----------------------------- | ------------------------------------------------------------------- | -------------------------------------------- | ------------------------------------------------------------------------------------ |
+| Data Streams Url              | `E2E_TEST_DATA_STREAMS_URL`                                         | `E2E_TEST_DATA_STREAMS_URL=url`              | Required by some automation tests to connect to data streams.                         |
+| Data Streams Username         | `E2E_TEST_DATA_STREAMS_USERNAME`                                    | `E2E_TEST_DATA_STREAMS_USERNAME=username`    | Required by some automation tests to connect to data streams.    |
+| Data Streams Password         | `E2E_TEST_DATA_STREAMS_PASSWORD`                                    | `E2E_TEST_DATA_STREAMS_PASSWORD=password`    | Required by some automation tests to connect to data streams. |
+
+### OCR
+
+#### Common OCR configurations
+
+Specify number of contracts to be deployed for OCR (correspondingly, the same amount of jobs per OCR contract will be created on a node). For example:
 
-Last, but not least, when deploying new OCR contracts you need to provide their number. For example:
 ```toml
-# for OCRv1
+# OCRv1
 [OCR.Common]
 number_of_contracts=2
 
-# for OCRv2
+- - - - - - - - - - - -
+
+# OCRv2
 [OCR2.Common]
 number_of_contracts=2
 ```
 
-### Setting env vars for Chainlink Node
+#### Reuse OCR contracts
 
-To set env vars for Chainlink Node use `WithCLNodeOptions()` and `WithNodeEnvVars()` when building a test environment. Example:
+The feature supports OCR v1 and v2. It gets enabled when `[OCR.Contract]` block is specified.
 
-```go
-envs := map[string]string{
-    "CL_LOOPP_HOSTNAME": "hostname",
-}
-testEnv, err := test_env.NewCLTestEnvBuilder().
-    WithTestInstance(t).
-    WithTestConfig(&config).
-    WithPrivateEthereumNetwork(privateNetwork.EthereumNetworkConfig).
-    WithMockAdapter().
-    WithCLNodes(clNodeCount).
-    WithCLNodeOptions(test_env.WithNodeEnvVars(envs)).
-    WithFunding(big.NewFloat(.1)).
-    WithStandardCleanup().
-    WithSeth().
-    Build()
-```
+To reuse existing OCR contracts provide:
 
-## Local/Kubernetes Usage
+- LINK token address (unique per chain)
+- OCR contract addresses
+- [optional] choose, whether to use and configure the existing OCR contracts. **N/B:** usage/configuring of several selected contracts (not all the listed addresses) is not supported. All the contacts should have the same `use` and `configure` values.
 
-GitHub workflows in this repository have been updated to dynamically generate and utilize base64-encoded TOML configurations derived from user inputs or environment variables. For local execution or remote Kubernetes runners, users must manually supply certain variables, which cannot be embedded in configuration files due to their sensitive or dynamic nature.
+Example:
 
-Essential variables might include:
+```toml
+# For OCRv1
+[OCR.Contracts]
+link_token = "0x88d1239894D9582f5849E5b5a964da9e5730f1E6"
+offchain_aggregators = ["0xc1ce3815d6e7f3705265c2577F1342344752A5Eb"]
 
-* Chainlink image and version
-* Test duration for specific tests (e.g., load, soak)
-* Configuration specific to Loki (mandatory for certain tests)
-* Grafana dashboard URLs
+# If [OCR.Contracts.Settings.<OCR aggregator address>] is not present, we assume it should be used and configured
 
-For local testing, it is advisable to place these variables in the `overrides.toml` file. For Kubernetes or remote runners, the process involves creating a TOML file with the necessary values, encoding it in base64, and setting the result as the `BASE64_CONFIG_OVERRIDE` environment variable.
+- - - - - - - - - - - - 
 
-## Embedded config
+# For OCRv2
+[OCR2.Contracts]
+link_token = "0x88d1239894D9582f5849E5b5a964da9e5730f1E6"
+offchain_aggregators = ["0xc1ce3815d6e7f3705265c2577F1342344752A5Eb"]
 
-Because Go automatically excludes TOML files during the compilation of binaries, we must take deliberate steps to include our configuration files in the compiled binary. This can be accomplished by using a custom build tag `-o embed`. Implementing this tag will incorporate all the default configurations located in the `./testconfig` folder directly into the binary. Therefore, when executing tests from the binary, you'll only need to supply the `overrides.toml` file. This file should list only the settings you wish to modify; all other configurations will be sourced from the embedded configurations. You can access these embedded configurations [here](./configs_embed.go).
+# notice that this address needs to match the one in offchain_aggregators
+[OCR2.Contracts.Settings."0xc1ce3815d6e7f3705265c2577F1342344752A5Eb"]
+use = false # Default: true. Reuse existing OCR contracts?
+configure = false # Default: true. Configure existing OCR contracts?
 
-## To bear in mind
+- - - - - - - - - - - - 
 
-### Validation failures
+# Non-compliant configurations
+[OCR.Contracts]
+link_token = "0x88d1239894D9582f5849E5b5a964da9e5730f1E6"
+offchain_aggregators = ["0xc1ce3815d6e7f3705265c2577F1342344752A5Eb", "0x2f4FA21fCd917C448C160caafEC874032F404c08"]
 
-When the system encounters even a single setting related to a specific product or configuration within the configurations, it triggers a comprehensive validation of the entire configuration for that product. This approach is based on the assumption that if any configuration for a given product is specified, the entire set of configurations for that product must be complete and valid. This is particularly crucial when dealing with the `overrides.toml` file, where it's easy to overlook the need to comment out or adjust values when switching between configurations for different products. Essentially, the presence of any specific configuration detail necessitates that all relevant configurations for that product be fully defined and correct to prevent validation errors.
+# Example 1: Setting `configure` to `false` for selected (not all) addresses will fail configuration validation
+[OCR.Contracts.Settings."0xc1ce3815d6e7f3705265c2577F1342344752A5Eb"]
+configure = false
 
-## Possible nil pointers
+# OR
 
-If no configuration values are set for a product or its logging parameters, the system won't perform validation checks. This can lead to a 'nil pointer exception' error if you attempt to access a configuration property later on. This situation arises because we use pointers to facilitate optional overrides; accessing an unset (nil) pointer will cause an error. To avoid such issues, especially when general validations might not cover every scenario, it's crucial for users to ensure that all necessary configuration options are explicitly set. Additionally, it's highly recommended to implement test-specific validations to confirm that all required values for a particular test are indeed established. This proactive approach helps prevent runtime errors and ensures smooth test execution.
+# Example 2: Setting `configure` to different values for the listed contracts will fail execution
+[OCR.Contracts.Settings."0xc1ce3815d6e7f3705265c2577F1342344752A5Eb"]
+configure = false
 
-## Contributing
+[OCR.Contracts.Settings."0x2f4FA21fCd917C448C160caafEC874032F404c08"]
+configure = true
 
-It's crucial to incorporate all new test configuration settings directly into the TOML configuration files, steering clear of using environment variables for this purpose. Our goal is to centralize all configuration details, including examples, within the same package. This approach simplifies the process of understanding the available configuration options and identifying the appropriate values to use for each setting.
+# OR
 
-## Reusing TestConfig in other projects
+# Example 3: Setting `use` to different values for the listed contracts will fail execution
+[OCR.Contracts.Settings."0xc1ce3815d6e7f3705265c2577F1342344752A5Eb"]
+use = false
 
-To ensure the cleanliness and simplicity of your project's configuration, it's advised against using the `testconfig` code as a direct library in other projects. The reason is that much of this code is tailored specifically to its current application, which might not align with the requirements of your project. Your project might not necessitate any overrides or could perhaps benefit from a simpler configuration approach.
+[OCR.Contracts.Settings."0x2f4FA21fCd917C448C160caafEC874032F404c08"]
+use = true
+```
+
+## Worthy to note
+
+> [!NOTE]
+> **Configuration Validation and `nil` pointers**
+> When tests encounter a [test](#test-type-and-case-specific-configurations) or [product-specific](#product-specific-configurations) setting, they trigger a validation to ensure that the entire set of configurations for that product is complete and valid.
+>
+> If there are no configuration values (for a product or its logging parameters), the tests won't perform validation checks, leading to a `nil pointer exception` error on an attempt to access a configuration property later on. The error is caused by the usage of pointers to facilitate optional overrides: accessing an unset (nil) pointer will cause an error. To avoid such run-time issues, it is highly recommended to implement configuration-specific validations to confirm that all the required values for a particular test are explicitly specified.
+
+> [!NOTE]
+> **Known Issues/Limitations**
+> Duplicated test configuration file names in different locations may lead to an unpredictable execution behavior.
+>
+> The use of pointer fields for optional configuration elements necessitates careful handling, especially for programmatic modifications, to avoid unintended consequences. The `MustCopy()` function is recommended for creating deep copies of configurations for isolated modifications. Unfortunately some of the custom types are not copied at all, you need to set them manually. It's true for example for `blockchain.StrDuration` type.
 
-However, if you find a need to utilize some methods from this project, the recommended practice is to implement the required interfaces within your project's configuration package, rather than directly copying and pasting code. For instance, if you aim to incorporate a setup action similar to the `SetupVRFV2Environment` for VRFv2, like the one shown below:
+## Reusing `testconfig` in other projects
+
+To utilize some methods from this project, implement the required interfaces within your project's configuration package (no copy-pasting or structure replicating).
+
+Example:
 
 ```go
 func SetupVRFV2Environment(
     env *test_env.CLClusterTestEnv,
     nodesToCreate []vrfcommon.VRFNodeType,
-    vrfv2TestConfig types.VRFv2TestConfig,
+    vrfv2TestConfig types.VRFv2TestConfig, // implementation of interface used as a parameter
     useVRFOwner bool,
     useTestCoordinator bool,
     linkToken contracts.LinkToken,
@@ -358,12 +391,5 @@ func SetupVRFV2Environment(
     numberOfConsumers int,
     numberOfSubToCreate int,
     l zerolog.Logger,
-) (*vrfcommon.VRFContracts, []uint64, *vrfcommon.VRFKeyData, map[vrfcommon.VRFNodeType]*vrfcommon.VRFNode, error) {
+) (*vrfcommon.VRFContracts, []uint64, *vrfcommon.VRFKeyData, map[vrfcommon.VRFNodeType]*vrfcommon.VRFNode, error) { <setup logic> }
 ```
-
-You should not replicate the entire `TestConfig` structure. Instead, create an implementation of the `types.VRFv2TestConfig` interface in your project and use that as the parameter. This approach allows you to maintain a streamlined and focused configuration package in your project.
-
-## Known Issues/Limitations
-
-* Duplicate file names in different locations may lead to unpredictable configurations being selected.
-* The use of pointer fields for optional configuration elements necessitates careful handling, especially for programmatic modifications, to avoid unintended consequences. The `MustCopy()` function is recommended for creating deep copies of configurations for isolated modifications. Unfortunately some of the custom types are not copied at all, you need to set them manually. It's true for example for `blockchain.StrDuration` type.
diff --git a/nix-darwin-shell-hook.sh b/nix-darwin-shell-hook.sh
new file mode 100755
index 00000000000..49dbfc60983
--- /dev/null
+++ b/nix-darwin-shell-hook.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+# This script is used to set up cross compilation to linux arm64 in a CRIB environment.
+# It's loaded during the shell hook execution in shell.nix
+main() {
+    echo "Running in CRIB environment, setting up cross compilation to linux arm64..."
+    PACKAGE="aarch64-unknown-linux-gnu"
+
+    if ! command -v brew >/dev/null 2>&1; then
+        echo -e "\e[31mHomebrew is not installed. Please install Homebrew first: https://brew.sh/\e[0m"
+        exit 1
+    fi
+
+    if ! brew list --formula | grep $PACKAGE > /dev/null; then
+        echo -e "\e[31mThe Homebrew package $PACKAGE is not installed.\e[0m"
+        echo -e "\e[31mPlease install it by running: brew tap messense/macos-cross-toolchains && brew install ${PACKAGE}\e[0m"
+        exit 1
+    fi
+
+    export GOOS=linux
+
+    installed_version=$(brew list --versions $PACKAGE | awk '{print $2}')
+    path_prefix=$(brew --prefix)
+    bin_path=$path_prefix/Cellar/$PACKAGE/$installed_version/bin
+
+    export CC=$bin_path/aarch64-linux-gnu-gcc
+    export CXX=$bin_path/aarch64-linux-gnu-g++
+}
+
+main "$@"
diff --git a/shell.nix b/shell.nix
index ba09ebc219d..e3b187dcd96 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,4 +1,4 @@
-{pkgs}:
+{pkgs, isCrib}:
 with pkgs; let
   go = go_1_21;
   postgresql = postgresql_14;
@@ -18,7 +18,6 @@ in
     nativeBuildInputs =
       [
         go
-        goreleaser
         postgresql
 
         python3
@@ -51,10 +50,22 @@ in
         pkg-config
         libudev-zero
         libusb1
+      ] ++ lib.optionals isCrib [
+        nur.repos.goreleaser.goreleaser-pro
+        patchelf
       ];
-    LD_LIBRARY_PATH = "${stdenv.cc.cc.lib}/lib64:$LD_LIBRARY_PATH";
-    GOROOT = "${go}/share/go";
 
+    shellHook = ''
+      ${if !isCrib then "" else ''
+        if [ -z $GORELEASER_KEY ]; then
+          echo "GORELEASER_KEY must be set in CRIB environments. You can find it in our 1p vault under 'goreleaser-pro-license'."
+          exit 1
+        fi
+        ${if stdenv.isDarwin then "source ./nix-darwin-shell-hook.sh" else ""}
+      ''}
+    '';
+
+    GOROOT = "${go}/share/go";
     PGDATA = "db";
     CL_DATABASE_URL = "postgresql://chainlink:chainlink@localhost:5432/chainlink_test?sslmode=disable";
   }
diff --git a/sonar-project.properties b/sonar-project.properties
index b0e773b1048..1df8dbfa5bf 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -12,6 +12,7 @@ sonar.exclusions=\
 **/contracts/artifacts/**/*,\
 **/contracts/cache/**/*,\
 **/contracts/scripts/**/*,\
+**/contracts/tsconfig.json,\
 **/generated/**/*,\
 **/fixtures/**/*,\
 **/testutils/**/*,\
@@ -20,6 +21,7 @@ sonar.exclusions=\
 **/testconfig/**/*,\
 **/core/web/assets/**/*,\
 **/core/scripts/**/*,\
+**/core/**/logger/**/colortest/**/*,\
 **/docs/**/*,\
 **/tools/**/*,\
 **/fuzz/**/*,\
@@ -32,7 +34,9 @@ sonar.exclusions=\
 **/*_codecgen.go,\
 **/*_gen.go,\
 **/tsconfig.json,\
-**/debug.go
+**/delete-deployments/tsconfig.json,\
+**/debug.go,\
+**/mock_*.go
 
 # Coverage exclusions
 sonar.coverage.exclusions=\
@@ -42,7 +46,9 @@ sonar.coverage.exclusions=\
 **/contracts/**/tests/**/*,\
 **/core/**/cltest/**/*,\
 **/integration-tests/**/*,\
+**/*integration_tests/**/*,\
 **/plugins/**/*,\
+**/capabilities/**/*test/**/*,\
 **/main.go,\
 **/0195_add_not_null_to_evm_chain_id_in_job_specs.go
 
@@ -56,16 +62,16 @@ sonar.cpd.exclusions=\
 **/core/services/ocr2/plugins/mercury/plugin.go,\
 **/integration-tests/load/**/*,\
 **/integration-tests/contracts/ethereum_keeper_contracts.go,\
-integration-tests/contracts/ethereum_contracts_seth.go,\
-integration-tests/contracts/ethereum_contracts_seth.go,\
-integration-tests/actions/seth/actions.go,\
-dashboard-lib/**
+**/integration-tests/contracts/ethereum_contracts_seth.go,\
+**/integration-tests/actions/seth/actions.go,\
+**/dashboard-lib/**
 
 # Tests' root folder, inclusions (tests to check and count) and exclusions
 sonar.tests=.
 sonar.test.inclusions=\
 **/*_test.go,\
 **/*.test.ts
+
 sonar.test.exclusions=\
 **/integration-tests/**/*,\
 **/charts/chainlink-cluster/dashboard/cmd/**/*
\ No newline at end of file
diff --git a/tools/bin/goreleaser_utils b/tools/bin/goreleaser_utils
index a01c1654133..b4b7f124ba7 100755
--- a/tools/bin/goreleaser_utils
+++ b/tools/bin/goreleaser_utils
@@ -13,7 +13,38 @@ before_hook() {
   install_local_plugins
   install_remote_plugins
   mkdir -p "$lib_path/plugins"
-  cp "$(go env GOPATH)"/bin/chainlink* "$lib_path/plugins"
+
+  # Retrieve GOPATH
+  GOPATH=$(go env GOPATH)
+  GOARCH=$(go env GOARCH)
+
+  # Define the source directories
+  BIN_DIR="$GOPATH/bin"
+  PLUGIN_DIR="$lib_path/plugins"
+
+  # Because we still do cross compilation in the case of
+  # darwin_arm64 -> linux_arm64, the plugin path will have a suffix of
+  # linux_arm64, rather than being suffixless on native platforms
+  if [ "$GOARCH" = "arm64" ]; then
+    if [ -d "$BIN_DIR/linux_arm64" ]; then
+      cp "$BIN_DIR/linux_arm64"/chainlink* "$PLUGIN_DIR"
+    else 
+      cp "$BIN_DIR"/chainlink* "$PLUGIN_DIR"
+    fi
+    # Call patchelf --set-interpreter on all plugins
+    for plugin in "$PLUGIN_DIR"/chainlink*; do
+      patchelf --set-interpreter /lib/ld-linux-aarch64.so.1 "$plugin"
+    done
+
+  else
+    cp "$BIN_DIR"/chainlink* "$PLUGIN_DIR"
+
+    # Call patchelf --set-interpreter on all plugins
+    for plugin in "$PLUGIN_DIR"/chainlink*; do
+      patchelf --set-interpreter /lib64/ld-linux-x86-64.so.2 "$plugin"
+    done
+  fi
+
 }
 
 install_local_plugins() {
diff --git a/tools/goreleaser-config/gen_config.go b/tools/goreleaser-config/gen_config.go
index 9108ec1bbd1..de0a4ef0c3c 100644
--- a/tools/goreleaser-config/gen_config.go
+++ b/tools/goreleaser-config/gen_config.go
@@ -13,10 +13,12 @@ var validEnvironments = []string{"devspace", "develop", "production"}
 func Generate(environment string) config.Project {
 	checkEnvironments(environment)
 
+	architectures := []string{"amd64", "arm64"}
+
 	project := config.Project{
 		ProjectName: "chainlink",
 		Version:     2,
-		Env:         commonEnv(),
+		Env:         commonEnv(environment),
 		Before: config.Before{
 			Hooks: []config.Hook{
 				{
@@ -28,7 +30,7 @@ func Generate(environment string) config.Project {
 			},
 		},
 		Builds:          builds(environment),
-		Dockers:         dockers(environment),
+		Dockers:         dockers(environment, architectures),
 		DockerManifests: dockerManifests(environment),
 		Checksum: config.Checksum{
 			NameTemplate: "checksums.txt",
@@ -54,6 +56,11 @@ func Generate(environment string) config.Project {
 			Disable: "true",
 		},
 	}
+	if environment == "devspace" {
+		versionTemplate := `v0.0.0-{{ .Runtime.Goarch }}-{{ .Now.Format "2006-01-02-15-04-05Z" }}`
+		project.Snapshot = config.Snapshot{VersionTemplate: versionTemplate}
+		project.Nightly = config.Nightly{VersionTemplate: versionTemplate}
+	}
 
 	// Add SBOMs if needed
 	if environment == "production" {
@@ -95,12 +102,17 @@ func checkEnvironments(environment string) {
 }
 
 // commonEnv returns the common environment variables used across environments.
-func commonEnv() []string {
-	return []string{
+func commonEnv(environment string) []string {
+	envs := []string{
 		`IMG_PRE={{ if index .Env "IMAGE_PREFIX"  }}{{ .Env.IMAGE_PREFIX }}{{ else }}localhost:5001{{ end }}`,
 		`IMG_TAG={{ if index .Env "IMAGE_TAG" }}{{ .Env.IMAGE_TAG }}{{ else }}develop{{ end }}`,
-		`VERSION={{ if index .Env "CHAINLINK_VERSION" }}{{ .Env.CHAINLINK_VERSION }}{{ else }}v0.0.0-local{{ end }}`,
+		`CGO_ENABLED=1`,
+	}
+
+	if environment != "devspace" {
+		envs = append(envs, `VERSION={{ if index .Env "CHAINLINK_VERSION" }}{{ .Env.CHAINLINK_VERSION }}{{ else }}v0.0.0-local{{ end }}`)
 	}
+	return envs
 }
 
 // builds returns the build configurations based on the environment.
@@ -122,13 +134,22 @@ func builds(environment string) []config.Build {
 
 // build creates a build configuration.
 func build(isDevspace bool) config.Build {
+	dynamicLinker := `{{ if contains .Runtime.Goarch "amd64" -}}
+/lib64/ld-linux-x86-64.so.2
+{{- else if contains .Runtime.Goarch "arm64" -}}
+/lib/ld-linux-aarch64.so.1
+{{- end }}`
+
 	ldflags := []string{
 		"-s -w -r=$ORIGIN/libs",
-		"-X github.com/smartcontractkit/chainlink/v2/core/static.Version={{ .Env.VERSION }}",
 		"-X github.com/smartcontractkit/chainlink/v2/core/static.Sha={{ .FullCommit }}",
+		fmt.Sprintf(`-extldflags "-Wl,--dynamic-linker=%s"`, dynamicLinker),
 	}
+
 	if isDevspace {
-		ldflags[2] = "-X github.com/smartcontractkit/chainlink/v2/core/static.Version={{ .Version }}"
+		ldflags = append(ldflags, "-X github.com/smartcontractkit/chainlink/v2/core/static.Version={{ .Version }}")
+	} else {
+		ldflags = append(ldflags, "-X github.com/smartcontractkit/chainlink/v2/core/static.Version={{ .Env.VERSION }}")
 	}
 
 	return config.Build{
@@ -148,16 +169,16 @@ func build(isDevspace bool) config.Build {
 }
 
 // dockers returns the docker configurations based on the environment.
-func dockers(environment string) []config.Docker {
+func dockers(environment string, architectures []string) []config.Docker {
 	var dockers []config.Docker
 	switch environment {
 	case "devspace":
 		dockers = []config.Docker{
 			docker("linux-amd64", "linux", "amd64", environment, true),
+			docker("linux-arm64", "linux", "arm64", environment, true),
 		}
 
 	case "develop", "production":
-		architectures := []string{"amd64", "arm64"}
 		imageNames := []string{"chainlink", "ccip"}
 
 		for _, imageName := range imageNames {
@@ -213,9 +234,13 @@ func docker(id, goos, goarch, environment string, isDevspace bool) config.Docker
 		`--label=org.opencontainers.image.revision={{ .FullCommit }}`,
 		`--label=org.opencontainers.image.source=https://github.com/smartcontractkit/chainlink`,
 		`--label=org.opencontainers.image.title=chainlink`,
-		`--label=org.opencontainers.image.version={{ .Env.VERSION }}`,
 		`--label=org.opencontainers.image.url=https://github.com/smartcontractkit/chainlink`,
 	)
+	if !isDevspace {
+		buildFlagTemplates = append(buildFlagTemplates,
+			`--label=org.opencontainers.image.version={{ .Env.VERSION }}`,
+		)
+	}
 
 	dockerConfig := config.Docker{
 		ID:                 id,
diff --git a/tools/goreleaser-config/main.go b/tools/goreleaser-config/main.go
index 852b5b580ae..1e3e9776b14 100644
--- a/tools/goreleaser-config/main.go
+++ b/tools/goreleaser-config/main.go
@@ -7,7 +7,7 @@ import (
 )
 
 func main() {
-	environments := []string{"develop", "production"}
+	environments := []string{"develop", "production", "devspace"}
 	for _, e := range environments {
 		cfg := Generate(e)
 		data, err := yaml.Marshal(&cfg)